DNM: mailmap updates

Waiting on feedback from authors