should fix #951
Merge branch 'extst' of github.com:gidden/cyclus into gidden-extst
Merge branch 'gidden-extst' into develop