Adding Nitrogen and Sulfur to solvation

This fixes some bugs and also adds groups for nitrogen and sulfur in the solute groups database.