Simplify mailmap rules
Merge pull request #206 from Joshua-Anderson/mailmap-fixes

Simplify mailmap rules