0.6.0 new

All features in this branch are good to go for the next release.
I think the "merge.strategy" text is the correct one -- this branch really contains "merge.existing": https://github.com/johnmyleswhite/ProjectTemplate/blob/0.6.0-new/NEWS.md#v04-5-2014-02-11