update mailmap
Merge pull request #214 from ndawe/master

update mailmap