Large vimrc reorganization