Merge pull request #813 from RosettaCommons/vmullig/unfustercluck
Vmullig/unfustercluck
Rolls master back to Sergey Lyskov's commit 1da8a4c, before a whole lot of stuff was broken. @everyday847, @rhiju, I'm going to create a branch and a pull request for reverting this pull request (i.e. restoring all of the broken stuff). IN THAT BRANCH please fix all the broken stuff, test the branch, then re-merge with master.