Update .mailmap
Merge pull request #1472 from maginatics/mailmap

Update .mailmap