mailmap: organization affiliations

updates to .organizationmap and .mailmap