6 files changed, 22 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index dc40196..4e09bd2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -41,9 +41,6 @@
 [submodule "nginx-vim-syntax"]
     path = files/.vim/bundle/nginx-vim-syntax
     url = https://github.com/evanmiller/nginx-vim-syntax.git
-[submodule "vim-sparkup"]
-    path = files/.vim/bundle/vim-sparkup
-    url = https://github.com/tristen/vim-sparkup
 [submodule "snipmate.vim"]
     path = files/.vim/bundle/snipmate.vim
     url = https://github.com/msanders/snipmate.vim
@@ -105,3 +102,12 @@
 [submodule "vim/vim-addon-local-vimrc"]
 	path = files/.vim/bundle/vim-addon-local-vimrc
 	url = https://github.com/MarcWeber/vim-addon-local-vimrc
+[submodule "vim/delimitmate"]
+	path = files/.vim/bundle/delimitmate
+	url = https://github.com/raimondi/delimitmate
+[submodule "vim/vim-orgmode"]
+	path = files/.vim/bundle/vim-orgmode
+	url = https://github.com/jceb/vim-orgmode
+[submodule "vim/vim-speeddating"]
+	path = files/.vim/bundle/vim-speeddating
+	url = https://github.com/tpope/vim-speeddating
diff --git a/files/.vim/bundle/delimitmate b/files/.vim/bundle/delimitmate
new file mode 160000
+Subproject b5719054beebe0135c94f4711a06dc7588041f0
diff --git a/files/.vim/bundle/vim-orgmode b/files/.vim/bundle/vim-orgmode
new file mode 160000
+Subproject e76c0f07e9193e08df2b8eeb95ef6240b494797
diff --git a/files/.vim/bundle/vim-sparkup b/files/.vim/bundle/vim-sparkup
deleted file mode 160000
-Subproject 29ba469fb073f4478017094e7df51eadf5d57a6
diff --git a/files/.vim/bundle/vim-speeddating b/files/.vim/bundle/vim-speeddating
new file mode 160000
+Subproject 426c792e479f6e1650a6996c683943a09344c21
diff --git a/files/.vimrc b/files/.vimrc
index 7947aa9..fda2d1d 100644
--- a/files/.vimrc
+++ b/files/.vimrc
@@ -334,6 +334,12 @@ augroup ft_ledger
     au FileType ledger inoremap <silent><buffer> <Leader>e <Esc>:call ledger#entry()<CR>
 augroup END
 " }}}
+" Org {{{
+augroup ft_org
+    au!
+    au FileType org setlocal spell nolist
+augroup END
+" }}}
 " }}}
 " Plugins {{{
 " Surround {{{
@@ -379,6 +385,7 @@ let NERDTreeMinimalUI = 1
 let NERDTreeDirArrows = 1
 let NERDChristmasTree = 1
 let NERDTreeChDirMode = 2
+let NERDTreeAutoDeleteBuffer=1
 
 let NERDTreeIgnore = [ '\.pyc$' ]
 
@@ -418,6 +425,12 @@ nnoremap <silent> <Leader>T :call TabularizeUnderCursos()<cr>
 let g:user_emmet_expandabbr_key = '<C-e>'
 
 " }}}
+" delimitMate {{{
+
+let delimitMate_expand_cr = 1
+au FileType html,xml let b:delimitMate_matchpairs="(:),[:],{:}"
+
+" }}}
 " }}}
 " Load custom local config {{{