Overwrite defaultAffiliation if we already have one. Fixes #69.
Merge pull request #84 from surevine/master

Overwrite defaultAffiliation if we already have one. Fixes #69.