Merge pull request #2242 from RosettaCommons/everyday847/analogue_na_scoring A couple places to generalize torsion scoring based on analogue_na()