update mailmap
Merge pull request #66 from esc/update_mailmap

update mailmap