Merge remote-tracking branch 'upstream/master' into ensemble_cleanup
Merge pull request #83 from dwhswenson/altered_ensemble

[WIP] OptionalEnsemble and SlicedTrajectoryEnsemble
Revert "[WIP] OptionalEnsemble and SlicedTrajectoryEnsemble"
Merge pull request #84 from choderalab/revert-83-altered_ensemble

Revert "[WIP] OptionalEnsemble and SlicedTrajectoryEnsemble"
Merge pull request #69 from dwhswenson/ensemble_cleanup

Ensemble cleanup
Merge remote-tracking branch 'upstream/master' into altered_ensemble

Conflicts:
	opentis/tests/testensemble.py