Several updates to aliases and employer affiliations that have taken place since folsom
Merge pull request #7 from dgstangel/master

 Several updates to aliases and employer affiliations that have taken place since folsom