Merge pull request #1292 from RosettaCommons/everyday847/hbs_geometry Fixing HBS geometry and unifying setup functions