Fixup .mailmap file

Fix a few issues with the `.mailmap` file.