Revert "More calibration clean up."

This reverts commit 1ef263265fd8a6c9f93d72da7d419414f23c6162.

Conflicts:
	omf/calibration/Milsoft_GridLAB_D_Feeder_Generation.py