Merge pull request #18 from ConsumerDataStandardsAustralia/feature/update-combined-options

Added energy payment schedules to options and fixed some issues.

Author: abeheron1