Updates for new dstore api (in progress)

The new dstore API (in master) is incompatible with v0.1.0, and vice-versa.   These changes are to make are code with the master branch of dstore.   They should be checked in on the next release of dstore.

Even with the changes, I'm still getting test failures, but it's a start.