Merge pull request #2149 from RosettaCommons/everyday847/base_pair_classification Base pair classification that extends to modified residues