plugin/autocmds.vim

@@ -11,5 +11,5 @@ augroup benieAugroup
   au BufRead,BufNewFile .out set filetype=zsh
 
   " Highlight conflict markers in any filefile
-  au FileType * :call matchadd('Todo', '^\(<<<<<<<\||||||||\|=======\|>>>>>>>\)\s\ze.*$')
+  au FileType * :call matchadd('Todo', '^\(<<<<<<<\||||||||\|=======\|>>>>>>>\)\ze.*$')
 augroup END

vimrc

@@ -53,7 +53,7 @@ if has('python')
   Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
 endif
 " vim-cmake-completion - completion & help
-Plug 'kbenzie/vim-cmake-completion', {'for': ['cmake']}
+Plug 'richq/vim-cmake-completion', {'for': ['cmake']}
 " vimomni - Completion for vimscript
 Plug 'vim-scripts/vimomni', {'for': ['vim']}
 
@@ -112,7 +112,6 @@ Plug 'tpope/vim-eunuch'
 " vim-vinegar - improved directory browser
 Plug 'tpope/vim-vinegar'
 " vim-abolish - CamelCase to under_score to mixedCase
-" TODO: Copy the good bit remove this plugin
 Plug 'tpope/vim-abolish'
 " vim-unimpaired - for pairs of tasks
 Plug 'tpope/vim-unimpaired'
@@ -122,8 +121,6 @@ Plug 'tpope/vim-speeddating'
 Plug 'godbyk/vim-endwise', {'branch': 'patch-1'}
 " vim-jdaddy - text object & formatting for json
 Plug 'tpope/vim-jdaddy'
-" vim-projectionist - granular project configuration
-Plug 'tpope/vim-projectionist'
 
 " fzf.vim - Fuzzy finder
 if !platform#is_windows()