Updating C-O-S groups, and adding 2 more.

GAVs for groups containing carbon, oxygen, and sulfur were
re-regressed using new calculations.  In addition to the updates,
this commit adds 2 more groups.