Moved r.js compile job into Gruntfile
Cleaned up grunt jobs