Set up for grunt
Merge remote-tracking branch 'origin/master'