updates cmake files to match cycamore
Merge branch 'cu' of https://github.com/gidden/cyclus into gidden-cu
Merge branch 'gidden-cu' into develop