update to bundles and clean up of vimrc