Merge pull request #5597 from RosettaCommons/jadolfbr/quick_fix2 Clean up code templates and fix score terms that were scoring virtual residues