companion to #863, also cleans up some test memory issues
actually using usings
updates cycamore with the cyclus toolkit
Merge branch 'gidden-rbp2' into develop
Merge branch 'tk' of https://github.com/gidden/cycamore into gidden-tk
some stale test includes
Merge branch 'tk' of https://github.com/gidden/cycamore into gidden-tk
Merge branch 'gidden-tk' into develop
merged from develop and resolved conflicts