CEP 30 - Improvements to Cyclus Supply-Demand Framework#396

dean-krueger wants to merge 14 commits intocyclus:sourcecyclus/cyclus.github.com:sourcefrom

dean-krueger:cep-30-cleandean-krueger/cyclus.github.com:cep-30-cleanCopy head branch name to clipboard