cyclus/cycamore — pull request #284 by gidden (2014-10-17 15:45:02+00:00)
Title: Dev merge

merges master into develop