cyclus/cycamore — pull request #283 by gidden (2014-10-17 15:38:45+00:00)
Title: Dev rebase

this rebases dev on master