diff --git a/.vim/after/plugin/UltiSnips_after.vim b/.vim/after/plugin/UltiSnips_after.vim
new file mode 120000
index 0000000..5771b77
--- /dev/null
+++ b/.vim/after/plugin/UltiSnips_after.vim
@@ -0,0 +1 @@
+../../bundle/ultisnips/after/plugin/UltiSnips_after.vim
\ No newline at end of file
diff --git a/.vim/after/plugin/snipMate.vim b/.vim/after/plugin/snipMate.vim
deleted file mode 100644
index 03e79ae..0000000
--- a/.vim/after/plugin/snipMate.vim
+++ /dev/null
@@ -1,35 +0,0 @@
-" These are the mappings for snipMate.vim. Putting it here ensures that it
-" will be mapped after other plugins such as supertab.vim.
-if !exists('loaded_snips') || exists('s:did_snips_mappings')
-	finish
-endif
-let s:did_snips_mappings = 1
-
-ino <silent> <tab> <c-r>=TriggerSnippet()<cr>
-snor <silent> <tab> <esc>i<right><c-r>=TriggerSnippet()<cr>
-ino <silent> <s-tab> <c-r>=BackwardsSnippet()<cr>
-snor <silent> <s-tab> <esc>i<right><c-r>=BackwardsSnippet()<cr>
-ino <silent> <c-r><tab> <c-r>=ShowAvailableSnips()<cr>
-
-" The default mappings for these are annoying & sometimes break snipMate.
-" You can change them back if you want, I've put them here for convenience.
-snor <bs> b<bs>
-snor <right> <esc>a
-snor <left> <esc>bi
-snor ' b<bs>'
-snor ` b<bs>`
-snor % b<bs>%
-snor U b<bs>U
-snor ^ b<bs>^
-snor \ b<bs>\
-snor <c-x> b<bs><c-x>
-
-" By default load snippets in snippets_dir
-if empty(snippets_dir)
-	finish
-endif
-
-call GetSnippets(snippets_dir, '_') " Get global snippets
-
-au FileType * if &ft != 'help' | call GetSnippets(snippets_dir, &ft) | endif
-" vim:noet:sw=4:ts=4:ft=vim
diff --git a/.vim/ftdetect/UltiSnips.vim b/.vim/ftdetect/UltiSnips.vim
new file mode 120000
index 0000000..36d1c2c
--- /dev/null
+++ b/.vim/ftdetect/UltiSnips.vim
@@ -0,0 +1 @@
+../bundle/ultisnips/ftdetect/UltiSnips.vim
\ No newline at end of file
diff --git a/.vim/ftdetect/snippets.vim b/.vim/ftdetect/snippets.vim
new file mode 120000
index 0000000..1de3804
--- /dev/null
+++ b/.vim/ftdetect/snippets.vim
@@ -0,0 +1 @@
+../bundle/ultisnips/ftdetect/snippets.vim
\ No newline at end of file
diff --git a/.vimrc b/.vimrc
index 6d1c04e..ddec22b 100644
--- a/.vimrc
+++ b/.vimrc
@@ -110,6 +110,7 @@ Plugin 'eagletmt/neco-ghc'
 Plugin 'eagletmt/ghcmod-vim'
 Plugin 'Shougo/vimproc.vim'
 Plugin 'SirVer/ultisnips'
+Bundle 'honza/vim-snippets'
 Plugin 'JuliaLang/julia-vim'
 Plugin 'tpope/vim-surround'
 "https://git.wincent.com/command-t.git
@@ -215,6 +216,7 @@ let g:ConqueTerm_SendVisKey = '<Leader>ss'
 let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
 let g:ycm_confirm_extra_conf = 0
 let g:ycm_key_invoke_completion = "<Leader><Tab>"
+let g:ycm_use_ultisnips_completer = 1
 "let g:ycm_add_preview_to_completeopt = 1
 "let g:ycm_autoclose_preview_window_after_completion = 1