More .mailmap changes; sorted the file