More vimrc refactoring