I use rcm. It assumes you keep a separate (potentially version-controlled) folder at ~/.dotfiles or similar, and it provides a suite of tools for managing the symlinks.

https://github.com/thoughtbot/rcm