mailmap updated for Mark too