Changed TypeStr class and sub attribute to be based upon new canon form.
Changed TypeStr class and sub attribute to be based upon new canon form.

hodger/cyclus,mbmcgarry/cyclus,Baaaaam/cyclus,rwcarlsen/cyclus,mbmcgarry/cyclus,hodger/cyclus,Baaaaam/cyclus,mbmcgarry/cyclus,hodger/cyclus,rwcarlsen/cyclus,mbmcgarry/cyclus,rwcarlsen/cyclus,hodger/cyclus,Baaaaam/cyclus,hodger/cyclus,rwcarlsen/cyclus