Merge pull request #478 from danvk/jshint