housekeeping fixes
reversing changes, appears to be problem in egg creation logic
Merge pull request #143 from wfrench/master

New Simulator Test Driver
Changed to sieve function, finished WFP_ENG.
fixed egg test
one last fix for egg generator test
Fixed keys to match preload names.
should have been committed last time.
Parad_k parser has been written and this is the initial check in
FLORT_KN driver.
Small harvester change and many files test.
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 '_'.
fixes for PARAD_K
Merge remote branch 'upstream/master'

Conflicts:
	mi/dataset/parser/WFP_E_file_common.py
Finishing up the PARAD_K
 fter emily's review
Please enter the commit message for your changes. Lines starting
Merge pull request #146 from mnicolet/master

Merge Parad_k data set driver
Merge remote branch 'upstream/master'