Add .mailmap file canonicalizing author information
Update AUTHORS
Merge pull request #202 from OP2/update-authors

The AUTHORS file had become out of date, so fix it. At the same time
add a .mailmap file to canonicalize commit authors in git shortlog.