mailmap updates

mail was sent to each person involved, waiting for feedback