Add .mailmap for better "git shortlog" reports
Merge pull request #532 from melissalinkert/rebased/dev_4_4/mailmap

Add .mailmap for better "git shortlog" reports (rebased onto dev_4_4)