Merge pull request #1399 from am11/master

src-jshint: Now supports jshint-ignore
Merge pull request #1405 from am11/master

Code: Misc. fixes