Grunt and jshint fixes
0.12.0