*That* was the merge from hell. Passes locally.
*That* was the merge from hell. Passes locally.

dwhswenson/openpathsampling,openpathsampling/openpathsampling,jhprinz/openpathsampling,choderalab/openpathsampling,openpathsampling/openpathsampling,openpathsampling/openpathsampling,jhprinz/openpathsampling,choderalab/openpathsampling,openpathsampling/openpathsampling,dwhswenson/openpathsampling,dwhswenson/openpathsampling,jhprinz/openpathsampling,dwhswenson/openpathsampling,choderalab/openpathsampling