merged jshint stuff
Merge branch 'master' into priopos