split store into a store and a watcher

Signed-off-by: Jared Carroll <jcarroll@pivotallabs.com>