From 4604e397606d115aa188c620ba3fe81e459f5c2c Mon Sep 17 00:00:00 2001
From: Taybin Rutkin <taybin@taybin.com>
Date: Tue, 13 Mar 2012 23:05:29 -0400
Subject: [PATCH 1/2] remove older, unsupported snipmate and snippets

---
 .gitmodules                    | 8 --------
 vim/bundle/mikefarmer-snipmate | 1 -
 vim/snippets                   | 1 -
 3 files changed, 10 deletions(-)
 delete mode 160000 vim/bundle/mikefarmer-snipmate
 delete mode 160000 vim/snippets

diff --git a/.gitmodules b/.gitmodules
index 991ece9..58721f8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -126,14 +126,6 @@
   path = vim/bundle/tpope-vim-fugitive
   url = https://github.com/tpope/vim-fugitive
   ignore=dirty
-[submodule "vim/bundle/mikefarmer-snipmate"]
-  path = vim/bundle/mikefarmer-snipmate
-  url = https://github.com/mikefarmer/snipmate.vim.git
-  ignore=dirty
-[submodule "vim/snippets"]
-  path = vim/snippets
-  url = https://github.com/scrooloose/snipmate-snippets.git
-  ignore=dirty
 [submodule "vim/bundle/skwp-vim-git-grep-rails-partial"]
   path = vim/bundle/skwp-vim-git-grep-rails-partial
   url = https://github.com/skwp/vim-git-grep-rails-partial
diff --git a/vim/bundle/mikefarmer-snipmate b/vim/bundle/mikefarmer-snipmate
deleted file mode 160000
index a8f1bc5..0000000
--- a/vim/bundle/mikefarmer-snipmate
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a8f1bc55dad9a734837ca456dac8879e14b3a245
diff --git a/vim/snippets b/vim/snippets
deleted file mode 160000
index 15cb6bf..0000000
--- a/vim/snippets
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 15cb6bf4fad5b11f83d2ddb7186aadc0604329c1

From e67b7e9c1025127d92526445801634e7a49f256b Mon Sep 17 00:00:00 2001
From: Taybin Rutkin <taybin@taybin.com>
Date: Tue, 13 Mar 2012 23:12:17 -0400
Subject: [PATCH 2/2] add new snipmate plugin from garbas

- with snippets from honza (as recommended by garbas)
- with dependencies tlib and vim-addon-mw-utils
---
 .gitmodules                             | 12 ++++++++++++
 vim/bundle/MarcWeber-vim-addon-mw-utils |  1 +
 vim/bundle/garbas-vim-snipmate          |  1 +
 vim/bundle/honza-snipmate-snippets      |  1 +
 vim/bundle/tomtom-tlib_vim              |  1 +
 5 files changed, 16 insertions(+)
 create mode 160000 vim/bundle/MarcWeber-vim-addon-mw-utils
 create mode 160000 vim/bundle/garbas-vim-snipmate
 create mode 160000 vim/bundle/honza-snipmate-snippets
 create mode 160000 vim/bundle/tomtom-tlib_vim

diff --git a/.gitmodules b/.gitmodules
index 58721f8..bad046f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -276,3 +276,15 @@
 [submodule "vim/bundle/vim-scripts-camelcasemotion"]
 	path = vim/bundle/vim-scripts-camelcasemotion
 	url = https://github.com/vim-scripts/camelcasemotion.git
+[submodule "vim/bundle/garbas-vim-snipmate"]
+	path = vim/bundle/garbas-vim-snipmate
+	url = https://github.com/garbas/vim-snipmate.git
+[submodule "vim/bundle/MarcWeber-vim-addon-mw-utils"]
+	path = vim/bundle/MarcWeber-vim-addon-mw-utils
+	url = https://github.com/MarcWeber/vim-addon-mw-utils.git
+[submodule "vim/bundle/tomtom-tlib_vim"]
+	path = vim/bundle/tomtom-tlib_vim
+	url = https://github.com/tomtom/tlib_vim.git
+[submodule "vim/bundle/honza-snipmate-snippets"]
+	path = vim/bundle/honza-snipmate-snippets
+	url = https://github.com/honza/snipmate-snippets.git
diff --git a/vim/bundle/MarcWeber-vim-addon-mw-utils b/vim/bundle/MarcWeber-vim-addon-mw-utils
new file mode 160000
index 0000000..a2676b4
--- /dev/null
+++ b/vim/bundle/MarcWeber-vim-addon-mw-utils
@@ -0,0 +1 @@
+Subproject commit a2676b4225b8a370b9e7046c5fc2f5ad1155e590
diff --git a/vim/bundle/garbas-vim-snipmate b/vim/bundle/garbas-vim-snipmate
new file mode 160000
index 0000000..f1e8510
--- /dev/null
+++ b/vim/bundle/garbas-vim-snipmate
@@ -0,0 +1 @@
+Subproject commit f1e851048fefca4be5a4913596a9288f6ccdf6d8
diff --git a/vim/bundle/honza-snipmate-snippets b/vim/bundle/honza-snipmate-snippets
new file mode 160000
index 0000000..b347b12
--- /dev/null
+++ b/vim/bundle/honza-snipmate-snippets
@@ -0,0 +1 @@
+Subproject commit b347b12dcfd341d3f038d2486ba714c5ac437402
diff --git a/vim/bundle/tomtom-tlib_vim b/vim/bundle/tomtom-tlib_vim
new file mode 160000
index 0000000..4bfa2df
--- /dev/null
+++ b/vim/bundle/tomtom-tlib_vim
@@ -0,0 +1 @@
+Subproject commit 4bfa2df5cfe9a139d65ab9a3ca1609623e968b90