.mailmap: match up some obvious names/emails