vimrc: Refactored remaining bundle configuration