I have various .rc/.conf files I want to keep in sync on different computers. I use these files in my office, an Internet facing server at home and my laptop. At the moment I am copying (scp) the files across which is not very efficient. I was thinking of installing rsync (to sync) and subversion (to track changes) on my laptop but my laptop is not the central point where I make changes to these files. I sometimes make changes in my office files or sometimes in my server or sometimes on my laptop. So it's really hard to sync them and it's getting out of hand.

Can anyone suggest how can I keep my files in sync and keep track of changes easily?