Additional tighter jshint options
Fixing merge conflict
Merge pull request #11 from serby/master

Tighter jshint options