Fix vimrc and bundles