Merge remote-tracking branch 'upstream/master' into shooting_fix
Added SampleSet.extend() as well as new tests.
Merge pull request #96 from dwhswenson/shooting_fix

Shooting fix
Merge branch 'master' of github.com:choderalab/msm-tis into multisimulator

Conflicts:
	examples/ipython/toy_dynamics_tis.ipynb
Merge pull request #91 from jhprinz/multisimulator

Storage for Engines
Removed old globalstate.py.
Merge remote-tracking branch 'upstream/master' into sample
Added @storable to SampleSet
Merge pull request #97 from dwhswenson/sample

SampleSet first draft
Merge remote-tracking branch 'upstream/master' into global_movers

Conflicts:
	examples/ipython/toy_dynamics_tis.ipynb
	opentis/sample.py