Best way to organize configuration files

I generally like to run Linux on many machines, and often need to create VMs as well. I have a lot of conf files (e.g. .vimrc, .bash_aliases) that I've spent years tweaking. Right now I have them all on a Dropbox folder and just source them from the local config files. I feel like there has to be a more efficient way to do this. I've seen some people actually set up a git repo for these files. Any other suggestions?