updates cycamore with the cyclus toolkit
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