Clean up some of the datastore locking, add an auto-incoming-syncer for pulling in remote changes as they happen