Pushes an encpk2 around now in order to facilitate login with keys
Linking remote boxes may work
Don't run delete SQL query if the list is empty
Lock tables when applying diff (as in update)
One-way syncing is stable using encpk2 auth
Syncing may work
Handle diff edge case
Do not propagate updates from the websocket

NB: doesn't work
Sharing working
All cjson to json, fixes unicode issues
Merge branch 'openid' into unstable