Merge pull request #2825 from RosettaCommons/rpavlovicz/clean_water Rpavlovicz/statistical solvation methods