Uglify more JS for fewer requests, fix grunt tasks