Merge pull request #2009 from RosettaCommons/everyday847/calibur_stuff Make calibur better accord with the coding conventions