Merge pull request #1229 from RosettaCommons/everyday847/cleanup
Trivial, semantic-neutral code cleanup effort to core/scoring: I think it makes sense to move forward with this PR: even the scorefile scores, in that one integration test that appears to just get optimized differently, end up the same.