Add a .mailmap file, to consolidate muliple committer identites.

That way, we don't end up with duplicates in the CONTRIBUTORS
section of the documentation.
Merge branch 'master' of github.com:thaljef/Pinto