Minor: Replacements of statements along vimrc to better cluster bundle segments/configurations.