more updates
Merge branch 'rm-schema' of github.com:cyclus/cycamore into rm-schema