After using a few different dotfile managers I finally settled on using a simple git repo. This setup is inspired by StreakyCobra on HN. Nicola Paolucci then did a nice write up on the method and put it here : The best way to store your dotfiles: A bare Git repository
If configuration files must diverge between machines then each machine should have a branch.
A setup gist is found here