Reverting everything that has happened since 698e461ad265a541. At this point, the master branch should be exactly where it was prior to the merge of the JK-lab branch with master. The following should now happen:
--bazzoli should fix the JK-lab branch in a branch, and test it by submitting SHAs to the test server (rather than testing it by merging with master over and over)
--I'll double-check that the broken Windows PyRosetta build was not due to my changes in vmullig/cycpep, and if my branch is good to go, I'll reinstate its merge with master. (Note that I had temporarily reinstated the merge of my vmullig/cycpep branch in this branch, but have now rolled that back, so no changes have occurred since 698e461ad265a541).