Update .mailmap with a few more addresses

Closes #7322 (thanks @pwaller)