Merge branch 'master' of github.com:maxf130/dotfiles

diff --combined vimrc
index 1e0b768f5e47bcb79019694c6f8f32cf008323e9,eff9b4905ef9c901908982afbf0cd5735b2a483b..b8cb7199daeed99827c56ae89f536acafe2f5cfc
--- 1/vimrc
--- 2/vimrc
+++ b/vimrc
@@@ -15,11 -15,11 +15,11 @@@ Plugin 'zanloy/vim-colors-sunburst
  Plugin 'Lokaltog/vim-distinguished'
  Plugin 'pangloss/vim-javascript'
  Plugin 'Yggdroot/indentLine'
- Plugin 'git@github.com:Raimondi/delimitMate.git'
+ Plugin 'Raimondi/delimitMate'
  Plugin 'scrooloose/syntastic'
  Plugin 'Valloric/YouCompleteMe'
  Plugin 'ternjs/tern_for_vim'
- Plugin 'git@github.com:docunext/closetag.vim.git'
+ Plugin 'docunext/closetag.vim'
  Plugin 'bling/vim-airline'
  Plugin 'airblade/vim-gitgutter'
  Plugin 'tpope/vim-fugitive'
@@@ -77,6 -77,7 +77,6 @@@ let delimitMate_autoclose = 
  
  " latex-box
  let g:LatexBox_quickfix = 4
 -let g:LatexBox_viewer = "apvlv"
  
  " clang fix
  let g:clang_user_options='|| exit0'