Yet more .vimrc shuffling.