Fixed Grunt tasks.
Fixed linting errors