[aoisjef]

I've just started using Unison and it exactly fits my needs.

Unlike dropbox, it only does work when I run it, and I can manually sort through the conflicts when I choose to run it (which is a good thing).

It also doesn't require a central server, so I can just use it to sync my laptop and PC.

Tarsnap is used for offsite backup, which I trust much more than myself or dropbox.