diff --git a/.gitmodules b/.gitmodules
index 0ef43538..0e6d2d8c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -208,3 +208,6 @@
 [submodule "vim/bundle/kien-ctrlp"]
 	path = vim/bundle/kien-ctrlp
 	url = https://github.com/kien/ctrlp.vim
+[submodule "vim/bundle/majutsushi-tagbar"]
+	path = vim/bundle/majutsushi-tagbar
+	url = https://github.com/majutsushi/tagbar.git
diff --git a/README.md b/README.md
index 105b1b56..478d759d 100644
--- a/README.md
+++ b/README.md
@@ -276,7 +276,7 @@ Included vim plugins
  * ShowMarks - creates a visual gutter to the left of the number column showing you your marks 
  * EasyMotion - hit ,,w (forward) or ,,b (back) and watch the magic happen. just type the letters and jump directly to your target - in the provided vimrc the keys are optimized for home and upper row, no pinkies
  * LustyJuggler/Explorer - hit B, type buf name to match a buffer, or type S and use the home row keys to select a buffer
- * TagList - hit ,T to see a list of methods in a class (uses ctags)
+ * TagBar - hit ,T to see a list of methods in a class (uses ctags)
  * CtrlP - Ctrl-p or ,t to find a file
  * VimBookmarks - toggle an anonymous bookmark ,bb and go thru them ,bn ,bp and clear them ,bc
  * TabMan - hit ,mt to see all tabs and buffers in a tree. Easy to navigate and close.
diff --git a/vim/bundle/majutsushi-tagbar b/vim/bundle/majutsushi-tagbar
new file mode 160000
index 00000000..52fe2b7c
--- /dev/null
+++ b/vim/bundle/majutsushi-tagbar
@@ -0,0 +1 @@
+Subproject commit 52fe2b7c3a6c74f1fc8cb311e0bcc6fe8c09fddb
diff --git a/vim/plugin/settings/skwp-keymap.vim b/vim/plugin/settings/skwp-keymap.vim
index fe1357f4..8e90bac7 100644
--- a/vim/plugin/settings/skwp-keymap.vim
+++ b/vim/plugin/settings/skwp-keymap.vim
@@ -134,9 +134,6 @@ nnoremap <silent> vv <C-w>v
 nnoremap <silent> ss <C-w>s
 
 
-"open the taglist (method browser) using ,t
-nnoremap <silent> ,T :TlistToggle<CR>
-
 " create <%= foo %> erb tags using Ctrl-k in edit mode
 imap <silent> <C-K> <%=   %><Esc>3hi
 
diff --git a/vim/plugin/settings/tagbar.vim b/vim/plugin/settings/tagbar.vim
new file mode 100644
index 00000000..dbde1d6d
--- /dev/null
+++ b/vim/plugin/settings/tagbar.vim
@@ -0,0 +1,3 @@
+"open the taglist (method browser) using ,t
+nnoremap <silent> ,T :TagbarToggle<CR>
+