diff --git a/.gitmodules b/.gitmodules
index 6f04de8..ef0a6fa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,84 +1,3 @@
-[submodule "vim/bundle/fugitive"]
-	path = vim/bundle/fugitive
-	url = git://github.com/tpope/vim-fugitive.git
-[submodule "vim/bundle/closetag"]
-	path = vim/bundle/closetag
-	url = git://github.com/docunext/closetag.vim.git
-[submodule "vim/bundle/supertab"]
-	path = vim/bundle/supertab
-	url = git://github.com/ervandew/supertab.git
-[submodule "vim/bundle/tagbar"]
-	path = vim/bundle/tagbar
-	url = git://github.com/majutsushi/tagbar.git
-[submodule "vim/bundle/solarized"]
-	path = vim/bundle/solarized
-	url = git://github.com/altercation/vim-colors-solarized.git
-[submodule "vim/bundle/surround"]
-	path = vim/bundle/surround
-	url = git://github.com/tpope/vim-surround.git
-[submodule "vim/bundle/javascript"]
-	path = vim/bundle/javascript
-	url = git://github.com/pangloss/vim-javascript
-[submodule "vim/bundle/nerdtree"]
-	path = vim/bundle/nerdtree
-	url = git://github.com/scrooloose/nerdtree
-[submodule "vim/bundle/repeat"]
-	path = vim/bundle/repeat
-	url = git://github.com/tpope/vim-repeat
-[submodule "vim/bundle/syntastic"]
-	path = vim/bundle/syntastic
-	url = git://github.com/scrooloose/syntastic
-[submodule "vim/bundle/snipmate"]
-	path = vim/bundle/snipmate
-	url = git://github.com/garbas/vim-snipmate.git
-[submodule "vim/bundle/tlib"]
-	path = vim/bundle/tlib
-	url = git://github.com/tomtom/tlib_vim.git
-[submodule "vim/bundle/vim-addon-mw-utils"]
-	path = vim/bundle/vim-addon-mw-utils
-	url = git://github.com/MarcWeber/vim-addon-mw-utils.git
-[submodule "vim/bundle/snipmate-snippets"]
-	path = vim/bundle/snipmate-snippets
-	url = git://github.com/honza/snipmate-snippets.git
-[submodule "vim/bundle/easymotion"]
-	path = vim/bundle/easymotion
-	url = git://github.com/Lokaltog/vim-easymotion
-[submodule "vim/bundle/nerdcommenter"]
-	path = vim/bundle/nerdcommenter
-	url = git://github.com/scrooloose/nerdcommenter
-[submodule "vim/bundle/vim-jade"]
-	path = vim/bundle/vim-jade
-	url = git://github.com/digitaltoad/vim-jade
-[submodule "vim/bundle/vim-less"]
-	path = vim/bundle/vim-less
-	url = git://github.com/groenewege/vim-less
-[submodule "ShowMarks"]
-	path = ShowMarks
-	url = git://github.com/vim-scripts/ShowMarks
-[submodule "vim/bundle/ShowMarks"]
-	path = vim/bundle/ShowMarks
-	url = git://github.com/vim-scripts/ShowMarks
-[submodule "vim/bundle/CamelCaseMotion"]
-	path = vim/bundle/CamelCaseMotion
-	url = git://github.com/bkad/CamelCaseMotion
-[submodule "vim/bundle/gundo"]
-	path = vim/bundle/gundo
-	url = git://github.com/sjl/gundo.vim
 [submodule "oh-my-zsh"]
-	path = oh-my-zsh
-	url = git://github.com/robbyrussell/oh-my-zsh
-[submodule "vim/bundle/MatchTag"]
-	path = vim/bundle/MatchTag
-	url = git://github.com/gregsexton/MatchTag
-[submodule "vim/bundle/vim-rails"]
-	path = vim/bundle/vim-rails
-	url = git://github.com/tpope/vim-rails
-[submodule "vim/bundle/endwise"]
-	path = vim/bundle/endwise
-	url = git://github.com/tpope/vim-endwise
-[submodule "vim/bundle/ctrlp"]
-	path = vim/bundle/ctrlp
-	url = git://github.com/kien/ctrlp.vim
-[submodule "vim/bundle/vim-powerline"]
-	path = vim/bundle/vim-powerline
-	url = git://github.com/Lokaltog/vim-powerline
+    path = oh-my-zsh
+    url = git://github.com/robbyrussell/oh-my-zsh
diff --git a/gitconfig b/gitconfig
index 29b1e8d..163ffa6 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,6 +1,6 @@
 [user]
-	name = Dustin Swan
-	email = dustinswan@gmail.com
+    name = Dustin Swan
+    email = dustinswan@gmail.com
 
 [alias]
     hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
diff --git a/vim/bundle/ShowMarks b/vim/bundle/ShowMarks
deleted file mode 160000
index ef22709..0000000
--- a/vim/bundle/ShowMarks
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ef22709d8ebba137819ab0e60db5463b480934cd
diff --git a/vim/bundle/closetag b/vim/bundle/closetag
deleted file mode 160000
index 0601093..0000000
--- a/vim/bundle/closetag
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 060109359b81b53dfad7206e23f86007d895996f
diff --git a/vim/bundle/ctrlp b/vim/bundle/ctrlp
deleted file mode 160000
index 420174f..0000000
--- a/vim/bundle/ctrlp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 420174fc537ba986a716964db7af0bd189252944
diff --git a/vim/bundle/easymotion b/vim/bundle/easymotion
deleted file mode 160000
index 667a668..0000000
--- a/vim/bundle/easymotion
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 667a668e114e9ec0e5d4cbcb0962d835b23614c4
diff --git a/vim/bundle/endwise b/vim/bundle/endwise
deleted file mode 160000
index 74306aa..0000000
--- a/vim/bundle/endwise
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 74306aa18c03ee2fdb044609e6f0bc866872711d
diff --git a/vim/bundle/fugitive b/vim/bundle/fugitive
deleted file mode 160000
index b4b75ef..0000000
--- a/vim/bundle/fugitive
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b4b75ef682da3e946c648d3634ade39d0af49aba
diff --git a/vim/bundle/gundo b/vim/bundle/gundo
deleted file mode 160000
index 5009271..0000000
--- a/vim/bundle/gundo
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 50092711ff831742cece76f3322674858863e3f3
diff --git a/vim/bundle/javascript b/vim/bundle/javascript
deleted file mode 160000
index e66f901..0000000
--- a/vim/bundle/javascript
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e66f9019b4eca05d7f5dfe38c742cf42e641e98d
diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree
deleted file mode 160000
index eced5f9..0000000
--- a/vim/bundle/nerdtree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit eced5f98a0724cd6498b70024b3edec1e7b29b2e
diff --git a/vim/bundle/repeat b/vim/bundle/repeat
deleted file mode 160000
index cdffdd4..0000000
--- a/vim/bundle/repeat
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cdffdd43816ddaeee858ae42da3ab6ddcfa25d19
diff --git a/vim/bundle/snipmate b/vim/bundle/snipmate
deleted file mode 160000
index 4cef3fc..0000000
--- a/vim/bundle/snipmate
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4cef3fca6969155698cda224acfb0843c2d6c6b4
diff --git a/vim/bundle/solarized b/vim/bundle/solarized
deleted file mode 160000
index 528a59f..0000000
--- a/vim/bundle/solarized
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21
diff --git a/vim/bundle/supertab b/vim/bundle/supertab
deleted file mode 160000
index ac395b5..0000000
--- a/vim/bundle/supertab
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ac395b57fec47f034cba151d01669d134ac7041b
diff --git a/vim/bundle/surround b/vim/bundle/surround
deleted file mode 160000
index 4eb2cdf..0000000
--- a/vim/bundle/surround
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4eb2cdfccc016889acfa3b5d63e8f390a87863cf
diff --git a/vim/bundle/tlib b/vim/bundle/tlib
deleted file mode 160000
index d6c56d4..0000000
--- a/vim/bundle/tlib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d6c56d4bae4f1e8908b64bc6bf0cbd6480081f49