Minor updates

Updates to the README file, as well as a few minor tweaks to the cmerge
script.