repair features after rebase
repair features after rebase

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