Added further mappings to .mailmap file.