mailmap updates

waiting for authors feedback