Renaming grunt.config.merge.js to grunt-config-merge.js to match standard naming conventions. This also fixes a bug where including grunt-config-merge in package.json was throwing a warning.