Fixed and added entries to mailmap.
Reordered mailmap alphabetically.