cyclus/cyclus — pull request #352 by gidden (2012-08-23 20:30:34+00:00)
Title: Dev hotfix

rebases the dev branch taking out the commits from my sim init upgrade. those will be applied to a new branch which will be ready to be merged when we fix cycamore at the same time.