Merge pull request #1274 from RosettaCommons/JWLabonte/sugars/CAPRI_redux Carbohydrates: CAPRI Redux Part II missing file; unit tests pass; carbohydrates test changes expected