Merge pull request #783 from RosettaCommons/everyday847/everyday847/simian Some final deduplication efforts before I have to focus on other stuff