diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index cb65c90..68fbaf1 100644
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -43,7 +43,7 @@ au Filetype html,xml,xsl source ~/.vim/closetag.vim
 
 au BufRead,BufNewFile *.go set filetype=go
 
-au FileType cpp let b:delimitMate_matchpairs = "(:),[:],{:},<:>"
+au FileType cpp let b:delimitMate_matchpairs = "(:),[:],{:}"
 
 "Settings per filetype
 augroup python
diff --git a/.vim/snippets/c.snippets b/.vim/usnips/c.snippets
similarity index 100%
rename from .vim/snippets/c.snippets
rename to .vim/usnips/c.snippets
diff --git a/.vim/snippets/cpp.snippets b/.vim/usnips/cpp.snippets
similarity index 100%
rename from .vim/snippets/cpp.snippets
rename to .vim/usnips/cpp.snippets
diff --git a/.vimrc b/.vimrc
index a632831..a2e1fb4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -182,7 +182,7 @@ let g:ycm_key_invoke_completion = "<Leader><Tab>"
 "let g:ycm_autoclose_preview_window_after_completion = 1
 
 " * UltiSnips
-let g:UltiSnipsSnippetDirectories=["UltiSnips", "snippets"]
+let g:UltiSnipsSnippetDirectories=["UltiSnips", "usnips"]
 let g:UltiSnipsExpandTrigger="<Leader>,"
 let g:UltiSnipsJumpForwardTrigger="<Leader>,"
 let g:UltiSnipsJumpBackwardTrigger="<Leader><s-,>"
diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
index 33ac6f6..06a49f3 100644
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@@ -14,7 +14,6 @@ flags = [
 '-Wno-variadic-macros',
 '-fexceptions',
 '-DNDEBUG',
-'-DUSE_CLANG_COMPLETER',
 # THIS IS IMPORTANT! Without a "-std=<something>" flag, clang won't know which
 # language to use when compiling headers. So it will guess. Badly. So C++
 # headers will be compiled as C headers. You don't want that so ALWAYS specify