From 7ec7c759263fd03a150605213628d481b647c28e Mon Sep 17 00:00:00 2001
From: Faerbit <faerbit@gmail.com>
Date: Fri, 27 Jun 2014 00:12:28 +0200
Subject: [PATCH] Making switch to vundle complete.

---
 vim/bundle/Makefile | 13 -------------
 vimrc               | 34 +++++++++++++++-------------------
 2 files changed, 15 insertions(+), 32 deletions(-)
 delete mode 100644 vim/bundle/Makefile

diff --git a/vim/bundle/Makefile b/vim/bundle/Makefile
deleted file mode 100644
index c0b273a..0000000
--- a/vim/bundle/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-all: update
-
-init:
-	git init
-	test -d tlib || git submodule add https://github.com/tomtom/tlib_vim.git tlib
-	test -d addon-mw-utils || git submodule add https://github.com/MarcWeber/vim-addon-mw-utils.git addon-mw-utils
-	test -d snipmate || git submodule add https://github.com/garbas/vim-snipmate.git snipmate
-	test -d snippets || git submodule add https://github.com/honza/vim-snippets.git snippets
-	test -d coveragepy || git submodule add https://github.com/alfredodeza/coveragepy.vim coveragepy
-	test -d supertab || git submodule add https://github.com/ervandew/supertab supertab
-	test -d autotag || git submodule add https://github.com/craigemery/vim-autotag autotag
-update:
-	git submodule update
diff --git a/vimrc b/vimrc
index 0f9a79f..621791c 100644
--- a/vimrc
+++ b/vimrc
@@ -3,23 +3,24 @@ filetype off                  " required
 
 " set the runtime path to include Vundle and initialize
 set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
-" alternatively, pass a path where Vundle should install plugins
-"call vundle#begin('~/some/path/here')
+if exists("vundle#begin")
+    call vundle#begin()
+    " alternatively, pass a path where Vundle should install plugins
 
-" let Vundle manage Vundle, required
-Plugin 'gmarik/Vundle.vim'
+    " let Vundle manage Vundle, required
+    Plugin 'gmarik/Vundle.vim'
 
-"Other plugins
-Plugin 'tomtom/tlib_vim'
-Plugin 'MarcWeber/vim-addon-mw-utils'
-Plugin 'garbas/vim-snipmate'
-Plugin 'honza/vim-snippets'
-Plugin 'alfredodeza/coveragepy.vim'
-Plugin 'valloric/youcompleteme'
+    "Other plugins
+    Plugin 'tomtom/tlib_vim'
+    Plugin 'MarcWeber/vim-addon-mw-utils'
+    Plugin 'garbas/vim-snipmate'
+    Plugin 'honza/vim-snippets'
+    Plugin 'alfredodeza/coveragepy.vim'
+    Plugin 'valloric/youcompleteme'
 
-" All of your Plugins must be added before the following line
-call vundle#end()            " required
+    " All of your Plugins must be added before the following line
+    call vundle#end()            " required
+endif
 
 set background=dark
 set autoindent
@@ -48,11 +49,6 @@ filetype plugin indent on
 "execute Makefile
 :map <F9> :! ~/.vim/custom_make.sh<cr>
 :imap <F9> <Esc><F9>
-"only execute pathogen if it exists
-runtime! autoload/pathogen.vim
-if exists("*pathogen#infect")
-    execute pathogen#infect()
-endif
 "Split view if multiple files are opened
 if argc() == 2
     silent vertical all