DNM: mailmap updates

A mail was sent to each contributor individually, asking for review.