Backup config files properly
Fix merge conflict
Also copy the new config files over
No need to back up the config files, they don't get overwritten if you answer "No"

Updated the readme.
Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0