On import replace non-IDENTIFIER_CHARS with a _.

Otherwise the interface breaks if we import affiliations with e.g.
a space. This fixes the problem for now; maybe a better approach
is to get rid of this primary key in team_affiliation.
Affiliation long and short name fields were switched.