prevents in source builds
Merge branch 'oos' of https://github.com/gidden/cyclus into gidden-oos
Merge branch 'develop' of github.com:cyclus/cyclus into develop