diff --git a/bundles-init/tagbar.cfg.vim b/bundles-init/tagbar.cfg.vim
deleted file mode 100644
index d7adfa1..0000000
--- a/bundles-init/tagbar.cfg.vim
+++ /dev/null
@@ -1,11 +0,0 @@
-" Extra syntax
-" Make
-let g:tagbar_type_make = {
-	\ 'kinds':[
-		\ 'm:macros',
-		\ 't:targets'
-	\ ]
-\ }
-
-nnoremap <silent> <Leader>t :Tagbar<CR>
-autocmd VimEnter * if argc() > 0 && &columns > 150 | execute "Tagbar" | endif
diff --git a/bundles-init/tagbar.load.vim b/bundles-init/tagbar.load.vim
deleted file mode 100644
index 06b7b49..0000000
--- a/bundles-init/tagbar.load.vim
+++ /dev/null
@@ -1 +0,0 @@
-NeoBundle 'majutsushi/tagbar'
diff --git a/bundles-init/undotree.cfg.vim b/bundles-init/undotree.cfg.vim
new file mode 100644
index 0000000..f7e1987
--- /dev/null
+++ b/bundles-init/undotree.cfg.vim
@@ -0,0 +1 @@
+nnoremap <Leader>u :UndotreeToggle<CR>
diff --git a/bundles-init/undotree.load.vim b/bundles-init/undotree.load.vim
new file mode 100644
index 0000000..a33462d
--- /dev/null
+++ b/bundles-init/undotree.load.vim
@@ -0,0 +1 @@
+NeoBundle 'mbbill/undotree'
diff --git a/bundles-init/vim-airline.load.vim b/bundles-init/vim-airline.load.vim
index dc3046c..6622f20 100644
--- a/bundles-init/vim-airline.load.vim
+++ b/bundles-init/vim-airline.load.vim
@@ -1,3 +1,3 @@
 NeoBundle 'bling/vim-airline' , {
-\		'depends' : [ 'ctrlpvim/ctrlp.vim' , 'majutsushi/tagbar' ]
+\		'depends' : [ 'ctrlpvim/ctrlp.vim' ]
 \	}
diff --git a/ftplugin/qf.vim b/ftplugin/qf.vim
index 943ee1e..934b994 100644
--- a/ftplugin/qf.vim
+++ b/ftplugin/qf.vim
@@ -4,4 +4,3 @@ setlocal cursorline
 setlocal nowrap
 setlocal tw=0
 setlocal nonumber
-wincmd J	" That's for when it spawns inside the tagbar