Earlier this year I was looking for a good way to sensibly manage my dotfiles across multiple machines (with different setups). The closest project I could find that supported something like this was https://github.com/EvanPurkhiser/dots which had a fairly robust way of extending/overriding configs, but I ended up getting a bit hung up (either with deploying or auto-updating, I forget which). Is there anything else out there that deals well w/ multiple machines/types (and across OS X and Linux ideally?)