add .mailmap
Merge pull request #687 from adamralph/mailmap

add .mailmap