added unit support for json in netcdf
Merge branch 'examples' into unitsinjson
Merge branch 'master' of github.com:choderalab/msm-tis into unitsinjson
changes
Merge branch 'master' of github.com:jhprinz/msm-tis into unitsinjson
streamlined saving of options
fixes for enhanced objet storage
add fixes to enhances storage
fixes
Merge branch 'master' into unitsinjson
fixes
more fixes
more fixes
script fixes
fixed to adapt to better storage
Merge remote-tracking branch 'origin' into unitsinjson

Conflicts:
	examples/alanine/ala_dipeptide_example.py
	opentis/Simulator.py
	opentis/storage/netcdf_storage.py
	scripts/storageview.py
fixes after merge
fixes after merge
fix imports
fix imports