Grunt fixes, cleaned remaining lint errors