Add snippets and try to fix up diff some more

.vimrc

@@ -25,6 +25,8 @@ if has('nvim')
     Plug 'windwp/nvim-autopairs'
     Plug 'ms-jpq/chadtree', {'branch': 'chad', 'do': 'python3 -m chadtree deps'}
 endif
+Plug 'SirVer/ultisnips'
+Plug 'honza/vim-snippets'
 Plug 'adelarsq/vim-matchit'
 Plug 'alvan/vim-closetag'
 Plug 'andymass/vim-matchup'
@@ -49,12 +51,18 @@ if has('nvim')
 
 
     "" CHADTree config
-    if !&diff
+    if &diff
+    else
         autocmd VimEnter * CHADopen --nofocus
     endif
     nnoremap <leader>v <cmd>CHADopen<cr>
 endif
 
+"" Ultrasnips
+let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsJumpForwardTrigger="<c-b>"
+let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+
 "" Vim Closetag
 let g:closetag_filenames = '*.xml,*.xlf,*.html,*.xhtml,*.phtml'