Renaming grunt.config.merge.js to grunt-config-merge.js to match standar...

...d naming conventions. This also fixes a bug where including grunt-config-merge in package.json was throwing a warning.

There are some formatting changes in here that were automated by my sublime settings. Feel free to ignore them or I can redo the pull request.