Using initConfig overwriting existing grunt config
Merge branch 'master' into bookshelf
Merge branch 'bookshelf' into bookshelf-express