Added peak shaving integration work
Merge branch 'master' of https://github.com/adamraudonis/Open-Dispatch-Model