Merge pull request #935 from RosettaCommons/revert-934-revert-929-dimaio/rama_prepro Fix clang unit test errors and re-merge "Dimaio/beta_nov15"