Many changes to vimrc and bundles