Update .mailmap
Sort .mailmap alphabetically
Merge pull request #881 from nyuszika7h/mailmap

Update .mailmap