Fixes to solvation group tree for some nitrogen and sulfur groups.

Fixed up some groups, and the tree, for some parent/child mismatches.

Should fix issue #58