Gruntify + Jshint fixes
more gruntification