@yellow if you've got a web server, there's a webdav sync plugin that might solve 1, works pretty ok
and it looks like there's even git plugins these days that might solve both, though i've not used it ^^
a remote git repository is easy enough to setup on pretty much any machine you've got ssh access to, webdav is a bit more annoying to get working...