diff --git a/.gitmodules b/.gitmodules
index 8de4b7b1..a52f9a7a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,9 +22,6 @@
 [submodule ".vim/bundle/vim-colors-solarized"]
 	path = vim/.vim/bundle/vim-colors-solarized
 	url = git://github.com/altercation/vim-colors-solarized.git
-[submodule ".vim/bundle/vim-commentary"]
-	path = vim/.vim/bundle/vim-commentary
-	url = git://github.com/tpope/vim-commentary.git
 [submodule ".vim/bundle/vim-repeat"]
 	path = vim/.vim/bundle/vim-repeat
 	url = git://github.com/tpope/vim-repeat.git
@@ -115,3 +112,6 @@
 [submodule "Alfred 2/Alfred.alfredpreferences/workflows/user.workflow.8694C3FC-8218-4B98-BB1F-F1CEC686477C"]
 	path = Alfred 2/Alfred.alfredpreferences/workflows/user.workflow.8694C3FC-8218-4B98-BB1F-F1CEC686477C
 	url = https://github.com/kejadlen/forecast.alfredworkflow.git
+[submodule "vim/.vim/bundle/nerdcommenter"]
+	path = vim/.vim/bundle/nerdcommenter
+	url = https://github.com/scrooloose/nerdcommenter.git
diff --git a/vim/.vim/bundle/nerdcommenter b/vim/.vim/bundle/nerdcommenter
new file mode 160000
index 00000000..6549cfde
--- /dev/null
+++ b/vim/.vim/bundle/nerdcommenter
@@ -0,0 +1 @@
+Subproject commit 6549cfde45339bd4f711504196ff3e8b766ef5e6
diff --git a/vim/.vim/bundle/vim-commentary b/vim/.vim/bundle/vim-commentary
deleted file mode 160000
index 9c685131..00000000
--- a/vim/.vim/bundle/vim-commentary
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9c685131a5facfa0d643feca3a61b41c007d8170