diff --git a/.gitignore b/.gitignore
index 1ee84da..463d05a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.sw*
+vim-files/vim/bundle
diff --git a/.gitmodules b/.gitmodules
index 0900823..338e6ad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -87,3 +87,6 @@
 [submodule "vim-files/.vim/bundle/YouCompleteMe"]
 	path = vim-files/.vim/bundle/YouCompleteMe
 	url = https://github.com/Valloric/YouCompleteMe.git
+[submodule "vim-files/vim/bundle/vundle"]
+	path = vim-files/vim/bundle/vundle
+	url = https://github.com/gmarik/Vundle.vim.git
diff --git a/vim-files/vim/bundle/vundle b/vim-files/vim/bundle/vundle
new file mode 160000
index 0000000..2d2690e
--- /dev/null
+++ b/vim-files/vim/bundle/vundle
@@ -0,0 +1 @@
+Subproject commit 2d2690e41f875466b7de06f93e7ff93b8c50a9af
diff --git a/vim-files/vimrc b/vim-files/vimrc
index c309e42..bc1c7d3 100644
--- a/vim-files/vimrc
+++ b/vim-files/vimrc
@@ -1,5 +1,41 @@
-call pathogen#infect()
-call pathogen#helptags()
+set nocompatible " required
+filetype off " required
+
+"""" VUNDLE
+" set the runtime path to include Vundle and initialize
+set rtp+=~/.vim/bundle/vundle/
+call vundle#rc()
+" alternatively, pass a path where Vundle should install bundles
+"let path = '~/some/path/here'
+"call vundle#rc(path)
+
+" let Vundle manage Vundle, required
+Bundle 'gmarik/vundle'
+
+
+Bundle 'tpope/vim-sensible'
+Bundle 'tpope/vim-eunuch'
+Bundle 'scrooloose/nerdtree'
+Bundle 'tomtom/tcomment_vim'
+Bundle 'tpope/vim-characterize'
+Bundle 'klen/python-mode'
+Bundle 'jonathanfilip/vim-lucius'
+Bundle 'majutsushi/tagbar'
+Bundle 'sjl/gundo.vim'
+Bundle 'SirVer/ultisnips'
+Bundle 'kien/ctrlp.vim'
+Bundle 'terryma/vim-multiple-cursors'
+Bundle 'myusuf3/numbers.vim'
+Bundle 'airblade/vim-gitgutter'
+Bundle 'nathanaelkane/vim-indent-guides'
+Bundle 'maxbrunsfeld/vim-yankstack'
+Bundle 'tpope/vim-surround'
+Bundle 'scrooloose/syntastic'
+Bundle 'Valloric/YouCompleteMe'
+
+
+filetype plugin indent on     " required
+""" end vundle
 
 """" PLUGIN SETTINGS
 
diff --git a/zsh-files/.zshrc b/zsh-files/zshrc
similarity index 100%
rename from zsh-files/.zshrc
rename to zsh-files/zshrc