diff --git a/README.md b/README.md
index 9d5c2ff..0439e2b 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Upgrading is easy.
 ```bash
 cd ~/.yadr
 git pull origin master
-rake install
+rake update
 ```
 
 # What's included, and how to customize?
@@ -455,10 +455,6 @@ YADR comes with a dead simple plugin manager that just uses git submodules, with
 
     yav -u https://github.com/airblade/vim-rooter
 
-You can update all the plugins easily:
-
-    yuv
-
 Delete a plugin (Coming Soon)
 
    ydv -p airblade-vim-rooter
diff --git a/Rakefile b/Rakefile
index 6824a3b..1d8590d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,12 +30,22 @@ task :install => [:submodules] do
   success_msg("installed")
 end
 
+task :update => [:install] do
+  #TODO: for now, we do the same as install. But it would be nice
+  #not to clobber zsh files
+end
+
 desc "Init and update submodules."
 task :submodules do
   puts "======================================================"
   puts "Downloading YADR submodules...please wait"
   puts "======================================================"
-  sh('git submodule update --init --recursive')
+
+  run %{
+    cd $HOME/.yadr
+    git submodule foreach 'git fetch origin; git checkout master; git reset --hard origin/master; git submodule update --recursive; git clean -dfx'
+    git clean -dfx
+  }
   puts
 end
 
@@ -45,7 +55,7 @@ task :default => 'install'
 private
 def run(cmd)
   puts
-  puts "[Installing] #{cmd}"
+  puts "[Running] #{cmd}"
   `#{cmd}` unless ENV['DEBUG']
 end
 
diff --git a/bin/yadr/yadr-update-plugins b/bin/yadr/yadr-update-plugins
new file mode 100755
index 0000000..d5a5b0e
--- /dev/null
+++ b/bin/yadr/yadr-update-plugins
@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require File.join(File.dirname(__FILE__), 'default_libs')
+
+GitStyleBinary.command do
+  version "yadr-update-plugins 1.0"
+  short_desc "Update all plugins to latest versions from github"
+
+  run do |command|
+    `cd $HOME/.yadr && rake submodules`
+  end
+
+end
diff --git a/bin/yadr/yadr-vim-update-plugins b/bin/yadr/yadr-vim-update-plugins
deleted file mode 100755
index dbaef08..0000000
--- a/bin/yadr/yadr-vim-update-plugins
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), 'default_libs')
-
-GitStyleBinary.command do
-  version "yadr-vim-update-plugins 1.0"
-  short_desc "Update all vim plugins to latest versions from github"
-
-  run do |command|
-    `cd "#{$yadr}" && git submodule foreach git pull origin master`
-  end
-
-end
diff --git a/vim/bundle/AndrewRadev-splitjoin b/vim/bundle/AndrewRadev-splitjoin
index 5f8301d..0ae42e8 160000
--- a/vim/bundle/AndrewRadev-splitjoin
+++ b/vim/bundle/AndrewRadev-splitjoin
@@ -1 +1 @@
-Subproject commit 5f8301dcc6e682331fcd182e511df5324135e3c6
+Subproject commit 0ae42e82bf8a0efd1240d078461203bab16a9a2b
diff --git a/vim/bundle/Shougo-neocomplcache b/vim/bundle/Shougo-neocomplcache
index 6963a45..8fd9d96 160000
--- a/vim/bundle/Shougo-neocomplcache
+++ b/vim/bundle/Shougo-neocomplcache
@@ -1 +1 @@
-Subproject commit 6963a45738fbeebb5ca308eafc5fb79dbbae1080
+Subproject commit 8fd9d9697c98e680be05ee33c512d3b69ec007c7
diff --git a/vim/bundle/groenewege-vim-less b/vim/bundle/groenewege-vim-less
index d605010..0223dcd 160000
--- a/vim/bundle/groenewege-vim-less
+++ b/vim/bundle/groenewege-vim-less
@@ -1 +1 @@
-Subproject commit d605010cab695dca64c5cd9bf8bbcc8db9864815
+Subproject commit 0223dcdf0f4d3cb2b811a10c3673c0832b337415
diff --git a/vim/bundle/honza-snipmate-snippets b/vim/bundle/honza-snipmate-snippets
index 7f96041..b1c30e0 160000
--- a/vim/bundle/honza-snipmate-snippets
+++ b/vim/bundle/honza-snipmate-snippets
@@ -1 +1 @@
-Subproject commit 7f96041b163c6924bffd7de2953f98e0944187f2
+Subproject commit b1c30e017ef5c703e36ca7a79e102507a042b5a5
diff --git a/vim/bundle/kchmck-vim-coffee-script b/vim/bundle/kchmck-vim-coffee-script
index d6dcb9b..089506e 160000
--- a/vim/bundle/kchmck-vim-coffee-script
+++ b/vim/bundle/kchmck-vim-coffee-script
@@ -1 +1 @@
-Subproject commit d6dcb9b0fb5beac9e84cfb84c1917b7e0df5850f
+Subproject commit 089506ed89da1849485fdfcca002a42111759fab
diff --git a/vim/bundle/kien-ctrlp b/vim/bundle/kien-ctrlp
index 3c61823..be5842a 160000
--- a/vim/bundle/kien-ctrlp
+++ b/vim/bundle/kien-ctrlp
@@ -1 +1 @@
-Subproject commit 3c6182371db8e8ede3789d21b52386569eda2208
+Subproject commit be5842a376f16c16c5dc4cc1879d7168a074f7de
diff --git a/vim/bundle/majutsushi-tagbar b/vim/bundle/majutsushi-tagbar
index 2fee767..568ef5f 160000
--- a/vim/bundle/majutsushi-tagbar
+++ b/vim/bundle/majutsushi-tagbar
@@ -1 +1 @@
-Subproject commit 2fee7677d5d46419570cd9760c58192dfba68113
+Subproject commit 568ef5fd25468a58723b50cf40a48c5dcb46c802
diff --git a/vim/bundle/scrooloose-nerdtree b/vim/bundle/scrooloose-nerdtree
index a1433c4..bf79e22 160000
--- a/vim/bundle/scrooloose-nerdtree
+++ b/vim/bundle/scrooloose-nerdtree
@@ -1 +1 @@
-Subproject commit a1433c485eb254838c1db52e087d5ec4d1e77cfd
+Subproject commit bf79e223aefe0665bcc62b5dcc4c2c23c6f23fc5
diff --git a/vim/bundle/scrooloose-syntastic b/vim/bundle/scrooloose-syntastic
index 930953a..2e7d733 160000
--- a/vim/bundle/scrooloose-syntastic
+++ b/vim/bundle/scrooloose-syntastic
@@ -1 +1 @@
-Subproject commit 930953a573939734fb9f65c7acc979f4351b3fa6
+Subproject commit 2e7d73305b70a456abb20b1754e094cccfefa3d3
diff --git a/vim/bundle/skwp-vim-powerline b/vim/bundle/skwp-vim-powerline
index 7571fd9..fa87701 160000
--- a/vim/bundle/skwp-vim-powerline
+++ b/vim/bundle/skwp-vim-powerline
@@ -1 +1 @@
-Subproject commit 7571fd9cae40e231039550604d1f567827714612
+Subproject commit fa8770161f9dafe40ae08d4a8485f2a2452ff200
diff --git a/vim/bundle/tomtom-tcomment_vim b/vim/bundle/tomtom-tcomment_vim
index 011474a..ef6b444 160000
--- a/vim/bundle/tomtom-tcomment_vim
+++ b/vim/bundle/tomtom-tcomment_vim
@@ -1 +1 @@
-Subproject commit 011474a458d9dbf020b52c844fbb8aef9518ed7a
+Subproject commit ef6b4443d7bf1f3194692272f54c50ee4c61e400
diff --git a/vim/bundle/tomtom-tlib_vim b/vim/bundle/tomtom-tlib_vim
index 6f2cfea..992c218 160000
--- a/vim/bundle/tomtom-tlib_vim
+++ b/vim/bundle/tomtom-tlib_vim
@@ -1 +1 @@
-Subproject commit 6f2cfeaa86e24bb3faa4b204f0a8ea6b3bdb5e1b
+Subproject commit 992c21804d003faffcaec0014a5f61e2ce76f57e
diff --git a/vim/bundle/tpope-vim-fugitive b/vim/bundle/tpope-vim-fugitive
index cff78c3..31dead6 160000
--- a/vim/bundle/tpope-vim-fugitive
+++ b/vim/bundle/tpope-vim-fugitive
@@ -1 +1 @@
-Subproject commit cff78c3ab4605d490e6be8d8af02f1e7efd25c95
+Subproject commit 31dead6d8088dc7073d0e2645517ebc68d6de06b
diff --git a/vim/bundle/tpope-vim-rails b/vim/bundle/tpope-vim-rails
index 2d65581..7d79b45 160000
--- a/vim/bundle/tpope-vim-rails
+++ b/vim/bundle/tpope-vim-rails
@@ -1 +1 @@
-Subproject commit 2d6558125cce7fcf1740d58870bda04eb66d3851
+Subproject commit 7d79b45e55d5e0c3f856269362e664258528e4cb
diff --git a/vim/bundle/vim-ruby-vim-ruby b/vim/bundle/vim-ruby-vim-ruby
index 4a90d71..f3e4253 160000
--- a/vim/bundle/vim-ruby-vim-ruby
+++ b/vim/bundle/vim-ruby-vim-ruby
@@ -1 +1 @@
-Subproject commit 4a90d71c6611e46d05eb110bea8edde983331929
+Subproject commit f3e4253faf5ff344fcdfc74c590f3b6816e7255b
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 377ef8f..84a5287 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -5,7 +5,8 @@ yadr=$HOME/.yadr
 
 # YADR support
 alias yav='yadr vim-add-plugin'
-alias yuv='yadr vim-update-plugins'
+alias yuv='yadr update-plugins' #FIXME: backwards compatibility. Kill me after Jan 1, 2013
+alias yup='yadr update-plugins'
 alias yip='yadr init-plugins'
 
 # PS
diff --git a/zsh/prezto b/zsh/prezto
index be0e424..bb597ae 160000
--- a/zsh/prezto
+++ b/zsh/prezto
@@ -1 +1 @@
-Subproject commit be0e4245a6b693a0e0fd5cfa2cad8add503442ef
+Subproject commit bb597ae22d69fc10fefdaebb31073a09c3e6830f