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

Update .mailmap