.mailmap: map duplicates that I noticed in git shortlog.
Merge pull request #593 from Mkaysi/mailmap

.mailmap: map duplicates that I noticed in git shortlog.