Revert "Revert "Add a .mailmap file.""

This reverts commit 4968330c2c3f3ef161f77af7981f06bf77e4aea4.