removed supply_demand and action_building namespace. closes #248.
Merge branch 'develop' of github.com:cyclus/cyclus into develop