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

This includes several changes to the openstack-config including normalizing some organization names (e.g. 'Cisco' -> 'Cisco Systems') and adding some affiliations where they could be easily found.  

These were collected after daily iterations of running gitdm against the grizzly top of tree.