I have a directory on each machine that are to be kept in sync, then I just put everything in a git repo. Go to work, pull, done. Go home, pull, done. Anything not in that directory is private to the machine, all my work is in the repo.