Fixing python3 errors - decoding all day
Merge branch 'develop' of github.com:cyclus/cyclus into develop