use regexp to parse the mailmap

this also makes parse_mailmap() work with the swift .mailmap and should
be more readable

Change-Id: I3abb2a18d655e507bee5f621ebc64421d943cf0b
Merge "use regexp to parse the mailmap"