Minor vimrc reorganization