Shameless plug for "yet another" dotfile manager I'm writing. It doesn't get in the way, and allows you to manage them in quite a flexible way. Templating, conditional linking, copying, custom code execution... You name it!

https://github.com/cquintana92/dotfilers