Make cloud syncing more reliable.

[octalmage]

There's situations where it's possible to overwrite the data in the cloud with an outdated set of notes. Need to possibly find a way to merge notes, or ask the user how to handle inconsistencies.