Merge pull request #2611 from RosettaCommons/sboyken/mchbnet_updates2 Sboyken/mchbnet updates2 (resubmission)