Update Grunt tasks, remove some small jshint issues