diff --git a/.vim/autoload/plug.vim b/.vim/autoload/plug.vim
index 52c6b2a..4e05630 100644
--- a/.vim/autoload/plug.vim
+++ b/.vim/autoload/plug.vim
@@ -193,6 +193,14 @@ function! s:ask_no_interrupt(...)
   endtry
 endfunction
 
+function! s:lazy(plug, opt)
+  return has_key(a:plug, a:opt) &&
+        \ (empty(s:to_a(a:plug[a:opt]))         ||
+        \  !isdirectory(a:plug.dir)             ||
+        \  len(s:glob(s:rtp(a:plug), 'plugin')) ||
+        \  len(s:glob(s:rtp(a:plug), 'after/plugin')))
+endfunction
+
 function! plug#end()
   if !exists('g:plugs')
     return s:err('Call plug#begin() first')
@@ -214,7 +222,7 @@ function! plug#end()
       continue
     endif
     let plug = g:plugs[name]
-    if get(s:loaded, name, 0) || !has_key(plug, 'on') && !has_key(plug, 'for')
+    if get(s:loaded, name, 0) || !s:lazy(plug, 'on') && !s:lazy(plug, 'for')
       let s:loaded[name] = 1
       continue
     endif
@@ -763,6 +771,9 @@ function! s:prepare(...)
     execute 'silent! unmap <buffer>' k
   endfor
   setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
+  if exists('+colorcolumn')
+    setlocal colorcolumn=
+  endif
   setf vim-plug
   if exists('g:syntax_on')
     call s:syntax()
@@ -1008,6 +1019,8 @@ function! s:update_impl(pull, force, args) abort
     let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
   endif
 
+  let s:submodule_opt = s:git_version_requirement(2, 8) ? ' --jobs='.threads : ''
+
   " Python version requirement (>= 2.7)
   if python && !has('python3') && !ruby && !use_job && s:update.threads > 1
     redir => pyv
@@ -1099,7 +1112,7 @@ function! s:update_finish()
       if !v:shell_error && filereadable(spec.dir.'/.gitmodules') &&
             \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir))
         call s:log4(name, 'Updating submodules. This may take a while.')
-        let out .= s:bang('git submodule update --init --recursive 2>&1', spec.dir)
+        let out .= s:bang('git submodule update --init --recursive'.s:submodule_opt.' 2>&1', spec.dir)
       endif
       let msg = s:format_message(v:shell_error ? 'x': '-', name, out)
       if v:shell_error
@@ -1318,7 +1331,7 @@ while 1 " Without TCO, Vim stack is bound to explode
 
   let name = keys(s:update.todo)[0]
   let spec = remove(s:update.todo, name)
-  let new  = !isdirectory(spec.dir)
+  let new  = empty(globpath(spec.dir, '.git', 1))
 
   call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
   redraw
@@ -2407,7 +2420,11 @@ function! s:diff()
     call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:')
     for [k, v] in plugs
       let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..'
-      let diff = s:system_chomp('git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')), v.dir)
+      let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)'))
+      if has_key(v, 'rtp')
+        let cmd .= ' -- '.s:shellesc(v.rtp)
+      endif
+      let diff = s:system_chomp(cmd, v.dir)
       if !empty(diff)
         let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : ''
         call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)')))
diff --git a/.vimrc b/.vimrc
index 34cc381..85a0d10 100644
--- a/.vimrc
+++ b/.vimrc
@@ -78,6 +78,7 @@ set runtimepath+=/home/barak/.vim/bundle/repos/github.com/Shougo/dein.vim
 call plug#begin('/home/barak/.vim/bundle')
 
 Plug '/home/barak/.vim/bundle/repos/github.com/Shougo/dein.vim'
+Plug 'lambdalisue/suda.vim'
 Plug 'vim-scripts/DrawIt'
 Plug 'tpope/vim-speeddating'
 Plug 'vim-scripts/EasyGrep'
@@ -98,7 +99,7 @@ Plug 'tpope/vim-unimpaired'
 "Plug 'Valloric/YouCompleteMe'
 Plug 'Shougo/deoplete.nvim'
 Plug 'zchee/deoplete-clang'
-Plug 'zchee/deoplete-go', {'build': {'unix': 'make'}}
+Plug 'zchee/deoplete-go', {'do': 'make'}
 Plug 'zchee/deoplete-jedi'
 Plug 'b4winckler/vim-angry'
 Plug 'tristen/vim-sparkup'
@@ -419,7 +420,8 @@ command LoadSession :source ~/.vim_last_session
 command ScratchOpen :e scp://barak@barakmich.com//home/barak/notes/scratch
 
 " Sudo-make-me-a-sandwich write. For when I forget to be root.
-command Wdammit :w !sudo tee > /dev/null %
+" command Wdammit :w !sudo tee > /dev/null %
+command Wdammit :w suda://%
 
 " I can never remember markdown fully. Open me a cheatsheet
 command MarkdownCheatsheet :rightb vsplit ~/.vim/markdown_cheatsheet.md
diff --git a/bin/contract b/bin/contract
index 4c1f2d4..f7bbeeb 100755
--- a/bin/contract
+++ b/bin/contract
@@ -1,11 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 import sys
 
 loadfile = sys.stdin
 
 if len(sys.argv) == 1:
-	print "No command to run"
+	print("No command to run")
 	sys.exit(1)
 
 if len(sys.argv) == 3:
@@ -26,7 +26,7 @@ def div(x,y):
 
 lis = []
 for line in loadfile:
-	if line.strip() <> "":
+	if line.strip() is not "":
 		x = float(line)
 		lis.append(x)