Got grunt set up proper-like
Merge remote-tracking branch 'origin/master'