Updated jshint task and cleaned up js
Merge branch 'jshint' into develop