Grunt + jshint fixes