commodity_producer_manager.* : style corrections.
Merge branch 'develop' into integration_testing
Remove inheritance from Model class, following the develop branch.
Additional adjustments to the sink facility.
Merge pull request #717 from rakhimov/google_style

commodity_producer_manager.* : style corrections.
Update .astylerc
commodity_recipe_context.* : style corrections.
Cyclus builds with sink facility but doesn't yet run with null_sink
input.
Merge branch 'develop' of github.com:cyclus/cyclus into develop
nuc-to-id, also painless
Added pyne to top-level header
made output db have more consistent col names. Renamed Agents table to
AgentEntry and AgentDeaths to AgentExit.  Post-processing will create the
Agents table by joining births and deaths.
Merge pull request #722 from rwcarlsen/fix-names

made output db have more consistent col names
fixes #613. switch nuclide ids to use pyne format to handle metastables among other things
comp_math.* : style corrections.
Merge pull request #719 from rakhimov/minor_changes

Update .astylerc
made model copy constructor private to force copying to use clone/initfrom
added adjustprefs methods to trader interface. Updated resource exchange to call trader's adjust methods instead of trader->manager()'s
Corrected schema for the sink facility.
added the cbc interface to the cyclus src