diff --git a/.gitmodules b/.gitmodules
index f07df32..757d527 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -354,6 +354,7 @@
 	path = vim/bundle/jtratner-vim-flavored-markdown
 	url = https://github.com/jtratner/vim-flavored-markdown.git
   ignore = dirty
-[submodule "vim/bundle/vim-scripts-ShowMarks"]
-	path = vim/bundle/vim-scripts-ShowMarks
-	url = https://github.com/vim-scripts/ShowMarks
+[submodule "vim/bundle/xsunsmile-showmarks"]
+	path = vim/bundle/xsunsmile-showmarks
+	url = https://github.com/xsunsmile/showmarks.git
+  ignore = dirty
diff --git a/vim/bundle/AndrewRadev-splitjoin b/vim/bundle/AndrewRadev-splitjoin
index 0ae42e8..5f51e3c 160000
--- a/vim/bundle/AndrewRadev-splitjoin
+++ b/vim/bundle/AndrewRadev-splitjoin
@@ -1 +1 @@
-Subproject commit 0ae42e82bf8a0efd1240d078461203bab16a9a2b
+Subproject commit 5f51e3c61b702a86762dc60cc1449b77b53a554b
diff --git a/vim/bundle/Shougo-neocomplcache b/vim/bundle/Shougo-neocomplcache
index 8fd9d96..28848d8 160000
--- a/vim/bundle/Shougo-neocomplcache
+++ b/vim/bundle/Shougo-neocomplcache
@@ -1 +1 @@
-Subproject commit 8fd9d9697c98e680be05ee33c512d3b69ec007c7
+Subproject commit 28848d87630ee934f90d34167d70b85354d55ba5
diff --git a/vim/bundle/bbommarito-vim-slim b/vim/bundle/bbommarito-vim-slim
index 7bb64ea..68d9e12 160000
--- a/vim/bundle/bbommarito-vim-slim
+++ b/vim/bundle/bbommarito-vim-slim
@@ -1 +1 @@
-Subproject commit 7bb64ea0239352ccb2682b6ec76d9c8f5237d69d
+Subproject commit 68d9e121bf6c87ab3fc82c09a100621b8a85017e
diff --git a/vim/bundle/briancollins-vim-jst b/vim/bundle/briancollins-vim-jst
index 22b0b62..70e38e2 160000
--- a/vim/bundle/briancollins-vim-jst
+++ b/vim/bundle/briancollins-vim-jst
@@ -1 +1 @@
-Subproject commit 22b0b628db58a5d8d3ebf8195ef072ea2c0bf1bb
+Subproject commit 70e38e2b5070140d5c892a410c1edbd8f92c2503
diff --git a/vim/bundle/honza-snipmate-snippets b/vim/bundle/honza-snipmate-snippets
index b1c30e0..925c6da 160000
--- a/vim/bundle/honza-snipmate-snippets
+++ b/vim/bundle/honza-snipmate-snippets
@@ -1 +1 @@
-Subproject commit b1c30e017ef5c703e36ca7a79e102507a042b5a5
+Subproject commit 925c6daac73927a7dde76ba61592723f13723f99
diff --git a/vim/bundle/mattn-gist-vim b/vim/bundle/mattn-gist-vim
index b41d650..f94abc6 160000
--- a/vim/bundle/mattn-gist-vim
+++ b/vim/bundle/mattn-gist-vim
@@ -1 +1 @@
-Subproject commit b41d650e38828c908e5c86d32745c5068e694a03
+Subproject commit f94abc65592874bd2fc78730ce896cfd61cac543
diff --git a/vim/bundle/mattn-zencoding-vim b/vim/bundle/mattn-zencoding-vim
index 72e10f8..68f6e18 160000
--- a/vim/bundle/mattn-zencoding-vim
+++ b/vim/bundle/mattn-zencoding-vim
@@ -1 +1 @@
-Subproject commit 72e10f85fe4459e1d36f4a7d632f71a98ccb5e2e
+Subproject commit 68f6e1851affe575837c0ae08d7f63dd2503b748
diff --git a/vim/bundle/mileszs-ack b/vim/bundle/mileszs-ack
index 9895285..fd9632b 160000
--- a/vim/bundle/mileszs-ack
+++ b/vim/bundle/mileszs-ack
@@ -1 +1 @@
-Subproject commit 9895285042a2fd5691b2f6582aa979e4d1bdffea
+Subproject commit fd9632b40ac07b39adb270311cde2c460c9ba6da
diff --git a/vim/bundle/scrooloose-nerdtree b/vim/bundle/scrooloose-nerdtree
index bf79e22..3e44d4e 160000
--- a/vim/bundle/scrooloose-nerdtree
+++ b/vim/bundle/scrooloose-nerdtree
@@ -1 +1 @@
-Subproject commit bf79e223aefe0665bcc62b5dcc4c2c23c6f23fc5
+Subproject commit 3e44d4ea5c3d8cfa192e66c77afd05629ddc92e6
diff --git a/vim/bundle/scrooloose-syntastic b/vim/bundle/scrooloose-syntastic
index 2e7d733..aa07bd7 160000
--- a/vim/bundle/scrooloose-syntastic
+++ b/vim/bundle/scrooloose-syntastic
@@ -1 +1 @@
-Subproject commit 2e7d73305b70a456abb20b1754e094cccfefa3d3
+Subproject commit aa07bd7122d64fccf1d8de30b94ab4cc900542bf
diff --git a/vim/bundle/tpope-vim-bundler b/vim/bundle/tpope-vim-bundler
index 7e65144..90d4e7c 160000
--- a/vim/bundle/tpope-vim-bundler
+++ b/vim/bundle/tpope-vim-bundler
@@ -1 +1 @@
-Subproject commit 7e651445ea759678c9e53a8657fd40a24eecb9a1
+Subproject commit 90d4e7ce4879e2e37697b56e9d3cd8ec7d04230d
diff --git a/vim/bundle/tpope-vim-fugitive b/vim/bundle/tpope-vim-fugitive
index 31dead6..05763df 160000
--- a/vim/bundle/tpope-vim-fugitive
+++ b/vim/bundle/tpope-vim-fugitive
@@ -1 +1 @@
-Subproject commit 31dead6d8088dc7073d0e2645517ebc68d6de06b
+Subproject commit 05763df0ed8bfa8a6d4453d089e9d82530497ea1
diff --git a/vim/bundle/tpope-vim-unimpaired b/vim/bundle/tpope-vim-unimpaired
index e801372..9507b80 160000
--- a/vim/bundle/tpope-vim-unimpaired
+++ b/vim/bundle/tpope-vim-unimpaired
@@ -1 +1 @@
-Subproject commit e8013727a008a68664a789fe0d2b5c2ab2ecf657
+Subproject commit 9507b80198acd1dd5da10fb01f69fa735c163800
diff --git a/vim/bundle/vim-ruby-vim-ruby b/vim/bundle/vim-ruby-vim-ruby
index f3e4253..f27d520 160000
--- a/vim/bundle/vim-ruby-vim-ruby
+++ b/vim/bundle/vim-ruby-vim-ruby
@@ -1 +1 @@
-Subproject commit f3e4253faf5ff344fcdfc74c590f3b6816e7255b
+Subproject commit f27d520ca79bf41e54cad0893839acfa8a98b9d2
diff --git a/vim/bundle/vim-scripts-ShowMarks b/vim/bundle/vim-scripts-ShowMarks
deleted file mode 160000
index ef22709..0000000
--- a/vim/bundle/vim-scripts-ShowMarks
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ef22709d8ebba137819ab0e60db5463b480934cd
diff --git a/vim/bundle/xsunsmile-showmarks b/vim/bundle/xsunsmile-showmarks
new file mode 160000
index 0000000..6ad38a0
--- /dev/null
+++ b/vim/bundle/xsunsmile-showmarks
@@ -0,0 +1 @@
+Subproject commit 6ad38a0a746541f897404183187407c4e4e7a177
diff --git a/zsh/prezto b/zsh/prezto
index bb597ae..13b501a 160000
--- a/zsh/prezto
+++ b/zsh/prezto
@@ -1 +1 @@
-Subproject commit bb597ae22d69fc10fefdaebb31073a09c3e6830f
+Subproject commit 13b501adaff3ce4610f275ec9d414dc41e3a7981