Adding a .mailmap file to help organize the output of 'git shortlog'

Refs #000
Merge pull request #4192 from jwpeterson/mailmap

Adding a .mailmap file to help organize the output of 'git shortlog'
Merge commit '88a7d245f905fb0d79a39ea4341dd494e4591d2c'