Even more .mailmap additions