Add in Grunt auto-completion
Merge remote-tracking branch 'upstream/master'