Merge branch 'master' of https://github.com/cyclus/cyclist2
schema failure :(
Merge branch 'master' of https://github.com/FlanFlanagan/cyclist2
adding my own code