Add a couple of aliases.
Exclude lots of files from mergemaster's purview.