Refactored and corrected the PlansFromEmmeDemand classes.
Authored by: jwjoubert 2010-06-22
Parent: [r11886]
Child: [r11888]