Merge pull request #3112 from RosettaCommons/everyday847/update_lores_potential Initial merge from a branch for updating the lores potential -- just cleans up code