Fix jshint warnings
Merge branch 'warnings'