Modified vimrc according to new bundles