Merge branch 'master' of tardis:/dotfiles

diff --combined vim/vimrc
index 9d182552d614d6476fe9db1dc047b81859bb9c54,40e3190e4c0d048818771933310e5db075a7ed01..23e9b8af20b489dab52a56fb59e7d43f5526ab91
--- 1/vim/vimrc
--- 2/vim/vimrc
+++ b/vim/vimrc
@@@ -46,7 -46,6 +46,7 @@@ Plugin 'Raimondi/delimitMate
  Plugin 'SirVer/ultisnips'
  Plugin 'Lokaltog/vim-easymotion'
  Plugin 'junegunn/vim-easy-align'
 +Plugin 'chrisbra/checkattach'
  
  " remove entries first
  set runtimepath -=$HOME/.vim
@@@ -394,9 -393,6 +394,9 @@@ let g:airline_detect_whitespace=
  let g:airline#extensions#tabline#enabled = 1
  let g:airline_powerline_fonts = 1
  
 +" checkattach {{{2
 +let g:checkattach_filebrowser = 'ranger'
 +
  " Gundo {{{2
  nnoremap <F7> :GundoToggle<CR>
  
@@@ -442,7 -438,11 +442,11 @@@ let g:tagbar_iconchars = ['+', '-'
  
  " UltiSnips {{{2
  let g:UltiSnipsEditSplit = 'vertical'
- let g:UltiSnipsSnippetsDir = "$XDG_CONFIG_HOME/vim/ultisnips"
+ let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")
+ let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
+ let g:UltiSnipsExpandTrigger = "<C-L>"
+ let g:UltiSnipsJumpForwardTrigger = "<C-L>"
+ let g:UltiSnipsJumpBackwardTrigger = "<C-H>"
  
  " youcompleteme {{{2
  let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']