Attempting upgrade
Merging master
Fix require job.
Merge pull request #62 from trainingwheels/upgrade-grunt

Attempting upgrade of Grunt - not quite working