Merge pull request #7 from dgstangel/master

 Several updates to aliases and employer affiliations that have taken place since folsom
specific domains for IBM added
Merge pull request #9 from dicortazar/master

Extra domains for IBM