COSMIT update mailmap

This took some interpretation, hope I got it all right.