Changing to different plugin system

16 files changed, 2056 insertions, 2045 deletions

diff --git a/.gitignore b/.gitignore
index 59151af..85af49f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 *.swp
 *~
-bundle/*
-!bundle/Vundle.vim/
 .DS_Store
 .netrwhist
+plugged/*
+!plugged/.gitkeep
diff --git a/autoload/plug.vim b/autoload/plug.vim
new file mode 100644
index 0000000..6e14d0e
--- /dev/null
+++ b/autoload/plug.vim
@@ -0,0 +1,2019 @@
+" vim-plug: Vim plugin manager
+" ============================
+"
+" Download plug.vim and put it in ~/.vim/autoload
+"
+"   curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
+"     https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+"
+" Edit your .vimrc
+"
+"   call plug#begin('~/.vim/plugged')
+"
+"   " Make sure you use single quotes
+"   Plug 'junegunn/seoul256.vim'
+"   Plug 'junegunn/vim-easy-align'
+"
+"   " Group dependencies, vim-snippets depends on ultisnips
+"   Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
+"
+"   " On-demand loading
+"   Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
+"   Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
+"
+"   " Using git URL
+"   Plug 'https://github.com/junegunn/vim-github-dashboard.git'
+"
+"   " Plugin options
+"   Plug 'nsf/gocode', { 'tag': 'v.20150303', 'rtp': 'vim' }
+"
+"   " Plugin outside ~/.vim/plugged with post-update hook
+"   Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' }
+"
+"   " Unmanaged plugin (manually installed and updated)
+"   Plug '~/my-prototype-plugin'
+"
+"   " Add plugins to &runtimepath
+"   call plug#end()
+"
+" Then reload .vimrc and :PlugInstall to install plugins.
+" Visit https://github.com/junegunn/vim-plug for more information.
+"
+"
+" Copyright (c) 2015 Junegunn Choi
+"
+" MIT License
+"
+" Permission is hereby granted, free of charge, to any person obtaining
+" a copy of this software and associated documentation files (the
+" "Software"), to deal in the Software without restriction, including
+" without limitation the rights to use, copy, modify, merge, publish,
+" distribute, sublicense, and/or sell copies of the Software, and to
+" permit persons to whom the Software is furnished to do so, subject to
+" the following conditions:
+"
+" The above copyright notice and this permission notice shall be
+" included in all copies or substantial portions of the Software.
+"
+" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+if exists('g:loaded_plug')
+  finish
+endif
+let g:loaded_plug = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let s:plug_src = 'https://github.com/junegunn/vim-plug.git'
+let s:plug_tab = get(s:, 'plug_tab', -1)
+let s:plug_buf = get(s:, 'plug_buf', -1)
+let s:mac_gui = has('gui_macvim') && has('gui_running')
+let s:is_win = has('win32') || has('win64')
+let s:nvim = has('nvim') && exists('*jobwait') && !s:is_win
+let s:me = resolve(expand('<sfile>:p'))
+let s:base_spec = { 'branch': 'master', 'frozen': 0 }
+let s:TYPE = {
+\   'string':  type(''),
+\   'list':    type([]),
+\   'dict':    type({}),
+\   'funcref': type(function('call'))
+\ }
+let s:loaded = get(s:, 'loaded', {})
+let s:triggers = get(s:, 'triggers', {})
+
+function! plug#begin(...)
+  if a:0 > 0
+    let s:plug_home_org = a:1
+    let home = s:path(fnamemodify(expand(a:1), ':p'))
+  elseif exists('g:plug_home')
+    let home = s:path(g:plug_home)
+  elseif !empty(&rtp)
+    let home = s:path(split(&rtp, ',')[0]) . '/plugged'
+  else
+    return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.')
+  endif
+
+  let g:plug_home = home
+  let g:plugs = {}
+  let g:plugs_order = []
+  let s:triggers = {}
+
+  call s:define_commands()
+  return 1
+endfunction
+
+function! s:define_commands()
+  command! -nargs=+ -bar Plug call s:add(<args>)
+  if !executable('git')
+    return s:err('`git` executable not found. vim-plug requires git.')
+  endif
+  command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install('<bang>' == '!', [<f-args>])
+  command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate  call s:update('<bang>' == '!', [<f-args>])
+  command! -nargs=0 -bar -bang PlugClean call s:clean('<bang>' == '!')
+  command! -nargs=0 -bar PlugUpgrade if s:upgrade() | execute 'source' s:esc(s:me) | endif
+  command! -nargs=0 -bar PlugStatus  call s:status()
+  command! -nargs=0 -bar PlugDiff    call s:diff()
+  command! -nargs=? -bar PlugSnapshot call s:snapshot(<f-args>)
+endfunction
+
+function! s:to_a(v)
+  return type(a:v) == s:TYPE.list ? a:v : [a:v]
+endfunction
+
+function! s:to_s(v)
+  return type(a:v) == s:TYPE.string ? a:v : join(a:v, "\n") . "\n"
+endfunction
+
+function! s:source(from, ...)
+  for pattern in a:000
+    for vim in s:lines(globpath(a:from, pattern))
+      execute 'source' s:esc(vim)
+    endfor
+  endfor
+endfunction
+
+function! s:assoc(dict, key, val)
+  let a:dict[a:key] = add(get(a:dict, a:key, []), a:val)
+endfunction
+
+function! plug#end()
+  if !exists('g:plugs')
+    return s:err('Call plug#begin() first')
+  endif
+
+  if exists('#PlugLOD')
+    augroup PlugLOD
+      autocmd!
+    augroup END
+    augroup! PlugLOD
+  endif
+  let lod = { 'ft': {}, 'map': {}, 'cmd': {} }
+
+  filetype off
+  for name in g:plugs_order
+    let plug = g:plugs[name]
+    if get(s:loaded, name, 0) || !has_key(plug, 'on') && !has_key(plug, 'for')
+      let s:loaded[name] = 1
+      continue
+    endif
+
+    if has_key(plug, 'on')
+      let s:triggers[name] = { 'map': [], 'cmd': [] }
+      for cmd in s:to_a(plug.on)
+        if cmd =~? '^<Plug>.\+'
+          if empty(mapcheck(cmd)) && empty(mapcheck(cmd, 'i'))
+            call s:assoc(lod.map, cmd, name)
+          endif
+          call add(s:triggers[name].map, cmd)
+        elseif cmd =~ '^[A-Z]'
+          if exists(':'.cmd) != 2
+            call s:assoc(lod.cmd, cmd, name)
+          endif
+          call add(s:triggers[name].cmd, cmd)
+        endif
+      endfor
+    endif
+
+    if has_key(plug, 'for')
+      let types = s:to_a(plug.for)
+      if !empty(types)
+        call s:source(s:rtp(plug), 'ftdetect/**/*.vim', 'after/ftdetect/**/*.vim')
+      endif
+      for type in types
+        call s:assoc(lod.ft, type, name)
+      endfor
+    endif
+  endfor
+
+  for [cmd, names] in items(lod.cmd)
+    execute printf(
+    \ 'command! -nargs=* -range -bang %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)',
+    \ cmd, string(cmd), string(names))
+  endfor
+
+  for [map, names] in items(lod.map)
+    for [mode, map_prefix, key_prefix] in
+          \ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
+      execute printf(
+      \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, "%s")<CR>',
+      \ mode, map, map_prefix, string(map), string(names), key_prefix)
+    endfor
+  endfor
+
+  for [ft, names] in items(lod.ft)
+    augroup PlugLOD
+      execute printf('autocmd FileType %s call <SID>lod_ft(%s, %s)',
+            \ ft, string(ft), string(names))
+    augroup END
+  endfor
+
+  call s:reorg_rtp()
+  filetype plugin indent on
+  if has('vim_starting')
+    syntax enable
+  else
+    call s:reload()
+  endif
+endfunction
+
+function! s:loaded_names()
+  return filter(copy(g:plugs_order), 'get(s:loaded, v:val, 0)')
+endfunction
+
+function! s:reload()
+  for name in s:loaded_names()
+    call s:source(s:rtp(g:plugs[name]), 'plugin/**/*.vim', 'after/plugin/**/*.vim')
+  endfor
+endfunction
+
+function! s:trim(str)
+  return substitute(a:str, '[\/]\+$', '', '')
+endfunction
+
+function! s:version_requirement(val, min)
+  for idx in range(0, len(a:min) - 1)
+    let v = get(a:val, idx, 0)
+    if     v < a:min[idx] | return 0
+    elseif v > a:min[idx] | return 1
+    endif
+  endfor
+  return 1
+endfunction
+
+function! s:git_version_requirement(...)
+  let s:git_version = get(s:, 'git_version',
+    \ map(split(split(s:system('git --version'))[-1], '\.'), 'str2nr(v:val)'))
+  return s:version_requirement(s:git_version, a:000)
+endfunction
+
+function! s:progress_opt(base)
+  return a:base && !s:is_win &&
+        \ s:git_version_requirement(1, 7, 1) ? '--progress' : ''
+endfunction
+
+if s:is_win
+  function! s:rtp(spec)
+    return s:path(a:spec.dir . get(a:spec, 'rtp', ''))
+  endfunction
+
+  function! s:path(path)
+    return s:trim(substitute(a:path, '/', '\', 'g'))
+  endfunction
+
+  function! s:dirpath(path)
+    return s:path(a:path) . '\'
+  endfunction
+
+  function! s:is_local_plug(repo)
+    return a:repo =~? '^[a-z]:\|^[%~]'
+  endfunction
+else
+  function! s:rtp(spec)
+    return s:dirpath(a:spec.dir . get(a:spec, 'rtp', ''))
+  endfunction
+
+  function! s:path(path)
+    return s:trim(a:path)
+  endfunction
+
+  function! s:dirpath(path)
+    return substitute(a:path, '[/\\]*$', '/', '')
+  endfunction
+
+  function! s:is_local_plug(repo)
+    return a:repo[0] =~ '[/$~]'
+  endfunction
+endif
+
+function! s:err(msg)
+  echohl ErrorMsg
+  echom a:msg
+  echohl None
+  return 0
+endfunction
+
+function! s:esc(path)
+  return escape(a:path, ' ')
+endfunction
+
+function! s:escrtp(path)
+  return escape(a:path, ' ,')
+endfunction
+
+function! s:remove_rtp()
+  for name in s:loaded_names()
+    let rtp = s:rtp(g:plugs[name])
+    execute 'set rtp-='.s:escrtp(rtp)
+    let after = globpath(rtp, 'after')
+    if isdirectory(after)
+      execute 'set rtp-='.s:escrtp(after)
+    endif
+  endfor
+endfunction
+
+function! s:reorg_rtp()
+  if !empty(s:first_rtp)
+    execute 'set rtp-='.s:first_rtp
+    execute 'set rtp-='.s:last_rtp
+  endif
+
+  " &rtp is modified from outside
+  if exists('s:prtp') && s:prtp !=# &rtp
+    call s:remove_rtp()
+    unlet! s:middle
+  endif
+
+  let s:middle = get(s:, 'middle', &rtp)
+  let rtps     = map(s:loaded_names(), 's:rtp(g:plugs[v:val])')
+  let afters   = filter(map(copy(rtps), 'globpath(v:val, "after")'), 'isdirectory(v:val)')
+  let rtp      = join(map(rtps, 'escape(v:val, ",")'), ',')
+                 \ . ','.s:middle.','
+                 \ . join(map(afters, 'escape(v:val, ",")'), ',')
+  let &rtp     = substitute(substitute(rtp, ',,*', ',', 'g'), '^,\|,$', '', 'g')
+  let s:prtp   = &rtp
+
+  if !empty(s:first_rtp)
+    execute 'set rtp^='.s:first_rtp
+    execute 'set rtp+='.s:last_rtp
+  endif
+endfunction
+
+function! plug#load(...)
+  if a:0 == 0
+    return s:err('Argument missing: plugin name(s) required')
+  endif
+  if !exists('g:plugs')
+    return s:err('plug#begin was not called')
+  endif
+  let unknowns = filter(copy(a:000), '!has_key(g:plugs, v:val)')
+  if !empty(unknowns)
+    let s = len(unknowns) > 1 ? 's' : ''
+    return s:err(printf('Unknown plugin%s: %s', s, join(unknowns, ', ')))
+  end
+  for name in a:000
+    call s:lod([name], ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
+  endfor
+  if exists('#BufRead')
+    doautocmd BufRead
+  endif
+  return 1
+endfunction
+
+function! s:remove_triggers(name)
+  if !has_key(s:triggers, a:name)
+    return
+  endif
+  for cmd in s:triggers[a:name].cmd
+    execute 'silent! delc' cmd
+  endfor
+  for map in s:triggers[a:name].map
+    execute 'silent! unmap' map
+    execute 'silent! iunmap' map
+  endfor
+  call remove(s:triggers, a:name)
+endfunction
+
+function! s:lod(names, types)
+  for name in a:names
+    call s:remove_triggers(name)
+    let s:loaded[name] = 1
+  endfor
+  call s:reorg_rtp()
+
+  for name in a:names
+    let rtp = s:rtp(g:plugs[name])
+    for dir in a:types
+      call s:source(rtp, dir.'/**/*.vim')
+    endfor
+    if exists('#User#'.name)
+      execute 'doautocmd User' name
+    endif
+  endfor
+endfunction
+
+function! s:lod_ft(pat, names)
+  call s:lod(a:names, ['plugin', 'after/plugin'])
+  execute 'autocmd! PlugLOD FileType' a:pat
+  if exists('#filetypeplugin#FileType')
+    doautocmd filetypeplugin FileType
+  endif
+  if exists('#filetypeindent#FileType')
+    doautocmd filetypeindent FileType
+  endif
+endfunction
+
+function! s:lod_cmd(cmd, bang, l1, l2, args, names)
+  call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
+  execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args)
+endfunction
+
+function! s:lod_map(map, names, prefix)
+  call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
+  let extra = ''
+  while 1
+    let c = getchar(0)
+    if c == 0
+      break
+    endif
+    let extra .= nr2char(c)
+  endwhile
+  call feedkeys(a:prefix . substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
+endfunction
+
+function! s:add(repo, ...)
+  if a:0 > 1
+    return s:err('Invalid number of arguments (1..2)')
+  endif
+
+  try
+    let repo = s:trim(a:repo)
+    let name = fnamemodify(repo, ':t:s?\.git$??')
+    let spec = extend(s:infer_properties(name, repo),
+                    \ a:0 == 1 ? s:parse_options(a:1) : s:base_spec)
+    if !has_key(g:plugs, name)
+      call add(g:plugs_order, name)
+    endif
+    let g:plugs[name] = spec
+    let s:loaded[name] = get(s:loaded, name, 0)
+  catch
+    return s:err(v:exception)
+  endtry
+endfunction
+
+function! s:parse_options(arg)
+  let opts = copy(s:base_spec)
+  let type = type(a:arg)
+  if type == s:TYPE.string
+    let opts.tag = a:arg
+  elseif type == s:TYPE.dict
+    call extend(opts, a:arg)
+    if has_key(opts, 'dir')
+      let opts.dir = s:dirpath(expand(opts.dir))
+    endif
+  else
+    throw 'Invalid argument type (expected: string or dictionary)'
+  endif
+  return opts
+endfunction
+
+function! s:infer_properties(name, repo)
+  let repo = a:repo
+  if s:is_local_plug(repo)
+    return { 'dir': s:dirpath(expand(repo)) }
+  else
+    if repo =~ ':'
+      let uri = repo
+    else
+      if repo !~ '/'
+        let repo = 'vim-scripts/'. repo
+      endif
+      let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git')
+      let uri = printf(fmt, repo)
+    endif
+    let dir = s:dirpath( fnamemodify(join([g:plug_home, a:name], '/'), ':p') )
+    return { 'dir': dir, 'uri': uri }
+  endif
+endfunction
+
+function! s:install(force, names)
+  call s:update_impl(0, a:force, a:names)
+endfunction
+
+function! s:update(force, names)
+  call s:update_impl(1, a:force, a:names)
+endfunction
+
+function! plug#helptags()
+  if !exists('g:plugs')
+    return s:err('plug#begin was not called')
+  endif
+  for spec in values(g:plugs)
+    let docd = join([spec.dir, 'doc'], '/')
+    if isdirectory(docd)
+      silent! execute 'helptags' s:esc(docd)
+    endif
+  endfor
+  return 1
+endfunction
+
+function! s:syntax()
+  syntax clear
+  syntax region plug1 start=/\%1l/ end=/\%2l/ contains=plugNumber
+  syntax region plug2 start=/\%2l/ end=/\%3l/ contains=plugBracket,plugX
+  syn match plugNumber /[0-9]\+[0-9.]*/ contained
+  syn match plugBracket /[[\]]/ contained
+  syn match plugX /x/ contained
+  syn match plugDash /^-/
+  syn match plugPlus /^+/
+  syn match plugStar /^*/
+  syn match plugMessage /\(^- \)\@<=.*/
+  syn match plugName /\(^- \)\@<=[^ ]*:/
+  syn match plugInstall /\(^+ \)\@<=[^:]*/
+  syn match plugUpdate /\(^* \)\@<=[^:]*/
+  syn match plugCommit /^  [0-9a-z]\{7} .*/ contains=plugRelDate,plugSha
+  syn match plugSha /\(^  \)\@<=[0-9a-z]\{7}/ contained
+  syn match plugRelDate /([^)]*)$/ contained
+  syn match plugNotLoaded /(not loaded)$/
+  syn match plugError /^x.*/
+  syn keyword Function PlugInstall PlugStatus PlugUpdate PlugClean
+  hi def link plug1       Title
+  hi def link plug2       Repeat
+  hi def link plugX       Exception
+  hi def link plugBracket Structure
+  hi def link plugNumber  Number
+
+  hi def link plugDash    Special
+  hi def link plugPlus    Constant
+  hi def link plugStar    Boolean
+
+  hi def link plugMessage Function
+  hi def link plugName    Label
+  hi def link plugInstall Function
+  hi def link plugUpdate  Type
+
+  hi def link plugError   Error
+  hi def link plugRelDate Comment
+  hi def link plugSha     Identifier
+
+  hi def link plugNotLoaded Comment
+endfunction
+
+function! s:lpad(str, len)
+  return a:str . repeat(' ', a:len - len(a:str))
+endfunction
+
+function! s:lines(msg)
+  return split(a:msg, "[\r\n]")
+endfunction
+
+function! s:lastline(msg)
+  return get(s:lines(a:msg), -1, '')
+endfunction
+
+function! s:new_window()
+  execute get(g:, 'plug_window', 'vertical topleft new')
+endfunction
+
+function! s:plug_window_exists()
+  let buflist = tabpagebuflist(s:plug_tab)
+  return !empty(buflist) && index(buflist, s:plug_buf) >= 0
+endfunction
+
+function! s:switch_in()
+  if !s:plug_window_exists()
+    return 0
+  endif
+
+  if winbufnr(0) != s:plug_buf
+    let s:pos = [tabpagenr(), winnr(), winsaveview()]
+    execute 'normal!' s:plug_tab.'gt'
+    let winnr = bufwinnr(s:plug_buf)
+    execute winnr.'wincmd w'
+    call add(s:pos, winsaveview())
+  else
+    let s:pos = [winsaveview()]
+  endif
+
+  setlocal modifiable
+  return 1
+endfunction
+
+function! s:switch_out(...)
+  call winrestview(s:pos[-1])
+  setlocal nomodifiable
+  if a:0 > 0
+    execute a:1
+  endif
+
+  if len(s:pos) > 1
+    execute 'normal!' s:pos[0].'gt'
+    execute s:pos[1] 'wincmd w'
+    call winrestview(s:pos[2])
+  endif
+endfunction
+
+function! s:prepare()
+  call s:job_abort()
+  if s:switch_in()
+    silent %d _
+  else
+    call s:new_window()
+    nnoremap <silent> <buffer> q  :if b:plug_preview==1<bar>pc<bar>endif<bar>echo<bar>q<cr>
+    nnoremap <silent> <buffer> R  :silent! call <SID>retry()<cr>
+    nnoremap <silent> <buffer> D  :PlugDiff<cr>
+    nnoremap <silent> <buffer> S  :PlugStatus<cr>
+    nnoremap <silent> <buffer> U  :call <SID>status_update()<cr>
+    xnoremap <silent> <buffer> U  :call <SID>status_update()<cr>
+    nnoremap <silent> <buffer> ]] :silent! call <SID>section('')<cr>
+    nnoremap <silent> <buffer> [[ :silent! call <SID>section('b')<cr>
+    let b:plug_preview = -1
+    let s:plug_tab = tabpagenr()
+    let s:plug_buf = winbufnr(0)
+    call s:assign_name()
+  endif
+  silent! unmap <buffer> <cr>
+  silent! unmap <buffer> L
+  silent! unmap <buffer> o
+  silent! unmap <buffer> X
+  setlocal buftype=nofile bufhidden=wipe nobuflisted noswapfile nowrap cursorline modifiable
+  setf vim-plug
+  call s:syntax()
+endfunction
+
+function! s:assign_name()
+  " Assign buffer name
+  let prefix = '[Plugins]'
+  let name   = prefix
+  let idx    = 2
+  while bufexists(name)
+    let name = printf('%s (%s)', prefix, idx)
+    let idx = idx + 1
+  endwhile
+  silent! execute 'f' fnameescape(name)
+endfunction
+
+function! s:do(pull, force, todo)
+  for [name, spec] in items(a:todo)
+    if !isdirectory(spec.dir)
+      continue
+    endif
+    let installed = has_key(s:update.new, name)
+    let updated = installed ? 0 :
+      \ (a:pull && !empty(s:system_chomp('git log --pretty=format:"%h" "HEAD...HEAD@{1}"', spec.dir)))
+    if a:force || installed || updated
+      execute 'cd' s:esc(spec.dir)
+      call append(3, '- Post-update hook for '. name .' ... ')
+      let type = type(spec.do)
+      if type == s:TYPE.string
+        try
+          " FIXME: Escaping is incomplete. We could use shellescape with eval,
+          "        but it won't work on Windows.
+          let g:_plug_do = '!'.escape(spec.do, '#!%')
+          execute "normal! :execute g:_plug_do\<cr>\<cr>"
+        finally
+          let result = v:shell_error ? ('Exit status: '.v:shell_error) : 'Done!'
+          unlet g:_plug_do
+        endtry
+      elseif type == s:TYPE.funcref
+        try
+          let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged')
+          call spec.do({ 'name': name, 'status': status, 'force': a:force })
+          let result = 'Done!'
+        catch
+          let result = 'Error: ' . v:exception
+        endtry
+      else
+        let result = 'Error: Invalid type!'
+      endif
+      call setline(4, getline(4) . result)
+      cd -
+    endif
+  endfor
+endfunction
+
+function! s:finish(pull)
+  let new_frozen = len(filter(keys(s:update.new), 'g:plugs[v:val].frozen'))
+  if new_frozen
+    let s = new_frozen > 1 ? 's' : ''
+    call append(3, printf('- Installed %d frozen plugin%s', new_frozen, s))
+  endif
+  call append(3, '- Finishing ... ')
+  redraw
+  call plug#helptags()
+  call plug#end()
+  call setline(4, getline(4) . 'Done!')
+  redraw
+  let msgs = []
+  if !empty(s:update.errors)
+    call add(msgs, "Press 'R' to retry.")
+  endif
+  if a:pull && len(s:update.new) < len(filter(getline(5, '$'),
+                \ "v:val =~ '^- ' && stridx(v:val, 'Already up-to-date') < 0"))
+    call add(msgs, "Press 'D' to see the updated changes.")
+  endif
+  echo join(msgs, ' ')
+endfunction
+
+function! s:retry()
+  if empty(s:update.errors)
+    return
+  endif
+  call s:update_impl(s:update.pull, s:update.force,
+        \ extend(copy(s:update.errors), [s:update.threads]))
+endfunction
+
+function! s:is_managed(name)
+  return has_key(g:plugs[a:name], 'uri')
+endfunction
+
+function! s:names(...)
+  return sort(filter(keys(g:plugs), 'stridx(v:val, a:1) == 0 && s:is_managed(v:val)'))
+endfunction
+
+function! s:update_impl(pull, force, args) abort
+  let args = copy(a:args)
+  let threads = (len(args) > 0 && args[-1] =~ '^[1-9][0-9]*$') ?
+                  \ remove(args, -1) : get(g:, 'plug_threads', s:is_win ? 1 : 16)
+
+  let managed = filter(copy(g:plugs), 's:is_managed(v:key)')
+  let todo = empty(args) ? filter(managed, '!v:val.frozen || !isdirectory(v:val.dir)') :
+                         \ filter(managed, 'index(args, v:key) >= 0')
+
+  if empty(todo)
+    echohl WarningMsg
+    echo 'No plugin to '. (a:pull ? 'update' : 'install') . '.'
+    echohl None
+    return
+  endif
+
+  if !s:is_win && s:git_version_requirement(2, 3)
+    let s:git_terminal_prompt = exists('$GIT_TERMINAL_PROMPT') ? $GIT_TERMINAL_PROMPT : ''
+    let $GIT_TERMINAL_PROMPT = 0
+    for plug in values(todo)
+      let plug.uri = substitute(plug.uri,
+            \ '^https://git::@github\.com', 'https://github.com', '')
+    endfor
+  endif
+
+  if !isdirectory(g:plug_home)
+    try
+      call mkdir(g:plug_home, 'p')
+    catch
+      return s:err(printf('Invalid plug directory: %s. '.
+              \ 'Try to call plug#begin with a valid directory', g:plug_home))
+    endtry
+  endif
+
+  if has('nvim') && !exists('*jobwait') && threads > 1
+    echohl WarningMsg
+    echomsg 'vim-plug: update Neovim for parallel installer'
+    echohl None
+  endif
+
+  let python = (has('python') || has('python3')) && !s:is_win && !has('win32unix')
+      \ && (!s:nvim || has('vim_starting'))
+  let ruby = has('ruby') && !s:nvim && (v:version >= 703 || v:version == 702 && has('patch374'))
+
+  let s:update = {
+    \ 'start':   reltime(),
+    \ 'all':     todo,
+    \ 'todo':    copy(todo),
+    \ 'errors':  [],
+    \ 'pull':    a:pull,
+    \ 'force':   a:force,
+    \ 'new':     {},
+    \ 'threads': (python || ruby || s:nvim) ? min([len(todo), threads]) : 1,
+    \ 'bar':     '',
+    \ 'fin':     0
+  \ }
+
+  call s:prepare()
+  call append(0, ['', ''])
+  normal! 2G
+  silent! redraw
+
+  let s:clone_opt = get(g:, 'plug_shallow', 1) ?
+        \ '--depth 1' . (s:git_version_requirement(1, 7, 10) ? ' --no-single-branch' : '') : ''
+
+  " Python version requirement (>= 2.7)
+  if python && !has('python3') && !ruby && !s:nvim && s:update.threads > 1
+    redir => pyv
+    silent python import platform; print(platform.python_version())
+    redir END
+    let python = s:version_requirement(
+          \ map(split(split(pyv)[0], '\.'), 'str2nr(v:val)'), [2, 6])
+  endif
+
+  if (python || ruby) && s:update.threads > 1
+    try
+      let imd = &imd
+      if s:mac_gui
+        set noimd
+      endif
+      if ruby
+        call s:update_ruby()
+      else
+        call s:update_python()
+      endif
+    catch
+      let lines = getline(4, '$')
+      let printed = {}
+      silent! 4,$d _
+      for line in lines
+        let name = s:extract_name(line, '.', '')
+        if empty(name) || !has_key(printed, name)
+          call append('$', line)
+          if !empty(name)
+            let printed[name] = 1
+            if line[0] == 'x' && index(s:update.errors, name) < 0
+              call add(s:update.errors, name)
+            end
+          endif
+        endif
+      endfor
+    finally
+      let &imd = imd
+      call s:update_finish()
+    endtry
+  else
+    call s:update_vim()
+  endif
+endfunction
+
+function! s:update_finish()
+  if exists('s:git_terminal_prompt')
+    let $GIT_TERMINAL_PROMPT = s:git_terminal_prompt
+  endif
+  if s:switch_in()
+    call s:do(s:update.pull, s:update.force, filter(copy(s:update.all), 'has_key(v:val, "do")'))
+    call s:finish(s:update.pull)
+    call setline(1, 'Updated. Elapsed time: ' . split(reltimestr(reltime(s:update.start)))[0] . ' sec.')
+    call s:switch_out('normal! gg')
+  endif
+endfunction
+
+function! s:job_abort()
+  if !s:nvim || !exists('s:jobs')
+    return
+  endif
+
+  for [name, j] in items(s:jobs)
+    silent! call jobstop(j.jobid)
+    if j.new
+      call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir))
+    endif
+  endfor
+  let s:jobs = {}
+endfunction
+
+" When a:event == 'stdout', data = list of strings
+" When a:event == 'exit', data = returncode
+function! s:job_handler(job_id, data, event) abort
+  if !s:plug_window_exists() " plug window closed
+    return s:job_abort()
+  endif
+
+  if a:event == 'stdout'
+    let self.result .= substitute(s:to_s(a:data), '[\r\n]', '', 'g') . "\n"
+    " To reduce the number of buffer updates
+    let self.tick = get(self, 'tick', -1) + 1
+    if self.tick % len(s:jobs) == 0
+      call s:log(self.new ? '+' : '*', self.name, self.result)
+    endif
+  elseif a:event == 'exit'
+    let self.running = 0
+    if a:data != 0
+      let self.error = 1
+    endif
+    call s:reap(self.name)
+    call s:tick()
+  endif
+endfunction
+
+function! s:spawn(name, cmd, opts)
+  let job = { 'name': a:name, 'running': 1, 'error': 0, 'result': '',
+            \ 'new': get(a:opts, 'new', 0),
+            \ 'on_stdout': function('s:job_handler'),
+            \ 'on_exit' : function('s:job_handler'),
+            \ }
+  let s:jobs[a:name] = job
+
+  if s:nvim
+    let argv = [ 'sh', '-c',
+               \ (has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd) ]
+    let jid = jobstart(argv, job)
+    if jid > 0
+      let job.jobid = jid
+    else
+      let job.running = 0
+      let job.error   = 1
+      let job.result  = jid < 0 ? 'sh is not executable' :
+            \ 'Invalid arguments (or job table is full)'
+    endif
+  else
+    let params = has_key(a:opts, 'dir') ? [a:cmd, a:opts.dir] : [a:cmd]
+    let job.result = call('s:system', params)
+    let job.error = v:shell_error != 0
+    let job.running = 0
+  endif
+endfunction
+
+function! s:reap(name)
+  let job = s:jobs[a:name]
+  if job.error
+    call add(s:update.errors, a:name)
+  elseif get(job, 'new', 0)
+    let s:update.new[a:name] = 1
+  endif
+  let s:update.bar .= job.error ? 'x' : '='
+
+  call s:log(job.error ? 'x' : '-', a:name, job.result)
+  call s:bar()
+
+  call remove(s:jobs, a:name)
+endfunction
+
+function! s:bar()
+  if s:switch_in()
+    let total = len(s:update.all)
+    call setline(1, (s:update.pull ? 'Updating' : 'Installing').
+          \ ' plugins ('.len(s:update.bar).'/'.total.')')
+    call s:progress_bar(2, s:update.bar, total)
+    call s:switch_out()
+  endif
+endfunction
+
+function! s:logpos(name)
+  for i in range(1, line('$'))
+    if getline(i) =~# '^[-+x*] '.a:name.':'
+      return i
+    endif
+  endfor
+  return 0
+endfunction
+
+function! s:log(bullet, name, lines)
+  if s:switch_in()
+    let pos = s:logpos(a:name)
+    if pos > 0
+      execute pos 'd _'
+      if pos > winheight('.')
+        let pos = 4
+      endif
+    else
+      let pos = 4
+    endif
+    call append(pos - 1, s:format_message(a:bullet, a:name, a:lines))
+    call s:switch_out()
+  endif
+endfunction
+
+function! s:update_vim()
+  let s:jobs = {}
+
+  call s:bar()
+  call s:tick()
+endfunction
+
+function! s:tick()
+  let pull = s:update.pull
+  let prog = s:progress_opt(s:nvim)
+while 1 " Without TCO, Vim stack is bound to explode
+  if empty(s:update.todo)
+    if empty(s:jobs) && !s:update.fin
+      let s:update.fin = 1
+      call s:update_finish()
+    endif
+    return
+  endif
+
+  let name = keys(s:update.todo)[0]
+  let spec = remove(s:update.todo, name)
+  let new  = !isdirectory(spec.dir)
+
+  call s:log(new ? '+' : '*', name, pull ? 'Updating ...' : 'Installing ...')
+  redraw
+
+  let has_tag = has_key(spec, 'tag')
+  let checkout = s:shellesc(has_tag ? spec.tag : spec.branch)
+  let merge = s:shellesc(has_tag ? spec.tag : 'origin/'.spec.branch)
+
+  if !new
+    let [valid, msg] = s:git_valid(spec, 0)
+    if valid
+      if pull
+        let fetch_opt = (has_tag && !empty(globpath(spec.dir, '.git/shallow'))) ? '--depth 99999999' : ''
+        call s:spawn(name,
+          \ printf('(git fetch %s %s 2>&1 && git checkout -q %s 2>&1 && git merge --ff-only %s 2>&1 && git submodule update --init --recursive 2>&1)',
+          \ fetch_opt, prog, checkout, merge), { 'dir': spec.dir })
+      else
+        let s:jobs[name] = { 'running': 0, 'result': 'Already installed', 'error': 0 }
+      endif
+    else
+      let s:jobs[name] = { 'running': 0, 'result': msg, 'error': 1 }
+    endif
+  else
+    call s:spawn(name,
+          \ printf('git clone %s %s --recursive %s -b %s %s 2>&1',
+          \ has_tag ? '' : s:clone_opt,
+          \ prog,
+          \ s:shellesc(spec.uri),
+          \ checkout,
+          \ s:shellesc(s:trim(spec.dir))), { 'new': 1 })
+  endif
+
+  if !s:jobs[name].running
+    call s:reap(name)
+  endif
+  if len(s:jobs) >= s:update.threads
+    break
+  endif
+endwhile
+endfunction
+
+function! s:update_python()
+let py_exe = has('python3') ? 'python3' : 'python'
+execute py_exe "<< EOF"
+""" Due to use of signals this function is POSIX only. """
+import datetime
+import functools
+import os
+try:
+  import queue
+except ImportError:
+  import Queue as queue
+import random
+import re
+import shutil
+import signal
+import subprocess
+import tempfile
+import threading as thr
+import time
+import traceback
+import vim
+
+G_NVIM = vim.eval("has('nvim')") == '1'
+G_PULL = vim.eval('s:update.pull') == '1'
+G_RETRIES = int(vim.eval('get(g:, "plug_retries", 2)')) + 1
+G_TIMEOUT = int(vim.eval('get(g:, "plug_timeout", 60)'))
+G_CLONE_OPT = vim.eval('s:clone_opt')
+G_PROGRESS = vim.eval('s:progress_opt(1)')
+G_LOG_PROB = 1.0 / int(vim.eval('s:update.threads'))
+G_STOP = thr.Event()
+G_THREADS = {}
+
+class BaseExc(Exception):
+  def __init__(self, msg):
+    self._msg = msg
+  @property
+  def msg(self):
+    return self._msg
+class CmdTimedOut(BaseExc):
+  pass
+class CmdFailed(BaseExc):
+  pass
+class InvalidURI(BaseExc):
+  pass
+class Action(object):
+  INSTALL, UPDATE, ERROR, DONE = ['+', '*', 'x', '-']
+
+class Buffer(object):
+  def __init__(self, lock, num_plugs, is_pull, is_win):
+    self.bar = ''
+    self.event = 'Updating' if is_pull else 'Installing'
+    self.is_win = is_win
+    self.lock = lock
+    self.maxy = int(vim.eval('winheight(".")'))
+    self.num_plugs = num_plugs
+
+  def _where(self, name):
+    """ Find first line with name in current buffer. Return line num. """
+    found, lnum = False, 0
+    matcher = re.compile('^[-+x*] {0}:'.format(name))
+    for line in vim.current.buffer:
+      if matcher.search(line) is not None:
+        found = True
+        break
+      lnum += 1
+
+    if not found:
+      lnum = -1
+    return lnum
+
+  def header(self):
+    curbuf = vim.current.buffer
+    curbuf[0] = self.event + ' plugins ({0}/{1})'.format(len(self.bar), self.num_plugs)
+
+    num_spaces = self.num_plugs - len(self.bar)
+    curbuf[1] = '[{0}{1}]'.format(self.bar, num_spaces * ' ')
+
+    with self.lock:
+      vim.command('normal! 2G')
+      if not self.is_win:
+        vim.command('redraw')
+
+  def write(self, action, name, lines):
+    first, rest = lines[0], lines[1:]
+    msg = ['{0} {1}{2}{3}'.format(action, name, ': ' if first else '', first)]
+    padded_rest = ['    ' + line for line in rest]
+    msg.extend(padded_rest)
+
+    try:
+      if action == Action.ERROR:
+        self.bar += 'x'
+        vim.command("call add(s:update.errors, '{0}')".format(name))
+      elif action == Action.DONE:
+        self.bar += '='
+
+      curbuf = vim.current.buffer
+      lnum = self._where(name)
+      if lnum != -1: # Found matching line num
+        del curbuf[lnum]
+        if lnum > self.maxy and action in set([Action.INSTALL, Action.UPDATE]):
+          lnum = 3
+      else:
+        lnum = 3
+      curbuf.append(msg, lnum)
+
+      self.header()
+    except vim.error:
+      pass
+
+class Command(object):
+  def __init__(self, cmd, cmd_dir=None, timeout=60, ntries=3, cb=None, clean=None):
+    self.cmd = cmd
+    self.cmd_dir = cmd_dir
+    self.timeout = timeout
+    self.ntries = ntries
+    self.callback = cb if cb else (lambda msg: None)
+    self.clean = clean
+
+  def attempt_cmd(self):
+    """ Tries to run the command, returns result if no exceptions. """
+    attempt = 0
+    finished = False
+    limit = self.timeout
+
+    while not finished:
+      try:
+        attempt += 1
+        result = self.timeout_cmd()
+        finished = True
+      except CmdTimedOut:
+        if attempt != self.ntries:
+          for count in range(3, 0, -1):
+            if G_STOP.is_set():
+              raise KeyboardInterrupt
+            msg = 'Timeout. Will retry in {0} second{1} ...'.format(
+                count, 's' if count != 1 else '')
+            self.callback([msg])
+            time.sleep(1)
+          self.timeout += limit
+          self.callback(['Retrying ...'])
+        else:
+          raise
+
+    return result
+
+  def timeout_cmd(self):
+    """ Execute a cmd & poll for callback. Returns list of output.
+    Raises CmdFailed   -> return code for Popen isn't 0
+    Raises CmdTimedOut -> command exceeded timeout without new output
+    """
+    proc = None
+    first_line = True
+    try:
+      tfile = tempfile.NamedTemporaryFile(mode='w+b', delete=False)
+      proc = subprocess.Popen(self.cmd, cwd=self.cmd_dir, stdout=tfile,
+          stderr=subprocess.STDOUT, shell=True, preexec_fn=os.setsid)
+      while proc.poll() is None:
+        # Yield this thread
+        time.sleep(0.2)
+
+        if G_STOP.is_set():
+          raise KeyboardInterrupt
+
+        if first_line or random.random() < G_LOG_PROB:
+          first_line = False
+          line = nonblock_read(tfile.name)
+          if line:
+            self.callback([line])
+
+        time_diff = time.time() - os.path.getmtime(tfile.name)
+        if time_diff > self.timeout:
+          raise CmdTimedOut(['Timeout!'])
+
+      tfile.seek(0)
+      result = [line.decode('utf-8', 'replace').rstrip() for line in tfile]
+
+      if proc.returncode != 0:
+        msg = ['']
+        msg.extend(result)
+        raise CmdFailed(msg)
+    except:
+      if proc and proc.poll() is None:
+        os.killpg(proc.pid, signal.SIGTERM)
+      if self.clean:
+        self.clean()
+      raise
+    finally:
+      os.remove(tfile.name)
+
+    return result
+
+class Plugin(object):
+  def __init__(self, name, args, buf_q, lock):
+    self.name = name
+    self.args = args
+    self.buf_q = buf_q
+    self.lock = lock
+    tag = args.get('tag', 0)
+    self.checkout = esc(tag if tag else args['branch'])
+    self.merge = esc(tag if tag else 'origin/' + args['branch'])
+    self.tag = tag
+
+  def manage(self):
+    try:
+      if os.path.exists(self.args['dir']):
+        self.update()
+      else:
+        self.install()
+        with self.lock:
+          thread_vim_command("let s:update.new['{0}'] = 1".format(self.name))
+    except (CmdTimedOut, CmdFailed, InvalidURI) as exc:
+      self.write(Action.ERROR, self.name, exc.msg)
+    except KeyboardInterrupt:
+      G_STOP.set()
+      self.write(Action.ERROR, self.name, ['Interrupted!'])
+    except:
+      # Any exception except those above print stack trace
+      msg = 'Trace:\n{0}'.format(traceback.format_exc().rstrip())
+      self.write(Action.ERROR, self.name, msg.split('\n'))
+      raise
+
+  def install(self):
+    target = self.args['dir']
+
+    def clean(target):
+      def _clean():
+        try:
+          shutil.rmtree(target)
+        except OSError:
+          pass
+      return _clean
+
+    self.write(Action.INSTALL, self.name, ['Installing ...'])
+    callback = functools.partial(self.write, Action.INSTALL, self.name)
+    cmd = 'git clone {0} {1} --recursive {2} -b {3} {4} 2>&1'.format(
+        '' if self.tag else G_CLONE_OPT, G_PROGRESS, self.args['uri'], self.checkout, esc(target))
+    com = Command(cmd, None, G_TIMEOUT, G_RETRIES, callback, clean(target))
+    result = com.attempt_cmd()
+    self.write(Action.DONE, self.name, result[-1:])
+
+  def update(self):
+    match = re.compile(r'git::?@')
+    actual_uri = re.sub(match, '', self.repo_uri())
+    expect_uri = re.sub(match, '', self.args['uri'])
+    if actual_uri != expect_uri:
+      msg = ['',
+             'Invalid URI: {0}'.format(actual_uri),
+             'Expected     {0}'.format(expect_uri),
+             'PlugClean required.']
+      raise InvalidURI(msg)
+
+    if G_PULL:
+      self.write(Action.UPDATE, self.name, ['Updating ...'])
+      callback = functools.partial(self.write, Action.UPDATE, self.name)
+      fetch_opt = '--depth 99999999' if self.tag and os.path.isfile(os.path.join(self.args['dir'], '.git/shallow')) else ''
+      cmds = ['git fetch {0} {1}'.format(fetch_opt, G_PROGRESS),
+              'git checkout -q {0}'.format(self.checkout),
+              'git merge --ff-only {0}'.format(self.merge),
+              'git submodule update --init --recursive']
+      cmd = ' 2>&1 && '.join(cmds)
+      com = Command(cmd, self.args['dir'], G_TIMEOUT, G_RETRIES, callback)
+      result = com.attempt_cmd()
+      self.write(Action.DONE, self.name, result[-1:])
+    else:
+      self.write(Action.DONE, self.name, ['Already installed'])
+
+  def repo_uri(self):
+    cmd = 'git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url'
+    command = Command(cmd, self.args['dir'], G_TIMEOUT, G_RETRIES)
+    result = command.attempt_cmd()
+    return result[-1]
+
+  def write(self, action, name, msg):
+    self.buf_q.put((action, name, msg))
+
+class PlugThread(thr.Thread):
+  def __init__(self, tname, args):
+    super(PlugThread, self).__init__()
+    self.tname = tname
+    self.args = args
+
+  def run(self):
+    thr.current_thread().name = self.tname
+    buf_q, work_q, lock = self.args
+
+    try:
+      while not G_STOP.is_set():
+        name, args = work_q.get_nowait()
+        plug = Plugin(name, args, buf_q, lock)
+        plug.manage()
+        work_q.task_done()
+    except queue.Empty:
+      pass
+    finally:
+      global G_THREADS
+      with lock:
+        del G_THREADS[thr.current_thread().name]
+
+class RefreshThread(thr.Thread):
+  def __init__(self, lock):
+    super(RefreshThread, self).__init__()
+    self.lock = lock
+    self.running = True
+
+  def run(self):
+    while self.running:
+      with self.lock:
+        thread_vim_command('noautocmd normal! a')
+      time.sleep(0.2)
+
+  def stop(self):
+    self.running = False
+
+if G_NVIM:
+  def thread_vim_command(cmd):
+    vim.session.threadsafe_call(lambda: vim.command(cmd))
+else:
+  def thread_vim_command(cmd):
+    vim.command(cmd)
+
+def esc(name):
+  return '"' + name.replace('"', '\"') + '"'
+
+def nonblock_read(fname):
+  """ Read a file with nonblock flag. Return the last line. """
+  fread = os.open(fname, os.O_RDONLY | os.O_NONBLOCK)
+  buf = os.read(fread, 100000).decode('utf-8', 'replace')
+  os.close(fread)
+
+  line = buf.rstrip('\r\n')
+  left = max(line.rfind('\r'), line.rfind('\n'))
+  if left != -1:
+    left += 1
+    line = line[left:]
+
+  return line
+
+def main():
+  thr.current_thread().name = 'main'
+  nthreads = int(vim.eval('s:update.threads'))
+  plugs = vim.eval('s:update.todo')
+  mac_gui = vim.eval('s:mac_gui') == '1'
+  is_win = vim.eval('s:is_win') == '1'
+
+  lock = thr.Lock()
+  buf = Buffer(lock, len(plugs), G_PULL, is_win)
+  buf_q, work_q = queue.Queue(), queue.Queue()
+  for work in plugs.items():
+    work_q.put(work)
+
+  global G_THREADS
+  for num in range(nthreads):
+    tname = 'PlugT-{0:02}'.format(num)
+    thread = PlugThread(tname, (buf_q, work_q, lock))
+    thread.start()
+    G_THREADS[tname] = thread
+  if mac_gui:
+    rthread = RefreshThread(lock)
+    rthread.start()
+
+  while not buf_q.empty() or len(G_THREADS) != 0:
+    try:
+      action, name, msg = buf_q.get(True, 0.25)
+      buf.write(action, name, msg)
+      buf_q.task_done()
+    except queue.Empty:
+      pass
+    except KeyboardInterrupt:
+      G_STOP.set()
+
+  if mac_gui:
+    rthread.stop()
+    rthread.join()
+
+main()
+EOF
+endfunction
+
+function! s:update_ruby()
+  ruby << EOF
+  module PlugStream
+    SEP = ["\r", "\n", nil]
+    def get_line
+      buffer = ''
+      loop do
+        char = readchar rescue return
+        if SEP.include? char.chr
+          buffer << $/
+          break
+        else
+          buffer << char
+        end
+      end
+      buffer
+    end
+  end unless defined?(PlugStream)
+
+  def esc arg
+    %["#{arg.gsub('"', '\"')}"]
+  end
+
+  def killall pid
+    pids = [pid]
+    unless `which pgrep 2> /dev/null`.empty?
+      children = pids
+      until children.empty?
+        children = children.map { |pid|
+          `pgrep -P #{pid}`.lines.map { |l| l.chomp }
+        }.flatten
+        pids += children
+      end
+    end
+    pids.each { |pid| Process.kill 'TERM', pid.to_i rescue nil }
+  end
+
+  require 'thread'
+  require 'fileutils'
+  require 'timeout'
+  running = true
+  iswin = VIM::evaluate('s:is_win').to_i == 1
+  pull  = VIM::evaluate('s:update.pull').to_i == 1
+  base  = VIM::evaluate('g:plug_home')
+  all   = VIM::evaluate('s:update.todo')
+  limit = VIM::evaluate('get(g:, "plug_timeout", 60)')
+  tries = VIM::evaluate('get(g:, "plug_retries", 2)') + 1
+  nthr  = VIM::evaluate('s:update.threads').to_i
+  maxy  = VIM::evaluate('winheight(".")').to_i
+  cd    = iswin ? 'cd /d' : 'cd'
+  tot   = VIM::evaluate('len(s:update.todo)') || 0
+  bar   = ''
+  skip  = 'Already installed'
+  mtx   = Mutex.new
+  take1 = proc { mtx.synchronize { running && all.shift } }
+  logh  = proc {
+    cnt = bar.length
+    $curbuf[1] = "#{pull ? 'Updating' : 'Installing'} plugins (#{cnt}/#{tot})"
+    $curbuf[2] = '[' + bar.ljust(tot) + ']'
+    VIM::command('normal! 2G')
+    VIM::command('redraw') unless iswin
+  }
+  where = proc { |name| (1..($curbuf.length)).find { |l| $curbuf[l] =~ /^[-+x*] #{name}:/ } }
+  log   = proc { |name, result, type|
+    mtx.synchronize do
+      ing  = ![true, false].include?(type)
+      bar += type ? '=' : 'x' unless ing
+      b = case type
+          when :install  then '+' when :update then '*'
+          when true, nil then '-' else
+            VIM::command("call add(s:update.errors, '#{name}')")
+            'x'
+          end
+      result =
+        if type || type.nil?
+          ["#{b} #{name}: #{result.lines.to_a.last}"]
+        elsif result =~ /^Interrupted|^Timeout/
+          ["#{b} #{name}: #{result}"]
+        else
+          ["#{b} #{name}"] + result.lines.map { |l| "    " << l }
+        end
+      if lnum = where.call(name)
+        $curbuf.delete lnum
+        lnum = 4 if ing && lnum > maxy
+      end
+      result.each_with_index do |line, offset|
+        $curbuf.append((lnum || 4) - 1 + offset, line.gsub(/\e\[./, '').chomp)
+      end
+      logh.call
+    end
+  }
+  bt = proc { |cmd, name, type, cleanup|
+    tried = timeout = 0
+    begin
+      tried += 1
+      timeout += limit
+      fd = nil
+      data = ''
+      if iswin
+        Timeout::timeout(timeout) do
+          tmp = VIM::evaluate('tempname()')
+          system("(#{cmd}) > #{tmp}")
+          data = File.read(tmp).chomp
+          File.unlink tmp rescue nil
+        end
+      else
+        fd = IO.popen(cmd).extend(PlugStream)
+        first_line = true
+        log_prob = 1.0 / nthr
+        while line = Timeout::timeout(timeout) { fd.get_line }
+          data << line
+          log.call name, line.chomp, type if name && (first_line || rand < log_prob)
+          first_line = false
+        end
+        fd.close
+      end
+      [$? == 0, data.chomp]
+    rescue Timeout::Error, Interrupt => e
+      if fd && !fd.closed?
+        killall fd.pid
+        fd.close
+      end
+      cleanup.call if cleanup
+      if e.is_a?(Timeout::Error) && tried < tries
+        3.downto(1) do |countdown|
+          s = countdown > 1 ? 's' : ''
+          log.call name, "Timeout. Will retry in #{countdown} second#{s} ...", type
+          sleep 1
+        end
+        log.call name, 'Retrying ...', type
+        retry
+      end
+      [false, e.is_a?(Interrupt) ? "Interrupted!" : "Timeout!"]
+    end
+  }
+  main = Thread.current
+  threads = []
+  watcher = Thread.new {
+    while VIM::evaluate('getchar(1)')
+      sleep 0.1
+    end
+    mtx.synchronize do
+      running = false
+      threads.each { |t| t.raise Interrupt }
+    end
+    threads.each { |t| t.join rescue nil }
+    main.kill
+  }
+  refresh = Thread.new {
+    while true
+      mtx.synchronize do
+        break unless running
+        VIM::command('noautocmd normal! a')
+      end
+      sleep 0.2
+    end
+  } if VIM::evaluate('s:mac_gui') == 1
+
+  clone_opt = VIM::evaluate('s:clone_opt')
+  progress = VIM::evaluate('s:progress_opt(1)')
+  nthr.times do
+    mtx.synchronize do
+      threads << Thread.new {
+        while pair = take1.call
+          name = pair.first
+          dir, uri, branch, tag = pair.last.values_at *%w[dir uri branch tag]
+          checkout = esc(tag ? tag : branch)
+          merge = esc(tag ? tag : "origin/#{branch}")
+          subm = "git submodule update --init --recursive 2>&1"
+          exists = File.directory? dir
+          ok, result =
+            if exists
+              dir = iswin ? dir : esc(dir)
+              ret, data = bt.call "#{cd} #{dir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url", nil, nil, nil
+              current_uri = data.lines.to_a.last
+              if !ret
+                if data =~ /^Interrupted|^Timeout/
+                  [false, data]
+                else
+                  [false, [data.chomp, "PlugClean required."].join($/)]
+                end
+              elsif current_uri.sub(/git::?@/, '') != uri.sub(/git::?@/, '')
+                [false, ["Invalid URI: #{current_uri}",
+                         "Expected:    #{uri}",
+                         "PlugClean required."].join($/)]
+              else
+                if pull
+                  log.call name, 'Updating ...', :update
+                  fetch_opt = (tag && File.exist?(File.join(dir, '.git/shallow'))) ? '--depth 99999999' : ''
+                  bt.call "#{cd} #{dir} && git fetch #{fetch_opt} #{progress} 2>&1 && git checkout -q #{checkout} 2>&1 && git merge --ff-only #{merge} 2>&1 && #{subm}", name, :update, nil
+                else
+                  [true, skip]
+                end
+              end
+            else
+              d = esc dir.sub(%r{[\\/]+$}, '')
+              log.call name, 'Installing ...', :install
+              bt.call "git clone #{clone_opt unless tag} #{progress} --recursive #{uri} -b #{checkout} #{d} 2>&1", name, :install, proc {
+                FileUtils.rm_rf dir
+              }
+            end
+          mtx.synchronize { VIM::command("let s:update.new['#{name}'] = 1") } if !exists && ok
+          log.call name, result, ok
+        end
+      } if running
+    end
+  end
+  threads.each { |t| t.join rescue nil }
+  logh.call
+  refresh.kill if refresh
+  watcher.kill
+EOF
+endfunction
+
+function! s:shellesc(arg)
+  return '"'.escape(a:arg, '"').'"'
+endfunction
+
+function! s:glob_dir(path)
+  return map(filter(s:lines(globpath(a:path, '**')), 'isdirectory(v:val)'), 's:dirpath(v:val)')
+endfunction
+
+function! s:progress_bar(line, bar, total)
+  call setline(a:line, '[' . s:lpad(a:bar, a:total) . ']')
+endfunction
+
+function! s:compare_git_uri(a, b)
+  let a = substitute(a:a, 'git:\{1,2}@', '', '')
+  let b = substitute(a:b, 'git:\{1,2}@', '', '')
+  return a ==# b
+endfunction
+
+function! s:format_message(bullet, name, message)
+  if a:bullet != 'x'
+    return [printf('%s %s: %s', a:bullet, a:name, s:lastline(a:message))]
+  else
+    let lines = map(s:lines(a:message), '"    ".v:val')
+    return extend([printf('x %s:', a:name)], lines)
+  endif
+endfunction
+
+function! s:with_cd(cmd, dir)
+  return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd)
+endfunction
+
+function! s:system(cmd, ...)
+  try
+    let [sh, shrd] = [&shell, &shellredir]
+    if !s:is_win
+      set shell=sh shellredir=>%s\ 2>&1
+    endif
+    let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd
+    return system(s:is_win ? '('.cmd.')' : cmd)
+  finally
+    let [&shell, &shellredir] = [sh, shrd]
+  endtry
+endfunction
+
+function! s:system_chomp(...)
+  let ret = call('s:system', a:000)
+  return v:shell_error ? '' : substitute(ret, '\n$', '', '')
+endfunction
+
+function! s:git_valid(spec, check_branch)
+  let ret = 1
+  let msg = 'OK'
+  if isdirectory(a:spec.dir)
+    let result = s:lines(s:system('git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url', a:spec.dir))
+    let remote = result[-1]
+    if v:shell_error
+      let msg = join([remote, 'PlugClean required.'], "\n")
+      let ret = 0
+    elseif !s:compare_git_uri(remote, a:spec.uri)
+      let msg = join(['Invalid URI: '.remote,
+                    \ 'Expected:    '.a:spec.uri,
+                    \ 'PlugClean required.'], "\n")
+      let ret = 0
+    elseif a:check_branch
+      let branch = result[0]
+      " Check tag
+      if has_key(a:spec, 'tag')
+        let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir)
+        if a:spec.tag !=# tag
+          let msg = printf('Invalid tag: %s (expected: %s). Try PlugUpdate.',
+                \ (empty(tag) ? 'N/A' : tag), a:spec.tag)
+          let ret = 0
+        endif
+      " Check branch
+      elseif a:spec.branch !=# branch
+        let msg = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.',
+              \ branch, a:spec.branch)
+        let ret = 0
+      endif
+    endif
+  else
+    let msg = 'Not found'
+    let ret = 0
+  endif
+  return [ret, msg]
+endfunction
+
+function! s:rm_rf(dir)
+  if isdirectory(a:dir)
+    call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(a:dir))
+  endif
+endfunction
+
+function! s:clean(force)
+  call s:prepare()
+  call append(0, 'Searching for unused plugins in '.g:plug_home)
+  call append(1, '')
+
+  " List of valid directories
+  let dirs = []
+  let [cnt, total] = [0, len(g:plugs)]
+  for [name, spec] in items(g:plugs)
+    if !s:is_managed(name) || s:git_valid(spec, 0)[0]
+      call add(dirs, spec.dir)
+    endif
+    let cnt += 1
+    call s:progress_bar(2, repeat('=', cnt), total)
+    normal! 2G
+    redraw
+  endfor
+
+  let allowed = {}
+  for dir in dirs
+    let allowed[s:dirpath(fnamemodify(dir, ':h:h'))] = 1
+    let allowed[dir] = 1
+    for child in s:glob_dir(dir)
+      let allowed[child] = 1
+    endfor
+  endfor
+
+  let todo = []
+  let found = sort(s:glob_dir(g:plug_home))
+  while !empty(found)
+    let f = remove(found, 0)
+    if !has_key(allowed, f) && isdirectory(f)
+      call add(todo, f)
+      call append(line('$'), '- ' . f)
+      let found = filter(found, 'stridx(v:val, f) != 0')
+    end
+  endwhile
+
+  normal! G
+  redraw
+  if empty(todo)
+    call append(line('$'), 'Already clean.')
+  else
+    call inputsave()
+    let yes = a:force || (input('Proceed? (y/N) ') =~? '^y')
+    call inputrestore()
+    if yes
+      for dir in todo
+        call s:rm_rf(dir)
+      endfor
+      call append(line('$'), 'Removed.')
+    else
+      call append(line('$'), 'Cancelled.')
+    endif
+  endif
+  normal! G
+endfunction
+
+function! s:upgrade()
+  echo 'Downloading the latest version of vim-plug'
+  redraw
+  let tmp = tempname()
+  let new = tmp . '/plug.vim'
+
+  try
+    let out = s:system(printf('git clone --depth 1 %s %s', s:plug_src, tmp))
+    if v:shell_error
+      return s:err('Error upgrading vim-plug: '. out)
+    endif
+
+    if readfile(s:me) ==# readfile(new)
+      echo 'vim-plug is already up-to-date'
+      return 0
+    else
+      call rename(s:me, s:me . '.old')
+      call rename(new, s:me)
+      unlet g:loaded_plug
+      echo 'vim-plug has been upgraded'
+      return 1
+    endif
+  finally
+    silent! call s:rm_rf(tmp)
+  endtry
+endfunction
+
+function! s:upgrade_specs()
+  for spec in values(g:plugs)
+    let spec.frozen = get(spec, 'frozen', 0)
+  endfor
+endfunction
+
+function! s:status()
+  call s:prepare()
+  call append(0, 'Checking plugins')
+  call append(1, '')
+
+  let ecnt = 0
+  let unloaded = 0
+  let [cnt, total] = [0, len(g:plugs)]
+  for [name, spec] in items(g:plugs)
+    if has_key(spec, 'uri')
+      if isdirectory(spec.dir)
+        let [valid, msg] = s:git_valid(spec, 1)
+      else
+        let [valid, msg] = [0, 'Not found. Try PlugInstall.']
+      endif
+    else
+      if isdirectory(spec.dir)
+        let [valid, msg] = [1, 'OK']
+      else
+        let [valid, msg] = [0, 'Not found.']
+      endif
+    endif
+    let cnt += 1
+    let ecnt += !valid
+    " `s:loaded` entry can be missing if PlugUpgraded
+    if valid && get(s:loaded, name, -1) == 0
+      let unloaded = 1
+      let msg .= ' (not loaded)'
+    endif
+    call s:progress_bar(2, repeat('=', cnt), total)
+    call append(3, s:format_message(valid ? '-' : 'x', name, msg))
+    normal! 2G
+    redraw
+  endfor
+  call setline(1, 'Finished. '.ecnt.' error(s).')
+  normal! gg
+  setlocal nomodifiable
+  if unloaded
+    echo "Press 'L' on each line to load plugin, or 'U' to update"
+    nnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr>
+    xnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr>
+  end
+endfunction
+
+function! s:extract_name(str, prefix, suffix)
+  return matchstr(a:str, '^'.a:prefix.' \zs[^:]\+\ze:.*'.a:suffix.'$')
+endfunction
+
+function! s:status_load(lnum)
+  let line = getline(a:lnum)
+  let name = s:extract_name(line, '-', '(not loaded)')
+  if !empty(name)
+    call plug#load(name)
+    setlocal modifiable
+    call setline(a:lnum, substitute(line, ' (not loaded)$', '', ''))
+    setlocal nomodifiable
+  endif
+endfunction
+
+function! s:status_update() range
+  let lines = getline(a:firstline, a:lastline)
+  let names = filter(map(lines, 's:extract_name(v:val, "[x-]", "")'), '!empty(v:val)')
+  if !empty(names)
+    echo
+    execute 'PlugUpdate' join(names)
+  endif
+endfunction
+
+function! s:is_preview_window_open()
+  silent! wincmd P
+  if &previewwindow
+    wincmd p
+    return 1
+  endif
+  return 0
+endfunction
+
+function! s:find_name(lnum)
+  for lnum in reverse(range(1, a:lnum))
+    let line = getline(lnum)
+    if empty(line)
+      return ''
+    endif
+    let name = s:extract_name(line, '-', '')
+    if !empty(name)
+      return name
+    endif
+  endfor
+  return ''
+endfunction
+
+function! s:preview_commit()
+  if b:plug_preview < 0
+    let b:plug_preview = !s:is_preview_window_open()
+  endif
+
+  let sha = matchstr(getline('.'), '\(^  \)\@<=[0-9a-z]\{7}')
+  if empty(sha)
+    return
+  endif
+
+  let name = s:find_name(line('.'))
+  if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir)
+    return
+  endif
+
+  execute 'pedit' sha
+  wincmd P
+  setlocal filetype=git buftype=nofile nobuflisted modifiable
+  execute 'silent read !cd' s:shellesc(g:plugs[name].dir) '&& git show --pretty=medium' sha
+  normal! gg"_dd
+  setlocal nomodifiable
+  nnoremap <silent> <buffer> q :q<cr>
+  wincmd p
+endfunction
+
+function! s:section(flags)
+  call search('\(^[x-] \)\@<=[^:]\+:', a:flags)
+endfunction
+
+function! s:diff()
+  call s:prepare()
+  call append(0, 'Collecting updated changes ...')
+  normal! gg
+  redraw
+
+  let cnt = 0
+  for [k, v] in items(g:plugs)
+    if !isdirectory(v.dir) || !s:is_managed(k)
+      continue
+    endif
+
+    let diff = s:system_chomp('git log --pretty=format:"%h %s (%cr)" "HEAD...HEAD@{1}"', v.dir)
+    if !empty(diff)
+      call append(1, '')
+      call append(2, '- '.k.':')
+      call append(3, map(s:lines(diff), '"  ". v:val'))
+      let cnt += 1
+      normal! gg
+      redraw
+    endif
+  endfor
+
+  call setline(1, cnt == 0 ? 'No updates.' : 'Last update:')
+  nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr>
+  nnoremap <silent> <buffer> o    :silent! call <SID>preview_commit()<cr>
+  nnoremap <silent> <buffer> X    :call <SID>revert()<cr>
+  normal! gg
+  setlocal nomodifiable
+  if cnt > 0
+    echo "Press 'X' on each block to revert the update"
+  endif
+endfunction
+
+function! s:revert()
+  let name = s:find_name(line('.'))
+  if empty(name) || !has_key(g:plugs, name) ||
+    \ input(printf('Revert the update of %s? (y/N) ', name)) !~? '^y'
+    return
+  endif
+
+  call s:system('git reset --hard HEAD@{1} && git checkout '.s:esc(g:plugs[name].branch), g:plugs[name].dir)
+  setlocal modifiable
+  normal! "_dap
+  setlocal nomodifiable
+  echo 'Reverted.'
+endfunction
+
+function! s:snapshot(...) abort
+  let home = get(s:, 'plug_home_org', g:plug_home)
+  let [type, var, header] = s:is_win ?
+    \ ['dosbatch', '%PLUG_HOME%',
+    \   ['@echo off', ':: Generated by vim-plug', ':: '.strftime("%c"), '',
+    \    ':: Make sure to PlugUpdate first', '', 'set PLUG_HOME='.home]] :
+    \ ['sh', '$PLUG_HOME',
+    \   ['#!/bin/sh',  '# Generated by vim-plug', '# '.strftime("%c"), '',
+    \    'vim +PlugUpdate +qa', '', 'PLUG_HOME='.s:esc(home)]]
+
+  call s:prepare()
+  execute 'setf' type
+  call append(0, header)
+  call append('$', '')
+  1
+  redraw
+
+  let dirs = sort(map(values(filter(copy(g:plugs),
+        \'has_key(v:val, "uri") && isdirectory(v:val.dir)')), 'v:val.dir'))
+  let anchor = line('$') - 1
+  for dir in reverse(dirs)
+    let sha = s:system_chomp('git rev-parse --short HEAD', dir)
+    if !empty(sha)
+      call append(anchor, printf('cd %s && git reset --hard %s',
+            \ substitute(dir, '^\V'.escape(g:plug_home, '\'), var, ''), sha))
+      redraw
+    endif
+  endfor
+
+  if a:0 > 0
+    let fn = expand(a:1)
+    let fne = s:esc(fn)
+    call writefile(getline(1, '$'), fn)
+    if !s:is_win | call s:system('chmod +x ' . fne) | endif
+    echo 'Saved to '.a:1
+    silent execute 'e' fne
+  endif
+endfunction
+
+function! s:split_rtp()
+  return split(&rtp, '\\\@<!,')
+endfunction
+
+let s:first_rtp = s:escrtp(get(s:split_rtp(), 0, ''))
+let s:last_rtp  = s:escrtp(get(s:split_rtp(), -1, ''))
+
+if exists('g:plugs')
+  let g:plugs_order = get(g:, 'plugs_order', keys(g:plugs))
+  call s:upgrade_specs()
+  call s:define_commands()
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
diff --git a/bundle/Vundle.vim/CONTRIBUTING.md b/bundle/Vundle.vim/CONTRIBUTING.md
deleted file mode 100644
index 2162ffc..0000000
--- a/bundle/Vundle.vim/CONTRIBUTING.md
+++ /dev/null
@@ -1,111 +0,0 @@
-Pull Requests
-=============
-
-1. Please squash your commits to minimize the log pollution. This is more of a convenience for the maintainer who pulls. If you are unfamiliar, see [here](http://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one/).
-
-2. Clearly describe what you aim to fix or add to Vundle.
-
-3. Try to minimize code changes and use existing style/functions.
-
-Issues
-======
-
-## Check For Answers
-
-Before submitting an issue, be sure to check the following places for answers.
-
-1. Vundle docs at [`:h vundle`](https://github.com/gmarik/Vundle.vim/blob/master/doc/vundle.txt).
-
-2. The [FAQ](https://github.com/gmarik/Vundle.vim/search).
-
-3. [Search](https://github.com/gmarik/Vundle.vim/search) the repository for related issues.
-
-## Try To Eliminate Your Vimrc
-
-In order to make sure it isn't just `.vimrc` replace your own config file with the [minimal vimrc](https://github.com/gmarik/Vundle.vim/blob/master/test/minirc.vim). Clear out bundles and then try to reproduce.
-
-If the problem stops, likely there is an issue in your user configuration. You can incrementally add back your user changes to the minimal file testing the bug each time. This will allow you to slowly bisect the issue. You may want to test one plugin at a time.
-
-If you can still reproduce the problem, try to find the smallest `.vimrc` config file that creates the problem to include later.
-
-## Guidelines
-
-To better respond to issues please follow these general guidelines when explaining the problem.
-
-1. Clearly describe what the error is, if relevant attach output/screenshots.
-
-2. Describe how developers can reproduce the bug, the steps should be from starting Vim.
-
-3. Include your OS, version and architecture. For example, Windows 7 64, Kubuntu 13.04 32, etc...
-
-4. If relevant to reproducing the bug, include the smallest subset of your `.vimrc` that causes the issue. Put this in code tags.
-
-5. At the end of your issue, please put the output of `vim --version` in code tags.
-
-## Example Post
-
-I am using Vim on Kubuntu 13.04 64 bit and I get the following error... (add further explanation here)
-
-To reproduce the bug, use the vimrc file below and run `:BundleInstall`... (continue with steps)
-
-Vimrc:
-```
-set nocompatible
-syntax on
-filetype off
-set rtp+=~/.vim/bundle/Vundle.vim/
-call vundle#rc()
-Bundle 'gmarik/Vundle.vim'
-Bundle 'relevant/plugin'
-filetype plugin indent on
-
-.... more user configs here...
-```
-
-Vim Version:
-```
-VIM - Vi IMproved 7.4 (2013 Aug 10, compiled Aug 15 2013 10:58:39)
-Included patches: 1-5
-Modified by pkg-vim-maintainers@lists.alioth.debian.org
-Compiled by buildd@
-Huge version with GTK2 GUI.  Features included (+) or not (-):
-+arabic          +file_in_path    +mouse_sgr       +tag_binary
-+autocmd         +find_in_path    -mouse_sysmouse  +tag_old_static
-+balloon_eval    +float           +mouse_urxvt     -tag_any_white
-+browse          +folding         +mouse_xterm     +tcl
-++builtin_terms  -footer          +multi_byte      +terminfo
-+byte_offset     +fork()          +multi_lang      +termresponse
-+cindent         +gettext         -mzscheme        +textobjects
-+clientserver    -hangul_input    +netbeans_intg   +title
-+clipboard       +iconv           +path_extra      +toolbar
-+cmdline_compl   +insert_expand   +perl            +user_commands
-+cmdline_hist    +jumplist        +persistent_undo +vertsplit
-+cmdline_info    +keymap          +postscript      +virtualedit
-+comments        +langmap         +printer         +visual
-+conceal         +libcall         +profile         +visualextra
-+cryptv          +linebreak       +python          +viminfo
-+cscope          +lispindent      -python3         +vreplace
-+cursorbind      +listcmds        +quickfix        +wildignore
-+cursorshape     +localmap        +reltime         +wildmenu
-+dialog_con_gui  +lua             +rightleft       +windows
-+diff            +menu            +ruby            +writebackup
-+digraphs        +mksession       +scrollbind      +X11
-+dnd             +modify_fname    +signs           -xfontset
--ebcdic          +mouse           +smartindent     +xim
-+emacs_tags      +mouseshape      -sniff           +xsmp_interact
-+eval            +mouse_dec       +startuptime     +xterm_clipboard
-+ex_extra        +mouse_gpm       +statusline      -xterm_save
-+extra_search    -mouse_jsbterm   -sun_workshop
-+farsi           +mouse_netterm   +syntax
-   system vimrc file: "$VIM/vimrc"
-     user vimrc file: "$HOME/.vimrc"
- 2nd user vimrc file: "~/.vim/vimrc"
-      user exrc file: "$HOME/.exrc"
-  system gvimrc file: "$VIM/gvimrc"
-    user gvimrc file: "$HOME/.gvimrc"
-2nd user gvimrc file: "~/.vim/gvimrc"
-    system menu file: "$VIMRUNTIME/menu.vim"
-  fall-back for $VIM: "/usr/share/vim"
-Compilation: gcc -c -I. -Iproto -DHAVE_CONFIG_H -DFEAT_GUI_GTK  -pthread -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/harfbuzz     -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1     -I/usr/include/tcl8.5  -D_REENTRANT=1  -D_THREAD_SAFE=1  -D_LARGEFILE64_SOURCE=1
-Linking: gcc   -L. -Wl,-Bsymbolic-functions -Wl,-z,relro -rdynamic -Wl,-export-dynamic -Wl,-E  -Wl,-Bsymbolic-functions -Wl,-z,relro -Wl,--as-needed -o vim   -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lglib-2.0   -lSM -lICE -lXpm -lXt -lX11 -lXdmcp -lSM -lICE  -lm -ltinfo -lnsl  -lselinux  -lacl -lattr -lgpm -ldl  -L/usr/lib -llua5.1 -Wl,-E  -fstack-protector -L/usr/local/lib  -L/usr/lib/perl/5.14/CORE -lperl -ldl -lm -lpthread -lcrypt -L/usr/lib/python2.7/config-x86_64-linux-gnu -lpython2.7 -lpthread -ldl -lutil -lm -Xlinker -export-dynamic -Wl,-O1 -Wl,-Bsymbolic-functions  -L/usr/lib/x86_64-linux-gnu -ltcl8.5 -ldl -lpthread -lieee -lm -lruby-1.9.1 -lpthread -lrt -ldl -lcrypt -lm  -L/usr/lib
-```
diff --git a/bundle/Vundle.vim/LICENSE-MIT.txt b/bundle/Vundle.vim/LICENSE-MIT.txt
deleted file mode 100644
index 003904d..0000000
--- a/bundle/Vundle.vim/LICENSE-MIT.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (C) 2010 http://github.com/gmarik
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/bundle/Vundle.vim/README.md b/bundle/Vundle.vim/README.md
deleted file mode 100644
index 337e0b5..0000000
--- a/bundle/Vundle.vim/README.md
+++ /dev/null
@@ -1,160 +0,0 @@
-## [Help Maintain Vundle](https://github.com/gmarik/Vundle.vim/issues/383)
-
-## About
-
-[Vundle] is short for _Vim bundle_ and is a [Vim] plugin manager.
-
-[Vundle] allows you to...
-
-* keep track of and [configure] your plugins right in the `.vimrc`
-* [install] configured plugins (a.k.a. scripts/bundle)
-* [update] configured plugins
-* [search] by name all available [Vim scripts]
-* [clean] unused plugins up
-* run the above actions in a *single keypress* with [interactive mode]
-
-[Vundle] automatically...
-
-* manages the [runtime path] of your installed scripts
-* regenerates [help tags] after installing and updating
-
-[Vundle] is undergoing an [interface change], please stay up to date to get latest changes.
-
-[![Gitter-chat](https://badges.gitter.im/gmarik/Vundle.vim.svg)](https://gitter.im/gmarik/Vundle.vim) for discussion and support.
-
-![Vundle-installer](http://i.imgur.com/Rueh7Cc.png)
-
-## Quick Start
-
-1. Introduction:
-
-   Installation requires [Git] and triggers [`git clone`] for each configured repository to `~/.vim/bundle/` by default.
-   Curl is required for search.
-
-   If you are using Windows, go directly to [Windows setup]. If you run into any issues, please consult the [FAQ].
-   See [Tips] for some advanced configurations.
-
-   Using non-POSIX shells, such as the popular Fish shell, requires additional setup. Please check the [FAQ].
-
-2. Set up [Vundle]:
-
-   `$ git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim`
-
-3. Configure Plugins:
-
-   Put this at the top of your `.vimrc` to use Vundle. Remove plugins you don't need, they are for illustration purposes.
-
-   ```vim
-   set nocompatible              " be iMproved, required
-   filetype off                  " required
-
-   " set the runtime path to include Vundle and initialize
-   set rtp+=~/.vim/bundle/Vundle.vim
-   call vundle#begin()
-   " alternatively, pass a path where Vundle should install plugins
-   "call vundle#begin('~/some/path/here')
-
-   " let Vundle manage Vundle, required
-   Plugin 'gmarik/Vundle.vim'
-
-   " The following are examples of different formats supported.
-   " Keep Plugin commands between vundle#begin/end.
-   " plugin on GitHub repo
-   Plugin 'tpope/vim-fugitive'
-   " plugin from http://vim-scripts.org/vim/scripts.html
-   Plugin 'L9'
-   " Git plugin not hosted on GitHub
-   Plugin 'git://git.wincent.com/command-t.git'
-   " git repos on your local machine (i.e. when working on your own plugin)
-   Plugin 'file:///home/gmarik/path/to/plugin'
-   " The sparkup vim script is in a subdirectory of this repo called vim.
-   " Pass the path to set the runtimepath properly.
-   Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
-   " Avoid a name conflict with L9
-   Plugin 'user/L9', {'name': 'newL9'}
-
-   " All of your Plugins must be added before the following line
-   call vundle#end()            " required
-   filetype plugin indent on    " required
-   " To ignore plugin indent changes, instead use:
-   "filetype plugin on
-   "
-   " Brief help
-   " :PluginList       - lists configured plugins
-   " :PluginInstall    - installs plugins; append `!` to update or just :PluginUpdate
-   " :PluginSearch foo - searches for foo; append `!` to refresh local cache
-   " :PluginClean      - confirms removal of unused plugins; append `!` to auto-approve removal
-   "
-   " see :h vundle for more details or wiki for FAQ
-   " Put your non-Plugin stuff after this line
-   ```
-
-4. Install Plugins:
-
-   Launch `vim` and run `:PluginInstall`
-
-   To install from command line: `vim +PluginInstall +qall`
-
-## Docs
-
-See the [`:h vundle`](https://github.com/gmarik/Vundle.vim/blob/master/doc/vundle.txt) Vimdoc for more details.
-
-## Changelog
-
-See the [changelog](https://github.com/gmarik/Vundle.vim/blob/master/changelog.md).
-
-## People Using Vundle
-
-see [Examples](https://github.com/gmarik/Vundle.vim/wiki/Examples)
-
-## Contributors
-
-see [Vundle contributors](https://github.com/gmarik/Vundle.vim/graphs/contributors)
-
-*Thank you!*
-
-## Inspiration & Ideas
-
-* [pathogen.vim](http://github.com/tpope/vim-pathogen/)
-* [Bundler](https://github.com/bundler/bundler)
-* [Scott Bronson](http://github.com/bronson)
-
-## Also
-
-* Vundle was developed and tested with [Vim] 7.3 on OS X, Linux and Windows
-* Vundle tries to be as [KISS](http://en.wikipedia.org/wiki/KISS_principle) as possible
-
-## TODO:
-[Vundle] is a work in progress, so any ideas and patches are appreciated.
-
-* ✓ activate newly added bundles on `.vimrc` reload or after `:PluginInstall`
-* ✓ use preview window for search results
-* ✓ Vim documentation
-* ✓ put Vundle in `bundles/` too (will fix Vundle help)
-* ✓ tests
-* ✓ improve error handling
-* allow specifying revision/version?
-* handle dependencies
-* show description in search results
-* search by description as well
-* make it rock!
-
-[Vundle]:http://github.com/gmarik/Vundle.vim
-[Windows setup]:https://github.com/gmarik/Vundle.vim/wiki/Vundle-for-Windows
-[FAQ]:https://github.com/gmarik/Vundle.vim/wiki
-[Tips]:https://github.com/gmarik/Vundle.vim/wiki/Tips-and-Tricks
-[Vim]:http://www.vim.org
-[Git]:http://git-scm.com
-[`git clone`]:http://gitref.org/creating/#clone
-
-[Vim scripts]:http://vim-scripts.org/vim/scripts.html
-[help tags]:http://vimdoc.sourceforge.net/htmldoc/helphelp.html#:helptags
-[runtime path]:http://vimdoc.sourceforge.net/htmldoc/options.html#%27runtimepath%27
-
-[configure]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L126-L233
-[install]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L234-L254
-[update]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L255-L265
-[search]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L266-L295
-[clean]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L303-L318
-[interactive mode]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L319-L360
-[interface change]:https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L372-L396
diff --git a/bundle/Vundle.vim/autoload/vundle.vim b/bundle/Vundle.vim/autoload/vundle.vim
deleted file mode 100644
index e458618..0000000
--- a/bundle/Vundle.vim/autoload/vundle.vim
+++ /dev/null
@@ -1,90 +0,0 @@
-" Vundle        is a shortcut for Vim Bundle and Is a simple plugin manager for Vim
-" Author:       gmarik
-" HomePage:     http://github.com/gmarik/Vundle.vim
-" Readme:       http://github.com/gmarik/Vundle.vim/blob/master/README.md
-" Version:      0.10.2
-
-" Plugin Commands
-com! -nargs=+  -bar   Plugin
-\ call vundle#config#bundle(<args>)
-
-com! -nargs=* -bang -complete=custom,vundle#scripts#complete PluginInstall
-\ call vundle#installer#new('!' == '<bang>', <f-args>)
-
-com! -nargs=? -bang -complete=custom,vundle#scripts#complete PluginSearch
-\ call vundle#scripts#all('!' == '<bang>', <q-args>)
-
-com! -nargs=0 -bang PluginList
-\ call vundle#installer#list('!' == '<bang>')
-
-com! -nargs=? -bang   PluginClean
-\ call vundle#installer#clean('!' == '<bang>')
-
-com! -nargs=0         PluginDocs
-\ call vundle#installer#helptags(g:vundle#bundles)
-
-" Aliases
-com! -nargs=* -complete=custom,vundle#scripts#complete PluginUpdate PluginInstall! <args>
-
-" Vundle Aliases
-com! -nargs=? -bang -complete=custom,vundle#scripts#complete VundleInstall PluginInstall<bang> <args>
-com! -nargs=? -bang -complete=custom,vundle#scripts#complete VundleSearch  PluginSearch<bang> <args>
-com! -nargs=? -bang                                          VundleClean   PluginClean<bang>
-com! -nargs=0                                                VundleDocs    PluginDocs
-com!                                                         VundleUpdate  PluginInstall!
-com! -nargs=*       -complete=custom,vundle#scripts#complete VundleUpdate  PluginInstall! <args>
-
-" Deprecated Commands
-com! -nargs=+                                                Bundle        call vundle#config#bundle(<args>)
-com! -nargs=? -bang -complete=custom,vundle#scripts#complete BundleInstall PluginInstall<bang> <args>
-com! -nargs=? -bang -complete=custom,vundle#scripts#complete BundleSearch  PluginSearch<bang> <args>
-com! -nargs=0 -bang                                          BundleList    PluginList<bang>
-com! -nargs=? -bang                                          BundleClean   PluginClean<bang>
-com! -nargs=0                                                BundleDocs    PluginDocs
-com!                                                         BundleUpdate  PluginInstall!
-
-" Set up the signs used in the installer window. (See :help signs)
-if (has('signs'))
-  sign define Vu_error    text=!  texthl=Error
-  sign define Vu_active   text=>  texthl=Comment
-  sign define Vu_todate   text=.  texthl=Comment
-  sign define Vu_new      text=+  texthl=Comment
-  sign define Vu_updated  text=*  texthl=Comment
-  sign define Vu_deleted  text=-  texthl=Comment
-  sign define Vu_helptags text=*  texthl=Comment
-  sign define Vu_pinned   text==  texthl=Comment
-endif
-
-" Set up Vundle.  This function has to be called from the users vimrc file.
-" This will force Vim to source this file as a side effect which wil define
-" the :Plugin command.  After calling this function the user can use the
-" :Plugin command in the vimrc.  It is not possible to do this automatically
-" because when loading the vimrc file no plugins where loaded yet.
-func! vundle#rc(...) abort
-  if a:0 > 0
-    let g:vundle#bundle_dir = expand(a:1, 1)
-  endif
-  call vundle#config#init()
-endf
-
-" Alternative to vundle#rc, offers speed up by modifying rtp only when end()
-" called later.
-func! vundle#begin(...) abort
-  let g:vundle#lazy_load = 1
-  call call('vundle#rc', a:000)
-endf
-
-" Finishes putting plugins on the rtp.
-func! vundle#end(...) abort
-  unlet g:vundle#lazy_load
-  call vundle#config#activate_bundles()
-endf
-
-" Initialize some global variables used by Vundle.
-let vundle#bundle_dir = expand('$HOME/.vim/bundle', 1)
-let vundle#bundles = []
-let vundle#lazy_load = 0
-let vundle#log = []
-let vundle#updated_bundles = []
-
-" vim: set expandtab sts=2 ts=2 sw=2 tw=78 norl:
diff --git a/bundle/Vundle.vim/autoload/vundle/config.vim b/bundle/Vundle.vim/autoload/vundle/config.vim
deleted file mode 100644
index 0e02b11..0000000
--- a/bundle/Vundle.vim/autoload/vundle/config.vim
+++ /dev/null
@@ -1,281 +0,0 @@
-" ---------------------------------------------------------------------------
-" Add a plugin to the runtimepath.
-"
-" arg    -- a string specifying the plugin
-" ...    -- a dictionary of options for the plugin
-" return -- the return value from vundle#config#init_bundle()
-" ---------------------------------------------------------------------------
-func! vundle#config#bundle(arg, ...)
-  let bundle = vundle#config#init_bundle(a:arg, a:000)
-  if !s:check_bundle_name(bundle)
-    return
-  endif
-  if exists('g:vundle#lazy_load') && g:vundle#lazy_load
-    call add(g:vundle#bundles, bundle)
-  else
-    call s:rtp_rm_a()
-    call add(g:vundle#bundles, bundle)
-    call s:rtp_add_a()
-    call s:rtp_add_defaults()
-  endif
-  return bundle
-endf
-
-
-" ---------------------------------------------------------------------------
-"  When lazy bundle load is used (begin/end functions), add all configured
-"  bundles to runtimepath and reorder appropriately.
-" ---------------------------------------------------------------------------
-func! vundle#config#activate_bundles()
-  call s:rtp_add_a()
-  call s:rtp_add_defaults()
-endf
-
-
-" ---------------------------------------------------------------------------
-" Initialize Vundle.
-"
-" Start a new bundles list and make sure the runtimepath does not contain
-" directories from a previous call. In theory, this should only be called
-" once.
-" ---------------------------------------------------------------------------
-func! vundle#config#init()
-  if !exists('g:vundle#bundles') | let g:vundle#bundles = [] | endif
-  call s:rtp_rm_a()
-  let g:vundle#bundles = []
-  let s:bundle_names = {}
-endf
-
-
-" ---------------------------------------------------------------------------
-" Add a list of bundles to the runtimepath and source them.
-"
-" bundles -- a list of bundle objects
-" ---------------------------------------------------------------------------
-func! vundle#config#require(bundles) abort
-  for b in a:bundles
-    call s:rtp_add(b.rtpath)
-    call s:rtp_add(g:vundle#bundle_dir)
-    " TODO: it has to be relative rtpath, not bundle.name
-    exec 'runtime! '.b.name.'/plugin/*.vim'
-    exec 'runtime! '.b.name.'/after/*.vim'
-    call s:rtp_rm(g:vundle#bundle_dir)
-  endfor
-  call s:rtp_add_defaults()
-endf
-
-
-" ---------------------------------------------------------------------------
-" Create a bundle object from a bundle specification.
-"
-" name   -- the bundle specification as a string
-" opts   -- the options dictionary from then bundle definition
-" return -- an initialized bundle object
-" ---------------------------------------------------------------------------
-func! vundle#config#init_bundle(name, opts)
-  if a:name != substitute(a:name, '^\s*\(.\{-}\)\s*$', '\1', '')
-    echo "Spurious leading and/or trailing whitespace found in plugin spec '" . a:name . "'"
-  endif
-  let opts = extend(s:parse_options(a:opts), s:parse_name(substitute(a:name,"['".'"]\+','','g')), 'keep')
-  let b = extend(opts, copy(s:bundle))
-  let b.rtpath = s:rtpath(opts)
-  return b
-endf
-
-
-" ---------------------------------------------------------------------------
-" Check if the current bundle name has already been used in this running
-" instance and show an error to that effect.
-"
-" bundle -- a bundle object whose name is to be checked
-" return -- 0 if the bundle's name has been seen before, 1 otherwise
-" ---------------------------------------------------------------------------
-funct! s:check_bundle_name(bundle)
-  if has_key(s:bundle_names, a:bundle.name)
-    echoerr 'Vundle error: Name collision for Plugin ' . a:bundle.name_spec .
-          \ '. Plugin ' . s:bundle_names[a:bundle.name] .
-          \ ' previously used the name "' . a:bundle.name . '"' .
-          \ '. Skipping Plugin ' . a:bundle.name_spec . '.'
-    return 0
-  elseif a:bundle.name !~ '\v^[A-Za-z0-9_-]%(\.?[A-Za-z0-9_-])*$'
-    echoerr 'Invalid plugin name: ' . a:bundle.name
-    return 0
-  endif
-  let s:bundle_names[a:bundle.name] = a:bundle.name_spec
-  return 1
-endf
-
-
-" ---------------------------------------------------------------------------
-" Parse the options which can be supplied with the bundle specification.
-" Corresponding documentation: vundle-plugins-configure
-"
-" opts   -- a dictionary with the user supplied options for the bundle
-" return -- a dictionary with the user supplied options for the bundle, this
-"           will be merged with a s:bundle object into one dictionary.
-" ---------------------------------------------------------------------------
-func! s:parse_options(opts)
-  " TODO: improve this
-  if len(a:opts) != 1 | return {} | endif
-
-  if type(a:opts[0]) == type({})
-    return a:opts[0]
-  else
-    return {'rev': a:opts[0]}
-  endif
-endf
-
-
-" ---------------------------------------------------------------------------
-" Parse the plugin specification.  Corresponding documentation:
-" vundle-plugins-uris
-"
-" arg    -- the string supplied to identify the plugin
-" return -- a dictionary with the folder name (key 'name') and the uri (key
-"           'uri') for cloning the plugin  and the original argument (key
-"           'name_spec')
-" ---------------------------------------------------------------------------
-func! s:parse_name(arg)
-  let arg = a:arg
-  let git_proto = exists('g:vundle_default_git_proto') ? g:vundle_default_git_proto : 'https'
-
-  if    arg =~? '^\s*\(gh\|github\):\S\+'
-  \  || arg =~? '^[a-z0-9][a-z0-9-]*/[^/]\+$'
-    let uri = git_proto.'://github.com/'.split(arg, ':')[-1]
-    if uri !~? '\.git$'
-      let uri .= '.git'
-    endif
-    let name = substitute(split(uri,'\/')[-1], '\.git\s*$','','i')
-  elseif arg =~? '^\s*\(git@\|git://\)\S\+'
-  \   || arg =~? '\(file\|https\?\)://'
-  \   || arg =~? '\.git\s*$'
-    let uri = arg
-    let name = split( substitute(uri,'/\?\.git\s*$','','i') ,'\/')[-1]
-  else
-    let name = arg
-    let uri  = git_proto.'://github.com/vim-scripts/'.name.'.git'
-  endif
-  return {'name': name, 'uri': uri, 'name_spec': arg }
-endf
-
-
-" ---------------------------------------------------------------------------
-"  Modify the runtimepath, after all bundles have been added, so that the
-"  directories that were in the default runtimepath appear first in the list
-"  (with their 'after' directories last).
-" ---------------------------------------------------------------------------
-func! s:rtp_add_defaults()
-  let current = &rtp
-  set rtp&vim
-  let default = &rtp
-  let &rtp = current
-  let default_rtp_items = split(default, ',')
-  if !empty(default_rtp_items)
-    let first_item = fnameescape(default_rtp_items[0])
-    exec 'set rtp-=' . first_item
-    exec 'set rtp^=' . first_item
-  endif
-endf
-
-
-" ---------------------------------------------------------------------------
-" Remove all paths for the plugins which are managed by Vundle from the
-" runtimepath.
-" ---------------------------------------------------------------------------
-func! s:rtp_rm_a()
-  let paths = map(copy(g:vundle#bundles), 'v:val.rtpath')
-  let prepends = join(paths, ',')
-  let appends = join(paths, '/after,').'/after'
-  exec 'set rtp-='.fnameescape(prepends)
-  exec 'set rtp-='.fnameescape(appends)
-endf
-
-
-" ---------------------------------------------------------------------------
-" Add all paths for the plugins which are managed by Vundle to the
-" runtimepath.
-" ---------------------------------------------------------------------------
-func! s:rtp_add_a()
-  let paths = map(copy(g:vundle#bundles), 'v:val.rtpath')
-  let prepends = join(paths, ',')
-  let appends = join(paths, '/after,').'/after'
-  exec 'set rtp^='.fnameescape(prepends)
-  exec 'set rtp+='.fnameescape(appends)
-endf
-
-
-" ---------------------------------------------------------------------------
-" Remove a directory and the corresponding 'after' directory from runtimepath.
-"
-" dir    -- the directory name to be removed as a string.  The corresponding
-"           'after' directory will also be removed.
-" ---------------------------------------------------------------------------
-func! s:rtp_rm(dir) abort
-  exec 'set rtp-='.fnameescape(expand(a:dir, 1))
-  exec 'set rtp-='.fnameescape(expand(a:dir.'/after', 1))
-endf
-
-
-" ---------------------------------------------------------------------------
-" Add a directory and the corresponding 'after' directory to runtimepath.
-"
-" dir    -- the directory name to be added as a string.  The corresponding
-"           'after' directory will also be added.
-" ---------------------------------------------------------------------------
-func! s:rtp_add(dir) abort
-  exec 'set rtp^='.fnameescape(expand(a:dir, 1))
-  exec 'set rtp+='.fnameescape(expand(a:dir.'/after', 1))
-endf
-
-
-" ---------------------------------------------------------------------------
-" Expand and simplify a path.
-"
-" path   -- the path to expand as a string
-" return -- the expanded and simplified path
-" ---------------------------------------------------------------------------
-func! s:expand_path(path) abort
-  return simplify(expand(a:path, 1))
-endf
-
-
-" ---------------------------------------------------------------------------
-" Find the actual path inside a bundle directory to be added to the
-" runtimepath.  It might be provided by the user with the 'rtp' option.
-" Corresponding documentation: vundle-plugins-configure
-"
-" opts   -- a bundle dict
-" return -- expanded path to the corresponding plugin directory
-" ---------------------------------------------------------------------------
-func! s:rtpath(opts)
-  return has_key(a:opts, 'rtp') ? s:expand_path(a:opts.path().'/'.a:opts.rtp) : a:opts.path()
-endf
-
-
-" ---------------------------------------------------------------------------
-" a bundle 'object'
-" ---------------------------------------------------------------------------
-let s:bundle = {}
-
-
-" ---------------------------------------------------------------------------
-" Return the absolute path to the directory inside the bundle directory
-" (prefix) where thr bundle will be cloned.
-"
-" return -- the target location to clone this bundle to
-" ---------------------------------------------------------------------------
-func! s:bundle.path()
-  return s:expand_path(g:vundle#bundle_dir.'/') . self.name
-endf
-
-
-" ---------------------------------------------------------------------------
-"  Determine if the bundle has the pinned attribute set in the config
-"
-"  return -- 1 if the bundle is pinned, 0 otherwise
-" ---------------------------------------------------------------------------
-func! s:bundle.is_pinned()
-  return get(self, 'pinned')
-endf
-
-" vim: set expandtab sts=2 ts=2 sw=2 tw=78 norl:
diff --git a/bundle/Vundle.vim/autoload/vundle/installer.vim b/bundle/Vundle.vim/autoload/vundle/installer.vim
deleted file mode 100644
index 472271a..0000000
--- a/bundle/Vundle.vim/autoload/vundle/installer.vim
+++ /dev/null
@@ -1,547 +0,0 @@
-" ---------------------------------------------------------------------------
-" Try to clone all new bundles given (or all bundles in g:vundle#bundles by
-" default) to g:vundle#bundle_dir.  If a:bang is 1 it will also update all
-" plugins (git pull).
-"
-" bang   -- 1 or 0
-" ...    -- any number of bundle specifications (separate arguments)
-" ---------------------------------------------------------------------------
-func! vundle#installer#new(bang, ...) abort
-  " No specific plugins are specified. Operate on all plugins.
-  if a:0 == 0
-    let bundles = g:vundle#bundles
-  " Specific plugins are specified for update. Update them.
-  elseif (a:bang)
-    let bundles = filter(copy(g:vundle#bundles), 'index(a:000, v:val.name) > -1')
-  " Specific plugins are specified for installation. Install them.
-  else
-    let bundles = map(copy(a:000), 'vundle#config#bundle(v:val, {})')
-  endif
-
-  if empty(bundles)
-    echoerr 'No bundles were selected for operation'
-    return
-  endif
-
-  let names = vundle#scripts#bundle_names(map(copy(bundles), 'v:val.name_spec'))
-  call vundle#scripts#view('Installer',['" Installing plugins to '.expand(g:vundle#bundle_dir, 1)], names +  ['Helptags'])
-
-  " This calls 'add' as a normal mode command. This is a buffer local mapping
-  " defined in vundle#scripts#view(). The mapping will call a buffer local
-  " command InstallPlugin which in turn will call vundle#installer#run() with
-  " vundle#installer#install().
-  call s:process(a:bang, (a:bang ? 'add!' : 'add'))
-
-  call vundle#config#require(bundles)
-endf
-
-
-" ---------------------------------------------------------------------------
-" Iterate over all lines in a Vundle window and execute the given command for
-" every line.  Used by the installation and cleaning functions.
-"
-" bang   -- not used (FIXME)
-" cmd    -- the (normal mode) command to execute for every line as a string
-" ---------------------------------------------------------------------------
-func! s:process(bang, cmd)
-  let msg = ''
-
-  redraw
-  sleep 1m
-
-  let lines = (getline('.','$')[0:-2])
-
-  for line in lines
-    redraw
-
-    exec ':norm '.a:cmd
-
-    if 'error' == s:last_status
-      let msg = 'With errors; press l to view log'
-    endif
-
-    if 'updated' == s:last_status && empty(msg)
-      let msg = 'Plugins updated; press u to view changelog'
-    endif
-
-    " goto next one
-    exec ':+1'
-
-    setl nomodified
-  endfor
-
-  redraw
-  echo 'Done! '.msg
-endf
-
-
-" ---------------------------------------------------------------------------
-" Call another function in the different Vundle windows.
-"
-" func_name -- the function to call
-" name      -- the bundle name to call func_name for (string)
-" ...       -- the argument to be used when calling func_name (only the first
-"              optional argument will be used)
-" return    -- the status returned by the call to func_name
-" ---------------------------------------------------------------------------
-func! vundle#installer#run(func_name, name, ...) abort
-  let n = a:name
-
-  echo 'Processing '.n
-  call s:sign('active')
-
-  sleep 1m
-
-  let status = call(a:func_name, a:1)
-
-  call s:sign(status)
-
-  redraw
-
-  if 'new' == status
-    echo n.' installed'
-  elseif 'updated' == status
-    echo n.' updated'
-  elseif 'todate' == status
-    echo n.' already installed'
-  elseif 'deleted' == status
-    echo n.' deleted'
-  elseif 'helptags' == status
-    echo n.' regenerated'
-  elseif 'pinned' == status
-    echo n.' pinned'
-  elseif 'error' == status
-    echohl Error
-    echo 'Error processing '.n
-    echohl None
-    sleep 1
-  else
-    throw 'whoops, unknown status:'.status
-  endif
-
-  let s:last_status = status
-
-  return status
-endf
-
-
-" ---------------------------------------------------------------------------
-" Put a sign on the current line, indicating the status of the installation
-" step.
-"
-" status -- string describing the status
-" ---------------------------------------------------------------------------
-func! s:sign(status)
-  if (!has('signs'))
-    return
-  endif
-
-  exe ":sign place ".line('.')." line=".line('.')." name=Vu_". a:status ." buffer=" . bufnr("%")
-endf
-
-
-" ---------------------------------------------------------------------------
-" Install a plugin, then add it to the runtimepath and source it.
-"
-" bang   -- 1 or 0, passed directly to vundle#installer#install()
-" name   -- the name of a bundle (string)
-" return -- the return value from vundle#installer#install()
-" ---------------------------------------------------------------------------
-func! vundle#installer#install_and_require(bang, name) abort
-  let result = vundle#installer#install(a:bang, a:name)
-  let b = vundle#config#bundle(a:name, {})
-  call vundle#installer#helptags([b])
-  call vundle#config#require([b])
-  return result
-endf
-
-
-" ---------------------------------------------------------------------------
-" Install or update a bundle given by its name.
-"
-" bang   -- 1 or 0, passed directly to s:sync()
-" name   -- the name of a bundle (string)
-" return -- the return value from s:sync()
-" ---------------------------------------------------------------------------
-func! vundle#installer#install(bang, name) abort
-  if !isdirectory(g:vundle#bundle_dir) | call mkdir(g:vundle#bundle_dir, 'p') | endif
-
-  let n = substitute(a:name,"['".'"]\+','','g')
-  let matched = filter(copy(g:vundle#bundles), 'v:val.name_spec == n')
-
-  if len(matched) > 0
-    let b = matched[0]
-  else
-    let b = vundle#config#init_bundle(a:name, {})
-  endif
-
-  return s:sync(a:bang, b)
-endf
-
-
-" ---------------------------------------------------------------------------
-" Call :helptags for all bundles in g:vundle#bundles.
-"
-" return -- 'error' if an error occurred, else return 'helptags'
-" ---------------------------------------------------------------------------
-func! vundle#installer#docs() abort
-  let error_count = vundle#installer#helptags(g:vundle#bundles)
-  if error_count > 0
-      return 'error'
-  endif
-  return 'helptags'
-endf
-
-
-" ---------------------------------------------------------------------------
-" Call :helptags for a list of bundles.
-"
-" bundles -- a list of bundle dictionaries for which :helptags should be
-"            called.
-" return  -- the number of directories where :helptags failed
-" ---------------------------------------------------------------------------
-func! vundle#installer#helptags(bundles) abort
-  let bundle_dirs = map(copy(a:bundles),'v:val.rtpath')
-  let help_dirs = filter(bundle_dirs, 's:has_doc(v:val)')
-
-  call s:log('')
-  call s:log('Helptags:')
-
-  let statuses = map(copy(help_dirs), 's:helptags(v:val)')
-  let errors = filter(statuses, 'v:val == 0')
-
-  call s:log('Helptags: '.len(help_dirs).' plugins processed')
-
-  return len(errors)
-endf
-
-
-" ---------------------------------------------------------------------------
-" List all installed plugins.
-" Corresponding documentation: vundle-plugins-list
-"
-" bang   -- not used
-" ---------------------------------------------------------------------------
-func! vundle#installer#list(bang) abort
-  let bundles = vundle#scripts#bundle_names(map(copy(g:vundle#bundles), 'v:val.name_spec'))
-  call vundle#scripts#view('list', ['" My Plugins'], bundles)
-  redraw
-  echo len(g:vundle#bundles).' plugins configured'
-endf
-
-
-" ---------------------------------------------------------------------------
-" List and remove all directories in the bundle directory which are not
-" activated (added to the bundle list).
-"
-" bang   -- 0 if the user should be asked to confirm every deletion, 1 if they
-"           should be removed unconditionally
-" ---------------------------------------------------------------------------
-func! vundle#installer#clean(bang) abort
-  let bundle_dirs = map(copy(g:vundle#bundles), 'v:val.path()')
-  let all_dirs = (v:version > 702 || (v:version == 702 && has("patch51")))
-  \   ? split(globpath(g:vundle#bundle_dir, '*', 1), "\n")
-  \   : split(globpath(g:vundle#bundle_dir, '*'), "\n")
-  let x_dirs = filter(all_dirs, '0 > index(bundle_dirs, v:val)')
-
-  if empty(x_dirs)
-    let headers = ['" All clean!']
-    let names = []
-  else
-    let headers = ['" Removing Plugins:']
-    let names = vundle#scripts#bundle_names(map(copy(x_dirs), 'fnamemodify(v:val, ":t")'))
-  end
-
-  call vundle#scripts#view('clean', headers, names)
-  redraw
-
-  if (a:bang || empty(names))
-    call s:process(a:bang, 'D')
-  else
-    call inputsave()
-    let response = input('Continue? [Y/n]: ')
-    call inputrestore()
-    if (response =~? 'y' || response == '')
-      call s:process(a:bang, 'D')
-    endif
-  endif
-endf
-
-
-" ---------------------------------------------------------------------------
-" Delete to directory for a plugin.
-"
-" bang     -- not used
-" dir_name -- the bundle directory to be deleted (as a string)
-" return   -- 'error' if an error occurred, 'deleted' if the plugin folder was
-"             successfully deleted
-" ---------------------------------------------------------------------------
-func! vundle#installer#delete(bang, dir_name) abort
-
-  let cmd = ((has('win32') || has('win64')) && empty(matchstr(&shell, 'sh'))) ?
-  \           'rmdir /S /Q' :
-  \           'rm -rf'
-
-  let bundle = vundle#config#init_bundle(a:dir_name, {})
-  let cmd .= ' '.vundle#installer#shellesc(bundle.path())
-
-  let out = s:system(cmd)
-
-  call s:log('')
-  call s:log('Plugin '.a:dir_name)
-  call s:log(cmd, '$ ')
-  call s:log(out, '> ')
-
-  if 0 != v:shell_error
-    return 'error'
-  else
-    return 'deleted'
-  endif
-endf
-
-
-" ---------------------------------------------------------------------------
-" Check if a bundled plugin has any documentation.
-"
-" rtp    -- a path (string) where the plugin is installed
-" return -- 1 if some documentation was found, 0 otherwise
-" ---------------------------------------------------------------------------
-func! s:has_doc(rtp) abort
-  return isdirectory(a:rtp.'/doc')
-  \   && (!filereadable(a:rtp.'/doc/tags') || filewritable(a:rtp.'/doc/tags'))
-  \   && (v:version > 702 || (v:version == 702 && has("patch51")))
-  \     ? !(empty(glob(a:rtp.'/doc/*.txt', 1)) && empty(glob(a:rtp.'/doc/*.??x', 1)))
-  \     : !(empty(glob(a:rtp.'/doc/*.txt')) && empty(glob(a:rtp.'/doc/*.??x')))
-endf
-
-
-" ---------------------------------------------------------------------------
-" Update the helptags for a plugin.
-"
-" rtp    -- the path to the plugin's root directory (string)
-" return -- 1 if :helptags succeeded, 0 otherwise
-" ---------------------------------------------------------------------------
-func! s:helptags(rtp) abort
-  " it is important to keep trailing slash here
-  let doc_path = resolve(a:rtp . '/doc/')
-  call s:log(':helptags '.doc_path)
-  try
-    execute 'helptags ' . doc_path
-  catch
-    call s:log("> Error running :helptags ".doc_path)
-    return 0
-  endtry
-  return 1
-endf
-
-
-" ---------------------------------------------------------------------------
-" Get the URL for the remote called 'origin' on the repository that
-" corresponds to a given bundle.
-"
-" bundle -- a bundle object to check the repository for
-" return -- the URL for the origin remote (string)
-" ---------------------------------------------------------------------------
-func! s:get_current_origin_url(bundle) abort
-  let cmd = 'cd '.vundle#installer#shellesc(a:bundle.path()).' && git config --get remote.origin.url'
-  let cmd = vundle#installer#shellesc_cd(cmd)
-  let out = s:strip(s:system(cmd))
-  return out
-endf
-
-
-" ---------------------------------------------------------------------------
-" Get a short sha of the HEAD of the repository for a given bundle
-"
-" bundle -- a bundle object
-" return -- A 15 character log sha for the current HEAD
-" ---------------------------------------------------------------------------
-func! s:get_current_sha(bundle)
-  let cmd = 'cd '.vundle#installer#shellesc(a:bundle.path()).' && git rev-parse HEAD'
-  let cmd = vundle#installer#shellesc_cd(cmd)
-  let out = s:system(cmd)[0:15]
-  return out
-endf
-
-
-" ---------------------------------------------------------------------------
-" Create the appropriate sync command to run according to the current state of
-" the local repository (clone, pull, reset, etc).
-"
-" In the case of a pull (update), also return the current sha, so that we can
-" later check that there has been an upgrade.
-"
-" bang   -- 0 if only new plugins should be installed, 1 if existing plugins
-"           should be updated
-" bundle -- a bundle object to create the sync command for
-" return -- A list containing the command to run and the sha for the current
-"           HEAD
-" ---------------------------------------------------------------------------
-func! s:make_sync_command(bang, bundle) abort
-  let git_dir = expand(a:bundle.path().'/.git/', 1)
-  if isdirectory(git_dir) || filereadable(expand(a:bundle.path().'/.git', 1))
-
-    let current_origin_url = s:get_current_origin_url(a:bundle)
-    if current_origin_url != a:bundle.uri
-      call s:log('Plugin URI change detected for Plugin ' . a:bundle.name)
-      call s:log('>  Plugin ' . a:bundle.name . ' old URI: ' . current_origin_url)
-      call s:log('>  Plugin ' . a:bundle.name . ' new URI: ' . a:bundle.uri)
-      " Directory names match but the origin remotes are not the same
-      let cmd_parts = [
-                  \ 'cd '.vundle#installer#shellesc(a:bundle.path()) ,
-                  \ 'git remote set-url origin ' . vundle#installer#shellesc(a:bundle.uri),
-                  \ 'git fetch',
-                  \ 'git reset --hard origin/HEAD',
-                  \ 'git submodule update --init --recursive',
-                  \ ]
-      let cmd = join(cmd_parts, ' && ')
-      let cmd = vundle#installer#shellesc_cd(cmd)
-      let initial_sha = ''
-      return [cmd, initial_sha]
-    endif
-
-    if !(a:bang)
-      " The repo exists, and no !, so leave as it is.
-      return ['', '']
-    endif
-
-    let cmd_parts = [
-                \ 'cd '.vundle#installer#shellesc(a:bundle.path()),
-                \ 'git pull',
-                \ 'git submodule update --init --recursive',
-                \ ]
-    let cmd = join(cmd_parts, ' && ')
-    let cmd = vundle#installer#shellesc_cd(cmd)
-
-    let initial_sha = s:get_current_sha(a:bundle)
-  else
-    let cmd = 'git clone --recursive '.vundle#installer#shellesc(a:bundle.uri).' '.vundle#installer#shellesc(a:bundle.path())
-    let initial_sha = ''
-  endif
-  return [cmd, initial_sha]
-endf
-
-
-" ---------------------------------------------------------------------------
-" Install or update a given bundle object with git.
-"
-" bang   -- 0 if only new plugins should be installed, 1 if existing plugins
-"           should be updated
-" bundle -- a bundle object (dictionary)
-" return -- a string indicating the status of the bundle installation:
-"            - todate  : Nothing was updated or the repository was up to date
-"            - new     : The plugin was newly installed
-"            - updated : Some changes where pulled via git
-"            - error   : An error occurred in the shell command
-"            - pinned  : The bundle is marked as pinned
-" ---------------------------------------------------------------------------
-func! s:sync(bang, bundle) abort
-  " Do not sync if this bundle is pinned
-  if a:bundle.is_pinned()
-    return 'pinned'
-  endif
-
-  let [ cmd, initial_sha ] = s:make_sync_command(a:bang, a:bundle)
-  if empty(cmd)
-      return 'todate'
-  endif
-
-  let out = s:system(cmd)
-  call s:log('')
-  call s:log('Plugin '.a:bundle.name_spec)
-  call s:log(cmd, '$ ')
-  call s:log(out, '> ')
-
-  if 0 != v:shell_error
-    return 'error'
-  end
-
-  if empty(initial_sha)
-    return 'new'
-  endif
-
-  let updated_sha = s:get_current_sha(a:bundle)
-
-  if initial_sha == updated_sha
-    return 'todate'
-  endif
-
-  call add(g:vundle#updated_bundles, [initial_sha, updated_sha, a:bundle])
-  return 'updated'
-endf
-
-
-" ---------------------------------------------------------------------------
-" Escape special characters in a string to be able to use it as a shell
-" command with system().
-"
-" cmd    -- the string holding the shell command
-" return -- a string with the relevant characters escaped
-" ---------------------------------------------------------------------------
-func! vundle#installer#shellesc(cmd) abort
-  if ((has('win32') || has('win64')) && empty(matchstr(&shell, 'sh')))
-    return '"' . substitute(a:cmd, '"', '\\"', 'g') . '"'
-  endif
-  return shellescape(a:cmd)
-endf
-
-
-" ---------------------------------------------------------------------------
-" Fix a cd shell command to be used on Windows.
-"
-" cmd    -- the command to be fixed (string)
-" return -- the fixed command (string)
-" ---------------------------------------------------------------------------
-func! vundle#installer#shellesc_cd(cmd) abort
-  if ((has('win32') || has('win64')) && empty(matchstr(&shell, 'sh')))
-    let cmd = substitute(a:cmd, '^cd ','cd /d ','')  " add /d switch to change drives
-    return cmd
-  else
-    return a:cmd
-  endif
-endf
-
-
-" ---------------------------------------------------------------------------
-" Make a system call.  This can be used to change the way system calls
-" are made during developing, without searching the whole code base for
-" actual system() calls.
-"
-" cmd    -- the command passed to system() (string)
-" return -- the return value from system()
-" ---------------------------------------------------------------------------
-func! s:system(cmd) abort
-  return system(a:cmd)
-endf
-
-
-" ---------------------------------------------------------------------------
-" Add a log message to Vundle's internal logging variable.
-"
-" str    -- the log message (string)
-" prefix -- optional prefix for multi-line entries (string)
-" return -- a:str
-" ---------------------------------------------------------------------------
-func! s:log(str, ...) abort
-  let prefix = a:0 > 0 ? a:1 : ''
-  let fmt = '%Y-%m-%d %H:%M:%S'
-  let lines = split(a:str, '\n', 1)
-  let time = strftime(fmt)
-  for line in lines
-      call add(g:vundle#log, '['. time .'] '. prefix . line)
-  endfor
-  return a:str
-endf
-
-
-" ---------------------------------------------------------------------------
-" Remove leading and trailing whitespace from a string
-"
-" str    -- The string to rid of trailing and leading spaces
-" return -- A string stripped of side spaces
-" ---------------------------------------------------------------------------
-func! s:strip(str)
-  return substitute(a:str, '\%^\_s*\(.\{-}\)\_s*\%$', '\1', '')
-endf
-
-" vim: set expandtab sts=2 ts=2 sw=2 tw=78 norl:
diff --git a/bundle/Vundle.vim/autoload/vundle/scripts.vim b/bundle/Vundle.vim/autoload/vundle/scripts.vim
deleted file mode 100644
index 5d56476..0000000
--- a/bundle/Vundle.vim/autoload/vundle/scripts.vim
+++ /dev/null
@@ -1,270 +0,0 @@
-" ---------------------------------------------------------------------------
-" Search the database from vim-script.org for a matching plugin.  If no
-" argument is given, list all plugins. This function is used by the :Plugins
-" and :PluginSearch commands.
-"
-" bang -- if 1 refresh the script name cache, if 0 don't
-" ...  -- a plugin name to search for
-" ---------------------------------------------------------------------------
-func! vundle#scripts#all(bang, ...)
-  let b:match = ''
-  let info = ['"Keymap: i - Install plugin; c - Cleanup; s - Search; R - Reload list']
-  let matches = s:load_scripts(a:bang)
-  if !empty(a:1)
-    let matches = filter(matches, 'v:val =~? "'.escape(a:1,'"').'"')
-    let info += ['"Search results for: '.a:1]
-    " TODO: highlight matches
-    let b:match = a:1
-  endif
-  call vundle#scripts#view('search',info, vundle#scripts#bundle_names(reverse(matches)))
-  redraw
-  echo len(matches).' plugins found'
-endf
-
-
-" ---------------------------------------------------------------------------
-" Repeat the search for bundles.
-" ---------------------------------------------------------------------------
-func! vundle#scripts#reload() abort
-  silent exec ':PluginSearch! '.(exists('b:match') ? b:match : '')
-  redraw
-endf
-
-
-" ---------------------------------------------------------------------------
-" Complete names for bundles in the command line.
-"
-" a, c, d -- see :h command-completion-custom
-" return  -- all valid plugin names from vim-scripts.org as completion
-"            candidates, or all installed plugin names when running an 'Update
-"            variant'. see also :h command-completion-custom
-" ---------------------------------------------------------------------------
-func! vundle#scripts#complete(a,c,d)
-  if match(a:c, '\v^%(Plugin|Vundle)%(Install!|Update)') == 0
-    " Only installed plugins if updating
-    return join(map(copy(g:vundle#bundles), 'v:val.name'), "\n")
-  else
-    " Or all known plugins otherwise
-    return join(s:load_scripts(0),"\n")
-  endif
-endf
-
-
-" ---------------------------------------------------------------------------
-" View the logfile after an update or installation.
-" ---------------------------------------------------------------------------
-func! s:view_log()
-  if !exists('s:log_file')
-    let s:log_file = tempname()
-  endif
-
-  if bufloaded(s:log_file)
-    execute 'silent bdelete' s:log_file
-  endif
-  call writefile(g:vundle#log, s:log_file)
-  execute 'silent pedit ' . s:log_file
-
-  wincmd P | wincmd H
-endf
-
-
-" ---------------------------------------------------------------------------
-" Parse the output from git log after an update to create a change log for the
-" user.
-" ---------------------------------------------------------------------------
-func! s:create_changelog() abort
-  let changelog = ['Updated Plugins:']
-  for bundle_data in g:vundle#updated_bundles
-    let initial_sha = bundle_data[0]
-    let updated_sha = bundle_data[1]
-    let bundle      = bundle_data[2]
-
-    let cmd = 'cd '.vundle#installer#shellesc(bundle.path()).
-          \              ' && git log --pretty=format:"%s   %an, %ar" --graph '.
-          \               initial_sha.'..'.updated_sha
-
-    let cmd = vundle#installer#shellesc_cd(cmd)
-
-    let updates = system(cmd)
-
-    call add(changelog, '')
-    call add(changelog, 'Updated Plugin: '.bundle.name)
-
-    if bundle.uri =~ "https://github.com"
-      call add(changelog, 'Compare at: '.bundle.uri[0:-5].'/compare/'.initial_sha.'...'.updated_sha)
-    endif
-
-    for update in split(updates, '\n')
-      let update = substitute(update, '\s\+$', '', '')
-      call add(changelog, '  '.update)
-    endfor
-  endfor
-  return changelog
-endf
-
-
-" ---------------------------------------------------------------------------
-" View the change log after an update or installation.
-" ---------------------------------------------------------------------------
-func! s:view_changelog()
-  if !exists('s:changelog_file')
-    let s:changelog_file = tempname()
-  endif
-
-  if bufloaded(s:changelog_file)
-    execute 'silent bdelete' s:changelog_file
-  endif
-  call writefile(s:create_changelog(), s:changelog_file)
-  execute 'silent pedit' s:changelog_file
-
-  wincmd P | wincmd H
-endf
-
-
-" ---------------------------------------------------------------------------
-" Create a list of 'Plugin ...' lines from a list of bundle names.
-"
-" names  -- a list of names (strings) of plugins
-" return -- a list of 'Plugin ...' lines suitable to be written to a buffer
-" ---------------------------------------------------------------------------
-func! vundle#scripts#bundle_names(names)
-  return map(copy(a:names), ' printf("Plugin ' ."'%s'".'", v:val) ')
-endf
-
-
-" ---------------------------------------------------------------------------
-" Open a buffer to display information to the user.  Several special commands
-" are defined in the new buffer.
-"
-" title   -- a title for the new buffer
-" headers -- a list of header lines to be displayed at the top of the buffer
-" results -- the main information to be displayed in the buffer (list of
-"            strings)
-" ---------------------------------------------------------------------------
-func! vundle#scripts#view(title, headers, results)
-  if exists('s:view') && bufloaded(s:view)
-    exec s:view.'bd!'
-  endif
-
-  exec 'silent pedit [Vundle] '.a:title
-
-  wincmd P | wincmd H
-
-  let s:view = bufnr('%')
-  "
-  " make buffer modifiable
-  " to append without errors
-  set modifiable
-
-  call append(0, a:headers + a:results)
-
-  setl buftype=nofile
-  setl noswapfile
-
-  setl cursorline
-  setl nonu ro noma
-  if (exists('&relativenumber')) | setl norelativenumber | endif
-
-  setl ft=vundle
-  setl syntax=vim
-  syn keyword vimCommand Plugin
-  syn keyword vimCommand Bundle
-  syn keyword vimCommand Helptags
-
-  com! -buffer -bang -nargs=1 DeletePlugin
-    \ call vundle#installer#run('vundle#installer#delete', split(<q-args>,',')[0], ['!' == '<bang>', <args>])
-
-  com! -buffer -bang -nargs=? InstallAndRequirePlugin
-    \ call vundle#installer#run('vundle#installer#install_and_require', split(<q-args>,',')[0], ['!' == '<bang>', <q-args>])
-
-  com! -buffer -bang -nargs=? InstallPlugin
-    \ call vundle#installer#run('vundle#installer#install', split(<q-args>,',')[0], ['!' == '<bang>', <q-args>])
-
-  com! -buffer -bang -nargs=0 InstallHelptags
-    \ call vundle#installer#run('vundle#installer#docs', 'helptags', [])
-
-  com! -buffer -nargs=0 VundleLog call s:view_log()
-
-  com! -buffer -nargs=0 VundleChangelog call s:view_changelog()
-
-  nnoremap <buffer> q :silent bd!<CR>
-  nnoremap <buffer> D :exec 'Delete'.getline('.')<CR>
-
-  nnoremap <buffer> add  :exec 'Install'.getline('.')<CR>
-  nnoremap <buffer> add! :exec 'Install'.substitute(getline('.'), '^Plugin ', 'Plugin! ', '')<CR>
-
-  nnoremap <buffer> i :exec 'InstallAndRequire'.getline('.')<CR>
-  nnoremap <buffer> I :exec 'InstallAndRequire'.substitute(getline('.'), '^Plugin ', 'Plugin! ', '')<CR>
-
-  nnoremap <buffer> l :VundleLog<CR>
-  nnoremap <buffer> u :VundleChangelog<CR>
-  nnoremap <buffer> h :h vundle<CR>
-  nnoremap <buffer> ? :norm h<CR>
-
-  nnoremap <buffer> c :PluginClean<CR>
-  nnoremap <buffer> C :PluginClean!<CR>
-
-  nnoremap <buffer> s :PluginSearch
-  nnoremap <buffer> R :call vundle#scripts#reload()<CR>
-
-  " goto first line after headers
-  exec ':'.(len(a:headers) + 1)
-endf
-
-
-" ---------------------------------------------------------------------------
-" Load the plugin database from vim-scripts.org .
-"
-" to     -- the filename (string) to save the database to
-" return -- 0 on success, 1 if an error occurred
-" ---------------------------------------------------------------------------
-func! s:fetch_scripts(to)
-  let scripts_dir = fnamemodify(expand(a:to, 1), ":h")
-  if !isdirectory(scripts_dir)
-    call mkdir(scripts_dir, "p")
-  endif
-
-  let l:vim_scripts_json = 'http://vim-scripts.org/api/scripts.json'
-  if executable("curl")
-    let cmd = 'curl --fail -s -o '.vundle#installer#shellesc(a:to).' '.l:vim_scripts_json
-  elseif executable("wget")
-    let temp = vundle#installer#shellesc(tempname())
-    let cmd = 'wget -q -O '.temp.' '.l:vim_scripts_json. ' && mv -f '.temp.' '.vundle#installer#shellesc(a:to)
-    if (has('win32') || has('win64'))
-      let cmd = substitute(cmd, 'mv -f ', 'move /Y ', '') " change force flag
-      let cmd = vundle#installer#shellesc(cmd)
-    end
-  else
-    echoerr 'Error curl or wget is not available!'
-    return 1
-  endif
-
-  call system(cmd)
-
-  if (0 != v:shell_error)
-    echoerr 'Error fetching scripts!'
-    return v:shell_error
-  endif
-  return 0
-endf
-
-
-" ---------------------------------------------------------------------------
-" Load the plugin database and return a list of all plugins.
-"
-" bang   -- if 1 download the redatabase, else only download if it is not
-"           readable on disk (i.e. does not exist)
-" return -- a list of strings, these are the names (valid bundle
-"           specifications) of all plugins from vim-scripts.org
-" ---------------------------------------------------------------------------
-func! s:load_scripts(bang)
-  let f = expand(g:vundle#bundle_dir.'/.vundle/script-names.vim-scripts.org.json', 1)
-  if a:bang || !filereadable(f)
-    if 0 != s:fetch_scripts(f)
-      return []
-    end
-  endif
-  return eval(readfile(f, 'b')[0])
-endf
-
-" vim: set expandtab sts=2 ts=2 sw=2 tw=78 norl:
diff --git a/bundle/Vundle.vim/changelog.md b/bundle/Vundle.vim/changelog.md
deleted file mode 100644
index b620840..0000000
--- a/bundle/Vundle.vim/changelog.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Change Log
-==========
-F = Feature, B = Bug Fix, D = Doc Change
-
-### Version 0.10.2
-
-- B: #430 Put user script directories before system directories in rtp
-- B: #455 Rename functions that start with `g:` + lowercase letter (Vim patch 7.4.264)
-
-### Version 0.10.1
-- B: #451 Escape spaces when handling rtp directories
-
-### Version 0.10
-- F: #415 Support plugin pinning (for non-git repos & preventing updates)
-- F: #440 Detect plugin name collisions
-- F: #418 Deferred rtp manipulation (speeds up start)
-- B: #418 Leave default rtp directories (i.e. ~/.vim) where they should be
-- B: #429 Fix newline character in log
-- B: #440 Detect changed remotes & update repos
-- D: #435 Image update in README.md
-- D: #419 Add function documentation
-- D: #436 Rename vundle to Vundle.vim, add modelines, quickstart update
diff --git a/bundle/Vundle.vim/doc/vundle.txt b/bundle/Vundle.vim/doc/vundle.txt
deleted file mode 100644
index 9a2670a..0000000
--- a/bundle/Vundle.vim/doc/vundle.txt
+++ /dev/null
@@ -1,411 +0,0 @@
-*vundle.txt*          Vundle, a plug-in manager for Vim.             *vundle*
-
-                              VUNDLE MANUAL
-
-1. About Vundle                                    |vundle-about|
-2. Quick Start                                     |vundle-quickstart|
-3. Plugins                                         |vundle-plugins|
-  3.1. Configuring Plugins                         |vundle-plugins-configure|
-  3.2. Supported URIs                              |vundle-plugins-uris|
-  3.3. Installing Plugins                          |vundle-plugins-install|
-  3.4. Updating Plugins                            |vundle-plugins-update|
-  3.5. Searching Plugins                           |vundle-plugins-search|
-  3.6. Listing Plugins                             |vundle-plugins-list|
-  3.7. Cleaning Up                                 |vundle-plugins-cleanup|
-4. Interactive Mode                                |vundle-interactive|
-5. Key Mappings                                    |vundle-keymappings|
-6. Options                                         |vundle-options|
-7. Plugin Interface Change                         |vundle-interface-change|
-
-=============================================================================
-1. ABOUT VUNDLE ~
-                                                               *vundle-about*
-
-Vundle is short for Vim bundle and is a Vim plugin manager.
-
-Vundle allows you to...
-
-  - keep track of and configure your scripts right in the `.vimrc`
-  - install configured scripts (a.k.a. bundle)
-  - update configured scripts
-  - search by name all available Vim scripts
-  - clean unused scripts up
-  - run the above actions in a single keypress with interactive mode
-
-Vundle automatically...
-
-  - manages the runtime path of your installed scripts
-  - regenerates help tags after installing and updating
-
-Vundle's search uses http://vim-scripts.org to provide a list of all
-available Vim scripts.
-
-Vundle is undergoing an interface change, see |vundle-interface-change| for
-more information.
-
-=============================================================================
-2. QUICK START ~
-                                                          *vundle-quickstart*
-
-1. Introduction:
-
-  Installation requires `Git` and triggers git clone for each configured
-  repository to `~/.vim/bundle/` by default. Curl is required for search.
-
-                                                             *vundle-windows*
-  If you are using Windows, see instructions on the Wiki
-  https://github.com/gmarik/Vundle.vim/wiki/Vundle-for-Windows.
-
-                                                                 *vundle-faq*
-  If you run into any issues, please consult the FAQ at
-  https://github.com/gmarik/Vundle.vim/wiki
-
-2. Setup Vundle:
->
-  git clone https://github.com/gmarik/Vundle.vim.git ~/.vim/bundle/Vundle.vim
-<
-3. Configure bundles:
-
-  Put this at the top of your `.vimrc` to use Vundle. Remove bundles you
-  don't need, they are for illustration purposes.
->
-    set nocompatible              " be iMproved, required
-    filetype off                  " required
-
-    " set the runtime path to include Vundle and initialize
-    set rtp+=~/.vim/bundle/Vundle.vim
-    call vundle#begin()
-    " alternatively, pass a path where Vundle should install plugins
-    "call vundle#begin('~/some/path/here')
-
-    " let Vundle manage Vundle, required
-    Plugin 'gmarik/Vundle.vim'
-
-    " The following are examples of different formats supported.
-    " Keep Plugin commands between vundle#begin/end.
-    " plugin on GitHub repo
-    Plugin 'tpope/vim-fugitive'
-    " plugin from http://vim-scripts.org/vim/scripts.html
-    Plugin 'L9'
-    " Git plugin not hosted on GitHub
-    Plugin 'git://git.wincent.com/command-t.git'
-    " git repos on your local machine (i.e. when working on your own plugin)
-    Plugin 'file:///home/gmarik/path/to/plugin'
-    " The sparkup vim script is in a subdirectory of this repo called vim.
-    " Pass the path to set the runtimepath properly.
-    Plugin 'rstacruz/sparkup', {'rtp': 'vim/'}
-    " Avoid a name conflict with L9
-    Plugin 'user/L9', {'name': 'newL9'}
-
-    " All of your Plugins must be added before the following line
-    call vundle#end()            " required
-    filetype plugin indent on    " required
-    " To ignore plugin indent changes, instead use:
-    "filetype plugin on
-    "
-    " Brief help
-    " :PluginList          - list configured plugins
-    " :PluginInstall(!)    - install (update) plugins
-    " :PluginSearch(!) foo - search (or refresh cache first) for foo
-    " :PluginClean(!)      - confirm (or auto-approve) removal of unused plugins
-    "
-    " see :h vundle for more details or wiki for FAQ
-    " Put your non-Plugin stuff after this line
-
-4. Install configured bundles:
-
-  Launch vim and run
->
-    :PluginInstall
-<
-  To install from command line:
->
-    vim +PluginInstall +qall
-
-=============================================================================
-3. PLUGINS ~
-                                                             *vundle-plugins*
-
-3.1 CONFIGURING PLUGINS ~
-                                         *vundle-plugins-configure* *:Plugin*
-
-Vundle tracks what plugins you want configured by the `Plugin` commands in your
-`.vimrc`. Each `Plugin` command tells Vundle to activate the script on startup
-adding it to your |runtimepath|. Commenting out or removing the line will
-disable the `Plugin`.
-
-Each `Plugin` command takes a URI pointing to the script. No comments should
-follow on the same line as the command. Example:
->
-  Plugin 'git_URI'
-
-The `Plugin` command can optionally take a second argument after the URI. It
-has to be a dictionary, separated from the URI by a comma. Each key-value pair
-in the dictionary is a configuration option.
-
-The following per-script configuration options are available.
-
-The 'rtp' option
-----------------
-
-Specifies a directory inside the repository (relative path from the root of
-the repository) where the vim plugin resides. It determines the path that will
-be added to the |runtimepath|.
-
-For example:
->
-  Plugin 'git_URI', {'rtp': 'some/subdir/'}
-
-This can be used with git repositories that put the vim plugin inside a
-subdirectory.
-
-The 'name' option
------------------
-
-The name of the directory that will hold the local clone of the configured
-script.
-
-For example:
->
-  Plugin 'git_URI', {'name': 'newPluginName'}
-
-This can be used to prevent name collisions between plugins that Vundle would
-otherwise try to clone into the same directory. It also provides an additional
-level of customisation.
-
-The 'pinned' option
--------------------
-
-A flag that, when set to a value of 1, tells Vundle not to perform any git
-operations on the plugin, while still adding the existing plugin under the
-`bundles` directories to the |runtimepath|.
-
-For example:
->
-  Plugin 'mylocalplugin', {'pinned': 1}
-
-This allows the users to include, with Vundle, plugins tracked with version
-control systems other than git, but the user is responsible for cloning and
-keeping up to date. It also allows the users to stay in the current version of
-a plugin that might have previously been updated by Vundle.
-
-Please note that the URI will be treated the same as for any other plugins, so
-only the last part of it will be added to the |runtimepath|. The user is
-advised to use this flag only with single word URIs to avoid confusion.
-
-3.2 SUPPORTED URIS ~
-                                                        *vundle-plugins-uris*
-
-`Vundle` integrates very well with both GitHub and vim-scripts.org
-(http://vim-scripts.org/vim/scripts.html) allowing short URIs. It also allows
-the use of any URI `git` recognizes. In all of the following cases (except
-local) the 'https' protocol is used, see Vundle's options to override this.
-
-More information on `git`'s protocols can be found at:
-http://git-scm.com/book/ch4-1.html
-
-GitHub
-------
-GitHub is used when a user/repo is passed to `Plugin`.
->
-  Plugin 'gmarik/Vundle.vim' => https://github.com/gmarik/Vundle.vim
-
-Vim Scripts
------------
-Any single word without a slash '/' is assumed to be from Vim Scripts.
->
-  Plugin 'ctrlp.vim' => https://github.com/vim-scripts/ctrlp.vim
-
-Other Git URIs
---------------
-No modification is performed on valid URIs that point outside the above
-URLs.
->
-  Plugin 'git://git.wincent.com/command-t.git'
-
-Local Plugins
--------------
-The git protocol supports local installation using the 'file://' protocol.
-This is handy when developing plugins locally. Follow the protocol with an
-absolute path to the script directory.
->
-  Plugin 'file:///path/from/root/to/plugin'
-
-3.3 INSTALLING PLUGINS ~
-                                    *vundle-plugins-install* *:PluginInstall*
->
-  :PluginInstall
-
-Will install all plugins configured in your `.vimrc`. Newly installed
-plugins will be automatically enabled. Some plugins may require extra steps
-such as compilation or external programs, refer to their documentation.
-
-PluginInstall allows installation of plugins by name:
->
-  :PluginInstall unite.vim
-
-Installs and activates unite.vim.
-
-PluginInstall also allows installation of several plugins separated by space.
->
-  :PluginInstall tpope/vim-surround tpope/vim-fugitive
-
-Installs both tpope/vim-surround and tpope/vim-fugitive from GitHub.
-
-You can use Tab to auto-complete known script names.
-Note that the installation just described isn't permanent. To
-finish, you must put `Plugin 'unite.vim'` at the appropriate place in your
-`.vimrc` to tell Vundle to load the plugin at startup.
-
-After installing plugins press 'l' (lowercase 'L') to see the log of commands
-if any errors occurred.
-
-3.4 UPDATING PLUGINS ~
-                    *vundle-plugins-update* *:PluginUpdate* *:PluginInstall!*
->
-  :PluginInstall!   " NOTE: bang(!)
-or >
-  :PluginUpdate
-
-Installs or updates the configured plugins. Press 'u' after updates complete
-to see the change log of all updated bundles. Press 'l' (lowercase 'L') to
-see the log of commands if any errors occurred.
-
-To update specific plugins, write their names separated by space:
->
-  :PluginInstall! vim-surround vim-fugitive
-or >
-  :PluginUpdate vim-surround vim-fugitive
-
-3.5 SEARCHING PLUGINS ~
-                                      *vundle-plugins-search* *:PluginSearch*
->
-  :PluginSearch
-
-Search requires that `curl` be available on the system. The command searches
-Vim Scripts (http://vim-scripts.org/vim/scripts.html) for matching
-plugins. Results display in a new split window. For example:
->
-  PluginSearch foo
-
-displays:
->
-  "Search results for: foo
-  Plugin 'MarkdownFootnotes'
-  Plugin 'VimFootnotes'
-  Plugin 'foo.vim'
-<
-                                                             *:PluginSearch!*
-Alternatively, you can refresh the script list before searching by adding a
-bang to the command.
->
-  :PluginSearch! foo
-
-If the command is run without argument:
->
-  :PluginSearch!
-
-it will display all known plugins in the new split.
-
-3.6 LISTING BUNDLES ~
-                                          *vundle-plugins-list* *:PluginList*
->
-  :PluginList
-
-Displays a list of installed bundles.
-
-3.7 CLEANING UP ~
-                                      *vundle-plugins-cleanup* *:PluginClean*
->
-  :PluginClean
-
-Requests confirmation for the removal of all plugins no longered configured
-in your `.vimrc` but present in your bundle installation directory
-(default: `.vim/bundle/`).
-
-                                                              *:PluginClean!*
->
-  :PluginClean!
-
-Automatically confirm removal of unused bundles.
-
-=============================================================================
-4. INTERACTIVE MODE ~
-                                                         *vundle-interactive*
-
-Vundle provides a simple interactive mode to help you explore new plugins
-easily.  Interactive mode is available after any command that lists `Plugins`
-such as PluginSearch, PluginList or Plugins. For instance:
->
-  :PluginSearch! unite
-
-Searches for plugins matching 'unite' and yields a split window with:
->
-  "Keymap: i - Install bundle; c - Cleanup; s - Search; R - Reload list
-  "Search results for: unite
-  Plugin 'unite-scriptenames'
-  Plugin 'unite.vim'
-  Plugin 'unite-yarm'
-  Plugin 'unite-gem'
-  Plugin 'unite-locate'
-  Plugin 'unite-font'
-  Plugin 'unite-colorscheme'
-
-To install a bundle, move your cursor to the Plugin of interest and then
-select a command. To install 'unite.vim' put your cursor on the line and
-then push `i`. For a more complete list see |vundle-keymappings|. After
-unite.vim is installed the `:Unite file` command should be available.
-
-Note: Interactive installation doesn't update your `.vimrc`.
-
-=============================================================================
-5. KEY MAPPINGS ~
-                                                         *vundle-keymappings*
-
-KEY | DESCRIPTION
-----|-------------------------- >
- i  |  run :PluginInstall with name taken from line cursor is positioned on
- I  |  same as i, but runs :PluginInstall! to update bundle
- D  |  delete selected bundle (be careful not to remove local modifications)
- c  |  run :PluginClean
- s  |  run :PluginSearch
- R  |  fetch fresh script list from server
-
-=============================================================================
-6. OPTIONS ~
-                                                             *vundle-options*
->
-  let g:vundle_default_git_proto = 'git'
-<
-  This option makes Vundle use `git` instead of `https` when building
-  absolute URIs. For example:
->
-    Plugin 'sjl/gundo.vim' -> git@github.com:sjl/gundo.git
-
-=============================================================================
-7. VUNDLE INTERFACE CHANGE ~
-                        *vundle-interface-change* *:Bundle* *:BundleInstall!*
-                *:BundleUpdate* *:BundleSearch* *:BundleList* *:BundleClean!*
-                            *:VundleInstall!* *:VundleUpdate* *:VundleSearch*
-                                                *:VundleList* *:VundleClean!*
-
-  In order to bring in new changes, Vundle is adopting a new interface.
-  Going forward we will support primarily the Plugin namespace, additionally
-  for convenience we will also alias some commands to the Vundle namespace.
-  The following table summarizes the interface changes.
-
-  Deprecated Names  | New Names
-  -----------------------------
-  Bundle            | Plugin
-  BundleInstall(!)  | PluginInstall(!), VundleInstall(!)
-  BundleUpdate      | PluginUpdate, VundleUpdate
-  BundleSearch(!)   | PluginSearch(!), VundleSearch(!)
-  BundleClean       | PluginClean(!), VundleClean(!)
-  BundleList        | PluginList
-
-  Note: The Bundle commands will be deprecated. You may continue using them,
-  but they may not get all future updates. For instance, we have enabled
-  comments on Plugin lines but not Bundle, since it requires a change in
-  command declaration.
-
-" vim: set expandtab sts=2 ts=2 sw=2 tw=78 ft=help norl:
diff --git a/bundle/Vundle.vim/test/files/test.erl b/bundle/Vundle.vim/test/files/test.erl
deleted file mode 100644
index 1672953..0000000
--- a/bundle/Vundle.vim/test/files/test.erl
+++ /dev/null
@@ -1,20 +0,0 @@
--module(mmc_logmon_sup).
--behaviour(supervisor).
--export([init/1]).
-
-init(_) ->
-    {ok, {
-        {one_for_one, 5, 1},
-        [
-            {listener,
-                {aaa, start_link, []},
-                permanent, 100, worker,
-                [aaa]
-            },
-            {server,
-                {bbb, start_link, []},
-                permanent, 100, worker,
-                [bbb]
-            }
-        ]
-    }}.
diff --git a/bundle/Vundle.vim/test/minirc.vim b/bundle/Vundle.vim/test/minirc.vim
deleted file mode 100644
index 7b48d13..0000000
--- a/bundle/Vundle.vim/test/minirc.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-set nocompatible
-syntax on
-filetype off
-set rtp+=~/.vim/bundle/Vundle.vim/
-call vundle#begin()
-Plugin 'gmarik/Vundle.vim'
-call vundle#end()
-filetype plugin indent on
-
diff --git a/bundle/Vundle.vim/test/vimrc b/bundle/Vundle.vim/test/vimrc
deleted file mode 100644
index d8455a7..0000000
--- a/bundle/Vundle.vim/test/vimrc
+++ /dev/null
@@ -1,81 +0,0 @@
-" vim -u test/vimrc
-set nocompatible
-
-set nowrap
-
-let bundle_dir = '/tmp/vundle-test/bundles/'
-" let src = 'http://github.com/gmarik/vundle.git'
-
-" Vundle Options
-" let g:vundle_default_git_proto = 'git'
-
-silent execute '!mkdir -p '.bundle_dir
-silent execute '!ln -f -s ~/.vim/bundle/Vundle.vim '.bundle_dir
-
-filetype off
-syntax on
-
-runtime macros/matchit.vim
-
-" This test should be executed in "test" directory
-exec 'set rtp^='.bundle_dir.'Vundle.vim/'
-
-call vundle#rc(bundle_dir)
-
-
-Plugin 'molokai' " vim-scripts name
-
-" github username with dashes
-Bundle 'vim-scripts/ragtag.vim'
-
-" original repo
-Bundle 'altercation/vim-colors-solarized'
-" with extension
-Bundle 'nelstrom/vim-mac-classic-theme.git'
-"
-"  invalid uri
-"Bundle 'nonexistinguser/yupppierepo.git'
-
-" full uri
-Bundle 'https://github.com/vim-scripts/vim-game-of-life'
-" full uri
-Bundle 'git@github.com:gmarik/ingretu.git'
-" short uri
-Bundle 'gh:gmarik/snipmate.vim.git'
-Bundle 'github:mattn/gist-vim.git'
-
-" local uri stuff
-Bundle '~/Dropbox/.gitrepos/utilz.vim.git'
-" Bundle 'file://Dropbox/.gitrepos/utilz.vim.git'
-
-" with options
-Bundle 'rstacruz/sparkup.git', {'rtp': 'vim/'}
-Bundle 'matchit.zip', {'name': 'matchit'}
-
-" Camel case
-Bundle 'vim-scripts/RubySinatra'
-
-" syntax issue #203
-Bundle 'jimenezrick/vimerl'
-
-" Static bundle: Same name as a valid vim-scripts bundle
-Bundle 'latte', {'pinned' : 1}
-if !isdirectory(expand(bundle_dir) . '/latte')
-  call mkdir(expand(bundle_dir) . '/latte', 'p')
-endif
-
-
-filetype plugin indent on      " Automatically detect file types.
-
-set wildignore+=doc            " should not break helptags
-set wildignore+=.git           " should not break clone
-set wildignore+=.git/*         " should not break clone
-set wildignore+=*/.git/*
-" TODO: helptags fails with this
-" set wildignore+=doc/*        " should not break clone
-" set wildignore+=*/doc/*
-
-au VimEnter * BundleInstall
-
-" e test/files/erlang.erl
-" vim: set expandtab sts=2 ts=2 sw=2 tw=78:
diff --git a/plugged/.gitkeep b/plugged/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/plugged/.gitkeep
diff --git a/vimrc b/vimrc
index 408b422..7b94ec1 100644
--- a/vimrc
+++ b/vimrc
@@ -3,42 +3,43 @@
 "-----------------------------------------------------------------------------------------------------------------------
 set nocompatible               " be iMproved
 filetype off                   " required!
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
+
 "Plugins
+call plug#begin('~/.vim/plugged')
 "General vim Plugins
-Plugin 'nathanaelkane/vim-indent-guides' 
-Plugin 'scrooloose/nerdtree'   
-Plugin 'scrooloose/nerdcommenter'   
-Plugin 'jistr/vim-nerdtree-tabs'   
-Plugin 'tpope/vim-fugitive'
-Plugin 'tpope/vim-unimpaired'
-Plugin 'terryma/vim-multiple-cursors'
-Plugin 'scrooloose/syntastic'
-Plugin 'joonty/vdebug'
-Plugin 'kien/ctrlp.vim'
-Plugin 'Lokaltog/vim-easymotion'
-Plugin 'Shougo/unite.vim'
-Plugin 'SirVer/ultisnips'
-Plugin 'honza/vim-snippets'
-Plugin 'ervandew/supertab'
-Plugin 'tsukkee/unite-tag'
-Plugin 'gcmt/taboo.vim'
-Plugin 'tpope/vim-surround'
-Plugin 'mattn/emmet-vim'
-Plugin 'tmhedberg/matchit'
-Plugin 'shawncplus/phpcomplete.vim'
-Plugin 'StanAngeloff/php.vim'
-Plugin 'octol/vim-cpp-enhanced-highlight'
-Plugin 'stephpy/vim-yaml'
-Plugin 'hdima/python-syntax'
-Plugin 'vim-scripts/pep8'
-Plugin 'fs111/pydoc.vim'
-Plugin 'davidhalter/jedi-vim'
-Plugin 'godlygeek/tabular'
-Plugin 'plasticboy/vim-markdown'
-Plugin 'jamessan/vim-gnupg'
-call vundle#end()
+Plug 'nathanaelkane/vim-indent-guides' 
+Plug 'scrooloose/nerdtree'   
+Plug 'scrooloose/nerdcommenter'   
+Plug 'jistr/vim-nerdtree-tabs'   
+Plug 'tpope/vim-fugitive'
+Plug 'tpope/vim-unimpaired'
+Plug 'terryma/vim-multiple-cursors'
+Plug 'scrooloose/syntastic'
+Plug 'joonty/vdebug'
+Plug 'kien/ctrlp.vim'
+Plug 'Lokaltog/vim-easymotion'
+Plug 'Shougo/unite.vim'
+Plug 'SirVer/ultisnips'
+Plug 'honza/vim-snippets'
+Plug 'ervandew/supertab'
+Plug 'tsukkee/unite-tag'
+Plug 'gcmt/taboo.vim'
+Plug 'tpope/vim-surround'
+Plug 'mattn/emmet-vim'
+Plug 'tmhedberg/matchit'
+Plug 'shawncplus/phpcomplete.vim'
+Plug 'StanAngeloff/php.vim'
+Plug 'octol/vim-cpp-enhanced-highlight'
+Plug 'stephpy/vim-yaml'
+Plug 'hdima/python-syntax'
+Plug 'vim-scripts/pep8'
+Plug 'fs111/pydoc.vim'
+Plug 'davidhalter/jedi-vim'
+Plug 'godlygeek/tabular'
+Plug 'plasticboy/vim-markdown'
+Plug 'jamessan/vim-gnupg'
+" Add plugins to &runtimepath
+call plug#end()
 filetype plugin indent on     " required!
 " Autocomplete
 set omnifunc=syntaxcomplete#Complete