Added a Git .mailmap file
Merge pull request #516 from GrahamLea/mailmap

* mailmap:
  Added a Git .mailmap file