Update AUTHORS and add .mailmap
Merge pull request #246 from titanous/update-authors

Update AUTHORS and add .mailmap