Only build master
Use grunt-cli too
Make grunt work with Grunt 0.4
Make all the grunts work yo
Merge master in