More vimrc shuffling