fixed storage
Merge branch 'dev_storage'

Conflicts:
	code/python/PySRMSTIS/OpenMM based SR-MS-TIS.md
	code/python/PySRMSTIS/src/Simulator.py
	code/python/PySRMSTIS/src/data/mdtraj.pdb
	code/python/PySRMSTIS/src/data/trajectory.nc
	code/python/PySRMSTIS/src/forkable_trajectory_storage.pyc
	code/python/PySRMSTIS/src/sandbox.py
	code/python/PySRMSTIS/src/simulator.pyc
	code/python/PySRMSTIS/src/snapshot.py
	code/python/PySRMSTIS/src/snapshot.pyc
	code/python/PySRMSTIS/src/trajectory.pyc
	code/python/PySRMSTIS/src/transition_interface_sampling.pyc
Merge branch 'master' of github.com:choderalab/msm-tis

Conflicts:
	code/python/PySRMSTIS/OpenMM based SR-MS-TIS.md
	code/python/PySRMSTIS/src/Simulator.py
	code/python/PySRMSTIS/src/data/mdtraj.pdb
	code/python/PySRMSTIS/src/data/trajectory.nc
	code/python/PySRMSTIS/src/forkable_trajectory_storage.pyc
	code/python/PySRMSTIS/src/sandbox.py
	code/python/PySRMSTIS/src/simulator.pyc
	code/python/PySRMSTIS/src/snapshot.py
	code/python/PySRMSTIS/src/snapshot.pyc
	code/python/PySRMSTIS/src/trajectory.pyc
	code/python/PySRMSTIS/src/transition_interface_sampling.pyc
Delete forkable_trajectory_storage.pyc
Delete simulator.pyc
Delete snapshot.pyc
Delete trajectory.pyc
Delete transition_interface_sampling.pyc
Merge branch 'master' of github.com:choderalab/msm-tis

Bringing JHP's updates to choderalab/master into my own master/