housekeeping fixes
reversing changes, appears to be problem in egg creation logic
fixed egg test
one last fix for egg generator test
should have been committed last time.
Merge pull request #145 from emilyhahn/master

CIDEVMI-1141 and CIDEVMI-837
Merge pull request #144 from unwin/fix_unit_errors

Fix unit errors
Egg generator does not generate names with '__', replace with '_'.