Fix all jshint errors. Add jshint to travis.
Merge branch 'master' into develop