Fixes to thermo ring groups so that parent-child relationships are correct.

Most fixes are making children's atomtypes more specific, i.e. switching O to Os
where appropriate.

Made sixnosidedouble group more broad and inclusive of nitrogen so that Piperidine
can be a child of it.