Merge pull request #2524 from RosettaCommons/everyday847/two_bugs Condition one of Vikram's new features -- for now -- on non-RNA identity