Update .mailmap

Anyone who has actually comitted with a real email address no longer has
a fake one in .mailmap.  This way, the contributors page on github is
more accurate.