diff --git a/.vim/bundle/NrrwRgn b/.vim/bundle/NrrwRgn
index 161d734..0fb0fe9 160000
--- a/.vim/bundle/NrrwRgn
+++ b/.vim/bundle/NrrwRgn
@@ -1 +1 @@
-Subproject commit 161d73499845fd0d9b24d76ecbcb00d7d00d6120
+Subproject commit 0fb0fe948cedda7cbea330303c5a28e7375d268c
diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe
index 47a0048..9d3258d 160000
--- a/.vim/bundle/YouCompleteMe
+++ b/.vim/bundle/YouCompleteMe
@@ -1 +1 @@
-Subproject commit 47a0048f346ba686e6c6b12eacec100b33e8feaa
+Subproject commit 9d3258df19b9d940576eda42899dbdbf9084f04a
diff --git a/.vim/bundle/ack.vim b/.vim/bundle/ack.vim
index f183a34..0292109 160000
--- a/.vim/bundle/ack.vim
+++ b/.vim/bundle/ack.vim
@@ -1 +1 @@
-Subproject commit f183a345a0c10caed7684d07dabae33e007c7590
+Subproject commit 0292109f1f87497c7cf9b0994db47c8e95bd252c
diff --git a/.vim/bundle/delimitMate b/.vim/bundle/delimitMate
index 35280c1..38487bb 160000
--- a/.vim/bundle/delimitMate
+++ b/.vim/bundle/delimitMate
@@ -1 +1 @@
-Subproject commit 35280c1444bf62d651f56ccaf03ad8db29c02383
+Subproject commit 38487bbec8ba50834e257940b357de03991fa8f9
diff --git a/.vim/bundle/ghcmod-vim b/.vim/bundle/ghcmod-vim
index 788b193..6a88e49 160000
--- a/.vim/bundle/ghcmod-vim
+++ b/.vim/bundle/ghcmod-vim
@@ -1 +1 @@
-Subproject commit 788b193dbeb1bebe303b0d0c6b17c09fdd1ebabb
+Subproject commit 6a88e49d5766edf32592c9c4b24921ba42f619c8
diff --git a/.vim/bundle/neco-ghc b/.vim/bundle/neco-ghc
index 41c7160..00985af 160000
--- a/.vim/bundle/neco-ghc
+++ b/.vim/bundle/neco-ghc
@@ -1 +1 @@
-Subproject commit 41c7160ee129209b758c5a9f0fc196ffeeb866f9
+Subproject commit 00985af541d8880a6a54d39dc5778ec7e00c053e
diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic
index 47f0541..f6d584b 160000
--- a/.vim/bundle/syntastic
+++ b/.vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 47f054112b91431f4af391e133f2fcc5f639309c
+Subproject commit f6d584bc639c2b799d5d7897d1e681b4e57cd476
diff --git a/.vim/bundle/tagbar b/.vim/bundle/tagbar
index ace45ad..b2c5f0b 160000
--- a/.vim/bundle/tagbar
+++ b/.vim/bundle/tagbar
@@ -1 +1 @@
-Subproject commit ace45adc51d0e08d45761bb515a9ff23906cba65
+Subproject commit b2c5f0b9284f85e92d98efc97c780ad01ba81e0c
diff --git a/.vim/bundle/ultisnips b/.vim/bundle/ultisnips
index ae611cc..4b4ee48 160000
--- a/.vim/bundle/ultisnips
+++ b/.vim/bundle/ultisnips
@@ -1 +1 @@
-Subproject commit ae611ccf950a93f93cab64542cbe48029f1e9c02
+Subproject commit 4b4ee488580f7586e82a76bb392e4f79027ce049
diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline
index b7c88b4..5a2daf6 160000
--- a/.vim/bundle/vim-airline
+++ b/.vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit b7c88b40aa40936245c2bfc3f8c1dbdc9393ddc0
+Subproject commit 5a2daf6dfbd6e0df21612a20f95b4285ae8a2603
diff --git a/.vim/bundle/vim-angry b/.vim/bundle/vim-angry
index 8705ee2..08e9e9a 160000
--- a/.vim/bundle/vim-angry
+++ b/.vim/bundle/vim-angry
@@ -1 +1 @@
-Subproject commit 8705ee2c4e619016a5abba2fb3c8886a6eb93426
+Subproject commit 08e9e9a50e6683ac7b0c1d6fddfb5f1235c75700
diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive
index 546a6bf..d6f1760 160000
--- a/.vim/bundle/vim-fugitive
+++ b/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 546a6bf2197529ed1bd402244cbf6e72ed62b2ca
+Subproject commit d6f17608ddbae06ed5867f58e322a16806fa7248
diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter
index 13a11f8..0ca3f7e 160000
--- a/.vim/bundle/vim-gitgutter
+++ b/.vim/bundle/vim-gitgutter
@@ -1 +1 @@
-Subproject commit 13a11f89354ca63b88a64b3bf452f2b9d6dbc716
+Subproject commit 0ca3f7e3cdbd3edf69d685ed463a6746fb0e8134
diff --git a/.vim/bundle/vim-gocode b/.vim/bundle/vim-gocode
index 05b9cc1..5a12617 160000
--- a/.vim/bundle/vim-gocode
+++ b/.vim/bundle/vim-gocode
@@ -1 +1 @@
-Subproject commit 05b9cc1b9e7497eef0add18d5adb034ecfeebec8
+Subproject commit 5a12617f085a32deec5eed80598e2165dc918615
diff --git a/.vim/bundle/vim-sparkup b/.vim/bundle/vim-sparkup
index 8078aff..0377b10 160000
--- a/.vim/bundle/vim-sparkup
+++ b/.vim/bundle/vim-sparkup
@@ -1 +1 @@
-Subproject commit 8078affa985f12b6fd35a715ced779c3fccaa0df
+Subproject commit 0377b100382c19295b42018289fe8d42a7d57e80
diff --git a/.vim/bundle/vim-unimpaired b/.vim/bundle/vim-unimpaired
index 2ad0376..f4a9143 160000
--- a/.vim/bundle/vim-unimpaired
+++ b/.vim/bundle/vim-unimpaired
@@ -1 +1 @@
-Subproject commit 2ad03764b67093179932f8c7105b7fddee02dcdb
+Subproject commit f4a914308ab32b118441418fdc64ac41fa7dc53c
diff --git a/.vim/bundle/vimproc b/.vim/bundle/vimproc
index 11bd685..92b34f1 160000
--- a/.vim/bundle/vimproc
+++ b/.vim/bundle/vimproc
@@ -1 +1 @@
-Subproject commit 11bd6853b25f73f3729cccbb9282fecade2bf50a
+Subproject commit 92b34f1ed9d2f2900f6a2db964526d6f94fa3d86
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