update .mailmap file
Merge pull request #14 from stefanbeller/master

update .mailmap file