Add paths to the Grunt config
Merge branch 'master' into gulp