Merge pull request #2246 from RosettaCommons/everyday847/stepwise_NCNTs Somehow, my last PR stopped being updated with commits in this branch...