diff --git a/.gitignore b/.gitignore
index 97a85d7..4c4f95b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 irssi
-vim/spell
+
+vim/bundle/*
+!vim/bundle/vundle
 vim/.netrwhist
+vim/spell
diff --git a/.gitmodules b/.gitmodules
index 2c547fb..5059e06 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,30 +1,9 @@
 [submodule "oh-my-zsh"]
 	path = oh-my-zsh
 	url = git@github.com:igrat/oh-my-zsh.git
-[submodule "vim/bundle/vim-javascript"]
-	path = vim/bundle/vim-javascript
-	url = https://github.com/pangloss/vim-javascript.git
-[submodule "vim/bundle/fugitive"]
-	path = vim/bundle/vim-fugitive
-	url = https://github.com/igrat/vim-fugitive.git
-[submodule "vim/bundle/nerdtree"]
-	path = vim/bundle/nerdtree
-	url = https://github.com/scrooloose/nerdtree.git
-[submodule "vim/bundle/vim-fuzzyfinder"]
-	path = vim/bundle/vim-fuzzyfinder
-	url = git@github.com:igrat/vim-fuzzyfinder.git
-[submodule "vim/bundle/vim-l9"]
-	path = vim/bundle/vim-l9
-	url = git@github.com:igrat/vim-l9.git
-[submodule "vim/bundle/vim-jade"]
-	path = vim/bundle/vim-jade
-	url = https://github.com/digitaltoad/vim-jade.git
-[submodule "vim/bundle/vim-coffee-script"]
-	path = vim/bundle/vim-coffee-script
-    url = https://github.com/kchmck/vim-coffee-script.git
 [submodule "config/awesome"]
 	path = config/awesome
 	url = git@github.com:igrat/awesome-config.git
-[submodule "vim/bundle/vim-colors-solarized"]
-	path = vim/bundle/vim-colors-solarized
-	url = git://github.com/altercation/vim-colors-solarized.git
+[submodule "vim/bundle/vundle"]
+	path = vim/bundle/vundle
+	url = https://github.com/gmarik/vundle.git
diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree
deleted file mode 160000
index 30f6bcc..0000000
--- a/vim/bundle/nerdtree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 30f6bcc30caf76bc1213f5c3d4001ba5d5fbe7fc
diff --git a/vim/bundle/vim-coffee-script b/vim/bundle/vim-coffee-script
deleted file mode 160000
index 2591fef..0000000
--- a/vim/bundle/vim-coffee-script
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2591fefbc78ee7448da8da4a0537a531f710c743
diff --git a/vim/bundle/vim-colors-solarized b/vim/bundle/vim-colors-solarized
deleted file mode 160000
index 528a59f..0000000
--- a/vim/bundle/vim-colors-solarized
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21
diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive
deleted file mode 160000
index 1b7e407..0000000
--- a/vim/bundle/vim-fugitive
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1b7e4070f5f7b7522422f5b00a75b323cc314daf
diff --git a/vim/bundle/vim-fuzzyfinder b/vim/bundle/vim-fuzzyfinder
deleted file mode 160000
index a3459ac..0000000
--- a/vim/bundle/vim-fuzzyfinder
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a3459acf38770eea770bd508d05e20f22814df57
diff --git a/vim/bundle/vim-jade b/vim/bundle/vim-jade
deleted file mode 160000
index 981b39b..0000000
--- a/vim/bundle/vim-jade
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 981b39bd2dcd839746509328e69c5053b8871d04
diff --git a/vim/bundle/vim-javascript b/vim/bundle/vim-javascript
deleted file mode 160000
index 9990a76..0000000
--- a/vim/bundle/vim-javascript
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9990a767695c78a44611ce33fb2dbc25c83d8827
diff --git a/vim/bundle/vim-l9 b/vim/bundle/vim-l9
deleted file mode 160000
index 8ac1787..0000000
--- a/vim/bundle/vim-l9
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8ac17871ddc3a020e9047ebea40a270ff95c06b1
diff --git a/vim/bundle/vundle b/vim/bundle/vundle
new file mode 160000
index 0000000..f69ae09
--- /dev/null
+++ b/vim/bundle/vundle
@@ -0,0 +1 @@
+Subproject commit f69ae09a70b012fcff1bfd02dbe18c811b6c486c
diff --git a/vimrc b/vimrc
index 9b1e80c..18c4253 100644
--- a/vimrc
+++ b/vimrc
@@ -1,10 +1,31 @@
 " FULL VIM
 set nocompatible
 
-" PATHOGEN
-filetype off
-silent! call pathogen#runtime_append_all_bundles()
-silent! call pathogen#helptags()
+" Vundle
+filetype off  " required!
+set rtp+=~/.vim/bundle/vundle/
+call vundle#rc()
+
+" My Bundles here:
+"
+" original repos on github
+Bundle 'gmarik/vundle'
+Bundle 'scrooloose/nerdtree'
+Bundle 'pangloss/vim-javascript'
+Bundle 'tpope/vim-fugitive'
+Bundle 'clones/vim-l9'
+Bundle 'clones/vim-fuzzyfinder'
+Bundle 'altercation/vim-colors-solarized'
+Bundle 'kchmck/vim-coffee-script'
+
+" vim-scripts repos
+"Bundle 'L9'
+
+" non github repos
+"Bundle 'git://git.wincent.com/command-t.git'
+
+" Continue with the rest
+
 filetype plugin indent on
 
 " MAP LEADER
@@ -227,51 +248,9 @@ au FileType python set noexpandtab
 au FileType javascript setlocal ts=2 sts=2 sw=2
 au BufRead,BufNewFile *.json set ft=json
 
+" always show status line
+set laststatus=2
 
-"" STATUS LINE
-
-set laststatus=2 " always hide the statusline
-set statusline= " clear the statusline for when vimrc is reloaded
-set statusline+=%-2.2n\  " buffer number
-set statusline+=%f\  " tail of the filename
-
-"display a warning if fileformat isnt unix
-set statusline+=%#warningmsg#
-set statusline+=%{&ff!='unix'?'['.&ff.']':''}
-set statusline+=%*
-
-"display a warning if file encoding isnt utf-8
-set statusline+=%#warningmsg#
-set statusline+=%{(&fenc!='utf-8'&&&fenc!='')?'['.&fenc.']':''}
-set statusline+=%*
-
-set statusline+=%h "help file flag
-set statusline+=%y\  "filetype
-set statusline+=%r "read only flag
-set statusline+=%m  "modified flag
-
-" display the filesize
-set statusline+=[%{FileSize()}]
-set statusline+=\
-" display current git branch
-set statusline+=%{fugitive#statusline()}
-set statusline+=\
-" display a warning with Syntastic, of validation errors and syntax checkers
-set statusline+=%#warningmsg#
-set statusline+=%*
-
-set statusline+=%=  "left/right separator
-
-set statusline+=%c, " cursor column
-set statusline+=%l/%L " cursor line/total lines
-set statusline+=\ %P\  " percent through file
-set laststatus=2  " always show status line
-
-"" TODO COLORING Status line
-"highlight statusLine    cterm=bold ctermfg=yellow ctermbg=darkred
-"highlight statusLineNC 	cterm=bold ctermfg=black  ctermbg=white
-"
-"highlight modeMsg       cterm=bold ctermfg=white  ctermbg=darkblue
 
 "" MISC FUNCTIONS
 function! FileSize()