I'd look at both git and mercurial. I have a similar situation, and I've pretty much settled on mercurial, but that's because I do a little bit of Windows stuff.