move some stuff around. Easier to VC VIM config/plugin changes/additions