Merge pull request #592 from Mkaysi/mailmap

Mailmap: fix my name and email addresses for git.
.mailmap: map duplicates that I noticed in git shortlog.