diff --git a/.gitmodules b/.gitmodules
index 32d555c..373dc63 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -139,9 +139,6 @@
 [submodule "vim/bundle/kana-vim-textobj-user"]
 	path = vim/bundle/kana-vim-textobj-user
 	url = https://github.com/kana/vim-textobj-user
-[submodule "vim/bundle/spiiph-vim-space"]
-	path = vim/bundle/spiiph-vim-space
-	url = https://github.com/spiiph/vim-space
 [submodule "vim/bundle/austintaylor-vim-indentobject"]
 	path = vim/bundle/austintaylor-vim-indentobject
 	url = https://github.com/austintaylor/vim-indentobject
diff --git a/vim/bundle/spiiph-vim-space b/vim/bundle/spiiph-vim-space
deleted file mode 160000
index 9440e38..0000000
--- a/vim/bundle/spiiph-vim-space
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9440e388cc75754ab7c58441f3ef965a70a411db
diff --git a/vimrc b/vimrc
index 34baa53..33d7f23 100644
--- a/vimrc
+++ b/vimrc
@@ -102,7 +102,10 @@ if has("gui_running")
   set background=dark
 
   " Show tab number (useful for Cmd-1, Cmd-2.. mapping)
-  set guitablabel=%N:\ %t\ %M
+  " For some reason this doesn't work as a regular set command,
+  " (the numbers don't show up) so I made it a VimEnter event
+  autocmd VimEnter * set guitablabel=%N:\ %t\ %M
+
   set lines=60
   set columns=190