Merge pull request #2574 from RosettaCommons/everyday847/riboswitch_reconciliation More riboswitch-centric modifications