Grunt file cleanups and PHP linting fixes