.mailmap: fixup entries