code generating bug fixes
Merge branch 'pp' of github.com:cyclus/cyclus into pp