diff --git a/.gitmodules b/.gitmodules
index 240cb2d..aec4ca9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,18 +1,3 @@
-[submodule "vim/bundle/vundle"]
-	path = vim/bundle/vundle
-	url = http://github.com/gmarik/vundle.git
-[submodule "tmux-powerline"]
-	path = tmux-powerline
-	url = git://github.com/erikw/tmux-powerline.git
-[submodule "powerline-shell"]
-	path = powerline-shell
-	url = git://github.com/milkbikis/powerline-shell.git
-[submodule "bin/gcalcli-git"]
-	path = bin/gcalcli-git
-	url = https://github.com/insanum/gcalcli
-[submodule "bin/cortex-git"]
-	path = bin/cortex-git
-	url = git://glacicle.org/projects/cortex.git
-[submodule "bin/rbenv-git"]
-	path = bin/rbenv-git
-	url = git://github.com/sstephenson/rbenv.git
+[submodule "vim/bundle/Vundle.vim"]
+	path = vim/bundle/Vundle.vim
+	url = https://github.com/gmarik/Vundle.vim.git
diff --git a/bin/gcalcli-git b/bin/gcalcli-git
deleted file mode 160000
index 4c059ea..0000000
--- a/bin/gcalcli-git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4c059eaa7260f5622e4541e1743826452009f513
diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim
new file mode 160000
index 0000000..8db3bcb
--- /dev/null
+++ b/vim/bundle/Vundle.vim
@@ -0,0 +1 @@
+Subproject commit 8db3bcb5921103f0eb6de361c8b25cc03cb350b5
diff --git a/vim/bundle/vundle b/vim/bundle/vundle
deleted file mode 160000
index f31aa52..0000000
--- a/vim/bundle/vundle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f31aa52552ceb40240e56e475e6df89cc756507e