Using initConfig overwriting existing grunt config
Merge branch 'master' into aws