Add some more entries to .mailmap

Most of these are deduplicating more email addresses of people already in .mailmap.  The exception is that I've added @gmalecha, and chose which of his two addresses to use by which I had more emails from (both have 1 commit in the repo).