Gruntfile, lint fixes and jsbeautify