Merge pull request #3244 from RosettaCommons/rpavlovicz/water_branch_updates Updates to the beta_nov16 statistical water protocols.