diff --git a/vim-plugins/.filetype.vim.un~ b/vim-plugins/.filetype.vim.un~
new file mode 100644
index 0000000..eabd95d
Binary files /dev/null and b/vim-plugins/.filetype.vim.un~ differ
diff --git a/vim-plugins/.netrwhist b/vim-plugins/.netrwhist
new file mode 100644
index 0000000..1543754
--- /dev/null
+++ b/vim-plugins/.netrwhist
@@ -0,0 +1,9 @@
+let g:netrw_dirhistmax  =10
+let g:netrw_dirhist_cnt =7
+let g:netrw_dirhist_1='/etc/NetworkManager/system-connections'
+let g:netrw_dirhist_2='/etc/NetworkManager/system-connections/USRP'
+let g:netrw_dirhist_3='/etc/NetworkManager/system-connections'
+let g:netrw_dirhist_4='/etc/cron.hourly'
+let g:netrw_dirhist_5='/home/viktor/Documents/Software_Development/python/hackbulgaria-python/week-10'
+let g:netrw_dirhist_6='/home/viktor/Documents/Software_Development/python/hackbulgaria-python/week-10/decorators'
+let g:netrw_dirhist_7='/home/viktor/Documents/Software_Development/python/HackBulgaria-Django/week-03/blog'
diff --git a/vim-plugins/Rename.vim b/vim-plugins/Rename.vim
new file mode 100644
index 0000000..819dccd
--- /dev/null
+++ b/vim-plugins/Rename.vim
@@ -0,0 +1,64 @@
+" Rename.vim  -  Rename a buffer within Vim and on the disk
+"
+" Copyright June 2007-2011 by Christian J. Robinson <heptite@gmail.com>
+"
+" Distributed under the terms of the Vim license.  See ":help license".
+"
+" Usage:
+"
+" :Rename[!] {newname}
+
+command! -nargs=* -complete=file -bang Rename call Rename(<q-args>, '<bang>')
+
+function! Rename(name, bang)
+	let l:name    = a:name
+	let l:oldfile = expand('%:p')
+
+	if bufexists(fnamemodify(l:name, ':p'))
+		if (a:bang ==# '!')
+			silent exe bufnr(fnamemodify(l:name, ':p')) . 'bwipe!'
+		else
+			echohl ErrorMsg
+			echomsg 'A buffer with that name already exists (use ! to override).'
+			echohl None
+			return 0
+		endif
+	endif
+
+	let l:status = 1
+
+	let v:errmsg = ''
+	silent! exe 'saveas' . a:bang . ' ' . l:name
+
+	if v:errmsg =~# '^$\|^E329'
+		let l:lastbufnr = bufnr('$')
+
+		if expand('%:p') !=# l:oldfile && filewritable(expand('%:p'))
+			if fnamemodify(bufname(l:lastbufnr), ':p') ==# l:oldfile
+				silent exe l:lastbufnr . 'bwipe!'
+			else
+				echohl ErrorMsg
+				echomsg 'Could not wipe out the old buffer for some reason.'
+				echohl None
+				let l:status = 0
+			endif
+
+			if delete(l:oldfile) != 0
+				echohl ErrorMsg
+				echomsg 'Could not delete the old file: ' . l:oldfile
+				echohl None
+				let l:status = 0
+			endif
+		else
+			echohl ErrorMsg
+			echomsg 'Rename failed for some reason.'
+			echohl None
+			let l:status = 0
+		endif
+	else
+		echoerr v:errmsg
+		let l:status = 0
+	endif
+
+	return l:status
+endfunction
diff --git a/vim-plugins/autoload/pathogen.vim b/vim-plugins/autoload/pathogen.vim
new file mode 100644
index 0000000..59a75c1
--- /dev/null
+++ b/vim-plugins/autoload/pathogen.vim
@@ -0,0 +1,353 @@
+" pathogen.vim - path option manipulation
+" Maintainer:   Tim Pope <http://tpo.pe/>
+" Version:      2.4
+
+" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
+"
+" For management of individually installed plugins in ~/.vim/bundle (or
+" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
+" .vimrc is the only other setup necessary.
+"
+" The API is documented inline below.
+
+if exists("g:loaded_pathogen") || &cp
+  finish
+endif
+let g:loaded_pathogen = 1
+
+" Point of entry for basic default usage.  Give a relative path to invoke
+" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke
+" pathogen#surround().  Curly braces are expanded with pathogen#expand():
+" "bundle/{}" finds all subdirectories inside "bundle" inside all directories
+" in the runtime path.
+function! pathogen#infect(...) abort
+  for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}']
+    if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]'
+      call pathogen#surround(path)
+    elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)'
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      call pathogen#surround(path . '/{}')
+    elseif path =~# '[{}*]'
+      call pathogen#interpose(path)
+    else
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      call pathogen#interpose(path . '/{}')
+    endif
+  endfor
+  call pathogen#cycle_filetype()
+  if pathogen#is_disabled($MYVIMRC)
+    return 'finish'
+  endif
+  return ''
+endfunction
+
+" Split a path into a list.
+function! pathogen#split(path) abort
+  if type(a:path) == type([]) | return a:path | endif
+  if empty(a:path) | return [] | endif
+  let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
+  return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
+endfunction
+
+" Convert a list to a path.
+function! pathogen#join(...) abort
+  if type(a:1) == type(1) && a:1
+    let i = 1
+    let space = ' '
+  else
+    let i = 0
+    let space = ''
+  endif
+  let path = ""
+  while i < a:0
+    if type(a:000[i]) == type([])
+      let list = a:000[i]
+      let j = 0
+      while j < len(list)
+        let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
+        let path .= ',' . escaped
+        let j += 1
+      endwhile
+    else
+      let path .= "," . a:000[i]
+    endif
+    let i += 1
+  endwhile
+  return substitute(path,'^,','','')
+endfunction
+
+" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
+function! pathogen#legacyjoin(...) abort
+  return call('pathogen#join',[1] + a:000)
+endfunction
+
+" Turn filetype detection off and back on again if it was already enabled.
+function! pathogen#cycle_filetype() abort
+  if exists('g:did_load_filetypes')
+    filetype off
+    filetype on
+  endif
+endfunction
+
+" Check if a bundle is disabled.  A bundle is considered disabled if its
+" basename or full name is included in the list g:pathogen_blacklist or the
+" comma delimited environment variable $VIMBLACKLIST.
+function! pathogen#is_disabled(path) abort
+  if a:path =~# '\~$'
+    return 1
+  endif
+  let sep = pathogen#slash()
+  let blacklist =
+        \ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) +
+        \ pathogen#split($VIMBLACKLIST)
+  if !empty(blacklist)
+    call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
+  endif
+  return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
+endfunction
+
+" Prepend the given directory to the runtime path and append its corresponding
+" after directory.  Curly braces are expanded with pathogen#expand().
+function! pathogen#surround(path) abort
+  let sep = pathogen#slash()
+  let rtp = pathogen#split(&rtp)
+  let path = fnamemodify(a:path, ':s?[\\/]\=$??')
+  let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
+  let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
+  call filter(rtp, 'index(before + after, v:val) == -1')
+  let &rtp = pathogen#join(before, rtp, after)
+  return &rtp
+endfunction
+
+" For each directory in the runtime path, add a second entry with the given
+" argument appended.  Curly braces are expanded with pathogen#expand().
+function! pathogen#interpose(name) abort
+  let sep = pathogen#slash()
+  let name = a:name
+  if has_key(s:done_bundles, name)
+    return ""
+  endif
+  let s:done_bundles[name] = 1
+  let list = []
+  for dir in pathogen#split(&rtp)
+    if dir =~# '\<after$'
+      let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
+    else
+      let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
+    endif
+  endfor
+  let &rtp = pathogen#join(pathogen#uniq(list))
+  return 1
+endfunction
+
+let s:done_bundles = {}
+
+" Invoke :helptags on all non-$VIM doc directories in runtimepath.
+function! pathogen#helptags() abort
+  let sep = pathogen#slash()
+  for glob in pathogen#split(&rtp)
+    for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep')
+      if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags'))
+        silent! execute 'helptags' pathogen#fnameescape(dir)
+      endif
+    endfor
+  endfor
+endfunction
+
+command! -bar Helptags :call pathogen#helptags()
+
+" Execute the given command.  This is basically a backdoor for --remote-expr.
+function! pathogen#execute(...) abort
+  for command in a:000
+    execute command
+  endfor
+  return ''
+endfunction
+
+" Section: Unofficial
+
+function! pathogen#is_absolute(path) abort
+  return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]')
+endfunction
+
+" Given a string, returns all possible permutations of comma delimited braced
+" alternatives of that string.  pathogen#expand('/{a,b}/{c,d}') yields
+" ['/a/c', '/a/d', '/b/c', '/b/d'].  Empty braces are treated as a wildcard
+" and globbed.  Actual globs are preserved.
+function! pathogen#expand(pattern, ...) abort
+  let after = a:0 ? a:1 : ''
+  if a:pattern =~# '{[^{}]\+}'
+    let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
+    let found = map(split(pat, ',', 1), 'pre.v:val.post')
+    let results = []
+    for pattern in found
+      call extend(results, pathogen#expand(pattern))
+    endfor
+  elseif a:pattern =~# '{}'
+    let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)')
+    let post = a:pattern[strlen(pat) : -1]
+    let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
+  else
+    let results = [a:pattern]
+  endif
+  let vf = pathogen#slash() . 'vimfiles'
+  call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
+  return filter(results, '!empty(v:val)')
+endfunction
+
+" \ on Windows unless shellslash is set, / everywhere else.
+function! pathogen#slash() abort
+  return !exists("+shellslash") || &shellslash ? '/' : '\'
+endfunction
+
+function! pathogen#separator() abort
+  return pathogen#slash()
+endfunction
+
+" Convenience wrapper around glob() which returns a list.
+function! pathogen#glob(pattern) abort
+  let files = split(glob(a:pattern),"\n")
+  return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
+endfunction
+
+" Like pathogen#glob(), only limit the results to directories.
+function! pathogen#glob_directories(pattern) abort
+  return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
+endfunction
+
+" Remove duplicates from a list.
+function! pathogen#uniq(list) abort
+  let i = 0
+  let seen = {}
+  while i < len(a:list)
+    if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
+      call remove(a:list,i)
+    elseif a:list[i] ==# ''
+      let i += 1
+      let empty = 1
+    else
+      let seen[a:list[i]] = 1
+      let i += 1
+    endif
+  endwhile
+  return a:list
+endfunction
+
+" Backport of fnameescape().
+function! pathogen#fnameescape(string) abort
+  if exists('*fnameescape')
+    return fnameescape(a:string)
+  elseif a:string ==# '-'
+    return '\-'
+  else
+    return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
+  endif
+endfunction
+
+" Like findfile(), but hardcoded to use the runtimepath.
+function! pathogen#runtime_findfile(file,count) abort
+  let rtp = pathogen#join(1,pathogen#split(&rtp))
+  let file = findfile(a:file,rtp,a:count)
+  if file ==# ''
+    return ''
+  else
+    return fnamemodify(file,':p')
+  endif
+endfunction
+
+" Section: Deprecated
+
+function! s:warn(msg) abort
+  echohl WarningMsg
+  echomsg a:msg
+  echohl NONE
+endfunction
+
+" Prepend all subdirectories of path to the rtp, and append all 'after'
+" directories in those subdirectories.  Deprecated.
+function! pathogen#runtime_prepend_subdirectories(path) abort
+  call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')')
+  return pathogen#surround(a:path . pathogen#slash() . '{}')
+endfunction
+
+function! pathogen#incubate(...) abort
+  let name = a:0 ? a:1 : 'bundle/{}'
+  call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')')
+  return pathogen#interpose(name)
+endfunction
+
+" Deprecated alias for pathogen#interpose().
+function! pathogen#runtime_append_all_bundles(...) abort
+  if a:0
+    call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')')
+  else
+    call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()')
+  endif
+  return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}')
+endfunction
+
+if exists(':Vedit')
+  finish
+endif
+
+let s:vopen_warning = 0
+
+function! s:find(count,cmd,file,lcd)
+  let rtp = pathogen#join(1,pathogen#split(&runtimepath))
+  let file = pathogen#runtime_findfile(a:file,a:count)
+  if file ==# ''
+    return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
+  endif
+  if !s:vopen_warning
+    let s:vopen_warning = 1
+    let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
+  else
+    let warning = ''
+  endif
+  if a:lcd
+    let path = file[0:-strlen(a:file)-2]
+    execute 'lcd `=path`'
+    return a:cmd.' '.pathogen#fnameescape(a:file) . warning
+  else
+    return a:cmd.' '.pathogen#fnameescape(file) . warning
+  endif
+endfunction
+
+function! s:Findcomplete(A,L,P)
+  let sep = pathogen#slash()
+  let cheats = {
+        \'a': 'autoload',
+        \'d': 'doc',
+        \'f': 'ftplugin',
+        \'i': 'indent',
+        \'p': 'plugin',
+        \'s': 'syntax'}
+  if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
+    let request = cheats[a:A[0]].a:A[1:-1]
+  else
+    let request = a:A
+  endif
+  let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*'
+  let found = {}
+  for path in pathogen#split(&runtimepath)
+    let path = expand(path, ':p')
+    let matches = split(glob(path.sep.pattern),"\n")
+    call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
+    call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]')
+    for match in matches
+      let found[match] = 1
+    endfor
+  endfor
+  return sort(keys(found))
+endfunction
+
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve       :execute s:find(<count>,'edit<bang>',<q-args>,0)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit    :execute s:find(<count>,'edit<bang>',<q-args>,0)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen    :execute s:find(<count>,'edit<bang>',<q-args>,1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit   :execute s:find(<count>,'split',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit  :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read',<q-args>,<bang>1)
+
+" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':
diff --git a/vim-plugins/bundle/.asd.markdown.un~ b/vim-plugins/bundle/.asd.markdown.un~
new file mode 100644
index 0000000..d6041fc
Binary files /dev/null and b/vim-plugins/bundle/.asd.markdown.un~ differ
diff --git a/vim-plugins/bundle/.asd.md.un~ b/vim-plugins/bundle/.asd.md.un~
new file mode 100644
index 0000000..fa39f23
Binary files /dev/null and b/vim-plugins/bundle/.asd.md.un~ differ
diff --git a/vim-plugins/bundle/.vundle/script-names.vim-scripts.org.json b/vim-plugins/bundle/.vundle/script-names.vim-scripts.org.json
new file mode 100644
index 0000000..c5a91ce
--- /dev/null
+++ b/vim-plugins/bundle/.vundle/script-names.vim-scripts.org.json
@@ -0,0 +1 @@
+["test.vim","test.zip","test_syntax.vim","ToggleCommentify.vim","DoxyGen-Syntax","keepcase.vim","ifdef-highlighting","vimbuddy.vim","buffoptions.vim","fortune.vim","drawing.vim","ctags.vim","closetag.vim","htmlcmd.vim","ccase.vim","compiler.tar.gz","ls.vim","calendar.vim","dl.vim","jcommenter.vim","info.vim","hunspchk.zip","EnhCommentify.vim","LoadHeaderFile.vim","mailbrowser.vim","vimmailr.zip","format.vim","vimxmms.tar.gz","sourceSafe.zip","python.vim","a.vim","vimrc.tcl","oravim.txt","javabean.vim","jbean.vim","vimvccmd.zip","dbhelper.tgz","matchit.zip","DrawIt","rcs-menu.vim","bufexplorer.zip","sccs-menu.vim","completeWord.py","Mail_Sig.set","Mail_mutt_alias.set","Mail_Re.set","Triggers.vim","Mail_cc.set","lh-brackets","cscope_macros.vim","calendar.vim","colorize.vim","ConvertBase.vim","TagsMenu.zip","perl.vim","oberon.vim","cvsmenu.vim","dtags","delphi.vim","Embperl_Syntax.zip","whatdomain.vim","emacs.vim","po.vim","CD.vim","_vim_wok_visualcpp01.zip","nqc.vim","vfp.vim","project.tar.gz","pt.vim.gz","dctl.vim.gz","foo.vim","word_complete.vim","aux2tags.vim","javaimp.vim","uri-ref","incfiles.vim","functags.vim","wordlist.vim","files2menu.pm","translate.vim","AppendComment.vim","let-modeline.vim","gdbvim.tar.gz","Mkcolorscheme.vim","brief.vim","plkeyb.vim","vimtips.zip","savevers.vim","vcscommand.vim","nsis.vim","borland.vim","tex.vim","express.vim","winmanager","methods.vim","sqlplus.vim","spec.vim","mail.tgz","TagsBase.zip","nlist.vim","DirDiff.vim","regview.vim","BlockHL","desert.vim","colorscheme_template.vim","SelectBuf","bufNwinUtils.vim","lightWeightArray.vim","golden.vim","torte.vim","borland.vim","idutils","MultiPrompt.vim","blue.vim","csharp.vim","cs.vim","Shell.vim","vim.vim","Decho","asu1dark.vim","Astronaut","sum.vim","quickhigh.tgz","selbuff.vim","ctx-1.15.vim","runscript.vim","random_vim_tip.tar.gz","PushPop.vim","usr2latex.pl","spellcheck.vim","PopupBuffer.vim","TableTab.vim","djgpp.vim","vim-spell.tar.gz","ada.vim","ada.vim","which.vim","VirMark.vim","oracle.vim","sql.vim","words_tools.vim","chcmdmod.vim","increment.vim","CmdlineCompl.vim","SearchCompl.vim","perl_io.vim","darkslategray.vim","undoins.vim","cisco-syntax.tar.gz","ShowMarks","EasyHtml.vim","ctags.vim","ant_menu.vim","increment.vim","autoload_cscope.vim","foldutil.vim","minibufexpl.vim","gtkvim.tgz","FavMenu.vim","auctex.vim","ruby-macros.vim","html-macros.vim","vimsh.tar.gz","libList.vim","perforce.vim","idevim.tgz","email.vim","mcant.vim","multvals.vim","TeTrIs.vim","boxdraw","tf.vim","CreateMenuPath.vim","Lineup--A-simple-text-aligner","Justify","A-better-tcl-indent","ViMail","remcmd.vim","prt_mgr.zip","SuperTab","treeexplorer","vtreeexplorer","bk-menu.vim","glib.vim","win-manager-Improved","ruby-menu.vim","renumber.vim","navajo.vim","wcd.vim","RExplorer","fortune.vim","MRU","Engspchk","vcal.vim","genutils","template-file-loader","charset.vim","ComplMenu.vim","bcbuf.vim","quickfonts.vim","DSP-Make","vimconfig","morse.vim","LaTeX-Help","MRU-Menu","ctx","Perldoc.vim","fine_blue.vim","sokoban.vim","linuxmag.vim","c.vim","lh-vim-lib","tagmenu.vim","xmms-play-and-enqueue","cmvc.vim","tex.vim","bccalc.vim","mkview.vim","VIlisp.vim","mu-template","xl_tiv.vim","night.vim","einstimer.vim","closeb","Brown","Expand-Template","search-in-runtime","Brace-Complete-for-CCpp","Smart-Tabs","spell.vim","print_bw.zip","std_c.zip","Naught-n-crosses","SourceSafe-Integration","Michaels-Standard-Settings","Hex-Output","Visual-Mapping-Maker","perforce","xul.vim","cream-capitalization","mu-marks","imaps.vim","JavaRun","Buffer-Menus","cream-ascii","vimRubyX","update_vim","bnf.vim","lid.vim","UserMenu.vim","midnight.vim","tmpl.vim","ihtml.vim","pascii","XSLT-syntax","htmlmap","lastchange.vim","manxome-foes-colorscheme","vimdoc","doc.vim","csc.vim","aspnet.vim","brief.vim","java.vim","Nsis-color","byteme.vim","scite-colors","Cool-colors","navajo-night","multi.vim","taglist.vim","User-Defined-Type-Highlighter","camo.vim","adrian.vim","PrintWithLNum","sybase.vim","Projmgr","netdict","ExecPerl","candy.vim","txt2pdf.vim","unilatex.vim","potts.vim","sessmgr","outlineMode.vim","aqua","serverlist.vim","ruby-matchit","autodate.vim","xian.vim","utl.vim","Align","bluegreen","showbrace","latextags","vimfortune","TabIndent","Vimacs","xmledit","AnsiEsc.vim","ftpluginruby.vim","pyimp.vim","sql_iabbr.vim","gnome-doc.vim","xemacs-colorscheme","fog-colorscheme","CSV-delimited-field-jumper","cream-sort","grep.vim","ipsec_conf.vim","EDIFACT-position-in-a-segment","tomatosoup.vim","xchat-log-syntax","broadcast.vim","vera.vim","f.vim","highlightline.vim","hungarian_to_english","Buffer-Search","srecord.vim","reformat.vim","multivim","JavaImp.vim","PHPcollection","JHTML-syntax-file","Nightshimmer","cfengine-syntax-file","code2html","prt_hdr","cream-progressbar","QuickAscii","bw.vim","lh-cpp","vtags","vtags_def","ASP-maps","tforge.vim","pf.vim","sand","fstab-syntax","MqlMenu.vim","lcscheck.vim","php.vim","textlink.vim","White-Dust","ruby.vim","Highlight-UnMatched-Brackets","localColorSchemes.vim","multipleRanges.vim","getVar.vim","variableSort.vim","vimrc_nopik","dbext.vim","openroad.vim","java_apidoc.vim","ABAP.vim","rcsdiff.vim","snippet.vim","opsplorer","cream-showinvisibles","bash-support.vim","ldraw.vim","DirDo.vim","oceandeep","atomcoder-vim","Expmod","timstamp.vim","Red-Black","ftpluginruby.vim","indentruby.vim","Denim","mof.vim","vim-game-of-life","ia64.vim","d.vim","PreviewTag.vim","ShowLine.vim","ShowBlockName.vim","SyntaxAttr.vim","DarkOcean.vim","ibmedit.vim","python_match.vim","rnc.vim","LbdbQuery.vim","scratch-utility","plp.vim","LaTeX-functions","ocean.vim","spectre.vim","bugfixes-to-vim-indent-for-verilog","gri.vim","scilab.vim","ShowFunc.vim","maxima.vim","ironman.vim","sean.vim","regRedir.vim","colormenu.vim","eruby.vim","getmail.vim","colour_flip.pl","blackdust.vim","CVSAnnotate.vim","beanshell.vim","svn.vim","muf.vim","tex.vim","cvopsefsa.vim","ActionScript","plsql.vim","Zenburn","Kent-Vim-Extensions","plsql.vim","Registryedit-win32","syslog-syntax-file","MySQL-script-runner","elinks.vim","eukleides.vim","jcl.vim","midnight2.vim","smlisp.vim","lustre","lustre-syntax","VimFootnotes","biogoo.vim","Get-Win32-Short-Name","Get-UNC-Path-Win32","pythonhelper","javaGetSet.vim","copycppdectoimp.vim","cppgetset.vim","titlecase.vim","stata.vim","localvimrc","lilac.vim","spacehi.vim","deldiff.vim","Syntax-for-the-BETA-programming-language","JavaDecompiler.vim","exim.vim","java_checkstyle.vim","gmt.vim","xhtml.vim","EasyAccents","draw.vim","HTML.zip","sql.vim","php_abb","xgen.vim","noweb.vim","PCP-header","vim-templates","rrd.vim","TTCoach","nw.vim","rainbow.zip","VB-Line-Number","vimspell","perl_h2xs","emodeline","VEC","fnaqevan","HTML-Photo-Board","cream-vimabbrev","mup.vim","BlockComment.vim","SearchComplete","LaTeX-Suite-aka-Vim-LaTeX","Transparent","python.vim","aj.vim","MultipleSearch","toothpik.vim","cscomment.vim","cuecat.vim","tagexplorer.vim","ddldbl.vim","markjump.vim","SAPDB_Pascal.vim","Posting","cream-keytest","ManPageView","java_getset.vim","debug.vim","SQLUtilities","Cpp-code-template-generator","ri-browser","sql.vim","poser.vim","waimea.vim","sql.vim","SpellChecker","foldlist","OO-code-completion","transvim.vim","Macromedia-Director-Lingo-Syntax","oz.vim","python_box.vim","greputil.vim","mercury.vim","ZoomWin","mailsig","Varrays","casejump.vim","Printer-Dialog","Indent-Finder","mrswin.vim","python_fold","sr.vim","TVO--The-Vim-Outliner","csv-color","CVS-conflict-highlight","PHPDoc-Script-PDocS","mru.vim","tar.vim","VimITunes.vim","Visual-Studio-.NET-compiler-file","cscope-menu","pdbvim","cppcomplete","mh","blockquote.vim","Mixed-sourceassembly-syntax-objdump","elvis-c-highlighting","colorer-color-scheme","ntservices","PHP-dictionary","tiger.vim","tiger.vim","tab-syntax","cream-email-munge","FavEx","apdl.vim","velocity.vim","russian-menu-translation","nuweb.vim","flyaccent.vim","ebnf.vim","IDLATL-Helper","as.vim","Mines","coffee.vim","adp.vim","mruex","HiCurLine","perl-support.vim","BOG","spreadsheet.vim","BufClose.vim","MPD-syntax-highlighting","help.vim","rd.vim","rcsvers.vim","ASPRecolor.vim","HTML--insert","ctrlax.vim","desc.vim","ntprocesses","caramel.vim","GTK","autolisp-help","wintersday.vim","darkdot","TEXT--fill-char","gnu-c","psp.vim","dawn","allfold","fgl.vim","autonumbering-in-vim","cg.vim","matlab.vim","comment.vim","pyljpost.vim","todolist.vim","northsky","fgl.c","JavaBrowser","seashell","BlackSea","PapayaWhip","ChocolateLiquor","guifontpp.vim","TaQua","HelpClose","colorpalette.vim","python-tools","execmap","cmake.vim","cmake.vim","vimwc.sh","vimbadword.sh","oceanblack.vim","php.vim-html-enhanced","cream-numberlines","asmMIPS","valgrind.vim","toc.vim","Qt.vim","ctags.vim","dante.vim","cpp.vim","gisdk","CRefVim","ruler.vim","Asciitable.vim","Adaryn.vim","BreakPts","brookstream","Russian-menu-for-gvimwin32","Conflict2Diff","tagsubmenu","m4pic.vim","nightwish.vim","Color-Sampler-Pack","ShowPairs","MarkShift","SeeTab","putty","resolv.conf-syntax","cf.vim","make-element","Reindent","otf.vim","sparc.vim","getdp","COMMENT.vim","WC.vim","gmsh.vim","SYN2HTML","tcsoft.vim","GetLatestVimScripts","WML-Wireless-Markup-Language-syntax","Color-Scheme-Test","greyblue.vim","colorize","DOS-Commands","fte.vim","chordpro.vim","vectorscript.vim","uniq.vim","stol.vim","ldap_schema.vim","ldif.vim","proc.vim","esperanto","epperl.vim","headers.vim","sip.vim","gpg.vim","gnupg","xml_cbks","VimDebug","scratch.vim","FeralToggleCommentify.vim","hexman.vim","Dotnet-Dictionaries","random.vim","matrix.vim","VisIncr","autumn.vim","listmaps.vim","Maxlen.vim","MakeDoxygenComment","VS-like-Class-Completion","GenerateMatlabFunctionComment","pgn.vim","genindent.vim","fluxbox.vim","ferallastchange.vim","blockhl2.vim","cschemerotate.vim","ftplugin-for-Calendar","Comment-Tools","incbufswitch.vim","feralalign.vim","VimTweak","calibre.vim","cleanphp","actionscript.vim","POD-Folder","VimSpeak","ample.vim","quancept.vim","po.vim","timecolor.vim","timecolor.vim","Visual-Cpp","NEdit","OIL.vim","cg.vim","parrot.vim","xmmsctrl.vim","isi2bib","sketch.vim","gdl.vim","msp.vim","brainfuck-syntax","sfl.vim","browser-like-scrolling-for-readonly-file","nuvola.vim","SideBar.vim","MSIL-Assembly","cygwin.vim","mupad.vim","trash.vim","wiki.vim","tagMenu","local_vimrc.vim","Hanoi-Tower","sudo.vim","co.vim","xmidas.vim","folddigest.vim","quicksession.vim","sql.vim","pam.vim","kickstart.vim","mdl.vim","gor.vim","yaml.vim","sbutils","movewin.vim","SwapHeader","svn.vim","dhcpd.vim","curcmdmode","cmdalias.vim","Intellisense-for-Vim","HelpExtractor","pic.vim","aiseered.vim","winhelp","opengl.vim","ttcn-syntax","ttcn-indent","VDLGBX.DLL","python_encoding.vim","showpairs-mutated","dusk","LogCVSCommit","peaksea","lpc.vim","hlcontext.vim","dont-click","gvim-with-tabs","VHDL-indent","ttcn-dict","mis.vim","table.vim","Source-Control","ocamlhelp.vim","umber-green","vgrep","lebrief.vim","vimcdoc","whereis.vim","highlight_cursor.vim","ntp.vim","php_console.vim","sessions.vim","pyfold","oasis.vim","gdm.vim","fluka.vim","vartabs.vim","delek.vim","qt2vimsyntax","tokens.vim","set_utf8.vim","python.vim","Relaxed-Green","simpleandfriendly.vim","ttcn-ftplugin","promela.vim","xterm16.vim","bmichaelsen","preview.vim","Walk.vim","FindMakefile","MixCase.vim","javaDoc.vim","gramadoir.vim","XQuery-syntax","expand.vim","zrf.vim","truegrid.vim","dks-il2-tex.vim","vimcommander","Smart-Diffsplit","robinhood.vim","darkblue2.vim","billw.vim","mail.vim","white.vim","HHCS_D","enumratingptn","HHCS","ephtml","rgbasm.vim","Mouse-Toggle","BlockWork","avrasm.vim","yum.vim","asmM68k.vim","find_in_files","mp.vim","Intellisense","VimNotes","gq","TT2-syntax","xmaslights.vim","smartmake","httpclog","RTF-1.6-Spec-in-Vim-Help-Format","systemc_syntax.tar.gz","selected-resizer","PureBasic-Syntax-file","macro.vim","python.vim","text.py","yo-speller","increment.vim","nasl.vim","ptl.vim","pyab","mars.vim","howto-ftplugin","SrchRplcHiGrp.vim","latex-mik.vim","Pydiction","Posting","Gothic","File-local-variables","less.vim","FX-HLSL","NSIS-2.0--Syntax","table_format.vim","LocateOpen","Destructive-Paste","inform.vim","VikiDeplate","cscope-quickfix","BlackBeauty","visual_studio.vim","unmswin.vim","Israelli-hebrew-shifted","phoneticvisual-hebrew-keyboard-mapphone","Redundant-phoneticvisual-Hebrew-keyboar","changesqlcase.vim","changeColorScheme.vim","allout.vim","Syntax-context-abbreviations","srec.vim","emacsmode","bufman.vim","automation.vim","GVColors","Posting","RegExpRef","passwd","buttercream.vim","fluxkeys.vim","ods.vim","AutoAlign","FormatBlock","FormatComment.vim","docbkhelper","armasm","EvalSelection.vim","edo_sea","pylint.vim","winpos.vim","gtags.vim","Viewing-Procmail-Log","Toggle","perl_synwrite.vim","ViewOutput","CharTab","nesC","Tower-of-Hanoi","sharp-Plugin-Added","ratfor.vim","fvl.vim","yiheb-il.vim","sql.vim","Editable-User-Interface-EUI-eui_vim","html_umlaute","nvi.vim","unicodeswitch.vim","pydoc.vim","nedit2","adam.vim","po.vim","sieve.vim","AsNeeded","Nibble","fdcc.vim","CSS-2.1-Specification","sqlldr.vim","tex_autoclose.vim","bufmenu2","svncommand.vim","timestamp.vim","html_portuquese","AutoFold.vim","russian-phonetic_utf-8.vim","colorsel.vim","XpMenu","timelog.vim","virata.vim","VimIRC.vim","TogFullscreen.vim","database-client","ftpsync","svg.vim","Karma-Decompiler","autosession.vim","newheader.vim","sccs.vim","screen.vim","edifact.vim","pqmagic.vim","ProjectBrowse","n3.vim","groovy.vim","StyleChecker--perl","2tex.vim","Scons-compiler-plugin","qf.vim","af.vim","aspnet.vim","psql.vim","multiselect","xml2latex","ToggleComment","php-doc","YAPosting","blugrine","latex_pt","replace","DumpStr.vim","RemoteSaveAll.vim","FTP-Completion","nexus.vim","uptime.vim","asmx86","php.vim-for-php5","autoit.vim","pic18fxxx","IncrediBuild.vim","folds.vim","chela_light","rest.vim","indentpython.vim","Siebel-VB-Script-SVB","Tibet","Maxscript","svn-diff.vim","idf.vim","ssa.vim","GtkFileChooser","Simple-templates","onsgmls.vim","mappinggroup.vim","metacosm.vim","ASPJScript","DoxygenToolkit.vim","VHT","pdftotext","rpl","rpl","rpl","aspvbs.vim","FiletypeRegisters","nant-compiler-script","tbf-vimfiles","Window-Sizes","menu_pt_br.vimfix","TransferChinese.vim","gtk-vim-syntax","2htmlj","glsl.vim","SearchInBuffers.vim","Docbook-XSL-compiler-file","Phrases","Olive","Lynx-Offline-Documentation-Browser","srec.vim","srec.vim","lingo.vim","buflist","lingodirector.vim","PLI-Tools","clipbrd","check-mutt-attachments.vim","corewars.vim","redcode.vim","potwiki.vim","updt.vim","revolutions.vim","feralstub.vim","Phoenity-discontinued","aftersyntax.vim","IndentHL","xmlwf.vim","Visual-Mark","errsign","log.vim","msvc2003","scalefont","uc.vim","commenter","OOP.vim","cream-iso639.vim","cream-iso3166-1","HTMLxC.vim","vimgrep.vim","array.vim","vimtabs.vim","CodeReviewer.vim","cube.vim","uc.vim","uc.vim","sf.vim","monday","ST20-compiler-plugin","R.vim","octave.vim","delete.py","groff-keymap","The-Mail-Suite-tms","browser.vim","InteractHL.vim","curBuf.vim","vsutil.vim","DavesVimPack","Menu-Autohide","pygtk_color","Vive.vim","actionscript.vim","greputils","HC12-syntax-highlighting","asp.vim","click.vim","cecutil","mingw.vim","abap.vim","vimsh","dsPIC30f","BufOnly.vim","ConfirmQuit.vim","fasm-compiler","python_calltips","netrw.vim","cscope_win","lindo.vim","VUT","replvim.sh","xmms.vim","HiColors","MS-Word-from-VIM","multiwin.vim","multiAPIsyntax","earth.vim","Black-Angus","tpp.vim","cfengine.vim","sas.vim","InsertTry.vim","VimRegEx.vim","blitzbasic.vim","Archive","cream-statusline-prototype","TabLaTeX","buffer-perlpython.pl","txt2tags-menu","hamster.vim","hamster.vim","clearsilver","hamster.vim","VB.NET-Syntax","VB.NET-Indent","ACScope","ptu","java_src_link.vim","AutumnLeaf","WhatsMissing.vim","bulgarian.vim","edifile.vim","rcs.vim","pydoc.vim","TWiki-Syntax","pmd.vim","BodySnatcher","MapleSyrup","ooosetup.vim","reverse.vim","mod_tcsoft.vim","PHP-correct-Indenting","anttestreport","lingo.vim","lpl.vim","UpdateModDate.vim","vimUnit","lxTrace","vim2ansi","synmark.vim","vim_faq.vim","jhlight.vim","javascript.vim","css.vim","scratch.vim","Japanese-Keymapping","vcbc.vim","scilab.tar.gz","scilab.tar.gz","tree","FileTree","Cisco-ACL-syntax-highlighting-rules","header.vim","inkpot","jhdark","C-fold","ccimpl.vim","bufkill.vim","perl-test-manage.vim","GetFDCText.vim","cygwin_utils.vim","globalreplace.vim","remote-PHP-debugger","xbl.vim","JavaKit","ledger.vim","ledger.vim","txt2tags","unhtml","pagemaker6","tSkeleton","foldcol.vim","jexplorer","html_danish","EditJava","tolerable.vim","Wiked","substitute.vim","sharp-Indent","GoboLinux-ColorScheme","Abc-Menu","DetectIndent","templates.vim","tComment","Rhythmbox-Control-Plugin","sharp-Syntax","oceanlight","OAL-Syntax","PVCS-access","context_complete.vim","fileaccess","avr.vim","tesei.vim","MultipleSearch2.vim","uniface.vim","turbo.vim","rotate.vim","cream-replacemulti","cleanswap","matrix.vim","hcc.vim","wc.vim","AutoUpload","expander.vim","vfp8.vim","vis","omlet.vim","ocaml.annot.pl","nodiff.vim","increment_new.vim","namazu.vim","c.vim","bsh.vim","WhereFrom","oo","Java-Syntax-and-Folding","ProvideX-Syntax","DNA-Tools","vimCU","cvsvimdiff","latexmenu","XML-Indent","AddIfndefGuard","Vim-JDE","cvsdiff.vim","Super-Shell-Indent","cool.vim","Perldoc-from-VIM","The-NERD-Commenter","darkblack.vim","OpenGLSL","monkeyd-configuration-syntax","OCaml-instructions-signature---parser","plist.vim","my-_vimrc-for-Windows-2000XP7-users","DotOutlineTree","Vim-klip-for-Serence-Klipfolio-Windows","explorer-reader.vim","recent.vim","crontab.freebsd.vim","Rainbow-Parenthesis","mom.vim","DoTagStuff","gentypes.py","YankRing.vim","mathml.vim","xhtml.vim","MS-SQL-Server-Syntax","Mark","autoit.vim","Guardian","octave.vim","Markdown-syntax","desert256.vim","Embedded-Vim-Preprocessor","cvsmenu.vim-updated","Omap.vim","swig","cccs.vim","vc_diff","Teradata-syntax","timekeeper","trt.vim","greens","VIMEN","pike.vim","aspvbs.vim","wood.vim","custom","sienna","tmda_filter.vim","cstol.vim","tex_umlaute","Quick-access-file-Menu","IComplete","Emacs-outline-mode","teol.vim","acsb","drcstubs","drc_indent","rubikscube.vim","php_check_syntax.vim","Mathematica-Syntax-File","Mathematica-Indent-File","SpotlightOpen","autoscroll","vsearch.vim","quantum.vim","ToggleOptions.vim","crontab.vim","tagselect","TinyBufferExplorer","TortoiseSVN.vim","nasl.vim","sadic.tgz","tabs.vim","otherfile.vim","otherfile.vim","LogiPat","luarefvim","keywords.vim","Pida","nightshade.vim","form.vim","rsl.vim","Color-Scheme-Explorer","Project-Browser-or-File-explorer-for-vim","Shortcut-functions-for-KeepCase-script-","maximize.dll","recycle.dll-and-recycle.vim","php_funcinfo.vim","T7ko","cguess","php_template","another-dark-scheme","java_fold","DataStage-Universe-Basic","vimplate","vimplate","bwftmenu.vim","asmM6502.vim","udvm.vim","bwHomeEndAdv.vim","bwUtility.vim","snippetsEmu","perlprove.vim","Dynamic-Keyword-Highlighting","CSVTK","ps2vsm","advantage","The-Stars-Color-Scheme","bufferlist.vim","Impact","Windows-PowerShell-Syntax-Plugin","xslt","verilogams.vim","XHTML-1.0-strict-help-file","sudoku","tidy","Pleasant-colorscheme","VST","A-soft-mellow-color-scheme","Professional-colorscheme-for-Vim","pluginfonts.vim","TabBar","Autoproject","last_change","last_change","AutoTag","switchtags.vim","dmd","VIM-Email-Client","cxxcomplete","The-Vim-Gardener","Colortest","Mud","Mud","Modelines-Bundle","syntaxada.vim","Night-Vision-Colorscheme","PDV--phpDocumentor-for-Vim","eraseSubword","larlet.vim","Cthulhian","SmartCase","HP-41-syntax-file","HP-41-file-type-plugin","Last-Modified","cloudy","xslhelper.vim","adobe.vim","Peppers","syntaxconkyrc.vim","bookmarks.vim","Zopedav","CVSconflict","TextMarker","ldap.vim","asmh8300","TailMinusF","QFixToggle","fpc.vim","Chars2HTML","cfengine-log-file-highlighting","syntaxuil.vim","cHeaderFinder","syntaxudev.vim","charon","SessionMgr","UniCycle","interfaces","gdbvim","build.vim","jay-syntax","d.vim","GreedyBackspace.vim","BuildWin","py_jump.vim","motus.vim","fish.vim","Processing-Syntax","range-search.vim","xml.vim","tagSetting.vim","javap.vim","desertedocean.vim","Zen-Color-Scheme","DarkZen-Color-Scheme","gnupg-symmetric.vim","desertedocean.vim","understated","impactG","DesertedOceanBurnt","Local-configuration","OMNeTpp-NED-syntax-file","Workspace-Manager","bwTemplate","vim_colors","brsccs.vim","bibFindIndex","Auto-debug-your-vim","shorewall.vim","carvedwood","avs.vim","jadl.vim","openvpn","softblue","bufmap.vim","corn","dtdmenu","iptables","CarvedWoodCool","darkerdesert","selection_eval.vim","cfname","checksyntax","textutil.vim","haml.zip","Dev-Cpp-Scheme","HiMtchBrkt","Compiler-Plugin-for-msbuild-csc","XML-Folding","compilerpython.vim","winmanager","xsl-fo","XML-Completion","telstar.vim","colors","AllBuffersToOneWindow.vim","MoveLine","Altair-OptiStruct-Syntax","Low-Contrast-Color-Schemes","vera.vim","VHDL-indent-93-syntax","svn_commit","cecscope","baycomb","VCard-syntax","copypath.vim","CycleColor","Grape-Color","moin.vim","glark.vim","syntaxm4.vim","dtd2vim","docbook44","moria","Ant","netrw.vim","far","bayQua","promela","lbnf.vim","watermark","Sift","vim7-install.sh","yellow","maude.vim","Modeliner","Surveyor","muttrc.vim","CmdlineCompl.vim","cvops-aut.vim","kid.vim","marklar.vim","spectro.vim","StickyCursor","fasm.vim","django.vim","ScrollColors","PluginKiller","jr.vim","JavaScript-syntax","pyte","Sudoku-Solver","Efficient-python-folding","derefined","initng","Align.vim","all-colors-pack","rfc2html","delins.vim","slr.vim","Vimball","Search-unFold","jbase.vim","jbase.vim","LargeFile","TabLineSet.vim","XHTML-1.0-Strict-vim7-xml-data-file","autohi","manuscript.vim","screenpaste.vim","VimVS6","SwitchExt","VhdlNav","smcl.vim","changelog","ClassTree","icalendar.vim","OmniCppComplete","maven2.vim","WinWalker.vim","cmaxx","magic.vim","vbnet.vim","javaimports.vim","habiLight","comments.vim","FlexWiki-syntax-highlighting","timing.vim","backburnerEdit_Visual_Block.vim","txt.vim","amarok.vim","vimproject","TagsParser","remind","pluginbackup.vim","colorsmartin_krischik.vim","Highlighter.vim","mousefunc-option-patch","GetChar-event-patch","pythoncomplete","Tabline-wrapping-patch","foxpro.vim","abolish.vim","perl_search_lib","compilergnat.vim","ftpluginada.vim","bluez","jVim","Simple-Color-Scheme","ScreenShot","autoproto.vim","autoloadadacomplete.vim","CD_Plus","xul.vim","Toggle-Window-Size","icansee.vim","KDE-GVIM-vimopen","Neverness-colour-scheme","Rainbow-Parenthsis-Bundle","patchreview.vim","forth.vim","ftdetectada.vim","gtd","rails.vim","abnf","montz.vim","redstring.vim","php.vim","SQLComplete.vim","systemverilog.vim","settlemyer.vim","findstr.vim","crt.vim","css.vim","tcl.vim","cr-bs-del-space-tab.vim","FlagIt","lookupfile","vim-addon-background-cmd","tobase","Erlang-plugin-package","actionscript.vim","verilog_systemverilog.vim","myghty.vim","ShowFunc","skk.vim","unimpaired.vim","octave.vim","crestore.vim","comment.vim","showhide.vim","warsow.vim","blacklight","color_toon","yanktmp.vim","highlight.vim","pop11.vim","Smooth-Scroll","developer","tcl.vim","colornames","gsl.vim","HelpWords","color_peruse","Chrome-syntax-script","Ada-Bundle","IncRoman.vim","Access-SQL-Syntax-file","vj","phps","Satori-Color-Scheme","SWIG-syntax","tdl.vim","afterimage.vim","cshelper","vimtips_with_comments","scvim","phpx","TIMEIT","phpfolding.vim","pastie.vim","x12-syntax","liquid.vim","doriath.vim","findfuncname.vim","XChat-IRC-Log","gnuchangelog","sh.vim","svncommand-tng","matlab_run.vim","candycode.vim","JDL-syntax-file","myfold.vim","SourceCodeObedience","MultiTabs","cpp.vim","AfterColors.vim","zzsplash","SuperTab-continued.","switch_headers.vim","tikiwiki.vim","str2numchar.vim","addexecmod.vim","ASL","scrollfix","asmx86_64","freya","highlight_current_line.vim","proe.vim","git.zip","cobol.zip","quilt","doxygenerator","The-NERD-tree","dw_colors","mint","redocommand","rubycomplete.vim","asm8051.vim","buftabs","tavi.vim","Alternate-workspace","campfire","blink","doorhinge.vim","darktango.vim","blueprint.vim","pdf.vim","Drupal-5.0-function-dictionary","toggle_words.vim","twilight","Tab-Name","tidy-compiler-script","Vexorian-color-scheme","ekvoli","IndexedSearch","Darcs","DNA-sequence-highlighter","plaintex.vim","Tango-colour-scheme","jdox","MakeInBuilddir","mail_indenter","IndentConsistencyCop","IndentConsistencyCopAutoCmds","tailtab.vim","desertEx","SnippetsMgr","StateExp","VPars","surround.vim","C_Epita","vimGTD","vimksh","Remove-Trailing-Spaces","edc-support","vdb.vim","vdb-duplicated","redcode.vim","Marks-Browser","php_getset.vim","FencView.vim","scons.vim","SWIFT-ATE-Syntax","Business-Objects-Syntax","Test.Base-syntax","darker-robin","Tail-Bundle","tcl_snit.vim","tcl_sqlite.vim","tcl.vim","tabula.vim","WLS-Mode","gvimext.dll--support-tabs-under-VIM-7","renamer.vim","cf.vim","vimpager","pyljvim","capslock.vim","ruby_imaps","Templeet","sal-syntax","exUtility","tAssert","perlcritic-compiler-script","rdark","aedit","vbugle","echofunc.vim","applescript.vim","gnuplot.vim","RunVim.applescript","Info.plist","filetype.vim","R-MacOSX","Utility","vst_with_syn","nightflight.vim","amifmt.vim","compilerflex.vim","javascript.vim","toggle_word.vim","GotoFileArg.vim","kib_darktango.vim","tGpg","kib_plastic","surrparen","TTrCodeAssistor","sparql.vim","BinarySearchMove","lbdbq","kate.vim","conlangs","lojban","surrogat","aspnetcs","lua-support","code_complete","tcl_itcl.vim","tcl_togl.vim","recent.vim","SnipSnap","lispcomplete.vim","etk-vim-syntax","woc","DAMOS-tools","Haml","Menu_SQL_Templates.vim","tcl_critcl.vim","Vimgrep-Replace","cvsdiff","Wombat","tcmdbar.vim","scala.vim","mlint.vim","polycl.vim","cscope-wrapper","apachestyle","javacomplete","hexsearch.vim","wikipedia.vim","Bexec","Audacious-Control","tagscan","erm.vim","fcsh-tools","vibrantink","autoloadTemplate.vim","SETL2","svnvimdiff","smarty.vim","polycfg.vim","IndentHL","c16gui","eclipse.vim","compview","brief2","SearchFold","MultiEnc.vim","calmar256-lightdark.vim","Vimplate-Enhanced","guicolorscheme.vim","Infobasic-Set-Syntax-FTDetect-FTPlugi","Random-Tip-Displayer","gotofile","greplace.vim","sqlvim.sh","Windows-PowerShell-Indent-File","Windows-PowerShell-File-Type-Plugin","buffers_search_and_replace","Yankcode","vimbuddy.vim","NAnt-completion","NAnt-syntax","incfilesearch.vim","NetSend.vim","Hints-for-C-Library-Functions","Hints-for-C-Library-Functions","smp","writebackup","writebackupVersionControl","html-improved-indentation","VimSpy","asciidoc.vim","des3.vim","st.vim","RDF-Namespace-complete","bufpos","BlitzBasic-syntax-and-indentation","tEchoPair","IndentAnything","Javascript-Indentation","nicotine.vim","screenplay","jman.vim","OceanBlack256","haproxy","gitdiff.vim","NesC-Syntax-Highlighting","arpalert","AutoClose","carrot.vim","SearchSyntaxError","clarity.vim","Twitter","Xdebugxs-dictionary-of-functions","textmate16.vim","Jinja","native.vim","mako.vim","eZVim","Directory-specific-settings","errormarker.vim","kpl.vim","tlib","tmru","tselectfiles","tselectbuffer","doctest-syntax","simplefold","genshi.vim","django.vim","fruity.vim","summerfruit.vim","projtags.vim","psql.vim","verilog_emacsauto.vim","securemodelines","voodu.vim","vimoutliner-colorscheme-fix","AutoComplPop","ck.vim","svndiff","Increment-and-Decrement-number","felix.vim","python_import.vim","scmCloseParens","nginx.vim","AnyPrinter","DiffGoFile","automated-rafb.net-uploader-plugin","LustyExplorer","vividchalk.vim","CimpTabulate.vim","vmake","Vim-Setup-system","gmcs.vim","ragtag.vim","synic.vim","vcsnursery","FindFile","ael.vim","freefem.vim","skill_comment.vim","REPL","ReloadScript","camelcasemotion","tmboxbrowser","snipper","creole.vim","QuickBuf","SuperPre","in.vim","perlhelp.vim","tbibtools","vdm.vim","mySqlGenQueryMenu.vim","Scheme-Mode","clibs.vim","cvsps-syntax","javalog.vim","ChocolatePapaya","vpp.vim","omniperl","context-complier-plugin","bbs.vim","syntaxalgol68.vim","Rename","DBGp-client","maxscript.vim","svndiff.vim","visSum.vim","html_french","git-commit","rectcut","OOP-javascript-indentation","Syntax-for-XUL","todo.vim","autofmt","drools.vim","fx.vim","stingray","JSON.vim","QuickFixFilterUtil","outline","Dictionary","VimExplorer","gvim-pdfsync","systemverilog.vim","Vimpress","yavdb","doxygen-support.vim","smart_cr","yasnippets","SmartX","CharSort","cimpl","Tabmerge","Simple256","vimscript-coding-aids","tie.vim","lodgeit.vim","Ruby-Snippets","gvim-extensions-for-TALpTAL","indenthaskell.vim","Highlight-and-Mark-Lines","deb.vim","trivial256","Parameter-Helpers","JET_toggle","pyconsole_vim.vim","lettuce.vim","rcscript","rcscript","Easy-alignment-to-column","Sass","vimremote.sh","halfmove","vimff","GtagsClient","FuzzyFinder","runtests.vim","mosalisp.vim","khaki.vim","two2tango","gitvimdiff","kwiki.vim","Shell-History","triangle.vim","NightVision","confluencewiki.vim","railscasts","bruce.vim","undo_tags","iast.vim","sas.vim","blinking_cursor","lookup.vim","python_ifold","gobgen","ColorSchemeMenuMaker","karma.vim","progressbar-widget","greplist.vim","buffer-status-menu.vim","AutoClose","sessionman.vim","dbext4rdb","openssl.vim","DrillCtg","ttoc","cheat.vim","no_quarter","tregisters","ttags","3DGlasses.vim","Gettext-PO-file-compiler","headerguard.vim","Tailf","erlang-indent-file","brew.vim","camlanot.vim","motion.vim","taskpaper.vim","MarkLines","4NT-Bundle","vimblog.vim","makeprgs","swap-parameters","trag","colorful256.vim","F6_Comment-old","F6_Comment","hookcursormoved","narrow_region","QuickComment","tcalc","AutoScrollMode","of.vim","VimPdb","myvim.vim","mips.vim","Flash-Live-Support-Agent-and-Chatroom","nosql.vim","BlockDiff","vimpp","LustyJuggler","enscript-highlight","idlang.vim","asmc54xx","TranslateIt","ttagecho","soso.vim","PropBank-Semantic-Role-Annotations","matchparenpp","winwkspaceexplorer","Warm-grey","haskell.vim","coq-syntax","xemacs-mouse-drag-copy","checksum.vim","executevimscript","newlisp","yate","ttagcomplete","bbcode","yet-another-svn-script","switch-files","rcg_gui","rcg_term","indenthtml.vim","setsyntax","phtml.vim","industrial","Coq-indent","autoresize.vim","mysqlquery","comments.vim","javascript.vim","gen_vimoptrc.vim","TI-Basic-Syntax","code-snippet","refactor","WuYe","Acpp","view_diff","verilog.vim","reloaded.vim","complval.vim","Puppet-Syntax-Highlighting","Smartput","Tab-Menu","narrow","fakeclip","xml_autons","textobj-user","textobj-datetime","EnvEdit.vim","kwbdi.vim","R.vim","oberon2","hiveminder.vim","scratch","csv-reader","BBCode","chords","robocom","autohotkey-ahk","pspad-colors-scheme","Torquescript-syntax-highlighting","Processing","Io-programming-language-syntax","GCov-plugin","gcov.vim","webpreview","speeddating.vim","HeaderCVS","bg.py","basic-colors","Twitter","SDL-library-syntax-for-C","accurev","Wikidoc-syntax-highlighting","symfony.vim","Noweb","XmlPretty","Socialtext-wiki-syntax-highlighting","byter","tintin.vim","tabpage_sort.vim","syntax-highlighting-for-tintinttpp","repeat.vim","Css-Pretty","PBwiki-syntax-highlighting","sgf.vim","xoria256.vim","undobranche_viewer.vim","showmarks","unibasic.vim","nice-vim","GOBject-Builder-gob2","prmths","VimTrac","quiltdiff","ncss.vim","css_color.vim","sessions.vim","snippets.vim","RecentFiles","marvim","greenvision","leo256","altfile","diffchanges.vim","timestamp","VFT--VIM-Form-Toolkit","DataStage-Server-and-Parallel","sharp-Syntax","GNU-R","renamec.vim","ukrainian-enhanced.vim","patran.vim","dakota.vim","Doxygen-via-Doxygen","jammy.vim","osx_like","PERLDOC2","head.vim","repmo.vim","Railscasts-Theme-GUIand256color","cwiki","rdhelp.txt","cqml.vim","Source-Explorer-srcexpl.vim","ColorSchemeEditor","reliable","vimlatex","smoothPageScroll.vim","file-line","git-file.vim","pig.vim","Latex-Text-Formatter","earendel","Luinnar","dtrace-syntax-file","MountainDew.vim","Syntax-for-Fasta","fpdf.vim","number-marks","Unicode-Macro-Table","antlr3.vim","beauty256","rastafari.vim","gauref.vim","northland.vim","SCMDiff","Boost-Build-v2-BBv2-syntax","vimgen","TwitVim","CoremoSearch","runzip","Relativize","Txtfmt-The-Vim-Highlighter","pyrex.vim","Shobogenzo","seoul","Obvious-Mode","VimTAP","Switch","darkspectrum","qfn","groovy.vim","debugger.py","Limp","bensday","Allegro-4.2-syntax-file","CmdlineComplete","tinymode.vim","STL-improved","sort-python-imports","vimwiki","browser.vim","autopreview","pacific.vim","beachcomber.vim","WriteRoom-for-Vim","h80","nc.vim","rtorrent-syntax-file","previewtag","WarzoneResourceFileSyntax","useful-optistruct-functions","StringComplete","darkrobot.vim","256-jungle","vcsbzr.vim","openser.vim","RemoveDups.VIM","less.bat","upf.vim","darkroom","FFeedVim","xml_taginsert","pac.vim","common_vimrc","journal.vim","publish.vim","railstab.vim","musicbox.vim","buffergrep","dark-ruby","bpel.vim","Git-Branch-Info","Named-Buffers","Contrasty","nagios-syntax","occur.vim","xtemplate","EZComment","vera.vim","silent.vim","colorful","apachelogs.vim","vim-rpcpaste","pygdb","AutoInclude","nightflight2.vim","gladecompletion.vim","flydiff","textobj-fold","textobj-jabraces","DevEiate-theme","jptemplate","cmdlinehelp","blackboard.vim","pink","brook.vim","huerotation.vim","cup.vim","vmv","Specky","fgl.vim","ctags.exe","loremipsum","smartchr","skeleton","linglang","Resolve","SwapIt","Glob-Edit","sipngrep","sipngrep-helper","codepad","fortran.vim","perl-mauke.vim","Gembase-dml-plugins","foldsearch","spring.vim","vimdb.vim","Textile-for-VIM","Text-Especially-LaTeX-Formatter","Clever-Tabs","portablemsys","GoogleSearchVIM","Indent-Highlight","softlight.vim","sofu.vim","QuickName","thegoodluck","auto_wc.vim","zoom.vim","zshr.vim","TextFormat","LaTeX-error-filter","batch.vim","catn.vim","nopaste.vim","Tumblr","log.vim","chlordane.vim","pathogen.vim","session.vim","backup.vim","metarw","metarw-git","ku","bundle","simple-pairs","molokai","postmail.vim","dictview.vim","ku-bundle","ku-metarw","Vimchant","bufmru.vim","trinity.vim","Chimp","indentgenie.vim","rootwater.vim","RltvNmbr.vim","stlrefvim","FastGrep","textobj-lastpat","Superior-Haskell-Interaction-Mode-SHIM","Nekthuth","tags-for-std-cpp-STL-streams-...","clue","louver.vim","diff_navigator","simplewhite.vim","vimxmms2","autoincludex.vim","ScopeVerilog","vcsc.py","darkbone.vim","CCTree","vimmp","Duplicated","sqloracle.vim","automatic-for-Verilog","ClosePairs","dokuwiki.vim","if_v8","vim-addon-sql","htmlspecialchars","mlint.vim","win9xblueback.vim","Verilog-constructs-plugin","RemoveIfdef","Note-Maker","winter.vim","buf2html.vim","sqlite_c","endwise.vim","cern_root.vim","conomode.vim","pdc.vim","CSApprox","MPC-syntax","Django-Projects","QuickTemplate","darkeclipse.vim","Fly-Between-Projects","Cutting-and-pasting-txt-file-in-middle","Fly-Between-Projects","hfile","cheat","sqlplsql","Russian-PLansliterated","advice","stackreg","Pit-Configuration","Robotbattle-Scripting-Language","Lissard-syntax","MatlabFilesEdition","Refactor-Color-Scheme","sql_iabbr-2","ku-args","Yow","lastchange","Miranda-syntax-highlighting","Tango2","textobj-diff","jQuery","Merb-and-Datamapper","Format-Helper","quickrun","gadgetxml.vim","PySmell","Wordnet.vim","Gist.vim","Transmit-FTP","arpeggio","nour.vim","code_complete-new-update","LineCommenter","autocorrect.vim","literal_tango.vim","commentToggle","corporation","W3AF-script-syntax-file","Side-C","Php-Doc","fuzzyjump.vim","shymenu","EasyGrep","Php-Doc","TagManager-BETA","pyflakes.vim","VimLocalHistory","Python-Documentation","Download-Vim-Scripts-as-Cron-Task","UpdateDNSSerial","narrow","Pago","PylonsCommand","sqlserver.vim","msdn_help.vim","nightsky","miko","eyapp","google","outputz","mtys-vimrc","unibox","enzyme.vim","AutoTmpl","AutoTmpl","Python-Syntax-Folding","kellys","session_dialog.vim","wombat256.vim","cdargs","submode","sandbox","translit","smartword","paintbox","Csound-compiler-plugin","python_open_module","Gentooish","ini-syntax-definition","cbackup.vim","Persistent-Abbreviations","ActionScript-3-Omnicomplete","grsecurity.vim","maroloccio","pygtk_syntax","Quagmire","Gorilla","textobj-indent","python_check_syntax.vim","proc.vim","fortran_codecomplete.vim","Rack.Builder-syntax","maroloccio2","eclm_wombat.vim","maroloccio3","ViBlip","pty.vim","Fruidle","Pimp","Changed","shellinsidevim.vim","blood","toggle_unit_tests","VimClojure","fly.vim","lightcolors","vanzan_color","tetragrammaton","VimIM","0scan","DBGp-Remote-Debugger-Interface","Spiderhawk","proton","RunView","guepardo.vim","charged-256.vim","ctxabbr","widower.vim","lilydjwg_green","norwaytoday","WOIM.vim","Dpaste.com-Plugin","reorder-tabs","searchfold.vim","wokmarks.vim","Jifty-syntax","Scratch","Thousand-separator","Perl-MooseX.Declare-Syntax","jpythonfold.vim","Thesaurus","IndentCommentPrefix","po.vim","slimv.vim","nxc.vim","muttaliasescomplete.vim","d.vim","cca.vim","Lucius","earthburn","ashen.vim","css-color-preview","snipMate","Mastermind-board-game","StarRange","SearchCols.vim","EditSimilar","Buffer-grep","repy.vim","xsltassistant.vim","php.vim","BusyBee","wps.vim","Vicle","jam.vim","irssilog.vim","CommentAnyWay","jellybeans.vim","myprojects","gitignore","Match-Bracket-for-Objective-C","gams.vim","numbertotext","NumberToEnglish","ansi_blows.vim","bufMenuToo","simple_comments.vim","runVimTests","utf8-math","Vim-Rspec","Blazer","LogMgr","vimdecdef","apidock.vim","ack.vim","Darkdevel","codeburn","std-includes","WinMove","summerfruit256.vim","lint.vim","Session-manager","spec.vim","Fdgrep","blogit.vim","popup_it","quickfixsigns","lilydjwg_dark","upAndDown","PDV-revised","glimpse","vylight","FSwitch","HTML-AutoCloseTag","Zmrok","LBufWin","tmarks","Skittles-Dark","gvimfullscreen_win32","lighttpd-syntax","reorder.vim","todolist.vim","Symfony","wargreycolorscheme","paster.vim","Haskell-Cuteness","svk","nextfile","vimuiex","TaskList.vim","send.vim","PA_translator","textobj-entire","xptemplate","Rubytest.vim","vimstall","sdticket","vimtemplate","graywh","SpamAssassin-syntax","ctk.vim","textobj-function","neocomplcache","up2picasaweb","ku-quickfix","TODO-List","ProtoDef","Cabal.vim","Vimya","exVim","Vim-R-plugin","explorer","compilerjsl.vim","dosbatch-indent","nimrod.vim","csindent.vim","SearchPosition","smartmatcheol.vim","google.vim","ScmFrontEnd-former-name--MinSCM","blogger","jlj.vim","tango-morning.vim","haskell.vim","PLI-Auto-Complete","python_coverage.vim","Erlang_detectVariable","bandit.vim","TagHighlight","Templates-for-Files-and-Function-Groups","darkburn","PBASIC-syntax","darkZ","fitnesse.vim","bblean.vim","cuteErrorMarker","Arduino-syntax-file","squirrel.vim","Simple-R-Omni-Completion","VOoM","Changing-color-script","g15vim","clips.vim","plumbing.vim","ywvim","mako.vim","HtmlHelper","Mark","setget","shell_it","fastlane","TuttiColori-Colorscheme","tango-desert.vim","Hoogle","smarttill","cocoa.vim","altercmd","supercat.vim","nature.vim","GoogleReader.vim","textobj-verticalbar","cursoroverdictionary","Colorzone","colorsupport.vim","FastLadder.vim","herald.vim","zOS-Enterprise-Compiler-PLI","cuteTodoList","iabassist","dual.vim","kalt.vim","kaltex.vim","fbc.vim","operator-user","ats-lang-vim","MediaWiki-folding-and-syntax-highlight","EnhancedJumps","elise.vim","elisex.vim","Dictionary-file-for-Luxology-Modo-Python","argtextobj.vim","PKGBUILD","editsrec","regreplop.vim","ReplaceWithRegister","mrpink","tiddlywiki","PA_ruby_ri","EnumToCase","commentop.vim","SudoEdit.vim","vimrc","Screen-vim---gnu-screentmux","sign-diff","nextCS","Tag-Signature-Balloons","UltiSnips","textobj-syntax","mutt-aliases","mutt-canned","Proj","arc.vim","AutoFenc.vim","cssvar","math","Rename2","translit_converter","Syntax-Highlighting-for-db2diag.log","jsbeautify","tkl.vim","jslint.vim","donbass.vim","sherlock.vim","Notes","Buffer-Reminder-Remake","PreviewDialog","Logcat-syntax-highlighter","Syntastic","bib_autocomp.vim","v2.vim","bclear","vimper","blue.vim","ruby.vim","greek_polytonic.vim","git-cheat","falcon.vim","nuweb-multi-language","d8g_01","d8g_02","d8g_03","d8g_04","vimdiff-vcs","falcon.vim","banned.vim","delimitMate.vim","evening_2","color-chooser.vim","forneus","Mustang2","Quich-Filter","Tortoise","qtmplsel.vim","falcon.vim","falcon.vim","dull","Better-Javascript-Indentation","Join.vim","emv","vimscript","pipe.vim","JumpInCode","Conque-Shell","Crazy-Home-Key","grex","whitebox.vim","logpad.vim","vilight.vim","tir_black","gui2term.py","moss","python-tag-import","Django-helper-utils","operator-replace","DumbBuf","template-init.vim","wwwsearch","cpan.vim","Melt-Vim","InsertList","rargs.vim","cmdline-increment.vim","popup_it","perdirvimrc--Autoload-vimrc-files-per-di","hybridevel","phpErrorMarker","Functionator","CheckAttach.vim","SoftTabStops","Pasto","tango.vim","Windows-PowerShell-indent-enhanced","NERD_tree-Project","JavaScript-syntax-add-E4X-support","php_localvarcheck.vim","chocolate.vim","assistant","md5.vim","Nmap-syntax-highlight","haxe_plugin","fontsize.vim","InsertChar","hlasm.vim","term.vim","MailApp","PyMol-syntax","hornet.vim","Execute-selection-in-Python-and-append","testname","Asneeded-2","smarty-syntax","DBGp-client","sqlplus.vim","unicode.vim","baan.vim","libperl.vim","filter","multisearch.vim","RTM.vim","Cobalt-Colour-scheme","roo.vim","csv.vim","mimicpak","xmms2ctrl","buf_it","template.vim","phpcodesniffer.vim","wikinotes","powershellCall","HiVim","QuickFixHighlight","noused","coldgreen.vim","vorg","FlipLR","simple-comment","ywchaos","haskellFold","pod-helper.vim","Script-Walker","color-codes-SQL-keywords-from-Oracle-11g","FindInNERDTree","Speedware","perlomni.vim","go.vim","go.vim","github-theme","vimmpc","exjumplist","textobj-fatpack","grey2","prettyprint.vim","JumpInCode-new-update","GNU-as-syntax","NSIS-syntax-highlighting","colqer","gemcolors","Go-Syntax","fortran_line_length","Ruby-Single-Test","OmniTags","FindMate","signature_block.vim","record-repeat.vim","php.vim","signal_dec_VHDL","HTML-menu-for-GVIM","spinner.vim","RDoc","XPstatusline","rc.vim","mib_translator","Markdown","growlnotify.vim","JavaAspect","gsession.vim","cgc.vim","manuscript","CodeOverview","bluechia.vim","slurper.vim","create_start_fold_marker.vim","doubleTap","filetype-completion.vim","vikitasks","PyPit","open-terminal-filemanager","Chrysoprase","circos.vim","TxtBrowser","gitolite.vim","ShowFunc.vim","AuthorInfo","Cfengine-3-ftplugin","Cfengine-version-3-syntax","vim-addon-manager","Vim-Condensed-Quick-Reference","hlint","Enhanced-Ex","Flex-Development-Support","restart.vim","selfdot","syntaxGemfile.vim","spidermonkey.vim","pep8","startup_profile","extended-help","tplugin","SpitVspit","Preamble","Mercury-compiler-support","FirstEffectiveLine.vim","vimomni","std.vim","tocterm","apt-complete.vim","SnippetComplete","Dictionary-List-Replacements","Vimrc-Version-Numbering","mark_tools","rfc-syntax","fontzoom.vim","histwin.vim","vim-addon-fcsh","vim-addon-actions","superSnipMate","bzr-commit","hexHighlight.vim","Multi-Replace","strawimodo","vim-addon-mw-utils","actionscript3id.vim","RubySinatra","ccvext.vim","visualstar.vim","AutomaticLaTeXPlugin","AGTD","bvemu.vim","GoogleSuggest-Complete","The-Max-Impact-Experiment","cflow-output-colorful","SaneCL","c-standard-functions-highlight","Wavefronts-obj","hypergit.vim","hex.vim","csp.vim","load_template","emoticon.vim","emoticon.vim","bisect","groovyindent","liftweb.vim","line-number-yank","neutron.vim","SyntaxMotion.vim","Doxia-APT","daemon_saver.vim","ikiwiki-nav","ucf.vim","ISBN-10-to-EAN-13-converter","sha1.vim","hmac.vim","cucumber.zip","mrkn256.vim","fugitive.vim","blowfish.vim","underwater","trogdor","Parameter-Text-Objects","php-doc-upgrade","ZenCoding.vim","jumphl.vim","qmake--syntax.vim","R-syntax-highlighting","BUGS-language","AddCppClass","loadtags","OpenCL-C-syntax-highlighting","pummode","stickykey","rcom","SaveSigns","ywtxt","Rackup","colorselector","TranslateEnToCn","utlx_interwiki.vim","BackgroundColor.vim","django-template-textobjects","html-advanced-text-objects","candyman.vim","tag_in_new_tab","indentpython","vxfold.vim","simplecommenter","CSSMinister","Twee-Integration-for-Vim","httplog","treemenu.vim","delete-surround-html","tumblr.vim","vspec","tcommand","ColorX","alex.vim","happy.vim","Cppcheck-compiler","vim-addon-completion","spin.vim","EasyOpts","Find-files","Bookmarking","tslime.vim","vimake","Command-T","PickAColor.vim","grsecurity","rename.vim","tex-turkce","motpat.vim","orange","Mahewincs","Vim-Title-Formatter","syntaxhaskell.vim","tesla","XTermEsc","vim-indent-object","noweb.vim","vimgdb","cmd.vim","RST-Tables","css3","clevercss.vim","compilerpython.vim","cmakeref","operator-camelize","scalacommenter.vim","vicom","acomment","smartmove.vim","vimform","changesPlugin","Maynard","Otter.vim","ciscoasa.vim","translit3","vimsizer","tex_mini.vim","lastpos.vim","Manuals","VxLib","256-grayvim","mdark.vim","aftersyntaxc.vim","mayansmoke","repeater.vim","ref.vim","recover.vim","Slidedown-Syntax","ShowMultiBase","reimin","self.vim","kiss.vim","Trac-Wikimarkup","NrrwRgn","ego.vim","Delphi-7-2010","CodeFactory","JavaScript-Indent","tagmaster","qiushibaike","dc.vim","tf2.vim","glyph.vim","OutlookVim","GetFile","vimtl","RTL","Sessions","autocomp.vim","TortoiseTyping","syntax-codecsconf","cvsdiff.vim","yaifa.vim","Silence","PNote","mflrename","nevfn","Tumble","vplinst","tony_light","pyref.vim","legiblelight","truebasic.vim","writebackupToAdjacentDir","GUI-Box","LaTeX-Box","mdx.vim","leglight2","RemoveFile.vim","formatvim","easytags.vim","SingleCompile","CFWheels-Dictionary","fu","skk.vim","tcbuild.vim","grails-vim","django_templates.vim","PySuite","shell.vim","vim-addon-sbt","PIV","xpcomplete","gams","Search-in-Addressbook","teraterm","CountJump","darkBlue","underwater-mod","open-browser.vim","rvm.vim","Vim-Script-Updater","beluga-syntax","tac-syntax","datascript.vim","phd","obsidian","ez_scroll","vim-snipplr","vim-haxe","hgrev","zetavim","quickrun.vim","wmgraphviz","reload.vim","Smooth-Center","session.vim","pytestator","sablecc.vim","CSS-one-line--multi-line-folding","vorax","slang_syntax","ikiwiki-syntax","opencl.vim","gitview","ekini-dark-colorscheme","pep8","pyflakes","tabops","endline","pythondo","obviously-insert","toggle_mouse","regbuf.vim","mojo.vim","luainspect.vim","pw","phpcomplete.vim","SyntaxComplete","vimgcwsyntax","JsLint-Helper","Haskell-Highlight-Enhanced","typeredeemer","BusierBee","Shapley-Values","help_movement","diff_movement","fortunes_movement","mail_movement","CSS3-Highlights","vimpluginloader","jsonvim","vimstuff","vimargumentchec","vimcompcrtr","vimoop","yamlvim","DokuVimKi","jade.vim","v4daemon","ovim","Starting-.vimrc","gedim","current-func-info.vim","undofile.vim","vim-addon-ocaml","Haskell-Conceal","trailing-whitespace","rdark-terminal","mantip","htip","python_showpydoc.vim","tangoshady","bundler","cHiTags","Quotes","Smart-Parentheses","operator-reverse","python_showpydoc","rslTools","presets","View-Ports","Replay.vim","qnamebuf","processing-snipmate","ProjectTag","Better-CSS-Syntax-for-Vim","indexer.tar.gz","285colors-with-az-menu","LanguageTool","VIM-Color-Picker","Flex-4","lodestone","Simple-Javascript-Indenter","porter-stem","stem-search","TeX-PDF","PyInteractive","HTML5-Syntax-File","VimgrepBuffer","ToggleLineNumberMode","showcolor.vim","html5.vim","blockinsert","LimitWindowSize","minibufexplorerpp","tdvim_FoldDigest","bufsurf","Open-associated-programs","aspnetide.vim","Timer-routine","Heliotrope","CaptureClipboard","Shades-of-Amber","Zephyr-Color-Scheme","Jasmine-snippets-for-snipMate","swap","RubyProxy","L9","makesd.vim","ora-workbench","sequence","phaver","Say-Time","pyunit","clang","Son-of-Obisidian","Selenitic","diff-fold.vim","Bird-Syntax","Vimtodo","cSyntaxAfter","Code.Blocks-Dark","omnetpp","command-list","open_file_from_clip_board","CommandWithMutableRange","RangeMacro","tchaba","kirikiri.vim","Liquid-Carbon","actionscript.vim","ProjectCTags","Python-2.x-Standard-Library-Reference","Python-3.x-Standard-Library-Reference","ProjectParse","Tabbi","run_python_tests","eregex.vim","OMNeTpp4.x-NED-Syntax-file","Quotes","looks","Lite-Tab-Page","Show-mandictperldocpydocphpdoc-use-K","newsprint.vim","pf_earth.vim","RevealExtends","openurl.vim","southernlights","numbered.vim","grass.vim","toggle_option","idp.vim","sjump.vim","vim_faq","Sorcerer","up.vim","TrimBlank","clang-complete","smartbd","Gundo","altera_sta.vim","altera.vim","vim-addon-async","vim-refact","vydark","gdb4vim","savemap.vim","operator-html-escape","Mizore","maxivim","vim-addon-json-encoding","tohtml_wincp","vim-addon-signs","unite-colorscheme","unite-font","vim-addon-xdebug","VimCoder.jar","FTPDEV","lilypink","js-mask","vim-fileutils","stakeholders","PyScratch","Blueshift","VimCalc","unite-locate","lua_omni","verilog_systemverilog_fix","mheg","void","VIP","Smart-Home-Key","tracwiki","newspaper.vim","rdist-syntax","zenesque.vim","auto","VimOrganizer","stackoverflow.vim","preview","inccomplete","screen_line_jumper","chance-of-storm","unite-gem","devbox-dark-256","lastchange.vim","qthelp","auto_mkdir","jbosslog","wesnothcfg.vim","UnconditionalPaste","unite-yarm","NERD_Tree-and-ack","tabpagecolorscheme","Figlet.vim","Peasy","Indent-Guides","janitor.vim","southwest-fog","Ceasy","txt.vim","Shebang","vimblogger_ft","List-File","softbluev2","eteSkeleton","hdl_plugin","blockle.vim","ColorSelect","notes.vim","FanVim","Vimblr","vcslogdiff","JumpNextLongLine","vimorator","emacsmodeline.vim","textobj-rubyblock","StatusLineHighlight","shadow.vim","csc.vim","JumpToLastOccurrence","perfect.vim","polytonic.utf-8.spl","opencl.vim","iim.vim","line-based_jump_memory.vim","hdl_plugin","localrc.vim","BOOKMARKS--Mark-and-Highlight-Full-Lines","chapa","unite.vim","neverland.vim--All-colorschemes-suck","fokus","phpunit","vim-creole","Search-Google","mophiaSmoke","mophiaDark","Google-translator","auto-kk","update_perl_line_directives","headerGatesAdd.vim","JellyX","HJKL","nclipper.vim","syntax_check_embedded_perl.vim","xterm-color-table.vim","zazen","bocau","supp.vim","w3cvalidator","toner.vim","QCL-syntax-hilighting","kkruby.vim","hdl_plugin","Mind_syntax","Comment-Squawk","neco-ghc","pytest.vim","Enhanced-Javascript-syntax","LispXp","Nazca","obsidian2.vim","vim-addon-sml","pep8","AsyncCommand","lazysnipmate","Biorhythm","IniParser","codepath.vim","twilight256.vim","PreciseJump","cscope_plus.vim","Cobaltish","neco-look","XFST-syntax-file","Royal-Colorschemes","pbcopy.vim","golded.vim","Getafe","ParseJSON","activity-log","File-Case-Enforcer","Microchip-Linker-Script-syntax-file","RST-Tables-works-with-non-english-langu","lexctwolc-Syntax-Highlighter","mxl.vim","fecompressor.vim","Flog","Headlights","Chess-files-.pgn-extension","vim-paint","vundle","funprototypes.vim","SVF-syntax","indentpython.vim","Compile","dragon","Tabular","Tagbar","vimake-vim-programmers-ide","align","windows-sif-syntax","csc.snippets","tidydiff","latte","thermometer","Clean","Neopro","Vim-Blog","bitly.vim","bad-apple","robokai","makebg","asp.net","Atom","vim-remote","IPC-syntax-highlight","PyREPL.vim","phrase.vim","virtualenv.vim","reporoot.vim","rebar","urilib","visualctrlg","textmanip.vim","compilerg95.vim","Risto-Color-Scheme","underlinetag","paper","compilergfortran.vim","compilerifort.vim","Scala-argument-formatter","FindEverything","vim_etx","emacs-like-macro-recorder","To-Upper-case-case-changer","vim-erlang-skeleteons","taglist-plus","PasteBin.vim","compilerpcc.vim","scrnpipe.vim","TeX-9","extradite.vim","VimRepress","text-object-left-and-right","Scala-Java-Edit","vim-stylus","vim-activator","VimOutliner","avr8bit.vim","iconv","accentuate.vim","Solarized","Gravity","SAS-Syntax","gem.vim","vim-scala","Rename","EasyMotion","boost.vim","ciscoacl.vim","Distinguished","mush.vim","cmdline-completion","UltraBlog","GetFilePlus","strange","vim-task","Tab-Manager","XPath-Search","plantuml-syntax","rvmprompt.vim","Save-Current-Font","fatrat.vim","Sesiones.vim","opener.vim","cascading.vim","Google-Translate","molly.vim","jianfan","Dagon","plexer","vim-online","gsearch","Message-Formatter","sudoku_game","emacscommandline","fso","openscad.vim","editqf","visual-increment","gtrans.vim","PairTools","Table-Helper","DayTimeColorer","Amethyst","hier","Javascript-OmniCompletion-with-YUI-and-j","m2sh.vim","colorizer","Tabs-only-for-indentation","modelica","terse","dogmatic.vim","ro-when-swapfound","quit-another-window","gitv","Enter-Indent","jshint.vim","pacmanlog.vim","lastmod.vim","ignore-me","vim-textobj-quoted","simplenote.vim","Comceal","checklist.vim","typofree.vim","Redhawk-Vim-Plugin","vim-soy","Find-XML-Tags","cake.vim","vim-coffee-script","browserprint","jovial.vim","pdub","ucompleteme","ethna-switch","Fanfou.vim","colorv.vim","Advancer-Abbreviation","Auto-Pairs","octave.vim","cmdline-insertdatetime","reorder-columns","calm","nicer-vim-regexps","listtag","Diablo3","vim_django","nautilus-py-vim","IDLE","operator-star","XQuery-indentomnicompleteftplugin","browsereload-mac.vim","splitjoin.vim","vimshell-ssh","ShowMarks7","warez-colorscheme","Quicksilver.vim","wikilink","Buffergator","Buffersaurus","ri-viewer","beautiful-pastebin","chef.vim","indsas","lua.vim","AutoSaveSetting","resizewin","cpp_gnuchlog.vim","tangolight","IDSearch","frawor","git_patch_tags.vim","snipmate-snippets","widl.vim","WinFastFind","ReplaceFile","gUnit-syntax","Handlebars","svnst.vim","The-Old-Ones","Atomic-Save","vim-orgmode","Vimper-IDE","vimgtd","gnupg.vim","Filesearch","VimLite","AutoCpp","simpleRGB","cakephp.vim","googleclosurevim","vim-task-org","brep","vrackets","xorium.vim","transpose-words","Powershell-FTDetect","LycosaExplorer","ldap_schema.vim","Lookup","Intelligent-Tags","lemon.vim","SnipMgr","repeat-motion","skyWeb","Toxic","sgmlendtag","rake.vim","orangeocean256","cdevframework","textgenshi.vim","aldmeris","univresal-blue-scheme","cab.vim","copy-as-rtf","baobaozhu","rfc5424","saturn.vim","tablistlite.vim","functionlist.vim","hints_opengl.vim","wikiatovimhelp","ctags_cache","werks.vim","RegImap","Calm-Breeze","Rst-edit-block-in-tab","Ambient-Color-Scheme","golden-ratio","annotatedmarks","quickhl.vim","FixCSS.vim","enablelvimrc.vim","commentary.vim","prefixer.vim","cssbaseline.vim","html_emogrifier.vim","Premailer.vim","tryit.vim","fthook.vim","sql.vim","zim-syntax","Transcription-Name-Helper","Rcode","obvious-resize","lemon256","swapcol.vim","vim-ipython","EasyPeasy","chinachess.vim","tabpage.vim","tabasco","light2011","numlist.vim","fuzzee.vim","SnippetySnip","melt-syntax","diffwindow_movement","noweboutline.vim","Threesome","quickfixstatus.vim","SimpylFold","indent-motion","mcabberlog.vim","easychair","right_align","galaxy.vim","vim-pandoc","putcmd.vim","vim-rpsl","olga_key","statusline.vim","bad-whitespace","ctrlp.vim","sexy-railscasts","TagmaTips","blue_sky","gccsingle.vim","kiwi.vim","mediawiki","Vimerl","MarkdownFootnotes","linediff.vim","watchdog.vim","syntaxdosini.vim","pylint-mode","NagelfarVim","TclShell","google_prettify.vim","Vimpy","vim-pad","baancomplete","racket.vim","scribble.vim","racket-auto-keywords.vim","Ambient-Theme","White","vim-dokuwiki","slide-show","Speech","vim-google-scribe","fcitx.vim","TagmaTasks","vimroom.vim","MapFinder","mappingmanager","ahkcomplete","Python-mode-klen","tagfinder.vim","rainbow_parentheses.vim","Lyrics","abbott.vim","wiki.vim","todotxt.vim","RST-Tables-CJK","utags","mango.vim","indentfolds","Twilight-for-python","Python-Syntax","vim-json-bundle","VIM-Metaprogramming","statline","SonicTemplate.vim","vim-mnml","Tagma-Buffer-Manager","desert-warm-256","html-source-explorer","codepaper","php-doc","Cpp11-Syntax-Support","node.js","Cleanroom","anwolib","fontforge_script.vim","prop.vim","vim-symbols-strings","vim-diff","openrel.vim","apg.vim","TFS","ipi","RSTO","project.vim","tex_AutoKeymap","log.vim","mirodark","vim-kickstart","MatchTag","Lisper.vim","Dart","vim-ocaml-conceal","csslint.vim","nu42dark-color-scheme","Colour-theme-neon-pk","simple_bookmarks.vim","modeleasy-vim-plugin","aurum","inline_edit.vim","better-snipmate-snippet","LastBuf.vim","SchemeXp","TVO--The-Vim-Outliner-with-asciidoc-supp","yankstack","vim-octopress","ChickenMetaXp","ChickenSetupXp","nscripter.vim","weibo.vim","vim-python-virtualenv","vim-django-support","nose.vim","nodeunit.vim","SpellCheck","lrc.vim","cue.vim","visualrepeat","git-time-lapse","boolpat.vim","Mark-Ring","Festoon","dokuwiki","unite-scriptenames","ide","tocdown","Word-Fuzzy-Completion","rmvim","Xoria256m","shelp","Lawrencium","grads.vim","epegzz.vim","Eddie.vim","behat.zip","phidgets.vim","gtags-multiwindow-browsing","lightdiff","vm.vim","SmartusLine","vimprj","turbux.vim","html-xml-tag-matcher","git-diff","ft_improved","nerdtree-ack","ambicmd.vim","fountain.vim","Powerline","EasyDigraph.vim","autosess","DfrankUtil","ruscmd","textobj-line","Independence","qtpy.vim","switch-buffer-quickly","simple-dark","gf-user","gf-diff","viewdoc","Limbo-syntax","rhinestones","buffet.vim","pwdstatus.vim","gtk-mode","indentjava.vim","coffee-check.vim-B","coffee-check.vim","compot","xsnippet","nsl.vim","vombato-colorscheme","ocamlMultiAnnot","mozpp.vim","mozjs.vim","e2.lua","gmlua.vim","vim-punto-switcher","toggle_comment","CapsulaPigmentorum.vim","CompleteHelper","CamelCaseComplete","vim-addon-haskell","tagport","cd-hook","pfldap.vim","WhiteWash","TagmaLast","Gummybears","taskmanagementvim","flymaker","ditaa","lout.vim","vim-flake8","phpcs.vim","badwolf","jbi.vim","Vim-Support","murphi.vim","argumentative.vim","editorconfig-vim","thinkpad.vim","Coverity-compiler-plugin","vim-wmfs","Trailer-Trash","ipyqtmacvim.vim","writebackupAutomator","CodeCommenter","sandbox_hg","pdv-standalone","Yii-API-manual-for-Vim","fountainwiki.vim","hop-language-syntax-highlight","Skittles-Berry","django.vim","pyunit.vim","EasyColour","tmpclip.vim","Improved-paragraph-motion","tortex","Add-to-Word-Search","fwk-notes","calendar.vim","mystatusinfo.vim","workflowish","tabman.vim","flashdevelop.vim","hammer.vim","Colorizer--Brabandt","less-syntax","DynamicSigns","ShowTrailingWhitespace","DeleteTrailingWhitespace","JumpToTrailingWhitespace","source.vim","mediawiki.vim","regexroute.vim","css3-syntax-plus","diff-toggle","showmarks2","Finder-for-vim","vim-human-dates","vim-addon-commenting","cudajinja.vim","vim-pomodoro","phpqa","TaskMotions","ConflictMotions","Sauce","gitvimrc.vim","instant-markdown.vim","vroom","portmon","spacebox.vim","paredit.vim","Ayumi","Clam","vim_movement","vbs_movement","dosbatch_movement","TextTransform","HyperList","python-imports.vim","youdao.dict","XDebug-DBGp-client-for-PHP","Vim-Gromacs","vimux","Vimpy--Stoner","readnovel","Vitality","close-duplicate-tabs","StripWhiteSpaces","vim-jsbeautify","clean_imports","WebAPI.vim","flipwords.vim","restore_view.vim","SpaceBetween","autolink","vim-addon-rdebug","DBGp-X-client","Splice","vim-htmldjango_omnicomplete","vim-addon-ruby-debug-ide","a-new-txt2tags-syntax","vim-cpp-auto-include","rstatusline","muxmate","vim4rally","SAS-Indent","modx","ucpp-vim-syntax","bestfriend.vim","vim-dasm","evervim","Fortune-vimtips","VDBI.vim","Ideone.vim","neocomplcache-snippets_complete","RbREPL.vim","AmbiCompletion","london.vim","jsruntime.vim","maven-plugin","vim-mou","Transpose","PHPUnit-QF","TimeTap","jsoncodecs.vim","jsflakes.vim","jsflakes","DBGPavim","nosyntaxwords","mathematic.vim","vtimer.vim","_jsbeautify","license-loader","cmdpathup","matchindent.vim","automatic-for-Verilog--guo","lingodirector.vim--Pawlik","Ubloh-Color-Scheme","html_FileCompletion","PyChimp","sonoma.vim","highlights-for-radiologist","Xdebug","burnttoast256","vmark.vim--Visual-Bookmarking","gprof.vim","jshint.vim--Stelmach","sourcebeautify.vim","HgCi","EscapeBchars","cscope.vim","php-cs-fixer","cst","OnSyntaxChange","python_fold_compact","EditPlus"]
\ No newline at end of file
diff --git a/vim-plugins/bundle/AutoComplPop/README b/vim-plugins/bundle/AutoComplPop/README
new file mode 100644
index 0000000..8a72261
--- /dev/null
+++ b/vim-plugins/bundle/AutoComplPop/README
@@ -0,0 +1,101 @@
+This is a mirror of http://www.vim.org/scripts/script.php?script_id=1879
+
+Repository:
+  https://bitbucket.org/ns9tks/vim-autocomplpop/
+
+Issues:
+  http://bitbucket.org/ns9tks/vim-autocomplpop/issues/
+
+Download latest(development) version
+  https://bitbucket.org/ns9tks/vim-autocomplpop/get/tip.zip
+
+==============================================================================
+INTRODUCTION                                                *acp-introduction*
+
+With this plugin, your vim comes to automatically opens popup menu for
+completions when you enter characters or move the cursor in Insert mode. It
+won't prevent you continuing entering characters.
+
+
+==============================================================================
+INSTALLATION                                                *acp-installation*
+
+Put all files into your runtime directory. If you have the zip file, extract
+it to your runtime directory.
+
+You should place the files as follows:
+>
+        <your runtime directory>/plugin/acp.vim
+        <your runtime directory>/doc/acp.txt
+        ...
+<
+If you disgust to jumble up this plugin and other plugins in your runtime
+directory, put the files into new directory and just add the directory path to
+'runtimepath'. It's easy to uninstall the plugin.
+
+And then update your help tags files to enable fuzzyfinder help. See
+|add-local-help| for details.
+
+
+==============================================================================
+USAGE                                                              *acp-usage*
+
+Once this plugin is installed, auto-popup is enabled at startup by default.
+
+Which completion method is used depends on the text before the cursor. The
+default behavior is as follows:
+
+        kind      filetype    text before the cursor ~
+        Keyword   *           two keyword characters
+        Filename  *           a filename character + a path separator 
+                              + 0 or more filename character
+        Omni      ruby        ".", "::" or non-word character + ":"
+                              (|+ruby| required.)
+        Omni      python      "." (|+python| required.)
+        Omni      xml         "<", "</" or ("<" + non-">" characters + " ")
+        Omni      html/xhtml  "<", "</" or ("<" + non-">" characters + " ")
+        Omni      css         (":", ";", "{", "^", "@", or "!")
+                              + 0 or 1 space
+
+Also, you can make user-defined completion and snipMate's trigger completion
+(|acp-snipMate|) auto-popup if the options are set.
+
+These behavior are customizable.
+
+                                                                *acp-snipMate*
+snipMate's Trigger Completion ~
+
+snipMate's trigger completion enables you to complete a snippet trigger
+provided by snipMate plugin
+(http://www.vim.org/scripts/script.php?script_id=2540) and expand it.
+
+
+To enable auto-popup for this completion, add following function to
+plugin/snipMate.vim:
+>
+  fun! GetSnipsInCurrentScope()
+    let snips = {}
+    for scope in [bufnr('%')] + split(&ft, '\.') + ['_']
+      call extend(snips, get(s:snippets, scope, {}), 'keep')
+      call extend(snips, get(s:multi_snips, scope, {}), 'keep')
+    endfor
+    return snips
+  endf
+<
+And set |g:acp_behaviorSnipmateLength| option to 1.
+
+There is the restriction on this auto-popup, that the word before cursor must
+consist only of uppercase characters.
+
+                                                               *acp-perl-omni*
+Perl Omni-Completion ~
+
+AutoComplPop supports perl-completion.vim
+(http://www.vim.org/scripts/script.php?script_id=2852).
+
+To enable auto-popup for this completion, set |g:acp_behaviorPerlOmniLength|
+option to 0 or more.
+
+
+==============================================================================
+
diff --git a/vim-plugins/bundle/AutoComplPop/autoload/acp.vim b/vim-plugins/bundle/AutoComplPop/autoload/acp.vim
new file mode 100644
index 0000000..827bbcc
--- /dev/null
+++ b/vim-plugins/bundle/AutoComplPop/autoload/acp.vim
@@ -0,0 +1,431 @@
+"=============================================================================
+" Copyright (c) 2007-2009 Takeshi NISHIDA
+"
+"=============================================================================
+" LOAD GUARD {{{1
+
+if exists('g:loaded_autoload_acp') || v:version < 702
+  finish
+endif
+let g:loaded_autoload_acp = 1
+
+" }}}1
+"=============================================================================
+" GLOBAL FUNCTIONS: {{{1
+
+"
+function acp#enable()
+  call acp#disable()
+
+  augroup AcpGlobalAutoCommand
+    autocmd!
+    autocmd InsertEnter * unlet! s:posLast s:lastUncompletable
+    autocmd InsertLeave * call s:finishPopup(1)
+  augroup END
+
+  if g:acp_mappingDriven
+    call s:mapForMappingDriven()
+  else
+    autocmd AcpGlobalAutoCommand CursorMovedI * call s:feedPopup()
+  endif
+
+  nnoremap <silent> i i<C-r>=<SID>feedPopup()<CR>
+  nnoremap <silent> a a<C-r>=<SID>feedPopup()<CR>
+  nnoremap <silent> R R<C-r>=<SID>feedPopup()<CR>
+endfunction
+
+"
+function acp#disable()
+  call s:unmapForMappingDriven()
+  augroup AcpGlobalAutoCommand
+    autocmd!
+  augroup END
+  nnoremap i <Nop> | nunmap i
+  nnoremap a <Nop> | nunmap a
+  nnoremap R <Nop> | nunmap R
+endfunction
+
+"
+function acp#lock()
+  let s:lockCount += 1
+endfunction
+
+"
+function acp#unlock()
+  let s:lockCount -= 1
+  if s:lockCount < 0
+    let s:lockCount = 0
+    throw "AutoComplPop: not locked"
+  endif
+endfunction
+
+"
+function acp#meetsForSnipmate(context)
+  if g:acp_behaviorSnipmateLength < 0
+    return 0
+  endif
+  let matches = matchlist(a:context, '\(^\|\s\|\<\)\(\u\{' .
+        \                            g:acp_behaviorSnipmateLength . ',}\)$')
+  return !empty(matches) && !empty(s:getMatchingSnipItems(matches[2]))
+endfunction
+
+"
+function acp#meetsForKeyword(context)
+  if g:acp_behaviorKeywordLength < 0
+    return 0
+  endif
+  let matches = matchlist(a:context, '\(\k\{' . g:acp_behaviorKeywordLength . ',}\)$')
+  if empty(matches)
+    return 0
+  endif
+  for ignore in g:acp_behaviorKeywordIgnores
+    if stridx(ignore, matches[1]) == 0
+      return 0
+    endif
+  endfor
+  return 1
+endfunction
+
+"
+function acp#meetsForFile(context)
+  if g:acp_behaviorFileLength < 0
+    return 0
+  endif
+  if has('win32') || has('win64')
+    let separator = '[/\\]'
+  else
+    let separator = '\/'
+  endif
+  if a:context !~ '\f' . separator . '\f\{' . g:acp_behaviorFileLength . ',}$'
+    return 0
+  endif
+  return a:context !~ '[*/\\][/\\]\f*$\|[^[:print:]]\f*$'
+endfunction
+
+"
+function acp#meetsForRubyOmni(context)
+  if !has('ruby')
+    return 0
+  endif
+  if g:acp_behaviorRubyOmniMethodLength >= 0 &&
+        \ a:context =~ '[^. \t]\(\.\|::\)\k\{' .
+        \              g:acp_behaviorRubyOmniMethodLength . ',}$'
+    return 1
+  endif
+  if g:acp_behaviorRubyOmniSymbolLength >= 0 &&
+        \ a:context =~ '\(^\|[^:]\):\k\{' .
+        \              g:acp_behaviorRubyOmniSymbolLength . ',}$'
+    return 1
+  endif
+  return 0
+endfunction
+
+"
+function acp#meetsForPythonOmni(context)
+  return has('python') && g:acp_behaviorPythonOmniLength >= 0 &&
+        \ a:context =~ '\k\.\k\{' . g:acp_behaviorPythonOmniLength . ',}$'
+endfunction
+
+"
+function acp#meetsForPerlOmni(context)
+  return g:acp_behaviorPerlOmniLength >= 0 &&
+        \ a:context =~ '\w->\k\{' . g:acp_behaviorPerlOmniLength . ',}$'
+endfunction
+
+"
+function acp#meetsForXmlOmni(context)
+  return g:acp_behaviorXmlOmniLength >= 0 &&
+        \ a:context =~ '\(<\|<\/\|<[^>]\+ \|<[^>]\+=\"\)\k\{' .
+        \              g:acp_behaviorXmlOmniLength . ',}$'
+endfunction
+
+"
+function acp#meetsForHtmlOmni(context)
+  return g:acp_behaviorHtmlOmniLength >= 0 &&
+        \ a:context =~ '\(<\|<\/\|<[^>]\+ \|<[^>]\+=\"\)\k\{' .
+        \              g:acp_behaviorHtmlOmniLength . ',}$'
+endfunction
+
+"
+function acp#meetsForCssOmni(context)
+  if g:acp_behaviorCssOmniPropertyLength >= 0 &&
+        \ a:context =~ '\(^\s\|[;{]\)\s*\k\{' .
+        \              g:acp_behaviorCssOmniPropertyLength . ',}$'
+    return 1
+  endif
+  if g:acp_behaviorCssOmniValueLength >= 0 &&
+        \ a:context =~ '[:@!]\s*\k\{' .
+        \              g:acp_behaviorCssOmniValueLength . ',}$'
+    return 1
+  endif
+  return 0
+endfunction
+
+"
+function acp#completeSnipmate(findstart, base)
+  if a:findstart
+    let s:posSnipmateCompletion = len(matchstr(s:getCurrentText(), '.*\U'))
+    return s:posSnipmateCompletion
+  endif
+  let lenBase = len(a:base)
+  let items = filter(GetSnipsInCurrentScope(),
+        \            'strpart(v:key, 0, lenBase) ==? a:base')
+  return map(sort(items(items)), 's:makeSnipmateItem(v:val[0], v:val[1])')
+endfunction
+
+"
+function acp#onPopupCloseSnipmate()
+  let word = s:getCurrentText()[s:posSnipmateCompletion :]
+  for trigger in keys(GetSnipsInCurrentScope())
+    if word ==# trigger
+      call feedkeys("\<C-r>=TriggerSnippet()\<CR>", "n")
+      return 0
+    endif
+  endfor
+  return 1
+endfunction
+
+"
+function acp#onPopupPost()
+  " to clear <C-r>= expression on command-line
+  echo ''
+  if pumvisible()
+    inoremap <silent> <expr> <C-h> acp#onBs()
+    inoremap <silent> <expr> <BS>  acp#onBs()
+    " a command to restore to original text and select the first match
+    return (s:behavsCurrent[s:iBehavs].command =~# "\<C-p>" ? "\<C-n>\<Up>"
+          \                                                 : "\<C-p>\<Down>")
+  endif
+  let s:iBehavs += 1
+  if len(s:behavsCurrent) > s:iBehavs 
+    call s:setCompletefunc()
+    return printf("\<C-e>%s\<C-r>=acp#onPopupPost()\<CR>",
+          \       s:behavsCurrent[s:iBehavs].command)
+  else
+    let s:lastUncompletable = {
+          \   'word': s:getCurrentWord(),
+          \   'commands': map(copy(s:behavsCurrent), 'v:val.command')[1:],
+          \ }
+    call s:finishPopup(0)
+    return "\<C-e>"
+  endif
+endfunction
+
+"
+function acp#onBs()
+  " using "matchstr" and not "strpart" in order to handle multi-byte
+  " characters
+  if call(s:behavsCurrent[s:iBehavs].meets,
+        \ [matchstr(s:getCurrentText(), '.*\ze.')])
+    return "\<BS>"
+  endif
+  return "\<C-e>\<BS>"
+endfunction
+
+" }}}1
+"=============================================================================
+" LOCAL FUNCTIONS: {{{1
+
+"
+function s:mapForMappingDriven()
+  call s:unmapForMappingDriven()
+  let s:keysMappingDriven = [
+        \ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
+        \ 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+        \ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
+        \ 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+        \ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+        \ '-', '_', '~', '^', '.', ',', ':', '!', '#', '=', '%', '$', '@', '<', '>', '/', '\',
+        \ '<Space>', '<C-h>', '<BS>', ]
+  for key in s:keysMappingDriven
+    execute printf('inoremap <silent> %s %s<C-r>=<SID>feedPopup()<CR>',
+          \        key, key)
+  endfor
+endfunction
+
+"
+function s:unmapForMappingDriven()
+  if !exists('s:keysMappingDriven')
+    return
+  endif
+  for key in s:keysMappingDriven
+    execute 'iunmap ' . key
+  endfor
+  let s:keysMappingDriven = []
+endfunction
+
+"
+function s:setTempOption(group, name, value)
+  call extend(s:tempOptionSet[a:group], { a:name : eval('&' . a:name) }, 'keep')
+  execute printf('let &%s = a:value', a:name)
+endfunction
+
+"
+function s:restoreTempOptions(group)
+  for [name, value] in items(s:tempOptionSet[a:group])
+    execute printf('let &%s = value', name)
+  endfor
+  let s:tempOptionSet[a:group] = {}
+endfunction
+
+"
+function s:getCurrentWord()
+  return matchstr(s:getCurrentText(), '\k*$')
+endfunction
+
+"
+function s:getCurrentText()
+  return strpart(getline('.'), 0, col('.') - 1)
+endfunction
+
+"
+function s:getPostText()
+  return strpart(getline('.'), col('.') - 1)
+endfunction
+
+"
+function s:isModifiedSinceLastCall()
+  if exists('s:posLast')
+    let posPrev = s:posLast
+    let nLinesPrev = s:nLinesLast
+    let textPrev = s:textLast
+  endif
+  let s:posLast = getpos('.')
+  let s:nLinesLast = line('$')
+  let s:textLast = getline('.')
+  if !exists('posPrev')
+    return 1
+  elseif posPrev[1] != s:posLast[1] || nLinesPrev != s:nLinesLast
+    return (posPrev[1] - s:posLast[1] == nLinesPrev - s:nLinesLast)
+  elseif textPrev ==# s:textLast
+    return 0
+  elseif posPrev[2] > s:posLast[2]
+    return 1
+  elseif has('gui_running') && has('multi_byte')
+    " NOTE: auto-popup causes a strange behavior when IME/XIM is working
+    return posPrev[2] + 1 == s:posLast[2]
+  endif
+  return posPrev[2] != s:posLast[2]
+endfunction
+
+"
+function s:makeCurrentBehaviorSet()
+  let modified = s:isModifiedSinceLastCall()
+  if exists('s:behavsCurrent[s:iBehavs].repeat') && s:behavsCurrent[s:iBehavs].repeat
+    let behavs = [ s:behavsCurrent[s:iBehavs] ]
+  elseif exists('s:behavsCurrent[s:iBehavs]')
+    return []
+  elseif modified
+    let behavs = copy(exists('g:acp_behavior[&filetype]')
+          \           ? g:acp_behavior[&filetype]
+          \           : g:acp_behavior['*'])
+  else
+    return []
+  endif
+  let text = s:getCurrentText()
+  call filter(behavs, 'call(v:val.meets, [text])')
+  let s:iBehavs = 0
+  if exists('s:lastUncompletable') &&
+        \ stridx(s:getCurrentWord(), s:lastUncompletable.word) == 0 &&
+        \ map(copy(behavs), 'v:val.command') ==# s:lastUncompletable.commands
+    let behavs = []
+  else
+    unlet! s:lastUncompletable
+  endif
+  return behavs
+endfunction
+
+"
+function s:feedPopup()
+  " NOTE: CursorMovedI is not triggered while the popup menu is visible. And
+  "       it will be triggered when popup menu is disappeared.
+  if s:lockCount > 0 || pumvisible() || &paste
+    return ''
+  endif
+  if exists('s:behavsCurrent[s:iBehavs].onPopupClose')
+    if !call(s:behavsCurrent[s:iBehavs].onPopupClose, [])
+      call s:finishPopup(1)
+      return ''
+    endif
+  endif
+  let s:behavsCurrent = s:makeCurrentBehaviorSet()
+  if empty(s:behavsCurrent)
+    call s:finishPopup(1)
+    return ''
+  endif
+  " In case of dividing words by symbols (e.g. "for(int", "ab==cd") while a
+  " popup menu is visible, another popup is not available unless input <C-e>
+  " or try popup once. So first completion is duplicated.
+  call insert(s:behavsCurrent, s:behavsCurrent[s:iBehavs])
+  call s:setTempOption(s:GROUP0, 'spell', 0)
+  call s:setTempOption(s:GROUP0, 'completeopt', 'menuone' . (g:acp_completeoptPreview ? ',preview' : ''))
+  call s:setTempOption(s:GROUP0, 'complete', g:acp_completeOption)
+  call s:setTempOption(s:GROUP0, 'ignorecase', g:acp_ignorecaseOption)
+  " NOTE: With CursorMovedI driven, Set 'lazyredraw' to avoid flickering.
+  "       With Mapping driven, set 'nolazyredraw' to make a popup menu visible.
+  call s:setTempOption(s:GROUP0, 'lazyredraw', !g:acp_mappingDriven)
+  " NOTE: 'textwidth' must be restored after <C-e>.
+  call s:setTempOption(s:GROUP1, 'textwidth', 0)
+  call s:setCompletefunc()
+  call feedkeys(s:behavsCurrent[s:iBehavs].command . "\<C-r>=acp#onPopupPost()\<CR>", 'n')
+  return '' " this function is called by <C-r>=
+endfunction
+
+"
+function s:finishPopup(fGroup1)
+  inoremap <C-h> <Nop> | iunmap <C-h>
+  inoremap <BS>  <Nop> | iunmap <BS>
+  let s:behavsCurrent = []
+  call s:restoreTempOptions(s:GROUP0)
+  if a:fGroup1
+    call s:restoreTempOptions(s:GROUP1)
+  endif
+endfunction
+
+"
+function s:setCompletefunc()
+  if exists('s:behavsCurrent[s:iBehavs].completefunc')
+    call s:setTempOption(0, 'completefunc', s:behavsCurrent[s:iBehavs].completefunc)
+  endif
+endfunction
+
+"
+function s:makeSnipmateItem(key, snip)
+  if type(a:snip) == type([])
+    let descriptions = map(copy(a:snip), 'v:val[0]')
+    let snipFormatted = '[MULTI] ' . join(descriptions, ', ')
+  else
+    let snipFormatted = substitute(a:snip, '\(\n\|\s\)\+', ' ', 'g')
+  endif
+  return  {
+        \   'word': a:key,
+        \   'menu': strpart(snipFormatted, 0, 80),
+        \ }
+endfunction
+
+"
+function s:getMatchingSnipItems(base)
+  let key = a:base . "\n"
+  if !exists('s:snipItems[key]')
+    let s:snipItems[key] = items(GetSnipsInCurrentScope())
+    call filter(s:snipItems[key], 'strpart(v:val[0], 0, len(a:base)) ==? a:base')
+    call map(s:snipItems[key], 's:makeSnipmateItem(v:val[0], v:val[1])')
+  endif
+  return s:snipItems[key]
+endfunction
+
+" }}}1
+"=============================================================================
+" INITIALIZATION {{{1
+
+let s:GROUP0 = 0
+let s:GROUP1 = 1
+let s:lockCount = 0
+let s:behavsCurrent = []
+let s:iBehavs = 0
+let s:tempOptionSet = [{}, {}]
+let s:snipItems = {}
+
+" }}}1
+"=============================================================================
+" vim: set fdm=marker:
diff --git a/vim-plugins/bundle/AutoComplPop/doc/acp.jax b/vim-plugins/bundle/AutoComplPop/doc/acp.jax
new file mode 100644
index 0000000..12e55ce
--- /dev/null
+++ b/vim-plugins/bundle/AutoComplPop/doc/acp.jax
@@ -0,0 +1,298 @@
+*acp.txt*       補完メニュー�自動�ップアップ
+
+        Copyright (c) 2007-2009 Takeshi NISHIDA
+
+AutoComplPop                                              *autocomplpop* *acp*
+
+概�                            |acp-introduction|
+インストール                    |acp-installation|
+使�方                          |acp-usage|
+コマンド                        |acp-commands|
+オプション                      |acp-options|
+SPECIAL THANKS                  |acp-thanks|
+CHANGELOG                       |acp-changelog|
+����                        |acp-about|
+
+
+==============================================================================
+概�                                                *acp-introduction*
+
+��プラグイン��インサートモード�文字を入力��りカーソルを動������補
+完メニューを自動的�開�よ�����。����続��文字を入力�る�を妨��り
+����ん。
+
+
+==============================================================================
+インストール                                                *acp-installation*
+
+ZIPファイルをランタイムディレクトリ�展開���。
+
+以下�よ��ファイル��置�れる����。
+>
+        <your runtime directory>/plugin/acp.vim
+        <your runtime directory>/doc/acp.txt
+        ...
+<
+も�ランタイムディレクトリ�他�プラグイン���混���る��嫌�ら�ファイル
+を新�ディレクトリ��置����ディレクトリ�パスを 'runtimepath' �追加��
+����。アンインストールも楽��り��。
+
+��後 FuzzyFinder �ヘルプを有効��る���タグファイルを更新������。
+詳���|add-local-help|を�照������。
+
+
+==============================================================================
+使�方                                                              *acp-usage*
+
+��プラグイン�インストール�れ��れ��自動�ップアップ� vim �開始時�ら
+有効��り��。
+
+カーソル直��テキスト�応���利用�る補完�種類を切り替���。デフォルト�
+補完動作�次�通り��:
+
+        補完モード      filetype    カーソル直��テキスト ~
+        キーワード補完  *           2文字�キーワード文字
+        ファイル�補完  *           ファイル�文字 + パスセパレータ
+                                    + 0文字以上�ファイル�文字
+        オムニ補完      ruby        ".", "::" or �語を構��る文字以外 + ":"
+        オムニ補完      python      "."
+        オムニ補完      xml         "<", "</" or ("<" + ">"以外�文字列 + " ")
+        オムニ補完      html/xhtml  "<", "</" or ("<" + ">"以外�文字列 + " ")
+        オムニ補完      css         (":", ";", "{", "^", "@", or "!")
+                                    + 0個���1個�スペース
+
+�ら��設定を行�����ユーザー定義補完� snipMate トリガー補完
+(|acp-snipMate|) を自動�ップアップ��る�������。
+
+�れら�補完動作�カスタマイズ�能��。
+
+                                                                *acp-snipMate*
+snipMate トリガー補完 ~
+
+snipMate トリガー補完���snipMate プラグイン
+(http://www.vim.org/scripts/script.php?script_id=2540) ��供�るスニペット�
+トリガーを補完���れを展開�る�������。
+
+��自動�ップアップを有効��る���次�関数を plugin/snipMate.vim �追加�
+る必���り��:
+>
+  fun! GetSnipsInCurrentScope()
+    let snips = {}
+    for scope in [bufnr('%')] + split(&ft, '\.') + ['_']
+      call extend(snips, get(s:snippets, scope, {}), 'keep')
+      call extend(snips, get(s:multi_snips, scope, {}), 'keep')
+    endfor
+    return snips
+  endf
+<
+���|g:acp_behaviorSnipmateLength|オプションを 1 �������。
+
+��自動�ップアップ��制���り�カーソル直���語�大文字英字���構��
+れ����れ��り��ん。
+
+                                                               *acp-perl-omni*
+Perl オムニ補完 ~
+
+AutoComplPop � perl-completion.vim
+(http://www.vim.org/scripts/script.php?script_id=2852) をサ�ート�����。
+
+��自動�ップアップを有効��る���|g:acp_behaviorPerlOmniLength|オプション
+を 0 以上�������。
+
+
+==============================================================================
+コマンド                                                        *acp-commands*
+
+                                                                  *:AcpEnable*
+:AcpEnable
+        自動�ップアップを有効����。
+
+                                                                 *:AcpDisable*
+:AcpDisable
+        自動�ップアップを無効����。
+
+                                                                    *:AcpLock*
+:AcpLock
+        自動�ップアップを一時的��止���。
+
+        別�スクリプト��干渉を回��る目的�ら���コマンド�|:AcpUnlock| 
+        を利用�る��を�|:AcpDisable|�|:AcpEnable| を利用�るよりも推奨��
+        �。
+
+                                                                  *:AcpUnlock*
+:AcpUnlock
+        |:AcpLock| ��止�れ�自動�ップアップを�開���。
+
+
+==============================================================================
+オプション                                                          *acp-options*
+
+                                                    *g:acp_enableAtStartup*  >
+  let g:acp_enableAtStartup = 1
+<
+        真�ら vim 開始時�ら自動�ップアップ�有効��り��。
+
+                                                      *g:acp_mappingDriven*  >
+  let g:acp_mappingDriven = 0
+<
+        真�ら|CursorMovedI|イベント����キーマッピング�自動�ップアップを
+        行�よ�����。カーソルを移動�る���補完�行�れる�������
+        ��都���る場��利用������。���他�プラグイン��相性�題
+        や日本語入力���具��発生�る�能性��り��。(逆も然り。)
+
+                                                   *g:acp_ignorecaseOption*  >
+  let g:acp_ignorecaseOption = 1
+<
+        自動�ップアップ時��'ignorecase' �一時的�設定�る値
+
+                                                     *g:acp_completeOption*  >
+  let g:acp_completeOption = '.,w,b,k'
+<
+        自動�ップアップ時��'complete' �一時的�設定�る値
+
+                                                 *g:acp_completeoptPreview*  >
+  let g:acp_completeoptPreview = 0
+<
+        真�ら自動�ップアップ時�� 'completeopt' � "preview" を追加���。
+
+                                        *g:acp_behaviorUserDefinedFunction*  >
+  let g:acp_behaviorUserDefinedFunction = ''
+<
+        ユーザー定義補完�|g:acp_behavior-completefunc|。空�ら��補完�行�
+        れ��ん。。
+
+                                         *g:acp_behaviorUserDefinedMeets*  >
+  let g:acp_behaviorUserDefinedMeets = ''
+<
+        ユーザー定義補完�|g:acp_behavior-meets|。空�ら��補完�行�れ��ん
+        。
+
+                                             *g:acp_behaviorSnipmateLength*  >
+  let g:acp_behaviorSnipmateLength = -1
+<
+        snipMate トリガー補完�自動�ップアップを行���必��カーソル�直�
+        �パターン。
+
+                                             *g:acp_behaviorKeywordCommand*  >
+  let g:acp_behaviorKeywordCommand = "\<C-n>"
+<
+        キーワード補完�コマンド。��オプション��普通 "\<C-n>" � "\<C-p>"
+        を設定���。
+
+                                              *g:acp_behaviorKeywordLength*  >
+  let g:acp_behaviorKeywordLength = 2
+<
+        キーワード補完�自動�ップアップを行���必��カーソル�直��キーワ
+        ード文字数。負数�ら��補完�行�れ��ん。
+
+                                             *g:acp_behaviorKeywordIgnores*  >
+  let g:acp_behaviorKeywordIgnores = []
+<
+        文字列�リスト。カーソル直���語��れら�内��れ��先頭部分�マッ
+        ��る場����補完�行�れ��ん。
+
+        例��� "get" �始�る補完キーワード�多����"g", "ge", "get" を入
+        力�����自動�ップアップ�レス�ンス�低下を引�起����る場��
+        ��オプション� ["get"] を設定�る����れを回��る�������。
+
+                                                 *g:acp_behaviorFileLength*  >
+  let g:acp_behaviorFileLength = 0
+<
+        ファイル�補完�自動�ップアップを行���必��カーソル�直��キーワ
+        ード文字数。負数�ら��補完�行�れ��ん。
+
+                                       *g:acp_behaviorRubyOmniMethodLength*  >
+  let g:acp_behaviorRubyOmniMethodLength = 0
+<
+        メソッド補完�����Ruby オムニ補完�自動�ップアップを行���必�
+        �カーソル�直��キーワード文字数。負数�ら��補完�行�れ��ん。
+
+                                       *g:acp_behaviorRubyOmniSymbolLength*  >
+  let g:acp_behaviorRubyOmniSymbolLength = 1
+<
+        シンボル補完�����Ruby オムニ補完�自動�ップアップを行���必�
+        �カーソル�直��キーワード文字数。負数�ら��補完�行�れ��ん。
+
+                                           *g:acp_behaviorPythonOmniLength*  >
+  let g:acp_behaviorPythonOmniLength = 0
+<
+        Python オムニ補完�自動�ップアップを行���必��カーソル�直��キ
+        ーワード文字数。負数�ら��補完�行�れ��ん。
+
+                                             *g:acp_behaviorPerlOmniLength*  >
+  let g:acp_behaviorPerlOmniLength = -1
+<
+        Perl オムニ補完�自動�ップアップを行���必��カーソル�直��キー
+        ワード文字数。負数�ら��補完�行�れ��ん。
+
+        See also: |acp-perl-omni|
+
+                                              *g:acp_behaviorXmlOmniLength*  >
+  let g:acp_behaviorXmlOmniLength = 0
+<
+        XML オムニ補完�自動�ップアップを行���必��カーソル�直��キーワ
+        ード文字数。負数�ら��補完�行�れ��ん。
+
+                                             *g:acp_behaviorHtmlOmniLength*  >
+  let g:acp_behaviorHtmlOmniLength = 0
+<
+        HTML オムニ補完�自動�ップアップを行���必��カーソル�直��キー
+        ワード文字数。負数�ら��補完�行�れ��ん。
+
+                                      *g:acp_behaviorCssOmniPropertyLength*  >
+  let g:acp_behaviorCssOmniPropertyLength = 1
+<
+        プロパティ補完�����CSS オムニ補完�自動�ップアップを行���必�
+        �カーソル�直��キーワード文字数。負数�ら��補完�行�れ��ん。
+
+                                         *g:acp_behaviorCssOmniValueLength*  >
+  let g:acp_behaviorCssOmniValueLength = 0
+<
+        値補完�����CSS オムニ補完�自動�ップアップを行���必��カーソ
+        ル�直��キーワード文字数。負数�ら��補完�行�れ��ん。
+
+                                                           *g:acp_behavior*  >
+  let g:acp_behavior = {}
+<
+
+        �れ�内部仕様������る人���オプション��他�オプション��設
+        定より優先�れ��。 
+
+        |Dictionary|型��キー�ファイルタイプ�対応���。 '*' �デフォルト
+        を表���。値�リスト型��。補完候補�得られる��リスト�先頭アイテ
+        ム�ら順�評価���。��素�|Dictionary|�詳細�次�通り：
+
+        "command":                                    *g:acp_behavior-command*
+          補完メニューを�ップアップ�る���コマンド。
+
+        "completefunc":                          *g:acp_behavior-completefunc*
+          'completefunc' �設定�る関数。 "command" � "<C-x><C-u>" �����
+          �味��り��。
+
+        "meets":                                        *g:acp_behavior-meets*
+          ��補完を行�����を判断�る関数���。��関数�カーソル直��
+          テキストを引数��り�補完を行��ら� 0 �値を返���。
+
+        "onPopupClose":                          *g:acp_behavior-onPopupClose*
+          ��補完��ップアップメニュー�閉�られ����呼�れる関数���。
+          ��関数� 0 を返��場��続��行�れる予定�補完�抑制�れ��。
+
+        "repeat":                                      *g:acp_behavior-repeat*
+          真�ら最後�補完�自動的�繰り返�れ��。
+
+
+==============================================================================
+����                                *acp-about* *acp-contact* *acp-author*
+
+作者:       Takeshi NISHIDA <ns9tks@DELETE-ME.gmail.com>
+ライセンス: MIT Licence
+URL:        http://www.vim.org/scripts/script.php?script_id=1879
+            http://bitbucket.org/ns9tks/vim-autocomplpop/
+
+�グや�望�� ~
+
+��ら����: http://bitbucket.org/ns9tks/vim-autocomplpop/issues/
+
+==============================================================================
+ vim:tw=78:ts=8:ft=help:norl:
+
diff --git a/vim-plugins/bundle/AutoComplPop/doc/acp.txt b/vim-plugins/bundle/AutoComplPop/doc/acp.txt
new file mode 100644
index 0000000..324c88b
--- /dev/null
+++ b/vim-plugins/bundle/AutoComplPop/doc/acp.txt
@@ -0,0 +1,512 @@
+*acp.txt*       Automatically opens popup menu for completions.
+
+        Copyright (c) 2007-2009 Takeshi NISHIDA
+
+AutoComplPop                                              *autocomplpop* *acp*
+
+INTRODUCTION                    |acp-introduction|
+INSTALLATION                    |acp-installation|
+USAGE                           |acp-usage|
+COMMANDS                        |acp-commands|
+OPTIONS                         |acp-options|
+SPECIAL THANKS                  |acp-thanks|
+CHANGELOG                       |acp-changelog|
+ABOUT                           |acp-about|
+
+
+==============================================================================
+INTRODUCTION                                                *acp-introduction*
+
+With this plugin, your vim comes to automatically opens popup menu for
+completions when you enter characters or move the cursor in Insert mode. It
+won't prevent you continuing entering characters.
+
+
+==============================================================================
+INSTALLATION                                                *acp-installation*
+
+Put all files into your runtime directory. If you have the zip file, extract
+it to your runtime directory.
+
+You should place the files as follows:
+>
+        <your runtime directory>/plugin/acp.vim
+        <your runtime directory>/doc/acp.txt
+        ...
+<
+If you disgust to jumble up this plugin and other plugins in your runtime
+directory, put the files into new directory and just add the directory path to
+'runtimepath'. It's easy to uninstall the plugin.
+
+And then update your help tags files to enable fuzzyfinder help. See
+|add-local-help| for details.
+
+
+==============================================================================
+USAGE                                                              *acp-usage*
+
+Once this plugin is installed, auto-popup is enabled at startup by default.
+
+Which completion method is used depends on the text before the cursor. The
+default behavior is as follows:
+
+        kind      filetype    text before the cursor ~
+        Keyword   *           two keyword characters
+        Filename  *           a filename character + a path separator 
+                              + 0 or more filename character
+        Omni      ruby        ".", "::" or non-word character + ":"
+                              (|+ruby| required.)
+        Omni      python      "." (|+python| required.)
+        Omni      xml         "<", "</" or ("<" + non-">" characters + " ")
+        Omni      html/xhtml  "<", "</" or ("<" + non-">" characters + " ")
+        Omni      css         (":", ";", "{", "^", "@", or "!")
+                              + 0 or 1 space
+
+Also, you can make user-defined completion and snipMate's trigger completion
+(|acp-snipMate|) auto-popup if the options are set.
+
+These behavior are customizable.
+
+                                                                *acp-snipMate*
+snipMate's Trigger Completion ~
+
+snipMate's trigger completion enables you to complete a snippet trigger
+provided by snipMate plugin
+(http://www.vim.org/scripts/script.php?script_id=2540) and expand it.
+
+
+To enable auto-popup for this completion, add following function to
+plugin/snipMate.vim:
+>
+  fun! GetSnipsInCurrentScope()
+    let snips = {}
+    for scope in [bufnr('%')] + split(&ft, '\.') + ['_']
+      call extend(snips, get(s:snippets, scope, {}), 'keep')
+      call extend(snips, get(s:multi_snips, scope, {}), 'keep')
+    endfor
+    return snips
+  endf
+<
+And set |g:acp_behaviorSnipmateLength| option to 1.
+
+There is the restriction on this auto-popup, that the word before cursor must
+consist only of uppercase characters.
+
+                                                               *acp-perl-omni*
+Perl Omni-Completion ~
+
+AutoComplPop supports perl-completion.vim
+(http://www.vim.org/scripts/script.php?script_id=2852).
+
+To enable auto-popup for this completion, set |g:acp_behaviorPerlOmniLength|
+option to 0 or more.
+
+
+==============================================================================
+COMMANDS                                                        *acp-commands*
+
+                                                                  *:AcpEnable*
+:AcpEnable
+        enables auto-popup.
+
+                                                                 *:AcpDisable*
+:AcpDisable
+        disables auto-popup.
+
+                                                                    *:AcpLock*
+:AcpLock
+        suspends auto-popup temporarily.
+
+        For the purpose of avoiding interruption to another script, it is
+        recommended to insert this command and |:AcpUnlock| than |:AcpDisable|
+        and |:AcpEnable| .
+
+                                                                  *:AcpUnlock*
+:AcpUnlock
+        resumes auto-popup suspended by |:AcpLock| .
+
+
+==============================================================================
+OPTIONS                                                          *acp-options*
+
+                                                    *g:acp_enableAtStartup*  >
+  let g:acp_enableAtStartup = 1
+<
+        If non-zero, auto-popup is enabled at startup.
+
+                                                      *g:acp_mappingDriven*  >
+  let g:acp_mappingDriven = 0
+<
+        If non-zero, auto-popup is triggered by key mappings instead of
+        |CursorMovedI| event. This is useful to avoid auto-popup by moving
+        cursor in Insert mode.
+
+                                                   *g:acp_ignorecaseOption*  >
+  let g:acp_ignorecaseOption = 1
+<
+        Value set to 'ignorecase' temporarily when auto-popup.
+
+                                                     *g:acp_completeOption*  >
+  let g:acp_completeOption = '.,w,b,k'
+<
+        Value set to 'complete' temporarily when auto-popup.
+
+                                                 *g:acp_completeoptPreview*  >
+  let g:acp_completeoptPreview = 0
+<
+        If non-zero, "preview" is added to 'completeopt' when auto-popup.
+
+                                        *g:acp_behaviorUserDefinedFunction*  >
+  let g:acp_behaviorUserDefinedFunction = ''
+<
+        |g:acp_behavior-completefunc| for user-defined completion. If empty,
+        this completion will be never attempted.
+
+                                           *g:acp_behaviorUserDefinedMeets*  >
+  let g:acp_behaviorUserDefinedMeets = ''
+<
+        |g:acp_behavior-meets| for user-defined completion. If empty, this
+        completion will be never attempted.
+
+                                             *g:acp_behaviorSnipmateLength*  >
+  let g:acp_behaviorSnipmateLength = -1
+<
+        Pattern before the cursor, which are needed to attempt
+        snipMate-trigger completion.
+
+                                             *g:acp_behaviorKeywordCommand*  >
+  let g:acp_behaviorKeywordCommand = "\<C-n>"
+<
+        Command for keyword completion. This option is usually set "\<C-n>" or
+        "\<C-p>".
+
+                                              *g:acp_behaviorKeywordLength*  >
+  let g:acp_behaviorKeywordLength = 2
+<
+        Length of keyword characters before the cursor, which are needed to
+        attempt keyword completion. If negative value, this completion will be
+        never attempted.
+
+                                             *g:acp_behaviorKeywordIgnores*  >
+  let g:acp_behaviorKeywordIgnores = []
+<
+        List of string. If a word before the cursor matches to the front part
+        of one of them, keyword completion won't be attempted.
+
+        E.g., when there are too many keywords beginning with "get" for the
+        completion and auto-popup by entering "g", "ge", or "get" causes
+        response degradation, set ["get"] to this option and avoid it.
+
+                                                 *g:acp_behaviorFileLength*  >
+  let g:acp_behaviorFileLength = 0
+<
+        Length of filename characters before the cursor, which are needed to
+        attempt filename completion. If negative value, this completion will
+        be never attempted.
+
+                                       *g:acp_behaviorRubyOmniMethodLength*  >
+  let g:acp_behaviorRubyOmniMethodLength = 0
+<
+        Length of keyword characters before the cursor, which are needed to
+        attempt ruby omni-completion for methods. If negative value, this
+        completion will be never attempted.
+
+                                       *g:acp_behaviorRubyOmniSymbolLength*  >
+  let g:acp_behaviorRubyOmniSymbolLength = 1
+<
+        Length of keyword characters before the cursor, which are needed to
+        attempt ruby omni-completion for symbols. If negative value, this
+        completion will be never attempted.
+
+                                           *g:acp_behaviorPythonOmniLength*  >
+  let g:acp_behaviorPythonOmniLength = 0
+<
+        Length of keyword characters before the cursor, which are needed to
+        attempt python omni-completion. If negative value, this completion
+        will be never attempted.
+
+                                             *g:acp_behaviorPerlOmniLength*  >
+  let g:acp_behaviorPerlOmniLength = -1
+<
+        Length of keyword characters before the cursor, which are needed to
+        attempt perl omni-completion. If negative value, this completion will
+        be never attempted.
+
+        See also: |acp-perl-omni|
+
+                                              *g:acp_behaviorXmlOmniLength*  >
+  let g:acp_behaviorXmlOmniLength = 0
+<
+        Length of keyword characters before the cursor, which are needed to
+        attempt XML omni-completion. If negative value, this completion will
+        be never attempted.
+
+                                             *g:acp_behaviorHtmlOmniLength*  >
+  let g:acp_behaviorHtmlOmniLength = 0
+<
+        Length of keyword characters before the cursor, which are needed to
+        attempt HTML omni-completion. If negative value, this completion will
+        be never attempted.
+
+                                      *g:acp_behaviorCssOmniPropertyLength*  >
+  let g:acp_behaviorCssOmniPropertyLength = 1
+<
+        Length of keyword characters before the cursor, which are needed to
+        attempt CSS omni-completion for properties. If negative value, this
+        completion will be never attempted.
+
+                                         *g:acp_behaviorCssOmniValueLength*  >
+  let g:acp_behaviorCssOmniValueLength = 0
+<
+        Length of keyword characters before the cursor, which are needed to
+        attempt CSS omni-completion for values. If negative value, this
+        completion will be never attempted.
+
+                                                           *g:acp_behavior*  >
+  let g:acp_behavior = {}
+<
+        This option is for advanced users. This setting overrides other
+        behavior options. This is a |Dictionary|. Each key corresponds to a
+        filetype. '*' is default. Each value is a list. These are attempted in
+        sequence until completion item is found. Each element is a
+        |Dictionary| which has following items:
+
+        "command":                                    *g:acp_behavior-command*
+          Command to be fed to open popup menu for completions.
+
+        "completefunc":                          *g:acp_behavior-completefunc*
+          'completefunc' will be set to this user-provided function during the
+          completion. Only makes sense when "command" is "<C-x><C-u>".
+
+        "meets":                                        *g:acp_behavior-meets*
+          Name of the function which dicides whether or not to attempt this
+          completion. It will be attempted if this function returns non-zero.
+          This function takes a text before the cursor.
+
+        "onPopupClose":                          *g:acp_behavior-onPopupClose*
+          Name of the function which is called when popup menu for this
+          completion is closed. Following completions will be suppressed if
+          this function returns zero.
+
+        "repeat":                                      *g:acp_behavior-repeat*
+          If non-zero, the last completion is automatically repeated.
+
+
+==============================================================================
+SPECIAL THANKS                                                    *acp-thanks*
+
+- Daniel Schierbeck
+- Ingo Karkat
+
+
+==============================================================================
+CHANGELOG                                                      *acp-changelog*
+
+2.14.1
+  - Changed the way of auto-popup for avoiding an issue about filename
+    completion.
+  - Fixed a bug that popup menu was opened twice when auto-popup was done.
+
+2.14
+  - Added the support for perl-completion.vim.
+
+2.13
+  - Changed to sort snipMate's triggers.
+  - Fixed a bug that a wasted character was inserted after snipMate's trigger
+    completion.
+
+2.12.1
+  - Changed to avoid a strange behavior with Microsoft IME.
+
+2.12
+  - Added g:acp_behaviorKeywordIgnores option.
+  - Added g:acp_behaviorUserDefinedMeets option and removed
+    g:acp_behaviorUserDefinedPattern.
+  - Changed to do auto-popup only when a buffer is modified.
+  - Changed the structure of g:acp_behavior option.
+  - Changed to reflect a change of behavior options (named g:acp_behavior*)
+    any time it is done.
+  - Fixed a bug that completions after omni completions or snipMate's trigger
+    completion were never attempted when no candidate for the former
+    completions was found.
+
+2.11.1
+  - Fixed a bug that a snipMate's trigger could not be expanded when it was
+    completed.
+
+2.11
+  - Implemented experimental feature which is snipMate's trigger completion.
+
+2.10
+  - Improved the response by changing not to attempt any completion when
+    keyword characters are entered after a word which has been found that it
+    has no completion candidate at the last attempt of completions.
+  - Improved the response by changing to close popup menu when <BS> was
+    pressed and the text before the cursor would not match with the pattern of
+    current behavior.
+
+2.9
+  - Changed default behavior to support XML omni completion.
+  - Changed default value of g:acp_behaviorKeywordCommand option.
+    The option with "\<C-p>" cause a problem which inserts a match without
+    <CR> when 'dictionary' has been set and keyword completion is done.
+  - Changed to show error message when incompatible with a installed vim.
+
+2.8.1
+  - Fixed a bug which inserted a selected match to the next line when
+    auto-wrapping (enabled with 'formatoptions') was performed.
+
+2.8
+  - Added g:acp_behaviorUserDefinedFunction option and
+    g:acp_behaviorUserDefinedPattern option for users who want to make custom
+    completion auto-popup.
+  - Fixed a bug that setting 'spell' on a new buffer made typing go crazy.
+
+2.7
+  - Changed naming conventions for filenames, functions, commands, and options 
+    and thus renamed them.
+  - Added g:acp_behaviorKeywordCommand option. If you prefer the previous
+    behavior for keyword completion, set this option "\<C-n>".
+  - Changed default value of g:acp_ignorecaseOption option.
+
+  The following were done by Ingo Karkat:
+
+  - ENH: Added support for setting a user-provided 'completefunc' during the
+    completion, configurable via g:acp_behavior. 
+  - BUG: When the configured completion is <C-p> or <C-x><C-p>, the command to
+    restore the original text (in on_popup_post()) must be reverted, too. 
+  - BUG: When using a custom completion function (<C-x><C-u>) that also uses
+    an s:...() function name, the s:GetSidPrefix() function dynamically
+    determines the wrong SID. Now calling s:DetermineSidPrefix() once during
+    sourcing and caching the value in s:SID. 
+  - BUG: Should not use custom defined <C-X><C-...> completion mappings. Now
+    consistently using unmapped completion commands everywhere. (Beforehand,
+    s:PopupFeeder.feed() used mappings via feedkeys(..., 'm'), but
+    s:PopupFeeder.on_popup_post() did not due to its invocation via
+    :map-expr.) 
+
+2.6:
+  - Improved the behavior of omni completion for HTML/XHTML.
+
+2.5:
+  - Added some options to customize behavior easily:
+      g:AutoComplPop_BehaviorKeywordLength
+      g:AutoComplPop_BehaviorFileLength
+      g:AutoComplPop_BehaviorRubyOmniMethodLength
+      g:AutoComplPop_BehaviorRubyOmniSymbolLength
+      g:AutoComplPop_BehaviorPythonOmniLength
+      g:AutoComplPop_BehaviorHtmlOmniLength
+      g:AutoComplPop_BehaviorCssOmniPropertyLength
+      g:AutoComplPop_BehaviorCssOmniValueLength
+
+2.4:
+  - Added g:AutoComplPop_MappingDriven option.
+
+2.3.1:
+  - Changed to set 'lazyredraw' while a popup menu is visible to avoid
+    flickering.
+  - Changed a behavior for CSS.
+  - Added support for GetLatestVimScripts.
+
+2.3:
+  - Added a behavior for Python to support omni completion.
+  - Added a behavior for CSS to support omni completion.
+
+2.2:
+  - Changed not to work when 'paste' option is set.
+  - Fixed AutoComplPopEnable command and AutoComplPopDisable command to
+    map/unmap "i" and "R".
+
+2.1:
+  - Fixed the problem caused by "." command in Normal mode.
+  - Changed to map "i" and "R" to feed completion command after starting
+    Insert mode.
+  - Avoided the problem caused by Windows IME.
+
+2.0:
+  - Changed to use CursorMovedI event to feed a completion command instead of
+    key mapping. Now the auto-popup is triggered by moving the cursor.
+  - Changed to feed completion command after starting Insert mode.
+  - Removed g:AutoComplPop_MapList option.
+
+1.7:
+  - Added behaviors for HTML/XHTML. Now supports the omni completion for
+    HTML/XHTML.
+  - Changed not to show expressions for CTRL-R =.
+  - Changed not to set 'nolazyredraw' while a popup menu is visible.
+
+1.6.1:
+  - Changed not to trigger the filename completion by a text which has
+    multi-byte characters.
+
+1.6:
+  - Redesigned g:AutoComplPop_Behavior option.
+  - Changed default value of g:AutoComplPop_CompleteOption option.
+  - Changed default value of g:AutoComplPop_MapList option.
+
+1.5:
+  - Implemented continuous-completion for the filename completion. And added
+    new option to g:AutoComplPop_Behavior.
+
+1.4:
+  - Fixed the bug that the auto-popup was not suspended in fuzzyfinder.
+  - Fixed the bug that an error has occurred with Ruby-omni-completion unless
+    Ruby interface.
+
+1.3:
+  - Supported Ruby-omni-completion by default.
+  - Supported filename completion by default.
+  - Added g:AutoComplPop_Behavior option.
+  - Added g:AutoComplPop_CompleteoptPreview option.
+  - Removed g:AutoComplPop_MinLength option.
+  - Removed g:AutoComplPop_MaxLength option.
+  - Removed g:AutoComplPop_PopupCmd option.
+
+1.2:
+  - Fixed bugs related to 'completeopt'.
+
+1.1:
+  - Added g:AutoComplPop_IgnoreCaseOption option.
+  - Added g:AutoComplPop_NotEnableAtStartup option.
+  - Removed g:AutoComplPop_LoadAndEnable option.
+1.0:
+  - g:AutoComplPop_LoadAndEnable option for a startup activation is added.
+  - AutoComplPopLock command and AutoComplPopUnlock command are added to
+    suspend and resume.
+  - 'completeopt' and 'complete' options are changed temporarily while
+    completing by this script.
+
+0.4:
+  - The first match are selected when the popup menu is Opened. You can insert
+    the first match with CTRL-Y.
+
+0.3:
+  - Fixed the problem that the original text is not restored if 'longest' is
+    not set in 'completeopt'. Now the plugin works whether or not 'longest' is
+    set in 'completeopt', and also 'menuone'.
+
+0.2:
+  - When completion matches are not found, insert CTRL-E to stop completion.
+  - Clear the echo area.
+  - Fixed the problem in case of dividing words by symbols, popup menu is
+    not opened.
+
+0.1:
+  - First release.
+
+
+==============================================================================
+ABOUT                                   *acp-about* *acp-contact* *acp-author*
+
+Author:  Takeshi NISHIDA <ns9tks@DELETE-ME.gmail.com>
+Licence: MIT Licence
+URL:     http://www.vim.org/scripts/script.php?script_id=1879
+         http://bitbucket.org/ns9tks/vim-autocomplpop/
+
+Bugs/Issues/Suggestions/Improvements ~
+
+Please submit to http://bitbucket.org/ns9tks/vim-autocomplpop/issues/ .
+
+==============================================================================
+ vim:tw=78:ts=8:ft=help:norl:
+
diff --git a/vim-plugins/bundle/AutoComplPop/plugin/acp.vim b/vim-plugins/bundle/AutoComplPop/plugin/acp.vim
new file mode 100644
index 0000000..0c01a31
--- /dev/null
+++ b/vim-plugins/bundle/AutoComplPop/plugin/acp.vim
@@ -0,0 +1,170 @@
+"=============================================================================
+" Copyright (c) 2007-2009 Takeshi NISHIDA
+"
+" GetLatestVimScripts: 1879 1 :AutoInstall: AutoComplPop
+"=============================================================================
+" LOAD GUARD {{{1
+
+if exists('g:loaded_acp')
+  finish
+elseif v:version < 702
+  echoerr 'AutoComplPop does not support this version of vim (' . v:version . ').'
+  finish
+endif
+let g:loaded_acp = 1
+
+" }}}1
+"=============================================================================
+" FUNCTION: {{{1
+
+"
+function s:defineOption(name, default)
+  if !exists(a:name)
+    let {a:name} = a:default
+  endif
+endfunction
+
+"
+function s:makeDefaultBehavior()
+  let behavs = {
+        \   '*'      : [],
+        \   'ruby'   : [],
+        \   'python' : [],
+        \   'perl'   : [],
+        \   'xml'    : [],
+        \   'html'   : [],
+        \   'xhtml'  : [],
+        \   'css'    : [],
+        \ }
+  "---------------------------------------------------------------------------
+  if !empty(g:acp_behaviorUserDefinedFunction) &&
+        \ !empty(g:acp_behaviorUserDefinedMeets)
+    for key in keys(behavs)
+      call add(behavs[key], {
+            \   'command'      : "\<C-x>\<C-u>",
+            \   'completefunc' : g:acp_behaviorUserDefinedFunction,
+            \   'meets'        : g:acp_behaviorUserDefinedMeets,
+            \   'repeat'       : 0,
+            \ })
+    endfor
+  endif
+  "---------------------------------------------------------------------------
+  for key in keys(behavs)
+    call add(behavs[key], {
+          \   'command'      : "\<C-x>\<C-u>",
+          \   'completefunc' : 'acp#completeSnipmate',
+          \   'meets'        : 'acp#meetsForSnipmate',
+          \   'onPopupClose' : 'acp#onPopupCloseSnipmate',
+          \   'repeat'       : 0,
+          \ })
+  endfor
+  "---------------------------------------------------------------------------
+  for key in keys(behavs)
+    call add(behavs[key], {
+          \   'command' : g:acp_behaviorKeywordCommand,
+          \   'meets'   : 'acp#meetsForKeyword',
+          \   'repeat'  : 0,
+          \ })
+  endfor
+  "---------------------------------------------------------------------------
+  for key in keys(behavs)
+    call add(behavs[key], {
+          \   'command' : "\<C-x>\<C-f>",
+          \   'meets'   : 'acp#meetsForFile',
+          \   'repeat'  : 1,
+          \ })
+  endfor
+  "---------------------------------------------------------------------------
+  call add(behavs.ruby, {
+        \   'command' : "\<C-x>\<C-o>",
+        \   'meets'   : 'acp#meetsForRubyOmni',
+        \   'repeat'  : 0,
+        \ })
+  "---------------------------------------------------------------------------
+  call add(behavs.python, {
+        \   'command' : "\<C-x>\<C-o>",
+        \   'meets'   : 'acp#meetsForPythonOmni',
+        \   'repeat'  : 0,
+        \ })
+  "---------------------------------------------------------------------------
+  call add(behavs.perl, {
+        \   'command' : "\<C-x>\<C-o>",
+        \   'meets'   : 'acp#meetsForPerlOmni',
+        \   'repeat'  : 0,
+        \ })
+  "---------------------------------------------------------------------------
+  call add(behavs.xml, {
+        \   'command' : "\<C-x>\<C-o>",
+        \   'meets'   : 'acp#meetsForXmlOmni',
+        \   'repeat'  : 1,
+        \ })
+  "---------------------------------------------------------------------------
+  call add(behavs.html, {
+        \   'command' : "\<C-x>\<C-o>",
+        \   'meets'   : 'acp#meetsForHtmlOmni',
+        \   'repeat'  : 1,
+        \ })
+  "---------------------------------------------------------------------------
+  call add(behavs.xhtml, {
+        \   'command' : "\<C-x>\<C-o>",
+        \   'meets'   : 'acp#meetsForHtmlOmni',
+        \   'repeat'  : 1,
+        \ })
+  "---------------------------------------------------------------------------
+  call add(behavs.css, {
+        \   'command' : "\<C-x>\<C-o>",
+        \   'meets'   : 'acp#meetsForCssOmni',
+        \   'repeat'  : 0,
+        \ })
+  "---------------------------------------------------------------------------
+  return behavs
+endfunction
+
+" }}}1
+"=============================================================================
+" INITIALIZATION {{{1
+
+"-----------------------------------------------------------------------------
+call s:defineOption('g:acp_enableAtStartup', 1)
+call s:defineOption('g:acp_mappingDriven', 0)
+call s:defineOption('g:acp_ignorecaseOption', 1)
+call s:defineOption('g:acp_completeOption', '.,w,b,k')
+call s:defineOption('g:acp_completeoptPreview', 0)
+call s:defineOption('g:acp_behaviorUserDefinedFunction', '')
+call s:defineOption('g:acp_behaviorUserDefinedMeets', '')
+call s:defineOption('g:acp_behaviorSnipmateLength', -1)
+call s:defineOption('g:acp_behaviorKeywordCommand', "\<C-n>")
+call s:defineOption('g:acp_behaviorKeywordLength', 2)
+call s:defineOption('g:acp_behaviorKeywordIgnores', [])
+call s:defineOption('g:acp_behaviorFileLength', 0)
+call s:defineOption('g:acp_behaviorRubyOmniMethodLength', 0)
+call s:defineOption('g:acp_behaviorRubyOmniSymbolLength', 1)
+call s:defineOption('g:acp_behaviorPythonOmniLength', 0)
+call s:defineOption('g:acp_behaviorPerlOmniLength', -1)
+call s:defineOption('g:acp_behaviorXmlOmniLength', 0)
+call s:defineOption('g:acp_behaviorHtmlOmniLength', 0)
+call s:defineOption('g:acp_behaviorCssOmniPropertyLength', 1)
+call s:defineOption('g:acp_behaviorCssOmniValueLength', 0)
+call s:defineOption('g:acp_behavior', {})
+"-----------------------------------------------------------------------------
+call extend(g:acp_behavior, s:makeDefaultBehavior(), 'keep')
+"-----------------------------------------------------------------------------
+command! -bar -narg=0 AcpEnable  call acp#enable()
+command! -bar -narg=0 AcpDisable call acp#disable()
+command! -bar -narg=0 AcpLock    call acp#lock()
+command! -bar -narg=0 AcpUnlock  call acp#unlock()
+"-----------------------------------------------------------------------------
+" legacy commands
+command! -bar -narg=0 AutoComplPopEnable  AcpEnable
+command! -bar -narg=0 AutoComplPopDisable AcpDisable
+command! -bar -narg=0 AutoComplPopLock    AcpLock
+command! -bar -narg=0 AutoComplPopUnlock  AcpUnlock
+"-----------------------------------------------------------------------------
+if g:acp_enableAtStartup
+  AcpEnable
+endif
+"-----------------------------------------------------------------------------
+
+" }}}1
+"=============================================================================
+" vim: set fdm=marker:
diff --git a/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp.vim b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp.vim
new file mode 100644
index 0000000..19ac146
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp.vim
@@ -0,0 +1,2289 @@
+" =============================================================================
+" File:          autoload/ctrlp.vim
+" Description:   Fuzzy file, buffer, mru, tag, etc finder.
+" Author:        Kien Nguyen <github.com/kien>
+" Version:       1.79
+" =============================================================================
+
+" ** Static variables {{{1
+" s:ignore() {{{2
+fu! s:ignore()
+	let igdirs = [
+		\ '\.git',
+		\ '\.hg',
+		\ '\.svn',
+		\ '_darcs',
+		\ '\.bzr',
+		\ '\.cdv',
+		\ '\~\.dep',
+		\ '\~\.dot',
+		\ '\~\.nib',
+		\ '\~\.plst',
+		\ '\.pc',
+		\ '_MTN',
+		\ 'blib',
+		\ 'CVS',
+		\ 'RCS',
+		\ 'SCCS',
+		\ '_sgbak',
+		\ 'autom4te\.cache',
+		\ 'cover_db',
+		\ '_build',
+		\ ]
+	let igfiles = [
+		\ '\~$',
+		\ '#.+#$',
+		\ '[._].*\.swp$',
+		\ 'core\.\d+$',
+		\ '\.exe$',
+		\ '\.so$',
+		\ '\.bak$',
+		\ '\.png$',
+		\ '\.jpg$',
+		\ '\.gif$',
+		\ '\.zip$',
+		\ '\.rar$',
+		\ '\.tar\.gz$',
+		\ ]
+	retu {
+		\ 'dir': '\v[\/]('.join(igdirs, '|').')$',
+		\ 'file': '\v'.join(igfiles, '|'),
+		\ }
+endf
+" Script local vars {{{2
+let [s:pref, s:bpref, s:opts, s:new_opts, s:lc_opts] =
+	\ ['g:ctrlp_', 'b:ctrlp_', {
+	\ 'abbrev':                ['s:abbrev', {}],
+	\ 'arg_map':               ['s:argmap', 0],
+	\ 'buffer_func':           ['s:buffunc', {}],
+	\ 'by_filename':           ['s:byfname', 0],
+	\ 'custom_ignore':         ['s:usrign', s:ignore()],
+	\ 'default_input':         ['s:deftxt', 0],
+	\ 'dont_split':            ['s:nosplit', 'netrw'],
+	\ 'dotfiles':              ['s:showhidden', 0],
+	\ 'extensions':            ['s:extensions', []],
+	\ 'follow_symlinks':       ['s:folsym', 0],
+	\ 'highlight_match':       ['s:mathi', [1, 'CtrlPMatch']],
+	\ 'jump_to_buffer':        ['s:jmptobuf', 'Et'],
+	\ 'key_loop':              ['s:keyloop', 0],
+	\ 'lazy_update':           ['s:lazy', 0],
+	\ 'match_func':            ['s:matcher', {}],
+	\ 'match_window':          ['s:mw', ''],
+	\ 'match_window_bottom':   ['s:mwbottom', 1],
+	\ 'match_window_reversed': ['s:mwreverse', 1],
+	\ 'max_depth':             ['s:maxdepth', 40],
+	\ 'max_files':             ['s:maxfiles', 10000],
+	\ 'max_height':            ['s:mxheight', 10],
+	\ 'max_history':           ['s:maxhst', exists('+hi') ? &hi : 20],
+	\ 'mruf_default_order':    ['s:mrudef', 0],
+	\ 'open_func':             ['s:openfunc', {}],
+	\ 'open_multi':            ['s:opmul', '1v'],
+	\ 'open_new_file':         ['s:newfop', 'v'],
+	\ 'prompt_mappings':       ['s:urprtmaps', 0],
+	\ 'regexp_search':         ['s:regexp', 0],
+	\ 'root_markers':          ['s:rmarkers', []],
+	\ 'split_window':          ['s:splitwin', 0],
+	\ 'status_func':           ['s:status', {}],
+	\ 'tabpage_position':      ['s:tabpage', 'ac'],
+	\ 'use_caching':           ['s:caching', 1],
+	\ 'use_migemo':            ['s:migemo', 0],
+	\ 'user_command':          ['s:usrcmd', ''],
+	\ 'working_path_mode':     ['s:pathmode', 'ra'],
+	\ }, {
+	\ 'open_multiple_files':   's:opmul',
+	\ 'regexp':                's:regexp',
+	\ 'reuse_window':          's:nosplit',
+	\ 'show_hidden':           's:showhidden',
+	\ 'switch_buffer':         's:jmptobuf',
+	\ }, {
+	\ 'root_markers':          's:rmarkers',
+	\ 'user_command':          's:usrcmd',
+	\ 'working_path_mode':     's:pathmode',
+	\ }]
+
+" Global options
+let s:glbs = { 'magic': 1, 'to': 1, 'tm': 0, 'sb': 1, 'hls': 0, 'im': 0,
+	\ 'report': 9999, 'sc': 0, 'ss': 0, 'siso': 0, 'mfd': 200, 'ttimeout': 0,
+	\ 'gcr': 'a:blinkon0', 'ic': 1, 'lmap': '', 'mousef': 0, 'imd': 1 }
+
+" Keymaps
+let [s:lcmap, s:prtmaps] = ['nn <buffer> <silent>', {
+	\ 'PrtBS()':              ['<bs>', '<c-]>'],
+	\ 'PrtDelete()':          ['<del>'],
+	\ 'PrtDeleteWord()':      ['<c-w>'],
+	\ 'PrtClear()':           ['<c-u>'],
+	\ 'PrtSelectMove("j")':   ['<c-j>', '<down>'],
+	\ 'PrtSelectMove("k")':   ['<c-k>', '<up>'],
+	\ 'PrtSelectMove("t")':   ['<Home>', '<kHome>'],
+	\ 'PrtSelectMove("b")':   ['<End>', '<kEnd>'],
+	\ 'PrtSelectMove("u")':   ['<PageUp>', '<kPageUp>'],
+	\ 'PrtSelectMove("d")':   ['<PageDown>', '<kPageDown>'],
+	\ 'PrtHistory(-1)':       ['<c-n>'],
+	\ 'PrtHistory(1)':        ['<c-p>'],
+	\ 'AcceptSelection("e")': ['<cr>', '<2-LeftMouse>'],
+	\ 'AcceptSelection("h")': ['<c-x>', '<c-cr>', '<c-s>'],
+	\ 'AcceptSelection("t")': ['<c-t>'],
+	\ 'AcceptSelection("v")': ['<c-v>', '<RightMouse>'],
+	\ 'ToggleFocus()':        ['<s-tab>'],
+	\ 'ToggleRegex()':        ['<c-r>'],
+	\ 'ToggleByFname()':      ['<c-d>'],
+	\ 'ToggleType(1)':        ['<c-f>', '<c-up>'],
+	\ 'ToggleType(-1)':       ['<c-b>', '<c-down>'],
+	\ 'PrtExpandDir()':       ['<tab>'],
+	\ 'PrtInsert("c")':       ['<MiddleMouse>', '<insert>'],
+	\ 'PrtInsert()':          ['<c-\>'],
+	\ 'PrtCurStart()':        ['<c-a>'],
+	\ 'PrtCurEnd()':          ['<c-e>'],
+	\ 'PrtCurLeft()':         ['<c-h>', '<left>', '<c-^>'],
+	\ 'PrtCurRight()':        ['<c-l>', '<right>'],
+	\ 'PrtClearCache()':      ['<F5>'],
+	\ 'PrtDeleteEnt()':       ['<F7>'],
+	\ 'CreateNewFile()':      ['<c-y>'],
+	\ 'MarkToOpen()':         ['<c-z>'],
+	\ 'OpenMulti()':          ['<c-o>'],
+	\ 'PrtExit()':            ['<esc>', '<c-c>', '<c-g>'],
+	\ }]
+
+if !has('gui_running')
+	cal add(s:prtmaps['PrtBS()'], remove(s:prtmaps['PrtCurLeft()'], 0))
+en
+
+let s:compare_lim = 3000
+
+let s:ficounts = {}
+
+let s:ccex = s:pref.'clear_cache_on_exit'
+
+" Regexp
+let s:fpats = {
+	\ '^\(\\|\)\|\(\\|\)$': '\\|',
+	\ '^\\\(zs\|ze\|<\|>\)': '^\\\(zs\|ze\|<\|>\)',
+	\ '^\S\*$': '\*',
+	\ '^\S\\?$': '\\?',
+	\ }
+
+" Keypad
+let s:kprange = {
+	\ 'Plus': '+',
+	\ 'Minus': '-',
+	\ 'Divide': '/',
+	\ 'Multiply': '*',
+	\ 'Point': '.',
+	\ }
+
+" Highlight groups
+let s:hlgrps = {
+	\ 'NoEntries': 'Error',
+	\ 'Mode1': 'Character',
+	\ 'Mode2': 'LineNr',
+	\ 'Stats': 'Function',
+	\ 'Match': 'Identifier',
+	\ 'PrtBase': 'Comment',
+	\ 'PrtText': 'Normal',
+	\ 'PrtCursor': 'Constant',
+	\ }
+" Get the options {{{2
+fu! s:opts(...)
+	unl! s:usrign s:usrcmd s:urprtmaps
+	for each in ['byfname', 'regexp', 'extensions'] | if exists('s:'.each)
+		let {each} = s:{each}
+	en | endfo
+	for [ke, va] in items(s:opts)
+		let {va[0]} = exists(s:pref.ke) ? {s:pref.ke} : va[1]
+	endfo
+	unl va
+	for [ke, va] in items(s:new_opts)
+		let {va} = {exists(s:pref.ke) ? s:pref.ke : va}
+	endfo
+	unl va
+	for [ke, va] in items(s:lc_opts)
+		if exists(s:bpref.ke)
+			unl {va}
+			let {va} = {s:bpref.ke}
+		en
+	endfo
+	" Match window options
+	cal s:match_window_opts()
+	" One-time values
+	if a:0 && a:1 != {}
+		unl va
+		for [ke, va] in items(a:1)
+			let opke = substitute(ke, '\(\w:\)\?ctrlp_', '', '')
+			if has_key(s:lc_opts, opke)
+				let sva = s:lc_opts[opke]
+				unl {sva}
+				let {sva} = va
+			en
+		endfo
+	en
+	for each in ['byfname', 'regexp'] | if exists(each)
+		let s:{each} = {each}
+	en | endfo
+	if !exists('g:ctrlp_newcache') | let g:ctrlp_newcache = 0 | en
+	let s:maxdepth = min([s:maxdepth, 100])
+	let s:glob = s:showhidden ? '.*\|*' : '*'
+	let s:igntype = empty(s:usrign) ? -1 : type(s:usrign)
+	let s:lash = ctrlp#utils#lash()
+	if s:keyloop
+		let [s:lazy, s:glbs['imd']] = [0, 0]
+	en
+	if s:lazy
+		cal extend(s:glbs, { 'ut': ( s:lazy > 1 ? s:lazy : 250 ) })
+	en
+	" Extensions
+	if !( exists('extensions') && extensions == s:extensions )
+		for each in s:extensions
+			exe 'ru autoload/ctrlp/'.each.'.vim'
+		endfo
+	en
+	" Keymaps
+	if type(s:urprtmaps) == 4
+		cal extend(s:prtmaps, s:urprtmaps)
+	en
+endf
+
+fu! s:match_window_opts()
+	let s:mw_pos =
+		\ s:mw =~ 'top\|bottom' ? matchstr(s:mw, 'top\|bottom') :
+		\ exists('g:ctrlp_match_window_bottom') ? ( s:mwbottom ? 'bottom' : 'top' )
+		\ : 'bottom'
+	let s:mw_order =
+		\ s:mw =~ 'order:[^,]\+' ? matchstr(s:mw, 'order:\zs[^,]\+') :
+		\ exists('g:ctrlp_match_window_reversed') ? ( s:mwreverse ? 'btt' : 'ttb' )
+		\ : 'btt'
+	let s:mw_max =
+		\ s:mw =~ 'max:[^,]\+' ? str2nr(matchstr(s:mw, 'max:\zs\d\+')) :
+		\ exists('g:ctrlp_max_height') ? s:mxheight
+		\ : 10
+	let s:mw_min =
+		\ s:mw =~ 'min:[^,]\+' ? str2nr(matchstr(s:mw, 'min:\zs\d\+')) : 1
+	let [s:mw_max, s:mw_min] = [max([s:mw_max, 1]), max([s:mw_min, 1])]
+	let s:mw_min = min([s:mw_min, s:mw_max])
+	let s:mw_res =
+		\ s:mw =~ 'results:[^,]\+' ? str2nr(matchstr(s:mw, 'results:\zs\d\+'))
+		\ : min([s:mw_max, &lines])
+	let s:mw_res = max([s:mw_res, 1])
+endf
+"}}}1
+" * Open & Close {{{1
+fu! s:Open()
+	cal s:log(1)
+	cal s:getenv()
+	cal s:execextvar('enter')
+	sil! exe 'keepa' ( s:mw_pos == 'top' ? 'to' : 'bo' ) '1new ControlP'
+	cal s:buffunc(1)
+	let [s:bufnr, s:winw] = [bufnr('%'), winwidth(0)]
+	let [s:focus, s:prompt] = [1, ['', '', '']]
+	abc <buffer>
+	if !exists('s:hstry')
+		let hst = filereadable(s:gethistloc()[1]) ? s:gethistdata() : ['']
+		let s:hstry = empty(hst) || !s:maxhst ? [''] : hst
+	en
+	for [ke, va] in items(s:glbs) | if exists('+'.ke)
+		sil! exe 'let s:glb_'.ke.' = &'.ke.' | let &'.ke.' = '.string(va)
+	en | endfo
+	if s:opmul != '0' && has('signs')
+		sign define ctrlpmark text=+> texthl=Search
+	en
+	cal s:setupblank()
+endf
+
+fu! s:Close()
+	cal s:buffunc(0)
+	if winnr('$') == 1
+		bw!
+	el
+		try | bun!
+		cat | clo! | endt
+		cal s:unmarksigns()
+	en
+	for key in keys(s:glbs) | if exists('+'.key)
+		sil! exe 'let &'.key.' = s:glb_'.key
+	en | endfo
+	if exists('s:glb_acd') | let &acd = s:glb_acd | en
+	let g:ctrlp_lines = []
+	if s:winres[1] >= &lines && s:winres[2] == winnr('$')
+		exe s:winres[0].s:winres[0]
+	en
+	unl! s:focus s:hisidx s:hstgot s:marked s:statypes s:cline s:init s:savestr
+		\ s:mrbs s:did_exp
+	cal ctrlp#recordhist()
+	cal s:execextvar('exit')
+	cal s:log(0)
+	let v:errmsg = s:ermsg
+	ec
+endf
+" * Clear caches {{{1
+fu! ctrlp#clr(...)
+	let [s:matches, g:ctrlp_new{ a:0 ? a:1 : 'cache' }] = [1, 1]
+endf
+
+fu! ctrlp#clra()
+	let cadir = ctrlp#utils#cachedir()
+	if isdirectory(cadir)
+		let cafiles = split(s:glbpath(s:fnesc(cadir, 'g', ','), '**', 1), "\n")
+		let eval = '!isdirectory(v:val) && v:val !~ ''\v[\/]cache[.a-z]+$|\.log$'''
+		sil! cal map(s:ifilter(cafiles, eval), 'delete(v:val)')
+	en
+	cal ctrlp#clr()
+endf
+
+fu! s:Reset(args)
+	let opts = has_key(a:args, 'opts') ? [a:args['opts']] : []
+	cal call('s:opts', opts)
+	cal s:autocmds()
+	cal ctrlp#utils#opts()
+	cal s:execextvar('opts')
+endf
+" * Files {{{1
+fu! ctrlp#files()
+	let cafile = ctrlp#utils#cachefile()
+	if g:ctrlp_newcache || !filereadable(cafile) || s:nocache(cafile)
+		let [lscmd, s:initcwd, g:ctrlp_allfiles] = [s:lsCmd(), s:dyncwd, []]
+		" Get the list of files
+		if empty(lscmd)
+			if !ctrlp#igncwd(s:dyncwd)
+				cal s:GlobPath(s:fnesc(s:dyncwd, 'g', ','), 0)
+			en
+		el
+			sil! cal ctrlp#progress('Indexing...')
+			try | cal s:UserCmd(lscmd)
+			cat | retu [] | endt
+		en
+		" Remove base directory
+		cal ctrlp#rmbasedir(g:ctrlp_allfiles)
+		if len(g:ctrlp_allfiles) <= s:compare_lim
+			cal sort(g:ctrlp_allfiles, 'ctrlp#complen')
+		en
+		cal s:writecache(cafile)
+		let catime = getftime(cafile)
+	el
+		let catime = getftime(cafile)
+		if !( exists('s:initcwd') && s:initcwd == s:dyncwd )
+			\ || get(s:ficounts, s:dyncwd, [0, catime])[1] != catime
+			let s:initcwd = s:dyncwd
+			let g:ctrlp_allfiles = ctrlp#utils#readfile(cafile)
+		en
+	en
+	cal extend(s:ficounts, { s:dyncwd : [len(g:ctrlp_allfiles), catime] })
+	retu g:ctrlp_allfiles
+endf
+
+fu! s:GlobPath(dirs, depth)
+	let entries = split(globpath(a:dirs, s:glob), "\n")
+	let [dnf, depth] = [ctrlp#dirnfile(entries), a:depth + 1]
+	cal extend(g:ctrlp_allfiles, dnf[1])
+	if !empty(dnf[0]) && !s:maxf(len(g:ctrlp_allfiles)) && depth <= s:maxdepth
+		sil! cal ctrlp#progress(len(g:ctrlp_allfiles), 1)
+		cal s:GlobPath(join(map(dnf[0], 's:fnesc(v:val, "g", ",")'), ','), depth)
+	en
+endf
+
+fu! s:UserCmd(lscmd)
+	let [path, lscmd] = [s:dyncwd, a:lscmd]
+	let do_ign =
+		\ type(s:usrcmd) == 4 && has_key(s:usrcmd, 'ignore') && s:usrcmd['ignore']
+	if do_ign && ctrlp#igncwd(s:cwd) | retu | en
+	if exists('+ssl') && &ssl
+		let [ssl, &ssl, path] = [&ssl, 0, tr(path, '/', '\')]
+	en
+	if has('win32') || has('win64')
+		let lscmd = substitute(lscmd, '\v(^|\&\&\s*)\zscd (/d)@!', 'cd /d ', '')
+	en
+	let path = exists('*shellescape') ? shellescape(path) : path
+	let g:ctrlp_allfiles = split(system(printf(lscmd, path)), "\n")
+	if exists('+ssl') && exists('ssl')
+		let &ssl = ssl
+		cal map(g:ctrlp_allfiles, 'tr(v:val, "\\", "/")')
+	en
+	if exists('s:vcscmd') && s:vcscmd
+		cal map(g:ctrlp_allfiles, 'tr(v:val, "/", "\\")')
+	en
+	if do_ign
+		if !empty(s:usrign)
+			let g:ctrlp_allfiles = ctrlp#dirnfile(g:ctrlp_allfiles)[1]
+		en
+		if &wig != ''
+			cal filter(g:ctrlp_allfiles, 'glob(v:val) != ""')
+		en
+	en
+endf
+
+fu! s:lsCmd()
+	let cmd = s:usrcmd
+	if type(cmd) == 1
+		retu cmd
+	elsei type(cmd) == 3 && len(cmd) >= 2 && cmd[:1] != ['', '']
+		if s:findroot(s:dyncwd, cmd[0], 0, 1) == []
+			retu len(cmd) == 3 ? cmd[2] : ''
+		en
+		let s:vcscmd = s:lash == '\'
+		retu cmd[1]
+	elsei type(cmd) == 4 && ( has_key(cmd, 'types') || has_key(cmd, 'fallback') )
+		let fndroot = []
+		if has_key(cmd, 'types') && cmd['types'] != {}
+			let [markrs, cmdtypes] = [[], values(cmd['types'])]
+			for pair in cmdtypes
+				cal add(markrs, pair[0])
+			endfo
+			let fndroot = s:findroot(s:dyncwd, markrs, 0, 1)
+		en
+		if fndroot == []
+			retu has_key(cmd, 'fallback') ? cmd['fallback'] : ''
+		en
+		for pair in cmdtypes
+			if pair[0] == fndroot[0] | brea | en
+		endfo
+		let s:vcscmd = s:lash == '\'
+		retu pair[1]
+	en
+endf
+" - Buffers {{{1
+fu! ctrlp#buffers(...)
+	let ids = sort(filter(range(1, bufnr('$')), 'empty(getbufvar(v:val, "&bt"))'
+		\ .' && getbufvar(v:val, "&bl")'), 's:compmreb')
+	if a:0 && a:1 == 'id'
+		retu ids
+	el
+		let bufs = [[], []]
+		for id in ids
+			let bname = bufname(id)
+			let ebname = bname == ''
+			let fname = fnamemodify(ebname ? '['.id.'*No Name]' : bname, ':.')
+			cal add(bufs[ebname], fname)
+		endfo
+		retu bufs[0] + bufs[1]
+	en
+endf
+" * MatchedItems() {{{1
+fu! s:MatchIt(items, pat, limit, exc)
+	let [lines, id] = [[], 0]
+	let pat =
+		\ s:byfname() ? map(split(a:pat, '^[^;]\+\\\@<!\zs;', 1), 's:martcs.v:val')
+		\ : s:martcs.a:pat
+	for item in a:items
+		let id += 1
+		try | if !( s:ispath && item == a:exc ) && call(s:mfunc, [item, pat]) >= 0
+			cal add(lines, item)
+		en | cat | brea | endt
+		if a:limit > 0 && len(lines) >= a:limit | brea | en
+	endfo
+	let s:mdata = [s:dyncwd, s:itemtype, s:regexp, s:sublist(a:items, id, -1)]
+	retu lines
+endf
+
+fu! s:MatchedItems(items, pat, limit)
+	let exc = exists('s:crfilerel') ? s:crfilerel : ''
+	let items = s:narrowable() ? s:matched + s:mdata[3] : a:items
+	if s:matcher != {}
+		let argms =
+			\ has_key(s:matcher, 'arg_type') && s:matcher['arg_type'] == 'dict' ? [{
+			\ 'items':  items,
+			\ 'str':    a:pat,
+			\ 'limit':  a:limit,
+			\ 'mmode':  s:mmode(),
+			\ 'ispath': s:ispath,
+			\ 'crfile': exc,
+			\ 'regex':  s:regexp,
+			\ }] : [items, a:pat, a:limit, s:mmode(), s:ispath, exc, s:regexp]
+		let lines = call(s:matcher['match'], argms, s:matcher)
+	el
+		let lines = s:MatchIt(items, a:pat, a:limit, exc)
+	en
+	let s:matches = len(lines)
+	unl! s:did_exp
+	retu lines
+endf
+
+fu! s:SplitPattern(str)
+	let str = a:str
+	if s:migemo && s:regexp && len(str) > 0 && executable('cmigemo')
+		let str = s:migemo(str)
+	en
+	let s:savestr = str
+	if s:regexp
+		let pat = s:regexfilter(str)
+	el
+		let lst = split(str, '\zs')
+		if exists('+ssl') && !&ssl
+			cal map(lst, 'escape(v:val, ''\'')')
+		en
+		for each in ['^', '$', '.']
+			cal map(lst, 'escape(v:val, each)')
+		endfo
+	en
+	if exists('lst')
+		let pat = ''
+		if !empty(lst)
+			if s:byfname() && index(lst, ';') > 0
+				let fbar = index(lst, ';')
+				let lst_1 = s:sublist(lst, 0, fbar - 1)
+				let lst_2 = len(lst) - 1 > fbar ? s:sublist(lst, fbar + 1, -1) : ['']
+				let pat = s:buildpat(lst_1).';'.s:buildpat(lst_2)
+			el
+				let pat = s:buildpat(lst)
+			en
+		en
+	en
+	retu escape(pat, '~')
+endf
+" * BuildPrompt() {{{1
+fu! s:Render(lines, pat)
+	let [&ma, lines, s:res_count] = [1, a:lines, len(a:lines)]
+	let height = min([max([s:mw_min, s:res_count]), s:winmaxh])
+	let pat = s:byfname() ? split(a:pat, '^[^;]\+\\\@<!\zs;', 1)[0] : a:pat
+	let cur_cmd = 'keepj norm! '.( s:mw_order == 'btt' ? 'G' : 'gg' ).'1|'
+	" Setup the match window
+	sil! exe '%d _ | res' height
+	" Print the new items
+	if empty(lines)
+		let [s:matched, s:lines] = [[], []]
+		let lines = [' == NO ENTRIES ==']
+		cal setline(1, s:offset(lines, height - 1))
+		setl noma nocul
+		exe cur_cmd
+		cal s:unmarksigns()
+		if s:dohighlight() | cal clearmatches() | en
+		retu
+	en
+	let s:matched = copy(lines)
+	" Sorting
+	if !s:nosort()
+		let s:compat = s:martcs.pat
+		cal sort(lines, 's:mixedsort')
+		unl s:compat
+	en
+	if s:mw_order == 'btt' | cal reverse(lines) | en
+	let s:lines = copy(lines)
+	cal map(lines, 's:formatline(v:val)')
+	cal setline(1, s:offset(lines, height))
+	setl noma cul
+	exe cur_cmd
+	cal s:unmarksigns()
+	cal s:remarksigns()
+	if exists('s:cline') && s:nolim != 1
+		cal cursor(s:cline, 1)
+	en
+	" Highlighting
+	if s:dohighlight()
+		cal s:highlight(pat, s:mathi[1])
+	en
+endf
+
+fu! s:Update(str)
+	" Get the previous string if existed
+	let oldstr = exists('s:savestr') ? s:savestr : ''
+	" Get the new string sans tail
+	let str = s:sanstail(a:str)
+	" Stop if the string's unchanged
+	if str == oldstr && !empty(str) && !exists('s:force') | retu | en
+	let s:martcs = &scs && str =~ '\u' ? '\C' : ''
+	let pat = s:matcher == {} ? s:SplitPattern(str) : str
+	let lines = s:nolim == 1 && empty(str) ? copy(g:ctrlp_lines)
+		\ : s:MatchedItems(g:ctrlp_lines, pat, s:mw_res)
+	cal s:Render(lines, pat)
+endf
+
+fu! s:ForceUpdate()
+	sil! cal s:Update(escape(s:getinput(), '\'))
+endf
+
+fu! s:BuildPrompt(upd)
+	let base = ( s:regexp ? 'r' : '>' ).( s:byfname() ? 'd' : '>' ).'> '
+	let str = escape(s:getinput(), '\')
+	let lazy = str == '' || exists('s:force') || !has('autocmd') ? 0 : s:lazy
+	if a:upd && !lazy && ( s:matches || s:regexp || exists('s:did_exp')
+		\ || str =~ '\(\\\(<\|>\)\|[*|]\)\|\(\\\:\([^:]\|\\:\)*$\)' )
+		sil! cal s:Update(str)
+	en
+	sil! cal ctrlp#statusline()
+	" Toggling
+	let [hiactive, hicursor, base] = s:focus
+		\ ? ['CtrlPPrtText', 'CtrlPPrtCursor', base]
+		\ : ['CtrlPPrtBase', 'CtrlPPrtBase', tr(base, '>', '-')]
+	let hibase = 'CtrlPPrtBase'
+	" Build it
+	redr
+	let prt = copy(s:prompt)
+	cal map(prt, 'escape(v:val, ''"\'')')
+	exe 'echoh' hibase '| echon "'.base.'"
+		\ | echoh' hiactive '| echon "'.prt[0].'"
+		\ | echoh' hicursor '| echon "'.prt[1].'"
+		\ | echoh' hiactive '| echon "'.prt[2].'" | echoh None'
+	" Append the cursor at the end
+	if empty(prt[1]) && s:focus
+		exe 'echoh' hibase '| echon "_" | echoh None'
+	en
+endf
+" - SetDefTxt() {{{1
+fu! s:SetDefTxt()
+	if s:deftxt == '0' || ( s:deftxt == 1 && !s:ispath ) | retu | en
+	let txt = s:deftxt
+	if !type(txt)
+		let path = s:crfpath.s:lash(s:crfpath)
+		let txt = txt && !stridx(path, s:dyncwd) ? ctrlp#rmbasedir([path])[0] : ''
+	en
+	let s:prompt[0] = txt
+endf
+" ** Prt Actions {{{1
+" Editing {{{2
+fu! s:PrtClear()
+	if !s:focus | retu | en
+	unl! s:hstgot
+	let [s:prompt, s:matches] = [['', '', ''], 1]
+	cal s:BuildPrompt(1)
+endf
+
+fu! s:PrtAdd(char)
+	unl! s:hstgot
+	let s:act_add = 1
+	let s:prompt[0] .= a:char
+	cal s:BuildPrompt(1)
+	unl s:act_add
+endf
+
+fu! s:PrtBS()
+	if !s:focus | retu | en
+	unl! s:hstgot
+	let [s:prompt[0], s:matches] = [substitute(s:prompt[0], '.$', '', ''), 1]
+	cal s:BuildPrompt(1)
+endf
+
+fu! s:PrtDelete()
+	if !s:focus | retu | en
+	unl! s:hstgot
+	let [prt, s:matches] = [s:prompt, 1]
+	let prt[1] = matchstr(prt[2], '^.')
+	let prt[2] = substitute(prt[2], '^.', '', '')
+	cal s:BuildPrompt(1)
+endf
+
+fu! s:PrtDeleteWord()
+	if !s:focus | retu | en
+	unl! s:hstgot
+	let [str, s:matches] = [s:prompt[0], 1]
+	let str = str =~ '\W\w\+$' ? matchstr(str, '^.\+\W\ze\w\+$')
+		\ : str =~ '\w\W\+$' ? matchstr(str, '^.\+\w\ze\W\+$')
+		\ : str =~ '\s\+$' ? matchstr(str, '^.*\S\ze\s\+$')
+		\ : str =~ '\v^(\S+|\s+)$' ? '' : str
+	let s:prompt[0] = str
+	cal s:BuildPrompt(1)
+endf
+
+fu! s:PrtInsert(...)
+	if !s:focus | retu | en
+	let type = !a:0 ? '' : a:1
+	if !a:0
+		let type = s:insertstr()
+		if type == 'cancel' | retu | en
+	en
+	if type ==# 'r'
+		let regcont = s:getregs()
+		if regcont < 0 | retu | en
+	en
+	unl! s:hstgot
+	let s:act_add = 1
+	let s:prompt[0] .= type ==# 'w' ? s:crword
+		\ : type ==# 'f' ? s:crgfile
+		\ : type ==# 's' ? s:regisfilter('/')
+		\ : type ==# 'v' ? s:crvisual
+		\ : type ==# 'c' ? s:regisfilter('+')
+		\ : type ==# 'r' ? regcont : ''
+	cal s:BuildPrompt(1)
+	unl s:act_add
+endf
+
+fu! s:PrtExpandDir()
+	if !s:focus | retu | en
+	let str = s:getinput('c')
+	if str =~ '\v^\@(cd|lc[hd]?|chd)\s.+' && s:spi
+		let hasat = split(str, '\v^\@(cd|lc[hd]?|chd)\s*\zs')
+		let str = get(hasat, 1, '')
+		if str =~# '\v^[~$]\i{-}[\/]?|^#(\<?\d+)?:(p|h|8|\~|\.|g?s+)'
+			let str = expand(s:fnesc(str, 'g'))
+		elsei str =~# '\v^(\%|\<c\h{4}\>):(p|h|8|\~|\.|g?s+)'
+			let spc = str =~# '^%' ? s:crfile
+				\ : str =~# '^<cfile>' ? s:crgfile
+				\ : str =~# '^<cword>' ? s:crword
+				\ : str =~# '^<cWORD>' ? s:crnbword : ''
+			let pat = '(:(p|h|8|\~|\.|g?s(.)[^\3]*\3[^\3]*\3))+'
+			let mdr = matchstr(str, '\v^[^:]+\zs'.pat)
+			let nmd = matchstr(str, '\v^[^:]+'.pat.'\zs.{-}$')
+			let str = fnamemodify(s:fnesc(spc, 'g'), mdr).nmd
+		en
+	en
+	if str == '' | retu | en
+	unl! s:hstgot
+	let s:act_add = 1
+	let [base, seed] = s:headntail(str)
+	if str =~# '^[\/]'
+		let base = expand('/').base
+	en
+	let dirs = s:dircompl(base, seed)
+	if len(dirs) == 1
+		let str = dirs[0]
+	elsei len(dirs) > 1
+		let str .= s:findcommon(dirs, str)
+	en
+	let s:prompt[0] = exists('hasat') ? hasat[0].str : str
+	cal s:BuildPrompt(1)
+	unl s:act_add
+endf
+" Movement {{{2
+fu! s:PrtCurLeft()
+	if !s:focus | retu | en
+	let prt = s:prompt
+	if !empty(prt[0])
+		let s:prompt = [substitute(prt[0], '.$', '', ''), matchstr(prt[0], '.$'),
+			\ prt[1] . prt[2]]
+	en
+	cal s:BuildPrompt(0)
+endf
+
+fu! s:PrtCurRight()
+	if !s:focus | retu | en
+	let prt = s:prompt
+	let s:prompt = [prt[0] . prt[1], matchstr(prt[2], '^.'),
+		\ substitute(prt[2], '^.', '', '')]
+	cal s:BuildPrompt(0)
+endf
+
+fu! s:PrtCurStart()
+	if !s:focus | retu | en
+	let str = join(s:prompt, '')
+	let s:prompt = ['', matchstr(str, '^.'), substitute(str, '^.', '', '')]
+	cal s:BuildPrompt(0)
+endf
+
+fu! s:PrtCurEnd()
+	if !s:focus | retu | en
+	let s:prompt = [join(s:prompt, ''), '', '']
+	cal s:BuildPrompt(0)
+endf
+
+fu! s:PrtSelectMove(dir)
+	let wht = winheight(0)
+	let dirs = {'t': 'gg','b': 'G','j': 'j','k': 'k','u': wht.'k','d': wht.'j'}
+	exe 'keepj norm!' dirs[a:dir]
+	if s:nolim != 1 | let s:cline = line('.') | en
+	if line('$') > winheight(0) | cal s:BuildPrompt(0) | en
+endf
+
+fu! s:PrtSelectJump(char)
+	let lines = copy(s:lines)
+	if s:byfname()
+		cal map(lines, 'split(v:val, ''[\/]\ze[^\/]\+$'')[-1]')
+	en
+	" Cycle through matches, use s:jmpchr to store last jump
+	let chr = escape(matchstr(a:char, '^.'), '.~')
+	let smartcs = &scs && chr =~ '\u' ? '\C' : ''
+	if match(lines, smartcs.'^'.chr) >= 0
+		" If not exists or does but not for the same char
+		let pos = match(lines, smartcs.'^'.chr)
+		if !exists('s:jmpchr') || ( exists('s:jmpchr') && s:jmpchr[0] != chr )
+			let [jmpln, s:jmpchr] = [pos, [chr, pos]]
+		elsei exists('s:jmpchr') && s:jmpchr[0] == chr
+			" Start of lines
+			if s:jmpchr[1] == -1 | let s:jmpchr[1] = pos | en
+			let npos = match(lines, smartcs.'^'.chr, s:jmpchr[1] + 1)
+			let [jmpln, s:jmpchr] = [npos == -1 ? pos : npos, [chr, npos]]
+		en
+		exe 'keepj norm!' ( jmpln + 1 ).'G'
+		if s:nolim != 1 | let s:cline = line('.') | en
+		if line('$') > winheight(0) | cal s:BuildPrompt(0) | en
+	en
+endf
+" Misc {{{2
+fu! s:PrtFocusMap(char)
+	cal call(( s:focus ? 's:PrtAdd' : 's:PrtSelectJump' ), [a:char])
+endf
+
+fu! s:PrtClearCache()
+	if s:itemtype == 0
+		cal ctrlp#clr()
+	elsei s:itemtype > 2
+		cal ctrlp#clr(s:statypes[s:itemtype][1])
+	en
+	if s:itemtype == 2
+		let g:ctrlp_lines = ctrlp#mrufiles#refresh()
+	el
+		cal ctrlp#setlines()
+	en
+	let s:force = 1
+	cal s:BuildPrompt(1)
+	unl s:force
+endf
+
+fu! s:PrtDeleteEnt()
+	if s:itemtype == 2
+		cal s:PrtDeleteMRU()
+	elsei type(s:getextvar('wipe')) == 1
+		cal s:delent(s:getextvar('wipe'))
+	en
+endf
+
+fu! s:PrtDeleteMRU()
+	if s:itemtype == 2
+		cal s:delent('ctrlp#mrufiles#remove')
+	en
+endf
+
+fu! s:PrtExit()
+	if bufnr('%') == s:bufnr && bufname('%') == 'ControlP'
+		noa cal s:Close()
+		noa winc p
+	en
+endf
+
+fu! s:PrtHistory(...)
+	if !s:focus || !s:maxhst | retu | en
+	let [str, hst, s:matches] = [join(s:prompt, ''), s:hstry, 1]
+	" Save to history if not saved before
+	let [hst[0], hslen] = [exists('s:hstgot') ? hst[0] : str, len(hst)]
+	let idx = exists('s:hisidx') ? s:hisidx + a:1 : a:1
+	" Limit idx within 0 and hslen
+	let idx = idx < 0 ? 0 : idx >= hslen ? hslen > 1 ? hslen - 1 : 0 : idx
+	let s:prompt = [hst[idx], '', '']
+	let [s:hisidx, s:hstgot, s:force] = [idx, 1, 1]
+	cal s:BuildPrompt(1)
+	unl s:force
+endf
+"}}}1
+" * Mappings {{{1
+fu! s:MapNorms()
+	if exists('s:nmapped') && s:nmapped == s:bufnr | retu | en
+	let pcmd = "nn \<buffer> \<silent> \<k%s> :\<c-u>cal \<SID>%s(\"%s\")\<cr>"
+	let cmd = substitute(pcmd, 'k%s', 'char-%d', '')
+	let pfunc = 'PrtFocusMap'
+	let ranges = [32, 33, 125, 126] + range(35, 91) + range(93, 123)
+	for each in [34, 92, 124]
+		exe printf(cmd, each, pfunc, escape(nr2char(each), '"|\'))
+	endfo
+	for each in ranges
+		exe printf(cmd, each, pfunc, nr2char(each))
+	endfo
+	for each in range(0, 9)
+		exe printf(pcmd, each, pfunc, each)
+	endfo
+	for [ke, va] in items(s:kprange)
+		exe printf(pcmd, ke, pfunc, va)
+	endfo
+	let s:nmapped = s:bufnr
+endf
+
+fu! s:MapSpecs()
+	if !( exists('s:smapped') && s:smapped == s:bufnr )
+		" Correct arrow keys in terminal
+		if ( has('termresponse') && v:termresponse =~ "\<ESC>" )
+			\ || &term =~? '\vxterm|<k?vt|gnome|screen|linux|ansi'
+			for each in ['\A <up>','\B <down>','\C <right>','\D <left>']
+				exe s:lcmap.' <esc>['.each
+			endfo
+		en
+	en
+	for [ke, va] in items(s:prtmaps) | for kp in va
+		exe s:lcmap kp ':<c-u>cal <SID>'.ke.'<cr>'
+	endfo | endfo
+	let s:smapped = s:bufnr
+endf
+
+fu! s:KeyLoop()
+	wh exists('s:init') && s:keyloop
+		redr
+		let nr = getchar()
+		let chr = !type(nr) ? nr2char(nr) : nr
+		if nr >=# 0x20
+			cal s:PrtFocusMap(chr)
+		el
+			let cmd = matchstr(maparg(chr), ':<C-U>\zs.\+\ze<CR>$')
+			exe ( cmd != '' ? cmd : 'norm '.chr )
+		en
+	endw
+endf
+" * Toggling {{{1
+fu! s:ToggleFocus()
+	let s:focus = !s:focus
+	cal s:BuildPrompt(0)
+endf
+
+fu! s:ToggleRegex()
+	let s:regexp = !s:regexp
+	cal s:PrtSwitcher()
+endf
+
+fu! s:ToggleByFname()
+	if s:ispath
+		let s:byfname = !s:byfname
+		let s:mfunc = s:mfunc()
+		cal s:PrtSwitcher()
+	en
+endf
+
+fu! s:ToggleType(dir)
+	let max = len(g:ctrlp_ext_vars) + 2
+	let next = s:walker(max, s:itemtype, a:dir)
+	cal ctrlp#syntax()
+	cal ctrlp#setlines(next)
+	cal s:PrtSwitcher()
+endf
+
+fu! s:ToggleKeyLoop()
+	let s:keyloop = !s:keyloop
+	if exists('+imd')
+		let &imd = !s:keyloop
+	en
+	if s:keyloop
+		let [&ut, s:lazy] = [0, 0]
+		cal s:KeyLoop()
+	elsei has_key(s:glbs, 'ut')
+		let [&ut, s:lazy] = [s:glbs['ut'], 1]
+	en
+endf
+
+fu! s:ToggleMRURelative()
+	cal ctrlp#mrufiles#tgrel()
+	cal s:PrtClearCache()
+endf
+
+fu! s:PrtSwitcher()
+	let [s:force, s:matches] = [1, 1]
+	cal s:BuildPrompt(1)
+	unl s:force
+endf
+" - SetWD() {{{1
+fu! s:SetWD(args)
+	if has_key(a:args, 'args') && stridx(a:args['args'], '--dir') >= 0
+		\ && exists('s:dyncwd')
+		cal ctrlp#setdir(s:dyncwd) | retu
+	en
+	if has_key(a:args, 'dir') && a:args['dir'] != ''
+		cal ctrlp#setdir(a:args['dir']) | retu
+	en
+	let pmode = has_key(a:args, 'mode') ? a:args['mode'] : s:pathmode
+	let [s:crfilerel, s:dyncwd] = [fnamemodify(s:crfile, ':.'), getcwd()]
+	if s:crfile =~ '^.\+://' | retu | en
+	if pmode =~ 'c' || ( pmode =~ 'a' && stridx(s:crfpath, s:cwd) < 0 )
+		\ || ( !type(pmode) && pmode )
+		if exists('+acd') | let [s:glb_acd, &acd] = [&acd, 0] | en
+		cal ctrlp#setdir(s:crfpath)
+	en
+	if pmode =~ 'r' || pmode == 2
+		let markers = ['.git', '.hg', '.svn', '.bzr', '_darcs']
+		let spath = pmode =~ 'd' ? s:dyncwd : pmode =~ 'w' ? s:cwd : s:crfpath
+		if type(s:rmarkers) == 3 && !empty(s:rmarkers)
+			if s:findroot(spath, s:rmarkers, 0, 0) != [] | retu | en
+			cal filter(markers, 'index(s:rmarkers, v:val) < 0')
+		en
+		cal s:findroot(spath, markers, 0, 0)
+	en
+endf
+" * AcceptSelection() {{{1
+fu! ctrlp#acceptfile(...)
+	let useb = 0
+	if a:0 == 1 && type(a:1) == 4
+		let [md, line] = [a:1['action'], a:1['line']]
+		let atl = has_key(a:1, 'tail') ? a:1['tail'] : ''
+	el
+		let [md, line] = [a:1, a:2]
+		let atl = a:0 > 2 ? a:3 : ''
+	en
+	if !type(line)
+		let [filpath, bufnr, useb] = [line, line, 1]
+	el
+		let filpath = fnamemodify(line, ':p')
+		if s:nonamecond(line, filpath)
+			let bufnr = str2nr(matchstr(line, '[\/]\?\[\zs\d\+\ze\*No Name\]$'))
+			let [filpath, useb] = [bufnr, 1]
+		el
+			let bufnr = bufnr('^'.filpath.'$')
+		en
+	en
+	cal s:PrtExit()
+	let tail = s:tail()
+	let j2l = atl != '' ? atl : matchstr(tail, '^ +\zs\d\+$')
+	if ( s:jmptobuf =~ md || ( s:jmptobuf && md =~ '[et]' ) ) && bufnr > 0
+		\ && !( md == 'e' && bufnr == bufnr('%') )
+		let [jmpb, bufwinnr] = [1, bufwinnr(bufnr)]
+		let buftab = ( s:jmptobuf =~# '[tTVH]' || s:jmptobuf > 1 )
+			\ ? s:buftab(bufnr, md) : [0, 0]
+	en
+	" Switch to existing buffer or open new one
+	if exists('jmpb') && bufwinnr > 0
+		\ && !( md == 't' && ( s:jmptobuf !~# toupper(md) || buftab[0] ) )
+		exe bufwinnr.'winc w'
+		if j2l | cal ctrlp#j2l(j2l) | en
+	elsei exists('jmpb') && buftab[0]
+		\ && !( md =~ '[evh]' && s:jmptobuf !~# toupper(md) )
+		exe 'tabn' buftab[0]
+		exe buftab[1].'winc w'
+		if j2l | cal ctrlp#j2l(j2l) | en
+	el
+		" Determine the command to use
+		let useb = bufnr > 0 && buflisted(bufnr) && ( empty(tail) || useb )
+		let cmd =
+			\ md == 't' || s:splitwin == 1 ? ( useb ? 'tab sb' : 'tabe' ) :
+			\ md == 'h' || s:splitwin == 2 ? ( useb ? 'sb' : 'new' ) :
+			\ md == 'v' || s:splitwin == 3 ? ( useb ? 'vert sb' : 'vne' ) :
+			\ call('ctrlp#normcmd', useb ? ['b', 'bo vert sb'] : ['e'])
+		" Reset &switchbuf option
+		let [swb, &swb] = [&swb, '']
+		" Open new window/buffer
+		let [fid, tail] = [( useb ? bufnr : filpath ), ( atl != '' ? ' +'.atl : tail )]
+		let args = [cmd, fid, tail, 1, [useb, j2l]]
+		cal call('s:openfile', args)
+		let &swb = swb
+	en
+endf
+
+fu! s:SpecInputs(str)
+	if a:str =~ '\v^(\.\.([\/]\.\.)*[\/]?[.\/]*)$' && s:spi
+		let cwd = s:dyncwd
+		cal ctrlp#setdir(a:str =~ '^\.\.\.*$' ?
+			\ '../'.repeat('../', strlen(a:str) - 2) : a:str)
+		if cwd != s:dyncwd | cal ctrlp#setlines() | en
+		cal s:PrtClear()
+		retu 1
+	elsei a:str == s:lash && s:spi
+		cal s:SetWD({ 'mode': 'rd' })
+		cal ctrlp#setlines()
+		cal s:PrtClear()
+		retu 1
+	elsei a:str =~ '^@.\+' && s:spi
+		retu s:at(a:str)
+	elsei a:str == '?'
+		cal s:PrtExit()
+		let hlpwin = &columns > 159 ? '| vert res 80' : ''
+		sil! exe 'bo vert h ctrlp-mappings' hlpwin '| norm! 0'
+		retu 1
+	en
+	retu 0
+endf
+
+fu! s:AcceptSelection(action)
+	let [md, icr] = [a:action[0], match(a:action, 'r') >= 0]
+	let subm = icr || ( !icr && md == 'e' )
+	if !subm && s:OpenMulti(md) != -1 | retu | en
+	let str = s:getinput()
+	if subm | if s:SpecInputs(str) | retu | en | en
+	" Get the selected line
+	let line = ctrlp#getcline()
+	if !subm && !s:itemtype && line == '' && line('.') > s:offset
+		\ && str !~ '\v^(\.\.([\/]\.\.)*[\/]?[.\/]*|/|\\|\?|\@.+)$'
+		cal s:CreateNewFile(md) | retu
+	en
+	if empty(line) | retu | en
+	" Do something with it
+	if s:openfunc != {} && has_key(s:openfunc, s:ctype)
+		let actfunc = s:openfunc[s:ctype]
+		let type = has_key(s:openfunc, 'arg_type') ? s:openfunc['arg_type'] : 'list'
+	el
+		if s:itemtype < 3
+			let [actfunc, type] = ['ctrlp#acceptfile', 'dict']
+		el
+			let [actfunc, exttype] = [s:getextvar('accept'), s:getextvar('act_farg')]
+			let type = exttype == 'dict' ? exttype : 'list'
+		en
+	en
+	let actargs = type == 'dict' ? [{ 'action': md, 'line': line, 'icr': icr }]
+		\ : [md, line]
+	cal call(actfunc, actargs)
+endf
+" - CreateNewFile() {{{1
+fu! s:CreateNewFile(...)
+	let [md, str] = ['', s:getinput('n')]
+	if empty(str) | retu | en
+	if s:argmap && !a:0
+		" Get the extra argument
+		let md = s:argmaps(md, 1)
+		if md == 'cancel' | retu | en
+	en
+	let str = s:sanstail(str)
+	let [base, fname] = s:headntail(str)
+	if fname =~ '^[\/]$' | retu | en
+	if exists('s:marked') && len(s:marked)
+		" Use the first marked file's path
+		let path = fnamemodify(values(s:marked)[0], ':p:h')
+		let base = path.s:lash(path).base
+		let str = fnamemodify(base.s:lash.fname, ':.')
+	en
+	if base != '' | if isdirectory(ctrlp#utils#mkdir(base))
+		let optyp = str | en | el | let optyp = fname
+	en
+	if !exists('optyp') | retu | en
+	let [filpath, tail] = [fnamemodify(optyp, ':p'), s:tail()]
+	if !stridx(filpath, s:dyncwd) | cal s:insertcache(str) | en
+	cal s:PrtExit()
+	let cmd = md == 'r' ? ctrlp#normcmd('e') :
+		\ s:newfop =~ '1\|t' || ( a:0 && a:1 == 't' ) || md == 't' ? 'tabe' :
+		\ s:newfop =~ '2\|h' || ( a:0 && a:1 == 'h' ) || md == 'h' ? 'new' :
+		\ s:newfop =~ '3\|v' || ( a:0 && a:1 == 'v' ) || md == 'v' ? 'vne' :
+		\ ctrlp#normcmd('e')
+	cal s:openfile(cmd, filpath, tail, 1)
+endf
+" * OpenMulti() {{{1
+fu! s:MarkToOpen()
+	if s:bufnr <= 0 || s:opmul == '0'
+		\ || ( s:itemtype > 2 && s:getextvar('opmul') != 1 )
+		retu
+	en
+	let line = ctrlp#getcline()
+	if empty(line) | retu | en
+	let filpath = s:ispath ? fnamemodify(line, ':p') : line
+	if exists('s:marked') && s:dictindex(s:marked, filpath) > 0
+		" Unmark and remove the file from s:marked
+		let key = s:dictindex(s:marked, filpath)
+		cal remove(s:marked, key)
+		if empty(s:marked) | unl s:marked | en
+		if has('signs')
+			exe 'sign unplace' key 'buffer='.s:bufnr
+		en
+	el
+		" Add to s:marked and place a new sign
+		if exists('s:marked')
+			let vac = s:vacantdict(s:marked)
+			let key = empty(vac) ? len(s:marked) + 1 : vac[0]
+			let s:marked = extend(s:marked, { key : filpath })
+		el
+			let [key, s:marked] = [1, { 1 : filpath }]
+		en
+		if has('signs')
+			exe 'sign place' key 'line='.line('.').' name=ctrlpmark buffer='.s:bufnr
+		en
+	en
+	sil! cal ctrlp#statusline()
+endf
+
+fu! s:OpenMulti(...)
+	let has_marked = exists('s:marked')
+	if ( !has_marked && a:0 ) || s:opmul == '0' || !s:ispath
+		\ || ( s:itemtype > 2 && s:getextvar('opmul') != 1 )
+		retu -1
+	en
+	" Get the options
+	let [nr, md] = [matchstr(s:opmul, '\d\+'), matchstr(s:opmul, '[thvi]')]
+	let [ur, jf] = [s:opmul =~ 'r', s:opmul =~ 'j']
+	let md = a:0 ? a:1 : ( md == '' ? 'v' : md )
+	let nopt = exists('g:ctrlp_open_multiple_files')
+	if !has_marked
+		let line = ctrlp#getcline()
+		if line == '' | retu | en
+		let marked = { 1 : fnamemodify(line, ':p') }
+		let [nr, ur, jf, nopt] = ['1', 0, 0, 1]
+	en
+	if ( s:argmap || !has_marked ) && !a:0
+		let md = s:argmaps(md, !has_marked ? 2 : 0)
+		if md == 'c'
+			cal s:unmarksigns()
+			unl! s:marked
+			cal s:BuildPrompt(0)
+		elsei !has_marked && md =~ '[axd]'
+			retu s:OpenNoMarks(md, line)
+		en
+		if md =~ '\v^c(ancel)?$' | retu | en
+		let nr = nr == '0' ? ( nopt ? '' : '1' ) : nr
+		let ur = !has_marked && md == 'r' ? 1 : ur
+	en
+	let mkd = values(has_marked ? s:marked : marked)
+	cal s:sanstail(join(s:prompt, ''))
+	cal s:PrtExit()
+	if nr == '0' || md == 'i'
+		retu map(mkd, "s:openfile('bad', v:val, '', 0)")
+	en
+	let tail = s:tail()
+	let [emptytail, bufnr] = [empty(tail), bufnr('^'.mkd[0].'$')]
+	let useb = bufnr > 0 && buflisted(bufnr) && emptytail
+	" Move to a replaceable window
+	let ncmd = ( useb ? ['b', 'bo vert sb'] : ['e', 'bo vne'] )
+		\ + ( ur ? [] : ['ignruw'] )
+	let fst = call('ctrlp#normcmd', ncmd)
+	" Check if the current window has a replaceable buffer
+	let repabl = !( md == 't' && !ur ) && empty(bufname('%')) && empty(&l:ft)
+	" Commands for the rest of the files
+	let [ic, cmds] = [1, { 'v': ['vert sb', 'vne'], 'h': ['sb', 'new'],
+		\ 't': ['tab sb', 'tabe'] }]
+	let [swb, &swb] = [&swb, '']
+	if md == 't' && ctrlp#tabcount() < tabpagenr()
+		let s:tabct = ctrlp#tabcount()
+	en
+	" Open the files
+	for va in mkd
+		let bufnr = bufnr('^'.va.'$')
+		if bufnr < 0 && getftype(va) == '' | con | en
+		let useb = bufnr > 0 && buflisted(bufnr) && emptytail
+		let snd = md != '' && has_key(cmds, md) ?
+			\ ( useb ? cmds[md][0] : cmds[md][1] ) : ( useb ? 'vert sb' : 'vne' )
+		let cmd = ic == 1 && ( !( !ur && fst =~ '^[eb]$' ) || repabl ) ? fst : snd
+		let conds = [( nr != '' && nr > 1 && nr < ic ) || ( nr == '' && ic > 1 ),
+			\ nr != '' && nr < ic]
+		if conds[nopt]
+			if !buflisted(bufnr) | cal s:openfile('bad', va, '', 0) | en
+		el
+			cal s:openfile(cmd, useb ? bufnr : va, tail, ic == 1)
+			if jf | if ic == 1
+				let crpos = [tabpagenr(), winnr()]
+			el
+				let crpos[0] += tabpagenr() <= crpos[0]
+				let crpos[1] += winnr() <= crpos[1]
+			en | en
+			let ic += 1
+		en
+	endfo
+	if jf && exists('crpos') && ic > 2
+		exe ( md == 't' ? 'tabn '.crpos[0] : crpos[1].'winc w' )
+	en
+	let &swb = swb
+	unl! s:tabct
+endf
+
+fu! s:OpenNoMarks(md, line)
+	if a:md == 'a'
+		let [s:marked, key] = [{}, 1]
+		for line in s:lines
+			let s:marked = extend(s:marked, { key : fnamemodify(line, ':p') })
+			let key += 1
+		endfo
+		cal s:remarksigns()
+		cal s:BuildPrompt(0)
+	elsei a:md == 'x'
+		let type = has_key(s:openfunc, 'arg_type') ? s:openfunc['arg_type'] : 'dict'
+		let argms = type == 'dict' ? [{ 'action': a:md, 'line': a:line }]
+			\ : [a:md, a:line]
+		cal call(s:openfunc[s:ctype], argms, s:openfunc)
+	elsei a:md == 'd'
+		let dir = fnamemodify(a:line, ':h')
+		if isdirectory(dir)
+			cal ctrlp#setdir(dir)
+			cal ctrlp#switchtype(0)
+			cal ctrlp#recordhist()
+			cal s:PrtClear()
+		en
+	en
+endf
+" ** Helper functions {{{1
+" Sorting {{{2
+fu! ctrlp#complen(...)
+	" By length
+	let [len1, len2] = [strlen(a:1), strlen(a:2)]
+	retu len1 == len2 ? 0 : len1 > len2 ? 1 : -1
+endf
+
+fu! s:compmatlen(...)
+	" By match length
+	let mln1 = s:shortest(s:matchlens(a:1, s:compat))
+	let mln2 = s:shortest(s:matchlens(a:2, s:compat))
+	retu mln1 == mln2 ? 0 : mln1 > mln2 ? 1 : -1
+endf
+
+fu! s:comptime(...)
+	" By last modified time
+	let [time1, time2] = [getftime(a:1), getftime(a:2)]
+	retu time1 == time2 ? 0 : time1 < time2 ? 1 : -1
+endf
+
+fu! s:compmreb(...)
+	" By last entered time (bufnr)
+	let [id1, id2] = [index(s:mrbs, a:1), index(s:mrbs, a:2)]
+	retu id1 == id2 ? 0 : id1 > id2 ? 1 : -1
+endf
+
+fu! s:compmref(...)
+	" By last entered time (MRU)
+	let [id1, id2] = [index(g:ctrlp_lines, a:1), index(g:ctrlp_lines, a:2)]
+	retu id1 == id2 ? 0 : id1 > id2 ? 1 : -1
+endf
+
+fu! s:comparent(...)
+	" By same parent dir
+	if !stridx(s:crfpath, s:dyncwd)
+		let [as1, as2] = [s:dyncwd.s:lash().a:1, s:dyncwd.s:lash().a:2]
+		let [loc1, loc2] = [s:getparent(as1), s:getparent(as2)]
+		if loc1 == s:crfpath && loc2 != s:crfpath | retu -1 | en
+		if loc2 == s:crfpath && loc1 != s:crfpath | retu 1  | en
+		retu 0
+	en
+	retu 0
+endf
+
+fu! s:compfnlen(...)
+	" By filename length
+	let len1 = strlen(split(a:1, s:lash)[-1])
+	let len2 = strlen(split(a:2, s:lash)[-1])
+	retu len1 == len2 ? 0 : len1 > len2 ? 1 : -1
+endf
+
+fu! s:matchlens(str, pat, ...)
+	if empty(a:pat) || index(['^', '$'], a:pat) >= 0 | retu {} | en
+	let st   = a:0 ? a:1 : 0
+	let lens = a:0 >= 2 ? a:2 : {}
+	let nr   = a:0 >= 3 ? a:3 : 0
+	if nr > 20 | retu {} | en
+	if match(a:str, a:pat, st) >= 0
+		let [mst, mnd] = [matchstr(a:str, a:pat, st), matchend(a:str, a:pat, st)]
+		let lens = extend(lens, { nr : [strlen(mst), mst] })
+		let lens = s:matchlens(a:str, a:pat, mnd, lens, nr + 1)
+	en
+	retu lens
+endf
+
+fu! s:shortest(lens)
+	retu min(map(values(a:lens), 'v:val[0]'))
+endf
+
+fu! s:mixedsort(...)
+	if s:itemtype == 1
+		let pat = '[\/]\?\[\d\+\*No Name\]$'
+		if a:1 =~# pat && a:2 =~# pat | retu 0
+		elsei a:1 =~# pat | retu 1
+		elsei a:2 =~# pat | retu -1 | en
+	en
+	let [cln, cml] = [ctrlp#complen(a:1, a:2), s:compmatlen(a:1, a:2)]
+	if s:ispath
+		let ms = []
+		if s:res_count < 21
+			let ms += [s:compfnlen(a:1, a:2)]
+			if s:itemtype !~ '^[12]$' | let ms += [s:comptime(a:1, a:2)] | en
+			if !s:itemtype | let ms += [s:comparent(a:1, a:2)] | en
+		en
+		if s:itemtype =~ '^[12]$'
+			let ms += [s:compmref(a:1, a:2)]
+			let cln = cml ? cln : 0
+		en
+		let ms += [cml, 0, 0, 0]
+		let mp = call('s:multipliers', ms[:3])
+		retu cln + ms[0] * mp[0] + ms[1] * mp[1] + ms[2] * mp[2] + ms[3] * mp[3]
+	en
+	retu cln + cml * 2
+endf
+
+fu! s:multipliers(...)
+	let mp0 = !a:1 ? 0 : 2
+	let mp1 = !a:2 ? 0 : 1 + ( !mp0 ? 1 : mp0 )
+	let mp2 = !a:3 ? 0 : 1 + ( !( mp0 + mp1 ) ? 1 : ( mp0 + mp1 ) )
+	let mp3 = !a:4 ? 0 : 1 + ( !( mp0 + mp1 + mp2 ) ? 1 : ( mp0 + mp1 + mp2 ) )
+	retu [mp0, mp1, mp2, mp3]
+endf
+
+fu! s:compval(...)
+	retu a:1 - a:2
+endf
+" Statusline {{{2
+fu! ctrlp#statusline()
+	if !exists('s:statypes')
+		let s:statypes = [
+			\ ['files', 'fil'],
+			\ ['buffers', 'buf'],
+			\ ['mru files', 'mru'],
+			\ ]
+		if !empty(g:ctrlp_ext_vars)
+			cal map(copy(g:ctrlp_ext_vars),
+				\ 'add(s:statypes, [ v:val["lname"], v:val["sname"] ])')
+		en
+	en
+	let tps = s:statypes
+	let max = len(tps) - 1
+	let nxt = tps[s:walker(max, s:itemtype,  1)][1]
+	let prv = tps[s:walker(max, s:itemtype, -1)][1]
+	let s:ctype = tps[s:itemtype][0]
+	let focus   = s:focus ? 'prt'  : 'win'
+	let byfname = s:ispath ? s:byfname ? 'file' : 'path' : 'line'
+	let marked  = s:opmul != '0' ?
+		\ exists('s:marked') ? ' <'.s:dismrk().'>' : ' <->' : ''
+	if s:status != {}
+		let argms =
+			\ has_key(s:status, 'arg_type') && s:status['arg_type'] == 'dict' ? [{
+			\ 'focus':   focus,
+			\ 'byfname': byfname,
+			\ 'regex':   s:regexp,
+			\ 'prev':    prv,
+			\ 'item':    s:ctype,
+			\ 'next':    nxt,
+			\ 'marked':  marked,
+			\ }] : [focus, byfname, s:regexp, prv, s:ctype, nxt, marked]
+		let &l:stl = call(s:status['main'], argms, s:status)
+	el
+		let item    = '%#CtrlPMode1# '.s:ctype.' %*'
+		let focus   = '%#CtrlPMode2# '.focus.' %*'
+		let byfname = '%#CtrlPMode1# '.byfname.' %*'
+		let regex   = s:regexp  ? '%#CtrlPMode2# regex %*' : ''
+		let slider  = ' <'.prv.'>={'.item.'}=<'.nxt.'>'
+		let dir     = ' %=%<%#CtrlPMode2# %{getcwd()} %*'
+		let &l:stl  = focus.byfname.regex.slider.marked.dir
+	en
+endf
+
+fu! s:dismrk()
+	retu has('signs') ? len(s:marked) :
+		\ '%<'.join(values(map(copy(s:marked), 'split(v:val, "[\\/]")[-1]')), ', ')
+endf
+
+fu! ctrlp#progress(enum, ...)
+	if has('macunix') || has('mac') | sl 1m | en
+	let txt = a:0 ? '(press ctrl-c to abort)' : ''
+	if s:status != {}
+		let argms = has_key(s:status, 'arg_type') && s:status['arg_type'] == 'dict'
+			\ ? [{ 'str': a:enum }] : [a:enum]
+		let &l:stl = call(s:status['prog'], argms, s:status)
+	el
+		let &l:stl = '%#CtrlPStats# '.a:enum.' %* '.txt.'%=%<%#CtrlPMode2# %{getcwd()} %*'
+	en
+	redraws
+endf
+" *** Paths {{{2
+" Line formatting {{{3
+fu! s:formatline(str)
+	let str = a:str
+	if s:itemtype == 1
+		let filpath = fnamemodify(str, ':p')
+		let bufnr = s:nonamecond(str, filpath)
+			\ ? str2nr(matchstr(str, '[\/]\?\[\zs\d\+\ze\*No Name\]$'))
+			\ : bufnr('^'.filpath.'$')
+		let idc = ( bufnr == bufnr('#') ? '#' : '' )
+			\ . ( getbufvar(bufnr, '&ma') ? '' : '-' )
+			\ . ( getbufvar(bufnr, '&ro') ? '=' : '' )
+			\ . ( getbufvar(bufnr, '&mod') ? '+' : '' )
+		let str .= idc != '' ? ' '.idc : ''
+	en
+	let cond = s:ispath && ( s:winw - 4 ) < s:strwidth(str)
+	retu '> '.( cond ? s:pathshorten(str) : str )
+endf
+
+fu! s:pathshorten(str)
+	retu matchstr(a:str, '^.\{9}').'...'
+		\ .matchstr(a:str, '.\{'.( s:winw - 16 ).'}$')
+endf
+
+fu! s:offset(lines, height)
+	let s:offset = s:mw_order == 'btt' ? ( a:height - s:res_count ) : 0
+	retu s:offset > 0 ? ( repeat([''], s:offset) + a:lines ) : a:lines
+endf
+" Directory completion {{{3
+fu! s:dircompl(be, sd)
+	if a:sd == '' | retu [] | en
+	if a:be == ''
+		let [be, sd] = [s:dyncwd, a:sd]
+	el
+		let be = a:be.s:lash(a:be)
+		let sd = be.a:sd
+	en
+	let dirs = split(globpath(s:fnesc(be, 'g', ','), a:sd.'*/'), "\n")
+	if a:be == ''
+		let dirs = ctrlp#rmbasedir(dirs)
+	en
+	cal filter(dirs, '!match(v:val, escape(sd, ''~$.\''))'
+		\ . ' && v:val !~ ''\v(^|[\/])\.{1,2}[\/]$''')
+	retu dirs
+endf
+
+fu! s:findcommon(items, seed)
+	let [items, id, cmn, ic] = [copy(a:items), strlen(a:seed), '', 0]
+	cal map(items, 'strpart(v:val, id)')
+	for char in split(items[0], '\zs')
+		for item in items[1:]
+			if item[ic] != char | let brk = 1 | brea | en
+		endfo
+		if exists('brk') | brea | en
+		let cmn .= char
+		let ic += 1
+	endfo
+	retu cmn
+endf
+" Misc {{{3
+fu! s:headntail(str)
+	let parts = split(a:str, '[\/]\ze[^\/]\+[\/:]\?$')
+	retu len(parts) == 1 ? ['', parts[0]] : len(parts) == 2 ? parts : []
+endf
+
+fu! s:lash(...)
+	retu ( a:0 ? a:1 : s:dyncwd ) !~ '[\/]$' ? s:lash : ''
+endf
+
+fu! s:ispathitem()
+	retu s:itemtype < 3 || ( s:itemtype > 2 && s:getextvar('type') == 'path' )
+endf
+
+fu! ctrlp#igncwd(cwd)
+	retu ctrlp#utils#glob(a:cwd, 0) == '' ||
+		\ ( s:igntype >= 0 && s:usrign(a:cwd, getftype(a:cwd)) )
+endf
+
+fu! ctrlp#dirnfile(entries)
+	let [items, cwd] = [[[], []], s:dyncwd.s:lash()]
+	for each in a:entries
+		let etype = getftype(each)
+		if s:igntype >= 0 && s:usrign(each, etype) | con | en
+		if etype == 'dir'
+			if s:showhidden | if each !~ '[\/]\.\{1,2}$'
+				cal add(items[0], each)
+			en | el
+				cal add(items[0], each)
+			en
+		elsei etype == 'link'
+			if s:folsym
+				let isfile = !isdirectory(each)
+				if s:folsym == 2 || !s:samerootsyml(each, isfile, cwd)
+					cal add(items[isfile], each)
+				en
+			en
+		elsei etype == 'file'
+			cal add(items[1], each)
+		en
+	endfo
+	retu items
+endf
+
+fu! s:usrign(item, type)
+	retu s:igntype == 1 ? a:item =~ s:usrign
+		\ : s:igntype == 4 && has_key(s:usrign, a:type) && s:usrign[a:type] != ''
+		\ ? a:item =~ s:usrign[a:type] : 0
+endf
+
+fu! s:samerootsyml(each, isfile, cwd)
+	let resolve = fnamemodify(resolve(a:each), ':p:h')
+	let resolve .= s:lash(resolve)
+	retu !( stridx(resolve, a:cwd) && ( stridx(a:cwd, resolve) || a:isfile ) )
+endf
+
+fu! ctrlp#rmbasedir(items)
+	let cwd = s:dyncwd.s:lash()
+	if a:items != [] && !stridx(a:items[0], cwd)
+		let idx = strlen(cwd)
+		retu map(a:items, 'strpart(v:val, idx)')
+	en
+	retu a:items
+endf
+" Working directory {{{3
+fu! s:getparent(item)
+	let parent = substitute(a:item, '[\/][^\/]\+[\/:]\?$', '', '')
+	if parent == '' || parent !~ '[\/]'
+		let parent .= s:lash
+	en
+	retu parent
+endf
+
+fu! s:findroot(curr, mark, depth, type)
+	let [depth, fnd] = [a:depth + 1, 0]
+	if type(a:mark) == 1
+		let fnd = s:glbpath(s:fnesc(a:curr, 'g', ','), a:mark, 1) != ''
+	elsei type(a:mark) == 3
+		for markr in a:mark
+			if s:glbpath(s:fnesc(a:curr, 'g', ','), markr, 1) != ''
+				let fnd = 1
+				brea
+			en
+		endfo
+	en
+	if fnd
+		if !a:type | cal ctrlp#setdir(a:curr) | en
+		retu [exists('markr') ? markr : a:mark, a:curr]
+	elsei depth > s:maxdepth
+		cal ctrlp#setdir(s:cwd)
+	el
+		let parent = s:getparent(a:curr)
+		if parent != a:curr
+			retu s:findroot(parent, a:mark, depth, a:type)
+		en
+	en
+	retu []
+endf
+
+fu! ctrlp#setdir(path, ...)
+	let cmd = a:0 ? a:1 : 'lc!'
+	sil! exe cmd s:fnesc(a:path, 'c')
+	let [s:crfilerel, s:dyncwd] = [fnamemodify(s:crfile, ':.'), getcwd()]
+endf
+" Fallbacks {{{3
+fu! s:glbpath(...)
+	retu call('ctrlp#utils#globpath', a:000)
+endf
+
+fu! s:fnesc(...)
+	retu call('ctrlp#utils#fnesc', a:000)
+endf
+
+fu! ctrlp#setlcdir()
+	if exists('*haslocaldir')
+		cal ctrlp#setdir(getcwd(), haslocaldir() ? 'lc!' : 'cd!')
+	en
+endf
+" Highlighting {{{2
+fu! ctrlp#syntax()
+	if ctrlp#nosy() | retu | en
+	for [ke, va] in items(s:hlgrps) | cal ctrlp#hicheck('CtrlP'.ke, va) | endfo
+	if synIDattr(synIDtrans(hlID('Normal')), 'bg') !~ '^-1$\|^$'
+		sil! exe 'hi CtrlPLinePre '.( has("gui_running") ? 'gui' : 'cterm' ).'fg=bg'
+	en
+	sy match CtrlPNoEntries '^ == NO ENTRIES ==$'
+	if hlexists('CtrlPLinePre')
+		sy match CtrlPLinePre '^>'
+	en
+endf
+
+fu! s:highlight(pat, grp)
+	if s:matcher != {} | retu | en
+	cal clearmatches()
+	if !empty(a:pat) && s:ispath
+		let pat = s:regexp ? substitute(a:pat, '\\\@<!\^', '^> \\zs', 'g') : a:pat
+		if s:byfname
+			let pat = substitute(pat, '\[\^\(.\{-}\)\]\\{-}', '[^\\/\1]\\{-}', 'g')
+			let pat = substitute(pat, '\$\@<!$', '\\ze[^\\/]*$', 'g')
+		en
+		cal matchadd(a:grp, ( s:martcs == '' ? '\c' : '\C' ).pat)
+		cal matchadd('CtrlPLinePre', '^>')
+	en
+endf
+
+fu! s:dohighlight()
+	retu s:mathi[0] && exists('*clearmatches') && !ctrlp#nosy()
+endf
+" Prompt history {{{2
+fu! s:gethistloc()
+	let utilcadir = ctrlp#utils#cachedir()
+	let cache_dir = utilcadir.s:lash(utilcadir).'hist'
+	retu [cache_dir, cache_dir.s:lash(cache_dir).'cache.txt']
+endf
+
+fu! s:gethistdata()
+	retu ctrlp#utils#readfile(s:gethistloc()[1])
+endf
+
+fu! ctrlp#recordhist()
+	let str = join(s:prompt, '')
+	if empty(str) || !s:maxhst | retu | en
+	let hst = s:hstry
+	if len(hst) > 1 && hst[1] == str | retu | en
+	cal extend(hst, [str], 1)
+	if len(hst) > s:maxhst | cal remove(hst, s:maxhst, -1) | en
+	cal ctrlp#utils#writecache(hst, s:gethistloc()[0], s:gethistloc()[1])
+endf
+" Signs {{{2
+fu! s:unmarksigns()
+	if !s:dosigns() | retu | en
+	for key in keys(s:marked)
+		exe 'sign unplace' key 'buffer='.s:bufnr
+	endfo
+endf
+
+fu! s:remarksigns()
+	if !s:dosigns() | retu | en
+	for ic in range(1, len(s:lines))
+		let line = s:ispath ? fnamemodify(s:lines[ic - 1], ':p') : s:lines[ic - 1]
+		let key = s:dictindex(s:marked, line)
+		if key > 0
+			exe 'sign place' key 'line='.ic.' name=ctrlpmark buffer='.s:bufnr
+		en
+	endfo
+endf
+
+fu! s:dosigns()
+	retu exists('s:marked') && s:bufnr > 0 && s:opmul != '0' && has('signs')
+endf
+" Lists & Dictionaries {{{2
+fu! s:ifilter(list, str)
+	let [rlist, estr] = [[], substitute(a:str, 'v:val', 'each', 'g')]
+	for each in a:list
+		try
+			if eval(estr)
+				cal add(rlist, each)
+			en
+		cat | con | endt
+	endfo
+	retu rlist
+endf
+
+fu! s:dictindex(dict, expr)
+	for key in keys(a:dict)
+		if a:dict[key] == a:expr | retu key | en
+	endfo
+	retu -1
+endf
+
+fu! s:vacantdict(dict)
+	retu filter(range(1, max(keys(a:dict))), '!has_key(a:dict, v:val)')
+endf
+
+fu! s:sublist(l, s, e)
+	retu v:version > 701 ? a:l[(a:s):(a:e)] : s:sublist7071(a:l, a:s, a:e)
+endf
+
+fu! s:sublist7071(l, s, e)
+	let [newlist, id, ae] = [[], a:s, a:e == -1 ? len(a:l) - 1 : a:e]
+	wh id <= ae
+		cal add(newlist, get(a:l, id))
+		let id += 1
+	endw
+	retu newlist
+endf
+" Buffers {{{2
+fu! s:buftab(bufnr, md)
+	for tabnr in range(1, tabpagenr('$'))
+		if tabpagenr() == tabnr && a:md == 't' | con | en
+		let buflist = tabpagebuflist(tabnr)
+		if index(buflist, a:bufnr) >= 0
+			for winnr in range(1, tabpagewinnr(tabnr, '$'))
+				if buflist[winnr - 1] == a:bufnr | retu [tabnr, winnr] | en
+			endfo
+		en
+	endfo
+	retu [0, 0]
+endf
+
+fu! s:bufwins(bufnr)
+	let winns = 0
+	for tabnr in range(1, tabpagenr('$'))
+		let winns += count(tabpagebuflist(tabnr), a:bufnr)
+	endfo
+	retu winns
+endf
+
+fu! s:nonamecond(str, filpath)
+	retu a:str =~ '[\/]\?\[\d\+\*No Name\]$' && !filereadable(a:filpath)
+		\ && bufnr('^'.a:filpath.'$') < 1
+endf
+
+fu! ctrlp#normcmd(cmd, ...)
+	if a:0 < 2 && s:nosplit() | retu a:cmd | en
+	let norwins = filter(range(1, winnr('$')),
+		\ 'empty(getbufvar(winbufnr(v:val), "&bt"))')
+	for each in norwins
+		let bufnr = winbufnr(each)
+		if empty(bufname(bufnr)) && empty(getbufvar(bufnr, '&ft'))
+			let fstemp = each | brea
+		en
+	endfo
+	let norwin = empty(norwins) ? 0 : norwins[0]
+	if norwin
+		if index(norwins, winnr()) < 0
+			exe ( exists('fstemp') ? fstemp : norwin ).'winc w'
+		en
+		retu a:cmd
+	en
+	retu a:0 ? a:1 : 'bo vne'
+endf
+
+fu! ctrlp#modfilecond(w)
+	retu &mod && !&hid && &bh != 'hide' && s:bufwins(bufnr('%')) == 1 && !&cf &&
+		\ ( ( !&awa && a:w ) || filewritable(fnamemodify(bufname('%'), ':p')) != 1 )
+endf
+
+fu! s:nosplit()
+	retu !empty(s:nosplit) && match([bufname('%'), &l:ft, &l:bt], s:nosplit) >= 0
+endf
+
+fu! s:setupblank()
+	setl noswf nonu nobl nowrap nolist nospell nocuc wfh
+	setl fdc=0 fdl=99 tw=0 bt=nofile bh=unload
+	if v:version > 702
+		setl nornu noudf cc=0
+	en
+endf
+
+fu! s:leavepre()
+	if exists('s:bufnr') && s:bufnr == bufnr('%') | bw! | en
+	if !( exists(s:ccex) && !{s:ccex} )
+		\ && !( has('clientserver') && len(split(serverlist(), "\n")) > 1 )
+		cal ctrlp#clra()
+	en
+endf
+
+fu! s:checkbuf()
+	if !exists('s:init') && exists('s:bufnr') && s:bufnr > 0
+		exe s:bufnr.'bw!'
+	en
+endf
+
+fu! s:iscmdwin()
+	let ermsg = v:errmsg
+	sil! noa winc p
+	sil! noa winc p
+	let [v:errmsg, ermsg] = [ermsg, v:errmsg]
+	retu ermsg =~ '^E11:'
+endf
+" Arguments {{{2
+fu! s:at(str)
+	if a:str =~ '\v^\@(cd|lc[hd]?|chd).*'
+		let str = substitute(a:str, '\v^\@(cd|lc[hd]?|chd)\s*', '', '')
+		if str == '' | retu 1 | en
+		let str = str =~ '^%:.\+' ? fnamemodify(s:crfile, str[1:]) : str
+		let path = fnamemodify(expand(str, 1), ':p')
+		if isdirectory(path)
+			if path != s:dyncwd
+				cal ctrlp#setdir(path)
+				cal ctrlp#setlines()
+			en
+			cal ctrlp#recordhist()
+			cal s:PrtClear()
+		en
+		retu 1
+	en
+	retu 0
+endf
+
+fu! s:tail()
+	if exists('s:optail') && !empty('s:optail')
+		let tailpref = s:optail !~ '^\s*+' ? ' +' : ' '
+		retu tailpref.s:optail
+	en
+	retu ''
+endf
+
+fu! s:sanstail(str)
+	let str = s:spi ?
+		\ substitute(a:str, '^\(@.*$\|\\\\\ze@\|\.\.\zs[.\/]\+$\)', '', 'g') : a:str
+	let [str, pat] = [substitute(str, '\\\\', '\', 'g'), '\([^:]\|\\:\)*$']
+	unl! s:optail
+	if str =~ '\\\@<!:'.pat
+		let s:optail = matchstr(str, '\\\@<!:\zs'.pat)
+		let str = substitute(str, '\\\@<!:'.pat, '', '')
+	en
+	retu substitute(str, '\\\ze:', '', 'g')
+endf
+
+fu! s:argmaps(md, i)
+	let roh = [
+		\ ['Open Multiple Files', '/h[i]dden/[c]lear', ['i', 'c']],
+		\ ['Create a New File', '/[r]eplace', ['r']],
+		\ ['Open Selected', '/[r]eplace', ['r', 'd', 'a']],
+		\ ]
+	if a:i == 2
+		if !buflisted(bufnr('^'.fnamemodify(ctrlp#getcline(), ':p').'$'))
+			let roh[2][1] .= '/h[i]dden'
+			let roh[2][2] += ['i']
+		en
+		if s:openfunc != {} && has_key(s:openfunc, s:ctype)
+			let roh[2][1] .= '/e[x]ternal'
+			let roh[2][2] += ['x']
+		en
+	en
+	let str = roh[a:i][0].': [t]ab/[v]ertical/[h]orizontal'.roh[a:i][1].'? '
+	retu s:choices(str, ['t', 'v', 'h'] + roh[a:i][2], 's:argmaps', [a:md, a:i])
+endf
+
+fu! s:insertstr()
+	let str = 'Insert: c[w]ord/c[f]ile/[s]earch/[v]isual/[c]lipboard/[r]egister? '
+	retu s:choices(str, ['w', 'f', 's', 'v', 'c', 'r'], 's:insertstr', [])
+endf
+
+fu! s:textdialog(str)
+	redr | echoh MoreMsg | echon a:str | echoh None
+	retu nr2char(getchar())
+endf
+
+fu! s:choices(str, choices, func, args)
+	let char = s:textdialog(a:str)
+	if index(a:choices, char) >= 0
+		retu char
+	elsei char =~# "\\v\<Esc>|\<C-c>|\<C-g>|\<C-u>|\<C-w>|\<C-[>"
+		cal s:BuildPrompt(0)
+		retu 'cancel'
+	elsei char =~# "\<CR>" && a:args != []
+		retu a:args[0]
+	en
+	retu call(a:func, a:args)
+endf
+
+fu! s:getregs()
+	let char = s:textdialog('Insert from register: ')
+	if char =~# "\\v\<Esc>|\<C-c>|\<C-g>|\<C-u>|\<C-w>|\<C-[>"
+		cal s:BuildPrompt(0)
+		retu -1
+	elsei char =~# "\<CR>"
+		retu s:getregs()
+	en
+	retu s:regisfilter(char)
+endf
+
+fu! s:regisfilter(reg)
+	retu substitute(getreg(a:reg), "[\t\n]", ' ', 'g')
+endf
+" Misc {{{2
+fu! s:modevar()
+	let s:matchtype = s:mtype()
+	let s:ispath = s:ispathitem()
+	let s:mfunc = s:mfunc()
+	let s:nolim = s:getextvar('nolim')
+	let s:dosort = s:getextvar('sort')
+	let s:spi = !s:itemtype || s:getextvar('specinput') > 0
+endf
+
+fu! s:nosort()
+	retu s:matcher != {} || s:nolim == 1 || ( s:itemtype == 2 && s:mrudef )
+		\ || ( s:itemtype =~ '\v^(1|2)$' && s:prompt == ['', '', ''] ) || !s:dosort
+endf
+
+fu! s:byfname()
+	retu s:ispath && s:byfname
+endf
+
+fu! s:narrowable()
+	retu exists('s:act_add') && exists('s:matched') && s:matched != []
+		\ && exists('s:mdata') && s:mdata[:2] == [s:dyncwd, s:itemtype, s:regexp]
+		\ && s:matcher == {} && !exists('s:did_exp')
+endf
+
+fu! s:getinput(...)
+	let [prt, spi] = [s:prompt, ( a:0 ? a:1 : '' )]
+	if s:abbrev != {}
+		let gmd = has_key(s:abbrev, 'gmode') ? s:abbrev['gmode'] : ''
+		let str = ( gmd =~ 't' && !a:0 ) || spi == 'c' ? prt[0] : join(prt, '')
+		if gmd =~ 't' && gmd =~ 'k' && !a:0 && matchstr(str, '.$') =~ '\k'
+			retu join(prt, '')
+		en
+		let [pf, rz] = [( s:byfname() ? 'f' : 'p' ), ( s:regexp ? 'r' : 'z' )]
+		for dict in s:abbrev['abbrevs']
+			let dmd = has_key(dict, 'mode') ? dict['mode'] : ''
+			let pat = escape(dict['pattern'], '~')
+			if ( dmd == '' || ( dmd =~ pf && dmd =~ rz && !a:0 )
+				\ || dmd =~ '['.spi.']' ) && str =~ pat
+				let [str, s:did_exp] = [join(split(str, pat, 1), dict['expanded']), 1]
+			en
+		endfo
+		if gmd =~ 't' && !a:0
+			let prt[0] = str
+		el
+			retu str
+		en
+	en
+	retu spi == 'c' ? prt[0] : join(prt, '')
+endf
+
+fu! s:migemo(str)
+	let [str, rtp] = [a:str, s:fnesc(&rtp, 'g')]
+	let dict = s:glbpath(rtp, printf("dict/%s/migemo-dict", &enc), 1)
+	if !len(dict)
+		let dict = s:glbpath(rtp, "dict/migemo-dict", 1)
+	en
+	if len(dict)
+		let [tokens, str, cmd] = [split(str, '\s'), '', 'cmigemo -v -w %s -d %s']
+		for token in tokens
+			let rtn = system(printf(cmd, shellescape(token), shellescape(dict)))
+			let str .= !v:shell_error && strlen(rtn) > 0 ? '.*'.rtn : token
+		endfo
+	en
+	retu str
+endf
+
+fu! s:strwidth(str)
+	retu exists('*strdisplaywidth') ? strdisplaywidth(a:str) : strlen(a:str)
+endf
+
+fu! ctrlp#j2l(nr)
+	exe 'norm!' a:nr.'G'
+	sil! norm! zvzz
+endf
+
+fu! s:maxf(len)
+	retu s:maxfiles && a:len > s:maxfiles
+endf
+
+fu! s:regexfilter(str)
+	let str = a:str
+	for key in keys(s:fpats) | if str =~ key
+		let str = substitute(str, s:fpats[key], '', 'g')
+	en | endfo
+	retu str
+endf
+
+fu! s:walker(m, p, d)
+	retu a:d >= 0 ? a:p < a:m ? a:p + a:d : 0 : a:p > 0 ? a:p + a:d : a:m
+endf
+
+fu! s:delent(rfunc)
+	if a:rfunc == '' | retu | en
+	let [s:force, tbrem] = [1, []]
+	if exists('s:marked')
+		let tbrem = values(s:marked)
+		cal s:unmarksigns()
+		unl s:marked
+	en
+	if tbrem == [] && ( has('dialog_gui') || has('dialog_con') ) &&
+		\ confirm("Wipe all entries?", "&OK\n&Cancel") != 1
+		unl s:force
+		cal s:BuildPrompt(0)
+		retu
+	en
+	let g:ctrlp_lines = call(a:rfunc, [tbrem])
+	cal s:BuildPrompt(1)
+	unl s:force
+endf
+" Entering & Exiting {{{2
+fu! s:getenv()
+	let [s:cwd, s:winres] = [getcwd(), [winrestcmd(), &lines, winnr('$')]]
+	let [s:crword, s:crnbword] = [expand('<cword>', 1), expand('<cWORD>', 1)]
+	let [s:crgfile, s:crline] = [expand('<cfile>', 1), getline('.')]
+	let [s:winmaxh, s:crcursor] = [min([s:mw_max, &lines]), getpos('.')]
+	let [s:crbufnr, s:crvisual] = [bufnr('%'), s:lastvisual()]
+	let s:crfile = bufname('%') == ''
+		\ ? '['.s:crbufnr.'*No Name]' : expand('%:p', 1)
+	let s:crfpath = expand('%:p:h', 1)
+	let s:mrbs = ctrlp#mrufiles#bufs()
+endf
+
+fu! s:lastvisual()
+	let cview = winsaveview()
+	let [ovreg, ovtype] = [getreg('v'), getregtype('v')]
+	let [oureg, outype] = [getreg('"'), getregtype('"')]
+	sil! norm! gv"vy
+	let selected = s:regisfilter('v')
+	cal setreg('v', ovreg, ovtype)
+	cal setreg('"', oureg, outype)
+	cal winrestview(cview)
+	retu selected
+endf
+
+fu! s:log(m)
+	if exists('g:ctrlp_log') && g:ctrlp_log | if a:m
+		let cadir = ctrlp#utils#cachedir()
+		let apd = g:ctrlp_log > 1 ? '>' : ''
+		sil! exe 'redi! >'.apd cadir.s:lash(cadir).'ctrlp.log'
+	el
+		sil! redi END
+	en | en
+endf
+
+fu! s:buffunc(e)
+	if a:e && has_key(s:buffunc, 'enter')
+		cal call(s:buffunc['enter'], [], s:buffunc)
+	elsei !a:e && has_key(s:buffunc, 'exit')
+		cal call(s:buffunc['exit'], [], s:buffunc)
+	en
+endf
+
+fu! s:openfile(cmd, fid, tail, chkmod, ...)
+	let cmd = a:cmd
+	if a:chkmod && cmd =~ '^[eb]$' && ctrlp#modfilecond(!( cmd == 'b' && &aw ))
+		let cmd = cmd == 'b' ? 'sb' : 'sp'
+	en
+	let cmd = cmd =~ '^tab' ? ctrlp#tabcount().cmd : cmd
+	let j2l = a:0 && a:1[0] ? a:1[1] : 0
+	exe cmd.( a:0 && a:1[0] ? '' : a:tail ) s:fnesc(a:fid, 'f')
+	if j2l
+		cal ctrlp#j2l(j2l)
+	en
+	if !empty(a:tail)
+		sil! norm! zvzz
+	en
+	if cmd != 'bad'
+		cal ctrlp#setlcdir()
+	en
+endf
+
+fu! ctrlp#tabcount()
+	if exists('s:tabct')
+		let tabct = s:tabct
+		let s:tabct += 1
+	elsei !type(s:tabpage)
+		let tabct = s:tabpage
+	elsei type(s:tabpage) == 1
+		let tabpos =
+			\ s:tabpage =~ 'c' ? tabpagenr() :
+			\ s:tabpage =~ 'f' ? 1 :
+			\ s:tabpage =~ 'l' ? tabpagenr('$') :
+			\ tabpagenr()
+		let tabct =
+			\ s:tabpage =~ 'a' ? tabpos :
+			\ s:tabpage =~ 'b' ? tabpos - 1 :
+			\ tabpos
+	en
+	retu tabct < 0 ? 0 : tabct
+endf
+
+fu! s:settype(type)
+	retu a:type < 0 ? exists('s:itemtype') ? s:itemtype : 0 : a:type
+endf
+" Matching {{{2
+fu! s:matchfname(item, pat)
+	let parts = split(a:item, '[\/]\ze[^\/]\+$')
+	let mfn = match(parts[-1], a:pat[0])
+	retu len(a:pat) == 1 ? mfn : len(a:pat) == 2 ?
+		\ ( mfn >= 0 && ( len(parts) == 2 ? match(parts[0], a:pat[1]) : -1 ) >= 0
+		\ ? 0 : -1 ) : -1
+	en
+endf
+
+fu! s:matchtabs(item, pat)
+	retu match(split(a:item, '\t\+')[0], a:pat)
+endf
+
+fu! s:matchtabe(item, pat)
+	retu match(split(a:item, '\t\+[^\t]\+$')[0], a:pat)
+endf
+
+fu! s:buildpat(lst)
+	let pat = a:lst[0]
+	for item in range(1, len(a:lst) - 1)
+		let pat .= '[^'.a:lst[item - 1].']\{-}'.a:lst[item]
+	endfo
+	retu pat
+endf
+
+fu! s:mfunc()
+	let mfunc = 'match'
+	if s:byfname()
+		let mfunc = 's:matchfname'
+	elsei s:itemtype > 2
+		let matchtypes = { 'tabs': 's:matchtabs', 'tabe': 's:matchtabe' }
+		if has_key(matchtypes, s:matchtype)
+			let mfunc = matchtypes[s:matchtype]
+		en
+	en
+	retu mfunc
+endf
+
+fu! s:mmode()
+	let matchmodes = {
+		\ 'match': 'full-line',
+		\ 's:matchfname': 'filename-only',
+		\ 's:matchtabs': 'first-non-tab',
+		\ 's:matchtabe': 'until-last-tab',
+		\ }
+	retu matchmodes[s:mfunc]
+endf
+" Cache {{{2
+fu! s:writecache(cafile)
+	if ( g:ctrlp_newcache || !filereadable(a:cafile) ) && !s:nocache()
+		cal ctrlp#utils#writecache(g:ctrlp_allfiles)
+		let g:ctrlp_newcache = 0
+	en
+endf
+
+fu! s:nocache(...)
+	if !s:caching
+		retu 1
+	elsei s:caching > 1
+		if !( exists(s:ccex) && !{s:ccex} ) || has_key(s:ficounts, s:dyncwd)
+			retu get(s:ficounts, s:dyncwd, [0, 0])[0] < s:caching
+		elsei a:0 && filereadable(a:1)
+			retu len(ctrlp#utils#readfile(a:1)) < s:caching
+		en
+		retu 1
+	en
+	retu 0
+endf
+
+fu! s:insertcache(str)
+	let [data, g:ctrlp_newcache, str] = [g:ctrlp_allfiles, 1, a:str]
+	if data == [] || strlen(str) <= strlen(data[0])
+		let pos = 0
+	elsei strlen(str) >= strlen(data[-1])
+		let pos = len(data) - 1
+	el
+		let pos = 0
+		for each in data
+			if strlen(each) > strlen(str) | brea | en
+			let pos += 1
+		endfo
+	en
+	cal insert(data, str, pos)
+	cal s:writecache(ctrlp#utils#cachefile())
+endf
+" Extensions {{{2
+fu! s:mtype()
+	retu s:itemtype > 2 ? s:getextvar('type') : 'path'
+endf
+
+fu! s:execextvar(key)
+	if !empty(g:ctrlp_ext_vars)
+		cal map(filter(copy(g:ctrlp_ext_vars),
+			\ 'has_key(v:val, a:key)'), 'eval(v:val[a:key])')
+	en
+endf
+
+fu! s:getextvar(key)
+	if s:itemtype > 2
+		let vars = g:ctrlp_ext_vars[s:itemtype - 3]
+		retu has_key(vars, a:key) ? vars[a:key] : -1
+	en
+	retu -1
+endf
+
+fu! ctrlp#getcline()
+	let [linenr, offset] = [line('.'), ( s:offset > 0 ? s:offset : 0 )]
+	retu !empty(s:lines) && !( offset && linenr <= offset )
+		\ ? s:lines[linenr - 1 - offset] : ''
+endf
+
+fu! ctrlp#getmarkedlist()
+	retu exists('s:marked') ? values(s:marked) : []
+endf
+
+fu! ctrlp#exit()
+	cal s:PrtExit()
+endf
+
+fu! ctrlp#prtclear()
+	cal s:PrtClear()
+endf
+
+fu! ctrlp#switchtype(id)
+	cal s:ToggleType(a:id - s:itemtype)
+endf
+
+fu! ctrlp#nosy()
+	retu !( has('syntax') && exists('g:syntax_on') )
+endf
+
+fu! ctrlp#hicheck(grp, defgrp)
+	if !hlexists(a:grp)
+		exe 'hi link' a:grp a:defgrp
+	en
+endf
+
+fu! ctrlp#call(func, ...)
+	retu call(a:func, a:000)
+endf
+
+fu! ctrlp#getvar(var)
+	retu {a:var}
+endf
+"}}}1
+" * Initialization {{{1
+fu! ctrlp#setlines(...)
+	if a:0 | let s:itemtype = a:1 | en
+	cal s:modevar()
+	let types = ['ctrlp#files()', 'ctrlp#buffers()', 'ctrlp#mrufiles#list()']
+	if !empty(g:ctrlp_ext_vars)
+		cal map(copy(g:ctrlp_ext_vars), 'add(types, v:val["init"])')
+	en
+	let g:ctrlp_lines = eval(types[s:itemtype])
+endf
+
+fu! ctrlp#init(type, ...)
+	if exists('s:init') || s:iscmdwin() | retu | en
+	let [s:ermsg, v:errmsg] = [v:errmsg, '']
+	let [s:matches, s:init] = [1, 1]
+	cal s:Reset(a:0 ? a:1 : {})
+	noa cal s:Open()
+	cal s:SetWD(a:0 ? a:1 : {})
+	cal s:MapNorms()
+	cal s:MapSpecs()
+	cal ctrlp#syntax()
+	cal ctrlp#setlines(s:settype(a:type))
+	cal s:SetDefTxt()
+	cal s:BuildPrompt(1)
+	if s:keyloop | cal s:KeyLoop() | en
+endf
+" - Autocmds {{{1
+if has('autocmd')
+	aug CtrlPAug
+		au!
+		au BufEnter ControlP cal s:checkbuf()
+		au BufLeave ControlP noa cal s:Close()
+		au VimLeavePre * cal s:leavepre()
+	aug END
+en
+
+fu! s:autocmds()
+	if !has('autocmd') | retu | en
+	if exists('#CtrlPLazy')
+		au! CtrlPLazy
+	en
+	if s:lazy
+		aug CtrlPLazy
+			au!
+			au CursorHold ControlP cal s:ForceUpdate()
+		aug END
+	en
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/bookmarkdir.vim b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/bookmarkdir.vim
new file mode 100644
index 0000000..89bda89
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/bookmarkdir.vim
@@ -0,0 +1,140 @@
+" =============================================================================
+" File:          autoload/ctrlp/bookmarkdir.vim
+" Description:   Bookmarked directories extension
+" Author:        Kien Nguyen <github.com/kien>
+" =============================================================================
+
+" Init {{{1
+if exists('g:loaded_ctrlp_bookmarkdir') && g:loaded_ctrlp_bookmarkdir
+	fini
+en
+let g:loaded_ctrlp_bookmarkdir = 1
+
+cal add(g:ctrlp_ext_vars, {
+	\ 'init': 'ctrlp#bookmarkdir#init()',
+	\ 'accept': 'ctrlp#bookmarkdir#accept',
+	\ 'lname': 'bookmarked dirs',
+	\ 'sname': 'bkd',
+	\ 'type': 'tabs',
+	\ 'opmul': 1,
+	\ 'nolim': 1,
+	\ 'wipe': 'ctrlp#bookmarkdir#remove',
+	\ })
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+" Utilities {{{1
+fu! s:getinput(str, ...)
+	echoh Identifier
+	cal inputsave()
+	let input = call('input', a:0 ? [a:str] + a:000 : [a:str])
+	cal inputrestore()
+	echoh None
+	retu input
+endf
+
+fu! s:cachefile()
+	if !exists('s:cadir') || !exists('s:cafile')
+		let s:cadir = ctrlp#utils#cachedir().ctrlp#utils#lash().'bkd'
+		let s:cafile = s:cadir.ctrlp#utils#lash().'cache.txt'
+	en
+	retu s:cafile
+endf
+
+fu! s:writecache(lines)
+	cal ctrlp#utils#writecache(a:lines, s:cadir, s:cafile)
+endf
+
+fu! s:getbookmarks()
+	retu ctrlp#utils#readfile(s:cachefile())
+endf
+
+fu! s:savebookmark(name, cwd)
+	let cwds = exists('+ssl') ? [tr(a:cwd, '\', '/'), tr(a:cwd, '/', '\')] : [a:cwd]
+	let entries = filter(s:getbookmarks(), 'index(cwds, s:parts(v:val)[1]) < 0')
+	cal s:writecache(insert(entries, a:name.'	'.a:cwd))
+endf
+
+fu! s:setentries()
+	let time = getftime(s:cachefile())
+	if !( exists('s:bookmarks') && time == s:bookmarks[0] )
+		let s:bookmarks = [time, s:getbookmarks()]
+	en
+endf
+
+fu! s:parts(str)
+	let mlist = matchlist(a:str, '\v([^\t]+)\t(.*)$')
+	retu mlist != [] ? mlist[1:2] : ['', '']
+endf
+
+fu! s:process(entries, type)
+	retu map(a:entries, 's:modify(v:val, a:type)')
+endf
+
+fu! s:modify(entry, type)
+	let [name, dir] = s:parts(a:entry)
+	let dir = fnamemodify(dir, a:type)
+	retu name.'	'.( dir == '' ? '.' : dir )
+endf
+
+fu! s:msg(name, cwd)
+	redr
+	echoh Identifier | echon 'Bookmarked ' | echoh Constant
+	echon a:name.' ' | echoh Directory | echon a:cwd
+	echoh None
+endf
+
+fu! s:syntax()
+	if !ctrlp#nosy()
+		cal ctrlp#hicheck('CtrlPBookmark', 'Identifier')
+		cal ctrlp#hicheck('CtrlPTabExtra', 'Comment')
+		sy match CtrlPBookmark '^> [^\t]\+' contains=CtrlPLinePre
+		sy match CtrlPTabExtra '\zs\t.*\ze$'
+	en
+endf
+" Public {{{1
+fu! ctrlp#bookmarkdir#init()
+	cal s:setentries()
+	cal s:syntax()
+	retu s:process(copy(s:bookmarks[1]), ':.')
+endf
+
+fu! ctrlp#bookmarkdir#accept(mode, str)
+	let parts = s:parts(s:modify(a:str, ':p'))
+	cal call('s:savebookmark', parts)
+	if a:mode =~ 't\|v\|h'
+		cal ctrlp#exit()
+	en
+	cal ctrlp#setdir(parts[1], a:mode =~ 't\|h' ? 'chd!' : 'lc!')
+	if a:mode == 'e'
+		cal ctrlp#switchtype(0)
+		cal ctrlp#recordhist()
+		cal ctrlp#prtclear()
+	en
+endf
+
+fu! ctrlp#bookmarkdir#add(dir, ...)
+	let str = 'Directory to bookmark: '
+	let cwd = a:dir != '' ? a:dir : s:getinput(str, getcwd(), 'dir')
+	if cwd == '' | retu | en
+	let cwd = fnamemodify(cwd, ':p')
+	let name = a:0 && a:1 != '' ? a:1 : s:getinput('Bookmark as: ', cwd)
+	if name == '' | retu | en
+	let name = tr(name, '	', ' ')
+	cal s:savebookmark(name, cwd)
+	cal s:msg(name, cwd)
+endf
+
+fu! ctrlp#bookmarkdir#remove(entries)
+	cal s:process(a:entries, ':p')
+	cal s:writecache(a:entries == [] ? [] :
+		\ filter(s:getbookmarks(), 'index(a:entries, v:val) < 0'))
+	cal s:setentries()
+	retu s:process(copy(s:bookmarks[1]), ':.')
+endf
+
+fu! ctrlp#bookmarkdir#id()
+	retu s:id
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/buffertag.vim b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/buffertag.vim
new file mode 100644
index 0000000..a38cad5
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/buffertag.vim
@@ -0,0 +1,264 @@
+" =============================================================================
+" File:          autoload/ctrlp/buffertag.vim
+" Description:   Buffer Tag extension
+" Maintainer:    Kien Nguyen <github.com/kien>
+" Credits:       Much of the code was taken from tagbar.vim by Jan Larres, plus
+"                a few lines from taglist.vim by Yegappan Lakshmanan and from
+"                buffertag.vim by Takeshi Nishida.
+" =============================================================================
+
+" Init {{{1
+if exists('g:loaded_ctrlp_buftag') && g:loaded_ctrlp_buftag
+	fini
+en
+let g:loaded_ctrlp_buftag = 1
+
+cal add(g:ctrlp_ext_vars, {
+	\ 'init': 'ctrlp#buffertag#init(s:crfile)',
+	\ 'accept': 'ctrlp#buffertag#accept',
+	\ 'lname': 'buffer tags',
+	\ 'sname': 'bft',
+	\ 'exit': 'ctrlp#buffertag#exit()',
+	\ 'type': 'tabs',
+	\ 'opts': 'ctrlp#buffertag#opts()',
+	\ })
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+
+let [s:pref, s:opts] = ['g:ctrlp_buftag_', {
+	\ 'systemenc': ['s:enc', &enc],
+	\ 'ctags_bin': ['s:bin', ''],
+	\ 'types': ['s:usr_types', {}],
+	\ }]
+
+let s:bins = [
+	\ 'ctags-exuberant',
+	\ 'exuberant-ctags',
+	\ 'exctags',
+	\ '/usr/local/bin/ctags',
+	\ '/opt/local/bin/ctags',
+	\ 'ctags',
+	\ 'ctags.exe',
+	\ 'tags',
+	\ ]
+
+let s:types = {
+	\ 'asm'    : '%sasm%sasm%sdlmt',
+	\ 'aspperl': '%sasp%sasp%sfsv',
+	\ 'aspvbs' : '%sasp%sasp%sfsv',
+	\ 'awk'    : '%sawk%sawk%sf',
+	\ 'beta'   : '%sbeta%sbeta%sfsv',
+	\ 'c'      : '%sc%sc%sdgsutvf',
+	\ 'cpp'    : '%sc++%sc++%snvdtcgsuf',
+	\ 'cs'     : '%sc#%sc#%sdtncEgsipm',
+	\ 'cobol'  : '%scobol%scobol%sdfgpPs',
+	\ 'eiffel' : '%seiffel%seiffel%scf',
+	\ 'erlang' : '%serlang%serlang%sdrmf',
+	\ 'expect' : '%stcl%stcl%scfp',
+	\ 'fortran': '%sfortran%sfortran%spbceiklmntvfs',
+	\ 'html'   : '%shtml%shtml%saf',
+	\ 'java'   : '%sjava%sjava%spcifm',
+	\ 'javascript': '%sjavascript%sjavascript%sf',
+	\ 'lisp'   : '%slisp%slisp%sf',
+	\ 'lua'    : '%slua%slua%sf',
+	\ 'make'   : '%smake%smake%sm',
+	\ 'ocaml'  : '%socaml%socaml%scmMvtfCre',
+	\ 'pascal' : '%spascal%spascal%sfp',
+	\ 'perl'   : '%sperl%sperl%sclps',
+	\ 'php'    : '%sphp%sphp%scdvf',
+	\ 'python' : '%spython%spython%scmf',
+	\ 'rexx'   : '%srexx%srexx%ss',
+	\ 'ruby'   : '%sruby%sruby%scfFm',
+	\ 'scheme' : '%sscheme%sscheme%ssf',
+	\ 'sh'     : '%ssh%ssh%sf',
+	\ 'csh'    : '%ssh%ssh%sf',
+	\ 'zsh'    : '%ssh%ssh%sf',
+	\ 'slang'  : '%sslang%sslang%snf',
+	\ 'sml'    : '%ssml%ssml%secsrtvf',
+	\ 'sql'    : '%ssql%ssql%scFPrstTvfp',
+	\ 'tcl'    : '%stcl%stcl%scfmp',
+	\ 'vera'   : '%svera%svera%scdefgmpPtTvx',
+	\ 'verilog': '%sverilog%sverilog%smcPertwpvf',
+	\ 'vim'    : '%svim%svim%savf',
+	\ 'yacc'   : '%syacc%syacc%sl',
+	\ }
+
+cal map(s:types, 'printf(v:val, "--language-force=", " --", "-types=")')
+
+if executable('jsctags')
+	cal extend(s:types, { 'javascript': { 'args': '-f -', 'bin': 'jsctags' } })
+en
+
+fu! ctrlp#buffertag#opts()
+	for [ke, va] in items(s:opts)
+		let {va[0]} = exists(s:pref.ke) ? {s:pref.ke} : va[1]
+	endfo
+	" Ctags bin
+	if empty(s:bin)
+		for bin in s:bins | if executable(bin)
+			let s:bin = bin
+			brea
+		en | endfo
+	el
+		let s:bin = expand(s:bin, 1)
+	en
+	" Types
+	cal extend(s:types, s:usr_types)
+endf
+" Utilities {{{1
+fu! s:validfile(fname, ftype)
+	if ( !empty(a:fname) || !empty(a:ftype) ) && filereadable(a:fname)
+		\ && index(keys(s:types), a:ftype) >= 0 | retu 1 | en
+	retu 0
+endf
+
+fu! s:exectags(cmd)
+	if exists('+ssl')
+		let [ssl, &ssl] = [&ssl, 0]
+	en
+	if &sh =~ 'cmd\.exe'
+		let [sxq, &sxq, shcf, &shcf] = [&sxq, '"', &shcf, '/s /c']
+	en
+	let output = system(a:cmd)
+	if &sh =~ 'cmd\.exe'
+		let [&sxq, &shcf] = [sxq, shcf]
+	en
+	if exists('+ssl')
+		let &ssl = ssl
+	en
+	retu output
+endf
+
+fu! s:exectagsonfile(fname, ftype)
+	let [ags, ft] = ['-f - --sort=no --excmd=pattern --fields=nKs ', a:ftype]
+	if type(s:types[ft]) == 1
+		let ags .= s:types[ft]
+		let bin = s:bin
+	elsei type(s:types[ft]) == 4
+		let ags = s:types[ft]['args']
+		let bin = expand(s:types[ft]['bin'], 1)
+	en
+	if empty(bin) | retu '' | en
+	let cmd = s:esctagscmd(bin, ags, a:fname)
+	if empty(cmd) | retu '' | en
+	let output = s:exectags(cmd)
+	if v:shell_error || output =~ 'Warning: cannot open' | retu '' | en
+	retu output
+endf
+
+fu! s:esctagscmd(bin, args, ...)
+	if exists('+ssl')
+		let [ssl, &ssl] = [&ssl, 0]
+	en
+	let fname = a:0 ? shellescape(a:1) : ''
+	let cmd = shellescape(a:bin).' '.a:args.' '.fname
+	if &sh =~ 'cmd\.exe'
+		let cmd = substitute(cmd, '[&()@^<>|]', '^\0', 'g')
+	en
+	if exists('+ssl')
+		let &ssl = ssl
+	en
+	if has('iconv')
+		let last = s:enc != &enc ? s:enc : !empty( $LANG ) ? $LANG : &enc
+		let cmd = iconv(cmd, &enc, last)
+	en
+	retu cmd
+endf
+
+fu! s:process(fname, ftype)
+	if !s:validfile(a:fname, a:ftype) | retu [] | endif
+	let ftime = getftime(a:fname)
+	if has_key(g:ctrlp_buftags, a:fname)
+		\ && g:ctrlp_buftags[a:fname]['time'] >= ftime
+		let lines = g:ctrlp_buftags[a:fname]['lines']
+	el
+		let data = s:exectagsonfile(a:fname, a:ftype)
+		let [raw, lines] = [split(data, '\n\+'), []]
+		for line in raw
+			if line !~# '^!_TAG_' && len(split(line, ';"')) == 2
+				let parsed_line = s:parseline(line)
+				if parsed_line != ''
+					cal add(lines, parsed_line)
+				en
+			en
+		endfo
+		let cache = { a:fname : { 'time': ftime, 'lines': lines } }
+		cal extend(g:ctrlp_buftags, cache)
+	en
+	retu lines
+endf
+
+fu! s:parseline(line)
+	let vals = matchlist(a:line,
+		\ '\v^([^\t]+)\t(.+)\t[?/]\^?(.{-1,})\$?[?/]\;\"\t(.+)\tline(no)?\:(\d+)')
+	if vals == [] | retu '' | en
+	let [bufnr, bufname] = [bufnr('^'.vals[2].'$'), fnamemodify(vals[2], ':p:t')]
+	retu vals[1].'	'.vals[4].'|'.bufnr.':'.bufname.'|'.vals[6].'| '.vals[3]
+endf
+
+fu! s:syntax()
+	if !ctrlp#nosy()
+		cal ctrlp#hicheck('CtrlPTagKind', 'Title')
+		cal ctrlp#hicheck('CtrlPBufName', 'Directory')
+		cal ctrlp#hicheck('CtrlPTabExtra', 'Comment')
+		sy match CtrlPTagKind '\zs[^\t|]\+\ze|\d\+:[^|]\+|\d\+|'
+		sy match CtrlPBufName '|\d\+:\zs[^|]\+\ze|\d\+|'
+		sy match CtrlPTabExtra '\zs\t.*\ze$' contains=CtrlPBufName,CtrlPTagKind
+	en
+endf
+
+fu! s:chknearby(pat)
+	if match(getline('.'), a:pat) < 0
+		let [int, forw, maxl] = [1, 1, line('$')]
+		wh !search(a:pat, 'W'.( forw ? '' : 'b' ))
+			if !forw
+				if int > maxl | brea | en
+				let int += int
+			en
+			let forw = !forw
+		endw
+	en
+endf
+" Public {{{1
+fu! ctrlp#buffertag#init(fname)
+	let bufs = exists('s:btmode') && s:btmode
+		\ ? filter(ctrlp#buffers(), 'filereadable(v:val)')
+		\ : [exists('s:bufname') ? s:bufname : a:fname]
+	let lines = []
+	for each in bufs
+		let bname = fnamemodify(each, ':p')
+		let tftype = get(split(getbufvar('^'.bname.'$', '&ft'), '\.'), 0, '')
+		cal extend(lines, s:process(bname, tftype))
+	endfo
+	cal s:syntax()
+	retu lines
+endf
+
+fu! ctrlp#buffertag#accept(mode, str)
+	let vals = matchlist(a:str,
+		\ '\v^[^\t]+\t+[^\t|]+\|(\d+)\:[^\t|]+\|(\d+)\|\s(.+)$')
+	let bufnr = str2nr(get(vals, 1))
+	if bufnr
+		cal ctrlp#acceptfile(a:mode, bufnr)
+		exe 'norm!' str2nr(get(vals, 2, line('.'))).'G'
+		cal s:chknearby('\V\C'.get(vals, 3, ''))
+		sil! norm! zvzz
+	en
+endf
+
+fu! ctrlp#buffertag#cmd(mode, ...)
+	let s:btmode = a:mode
+	if a:0 && !empty(a:1)
+		let s:btmode = 0
+		let bname = a:1 =~# '^%$\|^#\d*$' ? expand(a:1) : a:1
+		let s:bufname = fnamemodify(bname, ':p')
+	en
+	retu s:id
+endf
+
+fu! ctrlp#buffertag#exit()
+	unl! s:btmode s:bufname
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/changes.vim b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/changes.vim
new file mode 100644
index 0000000..313d8c2
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/changes.vim
@@ -0,0 +1,98 @@
+" =============================================================================
+" File:          autoload/ctrlp/changes.vim
+" Description:   Change list extension
+" Author:        Kien Nguyen <github.com/kien>
+" =============================================================================
+
+" Init {{{1
+if exists('g:loaded_ctrlp_changes') && g:loaded_ctrlp_changes
+	fini
+en
+let g:loaded_ctrlp_changes = 1
+
+cal add(g:ctrlp_ext_vars, {
+	\ 'init': 'ctrlp#changes#init(s:bufnr, s:crbufnr)',
+	\ 'accept': 'ctrlp#changes#accept',
+	\ 'lname': 'changes',
+	\ 'sname': 'chs',
+	\ 'exit': 'ctrlp#changes#exit()',
+	\ 'type': 'tabe',
+	\ 'sort': 0,
+	\ 'nolim': 1,
+	\ })
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+" Utilities {{{1
+fu! s:changelist(bufnr)
+	sil! exe 'noa hid b' a:bufnr
+	redi => result
+	sil! changes
+	redi END
+	retu map(split(result, "\n")[1:], 'tr(v:val, "	", " ")')
+endf
+
+fu! s:process(clines, ...)
+	let [clines, evas] = [[], []]
+	for each in a:clines
+		let parts = matchlist(each, '\v^.\s*\d+\s+(\d+)\s+(\d+)\s(.*)$')
+		if !empty(parts)
+			if parts[3] == '' | let parts[3] = ' ' | en
+			cal add(clines, parts[3].'	|'.a:1.':'.a:2.'|'.parts[1].':'.parts[2].'|')
+		en
+	endfo
+	retu reverse(filter(clines, 'count(clines, v:val) == 1'))
+endf
+
+fu! s:syntax()
+	if !ctrlp#nosy()
+		cal ctrlp#hicheck('CtrlPBufName', 'Directory')
+		cal ctrlp#hicheck('CtrlPTabExtra', 'Comment')
+		sy match CtrlPBufName '\t|\d\+:\zs[^|]\+\ze|\d\+:\d\+|$'
+		sy match CtrlPTabExtra '\zs\t.*\ze$' contains=CtrlPBufName
+	en
+endf
+" Public {{{1
+fu! ctrlp#changes#init(original_bufnr, bufnr)
+	let bufnr = exists('s:bufnr') ? s:bufnr : a:bufnr
+	let bufs = exists('s:clmode') && s:clmode ? ctrlp#buffers('id') : [bufnr]
+	cal filter(bufs, 'v:val > 0')
+	let [swb, &swb] = [&swb, '']
+	let lines = []
+	for each in bufs
+		let bname = bufname(each)
+		let fnamet = fnamemodify(bname == '' ? '[No Name]' : bname, ':t')
+		cal extend(lines, s:process(s:changelist(each), each, fnamet))
+	endfo
+	sil! exe 'noa hid b' a:original_bufnr
+	let &swb = swb
+	cal ctrlp#syntax()
+	cal s:syntax()
+	retu lines
+endf
+
+fu! ctrlp#changes#accept(mode, str)
+	let info = matchlist(a:str, '\t|\(\d\+\):[^|]\+|\(\d\+\):\(\d\+\)|$')
+	let bufnr = str2nr(get(info, 1))
+	if bufnr
+		cal ctrlp#acceptfile(a:mode, bufnr)
+		cal cursor(get(info, 2), get(info, 3))
+		sil! norm! zvzz
+	en
+endf
+
+fu! ctrlp#changes#cmd(mode, ...)
+	let s:clmode = a:mode
+	if a:0 && !empty(a:1)
+		let s:clmode = 0
+		let bname = a:1 =~# '^%$\|^#\d*$' ? expand(a:1) : a:1
+		let s:bufnr = bufnr('^'.fnamemodify(bname, ':p').'$')
+	en
+	retu s:id
+endf
+
+fu! ctrlp#changes#exit()
+	unl! s:clmode s:bufnr
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/dir.vim b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/dir.vim
new file mode 100644
index 0000000..4e6d4ad
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/dir.vim
@@ -0,0 +1,95 @@
+" =============================================================================
+" File:          autoload/ctrlp/dir.vim
+" Description:   Directory extension
+" Author:        Kien Nguyen <github.com/kien>
+" =============================================================================
+
+" Init {{{1
+if exists('g:loaded_ctrlp_dir') && g:loaded_ctrlp_dir
+	fini
+en
+let [g:loaded_ctrlp_dir, g:ctrlp_newdir] = [1, 0]
+
+let s:ars = ['s:maxdepth', 's:maxfiles', 's:compare_lim', 's:glob', 's:caching']
+
+cal add(g:ctrlp_ext_vars, {
+	\ 'init': 'ctrlp#dir#init('.join(s:ars, ', ').')',
+	\ 'accept': 'ctrlp#dir#accept',
+	\ 'lname': 'dirs',
+	\ 'sname': 'dir',
+	\ 'type': 'path',
+	\ 'specinput': 1,
+	\ })
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+
+let s:dircounts = {}
+" Utilities {{{1
+fu! s:globdirs(dirs, depth)
+	let entries = split(globpath(a:dirs, s:glob), "\n")
+	let [dirs, depth] = [ctrlp#dirnfile(entries)[0], a:depth + 1]
+	cal extend(g:ctrlp_alldirs, dirs)
+	let nr = len(g:ctrlp_alldirs)
+	if !empty(dirs) && !s:max(nr, s:maxfiles) && depth <= s:maxdepth
+		sil! cal ctrlp#progress(nr)
+		cal map(dirs, 'ctrlp#utils#fnesc(v:val, "g", ",")')
+		cal s:globdirs(join(dirs, ','), depth)
+	en
+endf
+
+fu! s:max(len, max)
+	retu a:max && a:len > a:max
+endf
+
+fu! s:nocache()
+	retu !s:caching || ( s:caching > 1 && get(s:dircounts, s:cwd) < s:caching )
+endf
+" Public {{{1
+fu! ctrlp#dir#init(...)
+	let s:cwd = getcwd()
+	for each in range(len(s:ars))
+		let {s:ars[each]} = a:{each + 1}
+	endfo
+	let cadir = ctrlp#utils#cachedir().ctrlp#utils#lash().'dir'
+	let cafile = cadir.ctrlp#utils#lash().ctrlp#utils#cachefile('dir')
+	if g:ctrlp_newdir || s:nocache() || !filereadable(cafile)
+		let [s:initcwd, g:ctrlp_alldirs] = [s:cwd, []]
+		if !ctrlp#igncwd(s:cwd)
+			cal s:globdirs(ctrlp#utils#fnesc(s:cwd, 'g', ','), 0)
+		en
+		cal ctrlp#rmbasedir(g:ctrlp_alldirs)
+		if len(g:ctrlp_alldirs) <= s:compare_lim
+			cal sort(g:ctrlp_alldirs, 'ctrlp#complen')
+		en
+		cal ctrlp#utils#writecache(g:ctrlp_alldirs, cadir, cafile)
+		let g:ctrlp_newdir = 0
+	el
+		if !( exists('s:initcwd') && s:initcwd == s:cwd )
+			let s:initcwd = s:cwd
+			let g:ctrlp_alldirs = ctrlp#utils#readfile(cafile)
+		en
+	en
+	cal extend(s:dircounts, { s:cwd : len(g:ctrlp_alldirs) })
+	retu g:ctrlp_alldirs
+endf
+
+fu! ctrlp#dir#accept(mode, str)
+	let path = a:mode == 'h' ? getcwd() : s:cwd.ctrlp#call('s:lash', s:cwd).a:str
+	if a:mode =~ 't\|v\|h'
+		cal ctrlp#exit()
+	en
+	cal ctrlp#setdir(path, a:mode =~ 't\|h' ? 'chd!' : 'lc!')
+	if a:mode == 'e'
+		sil! cal ctrlp#statusline()
+		cal ctrlp#setlines(s:id)
+		cal ctrlp#recordhist()
+		cal ctrlp#prtclear()
+	en
+endf
+
+fu! ctrlp#dir#id()
+	retu s:id
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/line.vim b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/line.vim
new file mode 100644
index 0000000..5bec47e
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/line.vim
@@ -0,0 +1,72 @@
+" =============================================================================
+" File:          autoload/ctrlp/line.vim
+" Description:   Line extension
+" Author:        Kien Nguyen <github.com/kien>
+" =============================================================================
+
+" Init {{{1
+if exists('g:loaded_ctrlp_line') && g:loaded_ctrlp_line
+	fini
+en
+let g:loaded_ctrlp_line = 1
+
+cal add(g:ctrlp_ext_vars, {
+	\ 'init': 'ctrlp#line#init(s:crbufnr)',
+	\ 'accept': 'ctrlp#line#accept',
+	\ 'lname': 'lines',
+	\ 'sname': 'lns',
+	\ 'type': 'tabe',
+	\ })
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+" Utilities {{{1
+fu! s:syntax()
+	if !ctrlp#nosy()
+		cal ctrlp#hicheck('CtrlPBufName', 'Directory')
+		cal ctrlp#hicheck('CtrlPTabExtra', 'Comment')
+		sy match CtrlPBufName '\t|\zs[^|]\+\ze|\d\+:\d\+|$'
+		sy match CtrlPTabExtra '\zs\t.*\ze$' contains=CtrlPBufName
+	en
+endf
+" Public {{{1
+fu! ctrlp#line#init(bufnr)
+	let [lines, bufnr] = [[], exists('s:bufnr') ? s:bufnr : a:bufnr]
+	let bufs = exists('s:lnmode') && s:lnmode ? ctrlp#buffers('id') : [bufnr]
+	for bufnr in bufs
+		let [lfb, bufn] = [getbufline(bufnr, 1, '$'), bufname(bufnr)]
+		if lfb == [] && bufn != ''
+			let lfb = ctrlp#utils#readfile(fnamemodify(bufn, ':p'))
+		en
+		cal map(lfb, 'tr(v:val, ''	'', '' '')')
+		let [linenr, len_lfb] = [1, len(lfb)]
+		let buft = bufn == '' ? '[No Name]' : fnamemodify(bufn, ':t')
+		wh linenr <= len_lfb
+			let lfb[linenr - 1] .= '	|'.buft.'|'.bufnr.':'.linenr.'|'
+			let linenr += 1
+		endw
+		cal extend(lines, filter(lfb, 'v:val !~ ''^\s*\t|[^|]\+|\d\+:\d\+|$'''))
+	endfo
+	cal s:syntax()
+	retu lines
+endf
+
+fu! ctrlp#line#accept(mode, str)
+	let info = matchlist(a:str, '\t|[^|]\+|\(\d\+\):\(\d\+\)|$')
+	let bufnr = str2nr(get(info, 1))
+	if bufnr
+		cal ctrlp#acceptfile(a:mode, bufnr, get(info, 2))
+	en
+endf
+
+fu! ctrlp#line#cmd(mode, ...)
+	let s:lnmode = a:mode
+	if a:0 && !empty(a:1)
+		let s:lnmode = 0
+		let bname = a:1 =~# '^%$\|^#\d*$' ? expand(a:1) : a:1
+		let s:bufnr = bufnr('^'.fnamemodify(bname, ':p').'$')
+	en
+	retu s:id
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/mixed.vim b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/mixed.vim
new file mode 100644
index 0000000..74d904d
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/mixed.vim
@@ -0,0 +1,88 @@
+" =============================================================================
+" File:          autoload/ctrlp/mixed.vim
+" Description:   Mixing Files + MRU + Buffers
+" Author:        Kien Nguyen <github.com/kien>
+" =============================================================================
+
+" Init {{{1
+if exists('g:loaded_ctrlp_mixed') && g:loaded_ctrlp_mixed
+	fini
+en
+let [g:loaded_ctrlp_mixed, g:ctrlp_newmix] = [1, 0]
+
+cal add(g:ctrlp_ext_vars, {
+	\ 'init': 'ctrlp#mixed#init(s:compare_lim)',
+	\ 'accept': 'ctrlp#acceptfile',
+	\ 'lname': 'fil + mru + buf',
+	\ 'sname': 'mix',
+	\ 'type': 'path',
+	\ 'opmul': 1,
+	\ 'specinput': 1,
+	\ })
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+" Utilities {{{1
+fu! s:newcache(cwd)
+	if g:ctrlp_newmix || !has_key(g:ctrlp_allmixes, 'data') | retu 1 | en
+	retu g:ctrlp_allmixes['cwd'] != a:cwd
+		\ || g:ctrlp_allmixes['filtime'] < getftime(ctrlp#utils#cachefile())
+		\ || g:ctrlp_allmixes['mrutime'] < getftime(ctrlp#mrufiles#cachefile())
+		\ || g:ctrlp_allmixes['bufs'] < len(ctrlp#mrufiles#bufs())
+endf
+
+fu! s:getnewmix(cwd, clim)
+	if g:ctrlp_newmix
+		cal ctrlp#mrufiles#refresh('raw')
+		let g:ctrlp_newcache = 1
+	en
+	let g:ctrlp_lines = copy(ctrlp#files())
+	cal ctrlp#progress('Mixing...')
+	let mrufs = copy(ctrlp#mrufiles#list('raw'))
+	if exists('+ssl') && &ssl
+		cal map(mrufs, 'tr(v:val, "\\", "/")')
+	en
+	let allbufs = map(ctrlp#buffers(), 'fnamemodify(v:val, ":p")')
+	let [bufs, ubufs] = [[], []]
+	for each in allbufs
+		cal add(filereadable(each) ? bufs : ubufs, each)
+	endfo
+	let mrufs = bufs + filter(mrufs, 'index(bufs, v:val) < 0')
+	if len(mrufs) > len(g:ctrlp_lines)
+		cal filter(mrufs, 'stridx(v:val, a:cwd)')
+	el
+		let cwd_mrufs = filter(copy(mrufs), '!stridx(v:val, a:cwd)')
+		let cwd_mrufs = ctrlp#rmbasedir(cwd_mrufs)
+		for each in cwd_mrufs
+			let id = index(g:ctrlp_lines, each)
+			if id >= 0 | cal remove(g:ctrlp_lines, id) | en
+		endfo
+	en
+	let mrufs += ubufs
+	cal map(mrufs, 'fnamemodify(v:val, ":.")')
+	let g:ctrlp_lines = len(mrufs) > len(g:ctrlp_lines)
+		\ ? g:ctrlp_lines + mrufs : mrufs + g:ctrlp_lines
+	if len(g:ctrlp_lines) <= a:clim
+		cal sort(g:ctrlp_lines, 'ctrlp#complen')
+	en
+	let g:ctrlp_allmixes = { 'filtime': getftime(ctrlp#utils#cachefile()),
+		\ 'mrutime': getftime(ctrlp#mrufiles#cachefile()), 'cwd': a:cwd,
+		\ 'bufs': len(ctrlp#mrufiles#bufs()), 'data': g:ctrlp_lines }
+endf
+" Public {{{1
+fu! ctrlp#mixed#init(clim)
+	let cwd = getcwd()
+	if s:newcache(cwd)
+		cal s:getnewmix(cwd, a:clim)
+	el
+		let g:ctrlp_lines = g:ctrlp_allmixes['data']
+	en
+	let g:ctrlp_newmix = 0
+	retu g:ctrlp_lines
+endf
+
+fu! ctrlp#mixed#id()
+	retu s:id
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/mrufiles.vim b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/mrufiles.vim
new file mode 100644
index 0000000..a182111
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/mrufiles.vim
@@ -0,0 +1,154 @@
+" =============================================================================
+" File:          autoload/ctrlp/mrufiles.vim
+" Description:   Most Recently Used Files extension
+" Author:        Kien Nguyen <github.com/kien>
+" =============================================================================
+
+" Static variables {{{1
+let [s:mrbs, s:mrufs] = [[], []]
+
+fu! ctrlp#mrufiles#opts()
+	let [pref, opts] = ['g:ctrlp_mruf_', {
+		\ 'max': ['s:max', 250],
+		\ 'include': ['s:in', ''],
+		\ 'exclude': ['s:ex', ''],
+		\ 'case_sensitive': ['s:cseno', 1],
+		\ 'relative': ['s:re', 0],
+		\ 'save_on_update': ['s:soup', 1],
+		\ }]
+	for [ke, va] in items(opts)
+		let [{va[0]}, {pref.ke}] = [pref.ke, exists(pref.ke) ? {pref.ke} : va[1]]
+	endfo
+endf
+cal ctrlp#mrufiles#opts()
+" Utilities {{{1
+fu! s:excl(fn)
+	retu !empty({s:ex}) && a:fn =~# {s:ex}
+endf
+
+fu! s:mergelists()
+	let diskmrufs = ctrlp#utils#readfile(ctrlp#mrufiles#cachefile())
+	cal filter(diskmrufs, 'index(s:mrufs, v:val) < 0')
+	let mrufs = s:mrufs + diskmrufs
+	retu s:chop(mrufs)
+endf
+
+fu! s:chop(mrufs)
+	if len(a:mrufs) > {s:max} | cal remove(a:mrufs, {s:max}, -1) | en
+	retu a:mrufs
+endf
+
+fu! s:reformat(mrufs, ...)
+	let cwd = getcwd()
+	let cwd .= cwd !~ '[\/]$' ? ctrlp#utils#lash() : ''
+	if {s:re}
+		let cwd = exists('+ssl') ? tr(cwd, '/', '\') : cwd
+		cal filter(a:mrufs, '!stridx(v:val, cwd)')
+	en
+	if a:0 && a:1 == 'raw' | retu a:mrufs | en
+	let idx = strlen(cwd)
+	if exists('+ssl') && &ssl
+		let cwd = tr(cwd, '\', '/')
+		cal map(a:mrufs, 'tr(v:val, "\\", "/")')
+	en
+	retu map(a:mrufs, '!stridx(v:val, cwd) ? strpart(v:val, idx) : v:val')
+endf
+
+fu! s:record(bufnr)
+	if s:locked | retu | en
+	let bufnr = a:bufnr + 0
+	let bufname = bufname(bufnr)
+	if bufnr > 0 && !empty(bufname)
+		cal filter(s:mrbs, 'v:val != bufnr')
+		cal insert(s:mrbs, bufnr)
+		cal s:addtomrufs(bufname)
+	en
+endf
+
+fu! s:addtomrufs(fname)
+	let fn = fnamemodify(a:fname, ':p')
+	let fn = exists('+ssl') ? tr(fn, '/', '\') : fn
+	if ( !empty({s:in}) && fn !~# {s:in} ) || ( !empty({s:ex}) && fn =~# {s:ex} )
+		\ || !empty(getbufvar('^'.fn.'$', '&bt')) || !filereadable(fn) | retu
+	en
+	let idx = index(s:mrufs, fn, 0, !{s:cseno})
+	if idx
+		cal filter(s:mrufs, 'v:val !='.( {s:cseno} ? '#' : '?' ).' fn')
+		cal insert(s:mrufs, fn)
+		if {s:soup} && idx < 0
+			cal s:savetofile(s:mergelists())
+		en
+	en
+endf
+
+fu! s:savetofile(mrufs)
+	cal ctrlp#utils#writecache(a:mrufs, s:cadir, s:cafile)
+endf
+" Public {{{1
+fu! ctrlp#mrufiles#refresh(...)
+	let mrufs = s:mergelists()
+	cal filter(mrufs, '!empty(ctrlp#utils#glob(v:val, 1)) && !s:excl(v:val)')
+	if exists('+ssl')
+		cal map(mrufs, 'tr(v:val, "/", "\\")')
+		cal map(s:mrufs, 'tr(v:val, "/", "\\")')
+		let cond = 'count(mrufs, v:val, !{s:cseno}) == 1'
+		cal filter(mrufs, cond)
+		cal filter(s:mrufs, cond)
+	en
+	cal s:savetofile(mrufs)
+	retu a:0 && a:1 == 'raw' ? [] : s:reformat(mrufs)
+endf
+
+fu! ctrlp#mrufiles#remove(files)
+	let mrufs = []
+	if a:files != []
+		let mrufs = s:mergelists()
+		let cond = 'index(a:files, v:val, 0, !{s:cseno}) < 0'
+		cal filter(mrufs, cond)
+		cal filter(s:mrufs, cond)
+	en
+	cal s:savetofile(mrufs)
+	retu s:reformat(mrufs)
+endf
+
+fu! ctrlp#mrufiles#add(fn)
+	if !empty(a:fn)
+		cal s:addtomrufs(a:fn)
+	en
+endf
+
+fu! ctrlp#mrufiles#list(...)
+	retu a:0 ? a:1 == 'raw' ? s:reformat(s:mergelists(), a:1) : 0
+		\ : s:reformat(s:mergelists())
+endf
+
+fu! ctrlp#mrufiles#bufs()
+	retu s:mrbs
+endf
+
+fu! ctrlp#mrufiles#tgrel()
+	let {s:re} = !{s:re}
+endf
+
+fu! ctrlp#mrufiles#cachefile()
+	if !exists('s:cadir') || !exists('s:cafile')
+		let s:cadir = ctrlp#utils#cachedir().ctrlp#utils#lash().'mru'
+		let s:cafile = s:cadir.ctrlp#utils#lash().'cache.txt'
+	en
+	retu s:cafile
+endf
+
+fu! ctrlp#mrufiles#init()
+	if !has('autocmd') | retu | en
+	let s:locked = 0
+	aug CtrlPMRUF
+		au!
+		au BufAdd,BufEnter,BufLeave,BufWritePost * cal s:record(expand('<abuf>', 1))
+		au QuickFixCmdPre  *vimgrep* let s:locked = 1
+		au QuickFixCmdPost *vimgrep* let s:locked = 0
+		au VimLeavePre * cal s:savetofile(s:mergelists())
+	aug END
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/quickfix.vim b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/quickfix.vim
new file mode 100644
index 0000000..03ab921
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/quickfix.vim
@@ -0,0 +1,59 @@
+" =============================================================================
+" File:          autoload/ctrlp/quickfix.vim
+" Description:   Quickfix extension
+" Author:        Kien Nguyen <github.com/kien>
+" =============================================================================
+
+" Init {{{1
+if exists('g:loaded_ctrlp_quickfix') && g:loaded_ctrlp_quickfix
+	fini
+en
+let g:loaded_ctrlp_quickfix = 1
+
+cal add(g:ctrlp_ext_vars, {
+	\ 'init': 'ctrlp#quickfix#init()',
+	\ 'accept': 'ctrlp#quickfix#accept',
+	\ 'lname': 'quickfix',
+	\ 'sname': 'qfx',
+	\ 'type': 'line',
+	\ 'sort': 0,
+	\ 'nolim': 1,
+	\ })
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+
+fu! s:lineout(dict)
+	retu printf('%s|%d:%d| %s', bufname(a:dict['bufnr']), a:dict['lnum'],
+		\ a:dict['col'], matchstr(a:dict['text'], '\s*\zs.*\S'))
+endf
+" Utilities {{{1
+fu! s:syntax()
+	if !ctrlp#nosy()
+		cal ctrlp#hicheck('CtrlPqfLineCol', 'Search')
+		sy match CtrlPqfLineCol '|\zs\d\+:\d\+\ze|'
+	en
+endf
+" Public {{{1
+fu! ctrlp#quickfix#init()
+	cal s:syntax()
+	retu map(getqflist(), 's:lineout(v:val)')
+endf
+
+fu! ctrlp#quickfix#accept(mode, str)
+	let vals = matchlist(a:str, '^\([^|]\+\ze\)|\(\d\+\):\(\d\+\)|')
+	if vals == [] || vals[1] == '' | retu | en
+	cal ctrlp#acceptfile(a:mode, vals[1])
+	let cur_pos = getpos('.')[1:2]
+	if cur_pos != [1, 1] && cur_pos != map(vals[2:3], 'str2nr(v:val)')
+		mark '
+	en
+	cal cursor(vals[2], vals[3])
+	sil! norm! zvzz
+endf
+
+fu! ctrlp#quickfix#id()
+	retu s:id
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/rtscript.vim b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/rtscript.vim
new file mode 100644
index 0000000..eed21c6
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/rtscript.vim
@@ -0,0 +1,59 @@
+" =============================================================================
+" File:          autoload/ctrlp/rtscript.vim
+" Description:   Runtime scripts extension
+" Author:        Kien Nguyen <github.com/kien>
+" =============================================================================
+
+" Init {{{1
+if exists('g:loaded_ctrlp_rtscript') && g:loaded_ctrlp_rtscript
+	fini
+en
+let [g:loaded_ctrlp_rtscript, g:ctrlp_newrts] = [1, 0]
+
+cal add(g:ctrlp_ext_vars, {
+	\ 'init': 'ctrlp#rtscript#init(s:caching)',
+	\ 'accept': 'ctrlp#acceptfile',
+	\ 'lname': 'runtime scripts',
+	\ 'sname': 'rts',
+	\ 'type': 'path',
+	\ 'opmul': 1,
+	\ })
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+
+let s:filecounts = {}
+" Utilities {{{1
+fu! s:nocache()
+	retu g:ctrlp_newrts ||
+		\ !s:caching || ( s:caching > 1 && get(s:filecounts, s:cwd) < s:caching )
+endf
+" Public {{{1
+fu! ctrlp#rtscript#init(caching)
+	let [s:caching, s:cwd] = [a:caching, getcwd()]
+	if s:nocache() ||
+		\ !( exists('g:ctrlp_rtscache') && g:ctrlp_rtscache[0] == &rtp )
+		sil! cal ctrlp#progress('Indexing...')
+		let entries = split(globpath(ctrlp#utils#fnesc(&rtp, 'g'), '**/*.*'), "\n")
+		cal filter(entries, 'count(entries, v:val) == 1')
+		let [entries, echoed] = [ctrlp#dirnfile(entries)[1], 1]
+	el
+		let [entries, results] = g:ctrlp_rtscache[2:3]
+	en
+	if s:nocache() ||
+		\ !( exists('g:ctrlp_rtscache') && g:ctrlp_rtscache[:1] == [&rtp, s:cwd] )
+		if !exists('echoed')
+			sil! cal ctrlp#progress('Processing...')
+		en
+		let results = map(copy(entries), 'fnamemodify(v:val, '':.'')')
+	en
+	let [g:ctrlp_rtscache, g:ctrlp_newrts] = [[&rtp, s:cwd, entries, results], 0]
+	cal extend(s:filecounts, { s:cwd : len(results) })
+	retu results
+endf
+
+fu! ctrlp#rtscript#id()
+	retu s:id
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/tag.vim b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/tag.vim
new file mode 100644
index 0000000..626363a
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/tag.vim
@@ -0,0 +1,138 @@
+" =============================================================================
+" File:          autoload/ctrlp/tag.vim
+" Description:   Tag file extension
+" Author:        Kien Nguyen <github.com/kien>
+" =============================================================================
+
+" Init {{{1
+if exists('g:loaded_ctrlp_tag') && g:loaded_ctrlp_tag
+	fini
+en
+let g:loaded_ctrlp_tag = 1
+
+cal add(g:ctrlp_ext_vars, {
+	\ 'init': 'ctrlp#tag#init()',
+	\ 'accept': 'ctrlp#tag#accept',
+	\ 'lname': 'tags',
+	\ 'sname': 'tag',
+	\ 'enter': 'ctrlp#tag#enter()',
+	\ 'type': 'tabs',
+	\ })
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+" Utilities {{{1
+fu! s:findcount(str)
+	let [tg, ofname] = split(a:str, '\t\+\ze[^\t]\+$')
+	let tgs = taglist('^'.tg.'$')
+	if len(tgs) < 2
+		retu [0, 0, 0, 0]
+	en
+	let bname = fnamemodify(bufname('%'), ':p')
+	let fname = expand(fnamemodify(simplify(ofname), ':s?^[.\/]\+??:p:.'), 1)
+	let [fnd, cnt, pos, ctgs, otgs] = [0, 0, 0, [], []]
+	for tgi in tgs
+		let lst = bname == fnamemodify(tgi["filename"], ':p') ? 'ctgs' : 'otgs'
+		cal call('add', [{lst}, tgi])
+	endfo
+	let ntgs = ctgs + otgs
+	for tgi in ntgs
+		let cnt += 1
+		let fulname = fnamemodify(tgi["filename"], ':p')
+		if stridx(fulname, fname) >= 0
+			\ && strlen(fname) + stridx(fulname, fname) == strlen(fulname)
+			let fnd += 1
+			let pos = cnt
+		en
+	endfo
+	let cnt = 0
+	for tgi in ntgs
+		let cnt += 1
+		if tgi["filename"] == ofname
+			let [fnd, pos] = [0, cnt]
+		en
+	endfo
+	retu [1, fnd, pos, len(ctgs)]
+endf
+
+fu! s:filter(tags)
+	let nr = 0
+	wh 0 < 1
+		if a:tags == [] | brea | en
+		if a:tags[nr] =~ '^!' && a:tags[nr] !~# '^!_TAG_'
+			let nr += 1
+			con
+		en
+		if a:tags[nr] =~# '^!_TAG_' && len(a:tags) > nr
+			cal remove(a:tags, nr)
+		el
+			brea
+		en
+	endw
+	retu a:tags
+endf
+
+fu! s:syntax()
+	if !ctrlp#nosy()
+		cal ctrlp#hicheck('CtrlPTabExtra', 'Comment')
+		sy match CtrlPTabExtra '\zs\t.*\ze$'
+	en
+endf
+" Public {{{1
+fu! ctrlp#tag#init()
+	if empty(s:tagfiles) | retu [] | en
+	let g:ctrlp_alltags = []
+	let tagfiles = sort(filter(s:tagfiles, 'count(s:tagfiles, v:val) == 1'))
+	for each in tagfiles
+		let alltags = s:filter(ctrlp#utils#readfile(each))
+		cal extend(g:ctrlp_alltags, alltags)
+	endfo
+	cal s:syntax()
+	retu g:ctrlp_alltags
+endf
+
+fu! ctrlp#tag#accept(mode, str)
+	cal ctrlp#exit()
+	let str = matchstr(a:str, '^[^\t]\+\t\+[^\t]\+\ze\t')
+	let [tg, fdcnt] = [split(str, '^[^\t]\+\zs\t')[0], s:findcount(str)]
+	let cmds = {
+		\ 't': ['tab sp', 'tab stj'],
+		\ 'h': ['sp', 'stj'],
+		\ 'v': ['vs', 'vert stj'],
+		\ 'e': ['', 'tj'],
+		\ }
+	let utg = fdcnt[3] < 2 && fdcnt[0] == 1 && fdcnt[1] == 1
+	let cmd = !fdcnt[0] || utg ? cmds[a:mode][0] : cmds[a:mode][1]
+	let cmd = a:mode == 'e' && ctrlp#modfilecond(!&aw)
+		\ ? ( cmd == 'tj' ? 'stj' : 'sp' ) : cmd
+	let cmd = a:mode == 't' ? ctrlp#tabcount().cmd : cmd
+	if !fdcnt[0] || utg
+		if cmd != ''
+			exe cmd
+		en
+		let save_cst = &cst
+		set cst&
+		cal feedkeys(":".( utg ? fdcnt[2] : "" )."ta ".tg."\r", 'nt')
+		let &cst = save_cst
+	el
+		let ext = ""
+		if fdcnt[1] < 2 && fdcnt[2]
+			let [sav_more, &more] = [&more, 0]
+			let ext = fdcnt[2]."\r".":let &more = ".sav_more."\r"
+		en
+		cal feedkeys(":".cmd." ".tg."\r".ext, 'nt')
+	en
+	cal ctrlp#setlcdir()
+endf
+
+fu! ctrlp#tag#id()
+	retu s:id
+endf
+
+fu! ctrlp#tag#enter()
+	let tfs = tagfiles()
+	let s:tagfiles = tfs != [] ? filter(map(tfs, 'fnamemodify(v:val, ":p")'),
+		\ 'filereadable(v:val)') : []
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/undo.vim b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/undo.vim
new file mode 100644
index 0000000..dee705e
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/undo.vim
@@ -0,0 +1,154 @@
+" =============================================================================
+" File:          autoload/ctrlp/undo.vim
+" Description:   Undo extension
+" Author:        Kien Nguyen <github.com/kien>
+" =============================================================================
+
+" Init {{{1
+if ( exists('g:loaded_ctrlp_undo') && g:loaded_ctrlp_undo )
+	fini
+en
+let g:loaded_ctrlp_undo = 1
+
+cal add(g:ctrlp_ext_vars, {
+	\ 'init': 'ctrlp#undo#init()',
+	\ 'accept': 'ctrlp#undo#accept',
+	\ 'lname': 'undo',
+	\ 'sname': 'udo',
+	\ 'enter': 'ctrlp#undo#enter()',
+	\ 'exit': 'ctrlp#undo#exit()',
+	\ 'type': 'line',
+	\ 'sort': 0,
+	\ 'nolim': 1,
+	\ })
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+
+let s:text = map(['second', 'seconds', 'minutes', 'hours', 'days', 'weeks',
+	\ 'months', 'years'], '" ".v:val." ago"')
+" Utilities {{{1
+fu! s:getundo()
+	if exists('*undotree')
+		\ && ( v:version > 703 || ( v:version == 703 && has('patch005') ) )
+		retu [1, undotree()]
+	el
+		redi => result
+		sil! undol
+		redi END
+		retu [0, split(result, "\n")[1:]]
+	en
+endf
+
+fu! s:flatten(tree, cur)
+	let flatdict = {}
+	for each in a:tree
+		let saved = has_key(each, 'save') ? 'saved' : ''
+		let current = each['seq'] == a:cur ? 'current' : ''
+		cal extend(flatdict, { each['seq'] : [each['time'], saved, current] })
+		if has_key(each, 'alt')
+			cal extend(flatdict, s:flatten(each['alt'], a:cur))
+		en
+	endfo
+	retu flatdict
+endf
+
+fu! s:elapsed(nr)
+	let [text, time] = [s:text, localtime() - a:nr]
+	let mins = time / 60
+	let hrs  = time / 3600
+	let days = time / 86400
+	let wks  = time / 604800
+	let mons = time / 2592000
+	let yrs  = time / 31536000
+	if yrs > 1
+		retu yrs.text[7]
+	elsei mons > 1
+		retu mons.text[6]
+	elsei wks > 1
+		retu wks.text[5]
+	elsei days > 1
+		retu days.text[4]
+	elsei hrs > 1
+		retu hrs.text[3]
+	elsei mins > 1
+		retu mins.text[2]
+	elsei time == 1
+		retu time.text[0]
+	elsei time < 120
+		retu time.text[1]
+	en
+endf
+
+fu! s:syntax()
+	if ctrlp#nosy() | retu | en
+	for [ke, va] in items({'T': 'Directory', 'Br': 'Comment', 'Nr': 'String',
+		\ 'Sv': 'Comment', 'Po': 'Title'})
+		cal ctrlp#hicheck('CtrlPUndo'.ke, va)
+	endfo
+	sy match CtrlPUndoT '\v\d+ \zs[^ ]+\ze|\d+:\d+:\d+'
+	sy match CtrlPUndoBr '\[\|\]'
+	sy match CtrlPUndoNr '\[\d\+\]' contains=CtrlPUndoBr
+	sy match CtrlPUndoSv 'saved'
+	sy match CtrlPUndoPo 'current'
+endf
+
+fu! s:dict2list(dict)
+	for ke in keys(a:dict)
+		let a:dict[ke][0] = s:elapsed(a:dict[ke][0])
+	endfo
+	retu map(keys(a:dict), 'eval(''[v:val, a:dict[v:val]]'')')
+endf
+
+fu! s:compval(...)
+	retu a:2[0] - a:1[0]
+endf
+
+fu! s:format(...)
+	let saved = !empty(a:1[1][1]) ? ' '.a:1[1][1] : ''
+	let current = !empty(a:1[1][2]) ? ' '.a:1[1][2] : ''
+	retu a:1[1][0].' ['.a:1[0].']'.saved.current
+endf
+
+fu! s:formatul(...)
+	let parts = matchlist(a:1,
+		\ '\v^\s+(\d+)\s+\d+\s+([^ ]+\s?[^ ]+|\d+\s\w+\s\w+)(\s*\d*)$')
+	retu parts == [] ? '----'
+		\ : parts[2].' ['.parts[1].']'.( parts[3] != '' ? ' saved' : '' )
+endf
+" Public {{{1
+fu! ctrlp#undo#init()
+	let entries = s:undos[0] ? s:undos[1]['entries'] : s:undos[1]
+	if empty(entries) | retu [] | en
+	if !exists('s:lines')
+		if s:undos[0]
+			let entries = s:dict2list(s:flatten(entries, s:undos[1]['seq_cur']))
+			let s:lines = map(sort(entries, 's:compval'), 's:format(v:val)')
+		el
+			let s:lines = map(reverse(entries), 's:formatul(v:val)')
+		en
+	en
+	cal s:syntax()
+	retu s:lines
+endf
+
+fu! ctrlp#undo#accept(mode, str)
+	let undon = matchstr(a:str, '\[\zs\d\+\ze\]')
+	if empty(undon) | retu | en
+	cal ctrlp#exit()
+	exe 'u' undon
+endf
+
+fu! ctrlp#undo#id()
+	retu s:id
+endf
+
+fu! ctrlp#undo#enter()
+	let s:undos = s:getundo()
+endf
+
+fu! ctrlp#undo#exit()
+	unl! s:lines
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/utils.vim b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/utils.vim
new file mode 100644
index 0000000..91b9f24
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/autoload/ctrlp/utils.vim
@@ -0,0 +1,110 @@
+" =============================================================================
+" File:          autoload/ctrlp/utils.vim
+" Description:   Utilities
+" Author:        Kien Nguyen <github.com/kien>
+" =============================================================================
+
+" Static variables {{{1
+fu! ctrlp#utils#lash()
+	retu &ssl || !exists('+ssl') ? '/' : '\'
+endf
+
+fu! s:lash(...)
+	retu ( a:0 ? a:1 : getcwd() ) !~ '[\/]$' ? s:lash : ''
+endf
+
+fu! ctrlp#utils#opts()
+	let s:lash = ctrlp#utils#lash()
+	let usrhome = $HOME . s:lash( $HOME )
+	let cahome = exists('$XDG_CACHE_HOME') ? $XDG_CACHE_HOME : usrhome.'.cache'
+	let cadir = isdirectory(usrhome.'.ctrlp_cache')
+		\ ? usrhome.'.ctrlp_cache' : cahome.s:lash(cahome).'ctrlp'
+	if exists('g:ctrlp_cache_dir')
+		let cadir = expand(g:ctrlp_cache_dir, 1)
+		if isdirectory(cadir.s:lash(cadir).'.ctrlp_cache')
+			let cadir = cadir.s:lash(cadir).'.ctrlp_cache'
+		en
+	en
+	let s:cache_dir = cadir
+endf
+cal ctrlp#utils#opts()
+
+let s:wig_cond = v:version > 702 || ( v:version == 702 && has('patch051') )
+" Files and Directories {{{1
+fu! ctrlp#utils#cachedir()
+	retu s:cache_dir
+endf
+
+fu! ctrlp#utils#cachefile(...)
+	let [tail, dir] = [a:0 == 1 ? '.'.a:1 : '', a:0 == 2 ? a:1 : getcwd()]
+	let cache_file = substitute(dir, '\([\/]\|^\a\zs:\)', '%', 'g').tail.'.txt'
+	retu a:0 == 1 ? cache_file : s:cache_dir.s:lash(s:cache_dir).cache_file
+endf
+
+fu! ctrlp#utils#readfile(file)
+	if filereadable(a:file)
+		let data = readfile(a:file)
+		if empty(data) || type(data) != 3
+			unl data
+			let data = []
+		en
+		retu data
+	en
+	retu []
+endf
+
+fu! ctrlp#utils#mkdir(dir)
+	if exists('*mkdir') && !isdirectory(a:dir)
+		sil! cal mkdir(a:dir, 'p')
+	en
+	retu a:dir
+endf
+
+fu! ctrlp#utils#writecache(lines, ...)
+	if isdirectory(ctrlp#utils#mkdir(a:0 ? a:1 : s:cache_dir))
+		sil! cal writefile(a:lines, a:0 >= 2 ? a:2 : ctrlp#utils#cachefile())
+	en
+endf
+
+fu! ctrlp#utils#glob(...)
+	let path = ctrlp#utils#fnesc(a:1, 'g')
+	retu s:wig_cond ? glob(path, a:2) : glob(path)
+endf
+
+fu! ctrlp#utils#globpath(...)
+	retu call('globpath', s:wig_cond ? a:000 : a:000[:1])
+endf
+
+fu! ctrlp#utils#fnesc(path, type, ...)
+	if exists('*fnameescape')
+		if exists('+ssl')
+			if a:type == 'c'
+				let path = escape(a:path, '%#')
+			elsei a:type == 'f'
+				let path = fnameescape(a:path)
+			elsei a:type == 'g'
+				let path = escape(a:path, '?*')
+			en
+			let path = substitute(path, '[', '[[]', 'g')
+		el
+			let path = fnameescape(a:path)
+		en
+	el
+		if exists('+ssl')
+			if a:type == 'c'
+				let path = escape(a:path, '%#')
+			elsei a:type == 'f'
+				let path = escape(a:path, " \t\n%#*?|<\"")
+			elsei a:type == 'g'
+				let path = escape(a:path, '?*')
+			en
+			let path = substitute(path, '[', '[[]', 'g')
+		el
+			let path = escape(a:path, " \t\n*?[{`$\\%#'\"|!<")
+		en
+	en
+	retu a:0 ? escape(path, a:1) : path
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/vim-plugins/bundle/ctrlp.vim/doc/ctrlp.txt b/vim-plugins/bundle/ctrlp.vim/doc/ctrlp.txt
new file mode 100644
index 0000000..e697b93
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/doc/ctrlp.txt
@@ -0,0 +1,1451 @@
+*ctrlp.txt*       Fuzzy file, buffer, mru, tag, ... finder. v1.79
+*CtrlP* *ControlP* *'ctrlp'* *'ctrl-p'*
+===============================================================================
+#                                                                             #
+#          :::::::: ::::::::::: :::::::::  :::             :::::::::          #
+#         :+:    :+:    :+:     :+:    :+: :+:             :+:    :+:         #
+#         +:+           +:+     +:+    +:+ +:+             +:+    +:+         #
+#         +#+           +#+     +#++:++#:  +#+             +#++:++#+          #
+#         +#+           +#+     +#+    +#+ +#+             +#+                #
+#         #+#    #+#    #+#     #+#    #+# #+#             #+#                #
+#          ########     ###     ###    ### ##########      ###                #
+#                                                                             #
+===============================================================================
+CONTENTS                                                       *ctrlp-contents*
+
+    1. Intro........................................|ctrlp-intro|
+    2. Options......................................|ctrlp-options|
+    3. Commands.....................................|ctrlp-commands|
+    4. Mappings.....................................|ctrlp-mappings|
+    5. Input Formats................................|ctrlp-input-formats|
+    6. Extensions...................................|ctrlp-extensions|
+
+===============================================================================
+INTRO                                                             *ctrlp-intro*
+
+Full path fuzzy file, buffer, mru, tag, ... finder with an intuitive interface.
+Written in pure Vimscript for MacVim, gVim and Vim version 7.0+. Has full
+support for Vim's |regexp| as search pattern, built-in MRU files monitoring,
+project's root finder, and more.
+
+To enable optional extensions (tag, dir, rtscript...), see |ctrlp-extensions|.
+
+===============================================================================
+OPTIONS                                                         *ctrlp-options*
+
+Overview:~
+
+  |loaded_ctrlp|................Disable the plugin.
+  |ctrlp_map|...................Default mapping.
+  |ctrlp_cmd|...................Default command used for the default mapping.
+  |ctrlp_by_filename|...........Default to filename mode or not.
+  |ctrlp_regexp|................Default to regexp mode or not.
+  |ctrlp_match_window|..........Order, height and position of the match window.
+  |ctrlp_switch_buffer|.........Jump to an open buffer if already opened.
+  |ctrlp_reuse_window|..........Reuse special windows (help, quickfix, etc).
+  |ctrlp_tabpage_position|......Where to put the new tab page.
+  |ctrlp_working_path_mode|.....How to set CtrlP's local working directory.
+  |ctrlp_root_markers|..........Additional, high priority root markers.
+  |ctrlp_use_caching|...........Use per-session caching or not.
+  |ctrlp_clear_cache_on_exit|...Keep cache after exiting Vim or not.
+  |ctrlp_cache_dir|.............Location of the cache directory.
+  |ctrlp_show_hidden|...........Ignore dotfiles and dotdirs or not.
+  |ctrlp_custom_ignore|.........Hide stuff when using |globpath()|.
+  |ctrlp_max_files|.............Number of files to scan initially.
+  |ctrlp_max_depth|.............Directory depth to recurse into when scanning.
+  |ctrlp_user_command|..........Use an external scanner.
+  |ctrlp_max_history|...........Number of entries saved in the prompt history.
+  |ctrlp_open_new_file|.........How to open a file created by <c-y>.
+  |ctrlp_open_multiple_files|...How to open files selected by <c-z>.
+  |ctrlp_arg_map|...............Intercept <c-y> and <c-o> or not.
+  |ctrlp_follow_symlinks|.......Follow symbolic links or not.
+  |ctrlp_lazy_update|...........Only update when typing has stopped.
+  |ctrlp_default_input|.........Seed the prompt with an initial string.
+  |ctrlp_abbrev|................Input abbreviations.
+  |ctrlp_key_loop|..............Use input looping for multi-byte input.
+  |ctrlp_use_migemo|............Use Migemo patterns for Japanese filenames.
+  |ctrlp_prompt_mappings|.......Change the mappings inside the prompt.
+
+  MRU mode:
+  |ctrlp_mruf_max|..............Max MRU entries to remember.
+  |ctrlp_mruf_exclude|..........Files that shouldn't be remembered.
+  |ctrlp_mruf_include|..........Files to be remembered.
+  |ctrlp_mruf_relative|.........Show only MRU files in the working directory.
+  |ctrlp_mruf_default_order|....Disable sorting.
+  |ctrlp_mruf_case_sensitive|...MRU files are case sensitive or not.
+  |ctrlp_mruf_save_on_update|...Save to disk whenever a new entry is added.
+
+  BufferTag mode: (to enable, see |ctrlp-extensions|)
+  |g:ctrlp_buftag_ctags_bin|....The location of the ctags-compatible binary.
+  |g:ctrlp_buftag_systemenc|....The encoding used for the ctags command.
+  |g:ctrlp_buftag_types|........Add new filetypes and set the cmd arguments.
+
+  Advanced options:
+  |ctrlp_open_func|.............Use custom file opening functions.
+  |ctrlp_status_func|...........Change CtrlP's two statuslines.
+  |ctrlp_buffer_func|...........Call custom functions in the CtrlP buffer.
+  |ctrlp_match_func|............Replace the built-in matching algorithm.
+
+-------------------------------------------------------------------------------
+Detailed descriptions and default values:~
+
+                                                                *'g:ctrlp_map'*
+Use this option to change the mapping to invoke CtrlP in |Normal| mode: >
+  let g:ctrlp_map = '<c-p>'
+<
+
+                                                                *'g:ctrlp_cmd'*
+Set the default opening command to use when pressing the above mapping: >
+  let g:ctrlp_cmd = 'CtrlP'
+<
+
+                                                             *'g:loaded_ctrlp'*
+Use this to disable the plugin completely: >
+  let g:loaded_ctrlp = 1
+<
+
+                                                        *'g:ctrlp_by_filename'*
+Set this to 1 to set searching by filename (as opposed to full path) as the
+default: >
+  let g:ctrlp_by_filename = 0
+<
+Can be toggled on/off by pressing <c-d> inside the prompt.
+
+                                                             *'g:ctrlp_regexp'*
+Set this to 1 to set regexp search as the default: >
+  let g:ctrlp_regexp = 0
+<
+Can be toggled on/off by pressing <c-r> inside the prompt.
+
+                                                       *'g:ctrlp_match_window'*
+Change the postion, the listing order of results, the minimum and the maximum
+heights of the match window: >
+  let g:ctrlp_match_window = ''
+<
+Example: >
+  let g:ctrlp_match_window = 'bottom,order:btt,min:1,max:10,results:10'
+<
+The position: (default: bottom)
+  top - show the match window at the top of the screen.
+  bottom - show the match window at the bottom of the screen.
+
+The listing order of results: (default: btt)
+  order:ttb - from top to bottom.
+  order:btt - from bottom to top.
+
+The minimum and maximum heights:
+  min:{n} - show minimum {n} lines (default: 1).
+  max:{n} - show maximum {n} lines (default: 10).
+
+The maximum number of results:
+  results:{n} - list maximum {n} results (default: sync with max height).
+
+Note: When a setting isn't set, its default value will be used.
+
+                                                      *'g:ctrlp_switch_buffer'*
+When opening a file, if it's already open in a window somewhere, CtrlP will try
+to jump to it instead of opening a new instance: >
+  let g:ctrlp_switch_buffer = 'Et'
+<
+  e - jump when <cr> is pressed, but only to windows in the current tab.
+  t - jump when <c-t> is pressed, but only to windows in another tab.
+  v - like "e", but jump when <c-v> is pressed.
+  h - like "e", but jump when <c-x> is pressed.
+  E, T, V, H - like "e", "t", "v", and "h", but jump to windows anywhere.
+  0 or <empty> - disable this feature.
+
+                                                       *'g:ctrlp_reuse_window'*
+When opening a file with <cr>, CtrlP avoids opening it in windows created by
+plugins, help and quickfix. Use this to setup some exceptions: >
+  let g:ctrlp_reuse_window = 'netrw'
+<
+Acceptable values are partial name, filetype or buftype of the special buffers.
+Use regexp to specify the pattern.
+Example: >
+  let g:ctrlp_reuse_window = 'netrw\|help\|quickfix'
+<
+
+                                                   *'g:ctrlp_tabpage_position'*
+Where to put the new tab page when opening one: >
+  let g:ctrlp_tabpage_position = 'ac'
+<
+  a - after.
+  b - before.
+  c - the current tab page.
+  l - the last tab page.
+  f - the first tab page.
+
+                                                  *'g:ctrlp_working_path_mode'*
+When starting up, CtrlP sets its local working directory according to this
+variable: >
+  let g:ctrlp_working_path_mode = 'ra'
+<
+  c - the directory of the current file.
+  a - like "c", but only applies when the current working directory outside of
+      CtrlP isn't a direct ancestor of the directory of the current file.
+  r - the nearest ancestor that contains one of these directories or files:
+      .git .hg .svn .bzr _darcs
+  w - begin finding a root from the current working directory outside of CtrlP
+      instead of from the directory of the current file (default). Only applies
+      when "r" is also present.
+  0 or <empty> - disable this feature.
+
+Note #1: if "a" or "c" is included with "r", use the behavior of "a" or "c" (as
+a fallback) when a root can't be found.
+
+Note #2: you can use a |b:var| to set this option on a per buffer basis.
+
+                                                       *'g:ctrlp_root_markers'*
+Use this to set your own root markers in addition to the default ones (.git,
+.hg, .svn, .bzr, and _darcs). Your markers will take precedence: >
+  let g:ctrlp_root_markers = ['']
+<
+Note: you can use a |b:var| to set this option on a per buffer basis.
+
+                                                        *'g:ctrlp_use_caching'*
+Enable/Disable per-session caching: >
+  let g:ctrlp_use_caching = 1
+<
+  0 - Disable caching.
+  1 - Enable caching.
+  n - When bigger than 1, disable caching and use the number as the limit to
+      enable caching again.
+
+Note: you can quickly purge the cache by pressing <F5> while inside CtrlP.
+
+                                                *'g:ctrlp_clear_cache_on_exit'*
+Set this to 0 to enable cross-session caching by not deleting the cache files
+upon exiting Vim: >
+  let g:ctrlp_clear_cache_on_exit = 1
+<
+
+                                                          *'g:ctrlp_cache_dir'*
+Set the directory to store the cache files: >
+  let g:ctrlp_cache_dir = $HOME.'/.cache/ctrlp'
+<
+
+                                                        *'g:ctrlp_show_hidden'*
+Set this to 1 if you want CtrlP to scan for dotfiles and dotdirs: >
+  let g:ctrlp_show_hidden = 0
+<
+Note: does not apply when a command defined with |g:ctrlp_user_command| is
+being used.
+
+                                                           *'ctrlp-wildignore'*
+You can use Vim's |'wildignore'| to exclude files and directories from the
+results.
+Examples: >
+  " Excluding version control directories
+  set wildignore+=*/.git/*,*/.hg/*,*/.svn/*        " Linux/MacOSX
+  set wildignore+=*\\.git\\*,*\\.hg\\*,*\\.svn\\*  " Windows ('noshellslash')
+<
+Note #1: the `*/` in front of each directory glob is required.
+
+Note #2: |wildignore| influences the result of |expand()|, |globpath()| and
+|glob()| which many plugins use to find stuff on the system (e.g. VCS related
+plugins look for .git/, .hg/,... some other plugins look for external *.exe
+tools on Windows). So be a little mindful of what you put in your |wildignore|.
+
+                                                      *'g:ctrlp_custom_ignore'*
+In addition to |'wildignore'|, use this for files and directories you want only
+CtrlP to not show. Use regexp to specify the patterns: >
+  let g:ctrlp_custom_ignore = ''
+<
+Examples: >
+  let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$'
+  let g:ctrlp_custom_ignore = {
+    \ 'dir':  '\v[\/]\.(git|hg|svn)$',
+    \ 'file': '\v\.(exe|so|dll)$',
+    \ 'link': 'SOME_BAD_SYMBOLIC_LINKS',
+    \ }
+  let g:ctrlp_custom_ignore = {
+    \ 'file': '\v(\.cpp|\.h|\.hh|\.cxx)@<!$'
+    \ }
+<
+Note #1: by default, |wildignore| and |g:ctrlp_custom_ignore| only apply when
+|globpath()| is used to scan for files, thus these options do not apply when a
+command defined with |g:ctrlp_user_command| is being used.
+
+Note #2: when changing the option's variable type, remember to |:unlet| it
+first or restart Vim to avoid the "E706: Variable type mismatch" error.
+
+                                                          *'g:ctrlp_max_files'*
+The maximum number of files to scan, set to 0 for no limit: >
+  let g:ctrlp_max_files = 10000
+<
+Note: does not apply when a command defined with |g:ctrlp_user_command| is
+being used.
+
+                                                          *'g:ctrlp_max_depth'*
+The maximum depth of a directory tree to recurse into: >
+  let g:ctrlp_max_depth = 40
+<
+Note: does not apply when a command defined with |g:ctrlp_user_command| is
+being used.
+
+                                                       *'g:ctrlp_user_command'*
+Specify an external tool to use for listing files instead of using Vim's
+|globpath()|. Use %s in place of the target directory: >
+  let g:ctrlp_user_command = ''
+<
+Examples: >
+  let g:ctrlp_user_command = 'find %s -type f'       " MacOSX/Linux
+  let g:ctrlp_user_command = 'dir %s /-n /b /s /a-d' " Windows
+<
+You can also use 'grep', 'findstr' or something else to filter the results.
+Examples: >
+  let g:ctrlp_user_command =
+    \ 'find %s -type f | grep -v -P "\.jpg$|/tmp/"'          " MacOSX/Linux
+  let g:ctrlp_user_command =
+    \ 'dir %s /-n /b /s /a-d | findstr /v /l ".jpg \\tmp\\"' " Windows
+<
+Use a version control listing command when inside a repository, this is faster
+when scanning large projects: >
+  let g:ctrlp_user_command = [root_marker, listing_command, fallback_command]
+  let g:ctrlp_user_command = {
+    \ 'types': {
+      \ 1: [root_marker_1, listing_command_1],
+      \ n: [root_marker_n, listing_command_n],
+      \ },
+    \ 'fallback': fallback_command,
+    \ 'ignore': 0 or 1
+    \ }
+<
+Some examples: >
+  " Single VCS, listing command does not list untracked files:
+  let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files']
+  let g:ctrlp_user_command = ['.hg', 'hg --cwd %s locate -I .']
+
+  " Multiple VCS's:
+  let g:ctrlp_user_command = {
+    \ 'types': {
+      \ 1: ['.git', 'cd %s && git ls-files'],
+      \ 2: ['.hg', 'hg --cwd %s locate -I .'],
+      \ },
+    \ 'fallback': 'find %s -type f'
+    \ }
+
+  " Single VCS, listing command lists untracked files (slower):
+  let g:ctrlp_user_command =
+    \ ['.git', 'cd %s && git ls-files . -co --exclude-standard']
+
+  let g:ctrlp_user_command =
+    \ ['.hg', 'hg --cwd %s status -numac -I . $(hg root)'] " MacOSX/Linux
+
+  let g:ctrlp_user_command = ['.hg', 'for /f "tokens=1" %%a in (''hg root'') '
+    \ . 'do hg --cwd %s status -numac -I . %%a']           " Windows
+<
+Note #1: in the |Dictionary| format, 'fallback' and 'ignore' are optional. In
+the |List| format, fallback_command is optional.
+
+Note #2: if the fallback_command is empty or the 'fallback' key is not defined,
+|globpath()| will then be used when scanning outside of a repository.
+
+Note #3: unless the |Dictionary| format is used and 'ignore' is defined and set
+to 1, the |wildignore| and |g:ctrlp_custom_ignore| options do not apply when
+these custom commands are being used. When not present, 'ignore' is set to 0 by
+default to retain the performance advantage of using external commands.
+
+Note #4: when changing the option's variable type, remember to |:unlet| it
+first or restart Vim to avoid the "E706: Variable type mismatch" error.
+
+Note #5: you can use a |b:var| to set this option on a per buffer basis.
+
+                                                        *'g:ctrlp_max_history'*
+The maximum number of input strings you want CtrlP to remember. The default
+value mirrors Vim's global |'history'| option: >
+  let g:ctrlp_max_history = &history
+<
+Set to 0 to disable prompt's history. Browse the history with <c-n> and <c-p>.
+
+                                                      *'g:ctrlp_open_new_file'*
+Use this option to specify how the newly created file is to be opened when
+pressing <c-y>: >
+  let g:ctrlp_open_new_file = 'v'
+<
+  t - in a new tab.
+  h - in a new horizontal split.
+  v - in a new vertical split.
+  r - in the current window.
+
+                                                *'g:ctrlp_open_multiple_files'*
+If non-zero, this will enable opening multiple files with <c-z> and <c-o>: >
+  let g:ctrlp_open_multiple_files = 'v'
+<
+Example: >
+  let g:ctrlp_open_multiple_files = '2vjr'
+<
+For the number:
+  - If given, it'll be used as the maximum number of windows or tabs to create
+    when opening the files (the rest will be opened as hidden buffers).
+  - If not given, <c-o> will open all files, each in a new window or new tab.
+
+For the letters:
+  t - each file in a new tab.
+  h - each file in a new horizontal split.
+  v - each file in a new vertical split.
+  i - all files as hidden buffers.
+  j - after opening, jump to the first opened tab or window.
+  r - open the first file in the current window, then the remaining files in
+      new splits or new tabs depending on which of "h", "v" and "t" is also
+      present.
+
+                                                            *'g:ctrlp_arg_map'*
+When this is set to 1, the <c-o> and <c-y> mappings will accept one extra key
+as an argument to override their default behavior: >
+  let g:ctrlp_arg_map = 0
+<
+Pressing <c-o> or <c-y> will then prompt for a keypress. The key can be:
+  t - open in tab(s)
+  h - open in horizontal split(s)
+  v - open in vertical split(s)
+  i - open as hidden buffers (for <c-o> only)
+  c - clear the marked files (for <c-o> only)
+  r - open in the current window (for <c-y> only)
+  <esc>, <c-c>, <c-u> - cancel and go back to the prompt.
+  <cr> - use the default behavior specified with |g:ctrlp_open_new_file| and
+  |g:ctrlp_open_multiple_files|.
+
+                                                    *'g:ctrlp_follow_symlinks'*
+If non-zero, CtrlP will follow symbolic links when listing files: >
+  let g:ctrlp_follow_symlinks = 0
+<
+  0 - don't follow symbolic links.
+  1 - follow but ignore looped internal symlinks to avoid duplicates.
+  2 - follow all symlinks indiscriminately.
+
+Note: does not apply when a command defined with |g:ctrlp_user_command| is
+being used.
+
+                                                        *'g:ctrlp_lazy_update'*
+Set this to 1 to enable the lazy-update feature: only update the match window
+after typing's been stopped for a certain amount of time: >
+  let g:ctrlp_lazy_update = 0
+<
+If is 1, update after 250ms. If bigger than 1, the number will be used as the
+delay time in milliseconds.
+
+                                                      *'g:ctrlp_default_input'*
+Set this to 1 to enable seeding the prompt with the current file's relative
+path: >
+  let g:ctrlp_default_input = 0
+<
+Instead of 1 or 0, if the value of the option is a string, it'll be used as-is
+as the default input: >
+  let g:ctrlp_default_input = 'anystring'
+<
+
+                                                             *'g:ctrlp_abbrev'*
+Define input abbreviations that can be expanded (either internally or visibly)
+in the prompt: >
+  let g:ctrlp_abbrev = {}
+<
+Examples: >
+  let g:ctrlp_abbrev = {
+    \ 'gmode': 'i',
+    \ 'abbrevs': [
+      \ {
+        \ 'pattern': '^cd b',
+        \ 'expanded': '@cd ~/.vim/bundle',
+        \ 'mode': 'pfrz',
+      \ },
+      \ {
+        \ 'pattern': '\(^@.\+\|\\\@<!:.\+\)\@<! ',
+        \ 'expanded': '.\{-}',
+        \ 'mode': 'pfr',
+      \ },
+      \ {
+        \ 'pattern': '\\\@<!:.\+\zs\\\@<! ',
+        \ 'expanded': '\ ',
+        \ 'mode': 'pfz',
+      \ },
+      \ ]
+    \ }
+<
+The 'pattern' string is regexp matched against the entered input. The expansion
+is as if the 'expanded' string was typed into the prompt.
+
+For 'gmode' (optional):
+  i - expand internally (default).
+  t - insert the expanded results into the prompt as you type.
+  k - insert the expanded results when a non-keyword character is typed. Only
+      applies when "t" is also present.
+
+For 'mode' (of each entry; optional):
+  f - only in filename mode.
+  p - only in full path mode.
+  r - only in regexp mode.
+  z - only in fuzzy mode.
+  n - only when creating a new file with <c-y> (use the expanded string in the
+      new filename).
+  c - only when auto-completing directory names with <tab> (expand the pattern
+      immediately before doing the auto-completion).
+  <empty> or not defined - always enable.
+
+Note: the abbrev entries are evaluated in sequence, so a later entry can be
+evaluated against the expanded result of a previous entry; this includes itself
+when 'gmode' is "t".
+
+                                                           *'g:ctrlp_key_loop'*
+An experimental feature. Set this to 1 to enable input looping for the typing
+of multi-byte characters: >
+  let g:ctrlp_key_loop = 0
+<
+Note #1: when set, this option resets the |g:ctrlp_lazy_update| option.
+
+Note #2: you can toggle this feature inside the prompt with a custom mapping: >
+  let g:ctrlp_prompt_mappings = { 'ToggleKeyLoop()': ['<F3>'] }
+<
+
+                                                         *'g:ctrlp_use_migemo'*
+Set this to 1 to use Migemo Pattern for Japanese filenames. Migemo Search only
+works in regexp mode. To split the pattern, separate words with space: >
+  let g:ctrlp_use_migemo = 0
+<
+
+                                                    *'g:ctrlp_prompt_mappings'*
+Use this to customize the mappings inside CtrlP's prompt to your liking. You
+only need to keep the lines that you've changed the values (inside []): >
+  let g:ctrlp_prompt_mappings = {
+    \ 'PrtBS()':              ['<bs>', '<c-]>'],
+    \ 'PrtDelete()':          ['<del>'],
+    \ 'PrtDeleteWord()':      ['<c-w>'],
+    \ 'PrtClear()':           ['<c-u>'],
+    \ 'PrtSelectMove("j")':   ['<c-j>', '<down>'],
+    \ 'PrtSelectMove("k")':   ['<c-k>', '<up>'],
+    \ 'PrtSelectMove("t")':   ['<Home>', '<kHome>'],
+    \ 'PrtSelectMove("b")':   ['<End>', '<kEnd>'],
+    \ 'PrtSelectMove("u")':   ['<PageUp>', '<kPageUp>'],
+    \ 'PrtSelectMove("d")':   ['<PageDown>', '<kPageDown>'],
+    \ 'PrtHistory(-1)':       ['<c-n>'],
+    \ 'PrtHistory(1)':        ['<c-p>'],
+    \ 'AcceptSelection("e")': ['<cr>', '<2-LeftMouse>'],
+    \ 'AcceptSelection("h")': ['<c-x>', '<c-cr>', '<c-s>'],
+    \ 'AcceptSelection("t")': ['<c-t>'],
+    \ 'AcceptSelection("v")': ['<c-v>', '<RightMouse>'],
+    \ 'ToggleFocus()':        ['<s-tab>'],
+    \ 'ToggleRegex()':        ['<c-r>'],
+    \ 'ToggleByFname()':      ['<c-d>'],
+    \ 'ToggleType(1)':        ['<c-f>', '<c-up>'],
+    \ 'ToggleType(-1)':       ['<c-b>', '<c-down>'],
+    \ 'PrtExpandDir()':       ['<tab>'],
+    \ 'PrtInsert("c")':       ['<MiddleMouse>', '<insert>'],
+    \ 'PrtInsert()':          ['<c-\>'],
+    \ 'PrtCurStart()':        ['<c-a>'],
+    \ 'PrtCurEnd()':          ['<c-e>'],
+    \ 'PrtCurLeft()':         ['<c-h>', '<left>', '<c-^>'],
+    \ 'PrtCurRight()':        ['<c-l>', '<right>'],
+    \ 'PrtClearCache()':      ['<F5>'],
+    \ 'PrtDeleteEnt()':       ['<F7>'],
+    \ 'CreateNewFile()':      ['<c-y>'],
+    \ 'MarkToOpen()':         ['<c-z>'],
+    \ 'OpenMulti()':          ['<c-o>'],
+    \ 'PrtExit()':            ['<esc>', '<c-c>', '<c-g>'],
+    \ }
+<
+Note: if pressing <bs> moves the cursor one character to the left instead of
+deleting a character for you, add this to your |.vimrc| to disable the plugin's
+default <c-h> mapping: >
+  let g:ctrlp_prompt_mappings = { 'PrtCurLeft()': ['<left>', '<c-^>'] }
+<
+
+----------------------------------------
+MRU mode options:~
+
+                                                           *'g:ctrlp_mruf_max'*
+Specify the number of recently opened files you want CtrlP to remember: >
+  let g:ctrlp_mruf_max = 250
+<
+
+                                                       *'g:ctrlp_mruf_exclude'*
+Files you don't want CtrlP to remember. Use regexp to specify the patterns: >
+  let g:ctrlp_mruf_exclude = ''
+<
+Examples: >
+  let g:ctrlp_mruf_exclude = '/tmp/.*\|/temp/.*' " MacOSX/Linux
+  let g:ctrlp_mruf_exclude = '^C:\\dev\\tmp\\.*' " Windows
+<
+
+                                                       *'g:ctrlp_mruf_include'*
+And if you want CtrlP to only remember some files, specify them here: >
+  let g:ctrlp_mruf_include = ''
+<
+Example: >
+  let g:ctrlp_mruf_include = '\.py$\|\.rb$'
+<
+
+                                                      *'g:ctrlp_mruf_relative'*
+Set this to 1 to show only MRU files in the current working directory: >
+  let g:ctrlp_mruf_relative = 0
+<
+Note: you can use a custom mapping to toggle this option inside the prompt: >
+  let g:ctrlp_prompt_mappings = { 'ToggleMRURelative()': ['<F2>'] }
+<
+
+                                                 *'g:ctrlp_mruf_default_order'*
+Set this to 1 to disable sorting when searching in MRU mode: >
+  let g:ctrlp_mruf_default_order = 0
+<
+
+                                                *'g:ctrlp_mruf_case_sensitive'*
+Match this with your file system case-sensitivity setting to avoid duplicate
+MRU entries: >
+  let g:ctrlp_mruf_case_sensitive = 1
+<
+
+                                                *'g:ctrlp_mruf_save_on_update'*
+Set this to 0 to disable saving of the MRU list to hard drive whenever a new
+entry is added, saving will then only occur when exiting Vim: >
+  let g:ctrlp_mruf_save_on_update = 1
+<
+
+----------------------------------------
+Advanced options:~
+
+                                                          *'g:ctrlp_open_func'*
+Define a custom function to open the selected file: >
+  let g:ctrlp_open_func = {}
+<
+Example: >
+  let g:ctrlp_open_func = {
+    \ 'files'     : 'Function_Name_1',
+    \ 'buffers'   : 'Function_Name_2',
+    \ 'mru files' : 'Function_Name_3',
+    \ }
+<
+Structure of the functions: >
+  function! Function_Name(action, line)
+    " Arguments:
+    " |
+    " +- a:action : The opening action:
+    " |             + 'e' : user pressed <cr>  (default)
+    " |             + 'h' : user pressed <c-x> (default)
+    " |             + 'v' : user pressed <c-v> (default)
+    " |             + 't' : user pressed <c-t> (default)
+    " |             + 'x' : user used the <c-o> console dialog (default) and
+    " |                     chose "e[x]ternal".
+    " |
+    " +- a:line   : The selected line.
+
+  endfunction
+<
+Note: does not apply when opening multiple files with <c-z> and <c-o>.
+
+Example: open HTML files in the default web browser when <c-t> is pressed and
+in Vim otherwise >
+  function! HTMLOpenFunc(action, line)
+    if a:action =~ '^[tx]$' && fnamemodify(a:line, ':e') =~? '^html\?$'
+
+      " Get the filename
+      let filename = fnameescape(fnamemodify(a:line, ':p'))
+
+      " Close CtrlP
+      call ctrlp#exit()
+
+      " Open the file
+      silent! execute '!xdg-open' filename
+
+    elseif a:action == 'x' && fnamemodify(a:line, ':e') !~? '^html\?$'
+
+      " Not a HTML file, simulate pressing <c-o> again and wait for new input
+      call feedkeys("\<c-o>")
+
+    else
+
+      " Use CtrlP's default file opening function
+      call call('ctrlp#acceptfile', [a:action, a:line])
+
+    endif
+  endfunction
+
+  let g:ctrlp_open_func = { 'files': 'HTMLOpenFunc' }
+<
+
+                                                        *'g:ctrlp_status_func'*
+Use this to customize the statuslines for the CtrlP window: >
+  let g:ctrlp_status_func = {}
+<
+Example: >
+  let g:ctrlp_status_func = {
+    \ 'main': 'Function_Name_1',
+    \ 'prog': 'Function_Name_2',
+    \ }
+<
+Structure of the functions: >
+  " Main statusline
+  function! Function_Name_1(focus, byfname, regex, prev, item, next, marked)
+    " Arguments:
+    " |
+    " +- a:focus   : The focus of the prompt: "prt" or "win".
+    " |
+    " +- a:byfname : In filename mode or in full path mode: "file" or "path".
+    " |
+    " +- a:regex   : In regex mode: 1 or 0.
+    " |
+    " +- a:prev    : The previous search mode.
+    " |
+    " +- a:item    : The current search mode.
+    " |
+    " +- a:next    : The next search mode.
+    " |
+    " +- a:marked  : The number of marked files, or a comma separated list of
+    "                the marked filenames.
+
+    return full_statusline
+  endfunction
+
+  " Progress statusline
+  function! Function_Name_2(str)
+    " a:str : Either the number of files scanned so far, or a string indicating
+    "         the current directory is being scanned with a user_command.
+
+    return full_statusline
+  endfunction
+<
+See https://gist.github.com/1610859 for a working example.
+
+                                                        *'g:ctrlp_buffer_func'*
+Specify the functions that will be called after entering and before exiting the
+CtrlP buffer: >
+  let g:ctrlp_buffer_func = {}
+<
+Example: >
+  let g:ctrlp_buffer_func = {
+    \ 'enter': 'Function_Name_1',
+    \ 'exit':  'Function_Name_2',
+    \ }
+<
+
+                                                         *'g:ctrlp_match_func'*
+Set an external fuzzy matching function for CtrlP to use: >
+  let g:ctrlp_match_func = {}
+<
+Example: >
+  let g:ctrlp_match_func = { 'match': 'Function_Name' }
+<
+Structure of the function: >
+  function! Function_Name(items, str, limit, mmode, ispath, crfile, regex)
+    " Arguments:
+    " |
+    " +- a:items  : The full list of items to search in.
+    " |
+    " +- a:str    : The string entered by the user.
+    " |
+    " +- a:limit  : The max height of the match window. Can be used to limit
+    " |             the number of items to return.
+    " |
+    " +- a:mmode  : The match mode. Can be one of these strings:
+    " |             + "full-line": match the entire line.
+    " |             + "filename-only": match only the filename.
+    " |             + "first-non-tab": match until the first tab char.
+    " |             + "until-last-tab": match until the last tab char.
+    " |
+    " +- a:ispath : Is 1 when searching in file, buffer, mru, mixed, dir, and
+    " |             rtscript modes. Is 0 otherwise.
+    " |
+    " +- a:crfile : The file in the current window. Should be excluded from the
+    " |             results when a:ispath == 1.
+    " |
+    " +- a:regex  : In regex mode: 1 or 0.
+
+    return list_of_matched_items
+  endfunction
+<
+
+Note: you can extend any of the above options with { 'arg_type': 'dict' } to
+enable passing all the function arguments in a single Dictionary argument. Use
+the existing argument names as keys in this Dictionary.
+
+Example: >
+  let g:ctrlp_status_func = {
+    \ 'arg_type' : 'dict',
+    \ 'enter': 'Function_Name_1',
+    \ 'exit':  'Function_Name_2',
+    \ }
+
+  function! Function_Name_1(dict)
+    " where dict == {
+    " \ 'focus':   value,
+    " \ 'byfname': value,
+    " \ 'regex':   value,
+    " \ ...
+    " }
+  endfunction
+<
+
+===============================================================================
+COMMANDS                                                       *ctrlp-commands*
+
+                                                                       *:CtrlP*
+:CtrlP [starting-directory]
+   Open CtrlP in find file mode.
+
+   If no argument is given, the value of |g:ctrlp_working_path_mode| will be
+   used to determine the starting directory.
+
+   You can use <tab> to auto-complete the [starting-directory] when typing it.
+
+                                                                 *:CtrlPBuffer*
+:CtrlPBuffer
+   Open CtrlP in find buffer mode.
+
+                                                                    *:CtrlPMRU*
+:CtrlPMRU
+   Open CtrlP in find Most-Recently-Used file mode.
+
+                                                               *:CtrlPLastMode*
+:CtrlPLastMode [--dir]
+   Open CtrlP in the last mode used. When having the "--dir" argument, also
+   reuse the last working directory.
+
+                                                                   *:CtrlPRoot*
+:CtrlPRoot
+    This acts like |:CtrlP| with |g:ctrlp_working_path_mode| = 'r' and ignores
+    the variable's current value.
+
+                                                             *:CtrlPClearCache*
+:CtrlPClearCache
+   Flush the cache for the current working directory. The same as pressing <F5>
+   inside CtrlP.
+   To enable or disable caching, use the |g:ctrlp_use_caching| option.
+
+                                                         *:CtrlPClearAllCaches*
+:CtrlPClearAllCaches
+   Delete all the cache files saved in |g:ctrlp_cache_dir| location.
+
+-------------------------------------------------------------------------------
+For commands provided by bundled extensions, see |ctrlp-extensions|.
+
+===============================================================================
+MAPPINGS                                                       *ctrlp-mappings*
+
+                                                                *'ctrlp-<c-p>'*
+<c-p>
+   Default |Normal| mode mapping to open the CtrlP prompt in find file mode.
+
+----------------------------------------
+Once inside the prompt:~
+
+  <c-d>
+    Toggle between full-path search and filename only search.
+    Note: in filename mode, the prompt's base is '>d>' instead of '>>>'
+
+  <c-r>                                                    *'ctrlp-fullregexp'*
+    Toggle between the string mode and full regexp mode.
+    Note: in full regexp mode, the prompt's base is 'r>>' instead of '>>>'
+
+    See also: |input-formats| (guide) and |g:ctrlp_regexp_search| (option).
+
+  <c-f>, 'forward'
+  <c-up>
+    Scroll to the 'next' search mode in the sequence.
+
+  <c-b>, 'backward'
+  <c-down>
+    Scroll to the 'previous' search mode in the sequence.
+
+  <tab>                                                *'ctrlp-autocompletion'*
+    Auto-complete directory names under the current working directory inside
+    the prompt.
+
+  <s-tab>
+    Toggle the focus between the match window and the prompt.
+
+  <esc>,
+  <c-c>
+    Exit CtrlP.
+
+Moving:~
+
+  <c-j>,
+  <down>
+    Move selection down.
+
+  <c-k>,
+  <up>
+    Move selection up.
+
+  <c-a>
+    Move the cursor to the 'start' of the prompt.
+
+  <c-e>
+    Move the cursor to the 'end' of the prompt.
+
+  <c-h>,
+  <left>,
+  <c-^>
+    Move the cursor one character to the 'left'.
+
+  <c-l>,
+  <right>
+    Move the cursor one character to the 'right'.
+
+Editing:~
+
+  <c-]>,
+  <bs>
+    Delete the preceding character.
+
+  <del>
+    Delete the current character.
+
+  <c-w>
+    Delete a preceding inner word.
+
+  <c-u>
+    Clear the input field.
+
+Browsing input history:~
+
+  <c-n>
+    Next string in the prompt's history.
+
+  <c-p>
+    Previous string in the prompt's history.
+
+Opening/Creating a file:~
+
+  <cr>
+    Open the selected file in the 'current' window if possible.
+
+  <c-t>
+    Open the selected file in a new 'tab'.
+
+  <c-v>
+    Open the selected file in a 'vertical' split.
+
+  <c-x>,
+  <c-cr>,
+  <c-s>
+    Open the selected file in a 'horizontal' split.
+
+  <c-y>
+    Create a new file and its parent directories.
+
+Opening multiple files:~
+
+  <c-z>
+    - Mark/unmark a file to be opened with <c-o>.
+    - Mark/unmark a file to create a new file in its directory using <c-y>.
+
+  <c-o>
+    - Open files marked by <c-z>.
+    - When no file has been marked by <c-z>, open a console dialog with the
+      following options:
+
+      Open the selected file:
+        t - in a tab page.
+        v - in a vertical split.
+        h - in a horizontal split.
+        r - in the current window.
+        i - as a hidden buffer.
+        x - (optional) with the function defined in |g:ctrlp_open_func|.
+
+      Other options (not shown):
+        a - mark all files in the match window.
+        d - change CtrlP's local working directory to the selected file's
+            directory and switch to find file mode.
+
+Function keys:~
+
+  <F5>
+    - Refresh the match window and purge the cache for the current directory.
+    - Remove deleted files from the MRU list.
+
+  <F7>
+    - Wipe the MRU list.
+    - Delete MRU entries marked by <c-z>.
+
+Pasting:~
+
+  <Insert>,                                                   *'ctrlp-pasting'*
+  <MiddleMouse>
+    Paste the clipboard content into the prompt.
+
+  <c-\>
+    Open a console dialog to paste <cword>, <cfile>, the content of the search
+    register, the last visual selection, the clipboard or any register into the
+    prompt.
+
+Choose your own mappings with |g:ctrlp_prompt_mappings|.
+
+----------------------------------------
+When inside the match window (press <s-tab> to switch):~
+
+  a-z
+  0-9
+  ~^-=;`',.+!@#$%&_(){}[]
+    Cycle through the lines which have the matching first character.
+
+===============================================================================
+INPUT FORMATS                                             *ctrlp-input-formats*
+
+Formats for inputting in the prompt:~
+
+a)  Simple string.
+
+    E.g. 'abc' is understood internally as 'a[^a]\{-}b[^b]\{-}c'
+
+b)  When in regexp mode, the input string's treated as a Vim's regexp |pattern|
+    without any modification.
+
+    E.g. 'abc\d*efg' will be read as 'abc\d*efg'.
+
+    See |ctrlp-fullregexp| (keymap) and |g:ctrlp_regexp_search| (option) for
+    how to enable regexp mode.
+
+c)  End the string with a colon ':' followed by a Vim command to execute that
+    command after opening the file. If you need to use ':' literally, escape it
+    with a backslash: '\:'. When opening multiple files, the command will be
+    executed on each opening file.
+
+    E.g. Use ':45' to jump to line 45.
+
+         Use ':/any\:string' to jump to the first instance of 'any:string'.
+
+         Use ':+setf\ myfiletype|50' to set the filetype to 'myfiletype', then
+         jump to line 50.
+
+         Use ':diffthis' when opening multiple files to run |:diffthis| on the
+         first 4 files.
+
+    See also: Vim's |++opt| and |+cmd|.
+
+d)  Submit two dots '..' to go upward the directory tree by 1 level. To go up
+    multiple levels, use one extra dot for each extra level:
+>
+         Raw input    Interpreted as
+         ..           ../
+         ...          ../../
+         ....         ../../../
+<
+    Note: if the parent directories are large and uncached, this can be slow.
+
+    You can also use '@cd path/' to change CtrlP's local working directory.
+    Use '@cd %:h' to change to the directory of the current file.
+
+e)  Similarly, submit '/' or '\' to find and go to the project's root.
+
+    If the project is large, using a VCS listing command to look for files
+    might help speeding up the intial scan (see |g:ctrlp_user_command| for more
+    details).
+
+    Note: d) and e) only work in file, directory and mixed modes.
+
+f)  Type the name of a non-existent file and press <c-y> to create it. Mark a
+    file with <c-z> to create the new file in the same directory as the marked
+    file.
+
+    E.g. Using 'newdir/newfile.txt' will create a directory named 'newdir' as
+         well as a file named 'newfile.txt'.
+
+         If an entry 'some/old/dirs/oldfile.txt' is marked with <c-z>, then
+         'newdir' and 'newfile.txt' will be created under 'some/old/dirs'. The
+         final path will then be 'some/old/dirs/newdir/newfile.txt'.
+
+    Note: use '\' in place of '/' on Windows (if |'shellslash'| is not set).
+
+g)  In filename mode (toggle with <c-d>), you can use one primary pattern and
+    one refining pattern separated by a semicolon. Both patterns work like (a),
+    or (b) when in regexp mode.
+
+h)  Submit ? to open this help file.
+
+===============================================================================
+EXTENSIONS                                                   *ctrlp-extensions*
+
+Extensions are optional. To enable an extension, add its name to the variable
+g:ctrlp_extensions: >
+  let g:ctrlp_extensions = ['tag', 'buffertag', 'quickfix', 'dir', 'rtscript',
+                          \ 'undo', 'line', 'changes', 'mixed', 'bookmarkdir']
+<
+The order of the items will be the order they appear on the statusline and when
+using <c-f>, <c-b>.
+
+Available extensions:~
+
+                                                                    *:CtrlPTag*
+  * Tag mode:~
+    - Name: 'tag'
+    - Command: ":CtrlPTag"
+    - Search for a tag within a generated central tags file, and jump to the
+      definition. Use the Vim's option |'tags'| to specify the names and the
+      locations of the tags file(s).
+      E.g. set tags+=doc/tags
+
+                                                                 *:CtrlPBufTag*
+                                                              *:CtrlPBufTagAll*
+  * Buffer Tag mode:~
+    - Name: 'buffertag'
+    - Commands: ":CtrlPBufTag [buffer]",
+                ":CtrlPBufTagAll".
+    - Search for a tag within the current buffer or all listed buffers and jump
+      to the definition. Requires |exuberant_ctags| or compatible programs.
+
+                                                               *:CtrlPQuickfix*
+  * Quickfix mode:~
+    - Name: 'quickfix'
+    - Command: ":CtrlPQuickfix"
+    - Search for an entry in the current quickfix errors and jump to it.
+
+                                                                    *:CtrlPDir*
+  * Directory mode:~
+    - Name: 'dir'
+    - Command: ":CtrlPDir [starting-directory]"
+    - Search for a directory and change the working directory to it.
+    - Mappings:
+      + <cr> change the local working directory for CtrlP and keep it open.
+      + <c-t> change the global working directory (exit).
+      + <c-v> change the local working directory for the current window (exit).
+      + <c-x> change the global working directory to CtrlP's current local
+        working directory (exit).
+
+                                                                    *:CtrlPRTS*
+  * Runtime script mode:~
+    - Name: 'rtscript'
+    - Command: ":CtrlPRTS"
+    - Search for files (vimscripts, docs, snippets...) in runtimepath.
+
+                                                                   *:CtrlPUndo*
+  * Undo mode:~
+    - Name: 'undo'
+    - Command: ":CtrlPUndo"
+    - Browse undo history.
+
+                                                                   *:CtrlPLine*
+  * Line mode:~
+    - Name: 'line'
+    - Command: ":CtrlPLine [buffer]"
+    - Search for a line in all listed buffers or in the specified [buffer].
+
+                                                                 *:CtrlPChange*
+                                                              *:CtrlPChangeAll*
+  * Change list mode:~
+    - Name: 'changes'
+    - Commands: ":CtrlPChange [buffer]",
+                ":CtrlPChangeAll".
+    - Search for and jump to a recent change in the current buffer or in all
+      listed buffers.
+
+                                                                  *:CtrlPMixed*
+  * Mixed mode:~
+    - Name: 'mixed'
+    - Command: ":CtrlPMixed"
+    - Search in files, buffers and MRU files at the same time.
+
+                                                            *:CtrlPBookmarkDir*
+                                                         *:CtrlPBookmarkDirAdd*
+  * BookmarkDir mode:~
+    - Name: 'bookmarkdir'
+    - Commands: ":CtrlPBookmarkDir",
+                ":CtrlPBookmarkDirAdd [directory]".
+    - Search for a bookmarked directory and change the working directory to it.
+    - Mappings:
+      + <cr> change the local working directory for CtrlP, keep it open and
+        switch to find file mode.
+      + <c-x> change the global working directory (exit).
+      + <c-v> change the local working directory for the current window (exit).
+      + <F7>
+        - Wipe bookmark list.
+        - Delete entries marked by <c-z>.
+
+----------------------------------------
+Buffer Tag mode options:~
+
+                                                   *'g:ctrlp_buftag_ctags_bin'*
+If ctags isn't in your $PATH, use this to set its location: >
+  let g:ctrlp_buftag_ctags_bin = ''
+<
+
+                                                   *'g:ctrlp_buftag_systemenc'*
+Match this with your OS's encoding (not Vim's). The default value mirrors Vim's
+global |'encoding'| option: >
+  let g:ctrlp_buftag_systemenc = &encoding
+<
+
+                                                       *'g:ctrlp_buftag_types'*
+Use this to set the arguments for ctags, jsctags... for a given filetype: >
+  let g:ctrlp_buftag_types = ''
+<
+Examples: >
+  let g:ctrlp_buftag_types = {
+    \ 'erlang'     : '--language-force=erlang --erlang-types=drmf',
+    \ 'javascript' : {
+      \ 'bin': 'jsctags',
+      \ 'args': '-f -',
+      \ },
+    \ }
+<
+
+===============================================================================
+CUSTOMIZATION                                             *ctrlp-customization*
+
+Highlighting:~
+  * For the CtrlP buffer:
+    CtrlPNoEntries : the message when no match is found (Error)
+    CtrlPMatch     : the matched pattern (Identifier)
+    CtrlPLinePre   : the line prefix '>' in the match window
+    CtrlPPrtBase   : the prompt's base (Comment)
+    CtrlPPrtText   : the prompt's text (|hl-Normal|)
+    CtrlPPrtCursor : the prompt's cursor when moving over the text (Constant)
+
+  * In extensions:
+    CtrlPTabExtra  : the part of each line that's not matched against (Comment)
+    CtrlPBufName   : the buffer name an entry belongs to (|hl-Directory|)
+    CtrlPTagKind   : the kind of the tag in buffer-tag mode (|hl-Title|)
+    CtrlPqfLineCol : the line and column numbers in quickfix mode (Comment)
+    CtrlPUndoT     : the elapsed time in undo mode (|hl-Directory|)
+    CtrlPUndoBr    : the square brackets [] in undo mode (Comment)
+    CtrlPUndoNr    : the undo number inside [] in undo mode (String)
+    CtrlPUndoSv    : the point where the file was saved (Comment)
+    CtrlPUndoPo    : the current position in the undo tree (|hl-Title|)
+    CtrlPBookmark  : the name of the bookmark (Identifier)
+
+Statuslines:~
+  * Highlight groups:
+    CtrlPMode1 : 'file' or 'path' or 'line', and the current mode (Character)
+    CtrlPMode2 : 'prt' or 'win', 'regex', the working directory (|hl-LineNr|)
+    CtrlPStats : the scanning status (Function)
+
+  For rebuilding the statuslines, see |g:ctrlp_status_func|.
+
+===============================================================================
+MISCELLANEOUS CONFIGS                             *ctrlp-miscellaneous-configs*
+
+* Using |wildignore| for |g:ctrlp_user_command|:
+>
+  function! s:wig2cmd()
+    " Change wildignore into space or | separated groups
+    " e.g. .aux .out .toc .jpg .bmp .gif
+    " or   .aux$\|.out$\|.toc$\|.jpg$\|.bmp$\|.gif$
+    let pats = ['[*\/]*\([?_.0-9A-Za-z]\+\)\([*\/]*\)\(\\\@<!,\|$\)','\\\@<!,']
+    let subs = has('win32') || has('win64') ? ['\1\3', ' '] : ['\1\2\3', '\\|']
+    let expr = substitute(&wig, pats[0], subs[0], 'g')
+    let expr = substitute(expr, pats[1], subs[1], 'g')
+    let expr = substitute(expr, '\\,', ',', 'g')
+
+    " Set the user_command option
+    let g:ctrlp_user_command = has('win32') || has('win64')
+      \ ? 'dir %s /-n /b /s /a-d | findstr /V /l "'.expr.'"'
+      \ : 'find %s -type f | grep -v "'.expr .'"'
+  endfunction
+
+  call s:wig2cmd()
+<
+(submitted by Rich Alesi <github.com/ralesi>)
+
+* A standalone function to set the working directory to the project's root, or
+  to the parent directory of the current file if a root can't be found:
+>
+  function! s:setcwd()
+    let cph = expand('%:p:h', 1)
+    if cph =~ '^.\+://' | retu | en
+    for mkr in ['.git/', '.hg/', '.svn/', '.bzr/', '_darcs/', '.vimprojects']
+      let wd = call('find'.(mkr =~ '/$' ? 'dir' : 'file'), [mkr, cph.';'])
+      if wd != '' | let &acd = 0 | brea | en
+    endfo
+    exe 'lc!' fnameescape(wd == '' ? cph : substitute(wd, mkr.'$', '.', ''))
+  endfunction
+
+  autocmd BufEnter * call s:setcwd()
+<
+(requires Vim 7.1.299+)
+
+* Using a |count| to invoke different commands using the same mapping:
+>
+  let g:ctrlp_cmd = 'exe "CtrlP".get(["", "Buffer", "MRU"], v:count)'
+<
+
+===============================================================================
+CREDITS                                                         *ctrlp-credits*
+
+Developed by Kien Nguyen <github.com/kien>. Distributed under Vim's |license|.
+
+Project's homepage:   http://kien.github.com/ctrlp.vim
+Git repository:       https://github.com/kien/ctrlp.vim
+Mercurial repository: https://bitbucket.org/kien/ctrlp.vim
+
+-------------------------------------------------------------------------------
+Thanks to everyone that has submitted ideas, bug reports or helped debugging on
+gibhub, bitbucket, and through email.
+
+Special thanks:~
+
+    * Woojong Koh <github.com/wjkoh>
+    * Simon Ruderich
+    * Yasuhiro Matsumoto <github.com/mattn>
+    * Ken Earley <github.com/kenearley>
+    * Kyo Nagashima <github.com/hail2u>
+    * Zak Johnson <github.com/zakj>
+    * Diego Viola <github.com/diegoviola>
+    * Piet Delport <github.com/pjdelport>
+    * Thibault Duplessis <github.com/ornicar>
+    * Kent Sibilev <github.com/datanoise>
+    * Tacahiroy <github.com/tacahiroy>
+    * Luca Pette <github.com/lucapette>
+    * Seth Fowler <github.com/sfowler>
+    * Lowe Thiderman <github.com/thiderman>
+    * Christopher Fredén <github.com/icetan>
+    * Zahary Karadjov <github.com/zah>
+    * Jo De Boeck <github.com/grimpy>
+    * Rudi Grinberg <github.com/rgrinberg>
+    * Timothy Mellor <github.com/mellort>
+
+===============================================================================
+CHANGELOG                                                     *ctrlp-changelog*
+
+    + Combine *g:ctrlp_match_window_bottom* *g:ctrlp_match_window_reversed* and
+      *g:ctrlp_max_height* into |g:ctrlp_match_window|.
+    + New option: |g:ctrlp_match_window|.
+
+Before 2012/11/30~
+
+    + New options: |g:ctrlp_abbrev|,
+                   |g:ctrlp_key_loop|,
+                   |g:ctrlp_open_func|,
+                   |g:ctrlp_tabpage_position|,
+                   |g:ctrlp_mruf_save_on_update|
+    + Rename:
+        *g:ctrlp_dotfiles* -> |g:ctrlp_show_hidden|.
+    + Change |g:ctrlp_switch_buffer|'s and |g:ctrlp_working_path_mode|'s type
+      (old values still work).
+    + New key for |g:ctrlp_user_command| when it's a Dictionary: 'ignore'.
+
+Before 2012/06/15~
+
+    + New value for |g:ctrlp_follow_symlinks|: 2.
+    + New value for |g:ctrlp_open_multiple_files|: 'j'.
+    + Allow using <c-t>, <c-x>, <c-v> to open files marked by <c-z>.
+    + Extend '..' (|ctrlp-input-formats| (d))
+    + New input format: '@cd' (|ctrlp-input-formats| (d))
+
+Before 2012/04/30~
+
+    + New option: |g:ctrlp_mruf_default_order|
+    + New feature: Bookmarked directories extension.
+    + New commands: |:CtrlPBookmarkDir|
+                    |:CtrlPBookmarkDirAdd|
+
+Before 2012/04/15~
+
+    + New option: |g:ctrlp_buffer_func|, callback functions for CtrlP buffer.
+    + Remove: g:ctrlp_mruf_last_entered, make it a default for MRU mode.
+    + New commands: |:CtrlPLastMode|, open CtrlP in the last mode used.
+                    |:CtrlPMixed|, search in files, buffers and MRU files.
+
+Before 2012/03/31~
+
+    + New options: |g:ctrlp_default_input|, default input when entering CtrlP.
+                   |g:ctrlp_match_func|, allow using a custom fuzzy matcher.
+    + Rename:
+        *ClearCtrlPCache* -> |CtrlPClearCache|
+        *ClearAllCtrlPCaches* -> |CtrlPClearAllCaches|
+        *ResetCtrlP* -> |CtrlPReload|
+
+Before 2012/03/02~
+
+    + Rename:
+        *g:ctrlp_regexp_search* -> |g:ctrlp_regexp|,
+        *g:ctrlp_dont_split* -> |g:ctrlp_reuse_window|,
+        *g:ctrlp_jump_to_buffer* -> |g:ctrlp_switch_buffer|.
+    + Rename and tweak:
+        *g:ctrlp_open_multi* -> |g:ctrlp_open_multiple_files|.
+    + Deprecate *g:ctrlp_highlight_match*
+    + Extend |g:ctrlp_user_command| to support multiple commands.
+    + New option: |g:ctrlp_mruf_last_entered| change MRU to Recently-Entered.
+
+Before 2012/01/15~
+
+    + New mapping: Switch <tab> and <s-tab>. <tab> is now used for completion
+                   of directory names under the current working directory.
+    + New options: |g:ctrlp_arg_map| for <c-y>, <c-o> to accept an argument.
+                   |g:ctrlp_status_func| custom statusline.
+                   |g:ctrlp_mruf_relative| show only MRU files inside cwd.
+    + Extend g:ctrlp_open_multi with new optional values: tr, hr, vr.
+    + Extend |g:ctrlp_custom_ignore| to specifically filter dir, file and link.
+
+Before 2012/01/05~
+
+    + New feature: Buffer Tag extension.
+    + New commands: |:CtrlPBufTag|, |:CtrlPBufTagAll|.
+    + New options: |g:ctrlp_cmd|,
+                   |g:ctrlp_custom_ignore|
+
+Before 2011/11/30~
+
+    + New features: Tag, Quickfix and Directory extensions.
+    + New commands: |:CtrlPTag|, |:CtrlPQuickfix|, |:CtrlPDir|.
+    + New options: |g:ctrlp_use_migemo|,
+                   |g:ctrlp_lazy_update|,
+                   |g:ctrlp_follow_symlinks|
+
+Before 2011/11/13~
+
+    + New special input: '/' and '\' find root (|ctrlp-input-formats| (e))
+    + Remove ctrlp#SetWorkingPath().
+    + Remove *g:ctrlp_mru_files* and make MRU mode permanent.
+    + Extend g:ctrlp_open_multi, add new ways to open files.
+    + New option: g:ctrlp_dont_split,
+                  |g:ctrlp_mruf_case_sensitive|
+
+Before 2011/10/30~
+
+    + New feature: Support for custom extensions.
+                   <F5> also removes non-existent files from MRU list.
+    + New option: g:ctrlp_jump_to_buffer
+
+Before 2011/10/12~
+
+    + New features: Open multiple files.
+                    Pass Vim's |++opt| and |+cmd| to the opening file
+                    (|ctrlp-input-formats| (c))
+                    Auto-complete each dir for |:CtrlP| [starting-directory]
+    + New mappings: <c-z> mark/unmark a file to be opened with <c-o>.
+                    <c-o> open all marked files.
+    + New option: g:ctrlp_open_multi
+    + Remove *g:ctrlp_persistent_input* *g:ctrlp_live_update* and <c-^>.
+
+Before 2011/09/29~
+
+    + New mappings: <c-n>, <c-p> next/prev string in the input history.
+                    <c-y> create a new file and its parent dirs.
+    + New options: |g:ctrlp_open_new_file|,
+                   |g:ctrlp_max_history|
+    + Added a new open-in-horizontal-split mapping: <c-x>
+
+Before 2011/09/19~
+
+    + New command: ResetCtrlP
+    + New options: |g:ctrlp_max_files|,
+                   |g:ctrlp_max_depth|,
+                   g:ctrlp_live_update
+    + New mapping: <c-^>
+
+Before 2011/09/12~
+
+    + Ability to cycle through matched lines in the match window.
+    + Extend the behavior of g:ctrlp_persistent_input
+    + Extend the behavior of |:CtrlP|
+    + New options: |g:ctrlp_dotfiles|,
+                   |g:ctrlp_clear_cache_on_exit|,
+                   g:ctrlp_highlight_match,
+                   |g:ctrlp_user_command|
+    + New special input: '..' (|ctrlp-input-formats| (d))
+    + New mapping: <F5>.
+    + New commands: |:CtrlPCurWD|,
+                    |:CtrlPCurFile|,
+                    |:CtrlPRoot|
+
+    + New feature: Search in most recently used (MRU) files
+    + New mapping: <c-b>.
+    + Extended the behavior of <c-f>.
+    + New options: g:ctrlp_mru_files,
+                   |g:ctrlp_mruf_max|,
+                   |g:ctrlp_mruf_exclude|,
+                   |g:ctrlp_mruf_include|
+    + New command: |:CtrlPMRU|
+
+First public release: 2011/09/06~
+
+===============================================================================
+vim:ft=help:et:ts=2:sw=2:sts=2:norl
diff --git a/vim-plugins/bundle/ctrlp.vim/doc/tags b/vim-plugins/bundle/ctrlp.vim/doc/tags
new file mode 100644
index 0000000..e1404fd
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/doc/tags
@@ -0,0 +1,100 @@
+'ctrl-p'	ctrlp.txt	/*'ctrl-p'*
+'ctrlp'	ctrlp.txt	/*'ctrlp'*
+'ctrlp-<c-p>'	ctrlp.txt	/*'ctrlp-<c-p>'*
+'ctrlp-autocompletion'	ctrlp.txt	/*'ctrlp-autocompletion'*
+'ctrlp-fullregexp'	ctrlp.txt	/*'ctrlp-fullregexp'*
+'ctrlp-pasting'	ctrlp.txt	/*'ctrlp-pasting'*
+'ctrlp-wildignore'	ctrlp.txt	/*'ctrlp-wildignore'*
+'g:ctrlp_abbrev'	ctrlp.txt	/*'g:ctrlp_abbrev'*
+'g:ctrlp_arg_map'	ctrlp.txt	/*'g:ctrlp_arg_map'*
+'g:ctrlp_buffer_func'	ctrlp.txt	/*'g:ctrlp_buffer_func'*
+'g:ctrlp_buftag_ctags_bin'	ctrlp.txt	/*'g:ctrlp_buftag_ctags_bin'*
+'g:ctrlp_buftag_systemenc'	ctrlp.txt	/*'g:ctrlp_buftag_systemenc'*
+'g:ctrlp_buftag_types'	ctrlp.txt	/*'g:ctrlp_buftag_types'*
+'g:ctrlp_by_filename'	ctrlp.txt	/*'g:ctrlp_by_filename'*
+'g:ctrlp_cache_dir'	ctrlp.txt	/*'g:ctrlp_cache_dir'*
+'g:ctrlp_clear_cache_on_exit'	ctrlp.txt	/*'g:ctrlp_clear_cache_on_exit'*
+'g:ctrlp_cmd'	ctrlp.txt	/*'g:ctrlp_cmd'*
+'g:ctrlp_custom_ignore'	ctrlp.txt	/*'g:ctrlp_custom_ignore'*
+'g:ctrlp_default_input'	ctrlp.txt	/*'g:ctrlp_default_input'*
+'g:ctrlp_follow_symlinks'	ctrlp.txt	/*'g:ctrlp_follow_symlinks'*
+'g:ctrlp_key_loop'	ctrlp.txt	/*'g:ctrlp_key_loop'*
+'g:ctrlp_lazy_update'	ctrlp.txt	/*'g:ctrlp_lazy_update'*
+'g:ctrlp_map'	ctrlp.txt	/*'g:ctrlp_map'*
+'g:ctrlp_match_func'	ctrlp.txt	/*'g:ctrlp_match_func'*
+'g:ctrlp_match_window'	ctrlp.txt	/*'g:ctrlp_match_window'*
+'g:ctrlp_max_depth'	ctrlp.txt	/*'g:ctrlp_max_depth'*
+'g:ctrlp_max_files'	ctrlp.txt	/*'g:ctrlp_max_files'*
+'g:ctrlp_max_history'	ctrlp.txt	/*'g:ctrlp_max_history'*
+'g:ctrlp_mruf_case_sensitive'	ctrlp.txt	/*'g:ctrlp_mruf_case_sensitive'*
+'g:ctrlp_mruf_default_order'	ctrlp.txt	/*'g:ctrlp_mruf_default_order'*
+'g:ctrlp_mruf_exclude'	ctrlp.txt	/*'g:ctrlp_mruf_exclude'*
+'g:ctrlp_mruf_include'	ctrlp.txt	/*'g:ctrlp_mruf_include'*
+'g:ctrlp_mruf_max'	ctrlp.txt	/*'g:ctrlp_mruf_max'*
+'g:ctrlp_mruf_relative'	ctrlp.txt	/*'g:ctrlp_mruf_relative'*
+'g:ctrlp_mruf_save_on_update'	ctrlp.txt	/*'g:ctrlp_mruf_save_on_update'*
+'g:ctrlp_open_func'	ctrlp.txt	/*'g:ctrlp_open_func'*
+'g:ctrlp_open_multiple_files'	ctrlp.txt	/*'g:ctrlp_open_multiple_files'*
+'g:ctrlp_open_new_file'	ctrlp.txt	/*'g:ctrlp_open_new_file'*
+'g:ctrlp_prompt_mappings'	ctrlp.txt	/*'g:ctrlp_prompt_mappings'*
+'g:ctrlp_regexp'	ctrlp.txt	/*'g:ctrlp_regexp'*
+'g:ctrlp_reuse_window'	ctrlp.txt	/*'g:ctrlp_reuse_window'*
+'g:ctrlp_root_markers'	ctrlp.txt	/*'g:ctrlp_root_markers'*
+'g:ctrlp_show_hidden'	ctrlp.txt	/*'g:ctrlp_show_hidden'*
+'g:ctrlp_status_func'	ctrlp.txt	/*'g:ctrlp_status_func'*
+'g:ctrlp_switch_buffer'	ctrlp.txt	/*'g:ctrlp_switch_buffer'*
+'g:ctrlp_tabpage_position'	ctrlp.txt	/*'g:ctrlp_tabpage_position'*
+'g:ctrlp_use_caching'	ctrlp.txt	/*'g:ctrlp_use_caching'*
+'g:ctrlp_use_migemo'	ctrlp.txt	/*'g:ctrlp_use_migemo'*
+'g:ctrlp_user_command'	ctrlp.txt	/*'g:ctrlp_user_command'*
+'g:ctrlp_working_path_mode'	ctrlp.txt	/*'g:ctrlp_working_path_mode'*
+'g:loaded_ctrlp'	ctrlp.txt	/*'g:loaded_ctrlp'*
+:CtrlP	ctrlp.txt	/*:CtrlP*
+:CtrlPBookmarkDir	ctrlp.txt	/*:CtrlPBookmarkDir*
+:CtrlPBookmarkDirAdd	ctrlp.txt	/*:CtrlPBookmarkDirAdd*
+:CtrlPBufTag	ctrlp.txt	/*:CtrlPBufTag*
+:CtrlPBufTagAll	ctrlp.txt	/*:CtrlPBufTagAll*
+:CtrlPBuffer	ctrlp.txt	/*:CtrlPBuffer*
+:CtrlPChange	ctrlp.txt	/*:CtrlPChange*
+:CtrlPChangeAll	ctrlp.txt	/*:CtrlPChangeAll*
+:CtrlPClearAllCaches	ctrlp.txt	/*:CtrlPClearAllCaches*
+:CtrlPClearCache	ctrlp.txt	/*:CtrlPClearCache*
+:CtrlPDir	ctrlp.txt	/*:CtrlPDir*
+:CtrlPLastMode	ctrlp.txt	/*:CtrlPLastMode*
+:CtrlPLine	ctrlp.txt	/*:CtrlPLine*
+:CtrlPMRU	ctrlp.txt	/*:CtrlPMRU*
+:CtrlPMixed	ctrlp.txt	/*:CtrlPMixed*
+:CtrlPQuickfix	ctrlp.txt	/*:CtrlPQuickfix*
+:CtrlPRTS	ctrlp.txt	/*:CtrlPRTS*
+:CtrlPRoot	ctrlp.txt	/*:CtrlPRoot*
+:CtrlPTag	ctrlp.txt	/*:CtrlPTag*
+:CtrlPUndo	ctrlp.txt	/*:CtrlPUndo*
+ClearAllCtrlPCaches	ctrlp.txt	/*ClearAllCtrlPCaches*
+ClearCtrlPCache	ctrlp.txt	/*ClearCtrlPCache*
+ControlP	ctrlp.txt	/*ControlP*
+CtrlP	ctrlp.txt	/*CtrlP*
+ResetCtrlP	ctrlp.txt	/*ResetCtrlP*
+ctrlp-changelog	ctrlp.txt	/*ctrlp-changelog*
+ctrlp-commands	ctrlp.txt	/*ctrlp-commands*
+ctrlp-contents	ctrlp.txt	/*ctrlp-contents*
+ctrlp-credits	ctrlp.txt	/*ctrlp-credits*
+ctrlp-customization	ctrlp.txt	/*ctrlp-customization*
+ctrlp-extensions	ctrlp.txt	/*ctrlp-extensions*
+ctrlp-input-formats	ctrlp.txt	/*ctrlp-input-formats*
+ctrlp-intro	ctrlp.txt	/*ctrlp-intro*
+ctrlp-mappings	ctrlp.txt	/*ctrlp-mappings*
+ctrlp-miscellaneous-configs	ctrlp.txt	/*ctrlp-miscellaneous-configs*
+ctrlp-options	ctrlp.txt	/*ctrlp-options*
+ctrlp.txt	ctrlp.txt	/*ctrlp.txt*
+g:ctrlp_dont_split	ctrlp.txt	/*g:ctrlp_dont_split*
+g:ctrlp_dotfiles	ctrlp.txt	/*g:ctrlp_dotfiles*
+g:ctrlp_highlight_match	ctrlp.txt	/*g:ctrlp_highlight_match*
+g:ctrlp_jump_to_buffer	ctrlp.txt	/*g:ctrlp_jump_to_buffer*
+g:ctrlp_live_update	ctrlp.txt	/*g:ctrlp_live_update*
+g:ctrlp_match_window_bottom	ctrlp.txt	/*g:ctrlp_match_window_bottom*
+g:ctrlp_match_window_reversed	ctrlp.txt	/*g:ctrlp_match_window_reversed*
+g:ctrlp_max_height	ctrlp.txt	/*g:ctrlp_max_height*
+g:ctrlp_mru_files	ctrlp.txt	/*g:ctrlp_mru_files*
+g:ctrlp_open_multi	ctrlp.txt	/*g:ctrlp_open_multi*
+g:ctrlp_persistent_input	ctrlp.txt	/*g:ctrlp_persistent_input*
+g:ctrlp_regexp_search	ctrlp.txt	/*g:ctrlp_regexp_search*
diff --git a/vim-plugins/bundle/ctrlp.vim/plugin/ctrlp.vim b/vim-plugins/bundle/ctrlp.vim/plugin/ctrlp.vim
new file mode 100644
index 0000000..c7b8fa3
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/plugin/ctrlp.vim
@@ -0,0 +1,68 @@
+" =============================================================================
+" File:          plugin/ctrlp.vim
+" Description:   Fuzzy file, buffer, mru, tag, etc finder.
+" Author:        Kien Nguyen <github.com/kien>
+" =============================================================================
+" GetLatestVimScripts: 3736 1 :AutoInstall: ctrlp.zip
+
+if ( exists('g:loaded_ctrlp') && g:loaded_ctrlp ) || v:version < 700 || &cp
+	fini
+en
+let g:loaded_ctrlp = 1
+
+let [g:ctrlp_lines, g:ctrlp_allfiles, g:ctrlp_alltags, g:ctrlp_alldirs,
+	\ g:ctrlp_allmixes, g:ctrlp_buftags, g:ctrlp_ext_vars, g:ctrlp_builtins]
+	\ = [[], [], [], [], {}, {}, [], 2]
+
+if !exists('g:ctrlp_map') | let g:ctrlp_map = '<c-p>' | en
+if !exists('g:ctrlp_cmd') | let g:ctrlp_cmd = 'CtrlP' | en
+
+com! -n=? -com=dir CtrlP         cal ctrlp#init(0, { 'dir': <q-args> })
+com! -n=? -com=dir CtrlPMRUFiles cal ctrlp#init(2, { 'dir': <q-args> })
+
+com! -bar CtrlPBuffer   cal ctrlp#init(1)
+com! -n=? CtrlPLastMode cal ctrlp#init(-1, { 'args': <q-args> })
+
+com! -bar CtrlPClearCache     cal ctrlp#clr()
+com! -bar CtrlPClearAllCaches cal ctrlp#clra()
+
+com! -bar ClearCtrlPCache     cal ctrlp#clr()
+com! -bar ClearAllCtrlPCaches cal ctrlp#clra()
+
+com! -bar CtrlPCurWD   cal ctrlp#init(0, { 'mode': '' })
+com! -bar CtrlPCurFile cal ctrlp#init(0, { 'mode': 'c' })
+com! -bar CtrlPRoot    cal ctrlp#init(0, { 'mode': 'r' })
+
+if g:ctrlp_map != '' && !hasmapto(':<c-u>'.g:ctrlp_cmd.'<cr>', 'n')
+	exe 'nn <silent>' g:ctrlp_map ':<c-u>'.g:ctrlp_cmd.'<cr>'
+en
+
+cal ctrlp#mrufiles#init()
+
+com! -bar CtrlPTag      cal ctrlp#init(ctrlp#tag#id())
+com! -bar CtrlPQuickfix cal ctrlp#init(ctrlp#quickfix#id())
+
+com! -n=? -com=dir CtrlPDir
+	\ cal ctrlp#init(ctrlp#dir#id(), { 'dir': <q-args> })
+
+com! -n=? -com=buffer CtrlPBufTag
+	\ cal ctrlp#init(ctrlp#buffertag#cmd(0, <q-args>))
+
+com! -bar CtrlPBufTagAll cal ctrlp#init(ctrlp#buffertag#cmd(1))
+com! -bar CtrlPRTS       cal ctrlp#init(ctrlp#rtscript#id())
+com! -bar CtrlPUndo      cal ctrlp#init(ctrlp#undo#id())
+
+com! -n=? -com=buffer CtrlPLine
+	\ cal ctrlp#init(ctrlp#line#cmd(1, <q-args>))
+
+com! -n=? -com=buffer CtrlPChange
+	\ cal ctrlp#init(ctrlp#changes#cmd(0, <q-args>))
+
+com! -bar CtrlPChangeAll   cal ctrlp#init(ctrlp#changes#cmd(1))
+com! -bar CtrlPMixed       cal ctrlp#init(ctrlp#mixed#id())
+com! -bar CtrlPBookmarkDir cal ctrlp#init(ctrlp#bookmarkdir#id())
+
+com! -n=? -com=dir CtrlPBookmarkDirAdd
+	\ cal ctrlp#call('ctrlp#bookmarkdir#add', <q-args>)
+
+" vim:ts=2:sw=2:sts=2
diff --git a/vim-plugins/bundle/ctrlp.vim/readme.md b/vim-plugins/bundle/ctrlp.vim/readme.md
new file mode 100644
index 0000000..d495fff
--- /dev/null
+++ b/vim-plugins/bundle/ctrlp.vim/readme.md
@@ -0,0 +1,91 @@
+#**This project is unmaintained** 
+**You should use [this fork](https://github.com/ctrlpvim/ctrlp.vim) instead.**
+
+# ctrlp.vim
+Full path fuzzy __file__, __buffer__, __mru__, __tag__, __...__ finder for Vim.
+
+* Written in pure Vimscript for MacVim, gVim and Vim 7.0+.
+* Full support for Vim's regexp as search patterns.
+* Built-in Most Recently Used (MRU) files monitoring.
+* Built-in project's root finder.
+* Open multiple files at once.
+* Create new files and directories.
+* [Extensible][2].
+
+![ctrlp][1]
+
+## Basic Usage
+* Run `:CtrlP` or `:CtrlP [starting-directory]` to invoke CtrlP in find file mode.
+* Run `:CtrlPBuffer` or `:CtrlPMRU` to invoke CtrlP in find buffer or find MRU file mode.
+* Run `:CtrlPMixed` to search in Files, Buffers and MRU files at the same time.
+
+Check `:help ctrlp-commands` and `:help ctrlp-extensions` for other commands.
+
+##### Once CtrlP is open:
+* Press `<F5>` to purge the cache for the current directory to get new files, remove deleted files and apply new ignore options.
+* Press `<c-f>` and `<c-b>` to cycle between modes.
+* Press `<c-d>` to switch to filename only search instead of full path.
+* Press `<c-r>` to switch to regexp mode.
+* Use `<c-j>`, `<c-k>` or the arrow keys to navigate the result list.
+* Use `<c-t>` or `<c-v>`, `<c-x>` to open the selected entry in a new tab or in a new split.
+* Use `<c-n>`, `<c-p>` to select the next/previous string in the prompt's history.
+* Use `<c-y>` to create a new file and its parent directories.
+* Use `<c-z>` to mark/unmark multiple files and `<c-o>` to open them.
+
+Run `:help ctrlp-mappings` or submit `?` in CtrlP for more mapping help.
+
+* Submit two or more dots `..` to go up the directory tree by one or multiple levels.
+* End the input string with a colon `:` followed by a command to execute it on the opening file(s):  
+Use `:25` to jump to line 25.  
+Use `:diffthis` when opening multiple files to run `:diffthis` on the first 4 files.
+
+## Basic Options
+* Change the default mapping and the default command to invoke CtrlP:
+
+    ```vim
+    let g:ctrlp_map = '<c-p>'
+    let g:ctrlp_cmd = 'CtrlP'
+    ```
+
+* When invoked, unless a starting directory is specified, CtrlP will set its local working directory according to this variable:
+
+    ```vim
+    let g:ctrlp_working_path_mode = 'ra'
+    ```
+
+    `'c'` - the directory of the current file.  
+    `'r'` - the nearest ancestor that contains one of these directories or files: `.git` `.hg` `.svn` `.bzr` `_darcs`  
+    `'a'` - like c, but only if the current working directory outside of CtrlP is not a direct ancestor of the directory of the current file.  
+    `0` or `''` (empty string) - disable this feature.
+
+    Define additional root markers with the `g:ctrlp_root_markers` option.
+
+* Exclude files and directories using Vim's `wildignore` and CtrlP's own `g:ctrlp_custom_ignore`:
+
+    ```vim
+    set wildignore+=*/tmp/*,*.so,*.swp,*.zip     " MacOSX/Linux
+    set wildignore+=*\\tmp\\*,*.swp,*.zip,*.exe  " Windows
+
+    let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$'
+    let g:ctrlp_custom_ignore = {
+      \ 'dir':  '\v[\/]\.(git|hg|svn)$',
+      \ 'file': '\v\.(exe|so|dll)$',
+      \ 'link': 'some_bad_symbolic_links',
+      \ }
+    ```
+
+* Use a custom file listing command:
+
+    ```vim
+    let g:ctrlp_user_command = 'find %s -type f'        " MacOSX/Linux
+    let g:ctrlp_user_command = 'dir %s /-n /b /s /a-d'  " Windows
+    ```
+
+Check `:help ctrlp-options` for other options.
+
+## Installation
+Use your favorite method or check the homepage for a [quick installation guide][3].
+
+[1]: http://i.imgur.com/yIynr.png
+[2]: https://github.com/kien/ctrlp.vim/tree/extensions
+[3]: http://kien.github.com/ctrlp.vim#installation
diff --git a/vim-plugins/bundle/emmet-vim/Makefile b/vim-plugins/bundle/emmet-vim/Makefile
new file mode 100644
index 0000000..1c06023
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/Makefile
@@ -0,0 +1,11 @@
+all : emmet-vim.zip
+
+remove-zip:
+	-rm doc/tags
+	-rm emmet-vim.zip
+
+emmet-vim.zip: remove-zip
+	zip -r emmet-vim.zip autoload plugin doc
+
+release: emmet-vim.zip
+	vimup update-script emmet.vim
diff --git a/vim-plugins/bundle/emmet-vim/README.mkd b/vim-plugins/bundle/emmet-vim/README.mkd
new file mode 100644
index 0000000..8bb52b2
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/README.mkd
@@ -0,0 +1,149 @@
+# Emmet-vim
+
+[emmet-vim](http://mattn.github.com/emmet-vim) is a vim plug-in
+which provides support for expanding abbreviations similar to
+[emmet](http://emmet.io/).
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/mattn/emmet-vim/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+
+![](https://raw.githubusercontent.com/mattn/emmet-vim/master/doc/screenshot.gif)
+
+## Installation
+
+[Download zip file](http://www.vim.org/scripts/script.php?script_id=2981):
+
+    cd ~/.vim
+    unzip emmet-vim.zip
+
+To install using pathogen.vim:
+
+    cd ~/.vim/bundle
+    git clone https://github.com/mattn/emmet-vim.git
+    
+To install using [Vundle](https://github.com/gmarik/vundle):
+
+    " add this line to your .vimrc file
+    Plugin 'mattn/emmet-vim'
+
+To checkout the source from repository:
+
+    cd ~/.vim/bundle
+    git clone https://github.com/mattn/emmet-vim.git
+
+or:
+
+    git clone https://github.com/mattn/emmet-vim.git
+    cd emmet-vim
+    cp plugin/emmet.vim ~/.vim/plugin/
+    cp autoload/emmet.vim ~/.vim/autoload/
+    cp -a autoload/emmet ~/.vim/autoload/
+
+
+## Quick Tutorial
+
+Open or create a New File:
+
+    vim index.html
+
+Type ("\_" is the cursor position):
+
+    html:5_
+
+Then type `<c-y>,` (<kbd>Ctrl</kbd><kbd>y</kbd><kbd>,</kbd>), and you should see:
+
+```html
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title></title>
+</head>
+<body>
+	_
+</body>
+</html>
+```
+
+[More Tutorials](https://raw.github.com/mattn/emmet-vim/master/TUTORIAL)
+
+
+## Enable in different mode
+
+If you don't want to enable emmet in all modes,
+you can use set these options in `vimrc`:
+
+```vim
+let g:user_emmet_mode='n'    "only enable normal mode functions.
+let g:user_emmet_mode='inv'  "enable all functions, which is equal to
+let g:user_emmet_mode='a'    "enable all function in all mode.
+```
+
+## Enable just for html/css
+
+```vim
+let g:user_emmet_install_global = 0
+autocmd FileType html,css EmmetInstall
+```
+
+## Redefine trigger key
+To remap the default `<C-Y>` leader:
+
+```vim
+let g:user_emmet_leader_key='<C-Z>'
+```
+
+Note that the trailing `,` still needs to be entered, so the new keymap would be `<C-Z>,`.
+
+## Adding custom snippets
+If you have installed the [web-api](https://github.com/mattn/webapi-vim) for **emmet-vim** you can also add your own snippets using a custom **snippets.json** file.
+
+Once you have installed the [web-api](https://github.com/mattn/webapi-vim) add this line to your **.vimrc**:
+```
+let g:user_emmet_settings = webapi#json#decode(join(readfile(expand('~/.snippets_custom.json')), "\n"))
+```
+You can change the **path** to your **snippets_custom.json** according to your preferences.
+
+[Here](http://docs.emmet.io/customization/snippets/) you can find instructions about creating your customized **snippets.json** file.
+
+## Project Authors
+
+[Yasuhiro Matsumoto](http://mattn.kaoriya.net/)
+
+## Links
+
+### Emmet official site:
+
+* <http://emmet.io/>
+
+### zen-coding official site:
+
+* <http://code.google.com/p/zen-coding/>
+
+### emmet.vim:
+
+* <http://mattn.github.com/emmet-vim>
+
+### development repository:
+
+* <https://github.com/mattn/emmet-vim>
+
+### my blog posts about zencoding-vim:
+
+* <http://mattn.kaoriya.net/software/vim/20100222103327.htm>
+
+* <http://mattn.kaoriya.net/software/vim/20100306021632.htm>
+
+### Japanese blog posts about zencoding-vim:
+
+* <http://d.hatena.ne.jp/idesaku/20100424/1272092255>
+
+* <http://d.hatena.ne.jp/griefworker/20110118/vim_zen_coding>
+
+* <http://d.hatena.ne.jp/sakurako_s/20110126/1295988873>
+
+* <http://looxu.blogspot.jp/2010/02/zencodingvimhtml.html>
+
+### A Chinese translation of the tutorial:
+
+* <http://www.zfanw.com/blog/zencoding-vim-tutorial-chinese.html>
+
diff --git a/vim-plugins/bundle/emmet-vim/TODO b/vim-plugins/bundle/emmet-vim/TODO
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/emmet-vim/TUTORIAL b/vim-plugins/bundle/emmet-vim/TUTORIAL
new file mode 100644
index 0000000..7d4ba61
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/TUTORIAL
@@ -0,0 +1,212 @@
+Tutorial for Emmet.vim
+
+                                                    mattn <mattn.jp@gmail.com>
+
+1. Expand an Abbreviation
+
+  Type the abbreviation as 'div>p#foo$*3>a' and type '<c-y>,'.
+  ---------------------
+  <div>
+      <p id="foo1">
+          <a href=""></a>
+      </p>
+      <p id="foo2">
+          <a href=""></a>
+      </p>
+      <p id="foo3">
+          <a href=""></a>
+      </p>
+  </div>
+  ---------------------
+
+2. Wrap with an Abbreviation
+
+  Write as below.
+  ---------------------
+  test1
+  test2
+  test3
+  ---------------------
+  Then do visual select(line wise) and type '<c-y>,'.
+  Once you get to the 'Tag:' prompt, type 'ul>li*'.
+  ---------------------
+  <ul>
+      <li>test1</li>
+      <li>test2</li>
+      <li>test3</li>
+  </ul>
+  ---------------------
+
+  If you type a tag, such as 'blockquote', then you'll see the following:
+  ---------------------
+  <blockquote>
+      test1
+      test2
+      test3
+  </blockquote>
+  ---------------------
+
+3. Balance a Tag Inward
+
+  type '<c-y>d' in insert mode.
+
+4. Balance a Tag Outward
+
+  type '<c-y>D' in insert mode.
+
+5. Go to the Next Edit Point
+
+  type '<c-y>n' in insert mode.
+
+6. Go to the Previous Edit Point
+
+  type '<c-y>N' in insert mode.
+
+7. Update an <img>’s Size
+
+  Move cursor to the img tag.
+  ---------------------
+  <img src="foo.png" />
+  ---------------------
+  Type '<c-y>i' on img tag
+  ---------------------
+  <img src="foo.png" width="32" height="48" />
+  ---------------------
+
+8. Merge Lines
+
+  select the lines, which include '<li>'
+  ---------------------
+  <ul>
+  	<li class="list1"></li>
+  	<li class="list2"></li>
+  	<li class="list3"></li>
+  </ul>
+  ---------------------
+  and then type '<c-y>m'
+  ---------------------
+  <ul>
+  	<li class="list1"></li><li class="list2"></li><li class="list3"></li>
+  </ul>
+  ---------------------
+
+9. Remove a Tag
+
+  Move cursor in block
+  ---------------------
+  <div class="foo">
+  	<a>cursor is here</a>
+  </div>
+  ---------------------
+  Type '<c-y>k' in insert mode.
+  ---------------------
+  <div class="foo">
+
+  </div>
+  ---------------------
+
+  And type '<c-y>k' in there again.
+  ---------------------
+
+  ---------------------
+
+10. Split/Join Tag
+
+  Move the cursor inside block
+  ---------------------
+  <div class="foo">
+  	cursor is here
+  </div>
+  ---------------------
+  Type '<c-y>j' in insert mode.
+  ---------------------
+  <div class="foo"/>
+  ---------------------
+
+  And then type '<c-y>j' in there again.
+  ---------------------
+  <div class="foo">
+  </div>
+  ---------------------
+
+11. Toggle Comment
+
+  Move cursor inside the block
+  ---------------------
+  <div>
+  	hello world
+  </div>
+  ---------------------
+  Type '<c-y>/' in insert mode.
+  ---------------------
+  <!-- <div>
+  	hello world
+  </div> -->
+  ---------------------
+  Type '<c-y>/' in there again.
+  ---------------------
+  <div>
+  	hello world
+  </div>
+  ---------------------
+
+12. Make an anchor from a URL
+
+  Move cursor to URL
+  ---------------------
+  http://www.google.com/
+  ---------------------
+  Type '<c-y>a'
+  ---------------------
+  <a href="http://www.google.com/">Google</a>
+  ---------------------
+
+13. Make some quoted text from a URL
+
+  Move cursor to the URL
+  ---------------------
+  http://github.com/
+  ---------------------
+  Type '<c-y>A'
+  ---------------------
+  <blockquote class="quote">
+  	<a href="http://github.com/">Secure source code hosting and collaborative development - GitHub</a><br />
+  	<p>How does it work? Get up and running in seconds by forking a project, pushing an existing repository...</p>
+  	<cite>http://github.com/</cite>
+  </blockquote>
+  ---------------------
+
+14. Installing emmet.vim for the language you are using:
+
+  # cd ~/.vim
+  # unzip emmet-vim.zip
+
+  Or if you are using pathogen.vim:
+
+  # cd ~/.vim/bundle # or make directory
+  # unzip /path/to/emmet-vim.zip
+
+  Or if you get the sources from the repository:
+
+  # cd ~/.vim/bundle # or make directory
+  # git clone http://github.com/mattn/emmet-vim.git
+
+15. Enable emmet.vim for the language you using.
+
+  You can customize the behavior of the languages you are using.
+
+  ---------------------
+  # cat >> ~/.vimrc
+  let g:user_emmet_settings = {
+  \  'php' : {
+  \    'extends' : 'html',
+  \    'filters' : 'c',
+  \  },
+  \  'xml' : {
+  \    'extends' : 'html',
+  \  },
+  \  'haml' : {
+  \    'extends' : 'html',
+  \  },
+  \}
+  ---------------------
diff --git a/vim-plugins/bundle/emmet-vim/autoload/emmet.vim b/vim-plugins/bundle/emmet-vim/autoload/emmet.vim
new file mode 100644
index 0000000..e344486
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/autoload/emmet.vim
@@ -0,0 +1,2033 @@
+"=============================================================================
+" emmet.vim
+" Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
+" Last Change: 26-Jul-2015.
+
+let s:save_cpo = &cpoptions
+set cpoptions&vim
+
+let s:filtermx = '|\(\%(bem\|html\|haml\|slim\|e\|c\|s\|fc\|xsl\|t\|\/[^ ]\+\)\s*,\{0,1}\s*\)*$'
+
+function! emmet#getExpandos(type, key) abort
+  let expandos = emmet#getResource(a:type, 'expandos', {})
+  if has_key(expandos, a:key)
+    return expandos[a:key]
+  endif
+  return a:key
+endfunction
+
+function! emmet#splitFilterArg(filters) abort
+  for f in a:filters
+    if f =~# '^/'
+      return f[1:]
+    endif
+  endfor
+  return ''
+endfunction
+
+function! emmet#useFilter(filters, filter) abort
+  for f in a:filters
+    if a:filter ==# '/' && f =~# '^/'
+      return 1
+    elseif f ==# a:filter
+      return 1
+    endif
+  endfor
+  return 0
+endfunction
+
+function! emmet#getIndentation(...) abort
+  if a:0 > 0
+    let type = a:1
+  else
+    let type = emmet#getFileType()
+  endif
+  if has_key(s:emmet_settings, type) && has_key(s:emmet_settings[type], 'indentation')
+    let indent = s:emmet_settings[type].indentation
+  elseif has_key(s:emmet_settings, 'indentation')
+    let indent = s:emmet_settings.indentation
+  elseif has_key(s:emmet_settings.variables, 'indentation')
+    let indent = s:emmet_settings.variables.indentation
+  else
+    let sw = exists('*shiftwidth') ? shiftwidth() : &l:shiftwidth
+    let indent = (&l:expandtab || &l:tabstop !=# sw) ? repeat(' ', sw) : "\t"
+  endif
+  return indent
+endfunction
+
+function! emmet#getBaseType(type) abort
+  if !has_key(s:emmet_settings, a:type)
+    return ''
+  endif
+  if !has_key(s:emmet_settings[a:type], 'extends')
+    return a:type
+  endif
+  let extends = s:emmet_settings[a:type].extends
+  if type(extends) ==# 1
+    let tmp = split(extends, '\s*,\s*')
+    let ext = tmp[0]
+  else
+    let ext = extends[0]
+  endif
+  if a:type !=# ext
+    return emmet#getBaseType(ext)
+  endif
+  return ''
+endfunction
+
+function! emmet#isExtends(type, extend) abort
+  if a:type ==# a:extend
+    return 1
+  endif
+  if !has_key(s:emmet_settings, a:type)
+    return 0
+  endif
+  if !has_key(s:emmet_settings[a:type], 'extends')
+    return 0
+  endif
+  let extends = s:emmet_settings[a:type].extends
+  if type(extends) ==# 1
+    let tmp = split(extends, '\s*,\s*')
+    unlet! extends
+    let extends = tmp
+  endif
+  for ext in extends
+    if a:extend ==# ext
+      return 1
+    endif
+  endfor
+  return 0
+endfunction
+
+function! emmet#parseIntoTree(abbr, type) abort
+  let abbr = a:abbr
+  let type = a:type
+  return emmet#lang#{emmet#lang#type(type)}#parseIntoTree(abbr, type)
+endfunction
+
+function! emmet#expandAbbrIntelligent(feedkey) abort
+  if !emmet#isExpandable()
+    return a:feedkey
+  endif
+  return "\<plug>(emmet-expand-abbr)"
+endfunction
+
+function! emmet#isExpandable() abort
+  let line = getline('.')
+  if col('.') < len(line)
+    let line = matchstr(line, '^\(.*\%'.col('.').'c\)')
+  endif
+  let part = matchstr(line, '\(\S.*\)$')
+  let type = emmet#getFileType()
+  let ftype = emmet#lang#exists(type) ? type : 'html'
+  let part = emmet#lang#{ftype}#findTokens(part)
+  return len(part) > 0
+endfunction
+
+function! emmet#mergeConfig(lhs, rhs) abort
+  let [lhs, rhs] = [a:lhs, a:rhs]
+  if type(lhs) ==# 3
+    if type(rhs) ==# 3
+      let lhs += rhs
+      if len(lhs)
+        call remove(lhs, 0, len(lhs)-1)
+      endif
+      for rhi in rhs
+        call add(lhs, rhs[rhi])
+      endfor
+    elseif type(rhs) ==# 4
+      let lhs += map(keys(rhs), '{v:val : rhs[v:val]}')
+    endif
+  elseif type(lhs) ==# 4
+    if type(rhs) ==# 3
+      for V in rhs
+        if type(V) != 4
+          continue
+        endif
+        for k in keys(V)
+          let lhs[k] = V[k]
+        endfor
+      endfor
+    elseif type(rhs) ==# 4
+      for key in keys(rhs)
+        if type(rhs[key]) ==# 3
+          if !has_key(lhs, key)
+            let lhs[key] = []
+          endif
+          if type(lhs[key]) == 3
+            let lhs[key] += rhs[key]
+          elseif type(lhs[key]) == 4
+            for k in keys(rhs[key])
+              let lhs[key][k] = rhs[key][k]
+            endfor
+          endif
+        elseif type(rhs[key]) ==# 4
+          if has_key(lhs, key)
+            call emmet#mergeConfig(lhs[key], rhs[key])
+          else
+            let lhs[key] = rhs[key]
+          endif
+        else
+          let lhs[key] = rhs[key]
+        endif
+      endfor
+    endif
+  endif
+endfunction
+
+function! emmet#newNode() abort
+  return { 'name': '', 'attr': {}, 'child': [], 'snippet': '', 'basevalue': 0, 'basedirect': 1, 'multiplier': 1, 'parent': {}, 'value': '', 'pos': 0, 'important': 0, 'attrs_order': ['id', 'class'], 'block': 0, 'empty': 0 }
+endfunction
+
+function! s:itemno(itemno, current) abort
+  let current = a:current
+  if current.basedirect > 0
+    if current.basevalue ==# 0
+      return a:itemno
+    else
+      return current.basevalue - 1 + a:itemno
+    endif
+  else
+    if current.basevalue ==# 0
+      return current.multiplier - 1 - a:itemno
+    else
+      return current.multiplier + current.basevalue - 2 - a:itemno
+    endif
+  endif
+endfunction
+
+function! emmet#toString(...) abort
+  let current = a:1
+  if a:0 > 1
+    let type = a:2
+  else
+    let type = &filetype
+  endif
+  if len(type) ==# 0 | let type = 'html' | endif
+  if a:0 > 2
+    let inline = a:3
+  else
+    let inline = 0
+  endif
+  if a:0 > 3
+    if type(a:4) ==# 1
+      let filters = split(a:4, '\s*,\s*')
+    else
+      let filters = a:4
+    endif
+  else
+    let filters = ['html']
+  endif
+  if a:0 > 4
+    let group_itemno = a:5
+  else
+    let group_itemno = 0
+  endif
+  if a:0 > 5
+    let indent = a:6
+  else
+    let indent = ''
+  endif
+
+  let dollar_expr = emmet#getResource(type, 'dollar_expr', 1)
+  let itemno = 0
+  let str = ''
+  let rtype = emmet#lang#type(type)
+  while itemno < current.multiplier
+    if len(current.name)
+      if current.multiplier ==# 1
+        let inner = emmet#lang#{rtype}#toString(s:emmet_settings, current, type, inline, filters, s:itemno(group_itemno, current), indent)
+      else
+        let inner = emmet#lang#{rtype}#toString(s:emmet_settings, current, type, inline, filters, s:itemno(itemno, current), indent)
+      endif
+      if current.multiplier > 1
+        let inner = substitute(inner, '\$#', '$line'.(itemno+1).'$', 'g')
+      endif
+      let str .= inner
+    else
+      let snippet = current.snippet
+      if len(snippet) ==# 0
+        let snippets = emmet#getResource(type, 'snippets', {})
+        if !empty(snippets) && has_key(snippets, 'emmet_snippet')
+          let snippet = snippets['emmet_snippet']
+        endif
+      endif
+      if len(snippet) > 0
+        let tmp = snippet
+        let tmp = substitute(tmp, '\${emmet_name}', current.name, 'g')
+        let snippet_node = emmet#newNode()
+        let snippet_node.value = '{'.tmp.'}'
+        let snippet_node.important = current.important
+        let snippet_node.multiplier = current.multiplier
+        let str .= emmet#lang#{rtype}#toString(s:emmet_settings, snippet_node, type, inline, filters, s:itemno(group_itemno, current), indent)
+        if current.multiplier > 1
+          let str .= "\n"
+        endif
+      else
+        if len(current.name)
+          let str .= current.name
+        endif
+        if len(current.value)
+          let text = current.value[1:-2]
+          if dollar_expr
+            " TODO: regexp engine specified
+            if exists('&regexpengine')
+              let text = substitute(text, '\%#=1\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", max([itemno, group_itemno])+1).submatch(2)', 'g')
+            else
+              let text = substitute(text, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", max([itemno, group_itemno])+1).submatch(2)', 'g')
+            endif
+            let text = substitute(text, '\${nr}', "\n", 'g')
+            let text = substitute(text, '\\\$', '$', 'g')
+          endif
+          let str .= text
+        endif
+      endif
+      let inner = ''
+      if len(current.child)
+        for n in current.child
+          let inner .= emmet#toString(n, type, inline, filters, s:itemno(group_itemno, n), indent)
+        endfor
+      else
+        let inner = current.value[1:-2]
+      endif
+      let inner = substitute(inner, "\n", "\n" . indent, 'g')
+      let str = substitute(str, '\${child}', inner, '')
+    endif
+    let itemno = itemno + 1
+  endwhile
+  return str
+endfunction
+
+function! emmet#getSettings() abort
+  return s:emmet_settings
+endfunction
+
+function! emmet#getFilters(type) abort
+  let filterstr = emmet#getResource(a:type, 'filters', '')
+  return split(filterstr, '\s*,\s*')
+endfunction
+
+function! emmet#getResource(type, name, default) abort
+  if exists('b:emmet_' . a:name)
+    return get(b:, 'emmet_' . a:name)
+  endif
+  let global = {}
+  if has_key(s:emmet_settings, '*') && has_key(s:emmet_settings['*'], a:name)
+    let global = extend(global, s:emmet_settings['*'][a:name])
+  endif
+
+  if has_key(s:emmet_settings, a:type)
+    let types = [a:type]
+  else
+    let types = split(a:type, '\.')
+  endif
+
+  for type in types
+    if !has_key(s:emmet_settings, type)
+      continue
+    endif
+    let ret = a:default
+
+    if has_key(s:emmet_settings[type], 'extends')
+      let extends = s:emmet_settings[type].extends
+      if type(extends) ==# 1
+        let tmp = split(extends, '\s*,\s*')
+        unlet! extends
+        let extends = tmp
+      endif
+      for ext in extends
+        if has_key(s:emmet_settings, ext) && has_key(s:emmet_settings[ext], a:name)
+          if type(ret) ==# 3 || type(ret) ==# 4
+            call emmet#mergeConfig(ret, s:emmet_settings[ext][a:name])
+          else
+            let ret = s:emmet_settings[ext][a:name]
+          endif
+        endif
+      endfor
+    endif
+
+    if has_key(s:emmet_settings[type], a:name)
+      if type(ret) ==# 3 || type(ret) ==# 4
+        call emmet#mergeConfig(ret, s:emmet_settings[type][a:name])
+        return extend(global, ret)
+      else
+        return s:emmet_settings[type][a:name]
+      endif
+    endif
+    if !empty(ret)
+      if type(ret) ==# 3 || type(ret) ==# 4
+        let ret = extend(global, ret)
+      endif
+      return ret
+    endif
+  endfor
+
+  let ret = a:default
+  if type(ret) ==# 3 || type(ret) ==# 4
+    let ret = extend(global, ret)
+  endif
+  return ret
+endfunction
+
+function! emmet#getFileType(...) abort
+  let flg = get(a:000, 0, 0)
+  let type = ''
+
+  if has_key(s:emmet_settings, &filetype)
+    let type = &filetype
+  else
+    let types = split(&filetype, '\.')
+    for part in types
+      if emmet#lang#exists(part)
+        let type = part
+        break
+      endif
+      let base = emmet#getBaseType(part)
+      if base !=# ''
+        if flg
+          let type = &filetype
+        else
+          let type = base
+        endif
+        unlet base
+        break
+      endif
+    endfor
+  endif
+  if type ==# 'html'
+    let pos = emmet#util#getcurpos()
+    let type = synIDattr(synID(pos[1], pos[2], 1), 'name')
+    if type =~# '^css\w'
+      let type = 'css'
+    endif
+    if type =~# '^html\w'
+      let type = 'html'
+    endif
+    if type =~# '^javaScript'
+      let type = 'javascript'
+    endif
+    if len(type) ==# 0 && type =~# '^xml'
+      let type = 'xml'
+    endif
+  endif
+  if len(type) ==# 0 | let type = 'html' | endif
+  return type
+endfunction
+
+function! emmet#getDollarExprs(expand) abort
+  let expand = a:expand
+  let dollar_list = []
+  let dollar_reg = '\%(\\\)\@<!\${\(\([^{}]\|\%(\\\)\@\<=[{}]\)\{}\)}'
+  while 1
+    let matcharr = matchlist(expand, dollar_reg)
+    if len(matcharr) > 0
+      let key = get(matcharr, 1)
+      if key !~# '^\d\+:'
+        let key = substitute(key, '\\{', '{', 'g')
+        let key = substitute(key, '\\}', '}', 'g')
+        let value = emmet#getDollarValueByKey(key)
+        if type(value) ==# type('')
+          let expr = get(matcharr, 0)
+          call add(dollar_list, {'expr': expr, 'value': value})
+        endif
+      endif
+    else
+      break
+    endif
+    let expand = substitute(expand, dollar_reg, '', '')
+  endwhile
+  return dollar_list
+endfunction
+
+function! emmet#getDollarValueByKey(key) abort
+  let ret = 0
+  let key = a:key
+  let ftsetting = get(s:emmet_settings, emmet#getFileType())
+  if type(ftsetting) ==# 4 && has_key(ftsetting, key)
+    let V = get(ftsetting, key)
+    if type(V) ==# 1 | return V | endif
+  endif
+  if type(ret) !=# 1 && has_key(s:emmet_settings.variables, key)
+    let V = get(s:emmet_settings.variables, key)
+    if type(V) ==# 1 | return V | endif
+  endif
+  if has_key(s:emmet_settings, 'custom_expands') && type(s:emmet_settings['custom_expands']) ==# 4
+    for k in keys(s:emmet_settings['custom_expands'])
+      if key =~# k
+        let V = get(s:emmet_settings['custom_expands'], k)
+        if type(V) ==# 1 | return V | endif
+        if type(V) ==# 2 | return V(key) | endif
+      endif
+    endfor
+  endif
+  return ret
+endfunction
+
+function! emmet#reExpandDollarExpr(expand, times) abort
+  let expand = a:expand
+  let dollar_exprs = emmet#getDollarExprs(expand)
+  if len(dollar_exprs) > 0
+    if a:times < 9
+      for n in range(len(dollar_exprs))
+        let pair = get(dollar_exprs, n)
+        let pat = get(pair, 'expr')
+        let sub = get(pair, 'value')
+        let expand = substitute(expand, pat, sub, '')
+      endfor
+      return emmet#reExpandDollarExpr(expand, a:times + 1)
+    endif
+  endif
+  return expand
+endfunction
+
+function! emmet#expandDollarExpr(expand) abort
+  return emmet#reExpandDollarExpr(a:expand, 0)
+endfunction
+
+function! emmet#expandCursorExpr(expand, mode) abort
+  let expand = a:expand
+  if expand !~# '\${cursor}'
+    if a:mode ==# 2
+      let expand = '${cursor}' . expand
+    else
+      let expand .= '${cursor}'
+    endif
+  endif
+  let expand = substitute(expand, '\${\d\+:\?\([^}]\+\)}', '$select$$cursor$\1$select$', 'g')
+  let expand = substitute(expand, '\${\d\+}', '$select$$cursor$$select$', 'g')
+  let expand = substitute(expand, '\${cursor}', '$cursor$', '')
+  let expand = substitute(expand, '\${cursor}', '', 'g')
+  let expand = substitute(expand, '\${cursor}', '', 'g')
+  return expand
+endfunction
+
+function! emmet#unescapeDollarExpr(expand) abort
+  return substitute(a:expand, '\\\$', '$', 'g')
+endfunction
+
+function! emmet#expandAbbr(mode, abbr) range abort
+  let type = emmet#getFileType()
+  let rtype = emmet#lang#type(emmet#getFileType(1))
+  let indent = emmet#getIndentation(type)
+  let expand = ''
+  let line = ''
+  let part = ''
+  let rest = ''
+
+  let filters = emmet#getFilters(type)
+  if len(filters) ==# 0
+    let filters = ['html']
+  endif
+
+  if a:mode ==# 2
+    let leader = substitute(input('Tag: ', ''), '^\s*\(.*\)\s*$', '\1', 'g')
+    if len(leader) ==# 0
+      return ''
+    endif
+    if leader =~# s:filtermx
+      let filters = map(split(matchstr(leader, s:filtermx)[1:], '\s*[^\\]\zs,\s*'), 'substitute(v:val, "\\\\\\\\zs.\\\\ze", "&", "g")')
+      let leader = substitute(leader, s:filtermx, '', '')
+    endif
+    if leader =~# '\*'
+      let query = substitute(leader, '*', '*' . (a:lastline - a:firstline + 1), '')
+      if query !~# '}\s*$' && query !~# '\$#'
+        let query .= '>{$#}'
+      endif
+      if emmet#useFilter(filters, '/')
+        let spl = emmet#splitFilterArg(filters)
+        let fline = getline(a:firstline)
+        let query = substitute(query, '>\{0,1}{\$#}\s*$', '{\\$column\\$}*' . len(split(fline, spl)), '')
+      else
+        let spl = ''
+      endif
+      let items = emmet#parseIntoTree(query, type).child
+      let itemno = 0
+      for item in items
+        let inner = emmet#toString(item, type, 0, filters, 0, indent)
+        let inner = substitute(inner, '\$#', '$line'.(itemno*(a:lastline - a:firstline + 1)/len(items)+1).'$', 'g')
+        let expand .= inner
+        let itemno = itemno + 1
+      endfor
+      if emmet#useFilter(filters, 'e')
+        let expand = substitute(expand, '&', '\&amp;', 'g')
+        let expand = substitute(expand, '<', '\&lt;', 'g')
+        let expand = substitute(expand, '>', '\&gt;', 'g')
+      endif
+      let line = getline(a:firstline)
+      let part = substitute(line, '^\s*', '', '')
+      for n in range(a:firstline, a:lastline)
+        let lline = getline(n)
+        let lpart = substitute(lline, '^\s\+', '', '')
+        if emmet#useFilter(filters, 't')
+          let lpart = substitute(lpart, '^[0-9.-]\+\s\+', '', '')
+          let lpart = substitute(lpart, '\s\+$', '', '')
+        endif
+        if emmet#useFilter(filters, '/')
+          for column in split(lpart, spl)
+            let expand = substitute(expand, '\$column\$', '\=column', '')
+          endfor
+        else
+          let expand = substitute(expand, '\$line'.(n-a:firstline+1).'\$', '\=lpart', 'g')
+        endif
+      endfor
+      let expand = substitute(expand, '\$line\d*\$', '', 'g')
+      let expand = substitute(expand, '\$column\$', '', 'g')
+      let content = join(getline(a:firstline, a:lastline), "\n")
+      if stridx(expand, '$#') < len(expand)-2
+        let expand = substitute(expand, '^\(.*\)\$#\s*$', '\1', '')
+      endif
+      let expand = substitute(expand, '\$#', '\=content', 'g')
+    else
+      let str = ''
+      if visualmode() ==# 'V'
+        let line = getline(a:firstline)
+        let lspaces = matchstr(line, '^\s*', '', '')
+        let part = substitute(line, '^\s*', '', '')
+        for n in range(a:firstline, a:lastline)
+          if len(leader) > 0
+            let line = getline(a:firstline)
+            let spaces = matchstr(line, '^\s*', '', '')
+            if len(spaces) >= len(lspaces)
+              let str .= indent . getline(n)[len(lspaces):] . "\n"
+            else
+              let str .= getline(n) . "\n"
+            endif
+          else
+            let lpart = substitute(getline(n), '^\s*', '', '')
+            let str .= lpart . "\n"
+          endif
+        endfor
+        if stridx(leader, '{$#}') ==# -1
+          let leader .= '{$#}'
+        endif
+        let items = emmet#parseIntoTree(leader, type).child
+      else
+        let save_regcont = @"
+        let save_regtype = getregtype('"')
+        silent! normal! gvygv
+        let str = @"
+        call setreg('"', save_regcont, save_regtype)
+        if stridx(leader, '{$#}') ==# -1
+          let leader .= '{$#}'
+        endif
+        let items = emmet#parseIntoTree(leader, type).child
+      endif
+      for item in items
+        let expand .= emmet#toString(item, type, 0, filters, 0, '')
+      endfor
+      if emmet#useFilter(filters, 'e')
+        let expand = substitute(expand, '&', '\&amp;', 'g')
+        let expand = substitute(expand, '<', '\&lt;', 'g')
+        let expand = substitute(expand, '>', '\&gt;', 'g')
+      endif
+      if stridx(leader, '{$#}') !=# -1
+        let expand = substitute(expand, '\$#', '\="\n" . str', 'g')
+      endif
+    endif
+  elseif a:mode ==# 4
+    let line = getline('.')
+    let spaces = matchstr(line, '^\s*')
+    if line !~# '^\s*$'
+      put =spaces.a:abbr
+    else
+      call setline('.', spaces.a:abbr)
+    endif
+    normal! $
+    call emmet#expandAbbr(0, '')
+    return ''
+  else
+    let line = getline('.')
+    if col('.') < len(line)
+      let line = matchstr(line, '^\(.*\%'.col('.').'c\)')
+    endif
+    if a:mode ==# 1
+      let part = matchstr(line, '\([a-zA-Z0-9:_\-\@|]\+\)$')
+    else
+      let part = matchstr(line, '\(\S.*\)$')
+      let ftype = emmet#lang#exists(type) ? type : 'html'
+      let part = emmet#lang#{ftype}#findTokens(part)
+      let line = line[0: strridx(line, part) + len(part) - 1]
+    endif
+    if col('.') ==# col('$')
+      let rest = ''
+    else
+      let rest = getline('.')[len(line):]
+    endif
+    let str = part
+    if str =~# s:filtermx
+      let filters = split(matchstr(str, s:filtermx)[1:], '\s*,\s*')
+      let str = substitute(str, s:filtermx, '', '')
+    endif
+    let items = emmet#parseIntoTree(str, type).child
+    for item in items
+      let expand .= emmet#toString(item, type, 0, filters, 0, indent)
+    endfor
+    if emmet#useFilter(filters, 'e')
+      let expand = substitute(expand, '&', '\&amp;', 'g')
+      let expand = substitute(expand, '<', '\&lt;', 'g')
+      let expand = substitute(expand, '>', '\&gt;', 'g')
+    endif
+    let expand = substitute(expand, '\$line\([0-9]\+\)\$', '\=submatch(1)', 'g')
+  endif
+  let expand = emmet#expandDollarExpr(expand)
+  let expand = emmet#expandCursorExpr(expand, a:mode)
+  if len(expand)
+    if has_key(s:emmet_settings, 'timezone') && len(s:emmet_settings.timezone)
+      let expand = substitute(expand, '${datetime}', strftime('%Y-%m-%dT%H:%M:%S') . s:emmet_settings.timezone, 'g')
+    else
+      " TODO: on windows, %z/%Z is 'Tokyo(Standard)'
+      let expand = substitute(expand, '${datetime}', strftime('%Y-%m-%dT%H:%M:%S %z'), 'g')
+    endif
+    let expand = emmet#unescapeDollarExpr(expand)
+    if a:mode ==# 2 && visualmode() ==# 'v'
+      if a:firstline ==# a:lastline
+        let expand = substitute(expand, '[\r\n]\s*', '', 'g')
+      else
+        let expand = substitute(expand, '[\n]$', '', 'g')
+      endif
+      silent! normal! gv
+      let col = col('''<')
+      silent! normal! c
+      let line = getline('.')
+      let lhs = matchstr(line, '.*\%<'.col.'c.')
+      let rhs = matchstr(line, '\%>'.(col-1).'c.*')
+      let expand = lhs.expand.rhs
+      let lines = split(expand, '\n')
+      call setline(line('.'), lines[0])
+      if len(lines) > 1
+        call append(line('.'), lines[1:])
+      endif
+    else
+      if line[:-len(part)-1] =~# '^\s\+$'
+        let indent = line[:-len(part)-1]
+      else
+        let indent = ''
+      endif
+      let expand = substitute(expand, '[\r\n]\s*$', '', 'g')
+      if emmet#useFilter(filters, 's')
+        let epart = substitute(expand, '[\r\n]\s*', '', 'g')
+      else
+        let epart = substitute(expand, '[\r\n]', "\n" . indent, 'g')
+      endif
+      let expand = line[:-len(part)-1] . epart . rest
+      let lines = split(expand, '[\r\n]', 1)
+      if a:mode ==# 2
+        silent! exe 'normal! gvc'
+      endif
+      call setline('.', lines[0])
+      if len(lines) > 1
+        call append('.', lines[1:])
+      endif
+    endif
+  endif
+  if g:emmet_debug > 1
+    call getchar()
+  endif
+  if search('\ze\$\(cursor\|select\)\$', 'c')
+    let oldselection = &selection
+    let &selection = 'inclusive'
+    if foldclosed(line('.')) !=# -1
+      silent! foldopen
+    endif
+    let pos = emmet#util#getcurpos()
+    let use_selection = emmet#getResource(type, 'use_selection', 0)
+    try
+      let l:gdefault = &gdefault
+      let &gdefault = 0
+      if use_selection && getline('.')[col('.')-1:] =~# '^\$select'
+        let pos[2] += 1
+        silent! s/\$select\$//
+        let next = searchpos('.\ze\$select\$', 'nW')
+        silent! %s/\$\(cursor\|select\)\$//g
+        call emmet#util#selectRegion([pos[1:2], next])
+        return "\<esc>gv"
+      else
+        silent! %s/\$\(cursor\|select\)\$//g
+        silent! call setpos('.', pos)
+        if col('.') < col('$')
+          return "\<right>"
+        endif
+      endif
+    finally
+      let &gdefault = l:gdefault
+    endtry
+    let &selection = oldselection
+  endif
+  return ''
+endfunction
+
+function! emmet#updateTag() abort
+  let type = emmet#getFileType()
+  let region = emmet#util#searchRegion('<\S', '>')
+  if !emmet#util#regionIsValid(region) || !emmet#util#cursorInRegion(region)
+    return ''
+  endif
+  let content = emmet#util#getContent(region)
+  let content = matchstr(content,  '^<[^><]\+>')
+  if content !~# '^<[^><]\+>$'
+    return ''
+  endif
+  let current = emmet#lang#html#parseTag(content)
+  if empty(current)
+    return ''
+  endif
+
+  let str = substitute(input('Enter Abbreviation: ', ''), '^\s*\(.*\)\s*$', '\1', 'g')
+  let item = emmet#parseIntoTree(str, type).child[0]
+  for k in keys(item.attr)
+    let current.attr[k] = item.attr[k]
+  endfor
+  let html = substitute(emmet#toString(current, 'html', 1), '\n', '', '')
+  let html = substitute(html, '\${cursor}', '', '')
+  let html = matchstr(html,  '^<[^><]\+>')
+  call emmet#util#setContent(region, html)
+  return ''
+endfunction
+
+function! emmet#moveNextPrevItem(flag) abort
+  let type = emmet#getFileType()
+  return emmet#lang#{emmet#lang#type(type)}#moveNextPrevItem(a:flag)
+endfunction
+
+function! emmet#moveNextPrev(flag) abort
+  let type = emmet#getFileType()
+  return emmet#lang#{emmet#lang#type(type)}#moveNextPrev(a:flag)
+endfunction
+
+function! emmet#imageSize() abort
+  let orgpos = emmet#util#getcurpos()
+  let type = emmet#getFileType()
+  call emmet#lang#{emmet#lang#type(type)}#imageSize()
+  silent! call setpos('.', orgpos)
+  return ''
+endfunction
+
+function! emmet#encodeImage() abort
+  let type = emmet#getFileType()
+  return emmet#lang#{emmet#lang#type(type)}#encodeImage()
+endfunction
+
+function! emmet#toggleComment() abort
+  let type = emmet#getFileType()
+  call emmet#lang#{emmet#lang#type(type)}#toggleComment()
+  return ''
+endfunction
+
+function! emmet#balanceTag(flag) range abort
+  let type = emmet#getFileType()
+  return emmet#lang#{emmet#lang#type(type)}#balanceTag(a:flag)
+endfunction
+
+function! emmet#splitJoinTag() abort
+  let type = emmet#getFileType()
+  return emmet#lang#{emmet#lang#type(type)}#splitJoinTag()
+endfunction
+
+function! emmet#mergeLines() range abort
+  let lines = join(map(getline(a:firstline, a:lastline), 'matchstr(v:val, "^\\s*\\zs.*\\ze\\s*$")'), '')
+  let indent = substitute(getline('.'), '^\(\s*\).*', '\1', '')
+  silent! exe 'normal! gvc'
+  call setline('.', indent . lines)
+endfunction
+
+function! emmet#removeTag() abort
+  let type = emmet#getFileType()
+  call emmet#lang#{emmet#lang#type(type)}#removeTag()
+  return ''
+endfunction
+
+function! emmet#anchorizeURL(flag) abort
+  let mx = 'https\=:\/\/[-!#$%&*+,./:;=?@0-9a-zA-Z_~]\+'
+  let pos1 = searchpos(mx, 'bcnW')
+  let url = matchstr(getline(pos1[0])[pos1[1]-1:], mx)
+  let block = [pos1, [pos1[0], pos1[1] + len(url) - 1]]
+  if !emmet#util#cursorInRegion(block)
+    return ''
+  endif
+
+  let mx = '.*<title[^>]*>\s*\zs\([^<]\+\)\ze\s*<\/title[^>]*>.*'
+  let content = emmet#util#getContentFromURL(url)
+  let content = substitute(content, '\r', '', 'g')
+  let content = substitute(content, '[ \n]\+', ' ', 'g')
+  let content = substitute(content, '<!--.\{-}-->', '', 'g')
+  let title = matchstr(content, mx)
+
+  let type = emmet#getFileType()
+  let rtype = emmet#lang#type(type)
+  if &filetype ==# 'markdown'
+    let expand = printf('[%s](%s)', substitute(title, '[\[\]]', '\\&', 'g'), url)
+  elseif a:flag ==# 0
+    let a = emmet#lang#html#parseTag('<a>')
+    let a.attr.href = url
+    let a.value = '{' . title . '}'
+    let expand = emmet#toString(a, rtype, 0, [])
+    let expand = substitute(expand, '\${cursor}', '', 'g')
+  else
+    let body = emmet#util#getTextFromHTML(content)
+    let body = '{' . substitute(body, '^\(.\{0,100}\).*', '\1', '') . '...}'
+
+    let blockquote = emmet#lang#html#parseTag('<blockquote class="quote">')
+    let a = emmet#lang#html#parseTag('<a>')
+    let a.attr.href = url
+    let a.value = '{' . title . '}'
+    call add(blockquote.child, a)
+    call add(blockquote.child, emmet#lang#html#parseTag('<br/>'))
+    let p = emmet#lang#html#parseTag('<p>')
+    let p.value = body
+    call add(blockquote.child, p)
+    let cite = emmet#lang#html#parseTag('<cite>')
+    let cite.value = '{' . url . '}'
+    call add(blockquote.child, cite)
+    let expand = emmet#toString(blockquote, rtype, 0, [])
+    let expand = substitute(expand, '\${cursor}', '', 'g')
+  endif
+  let indent = substitute(getline('.'), '^\(\s*\).*', '\1', '')
+  let expand = substitute(expand, "\n", "\n" . indent, 'g')
+  call emmet#util#setContent(block, expand)
+  return ''
+endfunction
+
+function! emmet#codePretty() range abort
+  let type = input('FileType: ', &filetype, 'filetype')
+  if len(type) ==# 0
+    return
+  endif
+  let block = emmet#util#getVisualBlock()
+  let content = emmet#util#getContent(block)
+  silent! 1new
+  let &l:filetype = type
+  call setline(1, split(content, "\n"))
+  let old_lazyredraw = &lazyredraw
+  set lazyredraw
+  silent! TOhtml
+  let &lazyredraw = old_lazyredraw
+  let content = join(getline(1, '$'), "\n")
+  silent! bw!
+  silent! bw!
+  let content = matchstr(content, '<body[^>]*>[\s\n]*\zs.*\ze</body>')
+  call emmet#util#setContent(block, content)
+endfunction
+
+function! emmet#expandWord(abbr, type, orig) abort
+  let str = a:abbr
+  let type = a:type
+  let indent = emmet#getIndentation(type)
+
+  if len(type) ==# 0 | let type = 'html' | endif
+  if str =~# s:filtermx
+    let filters = split(matchstr(str, s:filtermx)[1:], '\s*,\s*')
+    let str = substitute(str, s:filtermx, '', '')
+  else
+    let filters = emmet#getFilters(a:type)
+    if len(filters) ==# 0
+      let filters = ['html']
+    endif
+  endif
+  let str = substitute(str, '|', '${cursor}', 'g')
+  let items = emmet#parseIntoTree(str, a:type).child
+  let expand = ''
+  for item in items
+    let expand .= emmet#toString(item, a:type, 0, filters, 0, indent)
+  endfor
+  if emmet#useFilter(filters, 'e')
+    let expand = substitute(expand, '&', '\&amp;', 'g')
+    let expand = substitute(expand, '<', '\&lt;', 'g')
+    let expand = substitute(expand, '>', '\&gt;', 'g')
+  endif
+  if emmet#useFilter(filters, 's')
+    let expand = substitute(expand, "\n\s\*", '', 'g')
+  endif
+  if a:orig ==# 0
+    let expand = emmet#expandDollarExpr(expand)
+    let expand = substitute(expand, '\${cursor}', '', 'g')
+  endif
+  return expand
+endfunction
+
+function! emmet#getSnippets(type) abort
+  let type = a:type
+  if len(type) ==# 0 || !has_key(s:emmet_settings, type)
+    let type = 'html'
+  endif
+  return emmet#getResource(type, 'snippets', {})
+endfunction
+
+function! emmet#completeTag(findstart, base) abort
+  if a:findstart
+    let line = getline('.')
+    let start = col('.') - 1
+    while start > 0 && line[start - 1] =~# '[a-zA-Z0-9:_\@\-]'
+      let start -= 1
+    endwhile
+    return start
+  else
+    let type = emmet#getFileType()
+    let res = []
+
+    let snippets = emmet#getResource(type, 'snippets', {})
+    for item in keys(snippets)
+      if stridx(item, a:base) !=# -1
+        call add(res, substitute(item, '\${cursor}\||', '', 'g'))
+      endif
+    endfor
+    let aliases = emmet#getResource(type, 'aliases', {})
+    for item in values(aliases)
+      if stridx(item, a:base) !=# -1
+        call add(res, substitute(item, '\${cursor}\||', '', 'g'))
+      endif
+    endfor
+    return res
+  endif
+endfunction
+
+unlet! s:emmet_settings
+let s:emmet_settings = {
+\    'variables': {
+\      'lang': "en",
+\      'locale': "en-US",
+\      'charset': "UTF-8",
+\      'newline': "\n",
+\      'use_selection': 0,
+\    },
+\    'custom_expands' : {
+\      '^\%(lorem\|lipsum\)\(\d*\)$' : function('emmet#lorem#en#expand'),
+\    },
+\    'css': {
+\        'snippets': {
+\           "@i": "@import url(|);",
+\           "@import": "@import url(|);",
+\           "@m": "@media ${1:screen} {\n\t|\n}",
+\           "@media": "@media ${1:screen} {\n\t|\n}",
+\           "@f": "@font-face {\n\tfont-family:|;\n\tsrc:url(|);\n}",
+\           "@f+": "@font-face {\n\tfont-family: '${1:FontName}';\n\tsrc: url('${2:FileName}.eot');\n\tsrc: url('${2:FileName}.eot?#iefix') format('embedded-opentype'),\n\t\t url('${2:FileName}.woff') format('woff'),\n\t\t url('${2:FileName}.ttf') format('truetype'),\n\t\t url('${2:FileName}.svg#${1:FontName}') format('svg');\n\tfont-style: ${3:normal};\n\tfont-weight: ${4:normal};\n}",
+\           "@kf": "@-webkit-keyframes ${1:identifier} {\n\t${2:from} { ${3} }${6}\n\t${4:to} { ${5} }\n}\n@-o-keyframes ${1:identifier} {\n\t${2:from} { ${3} }${6}\n\t${4:to} { ${5} }\n}\n@-moz-keyframes ${1:identifier} {\n\t${2:from} { ${3} }${6}\n\t${4:to} { ${5} }\n}\n@keyframes ${1:identifier} {\n\t${2:from} { ${3} }${6}\n\t${4:to} { ${5} }\n}",
+\           "anim": "animation:|;",
+\           "anim-": "animation:${1:name} ${2:duration} ${3:timing-function} ${4:delay} ${5:iteration-count} ${6:direction} ${7:fill-mode};",
+\           "animdel": "animation-delay:${1:time};",
+\           "animdir": "animation-direction:${1:normal};",
+\           "animdir:n": "animation-direction:normal;",
+\           "animdir:r": "animation-direction:reverse;",
+\           "animdir:a": "animation-direction:alternate;",
+\           "animdir:ar": "animation-direction:alternate-reverse;",
+\           "animdur": "animation-duration:${1:0}s;",
+\           "animfm": "animation-fill-mode:${1:both};",
+\           "animfm:f": "animation-fill-mode:forwards;",
+\           "animfm:b": "animation-fill-mode:backwards;",
+\           "animfm:bt": "animation-fill-mode:both;",
+\           "animfm:bh": "animation-fill-mode:both;",
+\           "animic": "animation-iteration-count:${1:1};",
+\           "animic:i": "animation-iteration-count:infinite;",
+\           "animn": "animation-name:${1:none};",
+\           "animps": "animation-play-state:${1:running};",
+\           "animps:p": "animation-play-state:paused;",
+\           "animps:r": "animation-play-state:running;",
+\           "animtf": "animation-timing-function:${1:linear};",
+\           "animtf:e": "animation-timing-function:ease;",
+\           "animtf:ei": "animation-timing-function:ease-in;",
+\           "animtf:eo": "animation-timing-function:ease-out;",
+\           "animtf:eio": "animation-timing-function:ease-in-out;",
+\           "animtf:l": "animation-timing-function:linear;",
+\           "animtf:cb": "animation-timing-function:cubic-bezier(${1:0.1}, ${2:0.7}, ${3:1.0}, ${3:0.1});",
+\           "ap": "appearance:${none};",
+\           "!": "!important",
+\           "pos": "position:${1:relative};",
+\           "pos:s": "position:static;",
+\           "pos:a": "position:absolute;",
+\           "pos:r": "position:relative;",
+\           "pos:f": "position:fixed;",
+\           "t": "top:|;",
+\           "t:a": "top:auto;",
+\           "r": "right:|;",
+\           "r:a": "right:auto;",
+\           "b": "bottom:|;",
+\           "b:a": "bottom:auto;",
+\           "l": "left:|;",
+\           "l:a": "left:auto;",
+\           "z": "z-index:|;",
+\           "z:a": "z-index:auto;",
+\           "fl": "float:${1:left};",
+\           "fl:n": "float:none;",
+\           "fl:l": "float:left;",
+\           "fl:r": "float:right;",
+\           "cl": "clear:${1:both};",
+\           "cl:n": "clear:none;",
+\           "cl:l": "clear:left;",
+\           "cl:r": "clear:right;",
+\           "cl:b": "clear:both;",
+\           "colm": "columns:|;",
+\           "colmc": "column-count:|;",
+\           "colmf": "column-fill:|;",
+\           "colmg": "column-gap:|;",
+\           "colmr": "column-rule:|;",
+\           "colmrc": "column-rule-color:|;",
+\           "colmrs": "column-rule-style:|;",
+\           "colmrw": "column-rule-width:|;",
+\           "colms": "column-span:|;",
+\           "colmw": "column-width:|;",
+\           "d": "display:${1:block};",
+\           "d:n": "display:none;",
+\           "d:b": "display:block;",
+\           "d:f": "display:flex;",
+\           "d:if": "display:inline-flex;",
+\           "d:i": "display:inline;",
+\           "d:ib": "display:inline-block;",
+\           "d:ib+": "display: inline-block;\n*display: inline;\n*zoom: 1;",
+\           "d:li": "display:list-item;",
+\           "d:ri": "display:run-in;",
+\           "d:cp": "display:compact;",
+\           "d:tb": "display:table;",
+\           "d:itb": "display:inline-table;",
+\           "d:tbcp": "display:table-caption;",
+\           "d:tbcl": "display:table-column;",
+\           "d:tbclg": "display:table-column-group;",
+\           "d:tbhg": "display:table-header-group;",
+\           "d:tbfg": "display:table-footer-group;",
+\           "d:tbr": "display:table-row;",
+\           "d:tbrg": "display:table-row-group;",
+\           "d:tbc": "display:table-cell;",
+\           "d:rb": "display:ruby;",
+\           "d:rbb": "display:ruby-base;",
+\           "d:rbbg": "display:ruby-base-group;",
+\           "d:rbt": "display:ruby-text;",
+\           "d:rbtg": "display:ruby-text-group;",
+\           "v": "visibility:${1:hidden};",
+\           "v:v": "visibility:visible;",
+\           "v:h": "visibility:hidden;",
+\           "v:c": "visibility:collapse;",
+\           "ov": "overflow:${1:hidden};",
+\           "ov:v": "overflow:visible;",
+\           "ov:h": "overflow:hidden;",
+\           "ov:s": "overflow:scroll;",
+\           "ov:a": "overflow:auto;",
+\           "ovx": "overflow-x:${1:hidden};",
+\           "ovx:v": "overflow-x:visible;",
+\           "ovx:h": "overflow-x:hidden;",
+\           "ovx:s": "overflow-x:scroll;",
+\           "ovx:a": "overflow-x:auto;",
+\           "ovy": "overflow-y:${1:hidden};",
+\           "ovy:v": "overflow-y:visible;",
+\           "ovy:h": "overflow-y:hidden;",
+\           "ovy:s": "overflow-y:scroll;",
+\           "ovy:a": "overflow-y:auto;",
+\           "ovs": "overflow-style:${1:scrollbar};",
+\           "ovs:a": "overflow-style:auto;",
+\           "ovs:s": "overflow-style:scrollbar;",
+\           "ovs:p": "overflow-style:panner;",
+\           "ovs:m": "overflow-style:move;",
+\           "ovs:mq": "overflow-style:marquee;",
+\           "zoo": "zoom:1;",
+\           "zm": "zoom:1;",
+\           "cp": "clip:|;",
+\           "cp:a": "clip:auto;",
+\           "cp:r": "clip:rect(${1:top} ${2:right} ${3:bottom} ${4:left});",
+\           "bxz": "box-sizing:${1:border-box};",
+\           "bxz:cb": "box-sizing:content-box;",
+\           "bxz:bb": "box-sizing:border-box;",
+\           "bxsh": "box-shadow:${1:inset }${2:hoff} ${3:voff} ${4:blur} ${5:color};",
+\           "bxsh:r": "box-shadow:${1:inset }${2:hoff} ${3:voff} ${4:blur} ${5:spread }rgb(${6:0}, ${7:0}, ${8:0});",
+\           "bxsh:ra": "box-shadow:${1:inset }${2:h} ${3:v} ${4:blur} ${5:spread }rgba(${6:0}, ${7:0}, ${8:0}, .${9:5});",
+\           "bxsh:n": "box-shadow:none;",
+\           "m": "margin:|;",
+\           "m:a": "margin:auto;",
+\           "mt": "margin-top:|;",
+\           "mt:a": "margin-top:auto;",
+\           "mr": "margin-right:|;",
+\           "mr:a": "margin-right:auto;",
+\           "mb": "margin-bottom:|;",
+\           "mb:a": "margin-bottom:auto;",
+\           "ml": "margin-left:|;",
+\           "ml:a": "margin-left:auto;",
+\           "p": "padding:|;",
+\           "pt": "padding-top:|;",
+\           "pr": "padding-right:|;",
+\           "pb": "padding-bottom:|;",
+\           "pl": "padding-left:|;",
+\           "w": "width:|;",
+\           "w:a": "width:auto;",
+\           "h": "height:|;",
+\           "h:a": "height:auto;",
+\           "maw": "max-width:|;",
+\           "maw:n": "max-width:none;",
+\           "mah": "max-height:|;",
+\           "mah:n": "max-height:none;",
+\           "miw": "min-width:|;",
+\           "mih": "min-height:|;",
+\           "mar": "max-resolution:${1:res};",
+\           "mir": "min-resolution:${1:res};",
+\           "ori": "orientation:|;",
+\           "ori:l": "orientation:landscape;",
+\           "ori:p": "orientation:portrait;",
+\           "ol": "outline:|;",
+\           "ol:n": "outline:none;",
+\           "olo": "outline-offset:|;",
+\           "olw": "outline-width:|;",
+\           "olw:tn": "outline-width:thin;",
+\           "olw:m": "outline-width:medium;",
+\           "olw:tc": "outline-width:thick;",
+\           "ols": "outline-style:|;",
+\           "ols:n": "outline-style:none;",
+\           "ols:dt": "outline-style:dotted;",
+\           "ols:ds": "outline-style:dashed;",
+\           "ols:s": "outline-style:solid;",
+\           "ols:db": "outline-style:double;",
+\           "ols:g": "outline-style:groove;",
+\           "ols:r": "outline-style:ridge;",
+\           "ols:i": "outline-style:inset;",
+\           "ols:o": "outline-style:outset;",
+\           "olc": "outline-color:#${1:000};",
+\           "olc:i": "outline-color:invert;",
+\           "bfv": "backface-visibility:|;",
+\           "bfv:h": "backface-visibility:hidden;",
+\           "bfv:v": "backface-visibility:visible;",
+\           "bd": "border:|;",
+\           "bd+": "border:${1:1px} ${2:solid} ${3:#000};",
+\           "bd:n": "border:none;",
+\           "bdbk": "border-break:${1:close};",
+\           "bdbk:c": "border-break:close;",
+\           "bdcl": "border-collapse:|;",
+\           "bdcl:c": "border-collapse:collapse;",
+\           "bdcl:s": "border-collapse:separate;",
+\           "bdc": "border-color:#${1:000};",
+\           "bdc:t": "border-color:transparent;",
+\           "bdi": "border-image:url(|);",
+\           "bdi:n": "border-image:none;",
+\           "bdti": "border-top-image:url(|);",
+\           "bdti:n": "border-top-image:none;",
+\           "bdri": "border-right-image:url(|);",
+\           "bdri:n": "border-right-image:none;",
+\           "bdbi": "border-bottom-image:url(|);",
+\           "bdbi:n": "border-bottom-image:none;",
+\           "bdli": "border-left-image:url(|);",
+\           "bdli:n": "border-left-image:none;",
+\           "bdci": "border-corner-image:url(|);",
+\           "bdci:n": "border-corner-image:none;",
+\           "bdci:c": "border-corner-image:continue;",
+\           "bdtli": "border-top-left-image:url(|);",
+\           "bdtli:n": "border-top-left-image:none;",
+\           "bdtli:c": "border-top-left-image:continue;",
+\           "bdtri": "border-top-right-image:url(|);",
+\           "bdtri:n": "border-top-right-image:none;",
+\           "bdtri:c": "border-top-right-image:continue;",
+\           "bdbri": "border-bottom-right-image:url(|);",
+\           "bdbri:n": "border-bottom-right-image:none;",
+\           "bdbri:c": "border-bottom-right-image:continue;",
+\           "bdbli": "border-bottom-left-image:url(|);",
+\           "bdbli:n": "border-bottom-left-image:none;",
+\           "bdbli:c": "border-bottom-left-image:continue;",
+\           "bdf": "border-fit:${1:repeat};",
+\           "bdf:c": "border-fit:clip;",
+\           "bdf:r": "border-fit:repeat;",
+\           "bdf:sc": "border-fit:scale;",
+\           "bdf:st": "border-fit:stretch;",
+\           "bdf:ow": "border-fit:overwrite;",
+\           "bdf:of": "border-fit:overflow;",
+\           "bdf:sp": "border-fit:space;",
+\           "bdlen": "border-length:|;",
+\           "bdlen:a": "border-length:auto;",
+\           "bdsp": "border-spacing:|;",
+\           "bds": "border-style:|;",
+\           "bds:n": "border-style:none;",
+\           "bds:h": "border-style:hidden;",
+\           "bds:dt": "border-style:dotted;",
+\           "bds:ds": "border-style:dashed;",
+\           "bds:s": "border-style:solid;",
+\           "bds:db": "border-style:double;",
+\           "bds:dtds": "border-style:dot-dash;",
+\           "bds:dtdtds": "border-style:dot-dot-dash;",
+\           "bds:w": "border-style:wave;",
+\           "bds:g": "border-style:groove;",
+\           "bds:r": "border-style:ridge;",
+\           "bds:i": "border-style:inset;",
+\           "bds:o": "border-style:outset;",
+\           "bdw": "border-width:|;",
+\           "bdtw": "border-top-width:|;",
+\           "bdrw": "border-right-width:|;",
+\           "bdbw": "border-bottom-width:|;",
+\           "bdlw": "border-left-width:|;",
+\           "bdt": "border-top:|;",
+\           "bt": "border-top:|;",
+\           "bdt+": "border-top:${1:1px} ${2:solid} ${3:#000};",
+\           "bdt:n": "border-top:none;",
+\           "bdts": "border-top-style:|;",
+\           "bdts:n": "border-top-style:none;",
+\           "bdtc": "border-top-color:#${1:000};",
+\           "bdtc:t": "border-top-color:transparent;",
+\           "bdr": "border-right:|;",
+\           "br": "border-right:|;",
+\           "bdr+": "border-right:${1:1px} ${2:solid} ${3:#000};",
+\           "bdr:n": "border-right:none;",
+\           "bdrst": "border-right-style:|;",
+\           "bdrst:n": "border-right-style:none;",
+\           "bdrc": "border-right-color:#${1:000};",
+\           "bdrc:t": "border-right-color:transparent;",
+\           "bdb": "border-bottom:|;",
+\           "bb": "border-bottom:|;",
+\           "bdb+": "border-bottom:${1:1px} ${2:solid} ${3:#000};",
+\           "bdb:n": "border-bottom:none;",
+\           "bdbs": "border-bottom-style:|;",
+\           "bdbs:n": "border-bottom-style:none;",
+\           "bdbc": "border-bottom-color:#${1:000};",
+\           "bdbc:t": "border-bottom-color:transparent;",
+\           "bdl": "border-left:|;",
+\           "bl": "border-left:|;",
+\           "bdl+": "border-left:${1:1px} ${2:solid} ${3:#000};",
+\           "bdl:n": "border-left:none;",
+\           "bdls": "border-left-style:|;",
+\           "bdls:n": "border-left-style:none;",
+\           "bdlc": "border-left-color:#${1:000};",
+\           "bdlc:t": "border-left-color:transparent;",
+\           "bdrs": "border-radius:|;",
+\           "bdtrrs": "border-top-right-radius:|;",
+\           "bdtlrs": "border-top-left-radius:|;",
+\           "bdbrrs": "border-bottom-right-radius:|;",
+\           "bdblrs": "border-bottom-left-radius:|;",
+\           "bg": "background:#${1:000};",
+\           "bg+": "background:${1:#fff} url(${2}) ${3:0} ${4:0} ${5:no-repeat};",
+\           "bg:n": "background:none;",
+\           "bg:ie": "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1:x}.png',sizingMethod='${2:crop}');",
+\           "bgc": "background-color:#${1:fff};",
+\           "bgc:t": "background-color:transparent;",
+\           "bgi": "background-image:url(|);",
+\           "bgi:n": "background-image:none;",
+\           "bgr": "background-repeat:|;",
+\           "bgr:n": "background-repeat:no-repeat;",
+\           "bgr:x": "background-repeat:repeat-x;",
+\           "bgr:y": "background-repeat:repeat-y;",
+\           "bgr:sp": "background-repeat:space;",
+\           "bgr:rd": "background-repeat:round;",
+\           "bga": "background-attachment:|;",
+\           "bga:f": "background-attachment:fixed;",
+\           "bga:s": "background-attachment:scroll;",
+\           "bgp": "background-position:${1:0} ${2:0};",
+\           "bgpx": "background-position-x:|;",
+\           "bgpy": "background-position-y:|;",
+\           "bgbk": "background-break:|;",
+\           "bgbk:bb": "background-break:bounding-box;",
+\           "bgbk:eb": "background-break:each-box;",
+\           "bgbk:c": "background-break:continuous;",
+\           "bgcp": "background-clip:${1:padding-box};",
+\           "bgcp:bb": "background-clip:border-box;",
+\           "bgcp:pb": "background-clip:padding-box;",
+\           "bgcp:cb": "background-clip:content-box;",
+\           "bgcp:nc": "background-clip:no-clip;",
+\           "bgo": "background-origin:|;",
+\           "bgo:pb": "background-origin:padding-box;",
+\           "bgo:bb": "background-origin:border-box;",
+\           "bgo:cb": "background-origin:content-box;",
+\           "bgsz": "background-size:|;",
+\           "bgsz:a": "background-size:auto;",
+\           "bgsz:ct": "background-size:contain;",
+\           "bgsz:cv": "background-size:cover;",
+\           "c": "color:#${1:000};",
+\           "c:r": "color:rgb(${1:0}, ${2:0}, ${3:0});",
+\           "c:ra": "color:rgba(${1:0}, ${2:0}, ${3:0}, .${4:5});",
+\           "cm": "/* |${child} */",
+\           "cnt": "content:'|';",
+\           "cnt:n": "content:normal;",
+\           "cnt:oq": "content:open-quote;",
+\           "cnt:noq": "content:no-open-quote;",
+\           "cnt:cq": "content:close-quote;",
+\           "cnt:ncq": "content:no-close-quote;",
+\           "cnt:a": "content:attr(|);",
+\           "cnt:c": "content:counter(|);",
+\           "cnt:cs": "content:counters(|);",
+\           "tbl": "table-layout:|;",
+\           "tbl:a": "table-layout:auto;",
+\           "tbl:f": "table-layout:fixed;",
+\           "cps": "caption-side:|;",
+\           "cps:t": "caption-side:top;",
+\           "cps:b": "caption-side:bottom;",
+\           "ec": "empty-cells:|;",
+\           "ec:s": "empty-cells:show;",
+\           "ec:h": "empty-cells:hide;",
+\           "lis": "list-style:|;",
+\           "lis:n": "list-style:none;",
+\           "lisp": "list-style-position:|;",
+\           "lisp:i": "list-style-position:inside;",
+\           "lisp:o": "list-style-position:outside;",
+\           "list": "list-style-type:|;",
+\           "list:n": "list-style-type:none;",
+\           "list:d": "list-style-type:disc;",
+\           "list:c": "list-style-type:circle;",
+\           "list:s": "list-style-type:square;",
+\           "list:dc": "list-style-type:decimal;",
+\           "list:dclz": "list-style-type:decimal-leading-zero;",
+\           "list:lr": "list-style-type:lower-roman;",
+\           "list:ur": "list-style-type:upper-roman;",
+\           "lisi": "list-style-image:|;",
+\           "lisi:n": "list-style-image:none;",
+\           "q": "quotes:|;",
+\           "q:n": "quotes:none;",
+\           "q:ru": "quotes:'\\00AB' '\\00BB' '\\201E' '\\201C';",
+\           "q:en": "quotes:'\\201C' '\\201D' '\\2018' '\\2019';",
+\           "ct": "content:|;",
+\           "ct:n": "content:normal;",
+\           "ct:oq": "content:open-quote;",
+\           "ct:noq": "content:no-open-quote;",
+\           "ct:cq": "content:close-quote;",
+\           "ct:ncq": "content:no-close-quote;",
+\           "ct:a": "content:attr(|);",
+\           "ct:c": "content:counter(|);",
+\           "ct:cs": "content:counters(|);",
+\           "coi": "counter-increment:|;",
+\           "cor": "counter-reset:|;",
+\           "va": "vertical-align:${1:top};",
+\           "va:sup": "vertical-align:super;",
+\           "va:t": "vertical-align:top;",
+\           "va:tt": "vertical-align:text-top;",
+\           "va:m": "vertical-align:middle;",
+\           "va:bl": "vertical-align:baseline;",
+\           "va:b": "vertical-align:bottom;",
+\           "va:tb": "vertical-align:text-bottom;",
+\           "va:sub": "vertical-align:sub;",
+\           "ta": "text-align:${1:left};",
+\           "ta:l": "text-align:left;",
+\           "ta:c": "text-align:center;",
+\           "ta:r": "text-align:right;",
+\           "ta:j": "text-align:justify;",
+\           "ta-lst": "text-align-last:|;",
+\           "tal:a": "text-align-last:auto;",
+\           "tal:l": "text-align-last:left;",
+\           "tal:c": "text-align-last:center;",
+\           "tal:r": "text-align-last:right;",
+\           "td": "text-decoration:${1:none};",
+\           "td:n": "text-decoration:none;",
+\           "td:u": "text-decoration:underline;",
+\           "td:o": "text-decoration:overline;",
+\           "td:l": "text-decoration:line-through;",
+\           "te": "text-emphasis:|;",
+\           "te:n": "text-emphasis:none;",
+\           "te:ac": "text-emphasis:accent;",
+\           "te:dt": "text-emphasis:dot;",
+\           "te:c": "text-emphasis:circle;",
+\           "te:ds": "text-emphasis:disc;",
+\           "te:b": "text-emphasis:before;",
+\           "te:a": "text-emphasis:after;",
+\           "th": "text-height:|;",
+\           "th:a": "text-height:auto;",
+\           "th:f": "text-height:font-size;",
+\           "th:t": "text-height:text-size;",
+\           "th:m": "text-height:max-size;",
+\           "ti": "text-indent:|;",
+\           "ti:-": "text-indent:-9999px;",
+\           "tj": "text-justify:|;",
+\           "tj:a": "text-justify:auto;",
+\           "tj:iw": "text-justify:inter-word;",
+\           "tj:ii": "text-justify:inter-ideograph;",
+\           "tj:ic": "text-justify:inter-cluster;",
+\           "tj:d": "text-justify:distribute;",
+\           "tj:k": "text-justify:kashida;",
+\           "tj:t": "text-justify:tibetan;",
+\           "tov": "text-overflow:${ellipsis};",
+\           "tov:e": "text-overflow:ellipsis;",
+\           "tov:c": "text-overflow:clip;",
+\           "to": "text-outline:|;",
+\           "to+": "text-outline:${1:0} ${2:0} ${3:#000};",
+\           "to:n": "text-outline:none;",
+\           "tr": "text-replace:|;",
+\           "tr:n": "text-replace:none;",
+\           "tt": "text-transform:${1:uppercase};",
+\           "tt:n": "text-transform:none;",
+\           "tt:c": "text-transform:capitalize;",
+\           "tt:u": "text-transform:uppercase;",
+\           "tt:l": "text-transform:lowercase;",
+\           "tw": "text-wrap:|;",
+\           "tw:n": "text-wrap:normal;",
+\           "tw:no": "text-wrap:none;",
+\           "tw:u": "text-wrap:unrestricted;",
+\           "tw:s": "text-wrap:suppress;",
+\           "tsh": "text-shadow:${1:hoff} ${2:voff} ${3:blur} ${4:#000};",
+\           "tsh:r": "text-shadow:${1:h} ${2:v} ${3:blur} rgb(${4:0}, ${5:0}, ${6:0});",
+\           "tsh:ra": "text-shadow:${1:h} ${2:v} ${3:blur} rgba(${4:0}, ${5:0}, ${6:0}, .${7:5});",
+\           "tsh+": "text-shadow:${1:0} ${2:0} ${3:0} ${4:#000};",
+\           "tsh:n": "text-shadow:none;",
+\           "trf": "transform:|;",
+\           "trf:skx": "transform: skewX(${1:angle});",
+\           "trf:sky": "transform: skewY(${1:angle});",
+\           "trf:sc": "transform: scale(${1:x}, ${2:y});",
+\           "trf:scx": "transform: scaleX(${1:x});",
+\           "trf:scy": "transform: scaleY(${1:y});",
+\           "trf:scz": "transform: scaleZ(${1:z});",
+\           "trf:sc3": "transform: scale3d(${1:x}, ${2:y}, ${3:z});",
+\           "trf:r": "transform: rotate(${1:angle});",
+\           "trf:rx": "transform: rotateX(${1:angle});",
+\           "trf:ry": "transform: rotateY(${1:angle});",
+\           "trf:rz": "transform: rotateZ(${1:angle});",
+\           "trf:t": "transform: translate(${1:x}, ${2:y});",
+\           "trf:tx": "transform: translateX(${1:x});",
+\           "trf:ty": "transform: translateY(${1:y});",
+\           "trf:tz": "transform: translateZ(${1:z});",
+\           "trf:t3": "transform: translate3d(${1:tx}, ${2:ty}, ${3:tz});",
+\           "trfo": "transform-origin:|;",
+\           "trfs": "transform-style:${1:preserve-3d};",
+\           "trs": "transition:${1:prop} ${2:time};",
+\           "trsde": "transition-delay:${1:time};",
+\           "trsdu": "transition-duration:${1:time};",
+\           "trsp": "transition-property:${1:prop};",
+\           "trstf": "transition-timing-function:${1:tfunc};",
+\           "lh": "line-height:|;",
+\           "whs": "white-space:|;",
+\           "whs:n": "white-space:normal;",
+\           "whs:p": "white-space:pre;",
+\           "whs:nw": "white-space:nowrap;",
+\           "whs:pw": "white-space:pre-wrap;",
+\           "whs:pl": "white-space:pre-line;",
+\           "whsc": "white-space-collapse:|;",
+\           "whsc:n": "white-space-collapse:normal;",
+\           "whsc:k": "white-space-collapse:keep-all;",
+\           "whsc:l": "white-space-collapse:loose;",
+\           "whsc:bs": "white-space-collapse:break-strict;",
+\           "whsc:ba": "white-space-collapse:break-all;",
+\           "wob": "word-break:|;",
+\           "wob:n": "word-break:normal;",
+\           "wob:k": "word-break:keep-all;",
+\           "wob:ba": "word-break:break-all;",
+\           "wos": "word-spacing:|;",
+\           "wow": "word-wrap:|;",
+\           "wow:nm": "word-wrap:normal;",
+\           "wow:n": "word-wrap:none;",
+\           "wow:u": "word-wrap:unrestricted;",
+\           "wow:s": "word-wrap:suppress;",
+\           "wow:b": "word-wrap:break-word;",
+\           "wm": "writing-mode:${1:lr-tb};",
+\           "wm:lrt": "writing-mode:lr-tb;",
+\           "wm:lrb": "writing-mode:lr-bt;",
+\           "wm:rlt": "writing-mode:rl-tb;",
+\           "wm:rlb": "writing-mode:rl-bt;",
+\           "wm:tbr": "writing-mode:tb-rl;",
+\           "wm:tbl": "writing-mode:tb-lr;",
+\           "wm:btl": "writing-mode:bt-lr;",
+\           "wm:btr": "writing-mode:bt-rl;",
+\           "lts": "letter-spacing:|;",
+\           "lts-n": "letter-spacing:normal;",
+\           "f": "font:|;",
+\           "f+": "font:${1:1em} ${2:Arial,sans-serif};",
+\           "fw": "font-weight:|;",
+\           "fw:n": "font-weight:normal;",
+\           "fw:b": "font-weight:bold;",
+\           "fw:br": "font-weight:bolder;",
+\           "fw:lr": "font-weight:lighter;",
+\           "fs": "font-style:${italic};",
+\           "fs:n": "font-style:normal;",
+\           "fs:i": "font-style:italic;",
+\           "fs:o": "font-style:oblique;",
+\           "fv": "font-variant:|;",
+\           "fv:n": "font-variant:normal;",
+\           "fv:sc": "font-variant:small-caps;",
+\           "fz": "font-size:|;",
+\           "fza": "font-size-adjust:|;",
+\           "fza:n": "font-size-adjust:none;",
+\           "ff": "font-family:|;",
+\           "ff:s": "font-family:serif;",
+\           "ff:ss": "font-family:sans-serif;",
+\           "ff:c": "font-family:cursive;",
+\           "ff:f": "font-family:fantasy;",
+\           "ff:m": "font-family:monospace;",
+\           "ff:a": "font-family: Arial, \"Helvetica Neue\", Helvetica, sans-serif;",
+\           "ff:t": "font-family: \"Times New Roman\", Times, Baskerville, Georgia, serif;",
+\           "ff:v": "font-family: Verdana, Geneva, sans-serif;",
+\           "fef": "font-effect:|;",
+\           "fef:n": "font-effect:none;",
+\           "fef:eg": "font-effect:engrave;",
+\           "fef:eb": "font-effect:emboss;",
+\           "fef:o": "font-effect:outline;",
+\           "fem": "font-emphasize:|;",
+\           "femp": "font-emphasize-position:|;",
+\           "femp:b": "font-emphasize-position:before;",
+\           "femp:a": "font-emphasize-position:after;",
+\           "fems": "font-emphasize-style:|;",
+\           "fems:n": "font-emphasize-style:none;",
+\           "fems:ac": "font-emphasize-style:accent;",
+\           "fems:dt": "font-emphasize-style:dot;",
+\           "fems:c": "font-emphasize-style:circle;",
+\           "fems:ds": "font-emphasize-style:disc;",
+\           "fsm": "font-smooth:|;",
+\           "fsm:a": "font-smooth:auto;",
+\           "fsm:n": "font-smooth:never;",
+\           "fsm:aw": "font-smooth:always;",
+\           "fst": "font-stretch:|;",
+\           "fst:n": "font-stretch:normal;",
+\           "fst:uc": "font-stretch:ultra-condensed;",
+\           "fst:ec": "font-stretch:extra-condensed;",
+\           "fst:c": "font-stretch:condensed;",
+\           "fst:sc": "font-stretch:semi-condensed;",
+\           "fst:se": "font-stretch:semi-expanded;",
+\           "fst:e": "font-stretch:expanded;",
+\           "fst:ee": "font-stretch:extra-expanded;",
+\           "fst:ue": "font-stretch:ultra-expanded;",
+\           "op": "opacity:|;",
+\           "op+": "opacity: $1;\nfilter: alpha(opacity=$2);",
+\           "op:ie": "filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=100);",
+\           "op:ms": "-ms-filter:'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';",
+\           "rsz": "resize:|;",
+\           "rsz:n": "resize:none;",
+\           "rsz:b": "resize:both;",
+\           "rsz:h": "resize:horizontal;",
+\           "rsz:v": "resize:vertical;",
+\           "cur": "cursor:${pointer};",
+\           "cur:a": "cursor:auto;",
+\           "cur:d": "cursor:default;",
+\           "cur:c": "cursor:crosshair;",
+\           "cur:ha": "cursor:hand;",
+\           "cur:he": "cursor:help;",
+\           "cur:m": "cursor:move;",
+\           "cur:p": "cursor:pointer;",
+\           "cur:t": "cursor:text;",
+\           "fxd": "flex-direction:|;",
+\           "fxd:r": "flex-direction:row;",
+\           "fxd:rr": "flex-direction:row-reverse;",
+\           "fxd:c": "flex-direction:column;",
+\           "fxd:cr": "flex-direction:column-reverse;",
+\           "fxw": "flex-wrap: |;",
+\           "fxw:n": "flex-wrap:nowrap;",
+\           "fxw:w": "flex-wrap:wrap;",
+\           "fxw:wr": "flex-wrap:wrap-reverse;",
+\           "fxf": "flex-flow:|;",
+\           "jc": "justify-content:|;",
+\           "jc:fs": "justify-content:flex-start;",
+\           "jc:fe": "justify-content:flex-end;",
+\           "jc:c": "justify-content:center;",
+\           "jc:sb": "justify-content:space-between;",
+\           "jc:sa": "justify-content:space-around;",
+\           "ai": "align-items:|;",
+\           "ai:fs": "align-items:flex-start;",
+\           "ai:fe": "align-items:flex-end;",
+\           "ai:c": "align-items:center;",
+\           "ai:b": "align-items:baseline;",
+\           "ai:s": "align-items:stretch;",
+\           "ac": "align-content:|;",
+\           "ac:fs": "align-content:flex-start;",
+\           "ac:fe": "align-content:flex-end;",
+\           "ac:c": "align-content:center;",
+\           "ac:sb": "align-content:space-between;",
+\           "ac:sa": "align-content:space-around;",
+\           "ac:s": "align-content:stretch;",
+\           "ord": "order:|;",
+\           "fxg": "flex-grow:|;",
+\           "fxsh": "flex-shrink:|;",
+\           "fxb": "flex-basis:|;",
+\           "fx": "flex:|;",
+\           "as": "align-self:|;",
+\           "as:a": "align-self:auto;",
+\           "as:fs": "align-self:flex-start;",
+\           "as:fe": "align-self:flex-end;",
+\           "as:c": "align-self:center;",
+\           "as:b": "align-self:baseline;",
+\           "as:s": "align-self:stretch;",
+\           "pgbb": "page-break-before:|;",
+\           "pgbb:au": "page-break-before:auto;",
+\           "pgbb:al": "page-break-before:always;",
+\           "pgbb:l": "page-break-before:left;",
+\           "pgbb:r": "page-break-before:right;",
+\           "pgbi": "page-break-inside:|;",
+\           "pgbi:au": "page-break-inside:auto;",
+\           "pgbi:av": "page-break-inside:avoid;",
+\           "pgba": "page-break-after:|;",
+\           "pgba:au": "page-break-after:auto;",
+\           "pgba:al": "page-break-after:always;",
+\           "pgba:l": "page-break-after:left;",
+\           "pgba:r": "page-break-after:right;",
+\           "orp": "orphans:|;",
+\           "us": "user-select:${none};",
+\           "wid": "widows:|;",
+\           "wfsm": "-webkit-font-smoothing:${antialiased};",
+\           "wfsm:a": "-webkit-font-smoothing:antialiased;",
+\           "wfsm:s": "-webkit-font-smoothing:subpixel-antialiased;",
+\           "wfsm:sa": "-webkit-font-smoothing:subpixel-antialiased;",
+\           "wfsm:n": "-webkit-font-smoothing:none;"
+\        },
+\        'filters': 'fc',
+\    },
+\    'sass': {
+\        'extends': 'css',
+\        'snippets': {
+\            '@if': "@if {\n\t|\n}",
+\            '@e': "@else {\n\t|\n}",
+\            '@in': "@include |",
+\            '@ex': "@extend |",
+\            '@mx': "@mixin {\n\t|\n}",
+\            '@fn': "@function {\n\t|\n}",
+\            '@r': "@return |",
+\        },
+\    },
+\    'scss': {
+\        'extends': 'css',
+\    },
+\    'less': {
+\        'extends': 'css',
+\    },
+\    'css.drupal': {
+\        'extends': 'css',
+\    },
+\    'html': {
+\        'snippets': {
+\            '!': "html:5",
+\            '!!!': "<!DOCTYPE html>\n",
+\            '!!!4t':  "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n",
+\            '!!!4s':  "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n",
+\            '!!!xt':  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n",
+\            '!!!xs':  "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n",
+\            '!!!xxs': "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n",
+\            'c': "<!-- |${child} -->",
+\            'cc:ie6': "<!--[if lte IE 6]>\n\t${child}|\n<![endif]-->",
+\            'cc:ie': "<!--[if IE]>\n\t${child}|\n<![endif]-->",
+\            'cc:noie': "<!--[if !IE]><!-->\n\t${child}|\n<!--<![endif]-->",
+\            'html:4t': "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n"
+\                    ."<html lang=\"${lang}\">\n"
+\                    ."<head>\n"
+\                    ."\t<meta http-equiv=\"Content-Type\" content=\"text/html;charset=${charset}\">\n"
+\                    ."\t<title></title>\n"
+\                    ."</head>\n"
+\                    ."<body>\n\t${child}|\n</body>\n"
+\                    ."</html>",
+\            'html:4s': "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\">\n"
+\                    ."<html lang=\"${lang}\">\n"
+\                    ."<head>\n"
+\                    ."\t<meta http-equiv=\"Content-Type\" content=\"text/html;charset=${charset}\">\n"
+\                    ."\t<title></title>\n"
+\                    ."</head>\n"
+\                    ."<body>\n\t${child}|\n</body>\n"
+\                    ."</html>",
+\            'html:xt': "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"
+\                    ."<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"${lang}\">\n"
+\                    ."<head>\n"
+\                    ."\t<meta http-equiv=\"Content-Type\" content=\"text/html;charset=${charset}\" />\n"
+\                    ."\t<title></title>\n"
+\                    ."</head>\n"
+\                    ."<body>\n\t${child}|\n</body>\n"
+\                    ."</html>",
+\            'html:xs': "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n"
+\                    ."<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"${lang}\">\n"
+\                    ."<head>\n"
+\                    ."\t<meta http-equiv=\"Content-Type\" content=\"text/html;charset=${charset}\" />\n"
+\                    ."\t<title></title>\n"
+\                    ."</head>\n"
+\                    ."<body>\n\t${child}|\n</body>\n"
+\                    ."</html>",
+\            'html:xxs': "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n"
+\                    ."<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"${lang}\">\n"
+\                    ."<head>\n"
+\                    ."\t<meta http-equiv=\"Content-Type\" content=\"text/html;charset=${charset}\" />\n"
+\                    ."\t<title></title>\n"
+\                    ."</head>\n"
+\                    ."<body>\n\t${child}|\n</body>\n"
+\                    ."</html>",
+\            'html:5': "<!DOCTYPE html>\n"
+\                    ."<html lang=\"${lang}\">\n"
+\                    ."<head>\n"
+\                    ."\t<meta charset=\"${charset}\">\n"
+\                    ."\t<title></title>\n"
+\                    ."</head>\n"
+\                    ."<body>\n\t${child}|\n</body>\n"
+\                    ."</html>",
+\        },
+\        'default_attributes': {
+\            'a': [{'href': ''}],
+\            'a:link': [{'href': 'http://|'}],
+\            'a:mail': [{'href': 'mailto:|'}],
+\            'abbr': [{'title': ''}],
+\            'acronym': [{'title': ''}],
+\            'base': [{'href': ''}],
+\            'bdo': [{'dir': ''}],
+\            'bdo:r': [{'dir': 'rtl'}],
+\            'bdo:l': [{'dir': 'ltr'}],
+\            'del': [{'datetime': '${datetime}'}],
+\            'ins': [{'datetime': '${datetime}'}],
+\            'link:css': [{'rel': 'stylesheet'}, g:emmet_html5 ? {} : {'type': 'text/css'}, {'href': '|style.css'}, {'media': 'all'}],
+\            'link:print': [{'rel': 'stylesheet'}, g:emmet_html5 ? {} : {'type': 'text/css'}, {'href': '|print.css'}, {'media': 'print'}],
+\            'link:import': [{'rel': 'import'}, {'href': '|.html'}],
+\            'link:im': [{'rel': 'import'}, {'href': '|.html'}],
+\            'link:favicon': [{'rel': 'shortcut icon'}, {'type': 'image/x-icon'}, {'href': '|favicon.ico'}],
+\            'link:touch': [{'rel': 'apple-touch-icon'}, {'href': '|favicon.png'}],
+\            'link:rss': [{'rel': 'alternate'}, {'type': 'application/rss+xml'}, {'title': 'RSS'}, {'href': '|rss.xml'}],
+\            'link:atom': [{'rel': 'alternate'}, {'type': 'application/atom+xml'}, {'title': 'Atom'}, {'href': 'atom.xml'}],
+\            'meta:utf': [{'http-equiv': 'Content-Type'}, {'content': 'text/html;charset=UTF-8'}],
+\            'meta:vp': [{'name': 'viewport'}, {'content': 'width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0'}],
+\            'meta:win': [{'http-equiv': 'Content-Type'}, {'content': 'text/html;charset=Win-1251'}],
+\            'meta:compat': [{'http-equiv': 'X-UA-Compatible'}, {'content': 'IE=7'}],
+\            'style': g:emmet_html5 ? [] : [{'type': 'text/css'}],
+\            'script': g:emmet_html5 ? [] : [{'type': 'text/javascript'}],
+\            'script:src': (g:emmet_html5 ? [] : [{'type': 'text/javascript'}]) + [{'src': ''}],
+\            'img': [{'src': ''}, {'alt': ''}],
+\            'iframe': [{'src': ''}, {'frameborder': '0'}],
+\            'embed': [{'src': ''}, {'type': ''}],
+\            'object': [{'data': ''}, {'type': ''}],
+\            'param': [{'name': ''}, {'value': ''}],
+\            'map': {'name': ''},
+\            'area': [{'shape': ''}, {'coords': ''}, {'href': ''}, {'alt': ''}],
+\            'area:d': [{'shape': 'default'}, {'href': ''}, {'alt': ''}],
+\            'area:c': [{'shape': 'circle'}, {'coords': ''}, {'href': ''}, {'alt': ''}],
+\            'area:r': [{'shape': 'rect'}, {'coords': ''}, {'href': ''}, {'alt': ''}],
+\            'area:p': [{'shape': 'poly'}, {'coords': ''}, {'href': ''}, {'alt': ''}],
+\            'link': [{'rel': 'stylesheet'}, {'href': ''}],
+\            'form': [{'action': ''}],
+\            'form:get': [{'action': ''}, {'method': 'get'}],
+\            'form:post': [{'action': ''}, {'method': 'post'}],
+\            'form:upload': [{'action': ''}, {'method': 'post'}, {'enctype': 'multipart/form-data'}],
+\            'label': [{'for': ''}],
+\            'input': [{'type': ''}],
+\            'input:hidden': [{'type': 'hidden'}, {'name': ''}],
+\            'input:h': [{'type': 'hidden'}, {'name': ''}],
+\            'input:text': [{'type': 'text'}, {'name': ''}, {'id': ''}],
+\            'input:t': [{'type': 'text'}, {'name': ''}, {'id': ''}],
+\            'input:search': [{'type': 'search'}, {'name': ''}, {'id': ''}],
+\            'input:email': [{'type': 'email'}, {'name': ''}, {'id': ''}],
+\            'input:url': [{'type': 'url'}, {'name': ''}, {'id': ''}],
+\            'input:password': [{'type': 'password'}, {'name': ''}, {'id': ''}],
+\            'input:p': [{'type': 'password'}, {'name': ''}, {'id': ''}],
+\            'input:datetime': [{'type': 'datetime'}, {'name': ''}, {'id': ''}],
+\            'input:date': [{'type': 'date'}, {'name': ''}, {'id': ''}],
+\            'input:datetime-local': [{'type': 'datetime-local'}, {'name': ''}, {'id': ''}],
+\            'input:month': [{'type': 'month'}, {'name': ''}, {'id': ''}],
+\            'input:week': [{'type': 'week'}, {'name': ''}, {'id': ''}],
+\            'input:time': [{'type': 'time'}, {'name': ''}, {'id': ''}],
+\            'input:number': [{'type': 'number'}, {'name': ''}, {'id': ''}],
+\            'input:color': [{'type': 'color'}, {'name': ''}, {'id': ''}],
+\            'input:checkbox': [{'type': 'checkbox'}, {'name': ''}, {'id': ''}],
+\            'input:c': [{'type': 'checkbox'}, {'name': ''}, {'id': ''}],
+\            'input:radio': [{'type': 'radio'}, {'name': ''}, {'id': ''}],
+\            'input:r': [{'type': 'radio'}, {'name': ''}, {'id': ''}],
+\            'input:range': [{'type': 'range'}, {'name': ''}, {'id': ''}],
+\            'input:file': [{'type': 'file'}, {'name': ''}, {'id': ''}],
+\            'input:f': [{'type': 'file'}, {'name': ''}, {'id': ''}],
+\            'input:submit': [{'type': 'submit'}, {'value': ''}],
+\            'input:s': [{'type': 'submit'}, {'value': ''}],
+\            'input:image': [{'type': 'image'}, {'src': ''}, {'alt': ''}],
+\            'input:i': [{'type': 'image'}, {'src': ''}, {'alt': ''}],
+\            'input:reset': [{'type': 'reset'}, {'value': ''}],
+\            'input:button': [{'type': 'button'}, {'value': ''}],
+\            'input:b': [{'type': 'button'}, {'value': ''}],
+\            'select': [{'name': ''}, {'id': ''}],
+\            'option': [{'value': ''}],
+\            'textarea': [{'name': ''}, {'id': ''}, {'cols': '30'}, {'rows': '10'}],
+\            'menu:context': [{'type': 'context'}],
+\            'menu:c': [{'type': 'context'}],
+\            'menu:toolbar': [{'type': 'toolbar'}],
+\            'menu:t': [{'type': 'toolbar'}],
+\            'video': [{'src': ''}],
+\            'audio': [{'src': ''}],
+\            'html:xml': [{'xmlns': 'http://www.w3.org/1999/xhtml'}, {'xml:lang': '${lang}'}],
+\        },
+\        'aliases': {
+\            'link:*': 'link',
+\            'meta:*': 'meta',
+\            'area:*': 'area',
+\            'bdo:*': 'bdo',
+\            'form:*': 'form',
+\            'input:*': 'input',
+\            'script:*': 'script',
+\            'html:*': 'html',
+\            'a:*': 'a',
+\            'menu:*': 'menu',
+\            'bq': 'blockquote',
+\            'acr': 'acronym',
+\            'fig': 'figure',
+\            'ifr': 'iframe',
+\            'emb': 'embed',
+\            'obj': 'object',
+\            'src': 'source',
+\            'cap': 'caption',
+\            'colg': 'colgroup',
+\            'fst': 'fieldset',
+\            'btn': 'button',
+\            'optg': 'optgroup',
+\            'opt': 'option',
+\            'tarea': 'textarea',
+\            'leg': 'legend',
+\            'sect': 'section',
+\            'art': 'article',
+\            'hdr': 'header',
+\            'ftr': 'footer',
+\            'adr': 'address',
+\            'dlg': 'dialog',
+\            'str': 'strong',
+\            'sty': 'style',
+\            'prog': 'progress',
+\            'fset': 'fieldset',
+\            'datag': 'datagrid',
+\            'datal': 'datalist',
+\            'kg': 'keygen',
+\            'out': 'output',
+\            'det': 'details',
+\            'cmd': 'command',
+\        },
+\        'expandos': {
+\            'ol': 'ol>li',
+\            'ul': 'ul>li',
+\            'dl': 'dl>dt+dd',
+\            'map': 'map>area',
+\            'table': 'table>tr>td',
+\            'colgroup': 'colgroup>col',
+\            'colg': 'colgroup>col',
+\            'tr': 'tr>td',
+\            'select': 'select>option',
+\            'optgroup': 'optgroup>option',
+\            'optg': 'optgroup>option',
+\        },
+\        'empty_elements': 'area,base,basefont,br,col,frame,hr,img,input,isindex,link,meta,param,embed,keygen,command',
+\        'block_elements': 'address,applet,blockquote,button,center,dd,del,dir,div,dl,dt,fieldset,form,frameset,hr,iframe,ins,isindex,li,link,map,menu,noframes,noscript,object,ol,p,pre,script,table,tbody,td,tfoot,th,thead,tr,ul,h1,h2,h3,h4,h5,h6',
+\        'inline_elements': 'a,abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,small,span,strike,strong,sub,sup,textarea,tt,u,var',
+\        'empty_element_suffix': g:emmet_html5 ? '>' : ' />',
+\        'indent_blockelement': 0,
+\    },
+\    'elm': {
+\        'indentation': '    ',
+\        'extends': 'html',
+\    },
+\    'htmldjango': {
+\        'extends': 'html',
+\    },
+\    'html.django_template': {
+\        'extends': 'html',
+\    },
+\    'jade': {
+\        'indentation': '  ',
+\        'extends': 'html',
+\        'snippets': {
+\            '!': "html:5",
+\            '!!!': "doctype html\n",
+\            '!!!4t': "doctype HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\"\n",
+\            '!!!4s': "doctype HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\"\n",
+\            '!!!xt': "doctype transitional\n",
+\            '!!!xs': "doctype strict\n",
+\            '!!!xxs': "doctype 1.1\n",
+\            'c': "\/\/ |${child}",
+\            'html:4t': "doctype HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\"\n"
+\                    ."html(lang=\"${lang}\")\n"
+\                    ."\thead\n"
+\                    ."\t\tmeta(http-equiv=\"Content-Type\", content=\"text/html;charset=${charset}\")\n"
+\                    ."\t\ttitle\n"
+\                    ."\tbody\n\t\t${child}|",
+\            'html:4s': "doctype HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\"\n"
+\                    ."html(lang=\"${lang}\")\n"
+\                    ."\thead\n"
+\                    ."\t\tmeta(http-equiv=\"Content-Type\", content=\"text/html;charset=${charset}\")\n"
+\                    ."\t\ttitle\n"
+\                    ."\tbody\n\t\t${child}|",
+\            'html:xt': "doctype transitional\n"
+\                    ."html(xmlns=\"http://www.w3.org/1999/xhtml\", xml:lang=\"${lang}\")\n"
+\                    ."\thead\n"
+\                    ."\t\tmeta(http-equiv=\"Content-Type\", content=\"text/html;charset=${charset}\")\n"
+\                    ."\t\ttitle\n"
+\                    ."\tbody\n\t\t${child}|",
+\            'html:xs': "doctype strict\n"
+\                    ."html(xmlns=\"http://www.w3.org/1999/xhtml\", xml:lang=\"${lang}\")\n"
+\                    ."\thead\n"
+\                    ."\t\tmeta(http-equiv=\"Content-Type\", content=\"text/html;charset=${charset}\")\n"
+\                    ."\t\ttitle\n"
+\                    ."\tbody\n\t\t${child}|",
+\            'html:xxs': "doctype 1.1\n"
+\                    ."html(xmlns=\"http://www.w3.org/1999/xhtml\", xml:lang=\"${lang}\")\n"
+\                    ."\thead\n"
+\                    ."\t\tmeta(http-equiv=\"Content-Type\", content=\"text/html;charset=${charset}\")\n"
+\                    ."\t\ttitle\n"
+\                    ."\tbody\n\t\t${child}|",
+\            'html:5': "doctype html\n"
+\                    ."html(lang=\"${lang}\")\n"
+\                    ."\thead\n"
+\                    ."\t\tmeta(charset=\"${charset}\")\n"
+\                    ."\t\ttitle\n"
+\                    ."\tbody\n\t\t${child}|",
+\        },
+\    },
+\    'pug': {
+\        'extends': 'jade',
+\    },
+\    'xsl': {
+\        'extends': 'html',
+\        'default_attributes': {
+\            'tmatch': [{'match': ''}, {'mode': ''}],
+\            'tname': [{'name': ''}],
+\            'xsl:when': {'test': ''},
+\            'var': [{'name': ''}, {'select': ''}],
+\            'vari': {'name': ''},
+\            'if': {'test': ''},
+\            'call': {'name': ''},
+\            'attr': {'name': ''},
+\            'wp': [{'name': ''}, {'select': ''}],
+\            'par': [{'name': ''}, {'select': ''}],
+\            'val': {'select': ''},
+\            'co': {'select': ''},
+\            'each': {'select': ''},
+\            'ap': [{'select': ''}, {'mode': ''}]
+\        },
+\        'aliases': {
+\            'tmatch': 'xsl:template',
+\            'tname': 'xsl:template',
+\            'var': 'xsl:variable',
+\            'vari': 'xsl:variable',
+\            'if': 'xsl:if',
+\            'choose': 'xsl:choose',
+\            'call': 'xsl:call-template',
+\            'wp': 'xsl:with-param',
+\            'par': 'xsl:param',
+\            'val': 'xsl:value-of',
+\            'attr': 'xsl:attribute',
+\            'co' : 'xsl:copy-of',
+\            'each' : 'xsl:for-each',
+\            'ap' : 'xsl:apply-templates',
+\        },
+\        'expandos': {
+\            'choose': 'xsl:choose>xsl:when+xsl:otherwise',
+\        }
+\    },
+\    'jsx': {
+\        'extends': 'html',
+\        'attribute_name': {'class': 'className', 'for': 'htmlFor'},
+\        'empty_element_suffix': ' />',
+\    },
+\    'xslt': {
+\        'extends': 'xsl',
+\    },
+\    'haml': {
+\        'indentation': '  ',
+\        'extends': 'html',
+\        'snippets': {
+\            'html:5': "!!! 5\n"
+\                    ."%html{:lang => \"${lang}\"}\n"
+\                    ."\t%head\n"
+\                    ."\t\t%meta{:charset => \"${charset}\"}\n"
+\                    ."\t\t%title\n"
+\                    ."\t%body\n"
+\                    ."\t\t${child}|\n",
+\        },
+\        'attribute_style': 'hash',
+\    },
+\    'slim': {
+\        'indentation': '  ',
+\        'extends': 'html',
+\        'snippets': {
+\            'html:5': "doctype 5\n"
+\                    ."html lang=\"${lang}\"\n"
+\                    ."\thead\n"
+\                    ."\t\tmeta charset=\"${charset}\"\n"
+\                    ."\t\ttitle\n"
+\                    ."\tbody\n"
+\                    ."\t\t${child}|\n",
+\        },
+\    },
+\    'xhtml': {
+\        'extends': 'html'
+\    },
+\    'mustache': {
+\        'extends': 'html'
+\    },
+\    'xsd': {
+\        'extends': 'html',
+\        'snippets': {
+\            'xsd:w3c': "<?xml version=\"1.0\"?>\n"
+\                    ."<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n"
+\                    ."\t<xsd:element name=\"\" type=\"\"/>\n"
+\                    ."</xsd:schema>\n"
+\        }
+\    },
+\}
+
+if exists('g:user_emmet_settings')
+  call emmet#mergeConfig(s:emmet_settings, g:user_emmet_settings)
+endif
+
+let &cpoptions = s:save_cpo
+unlet s:save_cpo
+
+" vim:set et:
diff --git a/vim-plugins/bundle/emmet-vim/autoload/emmet/lang.vim b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang.vim
new file mode 100644
index 0000000..0bc416f
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang.vim
@@ -0,0 +1,30 @@
+let s:exists = {}
+function! emmet#lang#exists(type) abort
+  if len(a:type) == 0
+    return 0
+  elseif has_key(s:exists, a:type)
+    return s:exists[a:type]
+  endif
+  let s:exists[a:type] = len(globpath(&rtp, 'autoload/emmet/lang/'.a:type.'.vim')) > 0
+  return s:exists[a:type]
+endfunction
+
+function! emmet#lang#type(type) abort
+  let type = a:type
+  let base = type
+  let settings = emmet#getSettings()
+  while base != ''
+    for b in split(base, '\.')
+      if emmet#lang#exists(b)
+        return b
+      endif
+      if has_key(settings, b) && has_key(settings[b], 'extends')
+        let base = settings[b].extends
+        break
+      else
+        let base = ''
+      endif
+    endfor
+  endwhile
+  return 'html'
+endfunction
diff --git a/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/css.vim b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/css.vim
new file mode 100644
index 0000000..3796106
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/css.vim
@@ -0,0 +1,350 @@
+function! emmet#lang#css#findTokens(str) abort
+  let tmp = substitute(substitute(a:str, '^.*[;{]\s*', '', ''), '}\s*$', '', '')
+  if tmp =~ '/' && tmp =~ '^[a-zA-Z0-9/_.]\+$'
+    " maybe path or something
+    return ''
+  endif
+  return substitute(substitute(a:str, '^.*[;{]\s*', '', ''), '}\s*$', '', '')
+endfunction
+
+function! emmet#lang#css#parseIntoTree(abbr, type) abort
+  let abbr = a:abbr
+  let type = a:type
+  let prefix = 0
+  let value = ''
+
+  let indent = emmet#getIndentation(type)
+  let aliases = emmet#getResource(type, 'aliases', {})
+  let snippets = emmet#getResource(type, 'snippets', {})
+  let use_pipe_for_cursor = emmet#getResource(type, 'use_pipe_for_cursor', 1)
+
+  let root = emmet#newNode()
+
+  " emmet
+  let tokens = split(abbr, '+\ze[^+)!]')
+  let block = emmet#util#searchRegion('{', '}')
+  if abbr !~# '^@' && emmet#getBaseType(type) ==# 'css' && type !=# 'sass' && block[0] ==# [0,0] && block[1] ==# [0,0]
+    let current = emmet#newNode()
+    let current.snippet = substitute(abbr, '\s\+$', '', '') . " {\n" . indent . "${cursor}\n}"
+    let current.name = ''
+    call add(root.child, deepcopy(current))
+  else
+    for n in range(len(tokens))
+      let token = tokens[n]
+      let prop = matchlist(token, '^\(-\{0,1}[a-zA-Z]\+\|[a-zA-Z0-9]\++\{0,1}\|([a-zA-Z0-9]\++\{0,1})\)\(\%([0-9.-]\+\%(p\|e\|em\|re\|rem\|%\)\{0,1}-\{0,1}\|-auto\)*\)$')
+      if len(prop)
+        let token = substitute(prop[1], '^(\(.*\))', '\1', '')
+        if token =~# '^-'
+          let prefix = 1
+          let token = token[1:]
+        endif
+        let value = ''
+        for v in split(prop[2], '\d\zs-')
+          if len(value) > 0
+            let value .= ' '
+          endif
+          if token =~# '^[z]'
+            " TODO
+            let value .= substitute(v, '[^0-9.]*$', '', '')
+          elseif v =~# 'p$'
+            let value .= substitute(v, 'p$', '%', '')
+          elseif v =~# '%$'
+            let value .= v
+          elseif v =~# 'e$'
+            let value .= substitute(v, 'e$', 'em', '')
+          elseif v =~# 'em$'
+            let value .= v
+          elseif v =~# 're$'
+            let value .= substitute(v, 're$', 'rem', '')
+          elseif v =~# 'rem$'
+            let value .= v
+          elseif v =~# '\.'
+            let value .= v . 'em'
+          elseif v ==# 'auto'
+            let value .= v
+          elseif v ==# '0'
+            let value .= '0'
+          else
+            let value .= v . 'px'
+          endif
+        endfor
+      endif
+
+      let tag_name = token
+      if tag_name =~# '.!$'
+        let tag_name = tag_name[:-2]
+        let important = 1
+      else
+        let important = 0
+      endif
+      " make default node
+      let current = emmet#newNode()
+      let current.important = important
+      let current.name = tag_name
+
+      " aliases
+      if has_key(aliases, tag_name)
+        let current.name = aliases[tag_name]
+      endif
+
+      " snippets
+      if !empty(snippets)
+        let snippet_name = tag_name
+        if !has_key(snippets, snippet_name)
+          let pat = '^' . join(split(tag_name, '\zs'), '\%(\|[^:-]\+-\)')
+          let vv = filter(sort(keys(snippets)), 'snippets[v:val] =~ pat')
+          if len(vv) > 0
+            let snippet_name = vv[0]
+          else
+            let pat = '^' . join(split(tag_name, '\zs'), '\%(\|[^:-]\+-*\)')
+            let vv = filter(sort(keys(snippets)), 'snippets[v:val] =~ pat')
+            if len(vv) == 0
+              let pat = '^' . join(split(tag_name, '\zs'), '[^:]\{-}')
+              let vv = filter(sort(keys(snippets)), 'snippets[v:val] =~ pat')
+              if len(vv) == 0
+                let pat = '^' . join(split(tag_name, '\zs'), '.\{-}')
+                let vv = filter(sort(keys(snippets)), 'snippets[v:val] =~ pat')
+              endif
+            endif
+            let minl = -1
+            for vk in vv
+              let vvs = snippets[vk]
+              if minl == -1 || len(vvs) < minl
+                let snippet_name = vk
+                let minl = len(vvs)
+              endif
+            endfor
+          endif
+        endif
+        if has_key(snippets, snippet_name)
+          let snippet = snippets[snippet_name]
+          if use_pipe_for_cursor
+            let snippet = substitute(snippet, '|', '${cursor}', 'g')
+          endif
+          let lines = split(snippet, "\n")
+          call map(lines, 'substitute(v:val, "\\(    \\|\\t\\)", escape(indent, "\\\\"), "g")')
+          let current.snippet = join(lines, "\n")
+          let current.name = ''
+          let current.snippet = substitute(current.snippet, ';', value . ';', '')
+          if use_pipe_for_cursor && len(value) > 0
+            let current.snippet = substitute(current.snippet, '\${cursor}', '', 'g')
+          endif
+          if n < len(tokens) - 1
+            let current.snippet .= "\n"
+          endif
+        endif
+      endif
+
+      let current.pos = 0
+      let lg = matchlist(token, '^\%(linear-gradient\|lg\)(\s*\(\S\+\)\s*,\s*\([^,]\+\)\s*,\s*\([^)]\+\)\s*)$')
+      if len(lg) == 0
+        let lg = matchlist(token, '^\%(linear-gradient\|lg\)(\s*\(\S\+\)\s*,\s*\([^,]\+\)\s*)$')
+        if len(lg)
+          let [lg[1], lg[2], lg[3]] = ['linear', lg[1], lg[2]]
+        endif
+      endif
+      if len(lg)
+        let current.name = ''
+        let current.snippet = printf("background-image:-webkit-gradient(%s, 0 0, 0 100%, from(%s), to(%s));\n", lg[1], lg[2], lg[3])
+        call add(root.child, deepcopy(current))
+        let current.snippet = printf("background-image:-webkit-linear-gradient(%s, %s);\n", lg[2], lg[3])
+        call add(root.child, deepcopy(current))
+        let current.snippet = printf("background-image:-moz-linear-gradient(%s, %s);\n", lg[2], lg[3])
+        call add(root.child, deepcopy(current))
+        let current.snippet = printf("background-image:-o-linear-gradient(%s, %s);\n", lg[2], lg[3])
+        call add(root.child, deepcopy(current))
+        let current.snippet = printf("background-image:linear-gradient(%s, %s);\n", lg[2], lg[3])
+        call add(root.child, deepcopy(current))
+      elseif prefix
+        let snippet = current.snippet
+        let current.snippet = '-webkit-' . snippet . "\n"
+        call add(root.child, deepcopy(current))
+        let current.snippet = '-moz-' . snippet . "\n"
+        call add(root.child, deepcopy(current))
+        let current.snippet = '-o-' . snippet . "\n"
+        call add(root.child, deepcopy(current))
+        let current.snippet = '-ms-' . snippet . "\n"
+        call add(root.child, deepcopy(current))
+        let current.snippet = snippet
+        call add(root.child, current)
+      elseif token =~# '^c#\([0-9a-fA-F]\{3}\|[0-9a-fA-F]\{6}\)\(\.[0-9]\+\)\?'
+        let cs = split(token, '\.')
+        let current.name = ''
+        let [r,g,b] = [0,0,0]
+        if len(cs[0]) == 5
+          let rgb = matchlist(cs[0], 'c#\(.\)\(.\)\(.\)')
+          let r = eval('0x'.rgb[1].rgb[1])
+          let g = eval('0x'.rgb[2].rgb[2])
+          let b = eval('0x'.rgb[3].rgb[3])
+        elseif len(cs[0]) == 8
+          let rgb = matchlist(cs[0], 'c#\(..\)\(..\)\(..\)')
+          let r = eval('0x'.rgb[1])
+          let g = eval('0x'.rgb[2])
+          let b = eval('0x'.rgb[3])
+        endif
+        if len(cs) == 1
+          let current.snippet = printf('color:rgb(%d, %d, %d);', r, g, b)
+        else
+          let current.snippet = printf('color:rgb(%d, %d, %d, %s);', r, g, b, string(str2float('0.'.cs[1])))
+        endif
+        call add(root.child, current)
+      elseif token =~# '^c#'
+        let current.name = ''
+        let current.snippet = 'color:\${cursor};'
+        call add(root.child, current)
+      else
+        call add(root.child, current)
+      endif
+    endfor
+  endif
+  return root
+endfunction
+
+function! emmet#lang#css#toString(settings, current, type, inline, filters, itemno, indent) abort
+  let current = a:current
+  let value = current.value[1:-2]
+  let tmp = substitute(value, '\${cursor}', '', 'g')
+  if tmp !~ '.*{[ \t\r\n]*}$'
+    if emmet#useFilter(a:filters, 'fc')
+      let value = substitute(value, '\([^:]\+\):\([^;]*\)', '\1: \2', 'g')
+    else
+      let value = substitute(value, '\([^:]\+\):\([^;]*\)', '\1:\2', 'g')
+    endif
+    if current.important
+      let value = substitute(value, ';', ' !important;', '')
+    endif
+  endif
+  return value
+endfunction
+
+function! emmet#lang#css#imageSize() abort
+  let img_region = emmet#util#searchRegion('{', '}')
+  if !emmet#util#regionIsValid(img_region) || !emmet#util#cursorInRegion(img_region)
+    return
+  endif
+  let content = emmet#util#getContent(img_region)
+  let fn = matchstr(content, '\<url(\zs[^)]\+\ze)')
+  let fn = substitute(fn, '[''" \t]', '', 'g')
+  if fn =~# '^\s*$'
+    return
+  elseif fn !~# '^\(/\|http\)'
+    let fn = simplify(expand('%:h') . '/' . fn)
+  endif
+  let [width, height] = emmet#util#getImageSize(fn)
+  if width == -1 && height == -1
+    return
+  endif
+  let indent = emmet#getIndentation('css')
+  if content =~# '.*\<width\s*:[^;]*;.*'
+    let content = substitute(content, '\<width\s*:[^;]*;', 'width: ' . width . 'px;', '')
+  else
+    let content = substitute(content, '}', indent . 'width: ' . width . "px;\n}", '')
+  endif
+  if content =~# '.*\<height\s*:[^;]*;.*'
+    let content = substitute(content, '\<height\s*:[^;]*;', 'height: ' . height . 'px;', '')
+  else
+    let content = substitute(content, '}', indent . 'height: ' . height . "px;\n}", '')
+  endif
+  call emmet#util#setContent(img_region, content)
+endfunction
+
+function! emmet#lang#css#encodeImage() abort
+endfunction
+
+function! emmet#lang#css#parseTag(tag) abort
+  return {}
+endfunction
+
+function! emmet#lang#css#toggleComment() abort
+  let line = getline('.')
+  let mx = '^\(\s*\)/\*\s*\(.*\)\s*\*/\s*$'
+  if line =~# '{\s*$'
+    let block = emmet#util#searchRegion('/\*', '\*/\zs')
+    if emmet#util#regionIsValid(block)
+      let content = emmet#util#getContent(block)
+      let content = substitute(content, '/\*\s\(.*\)\s\*/', '\1', '')
+      call emmet#util#setContent(block, content)
+    else
+      let node = expand('<cword>')
+      if len(node)
+        exe "normal ciw\<c-r>='/* '.node.' */'\<cr>"
+      endif
+    endif
+  else
+    if line =~# mx
+      let space = substitute(matchstr(line, mx), mx, '\1', '')
+      let line = substitute(matchstr(line, mx), mx, '\2', '')
+      let line = space . substitute(line, '^\s*\|\s*$', '\1', 'g')
+    else
+      let mx = '^\(\s*\)\(.*\)\s*$'
+      let line = substitute(line, mx, '\1/* \2 */', '')
+    endif
+    call setline('.', line)
+  endif
+endfunction
+
+function! emmet#lang#css#balanceTag(flag) range abort
+  if a:flag == -2 || a:flag == 2
+    let curpos = [0, line("'<"), col("'<"), 0]
+  else
+    let curpos = emmet#util#getcurpos()
+  endif
+  let block = emmet#util#getVisualBlock()
+  if !emmet#util#regionIsValid(block)
+    if a:flag > 0
+      let block = emmet#util#searchRegion('^', ';')
+      if emmet#util#regionIsValid(block)
+        call emmet#util#selectRegion(block)
+        return
+      endif
+    endif
+  else
+    if a:flag > 0
+      let content = emmet#util#getContent(block)
+      if content !~# '^{.*}$'
+        let block = emmet#util#searchRegion('{', '}')
+        if emmet#util#regionIsValid(block)
+          call emmet#util#selectRegion(block)
+          return
+        endif
+      endif
+    else
+      let pos = searchpos('.*;', 'nW')
+      if pos[0] != 0
+        call setpos('.', [0, pos[0], pos[1], 0])
+        let block = emmet#util#searchRegion('^', ';')
+        if emmet#util#regionIsValid(block)
+          call emmet#util#selectRegion(block)
+          return
+        endif
+      endif
+    endif
+  endif
+  if a:flag == -2 || a:flag == 2
+    silent! exe 'normal! gv'
+  else
+    call setpos('.', curpos)
+  endif
+endfunction
+
+function! emmet#lang#css#moveNextPrevItem(flag) abort
+  return emmet#lang#css#moveNextPrev(a:flag)
+endfunction
+
+function! emmet#lang#css#moveNextPrev(flag) abort
+  let pos = search('""\|()\|\(:\s*\zs$\)', a:flag ? 'Wbp' : 'Wp')
+  if pos == 2
+    startinsert!
+  else
+    silent! normal! l
+    startinsert
+  endif
+endfunction
+
+function! emmet#lang#css#splitJoinTag() abort
+  " nothing to do
+endfunction
+
+function! emmet#lang#css#removeTag() abort
+  " nothing to do
+endfunction
diff --git a/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/elm.vim b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/elm.vim
new file mode 100644
index 0000000..2acde53
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/elm.vim
@@ -0,0 +1,214 @@
+function! emmet#lang#elm#findTokens(str) abort
+  return emmet#lang#html#findTokens(a:str)
+endfunction
+
+function! emmet#lang#elm#parseIntoTree(abbr, type) abort
+  let tree = emmet#lang#html#parseIntoTree(a:abbr, a:type)
+  if len(tree.child) < 2 | return tree | endif
+
+  " Add ',' nodes between root elements.
+  let new_children = []
+  for child in tree.child[0:-2]
+    let comma = emmet#newNode()
+    let comma.name = ','
+    call add(new_children, child)
+    call add(new_children, comma)
+  endfor
+  call add(new_children, tree.child[-1])
+  let tree.child = new_children
+  return tree
+endfunction
+
+function! emmet#lang#elm#renderNode(node)
+  let elm_nodes = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'
+        \, 'div', 'p', 'hr', 'pre', 'blockquote'
+        \, 'span', 'a', 'code', 'em', 'strong', 'i', 'b', 'u', 'sub', 'sup', 'br'
+        \, 'ol', 'ul', 'li', 'dl', 'dt', 'dd'
+        \, 'img', 'iframe', 'canvas', 'math'
+        \, 'form', 'input', 'textarea', 'button', 'select', 'option'
+        \, 'section', 'nav', 'article', 'aside', 'header', 'footer', 'address', 'main_', 'body'
+        \, 'figure', 'figcaption'
+        \, 'table', 'caption', 'colgroup', 'col', 'tbody', 'thead', 'tfoot', 'tr', 'td', 'th'
+        \, 'fieldset', 'legend', 'label', 'datalist', 'optgroup', 'keygen', 'output', 'progress', 'meter'
+        \, 'audio', 'video', 'source', 'track'
+        \, 'embed', 'object', 'param'
+        \, 'ins', 'del'
+        \, 'small', 'cite', 'dfn', 'abbr', 'time', 'var', 'samp', 'kbd', 's', 'q'
+        \, 'mark', 'ruby', 'rt', 'rp', 'bdi', 'bdo', 'wbr'
+        \, 'details', 'summary', 'menuitem', 'menu']
+
+  if index(elm_nodes, a:node) >= 0
+    return a:node
+  endif
+  return 'node "' . a:node . '"'
+endfunction
+
+function! emmet#lang#elm#renderParam(param)
+  let elm_events = ["onClick", "onDoubleClick"
+        \, "onMouseDown", "onMouseUp"
+        \, "onMouseEnter", "onMouseLeave"
+        \, "onMouseOver", "onMouseOut"
+        \, "onInput", "onCheck", "onSubmit"
+        \, "onBlur", "onFocus"
+        \, "on", "onWithOptions", "Options", "defaultOptions"
+        \, "targetValue", "targetChecked", "keyCode"]
+  if index(elm_events, a:param) >= 0
+    return a:param
+  endif
+  let elm_attributes = ["style", "map" , "class", "id", "title", "hidden"
+        \, "type", "type_", "value", "defaultValue", "checked", "placeholder", "selected"
+        \, "accept", "acceptCharset", "action", "autocomplete", "autofocus"
+        \, "disabled", "enctype", "formaction", "list", "maxlength", "minlength", "method", "multiple"
+        \, "name", "novalidate", "pattern", "readonly", "required", "size", "for", "form"
+        \, "max", "min", "step"
+        \, "cols", "rows", "wrap"
+        \, "href", "target", "download", "downloadAs", "hreflang", "media", "ping", "rel"
+        \, "ismap", "usemap", "shape", "coords"
+        \, "src", "height", "width", "alt"
+        \, "autoplay", "controls", "loop", "preload", "poster", "default", "kind", "srclang"
+        \, "sandbox", "seamless", "srcdoc"
+        \, "reversed", "start"
+        \, "align", "colspan", "rowspan", "headers", "scope"
+        \, "async", "charset", "content", "defer", "httpEquiv", "language", "scoped"
+        \, "accesskey", "contenteditable", "contextmenu", "dir", "draggable", "dropzone"
+        \, "itemprop", "lang", "spellcheck", "tabindex"
+        \, "challenge", "keytype"
+        \, "cite", "datetime", "pubdate", "manifest"]
+
+  if index(elm_attributes, a:param) >= 0
+    if a:param == 'type'
+      return 'type_'
+    endif
+    return a:param
+  endif
+  return 'attribute "' . a:param . '"'
+endfunction
+
+function! emmet#lang#elm#toString(settings, current, type, inline, filters, itemno, indent) abort
+  let settings = a:settings
+  let current = a:current
+  let type = a:type
+  let inline = a:inline
+  let filters = a:filters
+  let itemno = a:itemno
+  let indent = emmet#getIndentation(type)
+  let dollar_expr = emmet#getResource(type, 'dollar_expr', 1)
+  let str = ''
+
+  " comma between items with *, eg. li*3
+  if itemno > 0
+    let str = ", "
+  endif
+
+  let current_name = current.name
+  if dollar_expr
+    let current_name = substitute(current.name, '\$$', itemno+1, '')
+  endif
+
+  if len(current.name) > 0
+    " inserted root comma nodes
+    if current_name == ','
+      return "\n, "
+    endif
+    let str .= emmet#lang#elm#renderNode(current_name)
+    let tmp = ''
+    for attr in emmet#util#unique(current.attrs_order + keys(current.attr))
+      if !has_key(current.attr, attr)
+        continue
+      endif
+      let Val = current.attr[attr]
+
+      let attr = emmet#lang#elm#renderParam(attr)
+
+      if type(Val) == 2 && Val == function('emmet#types#true')
+        let tmp .= ', ' . attr . ' True'
+      else
+        if dollar_expr
+          while Val =~# '\$\([^#{]\|$\)'
+            let Val = substitute(Val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+          endwhile
+          let attr = substitute(attr, '\$$', itemno+1, '')
+        endif
+        let valtmp = substitute(Val, '\${cursor}', '', '')
+        if attr ==# 'id' && len(valtmp) > 0
+          let tmp .=', id "' . Val . '"'
+        elseif attr ==# 'class' && len(valtmp) > 0
+          let tmp .= ', class "' . substitute(Val, ' ', '.', 'g') . '"'
+        else
+          let tmp .= ', ' . attr . ' "' . Val . '"'
+        endif
+      endif
+    endfor
+
+    if ! len(tmp)
+      let str .= ' []'
+    else
+      let tmp = strpart(tmp, 2)
+      let str .= ' [ ' . tmp . ' ]'
+    endif
+
+    " No children quit early
+    if len(current.child) == 0 && len(current.value) == 0
+      "Place cursor in node with no value or children
+      let str .= ' [${cursor}]'
+      return str
+    endif
+
+    let inner = ''
+
+    " Parent contex text
+    if len(current.value) > 0
+      let text = current.value[1:-2]
+      if dollar_expr
+        let text = substitute(text, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+        let text = substitute(text, '\${nr}', "\n", 'g')
+        let text = substitute(text, '\\\$', '$', 'g')
+        " let str = substitute(str, '\$#', text, 'g')
+        let inner .= ', text "' . text . '"'
+      endif
+    endif
+
+
+    " Has children
+    for child in current.child
+      if len(child.name) == 0 && len(child.value) > 0
+        "  Text node
+        let text = child.value[1:-2]
+        if dollar_expr
+          let text = substitute(text, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+          let text = substitute(text, '\${nr}', "\n", 'g')
+          let text = substitute(text, '\\\$', '$', 'g')
+        endif
+        let inner .= ', text "' . text . '"'
+      else
+        " Other nodes
+        let inner .= ', ' . emmet#toString(child, type, inline, filters, 0, indent)
+      endif
+    endfor
+
+    let inner = substitute(inner, "\n", "\n" . escape(indent, '\'), 'g')
+    let inner = substitute(inner, "\n" . escape(indent, '\') . '$', '', 'g')
+    let inner = strpart(inner, 2)
+
+    let inner = substitute(inner, '  ', '', 'g')
+
+    if ! len(inner)
+      let str .= ' []'
+    else
+      let str .= ' [ ' . inner . ' ]'
+    endif
+
+  else
+    let str = current.value[1:-2]
+    if dollar_expr
+      let str = substitute(str, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+      let str = substitute(str, '\${nr}', "\n", 'g')
+      let str = substitute(str, '\\\$', '$', 'g')
+    endif
+  endif
+
+  let str .= "\n"
+
+  return str
+
+endfunction
diff --git a/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/haml.vim b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/haml.vim
new file mode 100644
index 0000000..a3585c9
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/haml.vim
@@ -0,0 +1,334 @@
+function! emmet#lang#haml#findTokens(str) abort
+  return emmet#lang#html#findTokens(a:str)
+endfunction
+
+function! emmet#lang#haml#parseIntoTree(abbr, type) abort
+  return emmet#lang#html#parseIntoTree(a:abbr, a:type)
+endfunction
+
+function! emmet#lang#haml#toString(settings, current, type, inline, filters, itemno, indent) abort
+  let settings = a:settings
+  let current = a:current
+  let type = a:type
+  let inline = a:inline
+  let filters = a:filters
+  let itemno = a:itemno
+  let indent = emmet#getIndentation(type)
+  let dollar_expr = emmet#getResource(type, 'dollar_expr', 1)
+  let attribute_style = emmet#getResource('haml', 'attribute_style', 'hash')
+  let str = ''
+
+  let current_name = current.name
+  if dollar_expr
+    let current_name = substitute(current.name, '\$$', itemno+1, '')
+  endif
+  if len(current.name) > 0
+    let str .= '%' . current_name
+    let tmp = ''
+    for attr in emmet#util#unique(current.attrs_order + keys(current.attr))
+      if !has_key(current.attr, attr)
+        continue
+      endif
+      let Val = current.attr[attr]
+      if type(Val) == 2 && Val == function('emmet#types#true')
+        if attribute_style ==# 'hash'
+          let tmp .= ' :' . attr . ' => true'
+        elseif attribute_style ==# 'html'
+          let tmp .= attr . '=true'
+        end
+      else
+        if dollar_expr
+          while Val =~# '\$\([^#{]\|$\)'
+            let Val = substitute(Val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+          endwhile
+          let attr = substitute(attr, '\$$', itemno+1, '')
+        endif
+        let valtmp = substitute(Val, '\${cursor}', '', '')
+        if attr ==# 'id' && len(valtmp) > 0
+          let str .= '#' . Val
+        elseif attr ==# 'class' && len(valtmp) > 0
+          let str .= '.' . substitute(Val, ' ', '.', 'g')
+        else
+          if len(tmp) > 0 
+            if attribute_style ==# 'hash'
+              let tmp .= ',' 
+            elseif attribute_style ==# 'html'
+              let tmp .= ' ' 
+            endif
+          endif
+          if attribute_style ==# 'hash'
+            let tmp .= ' :' . attr . ' => "' . Val . '"'
+          elseif attribute_style ==# 'html'
+            let tmp .= attr . '="' . Val . '"'
+          end
+        endif
+      endif
+    endfor
+    if len(tmp)
+      if attribute_style ==# 'hash'
+        let str .= '{' . tmp . ' }'
+      elseif attribute_style ==# 'html'
+        let str .= '(' . tmp . ')'
+      end
+    endif
+    if stridx(','.settings.html.empty_elements.',', ','.current_name.',') != -1 && len(current.value) == 0
+      let str .= '/'
+    endif
+
+    let inner = ''
+    if len(current.value) > 0
+      let text = current.value[1:-2]
+      if dollar_expr
+        let text = substitute(text, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+        let text = substitute(text, '\${nr}', "\n", 'g')
+        let text = substitute(text, '\\\$', '$', 'g')
+        let str = substitute(str, '\$#', text, 'g')
+      endif
+      let lines = split(text, "\n")
+      if len(lines) == 1
+        let str .= ' ' . text
+      else
+        for line in lines
+          let str .= "\n" . indent . line . ' |'
+        endfor
+      endif
+    elseif len(current.child) == 0
+      let str .= '${cursor}'
+    endif
+    if len(current.child) == 1 && len(current.child[0].name) == 0
+      let text = current.child[0].value[1:-2]
+      if dollar_expr
+        let text = substitute(text, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+        let text = substitute(text, '\${nr}', "\n", 'g')
+        let text = substitute(text, '\\\$', '$', 'g')
+      endif
+      let lines = split(text, "\n")
+      if len(lines) == 1
+        let str .= ' ' . text
+      else
+        for line in lines
+          let str .= "\n" . indent . line . ' |'
+        endfor
+      endif
+    elseif len(current.child) > 0
+      for child in current.child
+        let inner .= emmet#toString(child, type, inline, filters, itemno, indent)
+      endfor
+      let inner = substitute(inner, "\n", "\n" . escape(indent, '\'), 'g')
+      let inner = substitute(inner, "\n" . escape(indent, '\') . '$', '', 'g')
+      let str .= "\n" . indent . inner
+    endif
+  else
+    let str = current.value[1:-2]
+    if dollar_expr
+      let str = substitute(str, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+      let str = substitute(str, '\${nr}', "\n", 'g')
+      let str = substitute(str, '\\\$', '$', 'g')
+    endif
+  endif
+  let str .= "\n"
+  return str
+endfunction
+
+function! emmet#lang#haml#imageSize() abort
+  let line = getline('.')
+  let current = emmet#lang#haml#parseTag(line)
+  if empty(current) || !has_key(current.attr, 'src')
+    return
+  endif
+  let fn = current.attr.src
+  if fn =~# '^\s*$'
+    return
+  elseif fn !~# '^\(/\|http\)'
+    let fn = simplify(expand('%:h') . '/' . fn)
+  endif
+
+  let [width, height] = emmet#util#getImageSize(fn)
+  if width == -1 && height == -1
+    return
+  endif
+  let current.attr.width = width
+  let current.attr.height = height
+  let current.attrs_order += ['width', 'height']
+  let haml = emmet#toString(current, 'haml', 1)
+  let haml = substitute(haml, '\${cursor}', '', '')
+  call setline('.', substitute(matchstr(line, '^\s*') . haml, "\n", '', 'g'))
+endfunction
+
+function! emmet#lang#haml#encodeImage() abort
+endfunction
+
+function! emmet#lang#haml#parseTag(tag) abort
+  let current = emmet#newNode()
+  let mx = '%\([a-zA-Z][a-zA-Z0-9]*\)\s*\%({\(.*\)}\)'
+  let match = matchstr(a:tag, mx)
+  let current.name = substitute(match, mx, '\1', '')
+  let attrs = substitute(match, mx, '\2', '')
+  let mx = '\([a-zA-Z0-9]\+\)\s*=>\s*\%(\([^"'' \t]\+\)\|"\([^"]\{-}\)"\|''\([^'']\{-}\)''\)'
+  while len(attrs) > 0
+    let match = matchstr(attrs, mx)
+    if len(match) ==# 0
+      break
+    endif
+    let attr_match = matchlist(match, mx)
+    let name = attr_match[1]
+    let value = len(attr_match[2]) ? attr_match[2] : attr_match[3]
+    let current.attr[name] = value
+    let current.attrs_order += [name]
+    let attrs = attrs[stridx(attrs, match) + len(match):]
+  endwhile
+  return current
+endfunction
+
+function! emmet#lang#haml#toggleComment() abort
+  let line = getline('.')
+  let space = matchstr(line, '^\s*')
+  if line =~# '^\s*-#'
+    call setline('.', space . matchstr(line[len(space)+2:], '^\s*\zs.*'))
+  elseif line =~# '^\s*%[a-z]'
+    call setline('.', space . '-# ' . line[len(space):])
+  endif
+endfunction
+
+function! emmet#lang#haml#balanceTag(flag) range abort
+  let block = emmet#util#getVisualBlock()
+  if a:flag == -2 || a:flag == 2
+    let curpos = [0, line("'<"), col("'<"), 0]
+  else
+    let curpos = emmet#util#getcurpos()
+  endif
+  let n = curpos[1]
+  let ml = len(matchstr(getline(n), '^\s*'))
+
+  if a:flag > 0
+    if a:flag == 1 || !emmet#util#regionIsValid(block)
+      let n = line('.')
+    else
+      while n > 0
+        let l = len(matchstr(getline(n), '^\s*\ze%[a-z]'))
+        if l > 0 && l < ml
+          let ml = l
+          break
+        endif
+        let n -= 1
+      endwhile
+    endif
+    let sn = n
+    if n == 0
+      let ml = 0
+    endif
+    while n < line('$')
+      let l = len(matchstr(getline(n), '^\s*%[a-z]'))
+      if l > 0 && l <= ml
+        let n -= 1
+        break
+      endif
+      let n += 1
+    endwhile
+    call setpos('.', [0, n, 1, 0])
+    normal! V
+    call setpos('.', [0, sn, 1, 0])
+  else
+    while n > 0
+      let l = len(matchstr(getline(n), '^\s*\ze[a-z]'))
+      if l > 0 && l > ml
+        let ml = l
+        break
+      endif
+      let n += 1
+    endwhile
+    let sn = n
+    if n == 0
+      let ml = 0
+    endif
+    while n < line('$')
+      let l = len(matchstr(getline(n), '^\s*%[a-z]'))
+      if l > 0 && l <= ml
+        let n -= 1
+        break
+      endif
+      let n += 1
+    endwhile
+    call setpos('.', [0, n, 1, 0])
+    normal! V
+    call setpos('.', [0, sn, 1, 0])
+  endif
+endfunction
+
+function! emmet#lang#haml#moveNextPrevItem(flag) abort
+  return emmet#lang#haml#moveNextPrev(a:flag)
+endfunction
+
+function! emmet#lang#haml#moveNextPrev(flag) abort
+  let pos = search('""', a:flag ? 'Wb' : 'W')
+  if pos != 0
+    silent! normal! l
+    startinsert
+  endif
+endfunction
+
+function! emmet#lang#haml#splitJoinTag() abort
+  let n = line('.')
+  let sml = len(matchstr(getline(n), '^\s*%[a-z]'))
+  while n > 0
+    if getline(n) =~# '^\s*\ze%[a-z]'
+      if len(matchstr(getline(n), '^\s*%[a-z]')) < sml
+        break
+      endif
+      let line = getline(n)
+      call setline(n, substitute(line, '^\s*%\w\+\%(\s*{[^}]*}\|\s\)\zs.*', '', ''))
+      let sn = n
+      let n += 1
+      let ml = len(matchstr(getline(n), '^\s*%[a-z]'))
+      if len(matchstr(getline(n), '^\s*')) > ml
+        while n <= line('$')
+          let l = len(matchstr(getline(n), '^\s*'))
+          if l <= ml
+            break
+          endif
+          exe n 'delete'
+        endwhile
+        call setpos('.', [0, sn, 1, 0])
+      else
+        let tag = matchstr(getline(sn), '^\s*%\zs\(\w\+\)')
+        let spaces = matchstr(getline(sn), '^\s*')
+        let settings = emmet#getSettings()
+        if stridx(','.settings.html.inline_elements.',', ','.tag.',') == -1
+          call append(sn, spaces . '   ')
+          call setpos('.', [0, sn+1, 1, 0])
+        else
+          call setpos('.', [0, sn, 1, 0])
+        endif
+        startinsert!
+      endif
+      break
+    endif
+    let n -= 1
+  endwhile
+endfunction
+
+function! emmet#lang#haml#removeTag() abort
+  let n = line('.')
+  let ml = 0
+  while n > 0
+    if getline(n) =~# '^\s*\ze[a-z]'
+      let ml = len(matchstr(getline(n), '^\s*%[a-z]'))
+      break
+    endif
+    let n -= 1
+  endwhile
+  let sn = n
+  while n < line('$')
+    let l = len(matchstr(getline(n), '^\s*%[a-z]'))
+    if l > 0 && l <= ml
+      let n -= 1
+      break
+    endif
+    let n += 1
+  endwhile
+  if sn == n
+    exe 'delete'
+  else
+    exe sn ',' (n-1) 'delete'
+  endif
+endfunction
diff --git a/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/html.vim b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/html.vim
new file mode 100644
index 0000000..cdf440b
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/html.vim
@@ -0,0 +1,954 @@
+let s:bx = '{\%("[^"]*"\|''[^'']*''\|\$#\|\${\w\+}\|\$\+\|{[^{]\+\|[^{}]\)\{-}}'
+let s:mx = '\([+>]\|[<^]\+\)\{-}\s*'
+\     .'\((*\)\{-}\s*'
+\       .'\([@#.]\{-}[a-zA-Z_\!][a-zA-Z0-9:_\!\-$]*\|' . s:bx . '\|\[[^\]]\+\]\)'
+\       .'\('
+\         .'\%('
+\           .'\%(#{[{}a-zA-Z0-9_\-\$]\+\|#[a-zA-Z0-9_\-\$]\+\)'
+\           .'\|\%(\[\%("[^"]*"\|[^"\]]*\)\+\]\)'
+\           .'\|\%(\.{[{}a-zA-Z0-9_\-\$]\+\|\.[a-zA-Z0-9_\-\$]\+\)'
+\         .'\)*'
+\       .'\)'
+\       .'\%(\(' . s:bx . '\+\)\)\{0,1}'
+\         .'\%(\(@-\{0,1}[0-9]*\)\{0,1}\*\([0-9]\+\)\)\{0,1}'
+\     .'\(\%()\%(\(@-\{0,1}[0-9]*\)\{0,1}\*[0-9]\+\)\{0,1}\)*\)'
+
+function! emmet#lang#html#findTokens(str) abort
+  let str = a:str
+  let [pos, last_pos] = [0, 0]
+  while 1
+    let tag = matchstr(str, '<[a-zA-Z].\{-}>', pos)
+    if len(tag) == 0
+      break
+    endif
+    let pos = stridx(str, tag, pos) + len(tag)
+  endwhile
+  while 1
+    let tag = matchstr(str, '{%[^%]\{-}%}', pos)
+    if len(tag) == 0
+      break
+    endif
+    let pos = stridx(str, tag, pos) + len(tag)
+  endwhile
+  let last_pos = pos
+  while len(str) > 0
+    let token = matchstr(str, s:mx, pos)
+    if token ==# ''
+      break
+    endif
+    if token =~# '^\s'
+      let token = matchstr(token, '^\s*\zs.*')
+      let last_pos = stridx(str, token, pos)
+    endif
+    let pos = stridx(str, token, pos) + len(token)
+  endwhile
+  let str = a:str[last_pos :-1]
+  if str =~# '^\w\+="[^"]*$'
+    return ''
+  endif
+  return str
+endfunction
+
+function! emmet#lang#html#parseIntoTree(abbr, type) abort
+  let abbr = a:abbr
+  let type = a:type
+
+  let settings = emmet#getSettings()
+  if !has_key(settings, type)
+    let type = 'html'
+  endif
+  if len(type) == 0 | let type = 'html' | endif
+
+  let indent = emmet#getIndentation(type)
+  let pmap = {
+  \'p': 'span',
+  \'ul': 'li',
+  \'ol': 'li',
+  \'table': 'tr',
+  \'tr': 'td',
+  \'tbody': 'tr',
+  \'thead': 'tr',
+  \'tfoot': 'tr',
+  \'colgroup': 'col',
+  \'select': 'option',
+  \'optgroup': 'option',
+  \'audio': 'source',
+  \'video': 'source',
+  \'object': 'param',
+  \'map': 'area'
+  \}
+
+  let inlineLevel = split('a,abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var',',')
+
+  let custom_expands = emmet#getResource(type, 'custom_expands', {})
+  if empty(custom_expands) && has_key(settings, 'custom_expands')
+    let custom_expands = settings['custom_expands']
+  endif
+
+  " try 'foo' to (foo-x)
+  let rabbr = emmet#getExpandos(type, abbr)
+  if rabbr == abbr
+    " try 'foo+(' to (foo-x)
+    let rabbr = substitute(abbr, '\%(+\|^\)\([a-zA-Z][a-zA-Z0-9+]\+\)+\([(){}>]\|$\)', '\="(".emmet#getExpandos(type, submatch(1)).")".submatch(2)', 'i')
+  endif
+  let abbr = rabbr
+
+  let root = emmet#newNode()
+  let parent = root
+  let last = root
+  let pos = []
+  while len(abbr)
+    " parse line
+    let match = matchstr(abbr, s:mx)
+    let str = substitute(match, s:mx, '\0', 'ig')
+    let operator = substitute(match, s:mx, '\1', 'ig')
+    let block_start = substitute(match, s:mx, '\2', 'ig')
+    let tag_name = substitute(match, s:mx, '\3', 'ig')
+    let attributes = substitute(match, s:mx, '\4', 'ig')
+    let value = substitute(match, s:mx, '\5', 'ig')
+    let basevalue = substitute(match, s:mx, '\6', 'ig')
+    let multiplier = 0 + substitute(match, s:mx, '\7', 'ig')
+    let block_end = substitute(match, s:mx, '\8', 'ig')
+    let custom = ''
+    let important = 0
+    if len(str) == 0
+      break
+    endif
+    if tag_name =~# '^#'
+      let attributes = tag_name . attributes
+      let tag_name = ''
+    endif
+    if tag_name =~# '[^!]!$'
+      let tag_name = tag_name[:-2]
+      let important = 1
+    endif
+    if tag_name =~# '^\.'
+      let attributes = tag_name . attributes
+      let tag_name = ''
+    endif
+    if tag_name =~# '^\[.*\]$'
+      let attributes = tag_name . attributes
+      let tag_name = ''
+    endif
+
+    for k in keys(custom_expands)
+      if tag_name =~ k
+        let custom = tag_name
+        let tag_name = ''
+        break
+      endif
+    endfor
+
+    if empty(tag_name)
+      let pname = len(parent.child) > 0 ? parent.child[0].name : ''
+      if !empty(pname) && has_key(pmap, pname)
+        let tag_name = pmap[pname]
+      elseif !empty(pname) && index(inlineLevel, pname) > -1
+        let tag_name = 'span'
+      elseif len(parent.child) == 0 || len(custom) == 0
+        let tag_name = 'div'
+      else
+        let tag_name = custom
+      endif
+    endif
+
+    let basedirect = basevalue[1] ==# '-' ? -1 : 1
+    let basevalue = 0 + abs(basevalue[1:])
+    if multiplier <= 0 | let multiplier = 1 | endif
+
+    " make default node
+    let current = emmet#newNode()
+
+    let current.name = tag_name
+    let current.important = important
+
+    " aliases
+    let aliases = emmet#getResource(type, 'aliases', {})
+    if has_key(aliases, tag_name)
+      let current.name = aliases[tag_name]
+    endif
+
+    let use_pipe_for_cursor = emmet#getResource(type, 'use_pipe_for_cursor', 1)
+
+    " snippets
+    let snippets = emmet#getResource(type, 'snippets', {})
+    if !empty(snippets)
+      let snippet_name = tag_name
+      if has_key(snippets, snippet_name)
+        let snippet = snippet_name
+        while has_key(snippets, snippet)
+          let snippet = snippets[snippet]
+        endwhile
+        if use_pipe_for_cursor
+          let snippet = substitute(snippet, '|', '${cursor}', 'g')
+        endif
+        " just redirect to expanding
+        if type == 'html' && snippet !~ '^\s*[{\[<]'
+           return emmet#lang#html#parseIntoTree(snippet, a:type)
+        endif
+        let lines = split(snippet, "\n", 1)
+        call map(lines, 'substitute(v:val, "\\(    \\|\\t\\)", escape(indent, "\\\\"), "g")')
+        let current.snippet = join(lines, "\n")
+        let current.name = ''
+      endif
+    endif
+
+    for k in keys(custom_expands)
+      if tag_name =~# k
+        let current.snippet = '${' . (empty(custom) ? tag_name : custom) . '}'
+        let current.name = ''
+        break
+      elseif custom =~# k
+        let current.snippet = '${' . custom . '}'
+        let current.name = ''
+        break
+      endif
+    endfor
+
+    " default_attributes
+    let default_attributes = emmet#getResource(type, 'default_attributes', {})
+    if !empty(default_attributes)
+      for pat in [current.name, tag_name]
+        if has_key(default_attributes, pat)
+          if type(default_attributes[pat]) == 4
+            let a = default_attributes[pat]
+            let current.attrs_order += keys(a)
+            if use_pipe_for_cursor
+              for k in keys(a)
+                let current.attr[k] = len(a[k]) ? substitute(a[k], '|', '${cursor}', 'g') : '${cursor}'
+              endfor
+            else
+              for k in keys(a)
+                let current.attr[k] = a[k]
+              endfor
+            endif
+          else
+            for a in default_attributes[pat]
+              let current.attrs_order += keys(a)
+              if use_pipe_for_cursor
+                for k in keys(a)
+                  let current.attr[k] = len(a[k]) ? substitute(a[k], '|', '${cursor}', 'g') : '${cursor}'
+                endfor
+              else
+                for k in keys(a)
+                  let current.attr[k] = a[k]
+                endfor
+              endif
+            endfor
+          endif
+          if has_key(settings.html.default_attributes, current.name)
+            let current.name = substitute(current.name, ':.*$', '', '')
+          endif
+          break
+        endif
+      endfor
+    endif
+
+    " parse attributes
+    if len(attributes)
+      let attr = attributes
+      while len(attr)
+        let item = matchstr(attr, '\(\%(\%(#[{}a-zA-Z0-9_\-\$]\+\)\|\%(\[\%("[^"]*"\|[^"\]]*\)\+\]\)\|\%(\.[{}a-zA-Z0-9_\-\$]\+\)*\)\)')
+        if g:emmet_debug > 1
+          echomsg 'attr=' . item
+        endif
+        if len(item) == 0
+          break
+        endif
+        if item[0] ==# '#'
+          let current.attr.id = item[1:]
+        endif
+        if item[0] ==# '.'
+          let current.attr.class = substitute(item[1:], '\.', ' ', 'g')
+        endif
+        if item[0] ==# '['
+          let atts = item[1:-2]
+          if matchstr(atts, '^\s*\zs[0-9a-zA-Z_\-:]\+\(="[^"]*"\|=''[^'']*''\|=[^ ''"]\+\)') ==# ''
+            let ks = []
+			if has_key(default_attributes, current.name)
+              let dfa = default_attributes[current.name]
+              let ks = type(dfa) == 3 ? keys(dfa[0]) : keys(dfa)
+            endif
+            if len(ks) == 0 && has_key(default_attributes, current.name . ':src')
+              let ks = keys(default_attributes[current.name . ':src'])
+            endif
+            if len(ks) > 0
+              let current.attr[ks[0]] = atts
+            else
+              let current.attr[atts] = ''
+            endif
+          else
+            while len(atts)
+              let amat = matchstr(atts, '^\s*\zs\([0-9a-zA-Z-:]\+\%(="[^"]*"\|=''[^'']*''\|=[^ ''"]\+\|[^ ''"\]]*\)\{0,1}\)')
+              if len(amat) == 0
+                break
+              endif
+              let key = split(amat, '=')[0]
+              let Val = amat[len(key)+1:]
+              if key =~# '\.$' && Val ==# ''
+                let key = key[:-2]
+                unlet Val
+                let Val = function('emmet#types#true')
+              elseif Val =~# '^["'']'
+                let Val = Val[1:-2]
+              endif
+              let current.attr[key] = Val
+              if index(current.attrs_order, key) == -1
+                let current.attrs_order += [key]
+              endif
+              let atts = atts[stridx(atts, amat) + len(amat):]
+              unlet Val
+            endwhile
+          endif
+        endif
+        let attr = substitute(strpart(attr, len(item)), '^\s*', '', '')
+      endwhile
+    endif
+
+    " parse text
+    if tag_name =~# '^{.*}$'
+      let current.name = ''
+      let current.value = tag_name
+    else
+      let current.value = value
+    endif
+    let current.basedirect = basedirect
+    let current.basevalue = basevalue
+    let current.multiplier = multiplier
+
+    " parse step inside/outside
+    if !empty(last)
+      if operator =~# '>'
+        unlet! parent
+        let parent = last
+        let current.parent = last
+        let current.pos = last.pos + 1
+      else
+        let current.parent = parent
+        let current.pos = last.pos
+      endif
+    else
+      let current.parent = parent
+      let current.pos = 1
+    endif
+    if operator =~# '[<^]'
+      for c in range(len(operator))
+        let tmp = parent.parent
+        if empty(tmp)
+          break
+        endif
+        let parent = tmp
+        let current.parent = tmp
+      endfor
+    endif
+
+    call add(parent.child, current)
+    let last = current
+
+    " parse block
+    if block_start =~# '('
+      if operator =~# '>'
+        let last.pos += 1
+      endif
+      let last.block = 1
+      for n in range(len(block_start))
+        let pos += [last.pos]
+      endfor
+    endif
+    if block_end =~# ')'
+      for n in split(substitute(substitute(block_end, ' ', '', 'g'), ')', ',),', 'g'), ',')
+        if n ==# ')'
+          if len(pos) > 0 && last.pos >= pos[-1]
+            for c in range(last.pos - pos[-1])
+              let tmp = parent.parent
+              if !has_key(tmp, 'parent')
+                break
+              endif
+              let parent = tmp
+            endfor
+            if len(pos) > 0
+              call remove(pos, -1)
+            endif
+            let last = parent
+            let last.pos += 1
+          endif
+        elseif len(n)
+          let st = 0
+          for nc in range(len(last.child))
+            if last.child[nc].block
+              let st = nc
+              break
+            endif
+          endfor
+          let cl = last.child[st :]
+          let cls = []
+          for c in range(n[1:])
+            for cc in cl
+              if cc.multiplier > 1
+                let cc.basedirect = c + 1
+              else
+                let cc.basevalue = c + 1
+              endif
+            endfor
+            let cls += deepcopy(cl)
+          endfor
+          if st > 0
+            let last.child = last.child[:st-1] + cls
+          else
+            let last.child = cls
+          endif
+        endif
+      endfor
+    endif
+    let abbr = abbr[stridx(abbr, match) + len(match):]
+    if abbr == '/'
+		let g:hoge = 1
+      let current.empty = 1
+    endif
+
+    if g:emmet_debug > 1
+      echomsg 'str='.str
+      echomsg 'block_start='.block_start
+      echomsg 'tag_name='.tag_name
+      echomsg 'operator='.operator
+      echomsg 'attributes='.attributes
+      echomsg 'value='.value
+      echomsg 'basevalue='.basevalue
+      echomsg 'multiplier='.multiplier
+      echomsg 'block_end='.block_end
+      echomsg 'abbr='.abbr
+      echomsg 'pos='.string(pos)
+      echomsg '---'
+    endif
+  endwhile
+  return root
+endfunction
+
+function! s:dollar_add(base,no) abort
+  if a:base > 0
+    return a:base + a:no - 1
+  elseif a:base < 0
+    return a:base - a:no + 1
+  else
+    return a:no
+  endif
+endfunction
+
+function! emmet#lang#html#toString(settings, current, type, inline, filters, itemno, indent) abort
+  let settings = a:settings
+  let current = a:current
+  let type = a:type
+  let inline = a:inline
+  let filters = a:filters
+  let itemno = a:itemno
+  let indent = a:indent
+  let dollar_expr = emmet#getResource(type, 'dollar_expr', 1)
+  let q = emmet#getResource(type, 'quote_char', '"')
+  let ct = emmet#getResource(type, 'comment_type', 'both')
+  let an = emmet#getResource(type, 'attribute_name', {})
+  let empty_element_suffix = emmet#getResource(type, 'empty_element_suffix', settings.html.empty_element_suffix)
+
+  if emmet#useFilter(filters, 'haml')
+    return emmet#lang#haml#toString(settings, current, type, inline, filters, itemno, indent)
+  endif
+  if emmet#useFilter(filters, 'slim')
+    return emmet#lang#slim#toString(settings, current, type, inline, filters, itemno, indent)
+  endif
+
+  let comment = ''
+  let current_name = current.name
+  if dollar_expr
+    let current_name = substitute(current_name, '\$$', itemno+1, '')
+  endif
+
+  let str = ''
+  if len(current_name) == 0
+    let text = current.value[1:-2]
+    if dollar_expr
+      " TODO: regexp engine specified
+      let nr = itemno + 1
+      if exists('&regexpengine')
+        let text = substitute(text, '\%#=1\%(\\\)\@\<!\(\$\+\)\(@-\?[0-9]\+\)\{0,1}\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d",s:dollar_add(submatch(2)[1:],nr)).submatch(3)', 'g')
+      else
+        let text = substitute(text, '\%(\\\)\@\<!\(\$\+\)\(@-\?[0-9]\+\)\{0,1}\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d",s:dollar_add(submatch(2)[1:],nr).submatch(3)', 'g')
+      endif
+      let text = substitute(text, '\${nr}', "\n", 'g')
+      let text = substitute(text, '\\\$', '$', 'g')
+    endif
+    return text
+  endif
+  if len(current_name) > 0
+    let str .= '<' . current_name
+  endif
+  for attr in emmet#util#unique(current.attrs_order + keys(current.attr))
+    if !has_key(current.attr, attr)
+      continue
+    endif
+    let Val = current.attr[attr]
+    if type(Val) == 2 && Val == function('emmet#types#true')
+      unlet Val
+      let Val = 'true'
+      if g:emmet_html5
+        let str .= ' ' . attr
+      else
+        let str .= ' ' . attr . '=' . q . attr . q
+      endif
+      if emmet#useFilter(filters, 'c')
+        if attr ==# 'id' | let comment .= '#' . Val | endif
+        if attr ==# 'class' | let comment .= '.' . Val | endif
+      endif
+    else
+      if dollar_expr
+        while Val =~# '\$\([^#{]\|$\)'
+          " TODO: regexp engine specified
+          if exists('&regexpengine')
+            let Val = substitute(Val, '\%#=1\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+          else
+            let Val = substitute(Val, '\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+          endif
+        endwhile
+        let attr = substitute(attr, '\$$', itemno+1, '')
+      endif
+      if attr ==# 'class' && emmet#useFilter(filters, 'bem')
+        let vals = split(Val, '\s\+')
+        let Val = ''
+        let lead = ''
+        for _val in vals
+          if len(Val) > 0
+            let Val .= ' '
+          endif
+          if _val =~# '^_'
+            if has_key(current.parent.attr, 'class')
+              let lead = current.parent.attr["class"]
+              if _val =~# '^__'
+                let Val .= lead . _val
+              else
+                let Val .= lead . ' ' . lead . _val
+              endif
+            else
+              let lead = split(vals[0], '_')[0]
+              let Val .= lead . _val
+            endif
+          elseif _val =~# '^-'
+            for l in split(_val, '_')
+              if len(Val) > 0
+                let Val .= ' '
+              endif
+              let l = substitute(l, '^-', '__', '')
+              if len(lead) == 0
+                let pattr = current.parent.attr
+                if has_key(pattr, 'class')
+                  let lead = split(pattr['class'], '\s\+')[0]
+                endif
+              endif
+              let Val .= lead . l
+              let lead .= l . '_'
+            endfor
+          else
+            let Val .= _val
+          endif
+        endfor
+      endif
+      if has_key(an, attr)
+        let attr = an[attr]
+      endif
+      if emmet#isExtends(type, 'jsx') && Val =~ '^{.*}$'
+        let str .= ' ' . attr . '=' . Val
+      else
+        let str .= ' ' . attr . '=' . q . Val . q
+      endif
+      if emmet#useFilter(filters, 'c')
+        if attr ==# 'id' | let comment .= '#' . Val | endif
+        if attr ==# 'class' | let comment .= '.' . Val | endif
+      endif
+    endif
+    unlet Val
+  endfor
+  if len(comment) > 0 && ct ==# 'both'
+    let str = '<!-- ' . comment . " -->\n" . str
+  endif
+  if current.empty
+    let str .= ' />'
+  elseif stridx(','.settings.html.empty_elements.',', ','.current_name.',') != -1
+    let str .= empty_element_suffix
+  else
+    let str .= '>'
+    let text = current.value[1:-2]
+    if dollar_expr
+      " TODO: regexp engine specified
+      let nr = itemno + 1
+      if exists('&regexpengine')
+        let text = substitute(text, '\%#=1\%(\\\)\@\<!\(\$\+\)\(@-\?[0-9]\+\)\{0,1}\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d",s:dollar_add(submatch(2)[1:],nr)).submatch(3)', 'g')
+      else
+        let text = substitute(text, '\%(\\\)\@\<!\(\$\+\)\(@-\?[0-9]\+\)\{0,1}\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d",s:dollar_add(submatch(2)[1:],nr)).submatch(3)', 'g')
+      endif
+      let text = substitute(text, '\${nr}', "\n", 'g')
+      let text = substitute(text, '\\\$', '$', 'g')
+      if text != ''
+        let str = substitute(str, '\("\zs$#\ze"\|\s\zs\$#"\|"\$#\ze\s\)', text, 'g')
+      endif
+    endif
+    let str .= text
+    let nc = len(current.child)
+    let dr = 0
+    if nc > 0
+      for n in range(nc)
+        let child = current.child[n]
+        if child.multiplier > 1
+          let str .= "\n" . indent
+          let dr = 1
+        elseif len(current_name) > 0 && stridx(','.settings.html.inline_elements.',', ','.current_name.',') == -1
+          if nc > 1 || (len(child.name) > 0 && stridx(','.settings.html.inline_elements.',', ','.child.name.',') == -1)
+            let str .= "\n" . indent
+            let dr = 1
+          elseif current.multiplier == 1 && nc == 1 && len(child.name) == 0
+            let str .= "\n" . indent
+            let dr = 1
+          endif
+        endif
+        let inner = emmet#toString(child, type, 0, filters, itemno, indent)
+        let inner = substitute(inner, "^\n", '', 'g')
+        let inner = substitute(inner, "\n", "\n" . escape(indent, '\'), 'g')
+        let inner = substitute(inner, "\n" . escape(indent, '\') . '$', '', 'g')
+        let str .= inner
+      endfor
+    else
+      if settings.html.indent_blockelement && len(current_name) > 0 && stridx(','.settings.html.inline_elements.',', ','.current_name.',') == -1
+        let str .= "\n" . indent . '${cursor}' . "\n"
+      else
+        let str .= '${cursor}'
+      endif
+    endif
+    if dr
+      let str .= "\n"
+    endif
+    let str .= '</' . current_name . '>'
+  endif
+  if len(comment) > 0
+    if ct ==# 'lastonly'
+      let str .= '<!-- ' . comment . ' -->'
+    else
+      let str .= "\n<!-- /" . comment . ' -->'
+    endif
+  endif
+  if len(current_name) > 0 && current.multiplier > 0 || stridx(','.settings.html.block_elements.',', ','.current_name.',') != -1
+    let str .= "\n"
+  endif
+  return str
+endfunction
+
+function! emmet#lang#html#imageSize() abort
+  let img_region = emmet#util#searchRegion('<img\s', '>')
+  if !emmet#util#regionIsValid(img_region) || !emmet#util#cursorInRegion(img_region)
+    return
+  endif
+  let content = emmet#util#getContent(img_region)
+  if content !~# '^<img[^><]\+>$'
+    return
+  endif
+  let current = emmet#lang#html#parseTag(content)
+  if empty(current) || !has_key(current.attr, 'src')
+    return
+  endif
+  let fn = current.attr.src
+  if fn =~# '^\s*$'
+    return
+  elseif fn !~# '^\(/\|http\)'
+    let fn = simplify(expand('%:h') . '/' . fn)
+  endif
+
+  let [width, height] = emmet#util#getImageSize(fn)
+  if width == -1 && height == -1
+    return
+  endif
+  let current.attr.width = width
+  let current.attr.height = height
+  let current.attrs_order += ['width', 'height']
+  let html = substitute(emmet#toString(current, 'html', 1), '\n', '', '')
+  let html = substitute(html, '\${cursor}', '', '')
+  call emmet#util#setContent(img_region, html)
+endfunction
+
+function! emmet#lang#html#encodeImage() abort
+  let img_region = emmet#util#searchRegion('<img\s', '>')
+  if !emmet#util#regionIsValid(img_region) || !emmet#util#cursorInRegion(img_region)
+    return
+  endif
+  let content = emmet#util#getContent(img_region)
+  if content !~# '^<img[^><]\+>$'
+    return
+  endif
+  let current = emmet#lang#html#parseTag(content)
+  if empty(current) || !has_key(current.attr, 'src')
+    return
+  endif
+  let fn = current.attr.src
+  if fn !~# '^\(/\|http\)'
+    let fn = simplify(expand('%:h') . '/' . fn)
+  endif
+
+  let [width, height] = emmet#util#getImageSize(fn)
+  if width == -1 && height == -1
+    return
+  endif
+  let current.attr.width = width
+  let current.attr.height = height
+  let html = emmet#toString(current, 'html', 1)
+  call emmet#util#setContent(img_region, html)
+endfunction
+
+function! emmet#lang#html#parseTag(tag) abort
+  let current = emmet#newNode()
+  let mx = '<\([a-zA-Z][a-zA-Z0-9]*\)\(\%(\s[a-zA-Z][a-zA-Z0-9]\+=\%([^"'' \t]\+\|"[^"]\{-}"\|''[^'']\{-}''\)\s*\)*\)\(/\{0,1}\)>'
+  let match = matchstr(a:tag, mx)
+  let current.name = substitute(match, mx, '\1', 'i')
+  let attrs = substitute(match, mx, '\2', 'i')
+  let mx = '\([a-zA-Z0-9]\+\)=\%(\([^"'' \t]\+\)\|"\([^"]\{-}\)"\|''\([^'']\{-}\)''\)'
+  while len(attrs) > 0
+    let match = matchstr(attrs, mx)
+    if len(match) == 0
+      break
+    endif
+    let attr_match = matchlist(match, mx)
+    let name = attr_match[1]
+    let value = len(attr_match[2]) ? attr_match[2] : attr_match[3]
+    let current.attr[name] = value
+    let current.attrs_order += [name]
+    let attrs = attrs[stridx(attrs, match) + len(match):]
+  endwhile
+  return current
+endfunction
+
+function! emmet#lang#html#toggleComment() abort
+  let orgpos = getpos('.')
+  let curpos = getpos('.')
+  let mx = '<\%#[^>]*>'
+  while 1
+    let block = emmet#util#searchRegion('<!--', '-->')
+    if emmet#util#regionIsValid(block)
+      let block[1][1] += 2
+      let content = emmet#util#getContent(block)
+      let content = substitute(content, '^<!--\s\(.*\)\s-->$', '\1', '')
+      call emmet#util#setContent(block, content)
+      silent! call setpos('.', orgpos)
+      return
+    endif
+    let block = emmet#util#searchRegion('<[^>]', '>')
+    if !emmet#util#regionIsValid(block)
+      let pos1 = searchpos('<', 'bcW')
+      if pos1[0] == 0 && pos1[1] == 0
+        return
+      endif
+      let curpos = getpos('.')
+      continue
+    endif
+    let pos1 = block[0]
+    let pos2 = block[1]
+    let content = emmet#util#getContent(block)
+    let tag_name = matchstr(content, '^<\zs/\{0,1}[^ \r\n>]\+')
+    if tag_name[0] ==# '/'
+      call setpos('.', [0, pos1[0], pos1[1], 0])
+      let pos2 = searchpairpos('<'. tag_name[1:] . '\>[^>]*>', '', '</' . tag_name[1:] . '>', 'bnW')
+      let pos1 = searchpos('>', 'cneW')
+      let block = [pos2, pos1]
+    elseif tag_name =~# '/$'
+      if !emmet#util#pointInRegion(orgpos[1:2], block)
+        " it's broken tree
+        call setpos('.', orgpos)
+        let block = emmet#util#searchRegion('>', '<')
+        let content = '><!-- ' . emmet#util#getContent(block)[1:-2] . ' --><'
+        call emmet#util#setContent(block, content)
+        silent! call setpos('.', orgpos)
+        return
+      endif
+    else
+      call setpos('.', [0, pos2[0], pos2[1], 0])
+      let pos3 = searchpairpos('<'. tag_name . '\>[^>]*>', '', '</' . tag_name . '>', 'nW')
+      if pos3 == [0, 0]
+        let block = [pos1, pos2]
+      else
+        call setpos('.', [0, pos3[0], pos3[1], 0])
+        let pos2 = searchpos('>', 'neW')
+        let block = [pos1, pos2]
+      endif
+    endif
+    if !emmet#util#regionIsValid(block)
+      silent! call setpos('.', orgpos)
+      return
+    endif
+    if emmet#util#pointInRegion(curpos[1:2], block)
+      let content = '<!-- ' . emmet#util#getContent(block) . ' -->'
+      call emmet#util#setContent(block, content)
+      silent! call setpos('.', orgpos)
+      return
+    endif
+  endwhile
+endfunction
+
+function! emmet#lang#html#balanceTag(flag) range abort
+  let vblock = emmet#util#getVisualBlock()
+  if a:flag == -2 || a:flag == 2
+    let curpos = [0, line("'<"), col("'<"), 0]
+  else
+    let curpos = emmet#util#getcurpos()
+  endif
+  let settings = emmet#getSettings()
+
+  if a:flag > 0
+    let mx = '<\([a-zA-Z][a-zA-Z0-9:_\-]*\)[^>]*'
+    let last = curpos[1:2]
+    while 1
+      let pos1 = searchpos(mx, 'bW')
+      let content = matchstr(getline(pos1[0])[pos1[1]-1:], mx)
+      let tag_name = matchstr(content, '^<\zs[a-zA-Z0-9:_\-]*\ze')
+      if stridx(','.settings.html.empty_elements.',', ','.tag_name.',') != -1
+        let pos2 = searchpos('>', 'nW')
+      else
+        let pos2 = searchpairpos('<' . tag_name . '[^>]*>', '', '</'. tag_name . '\zs>', 'nW')
+      endif
+      let block = [pos1, pos2]
+      if pos1[0] == 0 && pos1[1] == 0
+        break
+      endif
+      if emmet#util#pointInRegion(last, block) && emmet#util#regionIsValid(block)
+        call emmet#util#selectRegion(block)
+        return
+      endif
+      if pos1 == last
+        break
+      endif
+      let last = pos1
+    endwhile
+  else
+    let mx = '<\([a-zA-Z][a-zA-Z0-9:_\-]*\)[^>]*>'
+    while 1
+      let pos1 = searchpos(mx, 'W')
+      if pos1 == curpos[1:2]
+        let pos1 = searchpos(mx . '\zs', 'W')
+        let pos2 = searchpos('.\ze<', 'W')
+        let block = [pos1, pos2]
+        if emmet#util#regionIsValid(block)
+          call emmet#util#selectRegion(block)
+          return
+        endif
+      endif
+      let content = matchstr(getline(pos1[0])[pos1[1]-1:], mx)
+      let tag_name = matchstr(content, '^<\zs[a-zA-Z0-9:_\-]*\ze')
+      if stridx(','.settings.html.empty_elements.',', ','.tag_name.',') != -1
+        let pos2 = searchpos('>', 'nW')
+      else
+        let pos2 = searchpairpos('<' . tag_name . '[^>]*>', '', '</'. tag_name . '\zs>', 'nW')
+      endif
+      let block = [pos1, pos2]
+      if pos1[0] == 0 && pos1[1] == 0
+        break
+      endif
+      if emmet#util#regionIsValid(block)
+        call emmet#util#selectRegion(block)
+        return
+      endif
+    endwhile
+  endif
+  if a:flag == -2 || a:flag == 2
+    silent! exe 'normal! gv'
+  else
+    call setpos('.', curpos)
+  endif
+endfunction
+
+function! emmet#lang#html#moveNextPrevItem(flag) abort
+  silent! exe "normal \<esc>"
+  let mx = '\%([0-9a-zA-Z-:]\+\%(="[^"]*"\|=''[^'']*''\|[^ ''">\]]*\)\{0,1}\)'
+  let pos = searchpos('\s'.mx.'\zs', '')
+  if pos != [0,0]
+    call feedkeys('v?\s\zs'.mx."\<cr>", '')
+  endif
+endfunction
+
+function! emmet#lang#html#moveNextPrev(flag) abort
+  let pos = search('\%(</\w\+\)\@<!\zs><\/\|\(""\)\|^\(\s*\)$', a:flag ? 'Wpb' : 'Wp')
+  if pos == 3
+    startinsert!
+  elseif pos != 0
+    silent! normal! l
+    startinsert
+  endif
+endfunction
+
+function! emmet#lang#html#splitJoinTag() abort
+  let curpos = emmet#util#getcurpos()
+  while 1
+    let mx = '<\(/\{0,1}[a-zA-Z][a-zA-Z0-9:_\-]*\)[^>]*>'
+    let pos1 = searchpos(mx, 'bcnW')
+    let content = matchstr(getline(pos1[0])[pos1[1]-1:], mx)
+    let tag_name = substitute(content, '^<\(/\{0,1}[a-zA-Z][a-zA-Z0-9:_\-]*\).*$', '\1', '')
+    let block = [pos1, [pos1[0], pos1[1] + len(content) - 1]]
+    if content[-2:] ==# '/>' && emmet#util#cursorInRegion(block)
+      let content = substitute(content[:-3], '\s*$', '', '')  . '></' . tag_name . '>'
+      call emmet#util#setContent(block, content)
+      call setpos('.', [0, block[0][0], block[0][1], 0])
+      return
+    else
+      if tag_name[0] ==# '/'
+        let pos1 = searchpos('<' . tag_name[1:] . '[^a-zA-Z0-9]', 'bcnW')
+        call setpos('.', [0, pos1[0], pos1[1], 0])
+        let pos2 = searchpos('</' . tag_name[1:] . '>', 'cneW')
+      else
+        let pos2 = searchpos('</' . tag_name . '>', 'cneW')
+      endif
+      let block = [pos1, pos2]
+      let content = emmet#util#getContent(block)
+      if emmet#util#pointInRegion(curpos[1:2], block) && content[1:] !~# '<' . tag_name . '[^a-zA-Z0-9]*[^>]*>'
+        let content = matchstr(content, mx)[:-2] . ' />'
+        call emmet#util#setContent(block, content)
+        call setpos('.', [0, block[0][0], block[0][1], 0])
+        return
+      else
+        if block[0][0] > 0
+          call setpos('.', [0, block[0][0]-1, block[0][1], 0])
+        else
+          call setpos('.', curpos)
+          return
+        endif
+      endif
+    endif
+  endwhile
+endfunction
+
+function! emmet#lang#html#removeTag() abort
+  let curpos = emmet#util#getcurpos()
+  while 1
+    let mx = '<\(/\{0,1}[a-zA-Z][a-zA-Z0-9:_\-]*\)[^>]*'
+    let pos1 = searchpos(mx, 'bcnW')
+    let content = matchstr(getline(pos1[0])[pos1[1]-1:], mx)
+    let tag_name = matchstr(content, '^<\zs/\{0,1}[a-zA-Z0-9:_\-]*')
+    let block = [pos1, [pos1[0], pos1[1] + len(content) - 1]]
+    if content[-2:] ==# '/>' && emmet#util#cursorInRegion(block)
+      call emmet#util#setContent(block, '')
+      call setpos('.', [0, block[0][0], block[0][1], 0])
+      return
+    else
+      if tag_name[0] ==# '/'
+        let pos1 = searchpos('<' . tag_name[1:] . '[^a-zA-Z0-9]', 'bcnW')
+        call setpos('.', [0, pos1[0], pos1[1], 0])
+        let pos2 = searchpos('</' . tag_name[1:] . '>', 'cneW')
+      else
+        let pos2 = searchpos('</' . tag_name . '>', 'cneW')
+      endif
+      let block = [pos1, pos2]
+      let content = emmet#util#getContent(block)
+      if emmet#util#pointInRegion(curpos[1:2], block) && content[1:] !~# '^<' . tag_name . '[^a-zA-Z0-9]'
+        call emmet#util#setContent(block, '')
+        call setpos('.', [0, block[0][0], block[0][1], 0])
+        return
+      else
+        if block[0][0] > 0
+          call setpos('.', [0, block[0][0]-1, block[0][1], 0])
+        else
+          call setpos('.', curpos)
+          return
+        endif
+      endif
+    endif
+  endwhile
+endfunction
diff --git a/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/jade.vim b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/jade.vim
new file mode 100644
index 0000000..06454a0
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/jade.vim
@@ -0,0 +1,331 @@
+function! emmet#lang#jade#findTokens(str) abort
+  return emmet#lang#html#findTokens(a:str)
+endfunction
+
+function! emmet#lang#jade#parseIntoTree(abbr, type) abort
+  return emmet#lang#html#parseIntoTree(a:abbr, a:type)
+endfunction
+
+function! emmet#lang#jade#toString(settings, current, type, inline, filters, itemno, indent) abort
+  let settings = a:settings
+  let current = a:current
+  let type = a:type
+  let inline = a:inline
+  let filters = a:filters
+  let itemno = a:itemno
+  let indent = emmet#getIndentation(type)
+  let dollar_expr = emmet#getResource(type, 'dollar_expr', 1)
+  let attribute_style = emmet#getResource('jade', 'attribute_style', 'hash')
+  let str = ''
+
+  let current_name = current.name
+  if dollar_expr
+    let current_name = substitute(current.name, '\$$', itemno+1, '')
+  endif
+  if len(current.name) > 0
+    let str .= '' . current_name
+    let tmp = ''
+    for attr in emmet#util#unique(current.attrs_order + keys(current.attr))
+      if !has_key(current.attr, attr)
+        continue
+      endif
+      let Val = current.attr[attr]
+      if type(Val) == 2 && Val == function('emmet#types#true')
+        if attribute_style ==# 'hash'
+          let tmp .= ' ' . attr . ' = true'
+        elseif attribute_style ==# 'html'
+          let tmp .= attr . '=true'
+        end
+      else
+        if dollar_expr
+          while Val =~# '\$\([^#{]\|$\)'
+            let Val = substitute(Val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+          endwhile
+          let attr = substitute(attr, '\$$', itemno+1, '')
+        endif
+        let valtmp = substitute(Val, '\${cursor}', '', '')
+        if attr ==# 'id' && len(valtmp) > 0
+          let str .= '#' . Val
+        elseif attr ==# 'class' && len(valtmp) > 0
+          let str .= '.' . substitute(Val, ' ', '.', 'g')
+        else
+          if len(tmp) > 0
+            if attribute_style ==# 'hash'
+              let tmp .= ', '
+            elseif attribute_style ==# 'html'
+              let tmp .= ' '
+            endif
+          endif
+          if attribute_style ==# 'hash'
+            let tmp .= '' . attr . '="' . Val . '"'
+          elseif attribute_style ==# 'html'
+            let tmp .= attr . '="' . Val . '"'
+          end
+        endif
+      endif
+    endfor
+    if len(tmp)
+      if attribute_style ==# 'hash'
+        let str .= '(' . tmp . ')'
+      elseif attribute_style ==# 'html'
+        let str .= '(' . tmp . ')'
+      end
+    endif
+
+    let inner = ''
+    if len(current.value) > 0
+      let text = current.value[1:-2]
+      if dollar_expr
+        let text = substitute(text, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+        let text = substitute(text, '\${nr}', "\n", 'g')
+        let text = substitute(text, '\\\$', '$', 'g')
+        let str = substitute(str, '\$#', text, 'g')
+      endif
+      let lines = split(text, "\n")
+      if len(lines) == 1
+        let str .= ' ' . text
+      else
+        for line in lines
+          let str .= "\n" . indent . line . ' |'
+        endfor
+      endif
+    elseif len(current.child) == 0
+      let str .= '${cursor}'
+    endif
+    if len(current.child) == 1 && len(current.child[0].name) == 0
+      let text = current.child[0].value[1:-2]
+      if dollar_expr
+        let text = substitute(text, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+        let text = substitute(text, '\${nr}', "\n", 'g')
+        let text = substitute(text, '\\\$', '$', 'g')
+      endif
+      let lines = split(text, "\n")
+      if len(lines) == 1
+        let str .= ' ' . text
+      else
+        for line in lines
+          let str .= "\n" . indent . line . ' |'
+        endfor
+      endif
+    elseif len(current.child) > 0
+      for child in current.child
+        let inner .= emmet#toString(child, type, inline, filters, itemno, indent)
+      endfor
+      let inner = substitute(inner, "\n", "\n" . escape(indent, '\'), 'g')
+      let inner = substitute(inner, "\n" . escape(indent, '\') . '$', '', 'g')
+      let str .= "\n" . indent . inner
+    endif
+  else
+    let str = current.value[1:-2]
+    if dollar_expr
+      let str = substitute(str, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+      let str = substitute(str, '\${nr}', "\n", 'g')
+      let str = substitute(str, '\\\$', '$', 'g')
+    endif
+  endif
+  let str .= "\n"
+  return str
+endfunction
+
+function! emmet#lang#jade#imageSize() abort
+  let line = getline('.')
+  let current = emmet#lang#jade#parseTag(line)
+  if empty(current) || !has_key(current.attr, 'src')
+    return
+  endif
+  let fn = current.attr.src
+  if fn =~# '^\s*$'
+    return
+  elseif fn !~# '^\(/\|http\)'
+    let fn = simplify(expand('%:h') . '/' . fn)
+  endif
+
+  let [width, height] = emmet#util#getImageSize(fn)
+  if width == -1 && height == -1
+    return
+  endif
+  let current.attr.width = width
+  let current.attr.height = height
+  let current.attrs_order += ['width', 'height']
+  let jade = emmet#toString(current, 'jade', 1)
+  let jade = substitute(jade, '\${cursor}', '', '')
+  call setline('.', substitute(matchstr(line, '^\s*') . jade, "\n", '', 'g'))
+endfunction
+
+function! emmet#lang#jade#encodeImage() abort
+endfunction
+
+function! emmet#lang#jade#parseTag(tag) abort
+  let current = emmet#newNode()
+  let mx = '%\([a-zA-Z][a-zA-Z0-9]*\)\s*\%({\(.*\)}\)'
+  let match = matchstr(a:tag, mx)
+  let current.name = substitute(match, mx, '\1', '')
+  let attrs = substitute(match, mx, '\2', '')
+  let mx = '\([a-zA-Z0-9]\+\)\s*=>\s*\%(\([^"'' \t]\+\)\|"\([^"]\{-}\)"\|''\([^'']\{-}\)''\)'
+  while len(attrs) > 0
+    let match = matchstr(attrs, mx)
+    if len(match) ==# 0
+      break
+    endif
+    let attr_match = matchlist(match, mx)
+    let name = attr_match[1]
+    let value = len(attr_match[2]) ? attr_match[2] : attr_match[3]
+    let current.attr[name] = value
+    let current.attrs_order += [name]
+    let attrs = attrs[stridx(attrs, match) + len(match):]
+  endwhile
+  return current
+endfunction
+
+function! emmet#lang#jade#toggleComment() abort
+  let line = getline('.')
+  let space = matchstr(line, '^\s*')
+  if line =~# '^\s*-#'
+    call setline('.', space . matchstr(line[len(space)+2:], '^\s*\zs.*'))
+  elseif line =~# '^\s*%[a-z]'
+    call setline('.', space . '-# ' . line[len(space):])
+  endif
+endfunction
+
+function! emmet#lang#jade#balanceTag(flag) range abort
+  let block = emmet#util#getVisualBlock()
+  if a:flag == -2 || a:flag == 2
+    let curpos = [0, line("'<"), col("'<"), 0]
+  else
+    let curpos = emmet#util#getcurpos()
+  endif
+  let n = curpos[1]
+  let ml = len(matchstr(getline(n), '^\s*'))
+
+  if a:flag > 0
+    if a:flag == 1 || !emmet#util#regionIsValid(block)
+      let n = line('.')
+    else
+      while n > 0
+        let l = len(matchstr(getline(n), '^\s*\ze%[a-z]'))
+        if l > 0 && l < ml
+          let ml = l
+          break
+        endif
+        let n -= 1
+      endwhile
+    endif
+    let sn = n
+    if n == 0
+      let ml = 0
+    endif
+    while n < line('$')
+      let l = len(matchstr(getline(n), '^\s*%[a-z]'))
+      if l > 0 && l <= ml
+        let n -= 1
+        break
+      endif
+      let n += 1
+    endwhile
+    call setpos('.', [0, n, 1, 0])
+    normal! V
+    call setpos('.', [0, sn, 1, 0])
+  else
+    while n > 0
+      let l = len(matchstr(getline(n), '^\s*\ze[a-z]'))
+      if l > 0 && l > ml
+        let ml = l
+        break
+      endif
+      let n += 1
+    endwhile
+    let sn = n
+    if n == 0
+      let ml = 0
+    endif
+    while n < line('$')
+      let l = len(matchstr(getline(n), '^\s*%[a-z]'))
+      if l > 0 && l <= ml
+        let n -= 1
+        break
+      endif
+      let n += 1
+    endwhile
+    call setpos('.', [0, n, 1, 0])
+    normal! V
+    call setpos('.', [0, sn, 1, 0])
+  endif
+endfunction
+
+function! emmet#lang#jade#moveNextPrevItem(flag) abort
+  return emmet#lang#jade#moveNextPrev(a:flag)
+endfunction
+
+function! emmet#lang#jade#moveNextPrev(flag) abort
+  let pos = search('""', a:flag ? 'Wb' : 'W')
+  if pos != 0
+    silent! normal! l
+    startinsert
+  endif
+endfunction
+
+function! emmet#lang#jade#splitJoinTag() abort
+  let n = line('.')
+  let sml = len(matchstr(getline(n), '^\s*%[a-z]'))
+  while n > 0
+    if getline(n) =~# '^\s*\ze%[a-z]'
+      if len(matchstr(getline(n), '^\s*%[a-z]')) < sml
+        break
+      endif
+      let line = getline(n)
+      call setline(n, substitute(line, '^\s*%\w\+\%(\s*{[^}]*}\|\s\)\zs.*', '', ''))
+      let sn = n
+      let n += 1
+      let ml = len(matchstr(getline(n), '^\s*%[a-z]'))
+      if len(matchstr(getline(n), '^\s*')) > ml
+        while n <= line('$')
+          let l = len(matchstr(getline(n), '^\s*'))
+          if l <= ml
+            break
+          endif
+          exe n 'delete'
+        endwhile
+        call setpos('.', [0, sn, 1, 0])
+      else
+        let tag = matchstr(getline(sn), '^\s*%\zs\(\w\+\)')
+        let spaces = matchstr(getline(sn), '^\s*')
+        let settings = emmet#getSettings()
+        if stridx(','.settings.html.inline_elements.',', ','.tag.',') == -1
+          call append(sn, spaces . '   ')
+          call setpos('.', [0, sn+1, 1, 0])
+        else
+          call setpos('.', [0, sn, 1, 0])
+        endif
+        startinsert!
+      endif
+      break
+    endif
+    let n -= 1
+  endwhile
+endfunction
+
+function! emmet#lang#jade#removeTag() abort
+  let n = line('.')
+  let ml = 0
+  while n > 0
+    if getline(n) =~# '^\s*\ze[a-z]'
+      let ml = len(matchstr(getline(n), '^\s*%[a-z]'))
+      break
+    endif
+    let n -= 1
+  endwhile
+  let sn = n
+  while n < line('$')
+    let l = len(matchstr(getline(n), '^\s*%[a-z]'))
+    if l > 0 && l <= ml
+      let n -= 1
+      break
+    endif
+    let n += 1
+  endwhile
+  if sn == n
+    exe 'delete'
+  else
+    exe sn ',' (n-1) 'delete'
+  endif
+endfunction
diff --git a/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/less.vim b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/less.vim
new file mode 100644
index 0000000..25308a0
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/less.vim
@@ -0,0 +1,47 @@
+function! emmet#lang#less#findTokens(str) abort
+  return emmet#lang#html#findTokens(a:str)
+endfunction
+
+function! emmet#lang#less#parseIntoTree(abbr, type) abort
+  return emmet#lang#scss#parseIntoTree(a:abbr, a:type)
+endfunction
+
+function! emmet#lang#less#toString(settings, current, type, inline, filters, itemno, indent) abort
+  return emmet#lang#scss#toString(a:settings, a:current, a:type, a:inline, a:filters, a:itemno, a:indent)
+endfunction
+
+function! emmet#lang#less#imageSize() abort
+  call emmet#lang#css#imageSize()
+endfunction
+
+function! emmet#lang#less#encodeImage() abort
+  return emmet#lang#css#encodeImage()
+endfunction
+
+function! emmet#lang#less#parseTag(tag) abort
+  return emmet#lang#css#parseTag(a:tag)
+endfunction
+
+function! emmet#lang#less#toggleComment() abort
+  call emmet#lang#css#toggleComment()
+endfunction
+
+function! emmet#lang#less#balanceTag(flag) range abort
+  call emmet#lang#scss#balanceTag(a:flag)
+endfunction
+
+function! emmet#lang#less#moveNextPrevItem(flag) abort
+  return emmet#lang#less#moveNextPrev(a:flag)
+endfunction
+
+function! emmet#lang#less#moveNextPrev(flag) abort
+  call emmet#lang#scss#moveNextPrev(a:flag)
+endfunction
+
+function! emmet#lang#less#splitJoinTag() abort
+  call emmet#lang#css#splitJoinTag()
+endfunction
+
+function! emmet#lang#less#removeTag() abort
+  call emmet#lang#css#removeTag()
+endfunction
diff --git a/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/sass.vim b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/sass.vim
new file mode 100644
index 0000000..07677cf
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/sass.vim
@@ -0,0 +1,160 @@
+function! emmet#lang#sass#findTokens(str) abort
+  return emmet#lang#css#findTokens(a:str)
+endfunction
+
+function! emmet#lang#sass#parseIntoTree(abbr, type) abort
+    return emmet#lang#css#parseIntoTree(a:abbr, a:type)
+endfunction
+
+function! emmet#lang#sass#toString(settings, current, type, inline, filters, itemno, indent) abort
+  let settings = a:settings
+  let current = a:current
+  let type = a:type
+  let inline = a:inline
+  let filters = a:filters
+  let itemno = a:itemno
+  let indent = a:indent
+  let str = ''
+
+  let current_name = current.name
+  let current_name = substitute(current.name, '\$$', itemno+1, '')
+  if len(current.name) > 0
+    let str .= current_name
+    let tmp = ''
+    for attr in keys(current.attr)
+      let val = current.attr[attr]
+      while val =~# '\$\([^#{]\|$\)'
+        let val = substitute(val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+      endwhile
+      let attr = substitute(attr, '\$$', itemno+1, '')
+      if attr ==# 'id'
+        let str .= '#' . val
+      elseif attr ==# 'class'
+        let str .= '.' . val
+      else
+        let tmp .= attr . ': ' . val
+      endif
+    endfor
+    if len(tmp) > 0
+      let str .= "\n"
+      for line in split(tmp, "\n")
+        let str .= indent . line . "\n"
+      endfor
+    else
+      let str .= "\n"
+    endif
+
+    let inner = ''
+    for child in current.child
+      let tmp = emmet#toString(child, type, inline, filters, itemno, indent)
+      let tmp = substitute(tmp, "\n", "\n" . escape(indent, '\'), 'g')
+      let tmp = substitute(tmp, "\n" . escape(indent, '\') . '$', '${cursor}\n', 'g')
+      let inner .= tmp
+    endfor
+    if len(inner) > 0
+      let str .= indent . inner
+    endif
+  else
+    let text = emmet#lang#css#toString(settings, current, type, inline, filters, itemno, indent)
+    let text = substitute(text, '\s*;\ze\(\${[^}]\+}\)\?\(\n\|$\)', '', 'g')
+    return text
+  endif
+  return str
+endfunction
+
+function! emmet#lang#sass#imageSize() abort
+endfunction
+
+function! emmet#lang#sass#encodeImage() abort
+endfunction
+
+function! emmet#lang#sass#parseTag(tag) abort
+endfunction
+
+function! emmet#lang#sass#toggleComment() abort
+endfunction
+
+function! emmet#lang#sass#balanceTag(flag) range abort
+  let block = emmet#util#getVisualBlock()
+  if a:flag == -2 || a:flag == 2
+    let curpos = [0, line("'<"), col("'<"), 0]
+  else
+    let curpos = emmet#util#getcurpos()
+  endif
+  let n = curpos[1]
+  let ml = len(matchstr(getline(n), '^\s*'))
+
+  if a:flag > 0
+    if a:flag == 1 || !emmet#util#regionIsValid(block)
+      let n = line('.')
+    else
+      while n > 0
+        let l = len(matchstr(getline(n), '^\s*\ze[a-z]'))
+        if l > 0 && l < ml
+          let ml = l
+          break
+        endif
+        let n -= 1
+      endwhile
+    endif
+    let sn = n
+    if n == 0
+      let ml = 0
+    endif
+    while n < line('$')
+      let l = len(matchstr(getline(n), '^\s*[a-z]'))
+      if l > 0 && l <= ml
+        let n -= 1
+        break
+      endif
+      let n += 1
+    endwhile
+    call setpos('.', [0, n, 1, 0])
+    normal! V
+    call setpos('.', [0, sn, 1, 0])
+  else
+    while n > 0
+      let l = len(matchstr(getline(n), '^\s*\ze[a-z]'))
+      if l > 0 && l > ml
+        let ml = l
+        break
+      endif
+      let n += 1
+    endwhile
+    let sn = n
+    if n == 0
+      let ml = 0
+    endif
+    while n < line('$')
+      let l = len(matchstr(getline(n), '^\s*[a-z]'))
+      if l > 0 && l <= ml
+        let n -= 1
+        break
+      endif
+      let n += 1
+    endwhile
+    call setpos('.', [0, n, 1, 0])
+    normal! V
+    call setpos('.', [0, sn, 1, 0])
+  endif
+endfunction
+
+function! emmet#lang#sass#moveNextPrevItem(flag) abort
+  return emmet#lang#sass#moveNextPrev(a:flag)
+endfunction
+
+function! emmet#lang#sass#moveNextPrev(flag) abort
+  let pos = search('""\|\(^\s*|\s*\zs\)', a:flag ? 'Wpb' : 'Wp')
+  if pos == 2
+    startinsert!
+  elseif pos != 0
+    silent! normal! l
+    startinsert
+  endif
+endfunction
+
+function! emmet#lang#sass#splitJoinTag() abort
+endfunction
+
+function! emmet#lang#sass#removeTag() abort
+endfunction
diff --git a/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/scss.vim b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/scss.vim
new file mode 100644
index 0000000..12a8aeb
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/scss.vim
@@ -0,0 +1,125 @@
+function! emmet#lang#scss#findTokens(str) abort
+  return emmet#lang#css#findTokens(a:str)
+endfunction
+
+function! emmet#lang#scss#parseIntoTree(abbr, type) abort
+  if a:abbr =~# '>'
+    return emmet#lang#html#parseIntoTree(a:abbr, a:type)
+  else
+    return emmet#lang#css#parseIntoTree(a:abbr, a:type)
+  endif
+endfunction
+
+function! emmet#lang#scss#toString(settings, current, type, inline, filters, itemno, indent) abort
+  let settings = a:settings
+  let current = a:current
+  let type = a:type
+  let inline = a:inline
+  let filters = a:filters
+  let itemno = a:itemno
+  let indent = a:indent
+  let str = ''
+
+  let current_name = substitute(current.name, '\$$', itemno+1, '')
+  if len(current.name) > 0
+    let str .= current_name
+    let tmp = ''
+    for attr in keys(current.attr)
+      let val = current.attr[attr]
+      while val =~# '\$\([^#{]\|$\)'
+        let val = substitute(val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+      endwhile
+      let attr = substitute(attr, '\$$', itemno+1, '')
+      if attr ==# 'id'
+        let str .= '#' . val
+      elseif attr ==# 'class'
+        let str .= '.' . val
+      else
+        let tmp .= attr . ': ' . val . ';'
+      endif
+    endfor
+    if len(tmp) > 0
+      let str .= " {\n"
+      for line in split(tmp, "\n")
+        let str .= indent . line . "\n"
+      endfor
+    else
+      let str .= " {\n"
+    endif
+
+    let inner = ''
+    for child in current.child
+      let inner .= emmet#toString(child, type, inline, filters, itemno)
+    endfor
+    let inner = substitute(inner, "\n", "\n" . escape(indent, '\'), 'g')
+    let inner = substitute(inner, "\n" . escape(indent, '\') . '$', '', 'g')
+    let str .= indent . inner . "${cursor}\n}\n"
+  else
+    return emmet#lang#css#toString(settings, current, type, inline, filters, itemno, indent)
+  endif
+  return str
+endfunction
+
+function! emmet#lang#scss#imageSize() abort
+  call emmet#lang#css#imageSize()
+endfunction
+
+function! emmet#lang#scss#encodeImage() abort
+  return emmet#lang#css#encodeImage()
+endfunction
+
+function! emmet#lang#scss#parseTag(tag) abort
+  return emmet#lang#css#parseTag(a:tag)
+endfunction
+
+function! emmet#lang#scss#toggleComment() abort
+  call emmet#lang#css#toggleComment()
+endfunction
+
+function! emmet#lang#scss#balanceTag(flag) range abort
+  if a:flag == -2 || a:flag == 2
+    let curpos = [0, line("'<"), col("'<"), 0]
+    call setpos('.', curpos)
+  else
+    let curpos = emmet#util#getcurpos()
+  endif
+  if a:flag < 0
+    let ret = searchpair('}', '', '.\zs{')
+  else
+    let ret = searchpair('{', '', '}', 'bW')
+  endif
+  if ret > 0
+    let pos1 = emmet#util#getcurpos()[1:2]
+    if a:flag < 0
+      let pos2 = searchpairpos('{', '', '}')
+    else
+      let pos2 = searchpairpos('{', '', '}')
+    endif
+    let block = [pos1, pos2]
+    if emmet#util#regionIsValid(block)
+      call emmet#util#selectRegion(block)
+      return
+    endif
+  endif
+  if a:flag == -2 || a:flag == 2
+    silent! exe 'normal! gv'
+  else
+    call setpos('.', curpos)
+  endif
+endfunction
+
+function! emmet#lang#scss#moveNextPrevItem(flag) abort
+  return emmet#lang#scss#moveNextPrev(a:flag)
+endfunction
+
+function! emmet#lang#scss#moveNextPrev(flag) abort
+  call emmet#lang#css#moveNextPrev(a:flag)
+endfunction
+
+function! emmet#lang#scss#splitJoinTag() abort
+  call emmet#lang#css#splitJoinTag()
+endfunction
+
+function! emmet#lang#scss#removeTag() abort
+  call emmet#lang#css#removeTag()
+endfunction
diff --git a/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/slim.vim b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/slim.vim
new file mode 100644
index 0000000..d57bf1f
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/autoload/emmet/lang/slim.vim
@@ -0,0 +1,281 @@
+function! emmet#lang#slim#findTokens(str) abort
+  return emmet#lang#html#findTokens(a:str)
+endfunction
+
+function! emmet#lang#slim#parseIntoTree(abbr, type) abort
+  return emmet#lang#html#parseIntoTree(a:abbr, a:type)
+endfunction
+
+function! emmet#lang#slim#toString(settings, current, type, inline, filters, itemno, indent) abort
+  let current = a:current
+  let type = a:type
+  let inline = a:inline
+  let filters = a:filters
+  let itemno = a:itemno
+  let indent = emmet#getIndentation(type)
+  let dollar_expr = emmet#getResource(type, 'dollar_expr', 1)
+  let str = ''
+
+  let current_name = current.name
+  if dollar_expr
+    let current_name = substitute(current.name, '\$$', itemno+1, '')
+  endif
+  if len(current.name) > 0
+    let str .= current_name
+    for attr in emmet#util#unique(current.attrs_order + keys(current.attr))
+      if !has_key(current.attr, attr)
+        continue
+      endif
+      let Val = current.attr[attr]
+      if type(Val) == 2 && Val == function('emmet#types#true')
+        let str .= ' ' . attr . '=true'
+      else
+        if dollar_expr
+          while Val =~# '\$\([^#{]\|$\)'
+            let Val = substitute(Val, '\(\$\+\)\([^{]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+          endwhile
+        endif
+        let attr = substitute(attr, '\$$', itemno+1, '')
+        let str .= ' ' . attr . '="' . Val . '"'
+      endif
+    endfor
+
+    let inner = ''
+    if len(current.value) > 0
+      let str .= "\n"
+      let text = current.value[1:-2]
+      if dollar_expr
+        let text = substitute(text, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+        let text = substitute(text, '\${nr}', "\n", 'g')
+        let text = substitute(text, '\\\$', '$', 'g')
+        let str = substitute(str, '\$#', text, 'g')
+      endif
+      for line in split(text, "\n")
+        let str .= indent . '| ' . line . "\n"
+      endfor
+    elseif len(current.child) == 0
+      let str .= '${cursor}'
+    endif
+    if len(current.child) == 1 && len(current.child[0].name) == 0
+      let str .= "\n"
+      let text = current.child[0].value[1:-2]
+      if dollar_expr
+        let text = substitute(text, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+        let text = substitute(text, '\${nr}', "\n", 'g')
+        let text = substitute(text, '\\\$', '$', 'g')
+      endif
+      for line in split(text, "\n")
+        let str .= indent . '| ' . line . "\n"
+      endfor
+    elseif len(current.child) > 0
+      for child in current.child
+        let inner .= emmet#toString(child, type, inline, filters, itemno, indent)
+      endfor
+      let inner = substitute(inner, "\n", "\n" . escape(indent, '\'), 'g')
+      let inner = substitute(inner, "\n" . escape(indent, '\') . '$', '', 'g')
+      let str .= "\n" . indent . inner
+    endif
+  else
+    let str = current.value[1:-2]
+    if dollar_expr
+      let str = substitute(str, '\%(\\\)\@\<!\(\$\+\)\([^{#]\|$\)', '\=printf("%0".len(submatch(1))."d", itemno+1).submatch(2)', 'g')
+      let str = substitute(str, '\${nr}', "\n", 'g')
+      let str = substitute(str, '\\\$', '$', 'g')
+    endif
+  endif
+  if str !~# "\n$"
+    let str .= "\n"
+  endif
+  return str
+endfunction
+
+function! emmet#lang#slim#imageSize() abort
+  let line = getline('.')
+  let current = emmet#lang#slim#parseTag(line)
+  if empty(current) || !has_key(current.attr, 'src')
+    return
+  endif
+  let fn = current.attr.src
+  if fn =~# '^\s*$'
+    return
+  elseif fn !~# '^\(/\|http\)'
+    let fn = simplify(expand('%:h') . '/' . fn)
+  endif
+
+  let [width, height] = emmet#util#getImageSize(fn)
+  if width == -1 && height == -1
+    return
+  endif
+  let current.attr.width = width
+  let current.attr.height = height
+  let current.attrs_order += ['width', 'height']
+  let slim = emmet#toString(current, 'slim', 1)
+  let slim = substitute(slim, '\${cursor}', '', '')
+  call setline('.', substitute(matchstr(line, '^\s*') . slim, "\n", '', 'g'))
+endfunction
+
+function! emmet#lang#slim#encodeImage() abort
+endfunction
+
+function! emmet#lang#slim#parseTag(tag) abort
+  let current = emmet#newNode()
+  let mx = '\([a-zA-Z][a-zA-Z0-9]*\)\s\+\(.*\)'
+  let match = matchstr(a:tag, mx)
+  let current.name = substitute(match, mx, '\1', '')
+  let attrs = substitute(match, mx, '\2', '')
+  let mx = '\([a-zA-Z0-9]\+\)=\%(\([^"'' \t]\+\)\|"\([^"]\{-}\)"\|''\([^'']\{-}\)''\)'
+  while len(attrs) > 0
+    let match = matchstr(attrs, mx)
+    if len(match) == 0
+      break
+    endif
+    let attr_match = matchlist(match, mx)
+    let name = attr_match[1]
+    let value = len(attr_match[2]) ? attr_match[2] : attr_match[3]
+    let current.attr[name] = value
+    let current.attrs_order += [name]
+    let attrs = attrs[stridx(attrs, match) + len(match):]
+  endwhile
+  return current
+endfunction
+
+function! emmet#lang#slim#toggleComment() abort
+  let line = getline('.')
+  let space = matchstr(line, '^\s*')
+  if line =~# '^\s*/'
+    call setline('.', space . line[len(space)+1:])
+  elseif line =~# '^\s*[a-z]'
+    call setline('.', space . '/' . line[len(space):])
+  endif
+endfunction
+
+function! emmet#lang#slim#balanceTag(flag) range abort
+  let block = emmet#util#getVisualBlock()
+  if a:flag == -2 || a:flag == 2
+    let curpos = [0, line("'<"), col("'<"), 0]
+  else
+    let curpos = emmet#util#getcurpos()
+  endif
+  let n = curpos[1]
+  let ml = len(matchstr(getline(n), '^\s*'))
+
+  if a:flag > 0
+    if a:flag == 1 || !emmet#util#regionIsValid(block)
+      let n = line('.')
+    else
+      while n > 0
+        let l = len(matchstr(getline(n), '^\s*\ze[a-z]'))
+        if l > 0 && l < ml
+          let ml = l
+          break
+        endif
+        let n -= 1
+      endwhile
+    endif
+    let sn = n
+    if n == 0
+      let ml = 0
+    endif
+    while n < line('$')
+      let l = len(matchstr(getline(n), '^\s*[a-z]'))
+      if l > 0 && l <= ml
+        let n -= 1
+        break
+      endif
+      let n += 1
+    endwhile
+    call setpos('.', [0, n, 1, 0])
+    normal! V
+    call setpos('.', [0, sn, 1, 0])
+  else
+    while n > 0
+      let l = len(matchstr(getline(n), '^\s*\ze[a-z]'))
+      if l > 0 && l > ml
+        let ml = l
+        break
+      endif
+      let n += 1
+    endwhile
+    let sn = n
+    if n == 0
+      let ml = 0
+    endif
+    while n < line('$')
+      let l = len(matchstr(getline(n), '^\s*[a-z]'))
+      if l > 0 && l <= ml
+        let n -= 1
+        break
+      endif
+      let n += 1
+    endwhile
+    call setpos('.', [0, n, 1, 0])
+    normal! V
+    call setpos('.', [0, sn, 1, 0])
+  endif
+endfunction
+
+function! emmet#lang#slim#moveNextPrevItem(flag) abort
+  return emmet#lang#slim#moveNextPrev(a:flag)
+endfunction
+
+function! emmet#lang#slim#moveNextPrev(flag) abort
+  let pos = search('""\|\(^\s*|\s*\zs\)', a:flag ? 'Wpb' : 'Wp')
+  if pos == 2
+    startinsert!
+  elseif pos != 0
+    silent! normal! l
+    startinsert
+  endif
+endfunction
+
+function! emmet#lang#slim#splitJoinTag() abort
+  let n = line('.')
+  while n > 0
+    if getline(n) =~# '^\s*\ze[a-z]'
+      let sn = n
+      let n += 1
+      if getline(n) =~# '^\s*|'
+        while n <= line('$')
+          if getline(n) !~# '^\s*|'
+            break
+          endif
+          exe n 'delete'
+        endwhile
+        call setpos('.', [0, sn, 1, 0])
+      else
+        let spaces = matchstr(getline(sn), '^\s*')
+        call append(sn, spaces . '  | ')
+        call setpos('.', [0, sn+1, 1, 0])
+        startinsert!
+      endif
+      break
+    endif
+    let n -= 1
+  endwhile
+endfunction
+
+function! emmet#lang#slim#removeTag() abort
+  let n = line('.')
+  let ml = 0
+  while n > 0
+    if getline(n) =~# '^\s*\ze[a-z]'
+      let ml = len(matchstr(getline(n), '^\s*[a-z]'))
+      break
+    endif
+    let n -= 1
+  endwhile
+  let sn = n
+  while n < line('$')
+    let l = len(matchstr(getline(n), '^\s*[a-z]'))
+    if l > 0 && l <= ml
+      let n -= 1
+      break
+    endif
+    let n += 1
+  endwhile
+  if sn == n
+    exe 'delete'
+  else
+    exe sn ',' (n-1) 'delete'
+  endif
+endfunction
diff --git a/vim-plugins/bundle/emmet-vim/autoload/emmet/lorem/en.vim b/vim-plugins/bundle/emmet-vim/autoload/emmet/lorem/en.vim
new file mode 100644
index 0000000..30713e4
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/autoload/emmet/lorem/en.vim
@@ -0,0 +1,65 @@
+function! emmet#lorem#en#expand(command) abort
+  let wcount = matchstr(a:command, '\(\d*\)$')
+  let wcount = wcount > 0 ? wcount : 30
+  
+  let common = ['lorem', 'ipsum', 'dolor', 'sit', 'amet', 'consectetur', 'adipisicing', 'elit']
+  let words = ['exercitationem', 'perferendis', 'perspiciatis', 'laborum', 'eveniet',
+  \            'sunt', 'iure', 'nam', 'nobis', 'eum', 'cum', 'officiis', 'excepturi',
+  \            'odio', 'consectetur', 'quasi', 'aut', 'quisquam', 'vel', 'eligendi',
+  \            'itaque', 'non', 'odit', 'tempore', 'quaerat', 'dignissimos',
+  \            'facilis', 'neque', 'nihil', 'expedita', 'vitae', 'vero', 'ipsum',
+  \            'nisi', 'animi', 'cumque', 'pariatur', 'velit', 'modi', 'natus',
+  \            'iusto', 'eaque', 'sequi', 'illo', 'sed', 'ex', 'et', 'voluptatibus',
+  \            'tempora', 'veritatis', 'ratione', 'assumenda', 'incidunt', 'nostrum',
+  \            'placeat', 'aliquid', 'fuga', 'provident', 'praesentium', 'rem',
+  \            'necessitatibus', 'suscipit', 'adipisci', 'quidem', 'possimus',
+  \            'voluptas', 'debitis', 'sint', 'accusantium', 'unde', 'sapiente',
+  \            'voluptate', 'qui', 'aspernatur', 'laudantium', 'soluta', 'amet',
+  \            'quo', 'aliquam', 'saepe', 'culpa', 'libero', 'ipsa', 'dicta',
+  \            'reiciendis', 'nesciunt', 'doloribus', 'autem', 'impedit', 'minima',
+  \            'maiores', 'repudiandae', 'ipsam', 'obcaecati', 'ullam', 'enim',
+  \            'totam', 'delectus', 'ducimus', 'quis', 'voluptates', 'dolores',
+  \            'molestiae', 'harum', 'dolorem', 'quia', 'voluptatem', 'molestias',
+  \            'magni', 'distinctio', 'omnis', 'illum', 'dolorum', 'voluptatum', 'ea',
+  \            'quas', 'quam', 'corporis', 'quae', 'blanditiis', 'atque', 'deserunt',
+  \            'laboriosam', 'earum', 'consequuntur', 'hic', 'cupiditate',
+  \            'quibusdam', 'accusamus', 'ut', 'rerum', 'error', 'minus', 'eius',
+  \            'ab', 'ad', 'nemo', 'fugit', 'officia', 'at', 'in', 'id', 'quos',
+  \            'reprehenderit', 'numquam', 'iste', 'fugiat', 'sit', 'inventore',
+  \            'beatae', 'repellendus', 'magnam', 'recusandae', 'quod', 'explicabo',
+  \            'doloremque', 'aperiam', 'consequatur', 'asperiores', 'commodi',
+  \            'optio', 'dolor', 'labore', 'temporibus', 'repellat', 'veniam',
+  \            'architecto', 'est', 'esse', 'mollitia', 'nulla', 'a', 'similique',
+  \            'eos', 'alias', 'dolore', 'tenetur', 'deleniti', 'porro', 'facere',
+  \            'maxime', 'corrupti']
+  let ret = []
+  let sentence = 0
+  for i in range(wcount)
+    let arr = common
+    if sentence > 0
+      let arr += words
+    endif
+    let r = emmet#util#rand()
+    let word = arr[r % len(arr)]
+    if sentence == 0
+      let word = substitute(word, '^.', '\U&', '')
+    endif
+    let sentence += 1
+    call add(ret, word)
+    if (sentence > 5 && emmet#util#rand() < 10000) || i == wcount - 1
+      if i == wcount - 1
+        let endc = '?!...'[emmet#util#rand() % 5]
+        call add(ret, endc)
+      else
+        let endc = '?!,...'[emmet#util#rand() % 6]
+        call add(ret, endc . ' ')
+      endif
+      if endc !=# ','
+        let sentence = 0
+      endif
+    else
+      call add(ret, ' ')
+    endif
+  endfor
+  return join(ret, '')
+endfunction
diff --git a/vim-plugins/bundle/emmet-vim/autoload/emmet/lorem/ja.vim b/vim-plugins/bundle/emmet-vim/autoload/emmet/lorem/ja.vim
new file mode 100644
index 0000000..f99d8fa
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/autoload/emmet/lorem/ja.vim
@@ -0,0 +1,27 @@
+scriptencoding utf-8
+
+function! emmet#lorem#ja#expand(command) abort
+  let wcount = matchstr(a:command, '^\%(lorem\|lipsum\)\(\d*\)}$', '\1', '')
+  let wcount = wcount > 0 ? wcount : 30
+
+  let url = "http://www.aozora.gr.jp/cards/000081/files/470_15407.html"
+  let content = emmet#util#cache(url)
+  if len(content) == 0
+    let content = emmet#util#getContentFromURL(url)
+    let content = matchstr(content, '<div[^>]*>\zs.\{-}</div>')
+    let content = substitute(content, '[　\r]', '', 'g')
+    let content = substitute(content, '<br[^>]*>', "\n", 'g')
+    let content = substitute(content, '<[^>]\+>', '', 'g')
+    let content = join(filter(split(content, "\n"), 'len(v:val)>0'), "\n")
+    call emmet#util#cache(url, content)
+  endif
+  
+  let content = substitute(content, "�\n", "�", "g")
+  let clines = split(content, '\n')
+  let lines = filter(clines, 'len(substitute(v:val,".",".","g"))<=wcount')
+  if len(lines) == 0
+    let lines = clines
+  endif
+  let r = emmet#util#rand()
+  return lines[r % len(lines)]
+endfunction
diff --git a/vim-plugins/bundle/emmet-vim/autoload/emmet/util.vim b/vim-plugins/bundle/emmet-vim/autoload/emmet/util.vim
new file mode 100644
index 0000000..9a5b8d3
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/autoload/emmet/util.vim
@@ -0,0 +1,349 @@
+"==============================================================================
+" region utils
+"==============================================================================
+" deleteContent : delete content in region
+"   if region make from between '<foo>' and '</foo>'
+"   --------------------
+"   begin:<foo>
+"   </foo>:end
+"   --------------------
+"   this function make the content as following
+"   --------------------
+"   begin::end
+"   --------------------
+function! emmet#util#deleteContent(region) abort
+  let lines = getline(a:region[0][0], a:region[1][0])
+  call setpos('.', [0, a:region[0][0], a:region[0][1], 0])
+  silent! exe 'delete '.(a:region[1][0] - a:region[0][0])
+  call setline(line('.'), lines[0][:a:region[0][1]-2] . lines[-1][a:region[1][1]])
+endfunction
+
+" change_content : change content in region
+"   if region make from between '<foo>' and '</foo>'
+"   --------------------
+"   begin:<foo>
+"   </foo>:end
+"   --------------------
+"   and content is
+"   --------------------
+"   foo
+"   bar
+"   baz
+"   --------------------
+"   this function make the content as following
+"   --------------------
+"   begin:foo
+"   bar
+"   baz:end
+"   --------------------
+function! emmet#util#setContent(region, content) abort
+  let newlines = split(a:content, '\n', 1)
+  let oldlines = getline(a:region[0][0], a:region[1][0])
+  call setpos('.', [0, a:region[0][0], a:region[0][1], 0])
+  silent! exe 'delete '.(a:region[1][0] - a:region[0][0])
+  if len(newlines) == 0
+    let tmp = ''
+    if a:region[0][1] > 1
+      let tmp = oldlines[0][:a:region[0][1]-2]
+    endif
+    if a:region[1][1] >= 1
+      let tmp .= oldlines[-1][a:region[1][1]:]
+    endif
+    call setline(line('.'), tmp)
+  elseif len(newlines) == 1
+    if a:region[0][1] > 1
+      let newlines[0] = oldlines[0][:a:region[0][1]-2] . newlines[0]
+    endif
+    if a:region[1][1] >= 1
+      let newlines[0] .= oldlines[-1][a:region[1][1]:]
+    endif
+    call setline(line('.'), newlines[0])
+  else
+    if a:region[0][1] > 1
+      let newlines[0] = oldlines[0][:a:region[0][1]-2] . newlines[0]
+    endif
+    if a:region[1][1] >= 1
+      let newlines[-1] .= oldlines[-1][a:region[1][1]:]
+    endif
+    call setline(line('.'), newlines[0])
+    call append(line('.'), newlines[1:])
+  endif
+endfunction
+
+" select_region : select region
+"   this function make a selection of region
+function! emmet#util#selectRegion(region) abort
+  call setpos('.', [0, a:region[1][0], a:region[1][1], 0])
+  normal! v
+  call setpos('.', [0, a:region[0][0], a:region[0][1], 0])
+endfunction
+
+" point_in_region : check point is in the region
+"   this function return 0 or 1
+function! emmet#util#pointInRegion(point, region) abort
+  if !emmet#util#regionIsValid(a:region) | return 0 | endif
+  if a:region[0][0] > a:point[0] | return 0 | endif
+  if a:region[1][0] < a:point[0] | return 0 | endif
+  if a:region[0][0] == a:point[0] && a:region[0][1] > a:point[1] | return 0 | endif
+  if a:region[1][0] == a:point[0] && a:region[1][1] < a:point[1] | return 0 | endif
+  return 1
+endfunction
+
+" cursor_in_region : check cursor is in the region
+"   this function return 0 or 1
+function! emmet#util#cursorInRegion(region) abort
+  if !emmet#util#regionIsValid(a:region) | return 0 | endif
+  let cur = emmet#util#getcurpos()[1:2]
+  return emmet#util#pointInRegion(cur, a:region)
+endfunction
+
+" region_is_valid : check region is valid
+"   this function return 0 or 1
+function! emmet#util#regionIsValid(region) abort
+  if a:region[0][0] == 0 || a:region[1][0] == 0 | return 0 | endif
+  return 1
+endfunction
+
+" search_region : make region from pattern which is composing start/end
+"   this function return array of position
+function! emmet#util#searchRegion(start, end) abort
+  let b = searchpairpos(a:start, '', a:end, 'bcnW')
+  if b == [0, 0]
+    return [searchpairpos(a:start, '', a:end, 'bnW'), searchpairpos(a:start, '\%#', a:end, 'nW')]
+  else
+    return [b, searchpairpos(a:start, '', a:end. '', 'nW')]
+  endif
+endfunction
+
+" get_content : get content in region
+"   this function return string in region
+function! emmet#util#getContent(region) abort
+  if !emmet#util#regionIsValid(a:region)
+    return ''
+  endif
+  let lines = getline(a:region[0][0], a:region[1][0])
+  if a:region[0][0] == a:region[1][0]
+    let lines[0] = lines[0][a:region[0][1]-1:a:region[1][1]-1]
+  else
+    let lines[0] = lines[0][a:region[0][1]-1:]
+    let lines[-1] = lines[-1][:a:region[1][1]-1]
+  endif
+  return join(lines, "\n")
+endfunction
+
+" region_in_region : check region is in the region
+"   this function return 0 or 1
+function! emmet#util#regionInRegion(outer, inner) abort
+  if !emmet#util#regionIsValid(a:inner) || !emmet#util#regionIsValid(a:outer)
+    return 0
+  endif
+  return emmet#util#pointInRegion(a:inner[0], a:outer) && emmet#util#pointInRegion(a:inner[1], a:outer)
+endfunction
+
+" get_visualblock : get region of visual block
+"   this function return region of visual block
+function! emmet#util#getVisualBlock() abort
+  return [[line("'<"), col("'<")], [line("'>"), col("'>")]]
+endfunction
+
+"==============================================================================
+" html utils
+"==============================================================================
+function! emmet#util#getContentFromURL(url) abort
+  let res = system(printf('%s -i %s', g:emmet_curl_command, shellescape(substitute(a:url, '#.*', '', ''))))
+  while res =~# '^HTTP/1.\d 3' || res =~# '^HTTP/1\.\d 200 Connection established' || res =~# '^HTTP/1\.\d 100 Continue'
+    let pos = stridx(res, "\r\n\r\n")
+    if pos != -1
+      let res = strpart(res, pos+4)
+    else
+      let pos = stridx(res, "\n\n")
+      let res = strpart(res, pos+2)
+    endif
+  endwhile
+  let pos = stridx(res, "\r\n\r\n")
+  if pos != -1
+    let content = strpart(res, pos+4)
+  else
+    let pos = stridx(res, "\n\n")
+    let content = strpart(res, pos+2)
+  endif
+  let header = res[:pos-1]
+  let charset = matchstr(content, '<meta[^>]\+content=["''][^;"'']\+;\s*charset=\zs[^;"'']\+\ze["''][^>]*>')
+  if len(charset) == 0
+    let charset = matchstr(content, '<meta\s\+charset=["'']\?\zs[^"'']\+\ze["'']\?[^>]*>')
+  endif
+  if len(charset) == 0
+    let charset = matchstr(header, '\nContent-Type:.* charset=[''"]\?\zs[^''";\n]\+\ze')
+  endif
+  if len(charset) == 0
+    let s1 = len(split(content, '?'))
+    let utf8 = iconv(content, 'utf-8', &encoding)
+    let s2 = len(split(utf8, '?'))
+    return (s2 == s1 || s2 >= s1 * 2) ? utf8 : content
+  endif
+  return iconv(content, charset, &encoding)
+endfunction
+
+function! emmet#util#getTextFromHTML(buf) abort
+  let threshold_len = 100
+  let threshold_per = 0.1
+  let buf = a:buf
+
+  let buf = strpart(buf, stridx(buf, '</head>'))
+  let buf = substitute(buf, '<style[^>]*>.\{-}</style>', '', 'g')
+  let buf = substitute(buf, '<script[^>]*>.\{-}</script>', '', 'g')
+  let res = ''
+  let max = 0
+  let mx = '\(<td[^>]\{-}>\)\|\(<\/td>\)\|\(<div[^>]\{-}>\)\|\(<\/div>\)'
+  let m = split(buf, mx)
+  for str in m
+    let c = split(str, '<[^>]*?>')
+    let str = substitute(str, '<[^>]\{-}>', ' ', 'g')
+    let str = substitute(str, '&gt;', '>', 'g')
+    let str = substitute(str, '&lt;', '<', 'g')
+    let str = substitute(str, '&quot;', '"', 'g')
+    let str = substitute(str, '&apos;', '''', 'g')
+    let str = substitute(str, '&nbsp;', ' ', 'g')
+    let str = substitute(str, '&yen;', '\&#65509;', 'g')
+    let str = substitute(str, '&amp;', '\&', 'g')
+    let str = substitute(str, '^\s*\(.*\)\s*$', '\1', '')
+    let str = substitute(str, '\s\+', ' ', 'g')
+    let l = len(str)
+    if l > threshold_len
+      let per = (l+0.0) / len(c)
+      if max < l && per > threshold_per
+        let max = l
+        let res = str
+      endif
+    endif
+  endfor
+  let res = substitute(res, '^\s*\(.*\)\s*$', '\1', 'g')
+  return res
+endfunction
+
+function! emmet#util#getImageSize(fn) abort
+  let fn = a:fn
+
+  if emmet#util#isImageMagickInstalled()
+    return emmet#util#imageSizeWithImageMagick(fn)
+  endif
+
+  if filereadable(fn)
+    let hex = substitute(system('xxd -p "'.fn.'"'), '\n', '', 'g')
+  else
+    if fn !~# '^\w\+://'
+      let path = fnamemodify(expand('%'), ':p:gs?\\?/?')
+      if has('win32') || has('win64') | 
+        let path = tolower(path)
+      endif
+      for k in keys(g:emmet_docroot)
+        let root = fnamemodify(k, ':p:gs?\\?/?')
+        if has('win32') || has('win64') | 
+          let root = tolower(root)
+        endif
+        if stridx(path, root) == 0
+          let v = g:emmet_docroot[k]
+          let fn = (len(v) == 0 ? k : v) . fn
+          break
+        endif
+      endfor
+    endif
+    let hex = substitute(system(g:emmet_curl_command.' "'.fn.'" | xxd -p'), '\n', '', 'g')
+  endif
+
+  let [width, height] = [-1, -1]
+  if hex =~# '^89504e470d0a1a0a'
+    let width = eval('0x'.hex[32:39])
+    let height = eval('0x'.hex[40:47])
+  endif
+  if hex =~# '^ffd8'
+    let pos = 4
+    while pos < len(hex)
+      let bs = hex[pos+0:pos+3]
+      let pos += 4
+      if bs ==# 'ffc0' || bs ==# 'ffc2'
+        let pos += 6
+        let height = eval('0x'.hex[pos+0:pos+1])*256 + eval('0x'.hex[pos+2:pos+3])
+        let pos += 4
+        let width = eval('0x'.hex[pos+0:pos+1])*256 + eval('0x'.hex[pos+2:pos+3])
+        break
+      elseif bs =~# 'ffd[9a]'
+        break
+      elseif bs =~# 'ff\(e[0-9a-e]\|fe\|db\|dd\|c4\)'
+        let pos += (eval('0x'.hex[pos+0:pos+1])*256 + eval('0x'.hex[pos+2:pos+3])) * 2
+      endif
+    endwhile
+  endif
+  if hex =~# '^47494638'
+    let width = eval('0x'.hex[14:15].hex[12:13])
+    let height = eval('0x'.hex[18:19].hex[16:17])
+  endif
+
+  return [width, height]
+endfunction
+
+function! emmet#util#imageSizeWithImageMagick(fn) abort
+  let img_info = system('identify -format "%wx%h" "'.a:fn.'"')
+  let img_size = split(substitute(img_info, '\n', '', ''), 'x')
+  if len(img_size) != 2
+    return [-1, -1]
+  endif
+  return img_size
+endfunction
+
+function! emmet#util#isImageMagickInstalled() abort
+  if !get(g:, 'emmet_use_identify', 1)
+    return 0
+  endif
+  return executable('identify')
+endfunction
+
+function! emmet#util#unique(arr) abort
+  let m = {}
+  let r = []
+  for i in a:arr
+    if !has_key(m, i)
+      let m[i] = 1
+      call add(r, i)
+    endif
+  endfor
+  return r
+endfunction
+
+let s:seed = localtime()
+function! emmet#util#srand(seed) abort
+  let s:seed = a:seed
+endfunction
+
+function! emmet#util#rand() abort
+  let s:seed = s:seed * 214013 + 2531011
+  return (s:seed < 0 ? s:seed - 0x80000000 : s:seed) / 0x10000 % 0x8000
+endfunction
+
+function! emmet#util#cache(name, ...) abort
+  let content = get(a:000, 0, '')
+  let dir = expand('~/.emmet/cache')
+  if !isdirectory(dir)
+    call mkdir(dir, 'p', 0700)
+  endif
+  let file = dir . '/' . substitute(a:name, '\W', '_', 'g')
+  if len(content) == 0
+    if !filereadable(file)
+      return ''
+    endif
+	return join(readfile(file), "\n")
+  endif
+  call writefile(split(content, "\n"), file)
+endfunction
+
+function! emmet#util#getcurpos() abort
+  let pos = getpos('.')
+  if mode(0) ==# 'i' && pos[2] > 0
+    let pos[2] -=1
+  endif
+  return pos
+endfunction
+
+function! emmet#util#closePopup() abort
+  return pumvisible() ? "\<c-e>" : ''
+endfunction
diff --git a/vim-plugins/bundle/emmet-vim/doc/emmet.txt b/vim-plugins/bundle/emmet-vim/doc/emmet.txt
new file mode 100644
index 0000000..ffa5e0a
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/doc/emmet.txt
@@ -0,0 +1,1773 @@
+*emmet.txt*        *Emmet* for Vim
+
+           -------------------------------------------------------
+             Emmet: vim plugins for HTML and CSS hi-speed coding
+           -------------------------------------------------------
+
+Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
+WebSite: http://mattn.kaoriya.net/
+Repository: https://github.com/mattn/emmet-vim
+Site: https://mattn.github.com/emmet-vim
+License: BSD style license
+
+==============================================================================
+CONTENTS                                                      *emmet-contents*
+
+Introduction           |emmet-introduction|
+Install                |emmet-install|
+Tutorial               |emmet-tutorial|
+  1. Expand abbreviation            |emmet-expand-abbr|              |<C-y>,|
+  2. Expand word                    |emmet-expand-word|              |<C-y>;|
+  3. Update tag                     |emmet-update-tag|               |<C-y>u|
+  4. Wrap with abbreviation         |emmet-wrap-with-abbreviation|   |v_<C-y>,|
+  5. Balance tag inward             |emmet-balance-tag-inward|       |<C-y>d|
+  6. Balance tag outward            |emmet-balance-tag-outward|      |<C-y>D|
+  7. Go to next edit point          |emmet-goto-next-point|          |<C-y>n|
+  8. Go to previous edit point      |emmet-goto-previous-point|      |<C-y>N|
+  9. Add and update <img> size      |emmet-update-image-size|        |<C-y>i|
+ 10. Merge lines                    |emmet-merge-lines|              |<C-y>m|
+ 11. Remove tag                     |emmet-remove-tag|               |<C-y>k|
+ 12. Split/join tag                 |emmet-split-join-tag|           |<C-y>j|
+ 13. Toggle comment                 |emmet-toggle-comment|           |<C-y>/|
+ 14. Make anchor from URL           |emmet-make-anchor-url|          |<C-y>a|
+ 15. Make quoted text from URL      |emmet-quoted-text-url|          |<C-y>A|
+ 16. Code pretty                    |emmet-code-pretty|              |<C-y>c|
+ 17. Lorem ipsum                    |emmet-lorem-ipsum|
+HTML expression syntax |emmet-html-expression-syntax|
+  1. Elements                       |emmet-html-syntax-elements|
+  2. Nesting operators              |emmet-html-syntax-nesting-operators|
+  2.1. Child                        |emmet->|
+  2.2. Sibling                      |emmet-+|
+  2.3. Climb-up                     |emmet-^|
+  2.4. Multiplication               |emmet-star|
+  2.5. Grouping                     |emmet-()|
+  3. Attribute operators            |emmet-html-syntax-attribute-operators|
+  3.1. ID and CLASS                 |emmet-.| |emmet-#|
+  3.2. Custom attributes            |emmet-[]|
+  3.3. Item numbering               |emmet-$|
+  3.3.1. Changing numbering origin and direction |emmet-@|
+  3.4. Quote character              |emmet-html-attr-quote-char|
+  4. Text                           |emmet-{}|
+  5. Implicit tag names             |emmet-html-implicit-tag-names|
+  6. Notes on abbreviation formatting |emmet-html-syntax-notes|
+  7. Choose position to insert text when wrap abbreviation |emmet-$#|
+CSS expression syntax  |emmet-css-expression-syntax|
+  1. Properties                     |emmet-css-properties|
+  2. Values                         |emmet-css-values|
+  3. Units                          |emmet-css-units|
+  4. Vendor prefixes                |emmet-css-vendor-prefixes|
+Commands               |emmet-commands|
+  :Emmet                            |:Emmet|
+  :EmmetInstall                     |:EmmetInstall|
+Variables              |emmet-variables|
+  g:emmet_html5                     |g:emmet_html5|
+  g:emmet_docroot                   |g:emmet_docroot|
+  g:emmet_curl_command              |g:emmet_curl_command|
+  g:user_emmet_complete_tag         |g:user_emmet_complete_tag|
+  g:user_emmet_leader_key           |g:user_emmet_leader_key|
+  g:user_emmet_install_global       |g:user_emmet_install_global|
+  g:user_emmet_install_command      |g:user_emmet_install_command|
+  g:user_emmet_settings             |g:user_emmet_settings|
+  g:user_emmet_mode                 |g:user_emmet_mode|
+Customize              |emmet-customize|
+  1. Key mappings                   |emmet-customize-key-mappings|
+  2. Indent size                    |emmet-indent-size|
+  3. Define tag's behavior          |emmet-define-tags-behavior|
+  4. Adding custom snippets         |emmet-custom-snippets|
+Filters                |emmet-filters-list|
+  Escapes XML-unsafe characters     |emmet-filter-e|
+  Add comments around 'important tags' |emmet-filter-c|
+  Outputs as a single line          |emmet-filter-s|
+  Trim list markers                 |emmet-filter-t|
+Links                  |emmet-links|
+ToDo                   |emmet-todo|
+
+==============================================================================
+INTRODUCTION                                      *emmet-introduction* *emmet*
+
+Emmet is an editor plugin for high-speed HTML, XML, XSL (or any other
+structured code format) coding and editing. The core of this plugin is a
+powerful abbreviation engine which allows you to expand expressions,
+similar to CSS selectors, into HTML code:
+>
+    div#page>div.logo+ul#navigation>li*5>a
+<
+can be expanded into:
+>
+    <div id="page">
+        <div class="logo"></div>
+        <ul id="navigation">
+            <li><a href=""></a></li>
+            <li><a href=""></a></li>
+            <li><a href=""></a></li>
+            <li><a href=""></a></li>
+            <li><a href=""></a></li>
+        </ul>
+    </div>
+<
+Read more about current Emmet syntax
+  |emmet-html-expression-syntax|
+  |emmet-css-expression-syntax|
+  http://docs.emmet.io/abbreviations/
+
+Abbreviation engine has a modular structure which allows you
+to expand abbreviations into different languages.
+Emmet currently supports CSS, HTML, XML/XSL and HAML, Slim languages
+via filters (see |emmet-filter|).
+
+==============================================================================
+INSTALL                                                        *emmet-install*
+
+Install the distributed files into Vim runtime directory which is usually
+'~/.vim/', or '$HOME/vimfiles' on Windows.
+
+If you install pathogen (https://github.com/tpope/vim-pathogen)
+that provided by Tim Pope, you should extract the
+file into 'bundle' directory.
+
+==============================================================================
+TUTORIAL                                                      *emmet-tutorial*
+
+If you are seeing this file as :help, then you can't edit this file.
+You should copy this section and create new buffer, paste and write as
+'emmet-tutor.txt'. Formally, open the file to start tutorial.
+
+1. Expand abbreviation                            *emmet-expand-abbr* *<C-y>,*
+
+  Type abbreviation as 'div>p#foo$*3>a' and type '<C-y>,'.
+>
+  <div>
+      <p id="foo1">
+          <a href=""></a>
+      </p>
+      <p id="foo2">
+          <a href=""></a>
+      </p>
+      <p id="foo3">
+          <a href=""></a>
+      </p>
+  </div>
+<
+2. Expand abbreviation                            *emmet-expand-word* *<C-y>;*
+
+  When you want to expand word except html tokens like below, use this.
+>
+  <html
+  >foo
+<
+  This will be expanded like:
+>
+  <html
+  ><foo></foo>
+
+3. Update tag                                     *emmet-update-tag* *<C-y>u*
+
+  The begining of tags '<div>' on below
+>
+  <div>foo</div>
+<
+  Type '<C-y>u' request 'Enter Abbreviation:'. Then type
+>
+  .global
+<
+  This will be expanded like:
+>
+  <div class="global">foo</div>
+<
+4. Wrap with abbreviation            *emmet-wrap-with-abbreviation* *v_<C-y>,*
+
+  Write as below.
+>
+  test1
+  test2
+  test3
+<
+  Then do visual select (line wise) and type '<C-y>,'.
+  If you request 'Tag:', then type
+>
+  ul>li*
+<
+  Result:
+>
+  <ul>
+      <li>test1</li>
+      <li>test2</li>
+      <li>test3</li>
+  </ul>
+<
+  If you type tag name, for example
+>
+  blockquote
+<
+  then you'll see as following:
+>
+  <blockquote>
+      test1
+      test2
+      test3
+  </blockquote>
+<
+  See also: |emmet-filter-t|, |emmet-$#|
+
+5. Balance tag inward                      *emmet-balance-tag-inward* *<C-y>d*
+
+  To select inward of '<ul>' tag, type '<C-y>d' in insert mode.
+>
+  <ul>
+  *   <li class="list1"></li>
+      <li class="list2"></li>
+      <li class="list3"></li>
+  </ul>
+<
+  If cursor is at '*', '<C-y>d' select from begin of '<ul>' to end of '</ul>'.
+  If cursor is at first of '<li>', it select '<li class="list1"></li>'.
+
+6. Balance tag outward                    *emmet-balance-tag-outward* *<C-y>D*
+
+  To select outward of '<ul>' tag type '<C-y>D' in insert mode.
+>
+  <ul>
+    * <li class="list1"></li>
+      <li class="list2"></li>
+      <li class="list3"></li>
+  </ul>
+<
+  If cursor is at '*', '<C-y>D' select from next letter of '<ul>'
+  to previous letter of '</ul>'.
+  If cursor is at first of '<li>', it select '<li class="list1"></li>'.
+
+7. Go to next edit point                      *emmet-goto-next-point* *<C-y>n*
+
+  To jump next point that need to edit, type '<C-y>n' in insert mode.
+>
+  * <div id="foo" class="">foo</div>
+    <div id="bar" class="bar"></div>
+<
+  If cursor is at '*', type '<C-y>n' to move a cursor
+  into attribute value of '<div>' specified id as 'foo'.
+  And type again '<C-y>n' to move a cursor
+  into inner of '<div>' specified id as 'bar'.
+
+8. Go to previous edit point              *emmet-goto-previous-point* *<C-y>N*
+
+  To jump previous point that need to edit, type '<C-y>N' in insert mode.
+>
+  <div id="foo" class="">foo</div>
+  <div id="bar" class="bar"></div> *
+<
+  If cursor is at '*', type '<C-y>N' to move a cursor
+  into '<div>' specified id as 'bar'.
+  And type again '<C-y>N' to move a cursor
+  into attribute value of 'foo'.
+
+9. Add and update <img> size                *emmet-update-image-size* *<C-y>i*
+
+  To add or update 'width' and 'height' attributes of image,
+  type '<C-y>i' on '<img>' tag
+>
+  <img src="foo.png" />
+<
+  Type '<C-y>i' on '<img>' tag
+>
+  <img src="foo.png" width="32" height="32" />
+<
+  If you change image, then type it again. it will be following.
+>
+  <img src="foo-48.png" width="32" height="48" />
+<
+  Image size retrieved using 'identify' (ImageMagick.org) (if available)
+  or |xxd|.
+
+10. Merge lines                                    *emmet-merge-lines* *<C-y>m*
+
+  To join multi line text like following, type |J|.
+>
+  <ul>
+      <li class="list1"></li>
+      <li class="list2"></li>
+      <li class="list3"></li>
+  </ul>
+<
+  If you select part of line include '<li>' and type |<C-y>m|,
+  it will be following.
+>
+  <ul>
+      <li class="list1"></li><li class="list2"></li><li class="list3"></li>
+  </ul>
+<
+11. Remove tag                                      *emmet-remove-tag* *<C-y>k*
+
+  To remove tag in the block, type '<C-y>k'.
+>
+  <div class="foo">
+      <a>cursor is here</a>
+  </div>
+<
+  Type '<C-y>k' in insert mode, then
+>
+  <div class="foo">
+
+  </div>
+<
+  And type '<C-y>k' in there again, then '<div>' will be removed.
+
+12. Split/join tag                             *emmet-split-join-tag* *<C-y>j*
+
+  To join block, type '<C-y>j'.
+>
+  <div class="foo">
+      cursor is here
+  </div>
+<
+  Type '<C-y>j' in insert mode. Then,
+>
+  <div class="foo" />
+<
+  And type '<C-y>j' in there again.
+>
+  <div class="foo">
+  </div>
+<
+13. Toggle comment                             *emmet-toggle-comment* *<C-y>/*
+
+  Move cursor to block
+>
+  <div>
+      hello world
+  </div>
+<
+  Type '<C-y>/' in insert mode.
+>
+  <!-- <div>
+      hello world
+  </div> -->
+<
+  Type '<C-y>/' in there again.
+>
+  <div>
+      hello world
+  </div>
+<
+14. Make anchor from URL                      *emmet-make-anchor-url* *<C-y>a*
+
+  Move cursor to URL
+>
+  http://www.google.com/
+<
+  Type '<C-y>a'
+>
+  <a href="http://www.google.com/">Google</a>
+<
+  Text retrieved using command, specified by |g:emmet_curl_command|.
+
+15. Make quoted text from URL                 *emmet-quoted-text-url* *<C-y>A*
+
+  Move cursor to URL
+>
+  https://github.com/
+<
+  Type '<C-y>A'
+>
+  <blockquote class="quote">
+      <a href="https://github.com/">Secure source code hosting and collaborative development - GitHub</a><br />
+      <p>How does it work? Get up and running in seconds by forking a project, pushing an existing repository...</p>
+      <cite>https://github.com/</cite>
+  </blockquote>
+<
+  Text retrieved using command, specified by |g:emmet_curl_command|.
+
+16. Code pretty                                   *emmet-code-pretty* *<C-y>c*
+
+  Select code block, for example select following code from 'int main()'.
+>
+  <p>Writing in C language</p>
+
+  int main() {
+    puts("hello world");
+  }
+<
+  Type '<C-y>c'
+>
+  <span class="Type">int</span>&nbsp;main() {<br />
+  &nbsp;&nbsp;puts(<span class="Constant">&quot;hello world&quot;</span>);<br />
+  }<br />
+<
+  To convert text into html used command |:TOhtml|.
+
+17. Lorem ipsum                                            *emmet-lorem-ipsum*
+
+  To insert dummy text (30 words by default).
+>
+  div>lorem
+<
+  Type |<C-y>,|
+>
+  <div>Adipisicing asperiores deleniti ipsum fuga deserunt perferendis
+  molestiae sunt excepturi aut quo nihil! Optio accusantium corporis molestiae
+  deserunt ab, veritatis commodi. Eius nobis ab deserunt magni iure quo
+  laboriosam laboriosam.</div>
+<
+  For japanese user, put like follow into your |g:user_emmet_settings|:
+>
+  let g:user_emmet_settings = {
+    ...
+
+    \  'custom_expands1' : {
+    \    '^\%(lorem\|lipsum\)\(\d*\)$' : function('emmet#lorem#ja#expand'),
+    \  },
+
+    ...
+<
+  You will get japanese dummy text. Text retrieved from url
+  'http://www.aozora.gr.jp/cards/000081/files/470_15407.html'
+  using command, specified by |g:emmet_curl_command|.
+
+  To insert 3 words of dummy text.
+>
+  div>lorem3
+<
+  Type |<C-y>,|
+>
+  <div>
+      Elit libero id.
+  </div>
+<
+==============================================================================
+HTML EXPRESSION SYNTAX                          *emmet-html-expression-syntax*
+
+Emmet uses syntax similar to CSS selectors for describing elements' positions
+inside generated tree and elements' attributes.
+
+1. Elements                                       *emmet-html-syntax-elements*
+
+  You can use elements' names like 'div' or 'p' to generate HTML tags.
+>
+    p     ->   <p></p>
+    div   ->   <div></div>
+<
+  You can write any word and transform it into a tag:
+>
+    foo   ->   <foo></foo>
+    bar   ->   <bar></bar>
+<
+  Emmet knowns set of empty elements:
+>
+    br    ->   <br />   or <br>
+    meta  ->   <meta /> or <meta>
+<
+  To choose between HTML '>' and XHTML ' />' use |g:emmet_html5| or
+  |g:user_emmet_settings|:
+>
+  let g:user_emmet_settings = {
+  \    ...
+  \    'html': {
+  \        ...
+  \        'empty_element_suffix': ' />',
+  \        ...
+  \    },
+  \    ...
+  \}
+<
+  Emmet will automatically insert some attributes:
+>
+    a     ->   <a href="" ></a>
+    link  ->   <link rel="stylesheet" href="" />
+<
+  Set of inserted attributes can be changed using |g:user_emmet_settings|:
+>
+  let s:emmet_settings = {
+  \    ...
+  \    'html': {
+  \        ...
+  \        'default_attributes': {
+  \            ...
+  \            'a': {'href': ''},
+  \            'ins': {'datetime': '${datetime}'},
+  \            'iframe': [{'src': ''}, {'frameborder': '0'}],
+  \            'textarea': [{'name': ''}, {'id': ''}, {'cols': '30'}, {'rows': '10'}],
+  \            ...
+  \        },
+  \        ...
+  \    },
+  \    ...
+  \}
+<
+2. Nesting operators                     *emmet-html-syntax-nesting-operators*
+
+  Nesting operators are used to position abbreviation elements
+  inside generated tree: whether it should be placed
+  inside or near the context element.
+
+  Operator   Description      Link ~
+  >          Child            |emmet->|
+  +          Sibling          |emmet-+|
+  ^          Climb-up         |emmet-^|
+  *          Multiplication   |emmet-star|
+  ()         Grouping         |emmet-()|
+
+2.1. Child                                                           *emmet->*
+
+  You can use '>' operator to nest elements inside each other:
+>
+  div>ul>li
+<
+  will produce
+>
+  <div>
+      <ul>
+          <li></li>
+      </ul>
+  </div>
+<
+2.2. Sibling                                                         *emmet-+*
+
+  Use '+' operator to place elements near each other, on the same level:
+>
+  div+p+bq
+<
+  will output
+>
+  <div></div>
+  <p></p>
+  <blockquote></blockquote>
+<
+2.3. Climb-up                                                        *emmet-^*
+
+  With '>' operator you're descending down the generated tree and
+  positions of all sibling elements will be resolved
+  against the most deepest element:
+>
+  div+div>p>span+em
+<
+  will be expanded to
+>
+  <div></div>
+  <div>
+      <p>
+          <span></span>
+          <em></em>
+      </p>
+  </div>
+<
+  With '^' operator, you can climb one level up the tree and change context
+  where following elements should appear:
+>
+  div+div>p>span+em^bq
+<
+  outputs to
+>
+  <div></div>
+  <div>
+      <p>
+          <span></span>
+          <em></em>
+      </p>
+      <blockquote></blockquote>
+  </div>
+<
+  You can use as many '^' operators as you like,
+  each operator will move one level up:
+>
+  div+div>p>span+em^^^bq
+<
+  will output to
+>
+  <div></div>
+  <div>
+      <p>
+          <span></span>
+          <em></em>
+      </p>
+  </div>
+  <blockquote></blockquote>
+<
+2.4. Multiplication                                               *emmet-star*
+
+  With '*' operator you can define how many times element should be outputted:
+>
+  ul>li*5
+<
+  outputs to
+>
+  <ul>
+      <li></li>
+      <li></li>
+      <li></li>
+      <li></li>
+      <li></li>
+  </ul>
+<
+  Expression may contain several '*' operators:
+>
+  tr*2>td*3
+<
+  become
+>
+  <tr>
+      <td></td>
+      <td></td>
+      <td></td>
+  </tr>
+  <tr>
+      <td></td>
+      <td></td>
+      <td></td>
+  </tr>
+<
+2.5. Grouping                                                       *emmet-()*
+
+  Parentheses '()' are used by Emmets' power users for grouping subtrees
+  in complex abbreviations:
+>
+  div>(header>ul>li*2>a)+footer>p
+<
+  expands to
+>
+  <div>
+      <header>
+          <ul>
+              <li><a href=""></a></li>
+              <li><a href=""></a></li>
+          </ul>
+      </header>
+      <footer>
+          <p></p>
+      </footer>
+  </div>
+<
+  If you're working with browser's DOM, you may think of groups
+  as Document Fragments: each group contains abbreviation subtree and
+  all the following elements are inserted at the same level
+  as the first element of group.
+
+  You can nest groups inside each other and
+  combine them with multiplication '*' operator:
+>
+  (div>dl>(dt+dd)*3)+footer>p
+<
+  produces
+>
+  <div>
+      <dl>
+          <dt></dt>
+          <dd></dd>
+          <dt></dt>
+          <dd></dd>
+          <dt></dt>
+          <dd></dd>
+      </dl>
+  </div>
+  <footer>
+      <p></p>
+  </footer>
+<
+  With groups, you can literally write full page mark-up
+  with a single abbreviation, but please don't do that.
+
+3. Attribute operators                 *emmet-html-syntax-attribute-operators*
+
+  Attribute operators are used to modify attributes of outputted elements.
+  For example, in HTML and XML you can quickly add 'class' attribute
+  to generated element.
+
+  Operator   Description                 Link ~
+  .          Attribute 'class'             |emmet-.|
+  #          Attribute 'id'                |emmet-#|
+  []         Custom attributes             |emmet-[]|
+  $          Number                        |emmet-$|
+  @          Number origin and direction   |emmet-@|
+
+3.1. ID and CLASS                                          *emmet-.* *emmet-#*
+
+  In CSS, you use 'elem#id' and 'elem.class' notation to reach the elements
+  with specified 'id' or 'class' attributes.
+  In Emmet, you can use the very same syntax to add these attributes
+  to specified element:
+>
+  span.class1          ->   <span class="class1"></span>
+  span.class1.class2   ->   <span class="class1 class2"></span>
+  div#wrapper          ->   <div id="wrapper"></div>
+  div#wrapper.content  ->   <div id="wrapper" class="content"></div>
+<
+  More complex expression:
+>
+  div#header+div.page+div#footer.class1.class2.class3
+<
+  will output
+>
+  <div id="header"></div>
+  <div class="page"></div>
+  <div id="footer" class="class1 class2 class3"></div>
+<
+3.2. Custom attributes                                              *emmet-[]*
+
+  You can use '[attr]' notation (as in CSS)
+  to add custom attributes to your element:
+>
+  td[title="Hello world!" colspan=3]
+<
+  outputs
+>
+  <td title="Hello world!" colspan="3"></td>
+<
+  You can place as many attributes as you like inside square brackets.
+
+  Attribute values may be omitted:
+>
+  td[colspan title]
+<
+  will produce
+>
+  <td colspan="" title="">
+<
+  You can use single or double quotes for quoting attribute values.
+>
+  div[a='value1' b="value2"]
+<
+  become
+>
+  <div a="value1" b="value2"></div>
+<
+  You don't need to quote values if they don't contain spaces:
+>
+  td[title=hello colspan=3]
+<
+  will output
+>
+  <td title="hello" colspan="3"></td>
+<
+3.3. Item numbering                                                  *emmet-$*
+
+  With multiplication '*' operator you can repeat elements,
+  but with '$' you can number them.
+  Place '$' operator inside element's name, attribute's name or
+  attribute's value to output current number of repeated element:
+>
+  ul>li.item_$*5
+<
+  outputs to
+>
+  <ul>
+      <li class="item_1"></li>
+      <li class="item_2"></li>
+      <li class="item_3"></li>
+      <li class="item_4"></li>
+      <li class="item_5"></li>
+  </ul>
+<
+  You can use multiple '$' in a row to pad number with zeroes:
+>
+  ul>li.item_$$$*5
+<
+  outputs to
+>
+  <ul>
+      <li class="item_001"></li>
+      <li class="item_002"></li>
+      <li class="item_003"></li>
+      <li class="item_004"></li>
+      <li class="item_005"></li>
+  </ul>
+<
+  Also '$' can be used in element name and in text (|emmet-{}|):
+>
+  h$[title=item$]{Header $}*3
+<
+  transformed to
+>
+  <h1 title="item1">Header 1</h1>
+  <h2 title="item2">Header 2</h2>
+  <h3 title="item3">Header 3</h3>
+<
+3.3.1. Changing numbering origin and direction                         *emmet-@*
+
+  With '@' modifier, you can change
+  - numbering direction (ascending or descending) and
+  - origin (i. e. start value).
+
+  For example, to change direction, add '@-' after '$':
+>
+  ul>li.item_$@-*5
+<
+  outputs to
+>
+  <ul>
+      <li class="item_5"></li>
+      <li class="item_4"></li>
+      <li class="item_3"></li>
+      <li class="item_2"></li>
+      <li class="item_1"></li>
+  </ul>
+<
+  To change counter origin value, add '@N' modifier to '$':
+>
+  ul>li.item_$@3*5
+<
+  transforms to
+>
+  <ul>
+      <li class="item_3"></li>
+      <li class="item_4"></li>
+      <li class="item_5"></li>
+      <li class="item_6"></li>
+      <li class="item_7"></li>
+  </ul>
+<
+  You can use these modifiers together:
+>
+  ul>li.item_$@-3*5
+<
+  is transformed to
+>
+  <ul>
+      <li class="item_7"></li>
+      <li class="item_6"></li>
+      <li class="item_5"></li>
+      <li class="item_4"></li>
+      <li class="item_3"></li>
+  </ul>
+>
+3.4. Quote character                              *emmet-html-attr-quote-char*
+
+  |g:user_emmet_settings| may be used to change attribute quote character:
+>
+  let g:user_emmet_settings = {
+       ...
+  \    'html' : {
+           ...
+  \        'quote_char': "'",
+           ...
+  \    },
+       ...
+  \}
+<
+  Then abbreviation
+>
+  a[target=_blank]
+<
+  will expand to
+>
+  <a href='' target='_blank'></a>
+<
+  instead of
+>
+  <a href="" target="_blank"></a>
+<
+  Default quote is '"'.
+
+4. Text                                                             *emmet-{}*
+
+  You can use curly braces to add text to element:
+>
+  a{Click me}
+<
+  will produce
+>
+  <a href="">Click me</a>
+<
+  Note that '{text}' is used and parsed as a separate element
+  (like, 'div', 'p' etc), but has a special meaning
+  when written right after element. For example,
+>
+  a{click}
+<
+  and
+>
+  a>{click}
+<
+  will produce the same output, but
+>
+  a{click}+b{here}
+<
+  and
+>
+  a>{click}+b{here}
+<
+  won't:
+>
+  <!-- a{click}+b{here} -->
+  <a href="">click</a><b>here</b>
+
+  <!-- a>{click}+b{here} -->
+  <a href="">click<b>here</b></a>
+<
+  In second example the '<b>' element is placed inside '<a>' element.
+  And that's the difference: when '{text}' is written right after element,
+  it doesn't change parent context.
+  Here's more complex example showing why it is important:
+>
+  p>{Click }+a{here}+{ to continue}
+<
+  produces
+>
+  <p>Click <a href="">here</a> to continue</p>
+<
+  In this example, to write 'Click here to continue' inside '<p>' element
+  we have explicitly move down the tree with '>' operator after 'p',
+  but in case of 'a' element we don't have to, since we need '<a>' element
+  with here word only, without changing parent context.
+
+  For comparison, here's the same abbreviation
+  written without child '>' operator:
+>
+  p{Click }+a{here}+{ to continue}
+<
+  produces
+>
+  <p>Click </p>
+  <a href="">here</a> to continue
+<
+5. Implicit tag names                          *emmet-html-implicit-tag-names*
+
+  Even with such a powerful abbreviation engine,
+  which can expand large HTML structures from short abbreviation,
+  writing tag names may be very tedious.
+
+  In many cases you can skip typing tag names and
+  Emmet will substitute it for you.
+  For example, instead of >
+    div.content
+<  you can simply write >
+    .content
+<  and expand it into >
+    <div class="content"></div>
+<
+  Other examples:
+>
+  .wrapper   ->   <div class="wrapper"></div>
+  #popup     ->   <div id="popup"></div>
+<
+  When you expand abbreviation, Emmet tries to grab parent context,
+  e. g. the HTML element, inside which you're expanding the abbreviation.
+  If the context was grabbed successfully,
+  Emmet uses its name to resolve implicit names.
+  Emmet looks at the parent tag name every time
+  you're expanding the abbreviation with an implicit name.
+  Here's how it resolves the names for some parent elements:
+
+  Inserted element   Parent elements ~
+  li                 ul, ol
+  tr                 table, tbody, thead, tfoot
+  td                 tr
+  option             select, optgroup
+  span               Inline elements
+  div                Block elements
+
+  Take a look at some abbreviations equivalents
+  with implicit and explicit tag names:
+>
+  .wrap>.content              ->   div.wrap>div.content
+  em>.info                    ->   em>span.info
+  ul>.item*3                  ->   ul>li.item*3
+  table>.row>.col             ->   table>tr.row>td.col
+  table>#row$*4>[colspan=2]   ->   table>tr#row$*4>td[colspan=2]
+<
+6. Notes on abbreviation formatting                  *emmet-html-syntax-notes*
+
+  When you get familiar with Emmet's abbreviations syntax,
+  you may want to use some formatting to make your abbreviations more readable.
+  For example, use spaces between elements and operators, like this:
+>
+  (header > ul.nav > li*5) + footer
+<
+  But it won't work, because space is a stop symbol
+  where Emmet stops abbreviation parsing.
+
+  Many users mistakenly think that each abbreviation
+  should be written in a new line, but they are wrong:
+  you can type and expand abbreviation anywhere in the text:
+
+  This is why Emmet needs some indicators (like spaces)
+  where it should stop parsing to not expand anything that you don't need.
+  If you're still thinking that such formatting is required
+  for complex abbreviations to make them more readable:
+  -  abbreviations are not a template language,
+     they don't have to be "readable",
+     they have to be "quickly expandable and removable";
+  -  you don't really need to write complex abbreviations.
+     Stop thinking that "typing" is the slowest process in web-development.
+     You'll quickly find out that constructing a single complex abbreviation
+     is much slower and error-prone than constructing and typing
+     a few short ones.
+
+7. Choose position to insert text when wrap abbreviation            *emmet-$#*
+
+  When wrap abbreviation (|emmet-wrap-with-abbreviation|) you can choose
+  position to insert text using '$#' operator.
+  Operator '$#' may be used only inside |emmet-[]| and/or |emmet-{}|.
+
+  For example, do visual select (line wise) following text:
+>
+  First
+  Second
+  Third
+<
+  Then press '<C-y>,' and type
+>
+  ul>li[ title="[$#]" ]*
+<
+  Result:
+>
+  <ul>
+      <li title="[First]">First</li>
+      <li title="[Second]">Second</li>
+      <li title="[Third]">Third</li>
+  </ul>
+<
+  You may type
+>
+  input[ type=input value=$# ]
+<
+  to get
+>
+  <input type="input" value="First">
+  <input type="input" value="Second">
+  <input type="input" value="Third">
+<
+  Using '$#' you can type text (|emmet-{}|) only once:
+>
+  a[title=$#]{foo}
+<
+  will be expanded to
+>
+  <a href="" title="foo">foo</a>
+<
+==============================================================================
+CSS EXPRESSION SYNTAX                            *emmet-css-expression-syntax*
+
+1. Properties                         *emmet-css-properties*
+
+  Emmet has a lot of predefined snippets for CSS properties.
+>
+  <style type="text/css">
+  .page {
+      m|
+  }
+  </style>
+<
+  become
+>
+  <style type="text/css">
+  .page {
+      margin: |;
+  }
+  </style>
+<
+  In above example '|' denotes a cursor (caret) position.
+
+  Other examples:
+>
+  t      ->   top: ;
+  d      ->   display: ;
+  o      ->   outline: ;
+  ov     ->   overflow: ;
+  cu     ->   cursor: ;
+  bdrs   ->   border-radius: ;
+<
+  '+' operator may be used to insert number of properties:
+>
+  m1+p2
+<
+  become
+>
+  margin: 1px;
+  padding: 2px;
+<
+2. Values                                                   *emmet-css-values*
+
+  Some properties have default values:
+>
+  c     ->   color: #000;
+  bgc   ->   background-color: #FFF;
+  zoo   ->   zoom: 1;
+<
+  To insert predefined property value after abbreviation
+  type colon ':' and first character of predefined keyword:
+>
+  d:n      ->   display: none;
+  d:b      ->   display: block;
+  d:i      ->   display: inline;
+<
+  Numerical value can be typed directly after abbreviation:
+>
+  m10   ->   margin: 10px;
+  m2e   ->   margin: 2em;
+<
+  Use a hyphen '-' to separate some numerical values:
+>
+  m10-20       ->   margin: 10px 20px;
+  p1-2-3       ->   padding: 1px 2px 3px;
+<
+  To negative values
+  precede the first value with hyphen and all the rest with double hyphens:
+>
+  m-10         ->   margin: -10px;
+  m-1--2       ->   margin: -1px -2px;
+  p-2--1-0-1   ->   padding: -2px -1px 0 1px;
+<
+  To insert '!important' append '!' to property abbreviation:
+>
+  m!     ->   margin:  !important;
+  bac!   ->   background:  !important;
+<
+  You can use special abbreviation 'lg(...)'
+  to insert definition of linear gradient. Example:
+>
+  lg(left, #fc0 30%, red)
+<
+  will expand to
+>
+  background-image: -webkit-gradient(left, 0 0, 0 100, from(#fc0 30%), to(red));
+  background-image: -webkit-linear-gradient(#fc0 30%, red);
+  background-image: -moz-linear-gradient(#fc0 30%, red);
+  background-image: -o-linear-gradient(#fc0 30%, red);
+  background-image: linear-gradient(#fc0 30%, red);
+<
+3. Units                                                     *emmet-css-units*
+
+  By default, when you expand an abbreviation with integer value,
+  Emmet outputs it with a 'px' unit:
+>
+  bor2    ->   border: 2px;
+  fs100   ->   font-size: 100px;
+  miw20   ->   min-width: 20px;
+<
+  By default, if you're expanding an abbreviation with a float value,
+  it is outputted with an 'em' unit:
+>
+  fs1.5   ->   font-style: 1.5em;
+<
+  But you can explicitly provide the unit name
+  by putting one of characters right after value:
+
+  Character   Unit ~
+  p           %
+  e           em
+
+  Examples:
+>
+  fs2e    ->   font-style: 2em;
+  w100p   ->   width: 100%;
+<
+4. Vendor prefixes                                 *emmet-css-vendor-prefixes*
+
+  To automatically create vendor-prefixed copies of property,
+  precede abbreviation with a hyphen '-'. For example, abbreviation
+>
+  -bdrs
+<
+  will be expanded into
+>
+  -webkit-border-radius: ;
+  -moz-border-radius: ;
+  border-radius: ;
+<
+==============================================================================
+COMMANDS                                                      *emmet-commands*
+
+:Emmet {expression}                                                   *:Emmet*
+                        Expand {expression} and insert result under cursor.
+                        {expression} is |emmet-html-expression|.
+                        Also see |g:user_emmet_install_command|.
+
+:EmmetInstall                                                  *:EmmetInstall*
+                        Create Emmet mappings to current buffer
+                        (|mapping|, |:map-<buffer>|) and,
+                        if set |g:user_emmet_complete_tag|,
+                        change |'omnifunc'| option to emmet#completeTag()
+
+==============================================================================
+VARIABLES                                                    *emmet-variables*
+
+g:emmet_html5                                                  *g:emmet_html5*
+                        If set to 1, enable HTML 5 support:
+                        - use ">" instead of "/>": >
+                             <meta />
+                             <meta>
+<                        - omit some HTML 4 attributes: >
+                             <style type="text/css">
+                             <style>
+<                        - add attributes without values; >
+                             <input checked="checked" />
+                             <input checked>
+<                        Default value: 1.
+                        To disable these set variable to 0: >
+                          let g:emmet_html5 = 0
+<
+g:emmet_docroot                                              *g:emmet_docroot*
+                        |Dictionary| used by |<C-y>i|.
+                        Dictionary keys is path relative to http server root.
+                        Dictionary values is local file system absolute path
+                        to http server root directory.
+                        Default value is empty dictionary: {}
+
+g:emmet_curl_command                                    *g:emmet_curl_command*
+                        Command to download web pages.
+                        Used by |emmet-html-syntax-item-numbering-base|,
+                        |emmet-html-syntax-item-numbering| and
+                        |emmet-lorem-ipsum| (for japanese).
+                        Default value: 'curl -s -L -A Mozilla/5.0'
+
+g:user_emmet_complete_tag                          *g:user_emmet_complete_tag*
+                        Use omni complete function, provided by Emmet.
+                        When user run |:EmmetInstall|,
+                        following command will be executed: >
+                          setlocal omnifunc=emmet#completeTag
+<
+g:user_emmet_leader_key                              *g:user_emmet_leader_key*
+                        Leading keys to run Emmet functions.
+                        Default value: '<C-y>'.
+                        |:EmmetInstall| will map Emmet keys to current buffer.
+                        See |emmet-customize-key-mappings|.
+
+g:user_emmet_install_global                      *g:user_emmet_install_global*
+                        If set to 1, Emmet will create global mappings.
+                        Set to 0 to prevent these: >
+                          let g:user_emmet_install_global = 0
+<                        Default value: 1.
+                        See |emmet-customize-key-mappings|.
+
+g:user_emmet_install_command                    *g:user_emmet_install_command*
+                        If set to 1, Emmet will create command |:Emmet|.
+                        Set to 0 to prevent these: >
+                          let g:user_emmet_install_command = 0
+<                        Default value: 1.
+
+g:user_emmet_settings                                  *g:user_emmet_settings*
+                        |Dictionary|, which contains user settings.
+                        User settings will override default settings.
+                        Default settings can be found in file
+                        'emmet/autoload/emmet.vim';
+                        search for variable 's:emmet_settings'.
+                        Dictionary has the same structure
+                        as 's:emmet_settings'.
+                        See also: |emmet-indent-size|,
+                        |emmet-define-tags-behavior|, |emmet-custom-snippets|
+
+g:user_emmet_mode                                          *g:user_emmet_mode*
+                        String. Choose modes, in which
+                        Emmet mappings will be created.
+                        Default value: 'a' - all modes.
+                        'n' - normal mode.
+                        'i' - insert mode.
+                        'v' - visual mode.
+                        Examples: >
+                          " create Emmet mappings only for normal mode
+                          let g:user_emmet_mode = 'n'
+                          " create Emmet mappings
+                          " for insert, normal and visual modes
+                          let g:user_emmet_mode = 'inv'
+                          " create Emmet mappings for all modes
+                          let g:user_emmet_mode = 'a'
+<
+==============================================================================
+CUSTOMIZE                                                    *emmet-customize*
+
+1. Key mapping                                  *emmet-customize-key-mappings*
+
+  To specify leading key for expanding or balance tag, or for all,
+  Add this line in your 'vimrc': >
+>
+  let g:user_emmet_leader_key = '<C-y>'
+<
+  Note that to expand abbreviation a trailing ',' must be typed, so
+  the resultant keymap is '<C-y>,'.
+
+  If you prefer to map for each actions separately, use following valuables:
+>
+  let g:user_emmet_expandabbr_key = '<C-y>,'
+  let g:user_emmet_expandword_key = '<C-y>;'
+  let g:user_emmet_update_tag = '<C-y>u'
+  let g:user_emmet_balancetaginward_key = '<C-y>d'
+  let g:user_emmet_balancetagoutward_key = '<C-y>D'
+  let g:user_emmet_next_key = '<C-y>n'
+  let g:user_emmet_prev_key = '<C-y>N'
+  let g:user_emmet_imagesize_key = '<C-y>i'
+  let g:user_emmet_togglecomment_key = '<C-y>/'
+  let g:user_emmet_splitjointag_key = '<C-y>j'
+  let g:user_emmet_removetag_key = '<C-y>k'
+  let g:user_emmet_anchorizeurl_key = '<C-y>a'
+  let g:user_emmet_anchorizesummary_key = '<C-y>A'
+  let g:user_emmet_mergelines_key = '<C-y>m'
+  let g:user_emmet_codepretty_key = '<C-y>c'
+<
+  Or you can use following <plug> mappings:
+>
+  imap   <C-y>,   <plug>(emmet-expand-abbr)
+  imap   <C-y>;   <plug>(emmet-expand-word)
+  imap   <C-y>u   <plug>(emmet-update-tag)
+  imap   <C-y>d   <plug>(emmet-balance-tag-inward)
+  imap   <C-y>D   <plug>(emmet-balance-tag-outward)
+  imap   <C-y>n   <plug>(emmet-move-next)
+  imap   <C-y>N   <plug>(emmet-move-prev)
+  imap   <C-y>i   <plug>(emmet-image-size)
+  imap   <C-y>/   <plug>(emmet-toggle-comment)
+  imap   <C-y>j   <plug>(emmet-split-join-tag)
+  imap   <C-y>k   <plug>(emmet-remove-tag)
+  imap   <C-y>a   <plug>(emmet-anchorize-url)
+  imap   <C-y>A   <plug>(emmet-anchorize-summary)
+  imap   <C-y>m   <plug>(emmet-merge-lines)
+  imap   <C-y>c   <plug>(emmet-code-pretty)
+<
+  You can make the mapping affected only for a filetype you want.
+>
+  let g:user_emmet_install_global = 0
+  autocmd FileType css imap <tab> <plug>(emmet-expand-abbr)
+<
+2. Indent size                                             *emmet-indent-size*
+
+  To change indent size of html, add following code in your 'vimrc':
+>
+  let g:user_emmet_settings = {
+  \    'html' : {
+  \        'indentation' : ' '
+  \    },
+  \}
+<
+  If you prefer to change global indent size then add this:
+>
+  let g:user_emmet_settings = {
+  \    'indentation' : ' '
+  \}
+<
+  Filetype dependent indent size will override global indent size.
+
+3. Define tag's behavior                          *emmet-define-tags-behavior*
+
+  User can create abbreviations and snippets for each filetypes
+  using |g:user_emmet_settings|. For details, see official site of Emmet.
+  For example, user can add following:
+>
+  let g:user_emmet_settings = {
+  \    'variables' : {
+  \        'lang' : 'ja',
+  \    },
+  \    'html' : {
+  \        'filters' : 'html',
+  \        'indentation' : ' ',
+  \        'expandos' : {
+  \            'ol': 'ol>li',
+  \            'list': 'ul>li*3',
+  \        },
+  \        'default_attributes': {
+  \            'a': {'href': ''},
+  \            'link': [{'rel': 'stylesheet'}, {'href': ''}],
+  \        },
+  \        'aliases': {
+  \            'bq': 'blockquote',
+  \            'obj': 'object',
+  \            'src': 'source',
+  \        },
+  \        'empty_elements': 'area,base,basefont,...,isindex,link,meta,...',
+  \        'block_elements': 'address,applet,blockquote,...,li,link,map,...',
+  \        'inline_elements': 'a,abbr,acronym,...',
+  \        'empty_element_suffix': ' />',
+  \    },
+  \    'perl' : {
+  \        'indentation' : '  ',
+  \        'aliases' : {
+  \            'req' : "require '|'"
+  \        },
+  \        'snippets' : {
+  \            'use' : "use strict\nuse warnings\n\n",
+  \            'w' : "warn \"${cursor}\";",
+  \        },
+  \    },
+  \    'php' : {
+  \        'extends' : 'html',
+  \        'filters' : 'html,c',
+  \    },
+  \    'css' : {
+  \        'filters' : 'fc',
+  \    },
+  \    'javascript' : {
+  \        'snippets' : {
+  \            'jq' : "\\$(function() {\n\t${cursor}${child}\n});",
+  \            'jq:each' : "\\$.each(arr, function(index, item)\n\t${child}\n});",
+  \            'fn' : "(function() {\n\t${cursor}\n})();",
+  \            'tm' : "setTimeout(function() {\n\t${cursor}\n}, 100);",
+  \        },
+  \    },
+  \    'java' : {
+  \        'indentation' : '    ',
+  \        'snippets' : {
+  \            'main': "public static void main(String[] args) {\n\t|\n}",
+  \            'println': "System.out.println(\"|\");",
+  \            'class': "public class | {\n}\n",
+  \        },
+  \    },
+  \}
+<
+  As you can see, at first level of tree are filetype names.
+  The second level of tree contains definition of abbreviations, snippets and
+  values of some options.
+                                                               *emmet-snippet*
+  Snippets are just blocks of plain code,
+  just like in all programmers' editors. You can type anything there and
+  it will be outputted 'as-is', without any transformation.
+
+  Bar '|' and '${cursor}' points to cursor position.
+  '${child}' points to position of children elements
+  (for example, in expression 'p>span' 'span' is children of 'p').
+                                                          *emmet-abbreviation*
+  Emmet parses tree and retrieves the following data:
+  - element name;
+  - default attributes;
+  - attributes' order;
+  - attributes' default values;
+  - should element contain closing tag.
+
+  Let's take a closer look on HTML abbreviations' definitions above.
+  The 'link' element is defined as
+>
+  let g:user_emmet_settings = {
+       ...
+  \    'html': {
+           ...
+  \        'default_attributes': {
+               ...
+               'link': [{'rel': 'stylesheet'}, {'href': ''}],
+  \        },
+           ...
+  \        'empty_elements': '...,link,...',
+  \        'block_elements': '...,link,...',
+  \        'empty_element_suffix': ' />',
+  \    },
+       ...
+  \}
+<
+  This definition says that tag, generated for 'link' abbreviation,
+  should be named 'link' and should contain two attributes:
+  'rel' with default value 'stylesheet' and 'href' with empty value
+  (exactly in this order), and
+  generated element should not contain closing tag.
+
+  When the link abbreviation is expanded,
+  you'll receive the following output for HTML syntax:
+>
+  <link rel="stylesheet" href="" />
+<
+  You can override default attribute values and add new ones as well:
+>
+  link[rel=prefetch title="Hello world"]
+<
+  expands to
+>
+  <link rel="prefetch" href="" title="Hello world" />
+<                                                                *emmet-alias*
+  Aliases are short-hands for commonly used abbreviations.
+  Aliases can be used to define:
+  - short names for long tag names;
+  - referencing commonly used abbreviations.
+>
+  let g:user_emmet_settings = {
+       ...
+  \    'html': {
+           ...
+  \        'aliases': {
+               ...
+               'bq': 'blockquote',
+           },
+           'expandos': {
+               ...
+               'ol': 'ol>li',
+           },
+           ...
+  \    },
+       ....
+  \}
+<
+  In the example above, when you expand abbreviation,
+>
+  bq
+<
+  Emmet will look for 'blockquote' abbreviation's definition.
+  If it doesn't exist, it will simply output element
+>
+  <blockquote></blockquote>
+<
+  The 'ol' abbreviation actually outputs the same result as 'ol>li' does:
+>
+  <ol>
+      <li></li>
+  </ol>
+<                                                               *emmet-filter*
+  Filters are special post-processors that modify expanded abbreviation
+  right before output to the editor. To better understand how filters work,
+  let's walk through a simple tutorial.
+
+  Try to expand the following abbreviation:
+>
+  #content>p.title
+<
+  As you may expect, it will be expanded into the following HTML code:
+>
+  <div id="content">
+      <p class="title"></p>
+  </div>
+<
+  Now, try to expand this abbreviation:
+>
+  #content>p.title|e
+<
+  You'll have a slightly different result:
+>
+  &lt;div id="content"&gt;
+      &lt;p class="title"&gt;&lt;/p&gt;
+  &lt;/div&gt;
+<
+  We've just applied 'e' (escape) filter by appending its name
+  after pipe character '|'.
+  This filter had escaped all XML-unsafe symbols with entities
+  (see |emmet-filter-e|) right before Emmet sent output to the editor.
+
+  Let's do something more interesting. Try to expand this abbreviation:
+>
+  #content>p.title|haml
+<
+  Result:
+>
+  #content
+      %p.title
+<
+  We've just expanded abbreviation as a HAML template.
+
+  As you can see, filtering is a key concept of Emmet. To draw an analogy
+  with the browser's DOM model, every time you expand abbreviation
+  it first gets transformed into a tree and
+  then filter walks on each tree node and modifies its output.
+  Filters can do anything: from small tweaks
+  as placing whitespace after CSS-rule to more complex tasks
+  as outputting result in different syntax. Even HTML output is defined
+  as 'html' filter.
+
+  You can apply filter to abbreviation explicitly,
+  by adding pipe character '|' and its name right after abbreviation.
+  But filters also can be applied implicitly, depending on document type
+  you're currently editing. Default filters are defined to each filetype:
+>
+  let g:user_emmet_settings = {
+       ...
+  \    'html' : {
+           ...
+           'filters': 'html',
+  \    },
+  \    'css' : {
+  \        'filters': 'fc',
+           ...
+  \    },
+       ...
+  \}
+<
+  If there's no filter specified, 'html' filter is applied by default.
+  If you want to apply more than one filter by default,
+  you can write a comma-separated list of filter names in filters section:
+>
+  let g:user_emmet_settings = {
+       ...
+  \    'html' : {
+           ...
+           'filters': 'html,e',
+  \    },
+       ...
+  \}
+<
+  Now, every time you expand abbreviation in HTML document,
+  'html' and 'e' filters will be applied by default.
+
+  But be careful. You always have to place one of the filetype filter
+  ('html', 'haml', etc) at first place of default filters,
+  otherwise you'll have empty output because syntax filters
+  are defining primary output result.
+
+  Number of available filters listed below (|emmet-filters-list|).
+
+4. Adding custom snippets                              *emmet-custom-snippets*
+
+  If you have installed the |webapi| (https://github.com/mattn/webapi-vim)
+  for |emmet| you can also add your own snippets
+  using a custom 'snippets.json' file.
+
+  Once you have installed the |webapi| add this line to your 'vimrc':
+>
+  let g:user_emmet_settings = webapi#json#decode(
+  \  join( readfile( expand( '~/.snippets_custom.json' ) ), "\n" ) )
+<
+  You can change the path to your 'snippets_custom.json'
+  according to your preferences.
+
+  See http://docs.emmet.io/customization/snippets/
+  to find instructions about creating
+  your customized 'snippets.json' file.
+
+==============================================================================
+FILTERS                                                   *emmet-filters-list*
+
+  Filter described above (see |emmet-filter|).
+  Some available filters listed in the following table.
+  For more details see http://docs.emmet.io/filters/ and source code.
+
+  Filter   Description                                        Link ~
+  html     Applies by default everywhere except HAML files
+  haml     Applies by default for 'haml' filetype
+  xsl      Applies by default for 'haml' filetype
+  e        Escapes XML-unsafe characters                     |emmet-filter-e|
+  c        Add comments around 'important tags'              |emmet-filter-c|
+  s        Outputs as a single line                          |emmet-filter-s|
+  t        Trim list markers                                 |emmet-filter-t|
+
+  'html', 'haml', 'xsl' filters will expand filetype specific abbreviations.
+  For full list of available abbreviations and snippets
+  see http://docs.emmet.io/cheat-sheet/
+  or file 'emmet/autoload/emmet.vim' (search for variable 's:emmet_settings').
+  Also see |emmet-define-tags-behavior|.
+                                                              *emmet-filter-e*
+  'e' (escape) filter replace XML-unsafe characters: '<', '>' and '&'
+  to entities: '&lt;', '&gt;', '&amp;'.
+
+  For example
+>
+  #header|e
+<
+  will expand to
+>
+  &lt;div id="header"&gt;&lt;/div&gt;
+<
+                                                              *emmet-filter-c*
+  'c' (comment) filter add comments around 'important tags'.
+  By default, 'important tags' are those tags
+  with 'id' and/or 'class' attribute.
+
+  For example
+>
+  #page|c
+<
+  will be expanded into
+>
+  <!-- #page -->
+  <div id="page"></div>
+  <!-- /#page -->
+<
+  Expression
+>
+  p.title|c
+<
+  become
+>
+  <!-- .title -->
+  <p class="title"></p>
+  <!-- /.title -->
+<
+  More complex expression
+>
+  div>#page>p.title+p|c
+<
+  will be transformed into
+>
+  <div>
+      <!-- #page -->
+      <div id="page">
+          <!-- .title -->
+          <p class="title"></p>
+          <!-- /.title -->
+          <p></p>
+      </div>
+      <!-- /#page -->
+  </div>
+<
+  To insert only second comment use the following code:
+>
+  let g:user_emmet_settings = {
+       ...
+  \    'html' : {
+           ...
+           'comment_type': 'lastonly',
+  \    },
+       ...
+  \}
+<
+  'comment_type' default value is 'both'.
+                                                              *emmet-filter-s*
+  's' (single line) filter removes newline characters, so
+  abbreviation will be expanded into single line:
+>
+  ul>li*4|s
+<
+  becomes to
+>
+  <ul><li></li><li></li><li></li><li></li></ul>
+<
+                                                              *emmet-filter-t*
+  't' (trim) filter removes trailing whitespace characters and
+  list markers, such as '1.', '2.', '3.', '-'.
+
+  For example, do visual select (line wise) following text:
+>
+  1. First
+  2. Second
+  3. Third
+<
+  Then press '<C-y>,' (|emmet-wrap-with-abbreviation|) and type expression
+>
+  ul>li*|t
+<
+  Result:
+>
+  <ul>
+      <li>First</li>
+      <li>Second</li>
+      <li>Third</li>
+  </ul>
+<
+==============================================================================
+LINKS                                                            *emmet-links*
+
+Emmet official site:
+  http://emmet.io/
+
+Emmet documentation:
+  http://docs.emmet.io/
+
+Emmet cheat sheet:
+  http://docs.emmet.io/cheat-sheet/
+
+Emmet vim plugin repository:
+  https://github.com/mattn/emmet-vim
+
+  Emmet (developed since 2012) is successor of
+  zen-coding (developed since 2009).
+
+zen-coding official site:
+  http://code.google.com/p/zen-coding/
+
+zen-coding official site:
+  http://code.google.com/p/zen-coding/
+
+zen-coding vim plugin repository:
+  http://mattn.github.com/zencoding-vim
+
+zen-coding development repository:
+  https://github.com/mattn/zencoding-vim
+
+My blog posts about zencoding-vim (japanese):
+  http://mattn.kaoriya.net/software/vim/20100222103327.htm
+  http://mattn.kaoriya.net/software/vim/20100306021632.htm
+
+Japanese blog posts about zencoding-vim:
+  http://d.hatena.ne.jp/idesaku/20100424/1272092255
+  http://d.hatena.ne.jp/griefworker/20110118/vim_zen_coding
+  http://d.hatena.ne.jp/sakurako_s/20110126/1295988873
+  http://looxu.blogspot.jp/2010/02/zencodingvimhtml.html
+
+Tutorial translated in chinese:
+  http://www.zfanw.com/blog/zencoding-vim-tutorial-chinese.html
+
+==============================================================================
+TODO                                                              *emmet-todo*
+  * wrapping inline selected.
+  * more documents.
+  * more contributor.
+  * more time to improve emmet.vim.
+
+==============================================================================
+vim: filetype=help expandtab textwidth=78 tabstop=8 norightleft foldenable foldlevel=0 :
diff --git a/vim-plugins/bundle/emmet-vim/doc/screenshot.gif b/vim-plugins/bundle/emmet-vim/doc/screenshot.gif
new file mode 100644
index 0000000..5330f63
Binary files /dev/null and b/vim-plugins/bundle/emmet-vim/doc/screenshot.gif differ
diff --git a/vim-plugins/bundle/emmet-vim/emmet.vim.vimup b/vim-plugins/bundle/emmet-vim/emmet.vim.vimup
new file mode 100644
index 0000000..3708229
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/emmet.vim.vimup
@@ -0,0 +1,277 @@
+script_name: Emmet.vim
+script_id: '2981'
+script_type: utility
+script_package: emmet-vim.zip
+script_version: '0.86'
+required_vim_version: '7.0'
+summary: vim plugins for HTML and CSS hi-speed coding.
+
+detailed_description: |
+
+  This is vim script support expanding abbreviation like emmet.
+  ref: http://emmet.io/
+
+  There is a movie using emmet.vim
+  ref: http://mattn.github.com/emmet-vim
+
+  Source Repository.
+  ref: http://github.com/mattn/emmet-vim
+
+  Type abbreviation
+     +-------------------------------------
+     | html:5_
+     +-------------------------------------
+  "_" is a cursor position. and type "<c-y>," (Ctrl + y and Comma)
+  NOTE: Don't worry about key map. you can change it easily.
+     +-------------------------------------
+     | <!DOCTYPE HTML>
+     | <html lang="en">
+     | <head>
+     |     <title></title>
+     |     <meta charset="UTF-8">
+     | </head>
+     | <body>
+     |      _
+     | </body>
+     | </html>
+     +-------------------------------------
+  Type following
+     +-------------------------------------
+     | div#foo$*2>div.bar
+     +-------------------------------------
+  And type "<c-y>,"
+     +-------------------------------------
+     |<div id="foo1">
+     |    <div class="bar">_</div>
+     |</div>
+     |<div id="foo2">
+     |    <div class="bar"></div>
+     |</div>
+     | _
+     +-------------------------------------
+
+  Tutorial:
+
+    http://github.com/mattn/emmet-vim/raw/master/TUTORIAL
+
+  How work this:
+
+    http://mattn.github.com/emmet-vim
+
+  Tips:
+
+  You can customize behavior of expanding with overriding config.
+  This configuration will be merged at loading plugin.
+
+    let g:user_emmet_settings = {
+    \  'indentation' : '  ',
+    \  'perl' : {
+    \    'aliases' : {
+    \      'req' : 'require '
+    \    },
+    \    'snippets' : {
+    \      'use' : "use strict\nuse warnings\n\n",
+    \      'warn' : "warn \"|\";",
+    \    }
+    \  }
+    \}
+
+    let g:user_emmet_expandabbr_key = '<c-e>'
+
+    let g:use_emmet_complete_tag = 1
+
+  You can set language attribute in html using emmet_settings['lang'].
+
+install_details: |
+
+  # cd ~/.vim
+  # unzip emmet-vim.zip
+
+  or if you install pathogen.vim:
+
+  # cd ~/.vim/bundle # or make directory
+  # unzip /path/to/emmet-vim.zip
+
+  if you get sources from repository:
+
+  # cd ~/.vim/bundle # or make directory
+  # git clone http://github.com/mattn/emmet-vim.git
+
+versions:
+- '0.86': |
+   This is an upgrade for Emmet.vim: lot of bug fixes.
+- '0.85': |
+   This is an upgrade for Emmet.vim: lot of bug fixes.
+- '0.84': |
+   This is an upgrade for Emmet.vim: lot of bug fixes. fix bug that interpose insert completion plugins.
+- '0.83': |
+   This is an upgrade for Emmet.vim: lot of bug fixes.
+- '0.82': |
+   This is an upgrade for Emmet.vim: many bug fixes.
+- '0.81': |
+   Release of Emmet.vim: renamed from ZenCoding.vim.
+- '0.80': |
+   This is an upgrade for ZenCoding.vim: add emmet features.
+- '0.74': |
+   This is an upgrade for ZenCoding.vim: many bug fixes.
+- '0.73': |
+   This is an upgrade for ZenCoding.vim: many bug fixes. and support slim format (experimental).
+- '0.72': |
+   This is an upgrade for ZenCoding.vim:
+   [fix] fix finding tokens.
+- '0.71': |
+   This is an upgrade for ZenCoding.vim:
+   [fix] fix finding begin of tokens.
+- '0.70': |
+   This is an upgrade for ZenCoding.vim:
+   [mod] Changed behavior of expanding. "div div>a|" should keep first div element.
+   [add] Supported slim formatter.
+- '0.60': |
+   This is an upgrade for ZenCoding.vim:
+   [fix] fixed expanding {{}}.
+- '0.59': |
+   This is an upgrade for ZenCoding.vim:
+   [fix] fixed toggleComment and mny bugs.
+- '0.58': |
+   This is an upgrade for ZenCoding.vim:
+   [fix] fixed 'foo+' style expandos.
+- '0.57': |
+   This is an upgrade for ZenCoding.vim:
+   [fix] fixed expandos that don't work 'choose' in xsl.
+- '0.56': |
+   This is an upgrade for ZenCoding.vim:
+   [fix] fixed contents parser.
+- '0.55': |
+   uploaded again: sorry, files was old.
+- '0.54': |
+   [add] support sass, xsd.
+   [fix] expanding with html tag.
+   uploaded again: sorry, fileformat was DOS.
+- '0.53': |
+   [fix] gif width/height was swapped.
+- '0.52': |
+   [fix] broken wrap expanding.
+- '0.51': |
+   This is an upgrade for ZenCoding.vim:
+   [fix] wrap expanding with '&'.
+   [fix] expand .content to class="content".
+   [fix] haml expanding.
+   [fix] bg+ snippet
+- '0.50': |
+   This is an upgrade for ZenCoding.vim:
+   [fix] fixed parsing '#{{foo}}' and '.{{bar}}'.
+- '0.49': |
+   This is an upgrade for ZenCoding.vim:
+   [doc] add help manual.
+- '0.48': |
+   This is an upgrade for ZenCoding.vim:
+   [fix] install mappings to global.
+- '0.47': |
+   This is an upgrade for ZenCoding.vim:
+   [drastic changes] enable autoload. you should whole replace older files.
+   package was empty. upload again.
+- '0.46': |
+   This is an upgrade for ZenCoding.vim:
+   [drastic changes] enable autoload. you should whole replace older files.
+- '0.45': |
+   This is an upgrade for ZenCoding.vim:
+   fixed attribute parsing like: a[href="hello', world" rel].
+- '0.44': |
+   This is an upgrade for ZenCoding.vim:
+   fixed checking whether have mapping using maparg() / hasmapto().
+- '0.43': |
+   This is an upgrade for ZenCoding.vim:
+   fixed behavior for nested block. like "html:5>#page>(header#globalHeader>(hgroup>h1+h2)+(nav>ul>li*3>a)+(form>p.siteSearch>input+input[type=button]))+(#contents>(#main>(section>h2+p*5)+p.pagetop>a[href=#page])+(#sub>p+(nav>ul>li>a)))+(footer#globalFoooter>(ul>li>a)+(p.copyright>small))"
+- '0.42': |
+   This is an upgrade for ZenCoding.vim:
+   fixed select/option indent.
+- '0.41': |
+   This is an upgrade for ZenCoding.vim:
+   fixed default filter. when using 'e' filter, output become empty.
+- '0.40': |
+   This is an upgrade for ZenCoding.vim:
+   add the pure vimscript code for 'get image size'. you can use it without perl interface just now.
+   change key assign of ZenCodingExpandWord from ',' to ';'. it don't effect to most users.
+- '0.39': |
+   This is an upgrade for ZenCoding.vim: fixed problem about 'selection'. see http://github.com/mattn/zencoding-vim/issues/#issue/2
+- '0.38': |
+   This is an upgrade for ZenCoding.vim: use v7h"_s instead of v7hs for backspace.
+- '0.37': |
+   This is an upgrade for ZenCoding.vim: fixed problem that won't working with some 'backspace' options.
+- '0.36': |
+   This is an upgrade for ZenCoding.vim: fixed problem that filter does not work.
+- '0.35': |
+   This is an upgrade for ZenCoding.vim: enable zencoding for other languages. (meaning php also)
+- '0.34': |
+   This is an upgrade for ZenCoding.vim: enable zencoding for xsl. (you should add ~/.vim/ftplugin/xslt/zencoding.vim)
+- '0.33': |
+   This is an upgrade for ZenCoding.vim: fixed problem breaking multibyte when cursor is in a part of line. enabled zencoding for javascript in html.
+- '0.32': |
+   This is an upgrade for ZenCoding.vim: fixed indentation. supported extends so that you can enable zencoding for php/xhtml/haml other's section 14 in http://github.com/mattn/zencoding-vim/raw/master/TUTORIAL
+- '0.31': |
+   This is an upgrade for ZenCoding.vim: fixed indentation and $$$ problem. fixed about missing support multiple classes.
+- '0.30': |
+   This is an upgrade for ZenCoding.vim: Fixed key assign.
+- '0.29': |
+   This is an upgrade for ZenCoding.vim: Changed leading key to '<c-y>' from '<c-z>'.
+- '0.28': |
+   This is an upgrade for ZenCoding.vim: supported 'Balance Tag Inward/Outward', 'Go to Next/Previous Edit Point', 'Update <img> Size', 'Remove Tag', 'Split/Join Tag', 'Toggle Comment'
+- '0.27': |
+   This is an upgrade for ZenCoding.vim: fixed problem that can't work on the part of multibyte characters. fixed inline elements behavior.
+- '0.26': |
+   This is an upgrade for ZenCoding.vim: The count of '(((a#foo + a#bar)*2)*3)' should be 12.
+- '0.25': |
+   This is an upgrade for ZenCoding.vim: store undo before working. good luck about 'table>(tr>td*3)*4'.
+- '0.24': |
+   This is an upgrade for ZenCoding.vim: fixed behavior of parsing area of visual selection.
+- '0.23': |
+   This is an upgrade for ZenCoding.vim: pre-expand '#header>li<#content' to 'div#header>li<div#content'. support () expression.
+- '0.22': |
+   This is an upgrade for ZenCoding.vim: expand 'ul+' to 'ul>li'. fix undo ring. support visual selection. when type trigger key on visual select, it request you leader like 'ul>li'. if you give 'ul>li*' as leader, you'll get each separate 'ul>li' tags. and when you give 'blockquote' as leader, you'll get blocked text.
+- '0.21': |
+   This is an upgrade for ZenCoding.vim: treat xhtml as html.
+- '0.20': |
+   This is an upgrade for ZenCoding.vim: add option use_zen_complete_tag for complete abbr.
+- '0.19': |
+   This is an upgrade for ZenCoding.vim: fixed problem that couldn't expand 'link:css' correctly.
+- '0.18': |
+   This is an upgrade for ZenCoding.vim: ignore duplicate key map.
+- '0.17': |
+   This is an upgrade for ZenCoding.vim: fixed key map.
+- '0.16': |
+   This is an upgrade for ZenCoding.vim: fixed problem 'endless loop'.
+- '0.15': |
+   This is an upgrade for ZenCoding.vim: set default filetype to 'html'.
+- '0.14': |
+   This is an upgrade for ZenCoding.vim: fixed tag name like 'fs:n' in 'css'.
+- '0.14': |
+   This is an upgrade for ZenCoding.vim: indentation for each languages.
+- '0.13': |
+   This is an upgrade for ZenCoding.vim: user key map.
+- '0.12': |
+   This is an upgrade for ZenCoding.vim: few extensive notation.
+- '0.11': |
+   This is an upgrade for ZenCoding.vim: fixed indent.
+- '0.10': |
+   This is an upgrade for ZenCoding.vim: fixed behavior of '+' operator
+- '0.9': |
+   This is an upgrade for ZenCoding.vim: fixed single line behavior
+- '0.8': |
+   This is an upgrade for ZenCoding.vim: support 'a[href=http://www.google.com]{Google}'
+- '0.7': |
+   This is an upgrade for ZenCoding.vim: fixed behavior in 'a+b'.
+- '0.6': |
+   This is an upgrade for ZenCoding.vim: fixed strange behavior about '<a href="">b_</a>'.
+- '0.5': |
+   This is an upgrade for ZenCoding.vim: recover rest part in line.
+- '0.4': |
+   This is an upgrade for ZenCoding.vim: fixed cursor position. fixed ${lang} replacement.
+- '0.3': |
+   This is an upgrade for ZenCoding.vim: fixed line expanding.
+- '0.2': |
+   This is an upgrade for ZenCoding.vim: fixed problem that moving cursor with expanding.
+- '0.1': |
+   Initial upload
+
+# __END__
+# vim: filetype=yaml
diff --git a/vim-plugins/bundle/emmet-vim/plugin/emmet.vim b/vim-plugins/bundle/emmet-vim/plugin/emmet.vim
new file mode 100644
index 0000000..927a467
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/plugin/emmet.vim
@@ -0,0 +1,177 @@
+"=============================================================================
+" File: emmet.vim
+" Author: Yasuhiro Matsumoto <mattn.jp@gmail.com>
+" Last Change: 26-Jul-2015.
+" Version: 0.86
+" WebPage: http://github.com/mattn/emmet-vim
+" Description: vim plugins for HTML and CSS hi-speed coding.
+" SeeAlso: http://emmet.io/
+" Usage:
+"
+"   This is vim script support expanding abbreviation like emmet.
+"   ref: http://emmet.io/
+"
+"   Type abbreviation
+"      +-------------------------------------
+"      | html:5_
+"      +-------------------------------------
+"   "_" is a cursor position. and type "<c-y>," (Ctrl+y and Comma)
+"   NOTE: Don't worry about key map. you can change it easily.
+"      +-------------------------------------
+"      | <!DOCTYPE HTML>
+"      | <html lang="en">
+"      | <head>
+"      |     <title></title>
+"      |     <meta charset="UTF-8">
+"      | </head>
+"      | <body>
+"      |      _
+"      | </body>
+"      | </html>
+"      +-------------------------------------
+"   Type following
+"      +-------------------------------------
+"      | div#foo$*2>div.bar
+"      +-------------------------------------
+"   And type "<c-y>,"
+"      +-------------------------------------
+"      |<div id="foo1">
+"      |    <div class="bar">_</div>
+"      |</div>
+"      |<div id="foo2">
+"      |    <div class="bar"></div>
+"      |</div>
+"      +-------------------------------------
+"
+" Tips:
+"
+"   You can customize behavior of expanding with overriding config.
+"   This configuration will be marged at loading plugin.
+"
+"     let g:user_emmet_settings = {
+"     \  'indentation' : '  ',
+"     \  'perl' : {
+"     \    'aliases' : {
+"     \      'req' : 'require '
+"     \    },
+"     \    'snippets' : {
+"     \      'use' : "use strict\nuse warnings\n\n",
+"     \      'warn' : "warn \"|\";",
+"     \    }
+"     \  }
+"     \}
+"
+"   You can set language attribute in html using 'emmet_settings.lang'.
+"
+" GetLatestVimScripts: 2981 1 :AutoInstall: emmet.vim
+" script type: plugin
+
+if &compatible || v:version < 702 || (exists('g:loaded_emmet_vim') && g:loaded_emmet_vim)
+  finish
+endif
+let g:loaded_emmet_vim = 1
+
+let s:save_cpo = &cpoptions
+set cpoptions&vim
+
+if !exists('g:emmet_html5')
+  let g:emmet_html5 = 1
+endif
+
+if !exists('g:emmet_docroot')
+  let g:emmet_docroot = {}
+endif
+
+if !exists('g:emmet_debug')
+  let g:emmet_debug = 0
+endif
+
+if !exists('g:emmet_curl_command')
+  let g:emmet_curl_command = 'curl -s -L -A Mozilla/5.0'
+endif
+
+if !exists('g:user_emmet_leader_key')
+  let g:user_emmet_leader_key = '<c-y>'
+endif
+
+function! s:install_plugin(mode, buffer)
+  let buffer = a:buffer ? '<buffer>' : ''
+  let items = [
+  \ {'mode': 'i', 'var': 'user_emmet_expandabbr_key', 'key': ',', 'plug': 'emmet-expand-abbr', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#expandAbbr(0,"")<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_expandabbr_key', 'key': ',', 'plug': 'emmet-expand-abbr', 'func': ':call emmet#expandAbbr(3,"")<cr>'},
+  \ {'mode': 'v', 'var': 'user_emmet_expandabbr_key', 'key': ',', 'plug': 'emmet-expand-abbr', 'func': ':call emmet#expandAbbr(2,"")<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_expandword_key', 'key': ';', 'plug': 'emmet-expand-word', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#expandAbbr(1,"")<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_expandword_key', 'key': ';', 'plug': 'emmet-expand-word', 'func': ':call emmet#expandAbbr(1,"")<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_update_tag', 'key': 'u', 'plug': 'emmet-update-tag', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#updateTag()<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_update_tag', 'key': 'u', 'plug': 'emmet-update-tag', 'func': ':call emmet#updateTag()<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_balancetaginward_key', 'key': 'd', 'plug': 'emmet-balance-tag-inward', 'func': '<esc>:call emmet#balanceTag(1)<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_balancetaginward_key', 'key': 'd', 'plug': 'emmet-balance-tag-inward', 'func': ':call emmet#balanceTag(1)<cr>'},
+  \ {'mode': 'v', 'var': 'user_emmet_balancetaginward_key', 'key': 'd', 'plug': 'emmet-balance-tag-inward', 'func': ':call emmet#balanceTag(2)<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_balancetagoutward_key', 'key': 'D', 'plug': 'emmet-balance-tag-outword', 'func': '<esc>:call emmet#balanceTag(-1)<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_balancetagoutward_key', 'key': 'D', 'plug': 'emmet-balance-tag-outword', 'func': ':call emmet#balanceTag(-1)<cr>'},
+  \ {'mode': 'v', 'var': 'user_emmet_balancetagoutward_key', 'key': 'D', 'plug': 'emmet-balance-tag-outword', 'func': ':call emmet#balanceTag(-2)<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_next_key', 'key': 'n', 'plug': 'emmet-move-next', 'func': '<esc>:call emmet#moveNextPrev(0)<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_next_key', 'key': 'n', 'plug': 'emmet-move-next', 'func': ':call emmet#moveNextPrev(0)<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_prev_key', 'key': 'N', 'plug': 'emmet-move-prev', 'func': '<esc>:call emmet#moveNextPrev(1)<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_prev_key', 'key': 'N', 'plug': 'emmet-move-prev', 'func': ':call emmet#moveNextPrev(1)<cr>'},
+  \ {'mode': 'i', 'var': '', 'key': '', 'plug': 'emmet-move-next-item', 'func': '<esc>:call emmet#moveNextPrevItem(0)<cr>'},
+  \ {'mode': 'n', 'var': '', 'key': '', 'plug': 'emmet-move-next-item', 'func': ':call emmet#moveNextPrevItem(0)<cr>'},
+  \ {'mode': 'i', 'var': '', 'key': '', 'plug': 'emmet-move-prev-item', 'func': '<esc>:call emmet#moveNextPrevItem(1)<cr>'},
+  \ {'mode': 'n', 'var': '', 'key': '', 'plug': 'emmet-move-prev-item', 'func': ':call emmet#moveNextPrevItem(1)<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_imagesize_key', 'key': 'i', 'plug': 'emmet-image-size', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#imageSize()<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_imagesize_key', 'key': 'i', 'plug': 'emmet-image-size', 'func': ':call emmet#imageSize()<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_togglecomment_key', 'key': '/', 'plug': 'emmet-toggle-comment', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#toggleComment()<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_togglecomment_key', 'key': '/', 'plug': 'emmet-toggle-comment', 'func': ':call emmet#toggleComment()<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_splitjointag_key', 'key': 'j', 'plug': 'emmet-split-join-tag', 'func': '<esc>:call emmet#splitJoinTag()<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_splitjointag_key', 'key': 'j', 'plug': 'emmet-split-join-tag', 'func': ':call emmet#splitJoinTag()<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_removetag_key', 'key': 'k', 'plug': 'emmet-remove-tag', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#removeTag()<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_removetag_key', 'key': 'k', 'plug': 'emmet-remove-tag', 'func': ':call emmet#removeTag()<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_anchorizeurl_key', 'key': 'a', 'plug': 'emmet-anchorize-url', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#anchorizeURL(0)<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_anchorizeurl_key', 'key': 'a', 'plug': 'emmet-anchorize-url', 'func': ':call emmet#anchorizeURL(0)<cr>'},
+  \ {'mode': 'i', 'var': 'user_emmet_anchorizesummary_key', 'key': 'A', 'plug': 'emmet-anchorize-summary', 'func': '<c-r>=emmet#util#closePopup()<cr><c-r>=emmet#anchorizeURL(1)<cr>'},
+  \ {'mode': 'n', 'var': 'user_emmet_anchorizesummary_key', 'key': 'A', 'plug': 'emmet-anchorize-summary', 'func': ':call emmet#anchorizeURL(1)<cr>'},
+  \ {'mode': 'v', 'var': 'user_emmet_mergelines_key', 'key': 'm', 'plug': 'emmet-merge-lines', 'func': ':call emmet#mergeLines()<cr>'},
+  \ {'mode': 'v', 'var': 'user_emmet_codepretty_key', 'key': 'c', 'plug': 'emmet-code-pretty', 'func': ':call emmet#codePretty()<cr>'},
+  \]
+
+  let only_plug = get(g:, 'emmet_install_only_plug', 0)
+  for item in items
+    if a:mode !=# 'a' && stridx(a:mode, item.mode) == -1
+      continue
+    endif
+    exe item.mode . 'noremap '. buffer .' <plug>(' . item.plug . ') ' . item.func
+    if item.var != '' && !only_plug
+      if exists('g:' . item.var)
+        let key = eval('g:' . item.var)
+      else
+        let key = g:user_emmet_leader_key . item.key
+      endif
+      if !hasmapto('<plug>(' . item.plug . ')', item.mode) && !len(maparg(key, item.mode))
+        exe item.mode . 'map ' . buffer . ' <unique> ' . key . ' <plug>(' . item.plug . ')'
+      endif
+    endif
+  endfor
+
+  if exists('g:user_emmet_complete_tag') && g:user_emmet_complete_tag
+    if get(g:, 'user_emmet_install_global', 1)
+      set omnifunc=emmet#completeTag
+    else
+      setlocal omnifunc=emmet#completeTag
+    endif
+  endif
+endfunction
+
+command! -nargs=0 -bar EmmetInstall call <SID>install_plugin(get(g:, 'user_emmet_mode', 'a'), 1)
+
+if get(g:, 'user_emmet_install_global', 1)
+  call s:install_plugin(get(g:, 'user_emmet_mode', 'a'), 0)
+endif
+
+if get(g:, 'user_emmet_install_command', 1)
+  command! -nargs=1 Emmet call emmet#expandAbbr(4, <q-args>)
+endif
+
+let &cpoptions = s:save_cpo
+unlet s:save_cpo
+
+" vim:set et:
diff --git a/vim-plugins/bundle/emmet-vim/unittest.vim b/vim-plugins/bundle/emmet-vim/unittest.vim
new file mode 100644
index 0000000..914c7c7
--- /dev/null
+++ b/vim-plugins/bundle/emmet-vim/unittest.vim
@@ -0,0 +1,1023 @@
+" {{{
+let s:sfile = expand('<sfile>')
+
+function! s:reload(d)
+  exe 'so' a:d.'/plugin/emmet.vim'
+  for f in split(globpath(a:d, 'autoload/**/*.vim'), "\n")
+    silent! exe 'so' f
+  endfor
+endfunction
+
+function! s:show_type(type)
+  echohl Search | echon '[' a:type "]\n" | echohl None
+  echo "\r"
+endfunction
+
+function! s:show_category(category)
+  echohl MatchParen | echon '[' a:category "]\n" | echohl None
+  echo "\r"
+endfunction
+
+function! s:show_pass(pass)
+  echohl Title | echo 'pass'.a:pass."\n" | echohl None
+endfunction
+
+function! s:show_done()
+  echohl IncSearch | echo 'done' | echohl None
+endfunction
+
+function! s:escape(str)
+  let str = a:str
+  let str = substitute(str, "\n", '\\n', 'g')
+  let str = substitute(str, "\t", '\\t', 'g')
+  return str
+endfunction
+
+function! s:show_title(no, title)
+  let title = s:escape(a:title)
+  let width = &columns - 23
+  echohl MoreMsg | echon "\rtesting #".printf('%03d', a:no)
+  echohl None | echon ': ' . (len(title) < width ? (title.repeat(' ', width-len(title))) : strpart(title, 0, width)) . ' ... '
+endfunction
+
+function! s:show_skip(no, title)
+  let title = s:escape(a:title)
+  let width = &columns - 23
+  echohl WarningMsg | echon "\rskipped #".printf('%03d', a:no)
+  echohl None | echon ': ' . (len(title) < width ? (title.repeat(' ', width-len(title))) : strpart(title, 0, width)) . ' ... '
+  echo ''
+endfunction
+
+function! s:show_ok()
+  echohl Title | echon "ok\n" | echohl None
+  echo ''
+endfunction
+
+function! s:show_ng(no, expect, got)
+  echohl WarningMsg | echon "ng\n" | echohl None
+  echohl ErrorMsg | echo 'failed test #'.a:no | echohl None
+  set more
+  echohl WarningMsg | echo printf('expect(%d):', len(a:expect)) | echohl None
+  echo join(split(a:expect, "\n", 1), "|\n")
+  echohl WarningMsg | echo printf('got(%d):', len(a:got)) | echohl None
+  echo join(split(a:got, "\n", 1), "|\n")
+  let cs = split(a:expect, '\zs')
+  for c in range(len(cs))
+    if c < len(a:got)
+      if a:expect[c] != a:got[c]
+        echohl WarningMsg | echo 'differ at:' | echohl None
+        echo a:expect[c :-1]
+        break
+      endif
+    endif
+  endfor
+  echo ''
+  throw 'stop'
+endfunction
+
+function! s:test(...)
+  let type = get(a:000, 0, '')
+  let name = get(a:000, 1, '')
+  let index = get(a:000, 2, '')
+
+  let testgroups = eval(join(filter(split(substitute(join(readfile(s:sfile), "\n"), '.*\nfinish\n', '', ''), '\n', 1), "v:val !~ '^\"'")))
+  for testgroup in testgroups
+    if len(type) > 0 && testgroup.type != type | continue | endif
+    call s:show_type(testgroup.type)
+    for category in testgroup.categories
+      if len(name) > 0 && substitute(category.name,' ','_','g') != name | continue | endif
+      call s:show_category(category.name)
+      let tests = category.tests
+      let start = reltime()
+      for n in range(len(tests))
+        if len(index) > 0 && n != index | continue | endif
+        if has_key(tests[n], 'ignore') && tests[n].ignore | continue | endif
+        let query = tests[n].query
+        let options = has_key(tests[n], 'options') ? tests[n].options : {}
+        let result = tests[n].result
+        if has_key(tests[n], 'skip') && tests[n].skip != 0
+          call s:show_skip(n+1, query)
+          continue
+        endif
+        let oldoptions = {}
+        for opt in keys(options)
+          if has_key(g:, opt)
+            let oldoptions[opt] = get(g:, opt)
+          endif
+          let g:[opt] = options[opt]
+        endfor
+        if stridx(query, '$$$$') != -1
+          silent! 1new
+          silent! exe 'setlocal ft='.testgroup.type
+          silent! let key = matchstr(query, '.*\$\$\$\$\zs.*\ze\$\$\$\$')
+          if len(key) > 0
+            exe printf('let key = "%s"', key)
+          else
+            let key = "\<c-y>,"
+          endif
+          silent! let query = substitute(query, '\$\$\$\$.*\$\$\$\$', '$$$$', '')
+          silent! call setline(1, split(query, "\n"))
+          let cmd = "normal gg0/\\$\\$\\$\\$\ri\<del>\<del>\<del>\<del>".key
+          if stridx(result, '$$$$') != -1
+            let cmd .= '$$$$'
+          endif
+          silent! exe cmd
+          unlet! res | let res = join(getline(1, line('$')), "\n")
+          silent! bw!
+          call s:show_title(n+1, query)
+        else
+          call s:show_title(n+1, query)
+          unlet! res | let res = emmet#expandWord(query, testgroup.type, 0)
+        endif
+        for opt in keys(options)
+          if has_key(oldoptions, opt)
+            let g:[opt] = oldoptions[opt]
+          else
+            call remove(g:, opt)
+          endif
+        endfor
+        if stridx(result, '$$$$') != -1
+          if res ==# result
+            call s:show_ok()
+          else
+            call s:show_ng(n+1, result, res)
+          endif
+        else
+          if res ==# result
+            call s:show_ok()
+          else
+            call s:show_ng(n+1, result, res)
+          endif
+        endif
+      endfor
+      call s:show_pass(reltimestr(reltime(start)))
+    endfor
+  endfor
+endfunction
+
+function! s:do_tests(...)
+  try
+    if exists('g:user_emmet_settings')
+      let s:old_user_emmet_settings = g:user_emmet_settings
+    endif
+    let g:user_emmet_settings = {'variables': {'indentation': "\t", 'use_selection': 1}}
+    let oldmore = &more
+    call s:reload(fnamemodify(s:sfile, ':h'))
+    let &more = 0
+    call call('s:test', a:000)
+    call s:show_done()
+  catch
+    echohl ErrorMsg | echomsg v:exception | echohl None
+  finally
+    let &more=oldmore
+    if exists('s:old_user_emmet_settings')
+      let g:user_emmet_settings = s:old_user_emmet_settings
+    endif
+  endtry
+endfunction
+
+function! s:emmet_unittest_complete(arglead, cmdline, cmdpos)
+  let args = split(a:cmdline, '\s\+', 1)
+  let testgroups = eval(join(filter(split(substitute(join(readfile(s:sfile), "\n"), '.*\nfinish\n', '', ''), '\n', 1), "v:val !~ '^\"'")))
+  try
+    if len(args) == 2
+      return filter(map(testgroups, 'v:val.type'), 'stridx(v:val,args[1])!=-1')
+    elseif len(args) == 3
+      return map(filter(testgroups, 'v:val.type==args[1]')[0].categories, 'substitute(v:val.name," ","_","g")')
+    endif
+  catch
+  endtry
+  return []
+endfunction
+
+command! -nargs=* -complete=customlist,<SID>emmet_unittest_complete EmmetUnitTest call s:do_tests(<f-args>)
+if s:sfile == expand('%:p')
+  EmmetUnitTest
+endif
+" }}}
+
+finish
+[
+{ 'test-html': "{{{",
+  'type': "html",
+  'categories': [
+    {
+      'name': 'expand abbreviation',
+      'tests': [
+        {
+          'query': "div",
+          'result': "<div></div>\n",
+        },
+        {
+          'query': "div#wrapper",
+          'result': "<div id=\"wrapper\"></div>\n",
+        },
+        {
+          'query': "div.box",
+          'result': "<div class=\"box\"></div>\n",
+        },
+        {
+          'query': "a[title=TITLE]",
+          'result': "<a href=\"\" title=\"TITLE\"></a>\n",
+        },
+        {
+          'query': "div#wrapper.box",
+          'result': "<div id=\"wrapper\" class=\"box\"></div>\n",
+        },
+        {
+          'query': "div#wrapper.box.current",
+          'result': "<div id=\"wrapper\" class=\"box current\"></div>\n",
+        },
+        {
+          'query': "div#wrapper.box.current[title=TITLE rel]",
+          'result': "<div id=\"wrapper\" class=\"box current\" title=\"TITLE\" rel=\"\"></div>\n",
+        },
+        {
+          'query': "div#main+div#sub",
+          'result': "<div id=\"main\"></div>\n<div id=\"sub\"></div>\n",
+        },
+        {
+          'query': "div#main>div#sub",
+          'result': "<div id=\"main\">\n\t<div id=\"sub\"></div>\n</div>\n",
+        },
+        {
+          'query': "html:xt>div#header>div#logo+ul#nav>li.item-$*5>a",
+          'result': "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\">\n<head>\n\t<meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\" />\n\t<title></title>\n</head>\n<body>\n\t<div id=\"header\">\n\t\t<div id=\"logo\"></div>\n\t\t<ul id=\"nav\">\n\t\t\t<li class=\"item-1\"><a href=\"\"></a></li>\n\t\t\t<li class=\"item-2\"><a href=\"\"></a></li>\n\t\t\t<li class=\"item-3\"><a href=\"\"></a></li>\n\t\t\t<li class=\"item-4\"><a href=\"\"></a></li>\n\t\t\t<li class=\"item-5\"><a href=\"\"></a></li>\n\t\t</ul>\n\t</div>\n\t\n</body>\n</html>",
+        },
+        {
+          'query': "ol>li*2",
+          'result': "<ol>\n\t<li></li>\n\t<li></li>\n</ol>\n",
+        },
+        {
+          'query': "a",
+          'result': "<a href=\"\"></a>\n",
+        },
+        {
+          'query': "obj",
+          'result': "<object data=\"\" type=\"\"></object>\n",
+        },
+        {
+          'query': "cc:ie6>p+blockquote#sample$.so.many.classes*2",
+          'result': "<!--[if lte IE 6]>\n\t<p></p>\n\t<blockquote id=\"sample1\" class=\"so many classes\"></blockquote>\n\t<blockquote id=\"sample2\" class=\"so many classes\"></blockquote>\n\t\n<![endif]-->",
+        },
+        {
+          'query': "html:4t>div#wrapper>div#header+div#contents+div#footer",
+          'result': "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n<html lang=\"en\">\n<head>\n\t<meta http-equiv=\"Content-Type\" content=\"text/html;charset=UTF-8\">\n\t<title></title>\n</head>\n<body>\n\t<div id=\"wrapper\">\n\t\t<div id=\"header\"></div>\n\t\t<div id=\"contents\"></div>\n\t\t<div id=\"footer\"></div>\n\t</div>\n\t\n</body>\n</html>",
+        },
+        {
+          'query': "a[href=http://www.google.com/].foo#hoge",
+          'result': "<a id=\"hoge\" class=\"foo\" href=\"http://www.google.com/\"></a>\n",
+        },
+        {
+          'query': "a[href=http://www.google.com/]{Google}",
+          'result': "<a href=\"http://www.google.com/\">Google</a>\n",
+        },
+        {
+          'query': "{Emmet}",
+          'result': "Emmet",
+        },
+        {
+          'query': "a+b",
+          'result': "<a href=\"\"></a>\n<b></b>\n",
+        },
+        {
+          'query': "a>b>i<b",
+          'result': "<a href=\"\"><b><i></i></b><b></b></a>\n",
+        },
+        {
+          'query': "a>b>i^b",
+          'result': "<a href=\"\"><b><i></i></b><b></b></a>\n",
+        },
+        {
+          'query': "a>b>i<<b",
+          'result': "<a href=\"\"><b><i></i></b></a>\n<b></b>\n",
+        },
+        {
+          'query': "a>b>i^^b",
+          'result': "<a href=\"\"><b><i></i></b></a>\n<b></b>\n",
+        },
+        {
+          'query': "blockquote>b>i<<b",
+          'result': "<blockquote><b><i></i></b></blockquote>\n<b></b>\n",
+        },
+        {
+          'query': "blockquote>b>i^^b",
+          'result': "<blockquote><b><i></i></b></blockquote>\n<b></b>\n",
+        },
+        {
+          'query': "a[href=foo][class=bar]",
+          'result': "<a class=\"bar\" href=\"foo\"></a>\n",
+        },
+        {
+          'query': "a[a=b][b=c=d][e]{foo}*2",
+          'result': "<a href=\"e\" a=\"b\" b=\"c=d\">foo</a>\n<a href=\"e\" a=\"b\" b=\"c=d\">foo</a>\n",
+        },
+        {
+          'query': "a[a=b][b=c=d][e]*2{foo}",
+          'result': "<a href=\"e\" a=\"b\" b=\"c=d\"></a>\n<a href=\"e\" a=\"b\" b=\"c=d\"></a>\nfoo",
+        },
+        {
+          'query': "a*2{foo}a",
+          'result': "<a href=\"\"></a>\n<a href=\"\"></a>\nfoo<a href=\"\"></a>\n",
+        },
+        {
+          'query': "a{foo}*2>b",
+          'result': "<a href=\"\">foo<b></b></a>\n<a href=\"\">foo<b></b></a>\n",
+        },
+        {
+          'query': "a*2{foo}>b",
+          'result': "<a href=\"\"></a>\n<a href=\"\"></a>\nfoo",
+        },
+        {
+          'query': "table>tr>td.name#foo+td*3",
+          'result': "<table>\n\t<tr>\n\t\t<td id=\"foo\" class=\"name\"></td>\n\t\t<td></td>\n\t\t<td></td>\n\t\t<td></td>\n\t</tr>\n</table>\n",
+        },
+        {
+          'query': "div#header + div#footer",
+          'result': "<div id=\"header\"></div>\n<div id=\"footer\"></div>\n",
+        },
+        {
+          'query': "#header + div#footer",
+          'result': "<div id=\"header\"></div>\n<div id=\"footer\"></div>\n",
+        },
+        {
+          'query': "#header > ul > li < p{Footer}",
+          'result': "<div id=\"header\">\n\t<ul>\n\t\t<li></li>\n\t</ul>\n\t<p>Footer</p>\n</div>\n",
+        },
+        {
+          'query': "#header > ul > li ^ p{Footer}",
+          'result': "<div id=\"header\">\n\t<ul>\n\t\t<li></li>\n\t</ul>\n\t<p>Footer</p>\n</div>\n",
+        },
+        {
+          'query': "a#foo$$$*3",
+          'result': "<a id=\"foo001\" href=\"\"></a>\n<a id=\"foo002\" href=\"\"></a>\n<a id=\"foo003\" href=\"\"></a>\n",
+        },
+        {
+          'query': "ul+",
+          'result': "<ul>\n\t<li></li>\n</ul>\n",
+        },
+        {
+          'query': "table+",
+          'result': "<table>\n\t<tr>\n\t\t<td></td>\n\t</tr>\n</table>\n",
+        },
+        {
+          'query': "#header>li<#content",
+          'result': "<div id=\"header\">\n\t<li></li>\n</div>\n<div id=\"content\"></div>\n",
+        },
+        {
+          'query': "#header>li^#content",
+          'result': "<div id=\"header\">\n\t<li></li>\n</div>\n<div id=\"content\"></div>\n",
+        },
+        {
+          'query': "(#header>li)<#content",
+          'result': "<div id=\"header\">\n\t<li></li>\n</div>\n<div id=\"content\"></div>\n",
+        },
+        {
+          'query': "(#header>li)^#content",
+          'result': "<div id=\"header\">\n\t<li></li>\n</div>\n<div id=\"content\"></div>\n",
+        },
+        {
+          'query': "a>b>i<<div",
+          'result': "<a href=\"\"><b><i></i></b></a>\n<div></div>\n",
+        },
+        {
+          'query': "a>b>i^^div",
+          'result': "<a href=\"\"><b><i></i></b></a>\n<div></div>\n",
+        },
+        {
+          'query': "(#header>h1)+#content+#footer",
+          'result': "<div id=\"header\">\n\t<h1></h1>\n</div>\n<div id=\"content\"></div>\n<div id=\"footer\"></div>\n",
+        },
+        {
+          'query': "(#header>h1)+(#content>(#main>h2+div#entry$.section*5>(h3>a)+div>p*3+ul+)+(#utilities))+(#footer>address)",
+          'result': "<div id=\"header\">\n\t<h1></h1>\n</div>\n<div id=\"content\">\n\t<div id=\"main\">\n\t\t<h2></h2>\n\t\t<div id=\"entry1\" class=\"section\">\n\t\t\t<h3><a href=\"\"></a></h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry2\" class=\"section\">\n\t\t\t<h3><a href=\"\"></a></h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry3\" class=\"section\">\n\t\t\t<h3><a href=\"\"></a></h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry4\" class=\"section\">\n\t\t\t<h3><a href=\"\"></a></h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t\t<div id=\"entry5\" class=\"section\">\n\t\t\t<h3><a href=\"\"></a></h3>\n\t\t\t<div>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<p></p>\n\t\t\t\t<ul>\n\t\t\t\t\t<li></li>\n\t\t\t\t</ul>\n\t\t\t</div>\n\t\t</div>\n\t</div>\n\t<div id=\"utilities\"></div>\n</div>\n<div id=\"footer\">\n\t<address></address>\n</div>\n",
+        },
+        {
+          'query': "(div>(ul*2)*2)+(#utilities)",
+          'result': "<div>\n\t<ul></ul>\n\t<ul></ul>\n\t<ul></ul>\n\t<ul></ul>\n</div>\n<div id=\"utilities\"></div>\n",
+        },
+        {
+          'query': "table>(tr>td*3)*4",
+          'result': "<table>\n\t<tr>\n\t\t<td></td>\n\t\t<td></td>\n\t\t<td></td>\n\t</tr>\n\t<tr>\n\t\t<td></td>\n\t\t<td></td>\n\t\t<td></td>\n\t</tr>\n\t<tr>\n\t\t<td></td>\n\t\t<td></td>\n\t\t<td></td>\n\t</tr>\n\t<tr>\n\t\t<td></td>\n\t\t<td></td>\n\t\t<td></td>\n\t</tr>\n</table>\n",
+        },
+        {
+          'query': "(((a#foo+a#bar)*2)*3)",
+          'result': "<a id=\"foo\" href=\"\"></a>\n<a id=\"bar\" href=\"\"></a>\n<a id=\"foo\" href=\"\"></a>\n<a id=\"bar\" href=\"\"></a>\n<a id=\"foo\" href=\"\"></a>\n<a id=\"bar\" href=\"\"></a>\n<a id=\"foo\" href=\"\"></a>\n<a id=\"bar\" href=\"\"></a>\n<a id=\"foo\" href=\"\"></a>\n<a id=\"bar\" href=\"\"></a>\n<a id=\"foo\" href=\"\"></a>\n<a id=\"bar\" href=\"\"></a>\n",
+        },
+        {
+          'query': "div#box$*3>h3+p*2",
+          'result': "<div id=\"box1\">\n\t<h3></h3>\n\t<p></p>\n\t<p></p>\n</div>\n<div id=\"box2\">\n\t<h3></h3>\n\t<p></p>\n\t<p></p>\n</div>\n<div id=\"box3\">\n\t<h3></h3>\n\t<p></p>\n\t<p></p>\n</div>\n"
+        },
+        {
+          'query': "div#box.foo$$$.bar$$$*3",
+          'result': "<div id=\"box\" class=\"foo001 bar001\"></div>\n<div id=\"box\" class=\"foo002 bar002\"></div>\n<div id=\"box\" class=\"foo003 bar003\"></div>\n",
+        },
+        {
+          'query': "div#box$*3>h3+p.bar*2|e",
+          'result': "&lt;div id=\"box1\"&gt;\n\t&lt;h3&gt;&lt;/h3&gt;\n\t&lt;p class=\"bar\"&gt;&lt;/p&gt;\n\t&lt;p class=\"bar\"&gt;&lt;/p&gt;\n&lt;/div&gt;\n&lt;div id=\"box2\"&gt;\n\t&lt;h3&gt;&lt;/h3&gt;\n\t&lt;p class=\"bar\"&gt;&lt;/p&gt;\n\t&lt;p class=\"bar\"&gt;&lt;/p&gt;\n&lt;/div&gt;\n&lt;div id=\"box3\"&gt;\n\t&lt;h3&gt;&lt;/h3&gt;\n\t&lt;p class=\"bar\"&gt;&lt;/p&gt;\n\t&lt;p class=\"bar\"&gt;&lt;/p&gt;\n&lt;/div&gt;\n",
+        },
+        {
+          'query': "div>div#page>p.title+p|c",
+          'result': "<div>\n\t<!-- #page -->\n\t<div id=\"page\">\n\t\t<!-- .title -->\n\t\t<p class=\"title\"></p>\n\t\t<!-- /.title -->\n\t\t<p></p>\n\t</div>\n\t<!-- /#page -->\n</div>\n",
+        },
+        {
+          'query': "kbd*2|s",
+          'result': "<kbd></kbd><kbd></kbd>",
+        },
+        {
+          'query': "link:css",
+          'result': "<link rel=\"stylesheet\" href=\"style.css\" media=\"all\">\n",
+        },
+        {
+          'query': "a[title=\"Hello', world\" rel]",
+          'result': "<a href=\"\" title=\"Hello', world\" rel=\"\"></a>\n",
+        },
+        {
+          'query': "div>a#foo{bar}",
+          'result': "<div><a id=\"foo\" href=\"\">bar</a></div>\n",
+        },
+        {
+          'query': ".content{Hello!}",
+          'result': "<div class=\"content\">Hello!</div>\n",
+        },
+        {
+          'query': "div.logo+(div#navigation)+(div#links)",
+          'result': "<div class=\"logo\"></div>\n<div id=\"navigation\"></div>\n<div id=\"links\"></div>\n",
+        },
+        {
+          'query': "h1{header}+{Text}+a[href=http://link.org]{linktext}+{again some text}+a[href=http://anoterlink.org]{click me!}+{some final text}",
+          'result': "<h1>header</h1>\nText<a href=\"http://link.org\">linktext</a>\nagain some text<a href=\"http://anoterlink.org\">click me!</a>\nsome final text",
+        },
+        {
+          'query': "a{&}+div{&&}",
+          'result': "<a href=\"\">&</a>\n<div>&&</div>\n",
+        },
+        {
+          'query': "<foo/>span$$$$\\<c-y>,$$$$",
+          'result': "<foo/><span></span>",
+        },
+        {
+          'query': "foo span$$$$\\<c-y>,$$$$",
+          'result': "foo <span></span>",
+        },
+        {
+          'query': "foo span$$$$\\<c-y>,$$$$ bar",
+          'result': "foo <span></span> bar",
+        },
+        {
+          'query': "foo $$$$\\<c-o>ve\\<c-y>,p\\<cr>$$$$bar baz",
+          'result': "foo <p>bar</p> baz",
+        },
+        {
+          'query': "foo $$$$\\<c-o>vee\\<c-y>,p\\<cr>$$$$bar baz",
+          'result': "foo <p>bar baz</p>",
+        },
+        {
+          'query': "f div.boxes>article.box2>header>(hgroup>h2{aaa}+h3{bbb})+p{ccc}$$$$",
+          'result': "f <div class=\"boxes\">\n\t<article class=\"box2\">\n\t\t<header>\n\t\t\t<hgroup>\n\t\t\t\t<h2>aaa</h2>\n\t\t\t\t<h3>bbb</h3>\n\t\t\t</hgroup>\n\t\t\t<p>ccc</p>\n\t\t</header>\n\t</article>\n</div>",
+        },
+        {
+          'query': "div.boxes>(div.box2>section>h2{a}+p{b})+(div.box1>section>h2{c}+p{d}+p{e}+(bq>h2{f}+h3{g})+p{h})",
+          'result': "<div class=\"boxes\">\n\t<div class=\"box2\">\n\t\t<section>\n\t\t\t<h2>a</h2>\n\t\t\t<p>b</p>\n\t\t</section>\n\t</div>\n\t<div class=\"box1\">\n\t\t<section>\n\t\t\t<h2>c</h2>\n\t\t\t<p>d</p>\n\t\t\t<p>e</p>\n\t\t\t<blockquote>\n\t\t\t\t<h2>f</h2>\n\t\t\t\t<h3>g</h3>\n\t\t\t</blockquote>\n\t\t\t<p>h</p>\n\t\t</section>\n\t</div>\n</div>\n",
+        },
+        {
+          'query': "(div>(label+input))+div",
+          'result': "<div>\n\t<label for=\"\"></label>\n\t<input type=\"\">\n</div>\n<div></div>\n",
+        },
+        {
+          'query': "test1\ntest2\ntest3$$$$\\<esc>ggVG\\<c-y>,ul>li>span*>a\\<cr>$$$$",
+          'result': "<ul>\n\t<li>\n\t\t<span><a href=\"\">test1</a></span>\n\t\t<span><a href=\"\">test2</a></span>\n\t\t<span><a href=\"\">test3</a></span>\n\t</li>\n</ul>",
+        },
+        {
+          'query': "test1\ntest2\ntest3$$$$\\<esc>ggVG\\<c-y>,input[type=input value=$#]*\\<cr>$$$$",
+          'result': "<input type=\"input\" value=\"test1\">\n<input type=\"input\" value=\"test2\">\n<input type=\"input\" value=\"test3\">",
+        },
+        {
+          'query': "test1\ntest2\ntest3$$$$\\<esc>ggVG\\<c-y>,div[id=$#]*\\<cr>$$$$",
+          'result': "<div id=\"test1\"></div>\n<div id=\"test2\"></div>\n<div id=\"test3\"></div>",
+        },
+        {
+          'query': "div#id-$*5>div#id2-$",
+          'result': "<div id=\"id-1\">\n\t<div id=\"id2-1\"></div>\n</div>\n<div id=\"id-2\">\n\t<div id=\"id2-2\"></div>\n</div>\n<div id=\"id-3\">\n\t<div id=\"id2-3\"></div>\n</div>\n<div id=\"id-4\">\n\t<div id=\"id2-4\"></div>\n</div>\n<div id=\"id-5\">\n\t<div id=\"id2-5\"></div>\n</div>\n",
+        },
+        {
+          'query': ".foo>[bar=2]>.baz",
+          'result': "<div class=\"foo\">\n\t<div bar=\"2\">\n\t\t<div class=\"baz\"></div>\n\t</div>\n</div>\n",
+        },
+        {
+          'query': "{test case $ }*3",
+          'result': "test case 1 test case 2 test case 3 ",
+        },
+        {
+          'query': "{test case $${nr}}*3",
+          'result': "test case 1\ntest case 2\ntest case 3\n",
+        },
+        {
+          'query': "{test case \\$ }*3",
+          'result': "test case $ test case $ test case $ ",
+        },
+        {
+          'query': "{test case $$$ }*3",
+          'result': "test case 001 test case 002 test case 003 ",
+        },
+        {
+          'query': "a[title=$#]{foo}",
+          'result': "<a href=\"\" title=\"foo\">foo</a>\n",
+        },
+        {
+          'query': "span.item$*2>{item $}",
+          'result': "<span class=\"item1\">item 1</span>\n<span class=\"item2\">item 2</span>\n",
+        },
+        {
+          'query': "\t<div class=\"footer_nav\">\n\t\t<a href=\"#\">nav link</a>\n\t</div>$$$$\\<esc>ggVG\\<c-y>,div\\<cr>$$$$",
+          'result': "\t<div>\n\t\t<div class=\"footer_nav\">\n\t\t\t<a href=\"#\">nav link</a>\n\t\t</div>\n\t</div>",
+        },
+        {
+          'query': "<small>a$$$$</small>",
+          'result': "<small><a href=\"\"></a></small>",
+        },
+        {
+          'query': "form.search-form._wide>input.-query-string+input:s.-btn_large|bem",
+          'result': "<form class=\"search-form search-form_wide\" action=\"\">\n\t<input class=\"search-form__query-string\" type=\"\">\n\t<input class=\"search-form__btn search-form__btn_large\" type=\"submit\" value=\"\">\n</form>\n",
+        },
+        {
+          'query': "form>fieldset>legend+(label>input[type=\"checkbox\"])*3",
+          'result': "<form action=\"\">\n\t<fieldset>\n\t\t<legend></legend>\n\t\t<label for=\"\"><input type=\"checkbox\"></label>\n\t\t<label for=\"\"><input type=\"checkbox\"></label>\n\t\t<label for=\"\"><input type=\"checkbox\"></label>\n\t</fieldset>\n</form>\n",
+        },
+      ],
+    },
+    {
+      'name': 'split join tag',
+      'tests': [
+        {
+          'query': "<div>\n\t<span>$$$$\\<c-y>j$$$$</span>\n</div>",
+          'result': "<div>\n\t<span />\n</div>",
+        },
+        {
+          'query': "<div>\n\t<span$$$$\\<c-y>j$$$$/>\n</div>",
+          'result': "<div>\n\t<span></span>\n</div>",
+        },
+      ],
+    },
+    {
+      'name': 'toggle comment',
+      'tests': [
+        {
+          'query': "<div>\n\t<span>$$$$\\<c-y>/$$$$</span>\n</div>",
+          'result': "<div>\n\t<!-- <span></span> -->\n</div>",
+        },
+        {
+          'query': "<div>\n\t<!-- <span>$$$$\\<c-y>/$$$$</span> -->\n</div>",
+          'result': "<div>\n\t<span></span>\n</div>",
+        },
+      ],
+    },
+    {
+      'name': 'image size',
+      'tests': [
+        {
+          'query': "img[src=http://mattn.kaoriya.net/images/logo.png]$$$$\\<c-y>,\\<c-y>i$$$$",
+          'result': "<img src=\"http://mattn.kaoriya.net/images/logo.png\" alt=\"\" width=\"113\" height=\"113\">",
+        },
+        {
+          'query': "img[src=/logo.png]$$$$\\<c-y>,\\<c-y>i$$$$",
+          'result': "<img src=\"/logo.png\" alt=\"\">",
+        },
+        {
+          'query': "img[src=http://mattn.kaoriya.net/images/logo.png width=foo height=bar]$$$$\\<c-y>,\\<c-y>i$$$$",
+          'result': "<img src=\"http://mattn.kaoriya.net/images/logo.png\" alt=\"\" width=\"113\" height=\"113\">",
+        },
+      ],
+    },
+    {
+      'name': 'move next prev',
+      'tests': [
+        {
+          'query': "foo+bar+baz[dankogai=\"\"]$$$$\\<c-y>,\\<esc>gg0\\<c-y>n\\<c-y>n\\<c-y>n\\<esc>Byw:%d _\\<cr>p$$$$",
+          'result': "dankogai",
+        },
+      ],
+    },
+    {
+      'name': 'contains dash in attributes',
+      'tests': [
+        {
+          'query': "div[foo-bar=\"baz\"]",
+          'result': "<div foo-bar=\"baz\"></div>\n",
+        },
+      ],
+    },
+    {
+      'name': 'default attributes',
+      'tests': [
+        {
+          'query': "p.title>a[/hoge/]",
+          'result': "<p class=\"title\"><a href=\"/hoge/\"></a></p>\n",
+        },
+        {
+          'query': "script[jquery.js]",
+          'result': "<script src=\"jquery.js\"></script>\n",
+        },
+      ],
+    },
+    {
+      'name': 'multiple group',
+      'tests': [
+        {
+          'query': ".outer$*3>.inner$*2",
+          'result': "<div class=\"outer1\">\n\t<div class=\"inner1\"></div>\n\t<div class=\"inner2\"></div>\n</div>\n<div class=\"outer2\">\n\t<div class=\"inner1\"></div>\n\t<div class=\"inner2\"></div>\n</div>\n<div class=\"outer3\">\n\t<div class=\"inner1\"></div>\n\t<div class=\"inner2\"></div>\n</div>\n",
+        },
+      ],
+    },
+    {
+      'name': 'group itemno',
+      'tests': [
+        {
+          'query': "dl>(dt{$}+dd)*3",
+          'result': "<dl>\n\t<dt>1</dt>\n\t<dd></dd>\n\t<dt>2</dt>\n\t<dd></dd>\n\t<dt>3</dt>\n\t<dd></dd>\n</dl>\n",
+        },
+        {
+          'query': "(div[attr=$]*3)*3",
+          'result': "<div attr=\"1\"></div>\n<div attr=\"2\"></div>\n<div attr=\"3\"></div>\n<div attr=\"1\"></div>\n<div attr=\"2\"></div>\n<div attr=\"3\"></div>\n<div attr=\"1\"></div>\n<div attr=\"2\"></div>\n<div attr=\"3\"></div>\n",
+        },
+      ],
+    },
+    {
+      'name': 'update tag',
+      'tests': [
+        {
+          'query': "<h$$$$\\<c-y>u.global\\<cr>$$$$3></h3>",
+          'result': "<h3 class=\"global\"></h3>",
+        },
+      ],
+    },
+  ],
+  'dummy': "}}}"},
+{ 'test-css': '{{{',
+  'type': 'css',
+  'categories': [
+    {
+      'name': 'expand abbreviation',
+      'tests': [
+        {
+          'query': "{fs:n$$$$}",
+          'result': "{font-style: normal;}",
+        },
+        {
+          'query': "{fl:l|fc$$$$}",
+          'result': "{float: left;}",
+        },
+        {
+          'query': "{bg+$$$$}",
+          'result': "{background: $$$$#fff url() 0 0 no-repeat;}",
+        },
+        {
+          'query': "{bg+!$$$$}",
+          'result': "{background: $$$$#fff url() 0 0 no-repeat !important;}",
+        },
+        {
+          'query': "{m$$$$}",
+          'result': "{margin: $$$$;}",
+        },
+        {
+          'query': "{m0.1p$$$$}",
+          'result': "{margin: 0.1%;}",
+        },
+        {
+          'query': "{m1.0$$$$}",
+          'result': "{margin: 1.0em;}",
+        },
+        {
+          'query': "{m2$$$$}",
+          'result': "{margin: 2px;}",
+        },
+        {
+          'query': "{bdrs10$$$$}",
+          'result': "{border-radius: 10px;}",
+        },
+        {
+          'query': "{-bdrs20$$$$}",
+          'result': "{-webkit-border-radius: 20px;\n-moz-border-radius: 20px;\n-o-border-radius: 20px;\n-ms-border-radius: 20px;\nborder-radius: 20px;}",
+        },
+        {
+          'query': "{lg(top,#fff,#000)$$$$}",
+          'result': "{background-image: -webkit-gradient(top, 0 0, 0 100, from(#fff), to(#000));\nbackground-image: -webkit-linear-gradient(#fff, #000);\nbackground-image: -moz-linear-gradient(#fff, #000);\nbackground-image: -o-linear-gradient(#fff, #000);\nbackground-image: linear-gradient(#fff, #000);\n}",
+        },
+        {
+          'query': "{m10-5-0$$$$}",
+          'result': "{margin: 10px 5px 0;}",
+        },
+        {
+          'query': "{m-10--5$$$$}",
+          'result': "{margin: -10px -5px;}",
+        },
+        {
+          'query': "{m10-auto$$$$}",
+          'result': "{margin: 10px auto;}",
+        },
+        {
+          'query': "{w100p$$$$}",
+          'result': "{width: 100%;}",
+        },
+        {
+          'query': "{h50e$$$$}",
+          'result': "{height: 50em;}",
+        },
+        {
+          'query': "{(bg+)+c$$$$}",
+          'result': "{background: $$$$#fff url() 0 0 no-repeat;\ncolor: #000;}",
+        },
+        {
+          'query': "{m0+bgi+bg++p0$$$$}",
+          'result': "{margin: 0;\nbackground-image: url($$$$);\nbackground: #fff url() 0 0 no-repeat;\npadding: 0;}",
+        },
+        {
+          'query': "{borle$$$$}",
+          'result': "{border-left: $$$$;}",
+        },
+        {
+          'query': "{c#dba$$$$}",
+          'result': "{color: rgb(221, 187, 170);}",
+        },
+        {
+          'query': "{c#dba.7$$$$}",
+          'result': "{color: rgb(221, 187, 170, 0.7);}",
+        },
+        {
+          'query': "{dn$$$$}",
+          'result': "{display: none;}",
+        },
+        {
+          'query': "{p10%$$$$}",
+          'result': "{padding: 10%;}",
+        },
+        {
+          'query': "{p10p$$$$}",
+          'result': "{padding: 10%;}",
+        },
+        {
+          'query': "{p10e$$$$}",
+          'result': "{padding: 10em;}",
+        },
+        {
+          'query': "{p10em$$$$}",
+          'result': "{padding: 10em;}",
+        },
+        {
+          'query': "{p10re$$$$}",
+          'result': "{padding: 10rem;}",
+        },
+        {
+          'query': "{p10rem$$$$}",
+          'result': "{padding: 10rem;}",
+        },
+      ],
+    },
+  ],
+  'dummy': "}}}"},
+{ 'test-haml': '{{{',
+  'type': 'haml',
+  'categories': [
+    {
+      'name': 'expand abbreviation',
+      'tests': [
+        {
+          'query': "div>p+ul#foo>li.bar$[foo=bar][bar=baz]*3>{baz}",
+          'result': "%div\n  %p\n  %ul#foo\n    %li.bar1{ :foo => \"bar\", :bar => \"baz\" } baz\n    %li.bar2{ :foo => \"bar\", :bar => \"baz\" } baz\n    %li.bar3{ :foo => \"bar\", :bar => \"baz\" } baz\n",
+        },
+        {
+          'query': "div>p+ul#foo>li.bar$[foo=bar][bar=baz]*3>{baz}|haml",
+          'result': "%div\n  %p\n  %ul#foo\n    %li.bar1{ :foo => \"bar\", :bar => \"baz\" } baz\n    %li.bar2{ :foo => \"bar\", :bar => \"baz\" } baz\n    %li.bar3{ :foo => \"bar\", :bar => \"baz\" } baz\n",
+        },
+        {
+          'query': "a*3|haml",
+          'result': "%a{ :href => \"\" }\n%a{ :href => \"\" }\n%a{ :href => \"\" }\n",
+        },
+        {
+          'query': ".content{Hello!}|haml",
+          'result': "%div.content Hello!\n",
+        },
+        {
+          'query': "a[title=$#]{foo}",
+          'result': "%a{ :href => \"\", :title => \"foo\" } foo\n",
+        },
+      ],
+    },
+    {
+      'name': 'expand abbreviation',
+      'tests': [
+        {
+          'query': "%a foo\n  bar$$$$\\<c-y>j$$$$",
+          'result': "%a ",
+        },
+        {
+          'query': "$$$$\\<c-y>j$$$$%a ",
+          'result': "%a $$$$",
+        },
+      ],
+    },
+    {
+      'name': 'toggle comment',
+      'tests': [
+        {
+          'query': "%a{ :href => \"http://www.google.com\"$$$$\\<c-y>/$$$$ } hello",
+          'result': "-# %a{ :href => \"http://www.google.com\" } hello",
+        },
+        {
+          'query': "-# %a{ :href => \"http://www.google.com\"$$$$\\<c-y>/$$$$ } hello",
+          'result': "%a{ :href => \"http://www.google.com\" } hello",
+        },
+      ],
+    },
+  ],
+  'dummy': "}}}"},
+{ 'test-slim': "{{{",
+  'type': 'slim',
+  'categories': [
+    {
+      'name': 'expand abbreviation',
+      'tests': [
+        {
+          'query': "div>p+ul#foo>li.bar$[foo=bar][bar=baz]*3>{baz}",
+          'result': "div\n  p\n  ul id=\"foo\"\n    li class=\"bar1\" foo=\"bar\" bar=\"baz\"\n      | baz\n    li class=\"bar2\" foo=\"bar\" bar=\"baz\"\n      | baz\n    li class=\"bar3\" foo=\"bar\" bar=\"baz\"\n      | baz\n",
+        },
+        {
+          'query': "div>p+ul#foo>li.bar$[foo=bar][bar=baz]*3>{baz}|slim",
+          'result': "div\n  p\n  ul id=\"foo\"\n    li class=\"bar1\" foo=\"bar\" bar=\"baz\"\n      | baz\n    li class=\"bar2\" foo=\"bar\" bar=\"baz\"\n      | baz\n    li class=\"bar3\" foo=\"bar\" bar=\"baz\"\n      | baz\n",
+        },
+        {
+          'query': "a*3|slim",
+          'result': "a href=\"\"\na href=\"\"\na href=\"\"\n",
+        },
+        {
+          'query': ".content{Hello!}|slim",
+          'result': "div class=\"content\"\n  | Hello!\n",
+        },
+        {
+          'query': "a[title=$#]{foo}",
+          'result': "a href=\"\" title=\"foo\"\n  | foo\n",
+        },
+      ],
+    },
+    {
+      'name': 'split join tag',
+      'tests': [
+        {
+          'query': "a\n  | foo$$$$\\<c-y>j$$$$",
+          'result': "a",
+        },
+        {
+          'query': "a$$$$\\<c-y>j$$$$",
+          'result': "a\n  | $$$$",
+        },
+      ],
+    },
+    {
+      'name': 'toggle comment',
+      'tests': [
+        {
+          'query': "a href=\"http://www.google.com\"$$$$\\<c-y>/$$$$\n  | hello",
+          'result': "/a href=\"http://www.google.com\"\n  | hello",
+        },
+        {
+          'query': "/a href=\"http://www.google.com\"$$$$\\<c-y>/$$$$\n  | hello",
+          'result': "a href=\"http://www.google.com\"\n  | hello",
+        },
+      ],
+    },
+  ],
+  'dummy': "}}}"},
+{ 'test-xsl': "{{{",
+  'type': 'xsl',
+  'categories': [
+    {
+      'name': 'expand abbreviation',
+      'tests': [
+        {
+          'query': "vari",
+          'result': "<xsl:variable name=\"\"></xsl:variable>\n",
+        },
+        {
+          'query': "ap>wp",
+          'result': "<xsl:apply-templates select=\"\" mode=\"\">\n\t<xsl:with-param name=\"\" select=\"\"></xsl:with-param>\n</xsl:apply-templates>\n",
+        },
+      ],
+    },
+  ],
+  'dummy': "}}}"},
+{ 'test-xsd': "{{{",
+  'type': 'xsd',
+  'categories': [
+    {
+      'name': 'expand abbreviation',
+      'tests': [
+        {
+          'query': "xsd:w3c",
+          'result': "<?xml version=\"1.0\"?>\n<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n\t<xsd:element name=\"\" type=\"\"/>\n</xsd:schema>\n",
+        },
+      ],
+    },
+  ],
+  'dummy': "}}}"},
+{ 'test-mustache': "{{{",
+  'type': 'mustache',
+  'categories': [
+    {
+      'name': 'expand abbreviation',
+      'tests': [
+        {
+          'query': "div#{{foo}}",
+          'result': "<div id=\"{{foo}}\"></div>\n",
+        },
+        {
+          'query': "div.{{foo}}",
+          'result': "<div class=\"{{foo}}\"></div>\n",
+        },
+      ],
+    },
+  ],
+  'dummy': "}}}"},
+{ 'test-sass': "{{{",
+  'type': 'scss',
+  'categories': [
+    {
+      'name': 'expand abbreviation',
+      'tests': [
+        {
+          'query': "@i$$$$",
+          'result': "@import url();",
+        },
+        {
+          'query': "{fs:n$$$$}",
+          'result': "{font-style: normal;}",
+        },
+        {
+          'query': "{fl:l|fc$$$$}",
+          'result': "{float: left;}",
+        },
+        {
+          'query': "{bg+$$$$}",
+          'result': "{background: $$$$#fff url() 0 0 no-repeat;}",
+        },
+        {
+          'query': "{bg+!$$$$}",
+          'result': "{background: $$$$#fff url() 0 0 no-repeat !important;}",
+        },
+        {
+          'query': "{m$$$$}",
+          'result': "{margin: $$$$;}",
+        },
+        {
+          'query': "{m0.1p$$$$}",
+          'result': "{margin: 0.1%;}",
+        },
+        {
+          'query': "{m1.0$$$$}",
+          'result': "{margin: 1.0em;}",
+        },
+        {
+          'query': "{m2$$$$}",
+          'result': "{margin: 2px;}",
+        },
+        {
+          'query': "{bdrs10$$$$}",
+          'result': "{border-radius: 10px;}",
+        },
+        {
+          'query': "{-bdrs20$$$$}",
+          'result': "{-webkit-border-radius: 20px;\n-moz-border-radius: 20px;\n-o-border-radius: 20px;\n-ms-border-radius: 20px;\nborder-radius: 20px;}",
+        },
+        {
+          'query': "{lg(top,#fff,#000)$$$$}",
+          'result': "{background-image: -webkit-gradient(top, 0 0, 0 100, from(#fff), to(#000));\nbackground-image: -webkit-linear-gradient(#fff, #000);\nbackground-image: -moz-linear-gradient(#fff, #000);\nbackground-image: -o-linear-gradient(#fff, #000);\nbackground-image: linear-gradient(#fff, #000);\n}",
+        },
+        {
+          'query': "{m10-5-0$$$$}",
+          'result': "{margin: 10px 5px 0;}",
+        },
+        {
+          'query': "{m-10--5$$$$}",
+          'result': "{margin: -10px -5px;}",
+        },
+        {
+          'query': "{m10-auto$$$$}",
+          'result': "{margin: 10px auto;}",
+        },
+        {
+          'query': "{w100p$$$$}",
+          'result': "{width: 100%;}",
+        },
+        {
+          'query': "{h50e$$$$}",
+          'result': "{height: 50em;}",
+        },
+        {
+          'query': "{(bg+)+c$$$$}",
+          'result': "{background: $$$$#fff url() 0 0 no-repeat;\ncolor: #000;}",
+        },
+      ],
+    },
+  ],
+  'dummy': "}}}"},
+]
+" vim:set et fdm=marker:
diff --git a/vim-plugins/bundle/jedi-vim/.jedi_vim.py.un~ b/vim-plugins/bundle/jedi-vim/.jedi_vim.py.un~
new file mode 100644
index 0000000..5da8bd2
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/.jedi_vim.py.un~ differ
diff --git a/vim-plugins/bundle/jedi-vim/.travis.yml b/vim-plugins/bundle/jedi-vim/.travis.yml
new file mode 100644
index 0000000..8f407fc
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/.travis.yml
@@ -0,0 +1,18 @@
+sudo: false
+language: python
+env:
+  matrix:
+    - ENV=test
+    - ENV=check
+matrix:
+  allow_failures:
+    # Needs to be fixed!
+    - env: ENV=test
+install:
+  - |
+    if [ "$ENV" = "test" ]; then
+      pip install pytest
+    fi
+script:
+  - vim --version
+  - make "$ENV"
diff --git a/vim-plugins/bundle/jedi-vim/AUTHORS.txt b/vim-plugins/bundle/jedi-vim/AUTHORS.txt
new file mode 100644
index 0000000..57c581e
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/AUTHORS.txt
@@ -0,0 +1,55 @@
+Main Authors
+============
+
+David Halter (@davidhalter) <davidhalter88@gmail.com>
+
+
+Contributors (in order of contributions)
+========================================
+
+Patrice Peterson (@runiq)
+tek (@tek)
+heavenshell (@heavenshell) <heavenshell.jp@gmail.com>
+Danilo Bargen (@dbrgn) <gezuru@gmail.com>
+mattn (@mattn) <mattn.jp@gmail.com>
+Enrico Batista da Luz (@ricobl) <rico.bl@gmail.com>
+coot (@coot) <mszamot@gmail.com>
+Artur Dryomov (@ming13) <artur.dryomov@gmail.com>
+andviro (@andviro)
+Jean-Louis Fuchs (@ganwell) <ganwell@fangorn.ch>
+Mathieu Comandon (@strycore) <strider@strycore.com>
+Nick Hurley (@todesschaf) <hurley@todesschaf.org>
+gpoulin (@gpoulin)
+Akinori Hattori (@hattya)
+Luper Rouch (@flupke)
+Matthew Moses (@mlmoses) <moses.matthewl@gmail.com>
+Tyler Wymer (@twymer)
+Artem Nezvigin (@artnez)
+rogererens (@rogererens)
+Emily Strickland (@emilyst) <mail@emily.st>
+Tin Tvrtković (@Tinche) <tinchester@gmail.com>
+Zekeriya Koc (@zekzekus) <zekzekus@gmail.com>
+ethinx (@ethinx) <eth2net@gmail.com>
+Wouter Overmeire (@lodagro) <lodagro@gmail.com>
+Stephen J. Fuhry (@fuhrysteve) <fuhrysteve@gmail.com>
+Sheng Yun (@ShengYun) <uewing@gmail.com>
+Yann Thomas-Gérard (@inside) <inside@gmail.com>
+Colin Su (@littleq0903) <littleq0903@gmail.com>
+Arthur Jaron (@eyetracker)
+Justin M. Keyes (@justinmk)
+nagev (@np1)
+Chris Lasher (@gotgenes) <chris.lasher@gmail.com>
+Doan Thanh Nam (@tndoan)
+Markus Koller (@toupeira)
+Justin Cheevers @justincheevers
+Talha Ahmed (@talha81) <talha.ahmed@gmail.com>
+Matthew Tylee Atkinson (@matatk)
+Pedro Ferrari (@petobens)
+Daniel Hahler (@blueyed)
+Dave Honneffer (@pearofducks)
+Bagrat Aznauryan (@n9code)
+Tomoyuki Kashiro (@kashiro)
+Tommy Allen (@tweekmonster)
+Mingliang (@Aulddays)
+
+@something are github user names.
diff --git a/vim-plugins/bundle/jedi-vim/CONTRIBUTING.md b/vim-plugins/bundle/jedi-vim/CONTRIBUTING.md
new file mode 100644
index 0000000..285eb30
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/CONTRIBUTING.md
@@ -0,0 +1,12 @@
+# We <3 pull requests!
+
+ 1. Fork the Repo on github.
+ 2. Add yourself to AUTHORS.txt
+ 3. Add a test if possible.
+ 4. Push to your fork and submit a pull request.
+
+Please use PEP8 as a Python code style. For VIM, just try to style your
+code similar to the jedi-vim code that is already there.
+
+# Bug reports
+Please include the output of `:version` and `:JediDebugInfo`.
diff --git a/vim-plugins/bundle/jedi-vim/LICENSE.txt b/vim-plugins/bundle/jedi-vim/LICENSE.txt
new file mode 100644
index 0000000..12f223f
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/LICENSE.txt
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) <2013> <David Halter and others, see AUTHORS.txt>
+
+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/vim-plugins/bundle/jedi-vim/Makefile b/vim-plugins/bundle/jedi-vim/Makefile
new file mode 100644
index 0000000..22712ef
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/Makefile
@@ -0,0 +1,16 @@
+test:
+	py.test
+
+build:
+	mkdir $@
+build/vint: | build
+	virtualenv $@
+	$@/bin/pip install vim-vint
+check: LINT_FILES:=after autoload ftplugin plugin
+check: build/vint
+	build/vint/bin/vint $(LINT_FILES)
+
+clean:
+	rm -rf .cache build
+
+.PHONY: test check clean
diff --git a/vim-plugins/bundle/jedi-vim/README.rst b/vim-plugins/bundle/jedi-vim/README.rst
new file mode 100644
index 0000000..36002cf
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/README.rst
@@ -0,0 +1,246 @@
+#################################################
+jedi-vim - awesome Python autocompletion with VIM
+#################################################
+
+.. image:: https://travis-ci.org/davidhalter/jedi-vim.png?branch=master
+   :target: https://travis-ci.org/davidhalter/jedi-vim
+   :alt: Travis-CI build status
+
+jedi-vim is a VIM binding to the autocompletion library
+`Jedi <http://github.com/davidhalter/jedi>`_.
+
+Here are some pictures:
+
+.. image:: https://github.com/davidhalter/jedi/raw/master/docs/_screenshots/screenshot_complete.png
+
+Completion for almost anything (Ctrl+Space).
+
+.. image:: https://github.com/davidhalter/jedi/raw/master/docs/_screenshots/screenshot_function.png
+
+Display of function/class bodies, docstrings.
+
+.. image:: https://github.com/davidhalter/jedi/raw/master/docs/_screenshots/screenshot_pydoc.png
+
+Documentation (Pydoc) support (with highlighting, Shift+k).
+
+There is also support for goto and renaming.
+
+
+Get the latest from `github <http://github.com/davidhalter/jedi-vim>`_.
+
+Documentation
+=============
+
+Documentation is available in your vim: ``:help jedi-vim``. You can also look
+it up `on github <http://github.com/davidhalter/jedi-vim/blob/master/doc/jedi-vim.txt>`_.
+
+You can read the Jedi library documentation `here <http://jedi.readthedocs.io/en/latest/>`_.
+
+If you want to report issues, just use the github issue tracker. In case of
+questions about the software, please use `stackoverflow
+<https://stackoverflow.com>`_ and tag your question with ``jedi-vim``.
+
+
+Contributing
+============
+
+We love Pull Requests! Read the instructions in ``CONTRIBUTING.md``.
+
+
+Features
+========
+
+The Jedi library understands most of Python's core features. From decorators to
+generators, there is broad support.
+
+Apart from that, jedi-vim supports the following commands
+
+- Completion ``<C-Space>``
+- Goto assignments ``<leader>g`` (typical goto function)
+- Goto definitions ``<leader>d`` (follow identifier as far as possible,
+  includes imports and statements)
+- Show Documentation/Pydoc ``K`` (shows a popup with assignments)
+- Renaming ``<leader>r``
+- Usages ``<leader>n`` (shows all the usages of a name)
+- Open module, e.g. ``:Pyimport os`` (opens the ``os`` module)
+
+
+Installation
+============
+
+Requirements
+------------
+You need a VIM version that was compiled with Python 2.6 or later
+(``+python`` or ``+python3``), which is typical for most distributions on
+Linux.  You can check this from within VIM using
+``:python3 import sys; print(sys.version)`` (use ``:python`` for Python 2).
+
+Manual installation
+-------------------
+
+You might want to use `pathogen <https://github.com/tpope/vim-pathogen>`_ or
+`Vundle <https://github.com/gmarik/vundle>`_ to install jedi-vim.
+
+The first thing you need after that is an up-to-date version of Jedi. You can
+either install it via ``pip install jedi`` or with
+``git submodule update --init`` in your jedi-vim repository.
+
+Example installation command using Pathogen:
+
+.. code-block:: sh
+
+    cd ~/.vim/bundle/ && git clone --recursive https://github.com/davidhalter/jedi-vim.git
+
+
+Installation with your distribution
+-----------------------------------
+
+On Arch Linux, you can also install jedi-vim from official repositories as
+`vim-jedi <https://www.archlinux.org/packages/community/any/vim-jedi/>`__.
+It is also available on
+`Debian (≥8) <https://packages.debian.org/vim-python-jedi>`__ and
+`Ubuntu (≥14.04) <http://packages.ubuntu.com/vim-python-jedi>`__ as
+vim-python-jedi.
+On Fedora Linux, it is available as
+`vim-jedi <https://apps.fedoraproject.org/packages/vim-jedi>`__.
+
+Please note that this version might be quite old compared to using jedi-vim
+from Git.
+
+Caveats
+-------
+
+Note that the `python-mode <https://github.com/klen/python-mode>`_ VIM plugin seems
+to conflict with jedi-vim, therefore you should disable it before enabling
+jedi-vim.
+
+To enjoy the full features of jedi-vim, you should have VIM >= 7.3, compiled with
+``+conceal`` (which is not the case on some platforms, including OS X). If your VIM
+does not meet these requirements, the parameter recommendation list may not appear
+when you type an open bracket after a function name. Please read
+`the documentation <http://github.com/davidhalter/jedi-vim/blob/master/doc/jedi-vim.txt>`_
+for details.
+
+
+Settings
+========
+
+Jedi is by default automatically initialized. If you don't want that I suggest
+you disable the auto-initialization in your ``.vimrc``:
+
+.. code-block:: vim
+
+    let g:jedi#auto_initialization = 0
+
+There are also some VIM options (like ``completeopt`` and key defaults) which
+are automatically initialized, but you can skip this:
+
+.. code-block:: vim
+
+    let g:jedi#auto_vim_configuration = 0
+
+
+You can make jedi-vim use tabs when going to a definition etc:
+
+.. code-block:: vim
+
+    let g:jedi#use_tabs_not_buffers = 1
+
+If you are a person who likes to use VIM-splits, you might want to put this in your ``.vimrc``:
+
+.. code-block:: vim
+
+    let g:jedi#use_splits_not_buffers = "left"
+
+This options could be "left", "right", "top", "bottom" or "winwidth". It will decide the direction where the split open.
+
+Jedi automatically starts the completion, if you type a dot, e.g. ``str.``, if
+you don't want this:
+
+.. code-block:: vim
+
+    let g:jedi#popup_on_dot = 0
+
+Jedi selects the first line of the completion menu: for a better typing-flow
+and usually saves one keypress.
+
+.. code-block:: vim
+
+    let g:jedi#popup_select_first = 0
+
+Jedi displays function call signatures in insert mode in real-time, highlighting
+the current argument. The call signatures can be displayed as a pop-up in the
+buffer (set to 1, the default), which has the advantage of being easier to refer
+to, or in Vim's command line aligned with the function call (set to 2), which
+can improve the integrity of Vim's undo history.
+
+.. code-block:: vim
+
+    let g:jedi#show_call_signatures = "1"
+
+Here are a few more defaults for actions, read the docs (``:help jedi-vim``) to
+get more information. If you set them to ``""``, they are not assigned.
+
+.. code-block:: vim
+
+    NOTE: subject to change!
+
+    let g:jedi#goto_command = "<leader>d"
+    let g:jedi#goto_assignments_command = "<leader>g"
+    let g:jedi#goto_definitions_command = ""
+    let g:jedi#documentation_command = "K"
+    let g:jedi#usages_command = "<leader>n"
+    let g:jedi#completions_command = "<C-Space>"
+    let g:jedi#rename_command = "<leader>r"
+
+
+Finally, if you don't want completion, but all the other features, use:
+
+.. code-block:: vim
+
+    let g:jedi#completions_enabled = 0
+
+FAQ
+===
+
+I don't want the docstring window to popup during completion
+------------------------------------------------------------
+
+This depends on the ``completeopt`` option. Jedi initializes it in its
+``ftplugin``. Add the following line to your ``.vimrc`` to disable it:
+
+.. code-block:: vim
+
+    autocmd FileType python setlocal completeopt-=preview
+
+
+I want <Tab> to do autocompletion
+---------------------------------
+
+Don't even think about changing the Jedi command to ``<Tab>``,
+use `supertab <https://github.com/ervandew/supertab>`_!
+
+
+The completion is waaay too slow!
+---------------------------------
+
+Completion of complex libraries (like Numpy) should only be slow the first time
+you complete it. After that, the results should be cached and very fast.
+
+If it's still slow, in case you've installed the python-mode VIM plugin, disable
+it. It seems to conflict with jedi-vim. See issue `#163
+<https://github.com/davidhalter/jedi-vim/issues/163>`__.
+
+
+Testing
+=======
+
+jedi-vim is being tested with a combination of `vspec
+<https://github.com/kana/vim-vspec>`_ and `py.test <http://pytest.org/>`_.
+
+The tests are in the ``test`` subdirectory, you can run them calling::
+
+    py.test
+
+The tests are automatically run with `travis
+<https://travis-ci.org/davidhalter/jedi-vim>`_.
diff --git a/vim-plugins/bundle/jedi-vim/__pycache__/jedi_vim.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/__pycache__/jedi_vim.cpython-35.pyc
new file mode 100644
index 0000000..7f1a3c5
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/__pycache__/jedi_vim.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/after/ftplugin/python/jedi.vim b/vim-plugins/bundle/jedi-vim/after/ftplugin/python/jedi.vim
new file mode 100644
index 0000000..2798207
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/after/ftplugin/python/jedi.vim
@@ -0,0 +1,23 @@
+if !jedi#init_python()
+    finish
+endif
+
+if g:jedi#auto_initialization
+    if g:jedi#completions_enabled
+        " We need our own omnifunc, so this overrides the omnifunc set by
+        " $VIMRUNTIME/ftplugin/python.vim.
+        setlocal omnifunc=jedi#completions
+
+        " map ctrl+space for autocompletion
+        if g:jedi#completions_command ==# '<C-Space>'
+            " In terminals, <C-Space> sometimes equals <Nul>.
+            imap <buffer> <Nul> <C-Space>
+            smap <buffer> <Nul> <C-Space>
+        endif
+        if len(g:jedi#completions_command)
+            execute 'inoremap <expr> <buffer> '.g:jedi#completions_command.' jedi#complete_string(0)'
+            " A separate mapping for select mode: deletes and completes.
+            execute 'snoremap <expr> <buffer> '.g:jedi#completions_command." '\<C-g>c'.jedi#complete_string(0)"
+        endif
+    endif
+endif
diff --git a/vim-plugins/bundle/jedi-vim/after/syntax/python.vim b/vim-plugins/bundle/jedi-vim/after/syntax/python.vim
new file mode 100644
index 0000000..a410b3d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/after/syntax/python.vim
@@ -0,0 +1,32 @@
+if !jedi#init_python()
+    finish
+endif
+
+if g:jedi#show_call_signatures > 0 && has('conceal')
+    " +conceal is the default for vim >= 7.3
+
+    let s:e = g:jedi#call_signature_escape
+    let s:full = s:e.'jedi=.\{-}'.s:e.'.\{-}'.s:e.'jedi'.s:e
+    let s:ignore = s:e.'jedi.\{-}'.s:e
+    exe 'syn match jediIgnore "'.s:ignore.'" contained conceal'
+    setlocal conceallevel=2
+    syn match jediFatSymbol "\*_\*" contained conceal
+    syn match jediFat "\*_\*.\{-}\*_\*" contained contains=jediFatSymbol
+    syn match jediSpace "\v[ ]+( )@=" contained
+    exe 'syn match jediFunction "'.s:full.'" keepend extend '
+                \ .' contains=jediIgnore,jediFat,jediSpace'
+                \ .' containedin=pythonComment,pythonString,pythonRawString'
+    unlet! s:e s:full s:ignore
+
+    hi def link jediIgnore Ignore
+    hi def link jediFatSymbol Ignore
+    hi def link jediSpace Normal
+
+    if exists('g:colors_name')
+        hi def link jediFunction CursorLine
+        hi def link jediFat TabLine
+    else
+        hi jediFunction term=NONE cterm=NONE ctermfg=6 guifg=Black gui=NONE ctermbg=0 guibg=Grey
+        hi jediFat term=bold,underline cterm=bold,underline gui=bold,underline ctermbg=0 guibg=#555555
+    endif
+endif
diff --git a/vim-plugins/bundle/jedi-vim/autoload/.jedi.vim.un~ b/vim-plugins/bundle/jedi-vim/autoload/.jedi.vim.un~
new file mode 100644
index 0000000..cfcf296
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/autoload/.jedi.vim.un~ differ
diff --git a/vim-plugins/bundle/jedi-vim/autoload/health/jedi.vim b/vim-plugins/bundle/jedi-vim/autoload/health/jedi.vim
new file mode 100644
index 0000000..8c80e93
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/autoload/health/jedi.vim
@@ -0,0 +1,4 @@
+function! health#jedi#check() abort
+  call health#report_start('jedi')
+  silent call jedi#debug_info()
+endfunction
diff --git a/vim-plugins/bundle/jedi-vim/autoload/jedi.vim b/vim-plugins/bundle/jedi-vim/autoload/jedi.vim
new file mode 100644
index 0000000..9be2e43
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/autoload/jedi.vim
@@ -0,0 +1,609 @@
+scriptencoding utf-8
+
+" ------------------------------------------------------------------------
+" Settings initialization
+" ------------------------------------------------------------------------
+let s:deprecations = {
+    \ 'get_definition_command':     'goto_definitions_command',
+    \ 'pydoc':                      'documentation_command',
+    \ 'related_names_command':      'usages_command',
+    \ 'autocompletion_command':     'completions_command',
+    \ 'show_function_definition':   'show_call_signatures',
+\ }
+
+let s:default_settings = {
+    \ 'use_tabs_not_buffers': 0,
+    \ 'use_splits_not_buffers': 1,
+    \ 'auto_initialization': 1,
+    \ 'auto_vim_configuration': 1,
+    \ 'goto_command': "'<leader>d'",
+    \ 'goto_assignments_command': "'<leader>g'",
+    \ 'goto_definitions_command': "''",
+    \ 'completions_command': "'<C-Space>'",
+    \ 'call_signatures_command': "'<leader>n'",
+    \ 'usages_command': "'<leader>n'",
+    \ 'rename_command': "'<leader>r'",
+    \ 'popup_on_dot': 1,
+    \ 'documentation_command': "'K'",
+    \ 'show_call_signatures': 1,
+    \ 'show_call_signatures_delay': 500,
+    \ 'call_signature_escape': "'?!?'",
+    \ 'auto_close_doc': 1,
+    \ 'max_doc_height': 30,
+    \ 'popup_select_first': 1,
+    \ 'quickfix_window_height': 10,
+    \ 'completions_enabled': 1,
+    \ 'force_py_version': "'auto'",
+    \ 'smart_auto_mappings': 1,
+    \ 'use_tag_stack': 1
+\ }
+
+for [s:key, s:val] in items(s:deprecations)
+    if exists('g:jedi#'.s:key)
+        echom "'g:jedi#".s:key."' is deprecated. Please use 'g:jedi#".s:val."' instead. Sorry for the inconvenience."
+        exe 'let g:jedi#'.s:val.' = g:jedi#'.s:key
+    endif
+endfor
+
+for [s:key, s:val] in items(s:default_settings)
+    if !exists('g:jedi#'.s:key)
+        exe 'let g:jedi#'.s:key.' = '.s:val
+    endif
+endfor
+
+
+" ------------------------------------------------------------------------
+" Python initialization
+" ------------------------------------------------------------------------
+let s:script_path = fnameescape(expand('<sfile>:p:h:h'))
+
+function! s:init_python() abort
+    if g:jedi#force_py_version !=# 'auto'
+        " Always use the user supplied version.
+        try
+            return jedi#force_py_version(g:jedi#force_py_version)
+        catch
+            throw 'Could not setup g:jedi#force_py_version: '.v:exception
+        endtry
+    endif
+
+    " Handle "auto" version.
+    if has('nvim') || (has('python') && has('python3'))
+        " Neovim usually has both python providers. Skipping the `has` check
+        " avoids starting both of them.
+
+        " Get default python version from interpreter in $PATH.
+        let s:def_py = system('python -c '.shellescape('import sys; sys.stdout.write(str(sys.version_info[0]))'))
+        if v:shell_error != 0 || !len(s:def_py)
+            if !exists('g:jedi#squelch_py_warning')
+                echohl WarningMsg
+                echom 'Warning: jedi-vim failed to get Python version from sys.version_info: ' . s:def_py
+                echom 'Falling back to version 2.'
+                echohl None
+            endif
+            let s:def_py = 2
+        elseif &verbose
+            echom 'jedi-vim: auto-detected Python: '.s:def_py
+        endif
+
+        " Make sure that the auto-detected version is available in Vim.
+        if !has('nvim') || has('python'.(s:def_py == 2 ? '' : s:def_py))
+            return jedi#force_py_version(s:def_py)
+        endif
+
+        " Add a warning in case the auto-detected version is not available,
+        " usually because of a missing neovim module in a VIRTUAL_ENV.
+        if has('nvim')
+            echohl WarningMsg
+            echom 'jedi-vim: the detected Python version ('.s:def_py.')'
+                        \ 'is not functional.'
+                        \ 'Is the "neovim" module installed?'
+                        \ 'While jedi-vim will work, it might not use the'
+                        \ 'expected Python path.'
+            echohl None
+        endif
+    endif
+
+    if has('python')
+        call jedi#setup_py_version(2)
+    elseif has('python3')
+        call jedi#setup_py_version(3)
+    else
+        throw 'jedi-vim requires Vim with support for Python 2 or 3.'
+    endif
+    return 1
+endfunction
+
+
+function! jedi#reinit_python() abort
+    unlet! s:_init_python
+    call jedi#init_python()
+endfunction
+
+
+let s:_init_python = -1
+function! jedi#init_python() abort
+    if s:_init_python == -1
+        try
+            let s:_init_python = s:init_python()
+        catch
+            let s:_init_python = 0
+            if !exists('g:jedi#squelch_py_warning')
+                echoerr 'Error: jedi-vim failed to initialize Python: '
+                            \ .v:exception.' (in '.v:throwpoint.')'
+            endif
+        endtry
+    endif
+    return s:_init_python
+endfunction
+
+
+let s:python_version = 'null'
+function! jedi#setup_py_version(py_version) abort
+    if a:py_version == 2
+        let cmd_init = 'pyfile'
+        let cmd_exec = 'python'
+        let s:python_version = 2
+    elseif a:py_version == 3
+        let cmd_init = 'py3file'
+        let cmd_exec = 'python3'
+        let s:python_version = 3
+    else
+        throw 'jedi#setup_py_version: invalid py_version: '.a:py_version
+    endif
+
+    try
+        execute cmd_init.' '.s:script_path.'/initialize.py'
+    catch
+        throw 'jedi#setup_py_version: '.v:exception
+    endtry
+    execute 'command! -nargs=1 PythonJedi '.cmd_exec.' <args>'
+    return 1
+endfunction
+
+
+function! jedi#debug_info() abort
+    if s:python_version ==# 'null'
+        call s:init_python()
+    endif
+    if &verbose
+      if &filetype !=# 'python'
+        echohl WarningMsg | echo 'You should run this in a buffer with filetype "python".' | echohl None
+      endif
+    endif
+    echo '#### Jedi-vim debug information'
+    echo 'Using Python version:' s:python_version
+    let pyeval = s:python_version == 3 ? 'py3eval' : 'pyeval'
+    let s:pythonjedi_called = 0
+    PythonJedi import vim; vim.command('let s:pythonjedi_called = 1')
+    if !s:pythonjedi_called
+      echohl WarningMsg
+      echom 'PythonJedi failed to run, likely a Python config issue.'
+      if exists(':CheckHealth') == 2
+        echom 'Try :CheckHealth for more information.'
+      endif
+      echohl None
+    else
+      PythonJedi << EOF
+vim.command("echo printf(' - sys.version: `%s`', {0!r})".format(', '.join([x.strip() for x in __import__('sys').version.split('\n')])))
+vim.command("echo printf(' - site module: `%s`', {0!r})".format(__import__('site').__file__))
+
+try:
+  jedi_vim
+except Exception as e:
+  vim.command("echo printf('ERROR: jedi_vim is not available: %s: %s', {0!r}, {1!r})".format(e.__class__.__name__, str(e)))
+else:
+  try:
+    if jedi_vim.jedi is None:
+      vim.command("echo 'ERROR: the \"jedi\" Python module could not be imported.'")
+      vim.command("echo printf('       The error was: %s', {0!r})".format(getattr(jedi_vim, "jedi_import_error", "UNKNOWN")))
+    else:
+      vim.command("echo printf('Jedi path: `%s`', {0!r})".format(jedi_vim.jedi.__file__))
+      vim.command("echo printf(' - version: %s', {0!r})".format(jedi_vim.jedi.__version__))
+      vim.command("echo ' - sys_path:'")
+      for p in jedi_vim.jedi.Script('')._evaluator.sys_path:
+        vim.command("echo printf('    - `%s`', {0!r})".format(p))
+  except Exception as e:
+    vim.command("echo printf('There was an error accessing jedi_vim.jedi: %s', {0!r})".format(e))
+EOF
+    endif
+    echo ' - jedi-vim git version: '
+    echon substitute(system('git -C '.s:script_path.' describe --tags --always --dirty'), '\v\n$', '', '')
+    echo ' - jedi git submodule status: '
+    echon substitute(system('git -C '.s:script_path.' submodule status'), '\v\n$', '', '')
+    echo "\n"
+    echo '##### Settings'
+    echo '```'
+    for [k, V] in items(filter(copy(g:), "v:key =~# '\\v^jedi#'"))
+      exe 'let default = '.get(s:default_settings,
+            \ substitute(k, '\v^jedi#', '', ''), "'-'")
+      " vint: -ProhibitUsingUndeclaredVariable
+      if default !=# V
+        echo printf('g:%s = %s (default: %s)', k, string(V), string(default))
+        unlet! V  " Fix variable type mismatch with Vim 7.3.
+      endif
+      " vint: +ProhibitUsingUndeclaredVariable
+    endfor
+    echo "\n"
+    verb set omnifunc? completeopt?
+    echo '```'
+
+    if &verbose
+      echo "\n"
+      echo '#### :version'
+      echo '```'
+      version
+      echo '```'
+      echo "\n"
+      echo '#### :messages'
+      echo '```'
+      messages
+      echo '```'
+      echo "\n"
+      echo "<details><summary>:scriptnames</summary>"
+      echo "\n"
+      echo '```'
+      scriptnames
+      echo '```'
+      echo "</details>"
+    endif
+endfunction
+
+function! jedi#force_py_version(py_version) abort
+    let g:jedi#force_py_version = a:py_version
+    return jedi#setup_py_version(a:py_version)
+endfunction
+
+
+function! jedi#force_py_version_switch() abort
+    if g:jedi#force_py_version == 2
+        call jedi#force_py_version(3)
+    elseif g:jedi#force_py_version == 3
+        call jedi#force_py_version(2)
+    else
+        throw "Don't know how to switch from ".g:jedi#force_py_version.'!'
+    endif
+endfunction
+
+
+" Helper function instead of `python vim.eval()`, and `.command()` because
+" these also return error definitions.
+function! jedi#_vim_exceptions(str, is_eval) abort
+    let l:result = {}
+    try
+        if a:is_eval
+            let l:result.result = eval(a:str)
+        else
+            execute a:str
+            let l:result.result = ''
+        endif
+    catch
+        let l:result.exception = v:exception
+        let l:result.throwpoint = v:throwpoint
+    endtry
+    return l:result
+endfunction
+
+call jedi#init_python()  " Might throw an error.
+
+" ------------------------------------------------------------------------
+" functions that call python code
+" ------------------------------------------------------------------------
+function! jedi#goto() abort
+    PythonJedi jedi_vim.goto(mode="goto")
+endfunction
+
+function! jedi#goto_assignments() abort
+    PythonJedi jedi_vim.goto(mode="assignment")
+endfunction
+
+function! jedi#goto_definitions() abort
+    PythonJedi jedi_vim.goto(mode="definition")
+endfunction
+
+function! jedi#usages() abort
+    PythonJedi jedi_vim.goto(mode="related_name")
+endfunction
+
+function! jedi#rename(...) abort
+    PythonJedi jedi_vim.rename()
+endfunction
+
+function! jedi#rename_visual(...) abort
+    PythonJedi jedi_vim.rename_visual()
+endfunction
+
+function! jedi#completions(findstart, base) abort
+    PythonJedi jedi_vim.completions()
+endfunction
+
+function! jedi#enable_speed_debugging() abort
+    PythonJedi jedi_vim.jedi.set_debug_function(jedi_vim.print_to_stdout, speed=True, warnings=False, notices=False)
+endfunction
+
+function! jedi#enable_debugging() abort
+    PythonJedi jedi_vim.jedi.set_debug_function(jedi_vim.print_to_stdout)
+endfunction
+
+function! jedi#disable_debugging() abort
+    PythonJedi jedi_vim.jedi.set_debug_function(None)
+endfunction
+
+function! jedi#py_import(args) abort
+    PythonJedi jedi_vim.py_import()
+endfun
+
+function! jedi#py_import_completions(argl, cmdl, pos) abort
+    PythonJedi jedi_vim.py_import_completions()
+endfun
+
+function! jedi#clear_cache(bang) abort
+    PythonJedi jedi_vim.jedi.cache.clear_time_caches(True)
+    if a:bang
+        PythonJedi jedi_vim.jedi.parser.utils.ParserPickling.clear_cache()
+    endif
+endfunction
+
+
+" ------------------------------------------------------------------------
+" show_documentation
+" ------------------------------------------------------------------------
+function! jedi#show_documentation() abort
+    PythonJedi if jedi_vim.show_documentation() is None: vim.command('return')
+
+    let bn = bufnr('__doc__')
+    if bn > 0
+        let wi=index(tabpagebuflist(tabpagenr()), bn)
+        if wi >= 0
+            " If the __doc__ buffer is open in the current tab, jump to it
+            silent execute (wi+1).'wincmd w'
+        else
+            silent execute 'sbuffer '.bn
+        endif
+    else
+        split '__doc__'
+    endif
+
+    setlocal modifiable
+    setlocal noswapfile
+    setlocal buftype=nofile
+    silent normal! ggdG
+    silent $put=l:doc
+    silent normal! 1Gdd
+    setlocal nomodifiable
+    setlocal nomodified
+    setlocal filetype=rst
+
+    if l:doc_lines > g:jedi#max_doc_height " max lines for plugin
+        let l:doc_lines = g:jedi#max_doc_height
+    endif
+    execute 'resize '.l:doc_lines
+
+    " quit comands
+    nnoremap <buffer> q ZQ
+    execute 'nnoremap <buffer> '.g:jedi#documentation_command.' ZQ'
+
+    " highlight python code within rst
+    unlet! b:current_syntax
+    syn include @rstPythonScript syntax/python.vim
+    " 4 spaces
+    syn region rstPythonRegion start=/^\v {4}/ end=/\v^( {4}|\n)@!/ contains=@rstPythonScript
+    " >>> python code -> (doctests)
+    syn region rstPythonRegion matchgroup=pythonDoctest start=/^>>>\s*/ end=/\n/ contains=@rstPythonScript
+    let b:current_syntax = 'rst'
+endfunction
+
+" ------------------------------------------------------------------------
+" helper functions
+" ------------------------------------------------------------------------
+
+function! jedi#add_goto_window(len) abort
+    set lazyredraw
+    cclose
+    let height = min([a:len, g:jedi#quickfix_window_height])
+    execute 'belowright copen '.height
+    set nolazyredraw
+    if g:jedi#use_tabs_not_buffers == 1
+        noremap <buffer> <CR> :call jedi#goto_window_on_enter()<CR>
+    endif
+    augroup jedi_goto_window
+      au!
+      au WinLeave <buffer> q  " automatically leave, if an option is chosen
+    augroup END
+    redraw!
+endfunction
+
+
+function! jedi#goto_window_on_enter() abort
+    let l:list = getqflist()
+    let l:data = l:list[line('.') - 1]
+    if l:data.bufnr
+        " close goto_window buffer
+        normal! ZQ
+        PythonJedi jedi_vim.new_buffer(vim.eval('bufname(l:data.bufnr)'))
+        call cursor(l:data.lnum, l:data.col)
+    else
+        echohl WarningMsg | echo 'Builtin module cannot be opened.' | echohl None
+    endif
+endfunction
+
+
+function! s:syn_stack() abort
+    if !exists('*synstack')
+        return []
+    endif
+    return map(synstack(line('.'), col('.') - 1), "synIDattr(v:val, 'name')")
+endfunc
+
+
+function! jedi#do_popup_on_dot_in_highlight() abort
+    let highlight_groups = s:syn_stack()
+    for a in highlight_groups
+        if a ==# 'pythonDoctest'
+            return 1
+        endif
+    endfor
+
+    for a in highlight_groups
+        for b in ['pythonString', 'pythonComment', 'pythonNumber']
+            if a == b
+                return 0
+            endif
+        endfor
+    endfor
+    return 1
+endfunc
+
+
+let s:show_call_signatures_last = [0, 0, '']
+function! jedi#show_call_signatures() abort
+    if s:_init_python == 0
+        return 1
+    endif
+    let [line, col] = [line('.'), col('.')]
+    let curline = getline(line)
+    let reload_signatures = 1
+
+    " Caching.  On the same line only.
+    if line == s:show_call_signatures_last[0]
+        " Check if the number of commas and parenthesis before or after the
+        " cursor has not changed since the last call, which means that the
+        " argument position was not changed and we can skip repainting.
+        let prevcol = s:show_call_signatures_last[1]
+        let prevline = s:show_call_signatures_last[2]
+        if substitute(curline[:col-2], '[^,()]', '', 'g')
+                    \ == substitute(prevline[:prevcol-2], '[^,()]', '', 'g')
+                    \ && substitute(curline[(col-2):], '[^,()]', '', 'g')
+                    \ == substitute(prevline[(prevcol-2):], '[^,()]', '', 'g')
+            let reload_signatures = 0
+        endif
+    endif
+    let s:show_call_signatures_last = [line, col, curline]
+
+    if reload_signatures
+        PythonJedi jedi_vim.show_call_signatures()
+    endif
+endfunction
+
+
+function! jedi#clear_call_signatures() abort
+    if s:_init_python == 0
+        return 1
+    endif
+
+    let s:show_call_signatures_last = [0, 0, '']
+    PythonJedi jedi_vim.clear_call_signatures()
+endfunction
+
+
+function! jedi#configure_call_signatures() abort
+    augroup jedi_call_signatures
+    autocmd! * <buffer>
+    if g:jedi#show_call_signatures == 2  " Command line call signatures
+        autocmd InsertEnter <buffer> let g:jedi#first_col = s:save_first_col()
+    endif
+    autocmd InsertEnter <buffer> let s:show_call_signatures_last = [0, 0, '']
+    autocmd InsertLeave <buffer> call jedi#clear_call_signatures()
+    if g:jedi#show_call_signatures_delay > 0
+        autocmd InsertEnter <buffer> let b:_jedi_orig_updatetime = &updatetime
+                    \ | let &updatetime = g:jedi#show_call_signatures_delay
+        autocmd InsertLeave <buffer> if exists('b:_jedi_orig_updatetime')
+                    \ |   let &updatetime = b:_jedi_orig_updatetime
+                    \ |   unlet b:_jedi_orig_updatetime
+                    \ | endif
+        autocmd CursorHoldI <buffer> call jedi#show_call_signatures()
+    else
+        autocmd CursorMovedI <buffer> call jedi#show_call_signatures()
+    endif
+    augroup END
+endfunction
+
+
+" Determine where the current window is on the screen for displaying call
+" signatures in the correct column.
+function! s:save_first_col() abort
+    if bufname('%') ==# '[Command Line]' || winnr('$') == 1
+        return 0
+    endif
+
+    let startwin = winnr()
+    let winwidth = winwidth(0)
+    if winwidth == &columns
+        return 0
+    elseif winnr('$') == 2
+        return startwin == 1 ? 0 : (winwidth(1) + 1)
+    elseif winnr('$') == 3
+        if startwin == 1
+            return 0
+        endif
+        let ww1 = winwidth(1)
+        let ww2 = winwidth(2)
+        let ww3 = winwidth(3)
+        if ww1 + ww2 + ww3 + 2 == &columns
+            if startwin == 2
+                return ww1 + 1
+            else
+                return ww1 + ww2 + 2
+            endif
+        elseif startwin == 2
+            if ww2 + ww3 + 1 == &columns
+                return 0
+            else
+                return ww1 + 1
+            endif
+        else " startwin == 3
+            if ww2 + ww3 + 1 == &columns
+                return ww2 + 1
+            else
+                return ww1 + 1
+            endif
+        endif
+    endif
+    return 0
+endfunction
+
+
+function! jedi#complete_string(is_popup_on_dot) abort
+    if a:is_popup_on_dot && !(g:jedi#popup_on_dot && jedi#do_popup_on_dot_in_highlight())
+        return ''
+    endif
+    if pumvisible() && !a:is_popup_on_dot
+        return "\<C-n>"
+    else
+        return "\<C-x>\<C-o>\<C-r>=jedi#complete_opened(".a:is_popup_on_dot.")\<CR>"
+    endif
+endfunction
+
+
+function! jedi#complete_opened(is_popup_on_dot) abort
+    if pumvisible()
+        " Only go down if it is visible, user-enabled and the longest
+        " option is set.
+        if g:jedi#popup_select_first && stridx(&completeopt, 'longest') > -1
+            return "\<Down>"
+        endif
+        if a:is_popup_on_dot
+            if &completeopt !~# '\(noinsert\|noselect\)'
+                " Prevent completion of the first entry with dot completion.
+                return "\<C-p>"
+            endif
+        endif
+    endif
+    return ''
+endfunction
+
+
+function! jedi#smart_auto_mappings() abort
+    " Auto put import statement after from module.name<space> and complete
+    if search('\m^\s*from\s\+[A-Za-z0-9._]\{1,50}\%#\s*$', 'bcn', line('.'))
+        " Enter character and start completion.
+        return "\<space>import \<C-x>\<C-o>\<C-r>=jedi#complete_opened(1)\<CR>"
+    endif
+    return "\<space>"
+endfunction
+
+
+"PythonJedi jedi_vim.jedi.set_debug_function(jedi_vim.print_to_stdout, speed=True, warnings=False, notices=False)
+"PythonJedi jedi_vim.jedi.set_debug_function(jedi_vim.print_to_stdout)
+
+" vim: set et ts=4:
diff --git a/vim-plugins/bundle/jedi-vim/conftest.py b/vim-plugins/bundle/jedi-vim/conftest.py
new file mode 100644
index 0000000..34a4603
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/conftest.py
@@ -0,0 +1,60 @@
+import os
+import subprocess
+import urllib
+import zipfile
+
+import pytest
+
+VSPEC_URL = 'https://github.com/kana/vim-vspec/archive/1.4.1.zip'
+CACHE_FOLDER = '.cache'
+VSPEC_FOLDER = os.path.join(CACHE_FOLDER, 'vim-vspec-1.4.1')
+VSPEC_RUNNER = os.path.join(VSPEC_FOLDER, 'bin/vspec')
+TEST_DIR = 'test'
+
+
+class IntegrationTestFile(object):
+    def __init__(self, path):
+        self.path = path
+
+    def run(self):
+        output = subprocess.check_output(
+            [VSPEC_RUNNER, '.', VSPEC_FOLDER, self.path])
+        for line in output.splitlines():
+            if line.startswith(b'not ok') or line.startswith(b'Error'):
+                pytest.fail("{0} failed:\n{1}".format(
+                    self.path, output.decode('utf-8')), pytrace=False)
+
+    def __repr__(self):
+        return "<%s: %s>" % (type(self), self.path)
+
+
+def pytest_configure(config):
+    if not os.path.isdir(CACHE_FOLDER):
+        os.mkdir(CACHE_FOLDER)
+
+    if not os.path.exists(VSPEC_FOLDER):
+        name, hdrs = urllib.urlretrieve(VSPEC_URL)
+        z = zipfile.ZipFile(name)
+        for n in z.namelist():
+            dest = os.path.join(CACHE_FOLDER, n)
+            destdir = os.path.dirname(dest)
+            if not os.path.isdir(destdir):
+                os.makedirs(destdir)
+            data = z.read(n)
+            if not os.path.isdir(dest):
+                with open(dest, 'w') as f:
+                    f.write(data)
+        z.close()
+        os.chmod(VSPEC_RUNNER, 0o777)
+
+
+def pytest_generate_tests(metafunc):
+    """
+    :type metafunc: _pytest.python.Metafunc
+    """
+    def collect_tests():
+        for f in os.listdir(TEST_DIR):
+            if f.endswith('.vim'):
+                yield IntegrationTestFile(os.path.join(TEST_DIR, f))
+
+    metafunc.parametrize('case', list(collect_tests()))
diff --git a/vim-plugins/bundle/jedi-vim/doc/jedi-vim.txt b/vim-plugins/bundle/jedi-vim/doc/jedi-vim.txt
new file mode 100644
index 0000000..81bf2ce
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/doc/jedi-vim.txt
@@ -0,0 +1,544 @@
+*jedi-vim.txt* - For Vim version 7.3 - Last change: 2014/07/29
+       __   _______  _______   __       ____    ____  __  .___  ___.~
+      |  | |   ____||       \ |  |      \   \  /   / |  | |   \/   |~
+      |  | |  |__   |  .--.  ||  |  _____\   \/   /  |  | |  \  /  |~
+.--.  |  | |   __|  |  |  |  ||  | |______\      /   |  | |  |\/|  |~
+|  `--'  | |  |____ |  '--'  ||  |         \    /    |  | |  |  |  |~
+ \______/  |_______||_______/ |__|          \__/     |__| |__|  |__|~
+
+          jedi-vim - awesome Python autocompletion with Vim
+
+==============================================================================
+Contents                                *jedi-vim-contents*
+
+1. Introduction                         |jedi-vim-introduction|
+2. Installation                         |jedi-vim-installation|
+    2.0. Requirements                   |jedi-vim-installation-requirements|
+    2.1. Manually                       |jedi-vim-installation-manually|
+    2.2. Using Pathogen                 |jedi-vim-installation-pathogen|
+    2.3. Using Vundle                   |jedi-vim-installation-vundle|
+    2.4. Installing from Repositories   |jedi-vim-installation-repos|
+3. Supported Python features            |jedi-vim-support|
+4. Usage                                |jedi-vim-usage|
+5. Mappings                             |jedi-vim-keybindings|
+    5.1. Start completion               |g:jedi#completions_command|
+    5.2. Go to definition               |g:jedi#goto_command|
+    5.3. Go to assignment               |g:jedi#goto_assignments_command|
+    5.4  Go to definition (deprecated)  |g:jedi#goto_definitions_command|
+    5.5. Show documentation             |g:jedi#documentation_command|
+    5.6. Rename variables               |g:jedi#rename_command|
+    5.7. Show name usages               |g:jedi#usages_command|
+    5.8. Open module by name            |:Pyimport|
+6. Configuration                        |jedi-vim-configuration|
+    6.1. auto_initialization            |g:jedi#auto_initialization|
+    6.2. auto_vim_configuration         |g:jedi#auto_vim_configuration|
+    6.3. popup_on_dot                   |g:jedi#popup_on_dot|
+    6.4. popup_select_first             |g:jedi#popup_select_first|
+    6.5. auto_close_doc                 |g:jedi#auto_close_doc|
+    6.6. show_call_signatures           |g:jedi#show_call_signatures|
+    6.7. show_call_signatures_delay     |g:jedi#show_call_signatures_delay|
+    6.8. use_tabs_not_buffers           |g:jedi#use_tabs_not_buffers|
+    6.9. squelch_py_warning             |g:jedi#squelch_py_warning|
+    6.10. completions_enabled           |g:jedi#completions_enabled|
+    6.11. use_splits_not_buffers        |g:jedi#use_splits_not_buffers|
+    6.12. force_py_version              |g:jedi#force_py_version|
+    6.13. smart_auto_mappings           |g:jedi#smart_auto_mappings|
+    6.14. use_tag_stack                 |g:jedi#use_tag_stack|
+7. Testing                              |jedi-vim-testing|
+8. Contributing                         |jedi-vim-contributing|
+9. License                              |jedi-vim-license|
+
+==============================================================================
+1. Introduction                         *jedi-vim-introduction*
+
+Jedi-vim is a Vim binding to the awesome Python autocompletion library
+`jedi`. Among jedi's (and, therefore, jedi-vim's) features are:
+
+- Completion for a wide array of Python features (see |jedi-vim-support|)
+- Robust in dealing with syntax errors and wrong indentation
+- Parses complex module/function/class structures
+- Infers function arguments from Sphinx/Epydoc strings
+- Doesn't execute Python code
+- Supports Virtualenv
+- Supports Python 2.5+ and 3.2+
+
+By leveraging this library, jedi-vim adds the following capabilities to Vim:
+
+- Displaying function/class bodies
+- "Go to definition" command
+- Displaying docstrings
+- Renaming and refactoring
+- Looking up related names
+
+==============================================================================
+2. Installation                         *jedi-vim-installation*
+
+------------------------------------------------------------------------------
+2.0. Requirements                       *jedi-vim-installation-requirements*
+
+First of all, jedi-vim requires Vim to be compiled with the `+python` option.
+
+The jedi library has to be installed for jedi-vim to work properly.  You can
+install it first, by using e.g. your distribution's package manager, or by
+using pip: >
+
+    pip install jedi
+
+However, you can also install it as a git submodule if you don't want to use
+jedi for anything but this plugin. How to do this is detailed below.
+
+It is best if you have VIM >= 7.3, compiled with the `+conceal` option. With
+older versions, you will probably not see the parameter recommendation list
+for functions after typing the open bracket. Some platforms (including OS X
+releases) do not ship a VIM with `+conceal`. You can check if your VIM has the
+feature with >
+
+    :ver
+
+and look for "`+conceal`" (as opposed to "`-conceal`") or >
+
+    :echo has('conceal')
+
+which will report 0 (not included) or 1 (included). If your VIM lacks this
+feature and you would like function parameter completion, you will need to
+build your own VIM, or use a package for your operating system that has this
+feature (such as MacVim on OS X, which also contains a console binary).
+
+------------------------------------------------------------------------------
+2.1. Installing manually                *jedi-vim-installation-manually*
+
+1a. Get the latest repository from Github: >
+
+    git clone http://github.com/davidhalter/jedi-vim path/to/bundles/jedi-vim
+
+1b. If you want to install jedi as a submodule instead, issue this command: >
+
+    git clone --recursive http://github.com/davidhalter/jedi-vim
+
+2. Put the plugin files into their respective folders in your vim runtime
+   directory (usually ~/.vim). Be sure to pay attention to the directory
+   structure!
+3. Update the Vim help tags with >
+
+    :helptags <path/to/vimruntime>/doc
+
+------------------------------------------------------------------------------
+2.1. Installing using Pathogen          *jedi-vim-installation-pathogen*
+
+Pathogen simplifies installation considerably.
+
+1.a Clone the git repository into your bundles directory: >
+
+    git clone http://github.com/davidhalter/jedi-vim path/to/bundles/jedi-vim
+
+1b. Again, if you want to install jedi as a submodule, use this command
+   instead: >
+
+    git clone --recursive http://github.com/davidhalter/jedi-vim
+
+------------------------------------------------------------------------------
+2.3. Installing using Vundle            *jedi-vim-installation-vundle*
+
+1. Vundle automatically downloads subrepositories as git submodules, so you
+   will automatically get the jedi library with the jedi-vim plugin. Add the
+   following to the Bundles section in your .vimrc file: >
+
+    Plugin 'davidhalter/jedi-vim'
+
+2. Issue the following command in Vim: >
+
+    :PluginInstall
+
+Help tags are generated automatically, so you should be good to go.
+
+------------------------------------------------------------------------------
+2.4. Installing from Repositories       *jedi-vim-installation-repos*
+
+Some Linux distributions have jedi-vim packages in their official 
+repositories. On Arch Linux, install vim-jedi. On Debian (8+) or Ubuntu 
+(14.04+) install vim-python-jedi.
+
+==============================================================================
+3. Supported Python features            *jedi-vim-support*
+
+The Jedi library does all the hard work behind the scenes. It supports
+completion of a large number of Python features, among them:
+
+- Builtins
+- Multiple `return`s or `yield`s
+- Tuple assignments/array indexing/dictionary indexing
+- `with`-statement/exception handling
+- `*args` and `**kwargs`
+- Decorators, lambdas, closures
+- Generators, iterators
+- Some descriptors: `property`/`staticmethod`/`classmethod`
+- Some magic methods: `__call__`, `__iter__`, `__next__`, `__get__`,
+  `__getitem__`, `__init__`
+- `list.append()`, `set.add()`, `list.extend()`, etc.
+- (Nested) list comprehensions and ternary expressions
+- Relative `import`s
+- `getattr()`/`__getattr__`/`__getattribute__`
+- Function annotations (py3k feature, are being ignored at the moment, but are
+  parsed)
+- Class decorators (py3k feature, are being ignored at the moment, but are
+  parsed)
+- Simple/usual `sys.path` modifications
+- `isinstance` checks for `if`/`while`/`assert` case, that doesn’t work with
+  Jedi
+- And more...
+
+Note: This list is not necessarily up to date. For a complete list of
+features, please refer to the Jedi documentation at http://jedi.jedidjah.ch.
+
+==============================================================================
+4. Usage                                *jedi-vim-usage*
+
+With the default settings, autocompletion can be triggered by typing
+<Ctrl-Space>. The first entry will automatically be selected, so you can press
+<Return> to insert it into your code or keep typing and narrow down your
+completion options. The usual <C-X><C-O> and <C-P>/<C-N> keybindings work as
+well. Autocompletion is also triggered by typing a period in insert mode.
+Since periods rarely occur in Python code outside of method/import lookups,
+this is handy to have (but can be disabled).
+
+When it encounters a new module, jedi might take a few seconds to parse that
+module's contents. Afterwards, the contents are cached and completion will be
+almost instantaneous.
+
+==============================================================================
+5. Key Bindings                         *jedi-vim-keybindings*
+
+All keybindings can be mapped by setting the appropriate global option. For
+example, to set the keybinding for starting omnicompletion to <C-N> instead of
+<Ctrl-Space>, add the following setting to your .vimrc file: >
+
+    let g:jedi#completions_command = "<C-N>"
+
+Note: If you have |g:jedi#auto_initialization| set to 0, you have to create
+a mapping yourself by calling a function: >
+
+    " Using <C-N> for omnicompletion
+    inoremap <silent> <buffer> <C-N> <c-x><c-o>
+    " Use <localleader>r (by default <\-r>) for renaming
+    nnoremap <silent> <buffer> <localleader>r :call jedi#rename()<cr>
+    " etc.
+
+Note: You can set commands to '', which means that they are empty and not
+assigned. It's an easy way to "disable" functionality of jedi-vim.
+
+------------------------------------------------------------------------------
+5.1. `g:jedi#completions_command`       *g:jedi#completions_command*
+Function: n/a; see above
+Default: <Ctrl-Space>                   Start completion
+
+Performs autocompletion (or omnicompletion, to be precise).
+
+Note: If you want to use <Tab> for completion, please install Supertab:
+https://github.com/ervandew/supertab.
+
+------------------------------------------------------------------------------
+5.2. `g:jedi#goto_command`              *g:jedi#goto_command*
+Function: `jedi#goto()`
+Default: <leader>d                      Go to definition (or assignment)
+
+This function first tries |jedi#goto_definitions|, and falls back to
+|jedi#goto_assignments| for builtin modules.  It produces an error if nothing
+could be found.
+NOTE: this implementation is subject to change.
+Ref: https://github.com/davidhalter/jedi/issues/570
+
+This command tries to find the original definition of the function/class under
+the cursor. Just like the `jedi#goto_assignments()` function, it does not work
+if the definition isn't in a Python source file.
+
+The difference between `jedi#goto_assignments()` and `jedi#goto_definitions()`
+is that the latter performs recursive lookups. Take, for example, the
+following module structure: >
+
+    # file1.py:
+    from file2 import foo
+
+    # file2.py:
+    from file3 import bar as foo
+
+    # file3.py
+    def bar():
+        pass
+
+The `jedi#goto_assignments()` function will take you to the >
+
+    from file2 import foo
+
+statement in file1.py, while the `jedi#goto_definitions()` function will take
+you all the way to the >
+
+    def bar():
+
+line in file3.py.
+
+------------------------------------------------------------------------------
+5.3. `g:jedi#goto_assignments_command`  *g:jedi#goto_assignments_command*
+Function: `jedi#goto_assignments()`
+Default: <leader>g                      Go to assignment
+
+This function finds the first definition of the function/class under the
+cursor. It produces an error if the definition is not in a Python file.
+
+------------------------------------------------------------------------------
+5.4. `g:jedi#goto_definitions_command`  *g:jedi#goto_definitions_command*
+Function: `jedi#goto_definitions()`
+Default: -                              Go to original definition
+
+NOTE: Deprecated. Use |g:jedi#goto_command| / |jedi#goto()| instead, which
+currently uses this internally.
+
+------------------------------------------------------------------------------
+5.5. `g:jedi#documentation_command`     *g:jedi#documentation_command*
+Function: `jedi#show_documentation()`
+Default: <K>                            Show pydoc documentation
+
+This shows the pydoc documentation for the item currently under the cursor.
+The documentation is opened in a horizontally split buffer. The height of this
+buffer is controlled by `g:jedi#max_doc_height` (set by default to 30).
+
+------------------------------------------------------------------------------
+5.6. `g:jedi#rename_command`            *g:jedi#rename_command*
+Function: `jedi#rename()`
+Default: <leader>r                      Rename variables
+
+Jedi-vim deletes the word currently under the cursor and puts Vim in insert
+mode, where the user is expected to enter the new variable name. Upon leaving
+insert mode, jedi-vim then renames all occurences of the old variable name
+with the new one. The number of performed renames is displayed in the command
+line.
+
+------------------------------------------------------------------------------
+5.7. `g:jedi#usages_command`            *g:jedi#usages_command*
+Function: `jedi#usages()`
+Default: <leader>n                      Show usages of a name.
+
+The quickfix window is populated with a list of all names which point to the
+definition of the name under the cursor.
+
+------------------------------------------------------------------------------
+5.8. Open module by name                *:Pyimport*
+Function: `jedi#py_import(args)`
+Default: :Pyimport                      e.g. `:Pyimport os` shows os.py in VIM.
+
+Simulate an import and open that module in VIM.
+
+==============================================================================
+6. Configuration                        *jedi-vim-configuration*
+
+Note: You currently have to set these options in your .vimrc. Setting them in
+an ftplugin (e.g. ~/.vim/ftplugin/python/jedi-vim-settings.vim) will not work
+because jedi-vim is not set up as an filetype plugin, but as a "regular"
+plugin.
+
+------------------------------------------------------------------------------
+6.1. `g:jedi#auto_initialization`       *g:jedi#auto_initialization*
+
+Upon initialization, jedi-vim performs the following steps:
+
+1. Set the current buffers 'omnifunc' to its own completion function
+   `jedi#completions`
+2. Create mappings to commands specified in |jedi-vim-keybindings|
+3. Call `jedi#configure_call_signatures()` if
+   `g:jedi#show_call_signatures` is set
+
+You can disable the default initialization routine by setting this option to
+0. Beware that you have to perform the above steps yourself, though.
+
+Options: 0 or 1
+Default: 1 (Perform automatic initialization)
+
+------------------------------------------------------------------------------
+6.2. `g:jedi#auto_vim_configuration`    *g:jedi#auto_vim_configuration*
+
+Jedi-vim sets 'completeopt' to `menuone,longest,preview` by default, if
+'completeopt' is not changed from Vim's default.
+It also remaps <Ctrl-C> to <Esc> in insert mode.
+
+If you want to keep your own configuration, disable this setting.
+
+Options: 0 or 1
+Default: 1 (Set 'completeopt' and mapping as described above)
+
+------------------------------------------------------------------------------
+6.3. `g:jedi#popup_on_dot`              *g:jedi#popup_on_dot*
+
+Jedi-vim automatically starts completion upon typing a period in insert mode.
+
+However, when working with large modules, this can slow down your typing flow
+since you have to wait for jedi to parse the module and show the completion
+menu. By disabling this setting, completion is only started when you manually
+press the completion key.
+
+Options: 0 or 1
+Default: 1 (Start completion on typing a period)
+
+------------------------------------------------------------------------------
+6.4. `g:jedi#popup_select_first`        *g:jedi#popup_select_first*
+
+Upon starting completion, jedi-vim can automatically select the first entry
+that pops up (without actually inserting it).
+
+This leads to a better typing flow: As you type more characters, the entries
+in the completion menu are narrowed down. If they are narrowed down enough,
+you can just press <Return> to insert the first match.
+
+Options: 0 or 1
+Default: 1 (Automatically select first completion entry)
+
+------------------------------------------------------------------------------
+6.5. `g:jedi#auto_close_doc`            *g:jedi#auto_close_doc*
+
+When doing completion, jedi-vim shows the docstring of the currently selected
+item in a preview window. By default, this window is being closed after
+insertion of a completion item.
+
+Set this to 0 to leave the preview window open even after leaving insert mode.
+This could be useful if you want to browse longer docstrings.
+
+Options: 0 or 1
+Default: 1 (Automatically close preview window upon leaving insert mode)
+
+------------------------------------------------------------------------------
+6.6. `g:jedi#show_call_signatures`      *g:jedi#show_call_signatures*
+
+Jedi-vim can display a small window detailing the arguments of the currently
+completed function and highlighting the currently selected argument. This can
+be disabled by setting this option to 0. Setting this option to 2 shows call
+signatures in the command line instead of a popup window.
+
+Options: 0, 1, or 2
+Default: 1 (Show call signatures window)
+
+Note: 'showmode' must be disabled for command line call signatures to be
+visible.
+
+Note: This setting is ignored if |g:jedi#auto_initialization| is set to 0. In
+that case, if you want to see call signatures, you have to set it up
+manually by calling a function in your configuration file: >
+
+    call jedi#configure_call_signatures()
+
+------------------------------------------------------------------------------
+6.7. `g:jedi#show_call_signatures_delay`  *g:jedi#show_call_signatures_delay*
+
+The delay to be used with |g:jedi#show_call_signatures|.  If it is greater
+than 0 it will use Vim's |CursorHoldI| event instead of |CursorMovedI|.
+It will temporarily set Vim's |'updatetime'| option during insert mode.
+
+Options: delay in milliseconds
+Default: 500
+
+------------------------------------------------------------------------------
+6.8. `g:jedi#use_tabs_not_buffers`      *g:jedi#use_tabs_not_buffers*
+
+You can make jedi-vim open a new tab if you use the "go to", "show
+definition", or "related names" commands. When you leave this at the default
+(0), they open in the current buffer instead.
+
+Options: 0 or 1
+Default: 0 (Command output is put in a new tab)
+
+------------------------------------------------------------------------------
+6.9. `g:jedi#squelch_py_warning`        *g:jedi#squelch_py_warning*
+
+When Vim has not been compiled with +python, jedi-vim shows a warning to that
+effect and aborts loading itself. Set this to 1 to suppress that warning.
+
+Options: 0 or 1
+Default: 0 (Warning is shown)
+
+------------------------------------------------------------------------------
+6.10. `g:jedi#completions_enabled`      *g:jedi#completions_enabled*
+
+If you don't want Jedi completion, but all the other features, you can disable
+it in favor of another completion engine (that probably also uses Jedi, like
+YCM).
+
+Options: 0 or 1
+Default: 1
+
+------------------------------------------------------------------------------
+6.11. `g:jedi#use_splits_not_buffers`   *g:jedi#use_splits_not_buffers*
+
+If you want to open new split for "go to", you could set this option to the
+direction which you want to open a split with.
+
+Options: top, left, right, bottom or winwidth
+Default: "" (not enabled by default)
+
+Note: with the 'winwidth' option the window is split vertically or horizontally
+depending on the width of the window relative to 'textwidth'. This essentially
+means that if the window is big enough it will be split vertically but if it is
+small a horizontal split happens.
+
+------------------------------------------------------------------------------
+6.12. `g:jedi#force_py_version`                *g:jedi#force_py_version*
+
+If you have installed both python 2 and python 3, you can force which one jedi
+should use by setting this variable. It forces the internal Vim command, which
+will be used for every jedi call to the respective python interpreter.
+The variable can be set in the .vimrc like this to force python 3:
+
+let g:jedi#force_py_version = 3
+
+This variable can be switched during runtime using the following function:
+Function: `jedi#force_py_version_switch()`
+
+or set directly using this function, which has the same name as the variable:
+Function: `jedi#force_py_version(py_version)`
+
+Options: 2 or 3
+Default: "auto" (will use sys.version_info from "python" in your $PATH)
+------------------------------------------------------------------------------
+6.13. `g:jedi#smart_auto_mappings`                  *g:jedi#smart_auto_mappings*
+
+When you start typing `from module.name<space>` jedi-vim automatically
+adds the "import" statement and displays the autocomplete popup.
+
+This option can be disabled in the .vimrc:
+
+`let g:jedi#smart_auto_mappings = 0`
+
+Options: 0 or 1
+Default: 1 (enabled by default)
+
+------------------------------------------------------------------------------
+6.14. `g:jedi#use_tag_stack`                    *g:jedi#use_tag_stack*
+
+Write results of |jedi#goto| to a temporary file and use the |:tjump| command
+to enable full |tagstack| functionality. Use of the tag stack allows
+returning to the usage of a function with CTRL-T after exploring the
+definition with arbitrary changes to the |jumplist|.
+
+Options: 0 or 1
+Default: 1 (enabled by default)
+
+==============================================================================
+7. Testing                              *jedi-vim-testing*
+
+jedi-vim is being tested with a combination of vspec
+https://github.com/kana/vim-vspec and py.test http://pytest.org/.
+
+The tests are in the test subdirectory, you can run them calling::
+
+    py.test
+
+The tests are automatically run with `travis
+<https://travis-ci.org/davidhalter/jedi-vim>`_.
+
+==============================================================================
+8. Contributing                         *jedi-vim-contributing*
+
+We love Pull Requests! Read the instructions in `CONTRIBUTING.md`.
+
+==============================================================================
+9. License                              *jedi-vim-license*
+
+Jedi-vim is licensed with the MIT license.
+
+ vim: textwidth=78 et filetype=help:norightleft:
diff --git a/vim-plugins/bundle/jedi-vim/doc/tags b/vim-plugins/bundle/jedi-vim/doc/tags
new file mode 100644
index 0000000..9538e5b
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/doc/tags
@@ -0,0 +1,38 @@
+:Pyimport	jedi-vim.txt	/*:Pyimport*
+g:jedi#auto_close_doc	jedi-vim.txt	/*g:jedi#auto_close_doc*
+g:jedi#auto_initialization	jedi-vim.txt	/*g:jedi#auto_initialization*
+g:jedi#auto_vim_configuration	jedi-vim.txt	/*g:jedi#auto_vim_configuration*
+g:jedi#completions_command	jedi-vim.txt	/*g:jedi#completions_command*
+g:jedi#completions_enabled	jedi-vim.txt	/*g:jedi#completions_enabled*
+g:jedi#documentation_command	jedi-vim.txt	/*g:jedi#documentation_command*
+g:jedi#force_py_version	jedi-vim.txt	/*g:jedi#force_py_version*
+g:jedi#goto_assignments_command	jedi-vim.txt	/*g:jedi#goto_assignments_command*
+g:jedi#goto_command	jedi-vim.txt	/*g:jedi#goto_command*
+g:jedi#goto_definitions_command	jedi-vim.txt	/*g:jedi#goto_definitions_command*
+g:jedi#popup_on_dot	jedi-vim.txt	/*g:jedi#popup_on_dot*
+g:jedi#popup_select_first	jedi-vim.txt	/*g:jedi#popup_select_first*
+g:jedi#rename_command	jedi-vim.txt	/*g:jedi#rename_command*
+g:jedi#show_call_signatures	jedi-vim.txt	/*g:jedi#show_call_signatures*
+g:jedi#show_call_signatures_delay	jedi-vim.txt	/*g:jedi#show_call_signatures_delay*
+g:jedi#smart_auto_mappings	jedi-vim.txt	/*g:jedi#smart_auto_mappings*
+g:jedi#squelch_py_warning	jedi-vim.txt	/*g:jedi#squelch_py_warning*
+g:jedi#usages_command	jedi-vim.txt	/*g:jedi#usages_command*
+g:jedi#use_splits_not_buffers	jedi-vim.txt	/*g:jedi#use_splits_not_buffers*
+g:jedi#use_tabs_not_buffers	jedi-vim.txt	/*g:jedi#use_tabs_not_buffers*
+g:jedi#use_tag_stack	jedi-vim.txt	/*g:jedi#use_tag_stack*
+jedi-vim-configuration	jedi-vim.txt	/*jedi-vim-configuration*
+jedi-vim-contents	jedi-vim.txt	/*jedi-vim-contents*
+jedi-vim-contributing	jedi-vim.txt	/*jedi-vim-contributing*
+jedi-vim-installation	jedi-vim.txt	/*jedi-vim-installation*
+jedi-vim-installation-manually	jedi-vim.txt	/*jedi-vim-installation-manually*
+jedi-vim-installation-pathogen	jedi-vim.txt	/*jedi-vim-installation-pathogen*
+jedi-vim-installation-repos	jedi-vim.txt	/*jedi-vim-installation-repos*
+jedi-vim-installation-requirements	jedi-vim.txt	/*jedi-vim-installation-requirements*
+jedi-vim-installation-vundle	jedi-vim.txt	/*jedi-vim-installation-vundle*
+jedi-vim-introduction	jedi-vim.txt	/*jedi-vim-introduction*
+jedi-vim-keybindings	jedi-vim.txt	/*jedi-vim-keybindings*
+jedi-vim-license	jedi-vim.txt	/*jedi-vim-license*
+jedi-vim-support	jedi-vim.txt	/*jedi-vim-support*
+jedi-vim-testing	jedi-vim.txt	/*jedi-vim-testing*
+jedi-vim-usage	jedi-vim.txt	/*jedi-vim-usage*
+jedi-vim.txt	jedi-vim.txt	/*jedi-vim.txt*
diff --git a/vim-plugins/bundle/jedi-vim/ftplugin/python/jedi.vim b/vim-plugins/bundle/jedi-vim/ftplugin/python/jedi.vim
new file mode 100644
index 0000000..158ea1f
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/ftplugin/python/jedi.vim
@@ -0,0 +1,50 @@
+if !jedi#init_python()
+    finish
+endif
+" ------------------------------------------------------------------------
+" Initialization of jedi-vim
+" ------------------------------------------------------------------------
+
+if g:jedi#auto_initialization
+    " goto / get_definition / usages
+    if len(g:jedi#goto_command)
+        execute 'nnoremap <buffer> '.g:jedi#goto_command.' :call jedi#goto()<CR>'
+    endif
+    if len(g:jedi#goto_assignments_command)
+        execute 'nnoremap <buffer> '.g:jedi#goto_assignments_command.' :call jedi#goto_assignments()<CR>'
+    endif
+    if len(g:jedi#goto_definitions_command)
+        execute 'nnoremap <buffer> '.g:jedi#goto_definitions_command.' :call jedi#goto_definitions()<CR>'
+    endif
+    if len(g:jedi#usages_command)
+        execute 'nnoremap <buffer> '.g:jedi#usages_command.' :call jedi#usages()<CR>'
+    endif
+    " rename
+    if len(g:jedi#rename_command)
+        execute 'nnoremap <buffer> '.g:jedi#rename_command.' :call jedi#rename()<CR>'
+        execute 'vnoremap <buffer> '.g:jedi#rename_command.' :call jedi#rename_visual()<CR>'
+    endif
+    " documentation/pydoc
+    if len(g:jedi#documentation_command)
+        execute 'nnoremap <silent> <buffer>'.g:jedi#documentation_command.' :call jedi#show_documentation()<CR>'
+    endif
+
+    if g:jedi#show_call_signatures > 0 && has('conceal')
+        call jedi#configure_call_signatures()
+    endif
+
+    if g:jedi#completions_enabled == 1
+        inoremap <silent> <buffer> . .<C-R>=jedi#complete_string(1)<CR>
+    endif
+
+    if g:jedi#smart_auto_mappings == 1
+        inoremap <silent> <buffer> <space> <C-R>=jedi#smart_auto_mappings()<CR>
+    end
+
+    if g:jedi#auto_close_doc
+        " close preview if its still open after insert
+        augroup jedi_preview
+            autocmd! InsertLeave <buffer> if pumvisible() == 0|pclose|endif
+        augroup END
+    endif
+endif
diff --git a/vim-plugins/bundle/jedi-vim/initialize.py b/vim-plugins/bundle/jedi-vim/initialize.py
new file mode 100644
index 0000000..0636889
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/initialize.py
@@ -0,0 +1,26 @@
+"""Python initialization for jedi module."""
+
+try:
+    import traceback
+except Exception as excinfo:
+    raise Exception('Failed to import traceback: {0}'.format(excinfo))
+
+try:
+    import os, sys, vim
+    jedi_path = os.path.join(vim.eval('expand(s:script_path)'), 'jedi')
+    sys.path.insert(0, jedi_path)
+
+    jedi_vim_path = vim.eval('expand(s:script_path)')
+    if jedi_vim_path not in sys.path:  # Might happen when reloading.
+        sys.path.insert(0, jedi_vim_path)
+except Exception as excinfo:
+    raise Exception('Failed to add to sys.path: {0}\n{1}'.format(
+        excinfo, traceback.format_exc()))
+
+try:
+    import jedi_vim
+except Exception as excinfo:
+    raise Exception('Failed to import jedi_vim: {0}\n{1}'.format(
+        excinfo, traceback.format_exc()))
+finally:
+    sys.path.remove(jedi_path)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/.coveragerc b/vim-plugins/bundle/jedi-vim/jedi/.coveragerc
new file mode 100644
index 0000000..939a317
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/.coveragerc
@@ -0,0 +1,19 @@
+[run]
+omit =
+    jedi/_compatibility.py
+    jedi/evaluate/site.py
+
+[report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Don't complain about missing debug-only code:
+    def __repr__
+    if self\.debug
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise AssertionError
+    raise NotImplementedError
+
+    # Don't complain if non-runnable code isn't run:
+    if 0:
+    if __name__ == .__main__.:
diff --git a/vim-plugins/bundle/jedi-vim/jedi/.travis.yml b/vim-plugins/bundle/jedi-vim/jedi/.travis.yml
new file mode 100644
index 0000000..25c3a21
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/.travis.yml
@@ -0,0 +1,28 @@
+language: python
+python: 3.5
+sudo: false
+env:
+    - TOXENV=py26
+    - TOXENV=py27
+    - TOXENV=py33
+    - TOXENV=py34
+    - TOXENV=py35
+    - TOXENV=pypy
+    - TOXENV=cov
+    - TOXENV=sith
+matrix:
+    allow_failures:
+        - env: TOXENV=cov
+        - env: TOXENV=sith
+        - env: TOXENV=pypy
+python: 3.5
+install:
+    - pip install --quiet tox
+script:
+    - tox
+after_script:
+    - if [ $TOXENV == "cov" ]; then
+      pip install --quiet --use-mirrors coveralls;
+      coveralls;
+      fi
+
diff --git a/vim-plugins/bundle/jedi-vim/jedi/AUTHORS.txt b/vim-plugins/bundle/jedi-vim/jedi/AUTHORS.txt
new file mode 100644
index 0000000..bbd7ecd
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/AUTHORS.txt
@@ -0,0 +1,45 @@
+Main Authors
+============
+
+David Halter (@davidhalter) <davidhalter88@gmail.com>
+Takafumi Arakaki (@tkf) <aka.tkf@gmail.com>
+
+Code Contributors
+=================
+
+Danilo Bargen (@dbrgn) <mail@dbrgn.ch>
+Laurens Van Houtven (@lvh) <_@lvh.cc>
+Aldo Stracquadanio (@Astrac) <aldo.strac@gmail.com>
+Jean-Louis Fuchs (@ganwell) <ganwell@fangorn.ch>
+tek (@tek)
+Yasha Borevich (@jjay) <j.borevich@gmail.com>
+Aaron Griffin <aaronmgriffin@gmail.com>
+andviro (@andviro)
+Mike Gilbert (@floppym) <floppym@gentoo.org>
+Aaron Meurer (@asmeurer) <asmeurer@gmail.com>
+Lubos Trilety <ltrilety@redhat.com>
+Akinori Hattori (@hattya) <hattya@gmail.com>
+srusskih (@srusskih)
+Steven Silvester (@blink1073)
+Colin Duquesnoy (@ColinDuquesnoy) <colin.duquesnoy@gmail.com>
+Jorgen Schaefer (@jorgenschaefer) <contact@jorgenschaefer.de>
+Fredrik Bergroth (@fbergroth)
+Mathias Fußenegger (@mfussenegger)
+Syohei Yoshida (@syohex) <syohex@gmail.com>
+ppalucky (@ppalucky)
+immerrr (@immerrr) immerrr@gmail.com
+Albertas Agejevas (@alga)
+Savor d'Isavano (@KenetJervet) <newelevenken@163.com>
+Phillip Berndt (@phillipberndt) <phillip.berndt@gmail.com>
+Ian Lee (@IanLee1521) <IanLee1521@gmail.com>
+Farkhad Khatamov (@hatamov) <comsgn@gmail.com>
+Kevin Kelley (@kelleyk) <kelleyk@kelleyk.net>
+Sid Shanker (@squidarth) <sid.p.shanker@gmail.com>
+Reinoud Elhorst (@reinhrst)
+Guido van Rossum (@gvanrossum) <guido@python.org>
+Dmytro Sadovnychyi (@sadovnychyi) <jedi@dmit.ro>
+Cristi Burcă (@scribu)
+bstaint (@bstaint)
+
+
+Note: (@user) means a github user name.
diff --git a/vim-plugins/bundle/jedi-vim/jedi/CHANGELOG.rst b/vim-plugins/bundle/jedi-vim/jedi/CHANGELOG.rst
new file mode 100644
index 0000000..4d000d8
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/CHANGELOG.rst
@@ -0,0 +1,67 @@
+.. :changelog:
+
+Changelog
+---------
+
+0.10.0 (2016-06-)
++++++++++++++++++
+
+- Actual semantic completions for the complete Python syntax.
+- Basic type inference for ``yield from`` PEP 380.
+- PEP 484 support (most of the important features of it). Thanks Claude! (@reinhrst)
+- Added ``get_line_code`` to ``Definition`` and ``Completion`` objects.
+- Again a lot of internal changes.
+
+0.9.0 (2015-04-10)
+++++++++++++++++++
+
+- The import logic has been rewritten to look more like Python's. There is now
+  an ``Evaluator.modules`` import cache, which resembles ``sys.modules``.
+- Integrated the parser of 2to3. This will make refactoring possible. It will
+  also be possible to check for error messages (like compiling an AST would give)
+  in the future.
+- With the new parser, the evaluation also completely changed. It's now simpler
+  and more readable.
+- Completely rewritten REPL completion.
+- Added ``jedi.names``, a command to do static analysis. Thanks to that
+  sourcegraph guys for sponsoring this!
+- Alpha version of the linter.
+
+
+0.8.1 (2014-07-23)
++++++++++++++++++++
+
+- Bugfix release, the last release forgot to include files that improve
+  autocompletion for builtin libraries. Fixed.
+
+0.8.0 (2014-05-05)
++++++++++++++++++++
+
+- Memory Consumption for compiled modules (e.g. builtins, sys) has been reduced
+  drastically. Loading times are down as well (it takes basically as long as an
+  import).
+- REPL completion is starting to become usable.
+- Various small API changes. Generally this release focuses on stability and
+  refactoring of internal APIs.
+- Introducing operator precedence, which makes calculating correct Array
+  indices and ``__getattr__`` strings possible.
+
+0.7.0 (2013-08-09)
+++++++++++++++++++
+
+- Switched from LGPL to MIT license.
+- Added an Interpreter class to the API to make autocompletion in REPL
+  possible.
+- Added autocompletion support for namespace packages.
+- Add sith.py, a new random testing method.
+
+0.6.0 (2013-05-14)
+++++++++++++++++++
+
+- Much faster parser with builtin part caching.
+- A test suite, thanks @tkf.
+
+0.5 versions (2012)
++++++++++++++++++++
+
+- Initial development.
diff --git a/vim-plugins/bundle/jedi-vim/jedi/CONTRIBUTING.md b/vim-plugins/bundle/jedi-vim/jedi/CONTRIBUTING.md
new file mode 100644
index 0000000..4dc59bf
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/CONTRIBUTING.md
@@ -0,0 +1,28 @@
+Pull Requests are great (on the **dev** branch)! Readme/Documentation changes
+are ok in the master branch.
+
+ 1. Fork the Repo on github.
+ 2. If you are adding functionality or fixing a bug, please add a test!
+ 3. Add your name to AUTHORS.txt
+ 4. Push to your fork and submit a **pull request to the dev branch**.
+
+My **master** branch is a 100% stable (should be). I only push to it after I am
+certain that things are working out. Many people are using Jedi directly from
+the github master branch.
+
+**Try to use the PEP8 style guide.**
+
+
+Changing Issues to Pull Requests (Github)
+-----------------------------------------
+
+If you have have previously filed a GitHub issue and want to contribute code
+that addresses that issue, we prefer it if you use
+[hub](https://github.com/github/hub) to convert your existing issue to a pull
+request. To do that, first push the changes to a separate branch in your fork
+and then issue the following command:
+
+    hub pull-request -b davidhalter:dev -i <issue-number> -h <your-github-username>:<your-branch-name>
+
+It's no strict requirement though, if you don't have hub installed or prefer to
+use the web interface, then feel free to post a traditional pull request.
diff --git a/vim-plugins/bundle/jedi-vim/jedi/LICENSE.txt b/vim-plugins/bundle/jedi-vim/jedi/LICENSE.txt
new file mode 100644
index 0000000..9492c4e
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/LICENSE.txt
@@ -0,0 +1,82 @@
+All contributions towards Jedi are MIT licensed.
+
+Some Python files have been taken from the standard library and are therefore
+PSF licensed. Modifications on these files are dual licensed (both MIT and
+PSF). These files are:
+
+- jedi/parser/pgen2
+- jedi/parser/tokenize.py
+- jedi/parser/token.py
+- test/test_parser/test_pgen2.py
+
+-------------------------------------------------------------------------------
+The MIT License (MIT)
+
+Copyright (c) <2013> <David Halter and others, see AUTHORS.txt>
+
+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.
+-------------------------------------------------------------------------------
+
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+--------------------------------------------
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using this software ("Python") in source or binary form and
+its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+analyze, test, perform and/or display publicly, prepare derivative works,
+distribute, and otherwise use Python alone or in any derivative version,
+provided, however, that PSF's License Agreement and PSF's notice of copyright,
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014, 2015 Python Software Foundation; All Rights Reserved"
+are retained in Python alone or in any derivative version prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
+
+4. PSF is making Python available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee.  This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
diff --git a/vim-plugins/bundle/jedi-vim/jedi/MANIFEST.in b/vim-plugins/bundle/jedi-vim/jedi/MANIFEST.in
new file mode 100644
index 0000000..f25326a
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/MANIFEST.in
@@ -0,0 +1,14 @@
+include README.rst
+include CHANGELOG.rst
+include LICENSE.txt
+include AUTHORS.txt
+include .coveragerc
+include sith.py
+include conftest.py
+include pytest.ini
+include tox.ini
+include jedi/evaluate/compiled/fake/*.pym
+include jedi/parser/grammar*.txt
+recursive-include test *
+recursive-include docs *
+recursive-exclude * *.pyc
diff --git a/vim-plugins/bundle/jedi-vim/jedi/README.rst b/vim-plugins/bundle/jedi-vim/jedi/README.rst
new file mode 100644
index 0000000..1adf138
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/README.rst
@@ -0,0 +1,210 @@
+###################################################################
+Jedi - an awesome autocompletion/static analysis library for Python
+###################################################################
+
+.. image:: https://secure.travis-ci.org/davidhalter/jedi.png?branch=master
+    :target: http://travis-ci.org/davidhalter/jedi
+    :alt: Travis-CI build status
+
+.. image:: https://coveralls.io/repos/davidhalter/jedi/badge.png?branch=master
+    :target: https://coveralls.io/r/davidhalter/jedi
+    :alt: Coverage Status
+
+
+*If you have specific questions, please add an issue or ask on* `stackoverflow
+<https://stackoverflow.com>`_ *with the label* ``python-jedi``.
+
+
+Jedi is a static analysis tool for Python that can be used in IDEs/editors. Its
+historic focus is autocompletion, but does static analysis for now as well.
+Jedi is fast and is very well tested. It understands Python on a deeper level
+than all other static analysis frameworks for Python.
+
+Jedi has support for two different goto functions. It's possible to search for
+related names and to list all names in a Python file and infer them. Jedi
+understands docstrings and you can use Jedi autocompletion in your REPL as
+well.
+
+Jedi uses a very simple API to connect with IDE's. There's a reference
+implementation as a `VIM-Plugin <https://github.com/davidhalter/jedi-vim>`_,
+which uses Jedi's autocompletion.  We encourage you to use Jedi in your IDEs.
+It's really easy.
+
+Jedi can currently be used with the following editors/projects:
+
+- Vim (jedi-vim_, YouCompleteMe_, deoplete-jedi_)
+- Emacs (Jedi.el_, company-mode_, elpy_, anaconda-mode_, ycmd_)
+- Sublime Text (SublimeJEDI_ [ST2 + ST3], anaconda_ [only ST3])
+- TextMate_ (Not sure if it's actually working)
+- Kate_ version 4.13+ supports it natively, you have to enable it, though. [`proof
+  <https://projects.kde.org/projects/kde/applications/kate/repository/show?rev=KDE%2F4.13>`_]
+- Atom_ (autocomplete-python_)
+- SourceLair_
+- `GNOME Builder`_ (with support for GObject Introspection)
+- `Visual Studio Code`_ (via `Python Extension <https://marketplace.visualstudio.com/items?itemName=donjayamanne.python>`_)
+- Gedit (gedi_)
+- wdb_ - Web Debugger
+- `Eric IDE`_ (Available as a plugin)
+
+and many more!
+
+
+Here are some pictures taken from jedi-vim_:
+
+.. image:: https://github.com/davidhalter/jedi/raw/master/docs/_screenshots/screenshot_complete.png
+
+Completion for almost anything (Ctrl+Space).
+
+.. image:: https://github.com/davidhalter/jedi/raw/master/docs/_screenshots/screenshot_function.png
+
+Display of function/class bodies, docstrings.
+
+.. image:: https://github.com/davidhalter/jedi/raw/master/docs/_screenshots/screenshot_pydoc.png
+
+Pydoc support (Shift+k).
+
+There is also support for goto and renaming.
+
+Get the latest version from `github <https://github.com/davidhalter/jedi>`_
+(master branch should always be kind of stable/working).
+
+Docs are available at `https://jedi.readthedocs.org/en/latest/
+<https://jedi.readthedocs.org/en/latest/>`_. Pull requests with documentation
+enhancements and/or fixes are awesome and most welcome. Jedi uses `semantic
+versioning <http://semver.org/>`_.
+
+
+Installation
+============
+
+    pip install jedi
+
+Note: This just installs the Jedi library, not the editor plugins. For
+information about how to make it work with your editor, refer to the
+corresponding documentation.
+
+You don't want to use ``pip``? Please refer to the `manual
+<https://jedi.readthedocs.org/en/latest/docs/installation.html>`_.
+
+
+Feature Support and Caveats
+===========================
+
+Jedi really understands your Python code. For a comprehensive list what Jedi
+understands, see: `Features
+<https://jedi.readthedocs.org/en/latest/docs/features.html>`_. A list of
+caveats can be found on the same page.
+
+You can run Jedi on cPython 2.6, 2.7, 3.3, 3.4 or 3.5 but it should also
+understand/parse code older than those versions.
+
+Tips on how to use Jedi efficiently can be found `here
+<https://jedi.readthedocs.org/en/latest/docs/features.html#recipes>`_.
+
+API
+---
+
+You can find the documentation for the `API here <https://jedi.readthedocs.org/en/latest/docs/plugin-api.html>`_.
+
+
+Autocompletion / Goto / Pydoc
+-----------------------------
+
+Please check the API for a good explanation. There are the following commands:
+
+- ``jedi.Script.goto_assignments``
+- ``jedi.Script.completions``
+- ``jedi.Script.usages``
+
+The returned objects are very powerful and really all you might need.
+
+
+Autocompletion in your REPL (IPython, etc.)
+-------------------------------------------
+
+It's possible to have Jedi autocompletion in REPL modes - `example video <https://vimeo.com/122332037>`_.
+This means that IPython and others are `supported
+<https://jedi.readthedocs.org/en/latest/docs/usage.html#tab-completion-in-the-python-shell>`_.
+
+
+Static Analysis / Linter
+------------------------
+
+To do all forms of static analysis, please try to use ``jedi.names``. It will
+return a list of names that you can use to infer types and so on.
+
+Linting is another thing that is going to be part of Jedi. For now you can try
+an alpha version ``python -m jedi linter``. The API might change though and
+it's still buggy. It's Jedi's goal to be smarter than classic linter and
+understand ``AttributeError`` and other code issues.
+
+
+Refactoring
+-----------
+
+Jedi's parser would support refactoring, but there's no API to use it right
+now.  If you're interested in helping out here, let me know. With the latest
+parser changes, it should be very easy to actually make it work.
+
+
+Development
+===========
+
+There's a pretty good and extensive `development documentation
+<https://jedi.readthedocs.org/en/latest/docs/development.html>`_.
+
+
+Testing
+=======
+
+The test suite depends on ``tox`` and ``pytest``::
+
+    pip install tox pytest
+
+To run the tests for all supported Python versions::
+
+    tox
+
+If you want to test only a specific Python version (e.g. Python 2.7), it's as
+easy as ::
+
+    tox -e py27
+
+Tests are also run automatically on `Travis CI
+<https://travis-ci.org/davidhalter/jedi/>`_.
+
+For more detailed information visit the `testing documentation
+<https://jedi.readthedocs.org/en/latest/docs/testing.html>`_
+
+
+Acknowledgements
+================
+
+- Takafumi Arakaki (@tkf) for creating a solid test environment and a lot of
+  other things.
+- Danilo Bargen (@dbrgn) for general housekeeping and being a good friend :).
+- Guido van Rossum (@gvanrossum) for creating the parser generator pgen2
+  (originally used in lib2to3).
+
+
+
+.. _jedi-vim: https://github.com/davidhalter/jedi-vim
+.. _youcompleteme: http://valloric.github.io/YouCompleteMe/
+.. _deoplete-jedi: https://github.com/zchee/deoplete-jedi
+.. _Jedi.el: https://github.com/tkf/emacs-jedi
+.. _company-mode: https://github.com/syohex/emacs-company-jedi
+.. _elpy: https://github.com/jorgenschaefer/elpy
+.. _anaconda-mode: https://github.com/proofit404/anaconda-mode
+.. _ycmd: https://github.com/abingham/emacs-ycmd
+.. _sublimejedi: https://github.com/srusskih/SublimeJEDI
+.. _anaconda: https://github.com/DamnWidget/anaconda
+.. _wdb: https://github.com/Kozea/wdb
+.. _TextMate: https://github.com/lawrenceakka/python-jedi.tmbundle
+.. _Kate: http://kate-editor.org
+.. _Atom: https://atom.io/
+.. _autocomplete-python: https://atom.io/packages/autocomplete-python
+.. _SourceLair: https://www.sourcelair.com
+.. _GNOME Builder: https://wiki.gnome.org/Apps/Builder
+.. _Visual Studio Code: https://code.visualstudio.com/
+.. _gedi: https://github.com/isamert/gedi
+.. _Eric IDE: http://eric-ide.python-projects.org
diff --git a/vim-plugins/bundle/jedi-vim/jedi/conftest.py b/vim-plugins/bundle/jedi-vim/jedi/conftest.py
new file mode 100644
index 0000000..2567fcd
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/conftest.py
@@ -0,0 +1,72 @@
+import tempfile
+import shutil
+
+import pytest
+
+import jedi
+
+collect_ignore = ["setup.py"]
+
+
+# The following hooks (pytest_configure, pytest_unconfigure) are used
+# to modify `jedi.settings.cache_directory` because `clean_jedi_cache`
+# has no effect during doctests.  Without these hooks, doctests uses
+# user's cache (e.g., ~/.cache/jedi/).  We should remove this
+# workaround once the problem is fixed in py.test.
+#
+# See:
+# - https://github.com/davidhalter/jedi/pull/168
+# - https://bitbucket.org/hpk42/pytest/issue/275/
+
+jedi_cache_directory_orig = None
+jedi_cache_directory_temp = None
+
+
+def pytest_addoption(parser):
+    parser.addoption("--jedi-debug", "-D", action='store_true',
+                     help="Enables Jedi's debug output.")
+
+    parser.addoption("--warning-is-error", action='store_true',
+                     help="Warnings are treated as errors.")
+
+
+def pytest_configure(config):
+    global jedi_cache_directory_orig, jedi_cache_directory_temp
+    jedi_cache_directory_orig = jedi.settings.cache_directory
+    jedi_cache_directory_temp = tempfile.mkdtemp(prefix='jedi-test-')
+    jedi.settings.cache_directory = jedi_cache_directory_temp
+
+    if config.option.jedi_debug:
+        jedi.set_debug_function()
+
+    if config.option.warning_is_error:
+        import warnings
+        warnings.simplefilter("error")
+
+
+def pytest_unconfigure(config):
+    global jedi_cache_directory_orig, jedi_cache_directory_temp
+    jedi.settings.cache_directory = jedi_cache_directory_orig
+    shutil.rmtree(jedi_cache_directory_temp)
+
+
+@pytest.fixture(scope='session')
+def clean_jedi_cache(request):
+    """
+    Set `jedi.settings.cache_directory` to a temporary directory during test.
+
+    Note that you can't use built-in `tmpdir` and `monkeypatch`
+    fixture here because their scope is 'function', which is not used
+    in 'session' scope fixture.
+
+    This fixture is activated in ../pytest.ini.
+    """
+    from jedi import settings
+    old = settings.cache_directory
+    tmp = tempfile.mkdtemp(prefix='jedi-test-')
+    settings.cache_directory = tmp
+
+    @request.addfinalizer
+    def restore():
+        settings.cache_directory = old
+        shutil.rmtree(tmp)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/Makefile b/vim-plugins/bundle/jedi-vim/jedi/docs/Makefile
new file mode 100644
index 0000000..14cfdf4
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/Makefile
@@ -0,0 +1,153 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Jedi.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Jedi.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/Jedi"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Jedi"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/_screenshots/screenshot_complete.png b/vim-plugins/bundle/jedi-vim/jedi/docs/_screenshots/screenshot_complete.png
new file mode 100644
index 0000000..2bafad6
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/docs/_screenshots/screenshot_complete.png differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/_screenshots/screenshot_function.png b/vim-plugins/bundle/jedi-vim/jedi/docs/_screenshots/screenshot_function.png
new file mode 100644
index 0000000..6109703
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/docs/_screenshots/screenshot_function.png differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/_screenshots/screenshot_pydoc.png b/vim-plugins/bundle/jedi-vim/jedi/docs/_screenshots/screenshot_pydoc.png
new file mode 100644
index 0000000..a399d5f
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/docs/_screenshots/screenshot_pydoc.png differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/_static/logo-src.txt b/vim-plugins/bundle/jedi-vim/jedi/docs/_static/logo-src.txt
new file mode 100644
index 0000000..59aa4f6
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/_static/logo-src.txt
@@ -0,0 +1,3 @@
+The source of the logo is a photoshop file hosted here:
+
+https://dl.dropboxusercontent.com/u/170011615/Jedi12_Logo.psd.xz
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/_static/logo.png b/vim-plugins/bundle/jedi-vim/jedi/docs/_static/logo.png
new file mode 100644
index 0000000..9f3d244
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/docs/_static/logo.png differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/_templates/ghbuttons.html b/vim-plugins/bundle/jedi-vim/jedi/docs/_templates/ghbuttons.html
new file mode 100644
index 0000000..badb06a
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/_templates/ghbuttons.html
@@ -0,0 +1,4 @@
+<h3>Github</h3>
+<iframe src="http://ghbtns.com/github-btn.html?user=davidhalter&repo=jedi&type=watch&count=true&size=large"
+        frameborder="0" scrolling="0" width="170" height="30" allowtransparency="true"></iframe>
+<br><br>
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/_templates/sidebarlogo.html b/vim-plugins/bundle/jedi-vim/jedi/docs/_templates/sidebarlogo.html
new file mode 100644
index 0000000..d9243c4
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/_templates/sidebarlogo.html
@@ -0,0 +1,3 @@
+<p class="logo"><a href="{{ pathto(master_doc) }}">
+  <img class="logo" src="{{ pathto('_static/logo.png', 1) }}" alt="Logo"/>
+</a></p>
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/LICENSE b/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/LICENSE
new file mode 100644
index 0000000..8daab7e
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/LICENSE
@@ -0,0 +1,37 @@
+Copyright (c) 2010 by Armin Ronacher.
+
+Some rights reserved.
+
+Redistribution and use in source and binary forms of the theme, with or
+without modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the following
+  disclaimer in the documentation and/or other materials provided
+  with the distribution.
+
+* The names of the contributors may not be used to endorse or
+  promote products derived from this software without specific
+  prior written permission.
+
+We kindly ask you to only use these themes in an unmodified manner just
+for Flask and Flask-related products, not for unrelated projects.  If you
+like the visual style and want to use it for your own projects, please
+consider making some larger changes to the themes (such as changing
+font faces, sizes, colors or margins).
+
+THIS THEME IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS THEME, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/layout.html b/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/layout.html
new file mode 100644
index 0000000..e781a11
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/layout.html
@@ -0,0 +1,28 @@
+{%- extends "basic/layout.html" %}
+{%- block extrahead %}
+  {{ super() }}
+  {% if theme_touch_icon %}
+  <link rel="apple-touch-icon" href="{{ pathto('_static/' ~ theme_touch_icon, 1) }}" />
+  {% endif %}
+  <link media="only screen and (max-device-width: 480px)" href="{{
+    pathto('_static/small_flask.css', 1) }}" type= "text/css" rel="stylesheet" />
+  <a href="https://github.com/davidhalter/jedi">
+    <img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub">
+  </a>
+{% endblock %}
+{%- block relbar2 %}{% endblock %}
+{% block header %}
+  {{ super() }}
+  {% if pagename == 'index' %}
+  <div class=indexwrapper>
+  {% endif %}
+{% endblock %}
+{%- block footer %}
+  <div class="footer">
+    &copy; Copyright {{ copyright }}.
+    Created using <a href="http://sphinx.pocoo.org/">Sphinx</a>.
+  </div>
+  {% if pagename == 'index' %}
+  </div>
+  {% endif %}
+{%- endblock %}
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/relations.html b/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/relations.html
new file mode 100644
index 0000000..3bbcde8
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/relations.html
@@ -0,0 +1,19 @@
+<h3>Related Topics</h3>
+<ul>
+  <li><a href="{{ pathto(master_doc) }}">Documentation overview</a><ul>
+  {%- for parent in parents %}
+  <li><a href="{{ parent.link|e }}">{{ parent.title }}</a><ul>
+  {%- endfor %}
+    {%- if prev %}
+      <li>Previous: <a href="{{ prev.link|e }}" title="{{ _('previous chapter')
+        }}">{{ prev.title }}</a></li>
+    {%- endif %}
+    {%- if next %}
+      <li>Next: <a href="{{ next.link|e }}" title="{{ _('next chapter')
+        }}">{{ next.title }}</a></li>
+    {%- endif %}
+  {%- for parent in parents %}
+  </ul></li>
+  {%- endfor %}
+  </ul></li>
+</ul>
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/static/flasky.css_t b/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/static/flasky.css_t
new file mode 100644
index 0000000..79ab478
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/static/flasky.css_t
@@ -0,0 +1,394 @@
+/*
+ * flasky.css_t
+ * ~~~~~~~~~~~~
+ *
+ * :copyright: Copyright 2010 by Armin Ronacher.
+ * :license: Flask Design License, see LICENSE for details.
+ */
+
+{% set page_width = '940px' %}
+{% set sidebar_width = '220px' %}
+ 
+@import url("basic.css");
+ 
+/* -- page layout ----------------------------------------------------------- */
+ 
+body {
+    font-family: 'Georgia', serif;
+    font-size: 17px;
+    background-color: white;
+    color: #000;
+    margin: 0;
+    padding: 0;
+}
+
+div.document {
+    width: {{ page_width }};
+    margin: 30px auto 0 auto;
+}
+
+div.documentwrapper {
+    float: left;
+    width: 100%;
+}
+
+div.bodywrapper {
+    margin: 0 0 0 {{ sidebar_width }};
+}
+
+div.sphinxsidebar {
+    width: {{ sidebar_width }};
+}
+
+hr {
+    border: 1px solid #B1B4B6;
+}
+ 
+div.body {
+    background-color: #ffffff;
+    color: #3E4349;
+    padding: 0 30px 0 30px;
+}
+
+img.floatingflask {
+    padding: 0 0 10px 10px;
+    float: right;
+}
+ 
+div.footer {
+    width: {{ page_width }};
+    margin: 20px auto 30px auto;
+    font-size: 14px;
+    color: #888;
+    text-align: right;
+}
+
+div.footer a {
+    color: #888;
+}
+
+div.related {
+    display: none;
+}
+ 
+div.sphinxsidebar a {
+    color: #444;
+    text-decoration: none;
+    border-bottom: 1px dotted #999;
+}
+
+div.sphinxsidebar a:hover {
+    border-bottom: 1px solid #999;
+}
+ 
+div.sphinxsidebar {
+    font-size: 14px;
+    line-height: 1.5;
+}
+
+div.sphinxsidebarwrapper {
+    padding: 18px 10px;
+}
+
+div.sphinxsidebarwrapper p.logo {
+    padding: 0 0 20px 0;
+    margin: 0;
+    text-align: center;
+}
+ 
+div.sphinxsidebar h3,
+div.sphinxsidebar h4 {
+    font-family: 'Garamond', 'Georgia', serif;
+    color: #444;
+    font-size: 24px;
+    font-weight: normal;
+    margin: 0 0 5px 0;
+    padding: 0;
+}
+
+div.sphinxsidebar h4 {
+    font-size: 20px;
+}
+ 
+div.sphinxsidebar h3 a {
+    color: #444;
+}
+
+div.sphinxsidebar p.logo a,
+div.sphinxsidebar h3 a,
+div.sphinxsidebar p.logo a:hover,
+div.sphinxsidebar h3 a:hover {
+    border: none;
+}
+ 
+div.sphinxsidebar p {
+    color: #555;
+    margin: 10px 0;
+}
+
+div.sphinxsidebar ul {
+    margin: 10px 0;
+    padding: 0;
+    color: #000;
+}
+ 
+div.sphinxsidebar input {
+    border: 1px solid #ccc;
+    font-family: 'Georgia', serif;
+    font-size: 1em;
+}
+ 
+/* -- body styles ----------------------------------------------------------- */
+ 
+a {
+    color: #004B6B;
+    text-decoration: underline;
+}
+ 
+a:hover {
+    color: #6D4100;
+    text-decoration: underline;
+}
+ 
+div.body h1,
+div.body h2,
+div.body h3,
+div.body h4,
+div.body h5,
+div.body h6 {
+    font-family: 'Garamond', 'Georgia', serif;
+    font-weight: normal;
+    margin: 30px 0px 10px 0px;
+    padding: 0;
+}
+
+{% if theme_index_logo %}
+div.indexwrapper h1 {
+    text-indent: -999999px;
+    background: url({{ theme_index_logo }}) no-repeat center center;
+    height: {{ theme_index_logo_height }};
+}
+{% endif %}
+ 
+div.body h1 { margin-top: 0; padding-top: 0; font-size: 240%; }
+div.body h2 { font-size: 180%; }
+div.body h3 { font-size: 150%; }
+div.body h4 { font-size: 130%; }
+div.body h5 { font-size: 100%; }
+div.body h6 { font-size: 100%; }
+ 
+a.headerlink {
+    color: #ddd;
+    padding: 0 4px;
+    text-decoration: none;
+}
+ 
+a.headerlink:hover {
+    color: #444;
+}
+ 
+div.body p, div.body dd, div.body li {
+    line-height: 1.4em;
+}
+
+div.admonition {
+    background: #fafafa;
+    margin: 20px -30px;
+    padding: 10px 30px;
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+}
+
+div.admonition tt.xref, div.admonition a tt {
+    border-bottom: 1px solid #fafafa;
+}
+
+dd div.admonition {
+    margin-left: -60px;
+    padding-left: 60px;
+}
+
+div.admonition p.admonition-title {
+    font-family: 'Garamond', 'Georgia', serif;
+    font-weight: normal;
+    font-size: 24px;
+    margin: 0 0 10px 0;
+    padding: 0;
+    line-height: 1;
+}
+
+div.admonition p.last {
+    margin-bottom: 0;
+}
+
+div.highlight {
+    background-color: white;
+}
+
+dt:target, .highlight {
+    background: #FAF3E8;
+}
+
+div.note {
+    background-color: #eee;
+    border: 1px solid #ccc;
+}
+ 
+div.seealso {
+    background-color: #ffc;
+    border: 1px solid #ff6;
+}
+ 
+div.topic {
+    background-color: #eee;
+}
+ 
+p.admonition-title {
+    display: inline;
+}
+ 
+p.admonition-title:after {
+    content: ":";
+}
+
+pre, tt {
+    font-family: 'Consolas', 'Menlo', 'Deja Vu Sans Mono', 'Bitstream Vera Sans Mono', monospace;
+    font-size: 0.9em;
+}
+
+img.screenshot {
+}
+
+tt.descname, tt.descclassname {
+    font-size: 0.95em;
+}
+
+tt.descname {
+    padding-right: 0.08em;
+}
+
+img.screenshot {
+    -moz-box-shadow: 2px 2px 4px #eee;
+    -webkit-box-shadow: 2px 2px 4px #eee;
+    box-shadow: 2px 2px 4px #eee;
+}
+
+table.docutils {
+    border: 1px solid #888;
+    -moz-box-shadow: 2px 2px 4px #eee;
+    -webkit-box-shadow: 2px 2px 4px #eee;
+    box-shadow: 2px 2px 4px #eee;
+}
+
+table.docutils td, table.docutils th {
+    border: 1px solid #888;
+    padding: 0.25em 0.7em;
+}
+
+table.field-list, table.footnote {
+    border: none;
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}
+
+table.footnote {
+    margin: 15px 0;
+    width: 100%;
+    border: 1px solid #eee;
+    background: #fdfdfd;
+    font-size: 0.9em;
+}
+
+table.footnote + table.footnote {
+    margin-top: -15px;
+    border-top: none;
+}
+
+table.field-list th {
+    padding: 0 0.8em 0 0;
+}
+
+table.field-list td {
+    padding: 0;
+}
+
+table.footnote td.label {
+    width: 0px;
+    padding: 0.3em 0 0.3em 0.5em;
+}
+
+table.footnote td {
+    padding: 0.3em 0.5em;
+}
+
+dl {
+    margin: 0;
+    padding: 0;
+}
+
+dl dd {
+    margin-left: 30px;
+}
+
+blockquote {
+    margin: 0 0 0 30px;
+    padding: 0;
+}
+
+ul, ol {
+    margin: 10px 0 10px 30px;
+    padding: 0;
+}
+ 
+pre {
+    background: #eee;
+    padding: 7px 30px;
+    margin: 15px -30px;
+    line-height: 1.3em;
+}
+
+dl pre, blockquote pre, li pre {
+    margin-left: -60px;
+    padding-left: 60px;
+}
+
+dl dl pre {
+    margin-left: -90px;
+    padding-left: 90px;
+}
+ 
+tt {
+    background-color: #ecf0f3;
+    color: #222;
+    /* padding: 1px 2px; */
+}
+
+tt.xref, a tt {
+    background-color: #FBFBFB;
+    border-bottom: 1px solid white;
+}
+
+a.reference {
+    text-decoration: none;
+    border-bottom: 1px dotted #004B6B;
+}
+
+a.reference:hover {
+    border-bottom: 1px solid #6D4100;
+}
+
+a.footnote-reference {
+    text-decoration: none;
+    font-size: 0.7em;
+    vertical-align: top;
+    border-bottom: 1px dotted #004B6B;
+}
+
+a.footnote-reference:hover {
+    border-bottom: 1px solid #6D4100;
+}
+
+a:hover tt {
+    background: #EEE;
+}
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/static/small_flask.css b/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/static/small_flask.css
new file mode 100644
index 0000000..1c6df30
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/static/small_flask.css
@@ -0,0 +1,70 @@
+/*
+ * small_flask.css_t
+ * ~~~~~~~~~~~~~~~~~
+ *
+ * :copyright: Copyright 2010 by Armin Ronacher.
+ * :license: Flask Design License, see LICENSE for details.
+ */
+
+body {
+    margin: 0;
+    padding: 20px 30px;
+}
+
+div.documentwrapper {
+    float: none;
+    background: white;
+}
+
+div.sphinxsidebar {
+    display: block;
+    float: none;
+    width: 102.5%;
+    margin: 50px -30px -20px -30px;
+    padding: 10px 20px;
+    background: #333;
+    color: white;
+}
+
+div.sphinxsidebar h3, div.sphinxsidebar h4, div.sphinxsidebar p,
+div.sphinxsidebar h3 a {
+    color: white;
+}
+
+div.sphinxsidebar a {
+    color: #aaa;
+}
+
+div.sphinxsidebar p.logo {
+    display: none;
+}
+
+div.document {
+    width: 100%;
+    margin: 0;
+}
+
+div.related {
+    display: block;
+    margin: 0;
+    padding: 10px 0 20px 0;
+}
+
+div.related ul,
+div.related ul li {
+    margin: 0;
+    padding: 0;
+}
+
+div.footer {
+    display: none;
+}
+
+div.bodywrapper {
+    margin: 0;
+}
+
+div.body {
+    min-height: 0;
+    padding: 0;
+}
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/theme.conf b/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/theme.conf
new file mode 100644
index 0000000..1d5657f
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask/theme.conf
@@ -0,0 +1,9 @@
+[theme]
+inherit = basic
+stylesheet = flasky.css
+pygments_style = flask_theme_support.FlaskyStyle
+
+[options]
+index_logo = 
+index_logo_height = 120px
+touch_icon = 
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask_theme_support.py b/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask_theme_support.py
new file mode 100644
index 0000000..d3e33c0
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/_themes/flask_theme_support.py
@@ -0,0 +1,125 @@
+"""
+Copyright (c) 2010 by Armin Ronacher.
+
+Some rights reserved.
+
+Redistribution and use in source and binary forms of the theme, with or
+without modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the following
+  disclaimer in the documentation and/or other materials provided
+  with the distribution.
+
+* The names of the contributors may not be used to endorse or
+  promote products derived from this software without specific
+  prior written permission.
+
+We kindly ask you to only use these themes in an unmodified manner just
+for Flask and Flask-related products, not for unrelated projects.  If you
+like the visual style and want to use it for your own projects, please
+consider making some larger changes to the themes (such as changing
+font faces, sizes, colors or margins).
+
+THIS THEME IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS THEME, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+"""
+# flasky extensions.  flasky pygments style based on tango style
+from pygments.style import Style
+from pygments.token import Keyword, Name, Comment, String, Error, \
+     Number, Operator, Generic, Whitespace, Punctuation, Other, Literal
+
+
+class FlaskyStyle(Style):
+    background_color = "#f8f8f8"
+    default_style = ""
+
+    styles = {
+        # No corresponding class for the following:
+        #Text:                     "", # class:  ''
+        Whitespace:                "underline #f8f8f8",      # class: 'w'
+        Error:                     "#a40000 border:#ef2929", # class: 'err'
+        Other:                     "#000000",                # class 'x'
+
+        Comment:                   "italic #8f5902", # class: 'c'
+        Comment.Preproc:           "noitalic",       # class: 'cp'
+
+        Keyword:                   "bold #004461",   # class: 'k'
+        Keyword.Constant:          "bold #004461",   # class: 'kc'
+        Keyword.Declaration:       "bold #004461",   # class: 'kd'
+        Keyword.Namespace:         "bold #004461",   # class: 'kn'
+        Keyword.Pseudo:            "bold #004461",   # class: 'kp'
+        Keyword.Reserved:          "bold #004461",   # class: 'kr'
+        Keyword.Type:              "bold #004461",   # class: 'kt'
+
+        Operator:                  "#582800",   # class: 'o'
+        Operator.Word:             "bold #004461",   # class: 'ow' - like keywords
+
+        Punctuation:               "bold #000000",   # class: 'p'
+
+        # because special names such as Name.Class, Name.Function, etc.
+        # are not recognized as such later in the parsing, we choose them
+        # to look the same as ordinary variables.
+        Name:                      "#000000",        # class: 'n'
+        Name.Attribute:            "#c4a000",        # class: 'na' - to be revised
+        Name.Builtin:              "#004461",        # class: 'nb'
+        Name.Builtin.Pseudo:       "#3465a4",        # class: 'bp'
+        Name.Class:                "#000000",        # class: 'nc' - to be revised
+        Name.Constant:             "#000000",        # class: 'no' - to be revised
+        Name.Decorator:            "#888",           # class: 'nd' - to be revised
+        Name.Entity:               "#ce5c00",        # class: 'ni'
+        Name.Exception:            "bold #cc0000",   # class: 'ne'
+        Name.Function:             "#000000",        # class: 'nf'
+        Name.Property:             "#000000",        # class: 'py'
+        Name.Label:                "#f57900",        # class: 'nl'
+        Name.Namespace:            "#000000",        # class: 'nn' - to be revised
+        Name.Other:                "#000000",        # class: 'nx'
+        Name.Tag:                  "bold #004461",   # class: 'nt' - like a keyword
+        Name.Variable:             "#000000",        # class: 'nv' - to be revised
+        Name.Variable.Class:       "#000000",        # class: 'vc' - to be revised
+        Name.Variable.Global:      "#000000",        # class: 'vg' - to be revised
+        Name.Variable.Instance:    "#000000",        # class: 'vi' - to be revised
+
+        Number:                    "#990000",        # class: 'm'
+
+        Literal:                   "#000000",        # class: 'l'
+        Literal.Date:              "#000000",        # class: 'ld'
+
+        String:                    "#4e9a06",        # class: 's'
+        String.Backtick:           "#4e9a06",        # class: 'sb'
+        String.Char:               "#4e9a06",        # class: 'sc'
+        String.Doc:                "italic #8f5902", # class: 'sd' - like a comment
+        String.Double:             "#4e9a06",        # class: 's2'
+        String.Escape:             "#4e9a06",        # class: 'se'
+        String.Heredoc:            "#4e9a06",        # class: 'sh'
+        String.Interpol:           "#4e9a06",        # class: 'si'
+        String.Other:              "#4e9a06",        # class: 'sx'
+        String.Regex:              "#4e9a06",        # class: 'sr'
+        String.Single:             "#4e9a06",        # class: 's1'
+        String.Symbol:             "#4e9a06",        # class: 'ss'
+
+        Generic:                   "#000000",        # class: 'g'
+        Generic.Deleted:           "#a40000",        # class: 'gd'
+        Generic.Emph:              "italic #000000", # class: 'ge'
+        Generic.Error:             "#ef2929",        # class: 'gr'
+        Generic.Heading:           "bold #000080",   # class: 'gh'
+        Generic.Inserted:          "#00A000",        # class: 'gi'
+        Generic.Output:            "#888",           # class: 'go'
+        Generic.Prompt:            "#745334",        # class: 'gp'
+        Generic.Strong:            "bold #000000",   # class: 'gs'
+        Generic.Subheading:        "bold #800080",   # class: 'gu'
+        Generic.Traceback:         "bold #a40000",   # class: 'gt'
+    }
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/conf.py b/vim-plugins/bundle/jedi-vim/jedi/docs/conf.py
new file mode 100644
index 0000000..0e25a88
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/conf.py
@@ -0,0 +1,291 @@
+# -*- coding: utf-8 -*-
+#
+# Jedi documentation build configuration file, created by
+# sphinx-quickstart on Wed Dec 26 00:11:34 2012.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+import datetime
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.insert(0, os.path.abspath('..'))
+sys.path.append(os.path.abspath('_themes'))
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'sphinx.ext.todo',
+              'sphinx.ext.intersphinx', 'sphinx.ext.inheritance_diagram']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+source_encoding = 'utf-8'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'Jedi'
+copyright = u'2012 - {today.year}, Jedi contributors'.format(today=datetime.date.today())
+
+import jedi
+from jedi.utils import version_info
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '.'.join(str(x) for x in version_info()[:2])
+# The full version, including alpha/beta/rc tags.
+release = jedi.__version__
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = []
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'flask'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+html_theme_path = ['_themes']
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+html_sidebars = {
+    '**': [
+        'sidebarlogo.html',
+        'localtoc.html',
+        #'relations.html',
+        'ghbuttons.html',
+        #'sourcelink.html',
+        #'searchbox.html'
+    ]
+}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'Jedidoc'
+
+#html_style = 'default.css'  # Force usage of default template on RTD
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+    ('index', 'Jedi.tex', u'Jedi Documentation',
+     u'Jedi contributors', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'jedi', u'Jedi Documentation',
+     [u'Jedi contributors'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output ------------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    ('index', 'Jedi', u'Jedi Documentation',
+     u'Jedi contributors', 'Jedi', 'Awesome Python autocompletion library.',
+     'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# -- Options for todo module ---------------------------------------------------
+
+todo_include_todos = False
+
+# -- Options for autodoc module ------------------------------------------------
+
+autoclass_content = 'both'
+autodoc_member_order = 'bysource'
+autodoc_default_flags = []
+#autodoc_default_flags = ['members', 'undoc-members']
+
+
+# -- Options for intersphinx module --------------------------------------------
+
+intersphinx_mapping = {
+    'http://docs.python.org/': None,
+}
+
+
+def skip_deprecated(app, what, name, obj, skip, options):
+    """
+    All attributes containing a deprecated note shouldn't be documented
+    anymore. This makes it even clearer that they are not supported anymore.
+    """
+    doc = obj.__doc__
+    return skip or doc and '.. deprecated::' in doc
+
+
+def setup(app):
+    app.connect('autodoc-skip-member', skip_deprecated)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/docs/development.rst b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/development.rst
new file mode 100644
index 0000000..bb2c479
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/development.rst
@@ -0,0 +1,248 @@
+.. include:: ../global.rst
+
+Jedi Development
+================
+
+.. currentmodule:: jedi
+
+.. note:: This documentation is for Jedi developers who want to improve Jedi
+    itself, but have no idea how Jedi works. If you want to use Jedi for 
+    your IDE, look at the `plugin api <plugin-api.html>`_.
+
+
+Introduction
+------------
+
+This page tries to address the fundamental demand for documentation of the
+|jedi| interals. Understanding a dynamic language is a complex task. Especially
+because type inference in Python can be a very recursive task. Therefore |jedi|
+couldn't get rid of complexity. I know that **simple is better than complex**,
+but unfortunately it sometimes requires complex solutions to understand complex
+systems.
+
+Since most of the Jedi internals have been written by me (David Halter), this
+introduction will be written mostly by me, because no one else understands to
+the same level how Jedi works. Actually this is also the reason for exactly this
+part of the documentation. To make multiple people able to edit the Jedi core.
+
+In five chapters I'm trying to describe the internals of |jedi|:
+
+- :ref:`The Jedi Core <core>`
+- :ref:`Core Extensions <core-extensions>`
+- :ref:`Imports & Modules <imports-modules>`
+- :ref:`Caching & Recursions <caching-recursions>`
+- :ref:`Helper modules <dev-helpers>`
+
+.. note:: Testing is not documented here, you'll find that
+   `right here <testing.html>`_.
+
+
+.. _core:
+
+The Jedi Core
+-------------
+
+The core of Jedi consists of three parts:
+
+- :ref:`Parser <parser>`
+- :ref:`Python code evaluation <evaluate>`
+- :ref:`API <dev-api>`
+
+Most people are probably interested in :ref:`code evaluation <evaluate>`,
+because that's where all the magic happens. I need to introduce the :ref:`parser
+<parser>` first, because :mod:`jedi.evaluate` uses it extensively.
+
+.. _parser:
+
+Parser (parser/__init__.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi.parser
+
+Parser Representation (parser/representation.py)
+++++++++++++++++++++++++++++++++++++++++++++++++
+
+.. automodule:: jedi.parser.representation
+
+Class inheritance diagram:
+
+.. inheritance-diagram::
+   SubModule
+   Class
+   Function
+   Lambda
+   Flow
+   ForFlow
+   Import
+   Statement
+   Param
+   Call
+   Array
+   Name
+   ListComprehension
+   :parts: 1
+
+.. _evaluate:
+
+Evaluation of python code (evaluate/__init__.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi.evaluate
+
+Evaluation Representation (evaluate/representation.py)
+++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+.. automodule:: jedi.evaluate.representation
+
+.. inheritance-diagram::
+   Executable
+   Instance
+   InstanceElement
+   Class
+   Function
+   FunctionExecution
+   :parts: 1
+
+
+.. _name_resolution:
+
+Name resolution (evaluate/finder.py)
+++++++++++++++++++++++++++++++++++++
+
+.. automodule:: jedi.evaluate.finder
+
+
+.. _dev-api:
+
+API (api.py and api_classes.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The API has been designed to be as easy to use as possible. The API
+documentation can be found `here <plugin-api.html>`_. The API itself contains
+little code that needs to be mentioned here. Generally I'm trying to be
+conservative with the API.  I'd rather not add new API features if they are not
+necessary, because it's much harder to deprecate stuff than to add it later.
+
+
+.. _core-extensions:
+
+Core Extensions
+---------------
+
+Core Extensions is a summary of the following topics:
+
+- :ref:`Iterables & Dynamic Arrays <iterables>`
+- :ref:`Dynamic Parameters <dynamic>`
+- :ref:`Fast Parser <fast_parser>`
+- :ref:`Docstrings <docstrings>`
+- :ref:`Refactoring <refactoring>`
+
+These topics are very important to understand what Jedi additionally does, but
+they could be removed from Jedi and Jedi would still work. But slower and
+without some features.
+
+.. _iterables:
+
+Iterables & Dynamic Arrays (evaluate/iterable.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To understand Python on a deeper level, |jedi| needs to understand some of the
+dynamic features of Python, however this probably the most complicated part:
+
+.. automodule:: jedi.evaluate.iterable
+
+
+.. _dynamic:
+
+Parameter completion (evaluate/dynamic.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi.evaluate.dynamic
+
+
+.. _fast_parser:
+
+Fast Parser (parser/fast.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi.parser.fast
+
+.. _docstrings:
+
+Docstrings (evaluate/docstrings.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi.evaluate.docstrings
+
+.. _refactoring:
+
+Refactoring (evaluate/refactoring.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi.refactoring
+
+
+.. _imports-modules:
+
+Imports & Modules
+-------------------
+
+
+- :ref:`Modules <modules>`
+- :ref:`Builtin Modules <builtin>`
+- :ref:`Imports <imports>`
+
+
+.. _builtin:
+
+Compiled Modules (evaluate/compiled.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi.evaluate.compiled
+
+
+.. _imports:
+
+Imports (evaluate/imports.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi.evaluate.imports
+
+
+.. _caching-recursions:
+
+Caching & Recursions
+--------------------
+
+
+- :ref:`Caching <cache>`
+- :ref:`Recursions <recursion>`
+
+.. _cache:
+
+Caching (cache.py)
+~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi.cache
+
+.. _recursion:
+
+Recursions (recursion.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi.evaluate.recursion
+
+
+.. _dev-helpers:
+
+Helper Modules
+---------------
+
+Most other modules are not really central to how Jedi works. They all contain
+relevant code, but you if you understand the modules above, you pretty much
+understand Jedi.
+
+Python 2/3 compatibility (_compatibility.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi._compatibility
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/docs/features.rst b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/features.rst
new file mode 100644
index 0000000..fd5b3ba
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/features.rst
@@ -0,0 +1,263 @@
+.. include:: ../global.rst
+
+Features and Caveats
+====================
+
+Jedi obviously supports autocompletion. It's also possible to get it working in
+(:ref:`your REPL (IPython, etc.) <repl-completion>`).
+
+Static analysis is also possible by using the command ``jedi.names``.
+
+The Jedi Linter is currently in an alpha version and can be tested by calling
+``python -m jedi linter``.
+
+Jedi would in theory support refactoring, but we have never publicized it,
+because it's not production ready. If you're interested in helping out here,
+let me know. With the latest parser changes, it should be very easy to actually
+make it work.
+
+
+General Features
+----------------
+
+- python 2.6+ and 3.3+ support
+- ignores syntax errors and wrong indentation
+- can deal with complex module / function / class structures
+- virtualenv support
+- can infer function arguments from sphinx, epydoc and basic numpydoc docstrings,
+  and PEP0484-style type hints (:ref:`type hinting <type-hinting>`)
+
+
+Supported Python Features
+-------------------------
+
+|jedi| supports many of the widely used Python features:
+
+- builtins
+- returns, yields, yield from
+- tuple assignments / array indexing / dictionary indexing / star unpacking
+- with-statement / exception handling
+- ``*args`` / ``**kwargs``
+- decorators / lambdas / closures
+- generators / iterators
+- some descriptors: property / staticmethod / classmethod
+- some magic methods: ``__call__``, ``__iter__``, ``__next__``, ``__get__``,
+  ``__getitem__``, ``__init__``
+- ``list.append()``, ``set.add()``, ``list.extend()``, etc.
+- (nested) list comprehensions / ternary expressions
+- relative imports
+- ``getattr()`` / ``__getattr__`` / ``__getattribute__``
+- function annotations (py3k feature, are ignored right now, but being parsed.
+  I don't know what to do with them.)
+- class decorators (py3k feature, are being ignored too, until I find a use
+  case, that doesn't work with |jedi|)
+- simple/usual ``sys.path`` modifications
+- ``isinstance`` checks for if/while/assert
+- namespace packages (includes ``pkgutil`` and ``pkg_resources`` namespaces)
+- Django / Flask / Buildout support
+
+
+Unsupported Features
+--------------------
+
+Not yet implemented:
+
+- manipulations of instances outside the instance variables without using
+  methods
+- implicit namespace packages (Python 3.3+, `PEP 420 <https://www.python.org/dev/peps/pep-0420/>`_)
+
+Will probably never be implemented:
+
+- metaclasses (how could an auto-completion ever support this)
+- ``setattr()``, ``__import__()``
+- writing to some dicts: ``globals()``, ``locals()``, ``object.__dict__``
+- evaluating ``if`` / ``while`` / ``del``
+
+
+Caveats
+-------
+
+**Malformed Syntax**
+
+Syntax errors and other strange stuff may lead to undefined behaviour of the
+completion. |jedi| is **NOT** a Python compiler, that tries to correct you. It
+is a tool that wants to help you. But **YOU** have to know Python, not |jedi|.
+
+**Legacy Python 2 Features**
+
+This framework should work for both Python 2/3. However, some things were just
+not as *pythonic* in Python 2 as things should be. To keep things simple, some
+older Python 2 features have been left out:
+
+- Classes: Always Python 3 like, therefore all classes inherit from ``object``.
+- Generators: No ``next()`` method. The ``__next__()`` method is used instead.
+
+**Slow Performance**
+
+Importing ``numpy`` can be quite slow sometimes, as well as loading the
+builtins the first time. If you want to speed things up, you could write import
+hooks in |jedi|, which preload stuff. However, once loaded, this is not a
+problem anymore.  The same is true for huge modules like ``PySide``, ``wx``,
+etc.
+
+**Security**
+
+Security is an important issue for |jedi|. Therefore no Python code is
+executed.  As long as you write pure python, everything is evaluated
+statically. But: If you use builtin modules (``c_builtin``) there is no other
+option than to execute those modules. However: Execute isn't that critical (as
+e.g. in pythoncomplete, which used to execute *every* import!), because it
+means one import and no more.  So basically the only dangerous thing is using
+the import itself. If your ``c_builtin`` uses some strange initializations, it
+might be dangerous. But if it does you're screwed anyways, because eventualy
+you're going to execute your code, which executes the import.
+
+
+Recipes
+-------
+
+Here are some tips on how to use |jedi| efficiently.
+
+
+.. _type-hinting:
+
+Type Hinting
+~~~~~~~~~~~~
+
+If |jedi| cannot detect the type of a function argument correctly (due to the
+dynamic nature of Python), you can help it by hinting the type using
+one of the following docstring/annotation syntax styles:
+
+**PEP-0484 style**
+
+https://www.python.org/dev/peps/pep-0484/
+
+function annotations (python 3 only; python 2 function annotations with
+comments in planned but not yet implemented)
+
+::
+
+    def myfunction(node: ProgramNode, foo: str) -> None:
+        """Do something with a ``node``.
+
+        """
+        node.| # complete here
+
+
+assignment, for-loop and with-statement type hints (all python versions).
+Note that the type hints must be on the same line as the statement
+
+::
+
+    x = foo()  # type: int
+    x, y = 2, 3  # type: typing.Optional[int], typing.Union[int, str] # typing module is mostly supported
+    for key, value in foo.items():  # type: str, Employee  # note that Employee must be in scope
+        pass
+    with foo() as f:  # type: int
+        print(f + 3)
+
+Most of the features in PEP-0484 are supported including the typing module
+(for python < 3.5 you have to do ``pip install typing`` to use these),
+and forward references.
+
+Things that are missing (and this is not an exhaustive list; some of these
+are planned, others might be hard to implement and provide little worth):
+
+- annotating functions with comments: https://www.python.org/dev/peps/pep-0484/#suggested-syntax-for-python-2-7-and-straddling-code
+- understanding ``typing.cast()``
+- stub files: https://www.python.org/dev/peps/pep-0484/#stub-files
+- ``typing.Callable``
+- ``typing.TypeVar``
+- User defined generic types: https://www.python.org/dev/peps/pep-0484/#user-defined-generic-types
+
+**Sphinx style**
+
+http://sphinx-doc.org/domains.html#info-field-lists
+
+::
+
+    def myfunction(node, foo):
+        """Do something with a ``node``.
+
+        :type node: ProgramNode
+        :param str foo: foo parameter description
+
+        """
+        node.| # complete here
+
+**Epydoc**
+
+http://epydoc.sourceforge.net/manual-fields.html
+
+::
+
+    def myfunction(node):
+        """Do something with a ``node``.
+
+        @type node: ProgramNode
+
+        """
+        node.| # complete here
+
+**Numpydoc**
+
+https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt
+
+In order to support the numpydoc format, you need to install the `numpydoc
+<https://pypi.python.org/pypi/numpydoc>`__ package.
+
+::
+
+    def foo(var1, var2, long_var_name='hi'):
+        r"""A one-line summary that does not use variable names or the
+        function name.
+
+        ...
+
+        Parameters
+        ----------
+        var1 : array_like
+            Array_like means all those objects -- lists, nested lists,
+            etc. -- that can be converted to an array. We can also
+            refer to variables like `var1`.
+        var2 : int
+            The type above can either refer to an actual Python type
+            (e.g. ``int``), or describe the type of the variable in more
+            detail, e.g. ``(N,) ndarray`` or ``array_like``.
+        long_variable_name : {'hi', 'ho'}, optional
+            Choices in brackets, default first when optional.
+
+        ...
+
+        """
+        var2.| # complete here
+
+A little history
+----------------
+
+The Star Wars Jedi are awesome. My Jedi software tries to imitate a little bit
+of the precognition the Jedi have. There's even an awesome `scene
+<http://www.youtube.com/watch?v=5BDO3pyavOY>`_ of Monty Python Jedis :-).
+
+But actually the name hasn't so much to do with Star Wars. It's part of my
+second name.
+
+After I explained Guido van Rossum, how some parts of my auto-completion work,
+he said (we drank a beer or two):
+
+    *"Oh, that worries me..."*
+
+When it's finished, I hope he'll like it :-)
+
+I actually started Jedi, because there were no good solutions available for VIM.
+Most auto-completions just didn't work well. The only good solution was PyCharm.
+But I like my good old VIM. Rope was never really intended to be an
+auto-completion (and also I really hate project folders for my Python scripts).
+It's more of a refactoring suite. So I decided to do my own version of a
+completion, which would execute non-dangerous code. But I soon realized, that
+this wouldn't work. So I built an extremely recursive thing which understands
+many of Python's key features.
+
+By the way, I really tried to program it as understandable as possible. But I
+think understanding it might need quite some time, because of its recursive
+nature.
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/docs/installation.rst b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/installation.rst
new file mode 100644
index 0000000..c6acbe9
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/installation.rst
@@ -0,0 +1,83 @@
+.. include:: ../global.rst
+
+Installation and Configuration
+==============================
+
+You can either include |jedi| as a submodule in your text editor plugin (like
+jedi-vim_ does by default), or you can install it systemwide.
+
+.. note:: This just installs the |jedi| library, not the :ref:`editor plugins
+    <editor-plugins>`. For information about how to make it work with your
+    editor, refer to the corresponding documentation.
+
+
+The preferred way
+-----------------
+
+On any system you can install |jedi| directly from the Python package index
+using pip::
+
+    sudo pip install jedi
+
+If you want to install the current development version (master branch)::
+
+    sudo pip install -e git://github.com/davidhalter/jedi.git#egg=jedi
+
+
+System-wide installation via a package manager
+----------------------------------------------
+
+Arch Linux
+~~~~~~~~~~
+
+You can install |jedi| directly from official Arch Linux packages:
+
+- `python-jedi <https://www.archlinux.org/packages/community/any/python-jedi/>`__
+  (Python 3)
+- `python2-jedi <https://www.archlinux.org/packages/community/any/python2-jedi/>`__
+  (Python 2)
+
+The specified Python version just refers to the *runtime environment* for
+|jedi|. Use the Python 2 version if you're running vim (or whatever editor you
+use) under Python 2. Otherwise, use the Python 3 version. But whatever version
+you choose, both are able to complete both Python 2 and 3 *code*.
+
+(There is also a packaged version of the vim plugin available: `vim-jedi at
+Arch Linux<https://www.archlinux.org/packages/community/any/vim-jedi/>`__.)
+
+Debian
+~~~~~~
+
+Debian packages are available in the `unstable repository
+<http://packages.debian.org/search?keywords=python%20jedi>`__.
+
+Others
+~~~~~~
+
+We are in the discussion of adding |jedi| to the Fedora repositories.
+
+
+Manual installation from a downloaded package
+---------------------------------------------
+
+If you prefer not to use an automated package installer, you can `download
+<https://github.com/davidhalter/jedi/archive/master.zip>`__ a current copy of
+|jedi| and install it manually.
+
+To install it, navigate to the directory containing `setup.py` on your console
+and type::
+
+    sudo python setup.py install
+
+
+Inclusion as a submodule
+------------------------
+
+If you use an editor plugin like jedi-vim_, you can simply include |jedi| as a
+git submodule of the plugin directory. Vim plugin managers like Vundle_ or
+Pathogen_ make it very easy to keep submodules up to date.
+
+
+.. _jedi-vim: https://github.com/davidhalter/jedi-vim
+.. _vundle: https://github.com/gmarik/vundle
+.. _pathogen: https://github.com/tpope/vim-pathogen
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/docs/plugin-api-classes.rst b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/plugin-api-classes.rst
new file mode 100644
index 0000000..74eb28b
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/plugin-api-classes.rst
@@ -0,0 +1,10 @@
+.. include:: ../global.rst
+
+.. _plugin-api-classes:
+
+API Return Classes
+------------------
+
+.. automodule:: jedi.api.classes
+    :members:
+    :undoc-members:
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/docs/plugin-api.rst b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/plugin-api.rst
new file mode 100644
index 0000000..93b081e
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/plugin-api.rst
@@ -0,0 +1,100 @@
+.. include:: ../global.rst
+
+The Plugin API
+==============
+
+.. currentmodule:: jedi
+
+Note: This documentation is for Plugin developers, who want to improve their
+editors/IDE autocompletion 
+
+If you want to use |jedi|, you first need to ``import jedi``.  You then have
+direct access to the :class:`.Script`. You can then call the functions
+documented here. These functions return :ref:`API classes
+<plugin-api-classes>`.
+
+
+Deprecations
+------------
+
+The deprecation process is as follows:
+
+1. A deprecation is announced in the next major/minor release.
+2. We wait either at least a year & at least two minor releases until we remove
+   the deprecated functionality.
+
+
+API documentation
+-----------------
+
+API Interface
+~~~~~~~~~~~~~
+
+.. automodule:: jedi.api
+    :members:
+    :undoc-members:
+
+
+Examples
+--------
+
+Completions:
+
+.. sourcecode:: python
+
+   >>> import jedi
+   >>> source = '''import json; json.l'''
+   >>> script = jedi.Script(source, 1, 19, '')
+   >>> script
+   <jedi.api.Script object at 0x2121b10>
+   >>> completions = script.completions()
+   >>> completions
+   [<Completion: load>, <Completion: loads>]
+   >>> completions[1]
+   <Completion: loads>
+   >>> completions[1].complete
+   'oads'
+   >>> completions[1].name
+   'loads'
+
+Definitions / Goto:
+
+.. sourcecode:: python
+
+    >>> import jedi
+    >>> source = '''def my_func():
+    ...     print 'called'
+    ... 
+    ... alias = my_func
+    ... my_list = [1, None, alias]
+    ... inception = my_list[2]
+    ... 
+    ... inception()'''
+    >>> script = jedi.Script(source, 8, 1, '')
+    >>>
+    >>> script.goto_assignments()
+    [<Definition inception=my_list[2]>]
+    >>>
+    >>> script.goto_definitions()
+    [<Definition def my_func>]
+
+Related names:
+
+.. sourcecode:: python
+
+    >>> import jedi
+    >>> source = '''x = 3
+    ... if 1 == 2:
+    ...     x = 4
+    ... else:
+    ...     del x'''
+    >>> script = jedi.Script(source, 5, 8, '')
+    >>> rns = script.related_names()
+    >>> rns
+    [<RelatedName x@3,4>, <RelatedName x@1,0>]
+    >>> rns[0].start_pos
+    (3, 4)
+    >>> rns[0].is_keyword
+    False
+    >>> rns[0].text
+    'x'
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/docs/settings.rst b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/settings.rst
new file mode 100644
index 0000000..640a110
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/settings.rst
@@ -0,0 +1,6 @@
+.. include:: ../global.rst
+
+Settings
+========
+
+.. automodule:: jedi.settings
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/docs/static_analsysis.rst b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/static_analsysis.rst
new file mode 100644
index 0000000..7ad03c7
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/static_analsysis.rst
@@ -0,0 +1,106 @@
+
+This file is the start of the documentation of how static analysis works.
+
+Below is a list of parser names that are used within nodes_to_execute.
+
+------------ cared for:
+global_stmt
+exec_stmt  # no priority
+assert_stmt
+if_stmt
+while_stmt
+for_stmt
+try_stmt
+(except_clause)
+with_stmt
+(with_item)
+(with_var)
+print_stmt
+del_stmt
+return_stmt
+raise_stmt
+yield_expr
+file_input
+funcdef
+param
+old_lambdef
+lambdef
+import_name
+import_from
+(import_as_name)
+(dotted_as_name)
+(import_as_names)
+(dotted_as_names)
+(dotted_name)
+classdef
+comp_for
+(comp_if) ?
+decorator
+
+----------- add basic
+test
+or_test
+and_test
+not_test
+expr
+xor_expr
+and_expr
+shift_expr
+arith_expr
+term
+factor
+power
+atom
+comparison
+expr_stmt
+testlist
+testlist1
+testlist_safe
+
+----------- special care:
+# mostly depends on how we handle the other ones.
+testlist_star_expr  # should probably just work with expr_stmt
+star_expr
+exprlist  # just ignore? then names are just resolved. Strange anyway, bc expr is not really allowed in the list, typically.
+
+----------- ignore:
+suite
+subscriptlist
+subscript
+simple_stmt
+?? sliceop     # can probably just be added.
+testlist_comp  # prob ignore and care about it with atom.
+dictorsetmaker
+trailer
+decorators
+decorated
+# always execute function arguments? -> no problem with stars.
+# Also arglist and argument are different in different grammars.
+arglist
+argument
+
+
+----------- remove:
+tname      # only exists in current Jedi parser. REMOVE!
+tfpdef     # python 2: tuple assignment; python 3: annotation
+vfpdef     # reduced in python 3 and therefore not existing.
+tfplist    # not in 3
+vfplist    # not in 3
+
+--------- not existing with parser reductions.
+small_stmt
+import_stmt
+flow_stmt
+compound_stmt
+stmt
+pass_stmt
+break_stmt
+continue_stmt
+comp_op
+augassign
+old_test
+typedargslist  # afaik becomes [param]
+varargslist    # dito
+vname
+comp_iter
+test_nocond
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/docs/testing.rst b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/testing.rst
new file mode 100644
index 0000000..0c666a1
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/testing.rst
@@ -0,0 +1,40 @@
+.. include:: ../global.rst
+
+Jedi Testing
+============
+
+The test suite depends on ``tox`` and ``pytest``::
+
+    pip install tox pytest
+
+To run the tests for all supported Python versions::
+
+    tox
+
+If you want to test only a specific Python version (e.g. Python 2.7), it's as
+easy as::
+
+    tox -e py27
+
+Tests are also run automatically on `Travis CI
+<https://travis-ci.org/davidhalter/jedi/>`_.
+
+You want to add a test for |jedi|? Great! We love that. Normally you should
+write your tests as :ref:`Blackbox Tests <blackbox>`. Most tests would
+fit right in there.
+
+For specific API testing we're using simple unit tests, with a focus on a
+simple and readable testing structure.
+
+.. _blackbox:
+
+Blackbox Tests (run.py)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: test.run
+
+Refactoring Tests (refactor.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: test.refactor
+
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/docs/usage.rst b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/usage.rst
new file mode 100644
index 0000000..82e1040
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/docs/usage.rst
@@ -0,0 +1,119 @@
+.. include:: ../global.rst
+
+End User Usage
+==============
+
+If you are a not an IDE Developer, the odds are that you just want to use
+|jedi| as a browser plugin or in the shell. Yes that's :ref:`also possible
+<repl-completion>`!
+
+|jedi| is relatively young and can be used in a variety of Plugins and
+Software. If your Editor/IDE is not among them, recommend |jedi| to your IDE
+developers.
+
+
+.. _editor-plugins:
+
+Editor Plugins
+--------------
+
+Vim:
+
+- jedi-vim_
+- YouCompleteMe_
+- deoplete-jedi_
+
+Emacs:
+
+- Jedi.el_
+- elpy_
+- anaconda-mode_
+
+Sublime Text 2/3:
+
+- SublimeJEDI_ (ST2 & ST3)
+- anaconda_ (only ST3)
+
+SynWrite:
+
+- SynJedi_
+
+TextMate:
+
+- Textmate_ (Not sure if it's actually working)
+
+Kate:
+
+- Kate_ version 4.13+ `supports it natively
+  <https://projects.kde.org/projects/kde/applications/kate/repository/entry/addons/kate/pate/src/plugins/python_autocomplete_jedi.py?rev=KDE%2F4.13>`__,
+  you have to enable it, though.
+
+Visual Studio Code:
+
+- `Python Extension`_
+
+Atom:
+
+- autocomplete-python_
+
+SourceLair:
+
+- SourceLair_
+
+GNOME Builder:
+
+- `GNOME Builder`_ `supports it natively
+  <https://git.gnome.org/browse/gnome-builder/tree/plugins/jedi>`__,
+  and is enabled by default.
+
+Gedit:
+
+- gedi_
+
+Eric IDE:
+
+- `Eric IDE`_ (Available as a plugin)
+
+Web Debugger:
+
+- wdb_
+
+and many more!
+
+.. _repl-completion:
+
+Tab completion in the Python Shell
+----------------------------------
+
+There are two different options how you can use Jedi autocompletion in
+your Python interpreter. One with your custom ``$HOME/.pythonrc.py`` file
+and one that uses ``PYTHONSTARTUP``.
+
+Using ``PYTHONSTARTUP``
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi.replstartup
+
+Using a custom ``$HOME/.pythonrc.py``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. autofunction:: jedi.utils.setup_readline
+
+.. _jedi-vim: https://github.com/davidhalter/jedi-vim
+.. _youcompleteme: http://valloric.github.io/YouCompleteMe/
+.. _deoplete-jedi: https://github.com/zchee/deoplete-jedi
+.. _Jedi.el: https://github.com/tkf/emacs-jedi
+.. _elpy: https://github.com/jorgenschaefer/elpy
+.. _anaconda-mode: https://github.com/proofit404/anaconda-mode
+.. _sublimejedi: https://github.com/srusskih/SublimeJEDI
+.. _anaconda: https://github.com/DamnWidget/anaconda
+.. _SynJedi: http://uvviewsoft.com/synjedi/
+.. _wdb: https://github.com/Kozea/wdb
+.. _TextMate: https://github.com/lawrenceakka/python-jedi.tmbundle
+.. _kate: http://kate-editor.org/
+.. _autocomplete-python: https://atom.io/packages/autocomplete-python
+.. _SourceLair: https://www.sourcelair.com
+.. _GNOME Builder: https://wiki.gnome.org/Apps/Builder/
+.. _gedi: https://github.com/isamert/gedi
+.. _Eric IDE: http://eric-ide.python-projects.org
+.. _Python Extension: https://marketplace.visualstudio.com/items?itemName=donjayamanne.python
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/global.rst b/vim-plugins/bundle/jedi-vim/jedi/docs/global.rst
new file mode 100644
index 0000000..0279842
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/global.rst
@@ -0,0 +1,3 @@
+:orphan:
+
+.. |jedi| replace:: *Jedi*
diff --git a/vim-plugins/bundle/jedi-vim/jedi/docs/index.rst b/vim-plugins/bundle/jedi-vim/jedi/docs/index.rst
new file mode 100644
index 0000000..19c0706
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/docs/index.rst
@@ -0,0 +1,40 @@
+.. include global.rst
+
+Jedi - an awesome autocompletion/static analysis library for Python
+===================================================================
+
+Release v\ |release|. (:doc:`Installation <docs/installation>`)
+
+.. automodule:: jedi
+
+Autocompletion can look like this (e.g. VIM plugin):
+
+.. figure:: _screenshots/screenshot_complete.png
+
+
+.. _toc:
+
+Docs
+----
+
+.. toctree::
+   :maxdepth: 2
+
+   docs/usage
+   docs/installation
+   docs/features
+   docs/plugin-api
+   docs/plugin-api-classes
+   docs/settings
+   docs/development
+   docs/testing
+
+
+.. _resources:
+
+Resources
+---------
+
+- `Source Code on Github <https://github.com/davidhalter/jedi>`_
+- `Travis Testing <https://travis-ci.org/davidhalter/jedi>`_
+- `Python Package Index <http://pypi.python.org/pypi/jedi/>`_
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/__init__.py
new file mode 100644
index 0000000..c278276
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/__init__.py
@@ -0,0 +1,43 @@
+"""
+Jedi is a static analysis tool for Python that can be used in IDEs/editors. Its
+historic focus is autocompletion, but does static analysis for now as well.
+Jedi is fast and is very well tested. It understands Python on a deeper level
+than all other static analysis frameworks for Python.
+
+Jedi has support for two different goto functions. It's possible to search for
+related names and to list all names in a Python file and infer them. Jedi
+understands docstrings and you can use Jedi autocompletion in your REPL as
+well.
+
+Jedi uses a very simple API to connect with IDE's. There's a reference
+implementation as a `VIM-Plugin <https://github.com/davidhalter/jedi-vim>`_,
+which uses Jedi's autocompletion.  We encourage you to use Jedi in your IDEs.
+It's really easy.
+
+To give you a simple example how you can use the Jedi library, here is an
+example for the autocompletion feature:
+
+>>> import jedi
+>>> source = '''
+... import datetime
+... datetime.da'''
+>>> script = jedi.Script(source, 3, len('datetime.da'), 'example.py')
+>>> script
+<Script: 'example.py'>
+>>> completions = script.completions()
+>>> completions                                         #doctest: +ELLIPSIS
+[<Completion: date>, <Completion: datetime>, ...]
+>>> print(completions[0].complete)
+te
+>>> print(completions[0].name)
+date
+
+As you see Jedi is pretty simple and allows you to concentrate on writing a
+good text editor, while still having very good IDE features for Python.
+"""
+
+__version__ = '0.10.0'
+
+from jedi.api import Script, Interpreter, NotFoundError, set_debug_function
+from jedi.api import preload_module, defined_names, names
+from jedi import settings
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/__main__.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/__main__.py
new file mode 100644
index 0000000..f2ee047
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/__main__.py
@@ -0,0 +1,48 @@
+import sys
+from os.path import join, dirname, abspath, isdir
+
+
+def _start_linter():
+    """
+    This is a pre-alpha API. You're not supposed to use it at all, except for
+    testing. It will very likely change.
+    """
+    import jedi
+
+    if '--debug' in sys.argv:
+        jedi.set_debug_function()
+
+    for path in sys.argv[2:]:
+        if path.startswith('--'):
+            continue
+        if isdir(path):
+            import fnmatch
+            import os
+
+            paths = []
+            for root, dirnames, filenames in os.walk(path):
+                for filename in fnmatch.filter(filenames, '*.py'):
+                    paths.append(os.path.join(root, filename))
+        else:
+            paths = [path]
+
+        try:
+            for path in paths:
+                for error in jedi.Script(path=path)._analysis():
+                    print(error)
+        except Exception:
+            if '--pdb' in sys.argv:
+                import traceback
+                traceback.print_exc()
+                import pdb
+                pdb.post_mortem()
+            else:
+                raise
+
+
+if len(sys.argv) == 2 and sys.argv[1] == 'repl':
+    # don't want to use __main__ only for repl yet, maybe we want to use it for
+    # something else. So just use the keyword ``repl`` for now.
+    print(join(dirname(abspath(__file__)), 'api', 'replstartup.py'))
+elif len(sys.argv) > 1 and sys.argv[1] == 'linter':
+    _start_linter()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..e36f041
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/_compatibility.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/_compatibility.cpython-35.pyc
new file mode 100644
index 0000000..5c1c895
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/_compatibility.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/cache.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/cache.cpython-35.pyc
new file mode 100644
index 0000000..6b893df
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/cache.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/common.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/common.cpython-35.pyc
new file mode 100644
index 0000000..e84d7d8
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/common.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/debug.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/debug.cpython-35.pyc
new file mode 100644
index 0000000..f47f611
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/debug.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/settings.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/settings.cpython-35.pyc
new file mode 100644
index 0000000..a95e9c4
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/settings.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/utils.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/utils.cpython-35.pyc
new file mode 100644
index 0000000..5596853
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/__pycache__/utils.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/_compatibility.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/_compatibility.py
new file mode 100644
index 0000000..3c14b6f
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/_compatibility.py
@@ -0,0 +1,263 @@
+"""
+To ensure compatibility from Python ``2.6`` - ``3.3``, a module has been
+created. Clearly there is huge need to use conforming syntax.
+"""
+import sys
+import imp
+import os
+import re
+import pkgutil
+try:
+    import importlib
+except ImportError:
+    pass
+
+is_py3 = sys.version_info[0] >= 3
+is_py33 = is_py3 and sys.version_info.minor >= 3
+is_py34 = is_py3 and sys.version_info.minor >= 4
+is_py35 = is_py3 and sys.version_info.minor >= 5
+is_py26 = not is_py3 and sys.version_info[1] < 7
+
+
+class DummyFile(object):
+    def __init__(self, loader, string):
+        self.loader = loader
+        self.string = string
+
+    def read(self):
+        return self.loader.get_source(self.string)
+
+    def close(self):
+        del self.loader
+
+
+def find_module_py33(string, path=None):
+    loader = importlib.machinery.PathFinder.find_module(string, path)
+
+    if loader is None and path is None:  # Fallback to find builtins
+        try:
+            loader = importlib.find_loader(string)
+        except ValueError as e:
+            # See #491. Importlib might raise a ValueError, to avoid this, we
+            # just raise an ImportError to fix the issue.
+            raise ImportError("Originally  " + repr(e))
+
+    if loader is None:
+        raise ImportError("Couldn't find a loader for {0}".format(string))
+
+    try:
+        is_package = loader.is_package(string)
+        if is_package:
+            if hasattr(loader, 'path'):
+                module_path = os.path.dirname(loader.path)
+            else:
+                # At least zipimporter does not have path attribute
+                module_path = os.path.dirname(loader.get_filename(string))
+            if hasattr(loader, 'archive'):
+                module_file = DummyFile(loader, string)
+            else:
+                module_file = None
+        else:
+            module_path = loader.get_filename(string)
+            module_file = DummyFile(loader, string)
+    except AttributeError:
+        # ExtensionLoader has not attribute get_filename, instead it has a
+        # path attribute that we can use to retrieve the module path
+        try:
+            module_path = loader.path
+            module_file = DummyFile(loader, string)
+        except AttributeError:
+            module_path = string
+            module_file = None
+        finally:
+            is_package = False
+
+    if hasattr(loader, 'archive'):
+        module_path = loader.archive
+
+    return module_file, module_path, is_package
+
+
+def find_module_pre_py33(string, path=None):
+    try:
+        module_file, module_path, description = imp.find_module(string, path)
+        module_type = description[2]
+        return module_file, module_path, module_type is imp.PKG_DIRECTORY
+    except ImportError:
+        pass
+
+    if path is None:
+        path = sys.path
+    for item in path:
+        loader = pkgutil.get_importer(item)
+        if loader:
+            try:
+                loader = loader.find_module(string)
+                if loader:
+                    is_package = loader.is_package(string)
+                    is_archive = hasattr(loader, 'archive')
+                    try:
+                        module_path = loader.get_filename(string)
+                    except AttributeError:
+                        # fallback for py26
+                        try:
+                            module_path = loader._get_filename(string)
+                        except AttributeError:
+                            continue
+                    if is_package:
+                        module_path = os.path.dirname(module_path)
+                    if is_archive:
+                        module_path = loader.archive
+                    file = None
+                    if not is_package or is_archive:
+                        file = DummyFile(loader, string)
+                    return (file, module_path, is_package)
+            except ImportError:
+                pass
+    raise ImportError("No module named {0}".format(string))
+
+
+find_module = find_module_py33 if is_py33 else find_module_pre_py33
+find_module.__doc__ = """
+Provides information about a module.
+
+This function isolates the differences in importing libraries introduced with
+python 3.3 on; it gets a module name and optionally a path. It will return a
+tuple containin an open file for the module (if not builtin), the filename
+or the name of the module if it is a builtin one and a boolean indicating
+if the module is contained in a package.
+"""
+
+
+# unicode function
+try:
+    unicode = unicode
+except NameError:
+    unicode = str
+
+if is_py3:
+    u = lambda s: s
+else:
+    u = lambda s: s.decode('utf-8')
+
+u.__doc__ = """
+Decode a raw string into unicode object.  Do nothing in Python 3.
+"""
+
+# exec function
+if is_py3:
+    def exec_function(source, global_map):
+        exec(source, global_map)
+else:
+    eval(compile("""def exec_function(source, global_map):
+                        exec source in global_map """, 'blub', 'exec'))
+
+# re-raise function
+if is_py3:
+    def reraise(exception, traceback):
+        raise exception.with_traceback(traceback)
+else:
+    eval(compile("""
+def reraise(exception, traceback):
+    raise exception, None, traceback
+""", 'blub', 'exec'))
+
+reraise.__doc__ = """
+Re-raise `exception` with a `traceback` object.
+
+Usage::
+
+    reraise(Exception, sys.exc_info()[2])
+
+"""
+
+class Python3Method(object):
+    def __init__(self, func):
+        self.func = func
+
+    def __get__(self, obj, objtype):
+        if obj is None:
+            return lambda *args, **kwargs: self.func(*args, **kwargs)
+        else:
+            return lambda *args, **kwargs: self.func(obj, *args, **kwargs)
+
+
+def use_metaclass(meta, *bases):
+    """ Create a class with a metaclass. """
+    if not bases:
+        bases = (object,)
+    return meta("HackClass", bases, {})
+
+
+try:
+    encoding = sys.stdout.encoding
+    if encoding is None:
+        encoding = 'utf-8'
+except AttributeError:
+    encoding = 'ascii'
+
+
+def u(string):
+    """Cast to unicode DAMMIT!
+    Written because Python2 repr always implicitly casts to a string, so we
+    have to cast back to a unicode (and we now that we always deal with valid
+    unicode, because we check that in the beginning).
+    """
+    if is_py3:
+        return str(string)
+    elif not isinstance(string, unicode):
+        return unicode(str(string), 'UTF-8')
+    return string
+
+try:
+    import builtins  # module name in python 3
+except ImportError:
+    import __builtin__ as builtins
+
+
+import ast
+
+
+def literal_eval(string):
+    # py3.0, py3.1 and py32 don't support unicode literals. Support those, I
+    # don't want to write two versions of the tokenizer.
+    if is_py3 and sys.version_info.minor < 3:
+        if re.match('[uU][\'"]', string):
+            string = string[1:]
+    return ast.literal_eval(string)
+
+
+try:
+    from itertools import zip_longest
+except ImportError:
+    from itertools import izip_longest as zip_longest  # Python 2
+
+
+def no_unicode_pprint(dct):
+    """
+    Python 2/3 dict __repr__ may be different, because of unicode differens
+    (with or without a `u` prefix). Normally in doctests we could use `pprint`
+    to sort dicts and check for equality, but here we have to write a separate
+    function to do that.
+    """
+    import pprint
+    s = pprint.pformat(dct)
+    print(re.sub("u'", "'", s))
+
+
+def utf8_repr(func):
+    """
+    ``__repr__`` methods in Python 2 don't allow unicode objects to be
+    returned. Therefore cast them to utf-8 bytes in this decorator.
+    """
+    def wrapper(self):
+        result = func(self)
+        if isinstance(result, unicode):
+            return result.encode('utf-8')
+        else:
+            return result
+
+    if is_py3:
+        return func
+    else:
+        return wrapper
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__init__.py
new file mode 100644
index 0000000..d443910
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__init__.py
@@ -0,0 +1,463 @@
+"""
+The API basically only provides one class. You can create a :class:`Script` and
+use its methods.
+
+Additionally you can add a debug function with :func:`set_debug_function`.
+Alternatively, if you don't need a custom function and are happy with printing
+debug messages to stdout, simply call :func:`set_debug_function` without
+arguments.
+
+.. warning:: Please, note that Jedi is **not thread safe**.
+"""
+import os
+import warnings
+import sys
+
+from jedi._compatibility import unicode
+from jedi.parser import load_grammar
+from jedi.parser import tree
+from jedi.parser.fast import FastParser
+from jedi.parser.utils import save_parser
+from jedi import debug
+from jedi import settings
+from jedi import common
+from jedi import cache
+from jedi.api import classes
+from jedi.api import interpreter
+from jedi.api import usages
+from jedi.api import helpers
+from jedi.api.completion import Completion
+from jedi.evaluate import Evaluator
+from jedi.evaluate import representation as er
+from jedi.evaluate import imports
+from jedi.evaluate.param import try_iter_content
+from jedi.evaluate.helpers import get_module_names
+from jedi.evaluate.sys_path import get_venv_path
+from jedi.evaluate.iterable import unpack_tuple_to_dict
+
+# Jedi uses lots and lots of recursion. By setting this a little bit higher, we
+# can remove some "maximum recursion depth" errors.
+sys.setrecursionlimit(2000)
+
+
+class NotFoundError(Exception):
+    """A custom error to avoid catching the wrong exceptions.
+
+    .. deprecated:: 0.9.0
+       Not in use anymore, Jedi just returns no goto result if you're not on a
+       valid name.
+    .. todo:: Remove!
+    """
+
+
+class Script(object):
+    """
+    A Script is the base for completions, goto or whatever you want to do with
+    |jedi|.
+
+    You can either use the ``source`` parameter or ``path`` to read a file.
+    Usually you're going to want to use both of them (in an editor).
+
+    The script might be analyzed in a different ``sys.path`` than |jedi|:
+
+    - if `sys_path` parameter is not ``None``, it will be used as ``sys.path``
+      for the script;
+
+    - if `sys_path` parameter is ``None`` and ``VIRTUAL_ENV`` environment
+      variable is defined, ``sys.path`` for the specified environment will be
+      guessed (see :func:`jedi.evaluate.sys_path.get_venv_path`) and used for
+      the script;
+
+    - otherwise ``sys.path`` will match that of |jedi|.
+
+    :param source: The source code of the current file, separated by newlines.
+    :type source: str
+    :param line: The line to perform actions on (starting with 1).
+    :type line: int
+    :param column: The column of the cursor (starting with 0).
+    :type column: int
+    :param path: The path of the file in the file system, or ``''`` if
+        it hasn't been saved yet.
+    :type path: str or None
+    :param encoding: The encoding of ``source``, if it is not a
+        ``unicode`` object (default ``'utf-8'``).
+    :type encoding: str
+    :param source_encoding: The encoding of ``source``, if it is not a
+        ``unicode`` object (default ``'utf-8'``).
+    :type encoding: str
+    :param sys_path: ``sys.path`` to use during analysis of the script
+    :type sys_path: list
+
+    """
+    def __init__(self, source=None, line=None, column=None, path=None,
+                 encoding='utf-8', source_path=None, source_encoding=None,
+                 sys_path=None):
+        if source_path is not None:
+            warnings.warn("Use path instead of source_path.", DeprecationWarning)
+            path = source_path
+        if source_encoding is not None:
+            warnings.warn("Use encoding instead of source_encoding.", DeprecationWarning)
+            encoding = source_encoding
+
+        self._orig_path = path
+        # An empty path (also empty string) should always result in no path.
+        self.path = os.path.abspath(path) if path else None
+
+        if source is None:
+            # TODO add a better warning than the traceback!
+            with open(path, 'rb') as f:
+                source = f.read()
+
+        self._source = common.source_to_unicode(source, encoding)
+        self._code_lines = common.splitlines(self._source)
+        line = max(len(self._code_lines), 1) if line is None else line
+        if not (0 < line <= len(self._code_lines)):
+            raise ValueError('`line` parameter is not in a valid range.')
+
+        line_len = len(self._code_lines[line - 1])
+        column = line_len if column is None else column
+        if not (0 <= column <= line_len):
+            raise ValueError('`column` parameter is not in a valid range.')
+        self._pos = line, column
+        self._path = path
+
+        cache.clear_time_caches()
+        debug.reset_time()
+        self._grammar = load_grammar(version='%s.%s' % sys.version_info[:2])
+        if sys_path is None:
+            venv = os.getenv('VIRTUAL_ENV')
+            if venv:
+                sys_path = list(get_venv_path(venv))
+        self._evaluator = Evaluator(self._grammar, sys_path=sys_path)
+        debug.speed('init')
+
+    def _get_module(self):
+        cache.invalidate_star_import_cache(self._path)
+        parser = FastParser(self._grammar, self._source, self.path)
+        save_parser(self.path, parser, pickling=False)
+
+        module = self._evaluator.wrap(parser.module)
+        imports.add_module(self._evaluator, unicode(module.name), module)
+        return parser.module
+
+    @property
+    def source_path(self):
+        """
+        .. deprecated:: 0.7.0
+           Use :attr:`.path` instead.
+        .. todo:: Remove!
+        """
+        warnings.warn("Use path instead of source_path.", DeprecationWarning)
+        return self.path
+
+    def __repr__(self):
+        return '<%s: %s>' % (self.__class__.__name__, repr(self._orig_path))
+
+    def completions(self):
+        """
+        Return :class:`classes.Completion` objects. Those objects contain
+        information about the completions, more than just names.
+
+        :return: Completion objects, sorted by name and __ comes last.
+        :rtype: list of :class:`classes.Completion`
+        """
+        debug.speed('completions start')
+        completion = Completion(
+            self._evaluator, self._get_module(), self._code_lines,
+            self._pos, self.call_signatures
+        )
+        completions = completion.completions()
+        debug.speed('completions end')
+        return completions
+
+    def goto_definitions(self):
+        """
+        Return the definitions of a the path under the cursor.  goto function!
+        This follows complicated paths and returns the end, not the first
+        definition. The big difference between :meth:`goto_assignments` and
+        :meth:`goto_definitions` is that :meth:`goto_assignments` doesn't
+        follow imports and statements. Multiple objects may be returned,
+        because Python itself is a dynamic language, which means depending on
+        an option you can have two different versions of a function.
+
+        :rtype: list of :class:`classes.Definition`
+        """
+        leaf = self._get_module().name_for_position(self._pos)
+        if leaf is None:
+            leaf = self._get_module().get_leaf_for_position(self._pos)
+            if leaf is None:
+                return []
+        definitions = helpers.evaluate_goto_definition(self._evaluator, leaf)
+
+        names = [s.name for s in definitions]
+        defs = [classes.Definition(self._evaluator, name) for name in names]
+        # The additional set here allows the definitions to become unique in an
+        # API sense. In the internals we want to separate more things than in
+        # the API.
+        return helpers.sorted_definitions(set(defs))
+
+    def goto_assignments(self, follow_imports=False):
+        """
+        Return the first definition found, while optionally following imports.
+        Multiple objects may be returned, because Python itself is a
+        dynamic language, which means depending on an option you can have two
+        different versions of a function.
+
+        :rtype: list of :class:`classes.Definition`
+        """
+        def filter_follow_imports(names):
+            for name in names:
+                definition = name.get_definition()
+                if definition.type in ('import_name', 'import_from'):
+                    imp = imports.ImportWrapper(self._evaluator, name)
+                    for name in filter_follow_imports(imp.follow(is_goto=True)):
+                        yield name
+                else:
+                    yield name
+
+        names = self._goto()
+        if follow_imports:
+            names = filter_follow_imports(names)
+
+        defs = [classes.Definition(self._evaluator, d) for d in set(names)]
+        return helpers.sorted_definitions(defs)
+
+    def _goto(self):
+        """
+        Used for goto_assignments and usages.
+        """
+        name = self._get_module().name_for_position(self._pos)
+        if name is None:
+            return []
+        return list(self._evaluator.goto(name))
+
+    def usages(self, additional_module_paths=()):
+        """
+        Return :class:`classes.Definition` objects, which contain all
+        names that point to the definition of the name under the cursor. This
+        is very useful for refactoring (renaming), or to show all usages of a
+        variable.
+
+        .. todo:: Implement additional_module_paths
+
+        :rtype: list of :class:`classes.Definition`
+        """
+        temp, settings.dynamic_flow_information = \
+            settings.dynamic_flow_information, False
+        try:
+            user_stmt = self._get_module().get_statement_for_position(self._pos)
+            definitions = self._goto()
+            if not definitions and isinstance(user_stmt, tree.Import):
+                # For not defined imports (goto doesn't find something, we take
+                # the name as a definition. This is enough, because every name
+                # points to it.
+                name = user_stmt.name_for_position(self._pos)
+                if name is None:
+                    # Must be syntax
+                    return []
+                definitions = [name]
+
+            if not definitions:
+                # Without a definition for a name we cannot find references.
+                return []
+
+            if not isinstance(user_stmt, tree.Import):
+                # import case is looked at with add_import_name option
+                definitions = usages.usages_add_import_modules(self._evaluator,
+                                                               definitions)
+
+            module = set([d.get_parent_until() for d in definitions])
+            module.add(self._get_module())
+            names = usages.usages(self._evaluator, definitions, module)
+
+            for d in set(definitions):
+                names.append(classes.Definition(self._evaluator, d))
+        finally:
+            settings.dynamic_flow_information = temp
+
+        return helpers.sorted_definitions(set(names))
+
+    def call_signatures(self):
+        """
+        Return the function object of the call you're currently in.
+
+        E.g. if the cursor is here::
+
+            abs(# <-- cursor is here
+
+        This would return the ``abs`` function. On the other hand::
+
+            abs()# <-- cursor is here
+
+        This would return an empty list..
+
+        :rtype: list of :class:`classes.CallSignature`
+        """
+        call_signature_details = \
+            helpers.get_call_signature_details(self._get_module(), self._pos)
+        if call_signature_details is None:
+            return []
+
+        with common.scale_speed_settings(settings.scale_call_signatures):
+            definitions = helpers.cache_call_signatures(
+                self._evaluator,
+                call_signature_details.bracket_leaf,
+                self._code_lines,
+                self._pos
+            )
+        debug.speed('func_call followed')
+
+        return [classes.CallSignature(self._evaluator, d.name,
+                                      call_signature_details.bracket_leaf.start_pos,
+                                      call_signature_details.call_index,
+                                      call_signature_details.keyword_name_str)
+                for d in definitions if hasattr(d, 'py__call__')]
+
+    def _analysis(self):
+        self._evaluator.is_analysis = True
+        self._evaluator.analysis_modules = [self._get_module()]
+        try:
+            for node in self._get_module().nodes_to_execute():
+                if node.type in ('funcdef', 'classdef'):
+                    if node.type == 'classdef':
+                        continue
+                        raise NotImplementedError
+                    er.Function(self._evaluator, node).get_decorated_func()
+                elif isinstance(node, tree.Import):
+                    import_names = set(node.get_defined_names())
+                    if node.is_nested():
+                        import_names |= set(path[-1] for path in node.paths())
+                    for n in import_names:
+                        imports.ImportWrapper(self._evaluator, n).follow()
+                elif node.type == 'expr_stmt':
+                    types = self._evaluator.eval_element(node)
+                    for testlist in node.children[:-1:2]:
+                        # Iterate tuples.
+                        unpack_tuple_to_dict(self._evaluator, types, testlist)
+                else:
+                    try_iter_content(self._evaluator.goto_definitions(node))
+                self._evaluator.reset_recursion_limitations()
+
+            ana = [a for a in self._evaluator.analysis if self.path == a.path]
+            return sorted(set(ana), key=lambda x: x.line)
+        finally:
+            self._evaluator.is_analysis = False
+
+
+class Interpreter(Script):
+    """
+    Jedi API for Python REPLs.
+
+    In addition to completion of simple attribute access, Jedi
+    supports code completion based on static code analysis.
+    Jedi can complete attributes of object which is not initialized
+    yet.
+
+    >>> from os.path import join
+    >>> namespace = locals()
+    >>> script = Interpreter('join("").up', [namespace])
+    >>> print(script.completions()[0].name)
+    upper
+    """
+
+    def __init__(self, source, namespaces, **kwds):
+        """
+        Parse `source` and mixin interpreted Python objects from `namespaces`.
+
+        :type source: str
+        :arg  source: Code to parse.
+        :type namespaces: list of dict
+        :arg  namespaces: a list of namespace dictionaries such as the one
+                          returned by :func:`locals`.
+
+        Other optional arguments are same as the ones for :class:`Script`.
+        If `line` and `column` are None, they are assumed be at the end of
+        `source`.
+        """
+        try:
+            namespaces = [dict(n) for n in namespaces]
+        except Exception:
+            raise TypeError("namespaces must be a non-empty list of dicts.")
+
+        super(Interpreter, self).__init__(source, **kwds)
+        self.namespaces = namespaces
+
+        parser_module = super(Interpreter, self)._get_module()
+        self._module = interpreter.MixedModule(self._evaluator, parser_module, self.namespaces)
+
+    def _get_module(self):
+        return self._module
+
+
+def defined_names(source, path=None, encoding='utf-8'):
+    """
+    Get all definitions in `source` sorted by its position.
+
+    This functions can be used for listing functions, classes and
+    data defined in a file.  This can be useful if you want to list
+    them in "sidebar".  Each element in the returned list also has
+    `defined_names` method which can be used to get sub-definitions
+    (e.g., methods in class).
+
+    :rtype: list of classes.Definition
+
+    .. deprecated:: 0.9.0
+       Use :func:`names` instead.
+    .. todo:: Remove!
+    """
+    warnings.warn("Use call_signatures instead.", DeprecationWarning)
+    return names(source, path, encoding)
+
+
+def names(source=None, path=None, encoding='utf-8', all_scopes=False,
+          definitions=True, references=False):
+    """
+    Returns a list of `Definition` objects, containing name parts.
+    This means you can call ``Definition.goto_assignments()`` and get the
+    reference of a name.
+    The parameters are the same as in :py:class:`Script`, except or the
+    following ones:
+
+    :param all_scopes: If True lists the names of all scopes instead of only
+        the module namespace.
+    :param definitions: If True lists the names that have been defined by a
+        class, function or a statement (``a = b`` returns ``a``).
+    :param references: If True lists all the names that are not listed by
+        ``definitions=True``. E.g. ``a = b`` returns ``b``.
+    """
+    def def_ref_filter(_def):
+        is_def = _def.is_definition()
+        return definitions and is_def or references and not is_def
+
+    # Set line/column to a random position, because they don't matter.
+    script = Script(source, line=1, column=0, path=path, encoding=encoding)
+    defs = [classes.Definition(script._evaluator, name_part)
+            for name_part in get_module_names(script._get_module(), all_scopes)]
+    return sorted(filter(def_ref_filter, defs), key=lambda x: (x.line, x.column))
+
+
+def preload_module(*modules):
+    """
+    Preloading modules tells Jedi to load a module now, instead of lazy parsing
+    of modules. Usful for IDEs, to control which modules to load on startup.
+
+    :param modules: different module names, list of string.
+    """
+    for m in modules:
+        s = "import %s as x; x." % m
+        Script(s, 1, len(s), None).completions()
+
+
+def set_debug_function(func_cb=debug.print_to_stdout, warnings=True,
+                       notices=True, speed=True):
+    """
+    Define a callback debug function to get all the debug messages.
+
+    If you don't specify any arguments, debug messages will be printed to stdout.
+
+    :param func_cb: The callback function for debug messages, with n params.
+    """
+    debug.debug_function = func_cb
+    debug.enable_warning = warnings
+    debug.enable_notice = notices
+    debug.enable_speed = speed
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..cf46de3
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/classes.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/classes.cpython-35.pyc
new file mode 100644
index 0000000..dc9b58a
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/classes.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/completion.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/completion.cpython-35.pyc
new file mode 100644
index 0000000..1ef7440
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/completion.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/helpers.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/helpers.cpython-35.pyc
new file mode 100644
index 0000000..fa7cd3a
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/helpers.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/interpreter.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/interpreter.cpython-35.pyc
new file mode 100644
index 0000000..283022f
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/interpreter.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/keywords.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/keywords.cpython-35.pyc
new file mode 100644
index 0000000..2c8dde5
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/keywords.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/usages.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/usages.cpython-35.pyc
new file mode 100644
index 0000000..767b47e
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/__pycache__/usages.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/classes.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/classes.py
new file mode 100644
index 0000000..a1d3ce8
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/classes.py
@@ -0,0 +1,764 @@
+"""
+The :mod:`jedi.api.classes` module contains the return classes of the API.
+These classes are the much bigger part of the whole API, because they contain
+the interesting information about completion and goto operations.
+"""
+import warnings
+from itertools import chain
+import re
+
+from jedi._compatibility import unicode, use_metaclass
+from jedi import settings
+from jedi import common
+from jedi.parser import tree
+from jedi.parser.utils import load_parser
+from jedi.evaluate.cache import memoize_default, CachedMetaClass
+from jedi.evaluate import representation as er
+from jedi.evaluate import iterable
+from jedi.evaluate import imports
+from jedi.evaluate import compiled
+from jedi.evaluate.compiled import mixed
+from jedi.api import keywords
+from jedi.evaluate.finder import filter_definition_names
+
+
+def defined_names(evaluator, scope):
+    """
+    List sub-definitions (e.g., methods in class).
+
+    :type scope: Scope
+    :rtype: list of Definition
+    """
+    dct = scope.names_dict
+    names = list(chain.from_iterable(dct.values()))
+    names = filter_definition_names(names, scope)
+    return [Definition(evaluator, d) for d in sorted(names, key=lambda s: s.start_pos)]
+
+
+class BaseDefinition(object):
+    _mapping = {
+        'posixpath': 'os.path',
+        'riscospath': 'os.path',
+        'ntpath': 'os.path',
+        'os2emxpath': 'os.path',
+        'macpath': 'os.path',
+        'genericpath': 'os.path',
+        'posix': 'os',
+        '_io': 'io',
+        '_functools': 'functools',
+        '_sqlite3': 'sqlite3',
+        '__builtin__': '',
+        'builtins': '',
+    }
+
+    _tuple_mapping = dict((tuple(k.split('.')), v) for (k, v) in {
+        'argparse._ActionsContainer': 'argparse.ArgumentParser',
+        '_sre.SRE_Match': 're.MatchObject',
+        '_sre.SRE_Pattern': 're.RegexObject',
+    }.items())
+
+    def __init__(self, evaluator, name):
+        self._evaluator = evaluator
+        self._name = name
+        """
+        An instance of :class:`jedi.parser.reprsentation.Name` subclass.
+        """
+        self._definition = evaluator.wrap(self._name.get_definition())
+        self.is_keyword = isinstance(self._definition, keywords.Keyword)
+
+        # generate a path to the definition
+        self._module = name.get_parent_until()
+        if self.in_builtin_module():
+            self.module_path = None
+        else:
+            self.module_path = self._module.path
+            """Shows the file path of a module. e.g. ``/usr/lib/python2.7/os.py``"""
+
+    @property
+    def name(self):
+        """
+        Name of variable/function/class/module.
+
+        For example, for ``x = None`` it returns ``'x'``.
+
+        :rtype: str or None
+        """
+        return unicode(self._name)
+
+    @property
+    def start_pos(self):
+        """
+        .. deprecated:: 0.7.0
+           Use :attr:`.line` and :attr:`.column` instead.
+        .. todo:: Remove!
+        """
+        warnings.warn("Use line/column instead.", DeprecationWarning)
+        return self._name.start_pos
+
+    @property
+    def type(self):
+        """
+        The type of the definition.
+
+        Here is an example of the value of this attribute.  Let's consider
+        the following source.  As what is in ``variable`` is unambiguous
+        to Jedi, :meth:`jedi.Script.goto_definitions` should return a list of
+        definition for ``sys``, ``f``, ``C`` and ``x``.
+
+        >>> from jedi import Script
+        >>> source = '''
+        ... import keyword
+        ...
+        ... class C:
+        ...     pass
+        ...
+        ... class D:
+        ...     pass
+        ...
+        ... x = D()
+        ...
+        ... def f():
+        ...     pass
+        ...
+        ... for variable in [keyword, f, C, x]:
+        ...     variable'''
+
+        >>> script = Script(source)
+        >>> defs = script.goto_definitions()
+
+        Before showing what is in ``defs``, let's sort it by :attr:`line`
+        so that it is easy to relate the result to the source code.
+
+        >>> defs = sorted(defs, key=lambda d: d.line)
+        >>> defs                           # doctest: +NORMALIZE_WHITESPACE
+        [<Definition module keyword>, <Definition class C>,
+         <Definition class D>, <Definition def f>]
+
+        Finally, here is what you can get from :attr:`type`:
+
+        >>> defs[0].type
+        'module'
+        >>> defs[1].type
+        'class'
+        >>> defs[2].type
+        'instance'
+        >>> defs[3].type
+        'function'
+
+        """
+        stripped = self._definition
+        if isinstance(stripped, er.InstanceElement):
+            stripped = stripped.var
+
+        if isinstance(stripped, (compiled.CompiledObject, mixed.MixedObject)):
+            return stripped.api_type()
+        elif isinstance(stripped, iterable.Array):
+            return 'instance'
+        elif isinstance(stripped, tree.Import):
+            return 'import'
+
+        string = type(stripped).__name__.lower().replace('wrapper', '')
+        if string == 'exprstmt':
+            return 'statement'
+        else:
+            return string
+
+    def _path(self):
+        """The path to a module/class/function definition."""
+        path = []
+        par = self._definition
+        while par is not None:
+            if isinstance(par, tree.Import):
+                path += imports.ImportWrapper(self._evaluator, self._name).import_path
+                break
+            try:
+                name = par.name
+            except AttributeError:
+                pass
+            else:
+                if isinstance(par, er.ModuleWrapper):
+                    # TODO just make the path dotted from the beginning, we
+                    # shouldn't really split here.
+                    path[0:0] = par.py__name__().split('.')
+                    break
+                else:
+                    path.insert(0, unicode(name))
+            par = par.parent
+        return path
+
+    @property
+    def module_name(self):
+        """
+        The module name.
+
+        >>> from jedi import Script
+        >>> source = 'import json'
+        >>> script = Script(source, path='example.py')
+        >>> d = script.goto_definitions()[0]
+        >>> print(d.module_name)                       # doctest: +ELLIPSIS
+        json
+        """
+        return str(self._module.name)
+
+    def in_builtin_module(self):
+        """Whether this is a builtin module."""
+        return isinstance(self._module, compiled.CompiledObject)
+
+    @property
+    def line(self):
+        """The line where the definition occurs (starting with 1)."""
+        if self.in_builtin_module():
+            return None
+        return self._name.start_pos[0]
+
+    @property
+    def column(self):
+        """The column where the definition occurs (starting with 0)."""
+        if self.in_builtin_module():
+            return None
+        return self._name.start_pos[1]
+
+    def docstring(self, raw=False):
+        r"""
+        Return a document string for this completion object.
+
+        Example:
+
+        >>> from jedi import Script
+        >>> source = '''\
+        ... def f(a, b=1):
+        ...     "Document for function f."
+        ... '''
+        >>> script = Script(source, 1, len('def f'), 'example.py')
+        >>> doc = script.goto_definitions()[0].docstring()
+        >>> print(doc)
+        f(a, b=1)
+        <BLANKLINE>
+        Document for function f.
+
+        Notice that useful extra information is added to the actual
+        docstring.  For function, it is call signature.  If you need
+        actual docstring, use ``raw=True`` instead.
+
+        >>> print(script.goto_definitions()[0].docstring(raw=True))
+        Document for function f.
+
+        """
+        if raw:
+            return _Help(self._definition).raw()
+        else:
+            return _Help(self._definition).full()
+
+    @property
+    def doc(self):
+        """
+        .. deprecated:: 0.8.0
+           Use :meth:`.docstring` instead.
+        .. todo:: Remove!
+        """
+        warnings.warn("Use docstring() instead.", DeprecationWarning)
+        return self.docstring()
+
+    @property
+    def raw_doc(self):
+        """
+        .. deprecated:: 0.8.0
+           Use :meth:`.docstring` instead.
+        .. todo:: Remove!
+        """
+        warnings.warn("Use docstring() instead.", DeprecationWarning)
+        return self.docstring(raw=True)
+
+    @property
+    def description(self):
+        """A textual description of the object."""
+        return unicode(self._name)
+
+    @property
+    def full_name(self):
+        """
+        Dot-separated path of this object.
+
+        It is in the form of ``<module>[.<submodule>[...]][.<object>]``.
+        It is useful when you want to look up Python manual of the
+        object at hand.
+
+        Example:
+
+        >>> from jedi import Script
+        >>> source = '''
+        ... import os
+        ... os.path.join'''
+        >>> script = Script(source, 3, len('os.path.join'), 'example.py')
+        >>> print(script.goto_definitions()[0].full_name)
+        os.path.join
+
+        Notice that it correctly returns ``'os.path.join'`` instead of
+        (for example) ``'posixpath.join'``.
+
+        """
+        path = [unicode(p) for p in self._path()]
+        # TODO add further checks, the mapping should only occur on stdlib.
+        if not path:
+            return None  # for keywords the path is empty
+
+        with common.ignored(KeyError):
+            path[0] = self._mapping[path[0]]
+        for key, repl in self._tuple_mapping.items():
+            if tuple(path[:len(key)]) == key:
+                path = [repl] + path[len(key):]
+
+        return '.'.join(path if path[0] else path[1:])
+
+    def goto_assignments(self):
+        defs = self._evaluator.goto(self._name)
+        return [Definition(self._evaluator, d) for d in defs]
+
+    @memoize_default()
+    def _follow_statements_imports(self):
+        """
+        Follow both statements and imports, as far as possible.
+        """
+        if self._definition.isinstance(tree.ExprStmt):
+            return self._evaluator.eval_statement(self._definition)
+        elif self._definition.isinstance(tree.Import):
+            return imports.ImportWrapper(self._evaluator, self._name).follow()
+        else:
+            return set([self._definition])
+
+    @property
+    @memoize_default()
+    def params(self):
+        """
+        Raises an ``AttributeError``if the definition is not callable.
+        Otherwise returns a list of `Definition` that represents the params.
+        """
+        followed = list(self._follow_statements_imports())
+        if not followed or not hasattr(followed[0], 'py__call__'):
+            raise AttributeError()
+        followed = followed[0]  # only check the first one.
+
+        if followed.type in ('funcdef', 'lambda'):
+            if isinstance(followed, er.InstanceElement):
+                params = followed.params[1:]
+            else:
+                params = followed.params
+        elif followed.isinstance(er.compiled.CompiledObject):
+            params = followed.params
+        elif isinstance(followed, er.Class):
+            try:
+                sub = followed.get_subscope_by_name('__init__')
+                params = sub.params[1:]  # ignore self
+            except KeyError:
+                return []
+        elif isinstance(followed, er.Instance):
+            try:
+                sub = followed.get_subscope_by_name('__call__')
+                params = sub.params[1:]  # ignore self
+            except KeyError:
+                return []
+        else:
+            return []
+        return [_Param(self._evaluator, p.name) for p in params]
+
+    def parent(self):
+        scope = self._definition.get_parent_scope()
+        scope = self._evaluator.wrap(scope)
+        return Definition(self._evaluator, scope.name)
+
+    def __repr__(self):
+        return "<%s %s>" % (type(self).__name__, self.description)
+
+    def get_line_code(self, before=0, after=0):
+        """
+        Returns the line of code where this object was defined.
+
+        :param before: Add n lines before the current line to the output.
+        :param after: Add n lines after the current line to the output.
+
+        :return str: Returns the line(s) of code or an empty string if it's a
+                     builtin.
+        """
+        if self.in_builtin_module():
+            return ''
+
+        path = self._definition.get_parent_until().path
+        parser = load_parser(path)
+        lines = common.splitlines(parser.source)
+
+        line_nr = self._name.start_pos[0]
+        start_line_nr = line_nr - before
+        return '\n'.join(lines[start_line_nr:line_nr + after + 1])
+
+
+class Completion(BaseDefinition):
+    """
+    `Completion` objects are returned from :meth:`api.Script.completions`. They
+    provide additional information about a completion.
+    """
+    def __init__(self, evaluator, name, stack, like_name_length):
+        super(Completion, self).__init__(evaluator, name)
+
+        self._like_name_length = like_name_length
+        self._stack = stack
+
+        # Completion objects with the same Completion name (which means
+        # duplicate items in the completion)
+        self._same_name_completions = []
+
+    def _complete(self, like_name):
+        append = ''
+        if settings.add_bracket_after_function \
+                and self.type == 'Function':
+            append = '('
+
+        if isinstance(self._definition, tree.Param) and self._stack is not None:
+            node_names = list(self._stack.get_node_names(self._evaluator.grammar))
+            if 'trailer' in node_names and 'argument' not in node_names:
+                append += '='
+
+        name = str(self._name)
+        if like_name:
+            name = name[self._like_name_length:]
+        return name + append
+
+    @property
+    def complete(self):
+        """
+        Return the rest of the word, e.g. completing ``isinstance``::
+
+            isinstan# <-- Cursor is here
+
+        would return the string 'ce'. It also adds additional stuff, depending
+        on your `settings.py`.
+        """
+        return self._complete(True)
+
+    @property
+    def name_with_symbols(self):
+        """
+        Similar to :attr:`name`, but like :attr:`name`
+        returns also the symbols, for example::
+
+            list()
+
+        would return ``.append`` and others (which means it adds a dot).
+        """
+        return self._complete(False)
+
+    @property
+    def description(self):
+        """Provide a description of the completion object."""
+        if self._definition is None:
+            return ''
+        t = self.type
+        if t == 'statement' or t == 'import':
+            desc = self._definition.get_code()
+        else:
+            desc = '.'.join(unicode(p) for p in self._path())
+
+        line = '' if self.in_builtin_module else '@%s' % self.line
+        return '%s: %s%s' % (t, desc, line)
+
+    def __repr__(self):
+        return '<%s: %s>' % (type(self).__name__, self._name)
+
+    def docstring(self, raw=False, fast=True):
+        """
+        :param fast: Don't follow imports that are only one level deep like
+            ``import foo``, but follow ``from foo import bar``. This makes
+            sense for speed reasons. Completing `import a` is slow if you use
+            the ``foo.docstring(fast=False)`` on every object, because it
+            parses all libraries starting with ``a``.
+        """
+        definition = self._definition
+        if isinstance(definition, tree.Import):
+            i = imports.ImportWrapper(self._evaluator, self._name)
+            if len(i.import_path) > 1 or not fast:
+                followed = self._follow_statements_imports()
+                if followed:
+                    # TODO: Use all of the followed objects as input to Documentation.
+                    definition = list(followed)[0]
+
+        if raw:
+            return _Help(definition).raw()
+        else:
+            return _Help(definition).full()
+
+    @property
+    def type(self):
+        """
+        The type of the completion objects. Follows imports. For a further
+        description, look at :attr:`jedi.api.classes.BaseDefinition.type`.
+        """
+        if isinstance(self._definition, tree.Import):
+            i = imports.ImportWrapper(self._evaluator, self._name)
+            if len(i.import_path) <= 1:
+                return 'module'
+
+            followed = self.follow_definition()
+            if followed:
+                # Caveat: Only follows the first one, ignore the other ones.
+                # This is ok, since people are almost never interested in
+                # variations.
+                return followed[0].type
+        return super(Completion, self).type
+
+    @memoize_default()
+    def _follow_statements_imports(self):
+        # imports completion is very complicated and needs to be treated
+        # separately in Completion.
+        definition = self._definition
+        if definition.isinstance(tree.Import):
+            i = imports.ImportWrapper(self._evaluator, self._name)
+            return i.follow()
+        return super(Completion, self)._follow_statements_imports()
+
+    @memoize_default()
+    def follow_definition(self):
+        """
+        Return the original definitions. I strongly recommend not using it for
+        your completions, because it might slow down |jedi|. If you want to
+        read only a few objects (<=20), it might be useful, especially to get
+        the original docstrings. The basic problem of this function is that it
+        follows all results. This means with 1000 completions (e.g.  numpy),
+        it's just PITA-slow.
+        """
+        defs = self._follow_statements_imports()
+        return [Definition(self._evaluator, d.name) for d in defs]
+
+
+class Definition(use_metaclass(CachedMetaClass, BaseDefinition)):
+    """
+    *Definition* objects are returned from :meth:`api.Script.goto_assignments`
+    or :meth:`api.Script.goto_definitions`.
+    """
+    def __init__(self, evaluator, definition):
+        super(Definition, self).__init__(evaluator, definition)
+
+    @property
+    def description(self):
+        """
+        A description of the :class:`.Definition` object, which is heavily used
+        in testing. e.g. for ``isinstance`` it returns ``def isinstance``.
+
+        Example:
+
+        >>> from jedi import Script
+        >>> source = '''
+        ... def f():
+        ...     pass
+        ...
+        ... class C:
+        ...     pass
+        ...
+        ... variable = f if random.choice([0,1]) else C'''
+        >>> script = Script(source, column=3)  # line is maximum by default
+        >>> defs = script.goto_definitions()
+        >>> defs = sorted(defs, key=lambda d: d.line)
+        >>> defs
+        [<Definition def f>, <Definition class C>]
+        >>> str(defs[0].description)  # strip literals in python2
+        'def f'
+        >>> str(defs[1].description)
+        'class C'
+
+        """
+        d = self._definition
+        if isinstance(d, er.InstanceElement):
+            d = d.var
+
+        if isinstance(d, compiled.CompiledObject):
+            typ = d.api_type()
+            if typ == 'instance':
+                typ = 'class'  # The description should be similar to Py objects.
+            d = typ + ' ' + d.name.get_code()
+        elif isinstance(d, iterable.Array):
+            d = 'class ' + d.type
+        elif isinstance(d, (tree.Class, er.Class, er.Instance)):
+            d = 'class ' + unicode(d.name)
+        elif isinstance(d, (er.Function, tree.Function)):
+            d = 'def ' + unicode(d.name)
+        elif isinstance(d, tree.Module):
+            # only show module name
+            d = 'module %s' % self.module_name
+        elif isinstance(d, tree.Param):
+            d = d.get_code().strip()
+            if d.endswith(','):
+                d = d[:-1]  # Remove the comma.
+        else:  # ExprStmt
+            try:
+                first_leaf = d.first_leaf()
+            except AttributeError:
+                # `d` is already a Leaf (Name).
+                first_leaf = d
+            # Remove the prefix, because that's not what we want for get_code
+            # here.
+            old, first_leaf.prefix = first_leaf.prefix, ''
+            try:
+                d = d.get_code()
+            finally:
+                first_leaf.prefix = old
+        # Delete comments:
+        d = re.sub('#[^\n]+\n', ' ', d)
+        # Delete multi spaces/newlines
+        return re.sub('\s+', ' ', d).strip()
+
+    @property
+    def desc_with_module(self):
+        """
+        In addition to the definition, also return the module.
+
+        .. warning:: Don't use this function yet, its behaviour may change. If
+            you really need it, talk to me.
+
+        .. todo:: Add full path. This function is should return a
+            `module.class.function` path.
+        """
+        position = '' if self.in_builtin_module else '@%s' % (self.line)
+        return "%s:%s%s" % (self.module_name, self.description, position)
+
+    @memoize_default()
+    def defined_names(self):
+        """
+        List sub-definitions (e.g., methods in class).
+
+        :rtype: list of Definition
+        """
+        defs = self._follow_statements_imports()
+        # For now we don't want base classes or evaluate decorators.
+        defs = [d.base if isinstance(d, (er.Class, er.Function)) else d for d in defs]
+        iterable = (defined_names(self._evaluator, d) for d in defs)
+        iterable = list(iterable)
+        return list(chain.from_iterable(iterable))
+
+    def is_definition(self):
+        """
+        Returns True, if defined as a name in a statement, function or class.
+        Returns False, if it's a reference to such a definition.
+        """
+        return self._name.is_definition()
+
+    def __eq__(self, other):
+        return self._name.start_pos == other._name.start_pos \
+            and self.module_path == other.module_path \
+            and self.name == other.name \
+            and self._evaluator == other._evaluator
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    def __hash__(self):
+        return hash((self._name.start_pos, self.module_path, self.name, self._evaluator))
+
+
+class CallSignature(Definition):
+    """
+    `CallSignature` objects is the return value of `Script.function_definition`.
+    It knows what functions you are currently in. e.g. `isinstance(` would
+    return the `isinstance` function. without `(` it would return nothing.
+    """
+    def __init__(self, evaluator, executable_name, bracket_start_pos, index, key_name_str):
+        super(CallSignature, self).__init__(evaluator, executable_name)
+        self._index = index
+        self._key_name_str = key_name_str
+        self._bracket_start_pos = bracket_start_pos
+
+    @property
+    def index(self):
+        """
+        The Param index of the current call.
+        Returns None if the index cannot be found in the curent call.
+        """
+        if self._key_name_str is not None:
+            for i, param in enumerate(self.params):
+                if self._key_name_str == param.name:
+                    return i
+            if self.params and self.params[-1]._name.get_definition().stars == 2:
+                return i
+            else:
+                return None
+
+        if self._index >= len(self.params):
+
+            for i, param in enumerate(self.params):
+                # *args case
+                if param._name.get_definition().stars == 1:
+                    return i
+            return None
+        return self._index
+
+    @property
+    def bracket_start(self):
+        """
+        The indent of the bracket that is responsible for the last function
+        call.
+        """
+        return self._bracket_start_pos
+
+    @property
+    def call_name(self):
+        """
+        .. deprecated:: 0.8.0
+           Use :attr:`.name` instead.
+        .. todo:: Remove!
+
+        The name (e.g. 'isinstance') as a string.
+        """
+        warnings.warn("Use name instead.", DeprecationWarning)
+        return unicode(self.name)
+
+    @property
+    def module(self):
+        """
+        .. deprecated:: 0.8.0
+           Use :attr:`.module_name` for the module name.
+        .. todo:: Remove!
+        """
+        return self._executable.get_parent_until()
+
+    def __repr__(self):
+        return '<%s: %s index %s>' % (type(self).__name__, self._name,
+                                      self.index)
+
+
+class _Param(Definition):
+    """
+    Just here for backwards compatibility.
+    """
+    def get_code(self):
+        """
+        .. deprecated:: 0.8.0
+           Use :attr:`.description` and :attr:`.name` instead.
+        .. todo:: Remove!
+
+        A function to get the whole code of the param.
+        """
+        warnings.warn("Use description instead.", DeprecationWarning)
+        return self.description
+
+
+class _Help(object):
+    """
+    Temporary implementation, will be used as `Script.help() or something in
+    the future.
+    """
+    def __init__(self, definition):
+        self._name = definition
+
+    def full(self):
+        try:
+            return self._name.doc
+        except AttributeError:
+            return self.raw()
+
+    def raw(self):
+        """
+        The raw docstring ``__doc__`` for any object.
+
+        See :attr:`doc` for example.
+        """
+        try:
+            return self._name.raw_doc
+        except AttributeError:
+            return ''
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/completion.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/completion.py
new file mode 100644
index 0000000..2c0c44d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/completion.py
@@ -0,0 +1,256 @@
+from itertools import chain
+
+from jedi.parser import token
+from jedi.parser import tree
+from jedi import debug
+from jedi import settings
+from jedi.api import classes
+from jedi.api import helpers
+from jedi.evaluate import imports
+from jedi.api import keywords
+from jedi.evaluate import compiled
+from jedi.evaluate.helpers import call_of_leaf
+from jedi.evaluate.finder import global_names_dict_generator, filter_definition_names
+
+
+def get_call_signature_param_names(call_signatures):
+    # add named params
+    for call_sig in call_signatures:
+        # Allow protected access, because it's a public API.
+        module = call_sig._name.get_parent_until()
+        # Compiled modules typically don't allow keyword arguments.
+        if not isinstance(module, compiled.CompiledObject):
+            for p in call_sig.params:
+                # Allow access on _definition here, because it's a
+                # public API and we don't want to make the internal
+                # Name object public.
+                if p._definition.stars == 0:  # no *args/**kwargs
+                    yield p._name
+
+
+def filter_names(evaluator, completion_names, stack, like_name):
+    comp_dct = {}
+    for name in set(completion_names):
+        if settings.case_insensitive_completion \
+                and str(name).lower().startswith(like_name.lower()) \
+                or str(name).startswith(like_name):
+
+            if isinstance(name.parent, (tree.Function, tree.Class)):
+                # TODO I think this is a hack. It should be an
+                #   er.Function/er.Class before that.
+                name = evaluator.wrap(name.parent).name
+            new = classes.Completion(
+                evaluator,
+                name,
+                stack,
+                len(like_name)
+            )
+            k = (new.name, new.complete)  # key
+            if k in comp_dct and settings.no_completion_duplicates:
+                comp_dct[k]._same_name_completions.append(new)
+            else:
+                comp_dct[k] = new
+                yield new
+
+
+def get_user_scope(module, position):
+    """
+    Returns the scope in which the user resides. This includes flows.
+    """
+    user_stmt = module.get_statement_for_position(position)
+    if user_stmt is None:
+        def scan(scope):
+            for s in scope.children:
+                if s.start_pos <= position <= s.end_pos:
+                    if isinstance(s, (tree.Scope, tree.Flow)):
+                        return scan(s) or s
+                    elif s.type in ('suite', 'decorated'):
+                        return scan(s)
+            return None
+
+        return scan(module) or module
+    else:
+        return user_stmt.get_parent_scope(include_flows=True)
+
+
+class Completion:
+    def __init__(self, evaluator, module, code_lines, position, call_signatures_method):
+        self._evaluator = evaluator
+        self._module = evaluator.wrap(module)
+        self._code_lines = code_lines
+
+        # The first step of completions is to get the name
+        self._like_name = helpers.get_on_completion_name(module, code_lines, position)
+        # The actual cursor position is not what we need to calculate
+        # everything. We want the start of the name we're on.
+        self._position = position[0], position[1] - len(self._like_name)
+        self._call_signatures_method = call_signatures_method
+
+    def completions(self):
+        completion_names = self._get_context_completions()
+
+        completions = filter_names(self._evaluator, completion_names,
+                                   self.stack, self._like_name)
+
+        return sorted(completions, key=lambda x: (x.name.startswith('__'),
+                                                  x.name.startswith('_'),
+                                                  x.name.lower()))
+
+    def _get_context_completions(self):
+        """
+        Analyzes the context that a completion is made in and decides what to
+        return.
+
+        Technically this works by generating a parser stack and analysing the
+        current stack for possible grammar nodes.
+
+        Possible enhancements:
+        - global/nonlocal search global
+        - yield from / raise from <- could be only exceptions/generators
+        - In args: */**: no completion
+        - In params (also lambda): no completion before =
+        """
+
+        grammar = self._evaluator.grammar
+
+        try:
+            self.stack = helpers.get_stack_at_position(
+                grammar, self._code_lines, self._module, self._position
+            )
+        except helpers.OnErrorLeaf as e:
+            self.stack = None
+            if e.error_leaf.value == '.':
+                # After ErrorLeaf's that are dots, we will not do any
+                # completions since this probably just confuses the user.
+                return []
+            # If we don't have a context, just use global completion.
+
+            return self._global_completions()
+
+        allowed_keywords, allowed_tokens = \
+            helpers.get_possible_completion_types(grammar, self.stack)
+
+        completion_names = list(self._get_keyword_completion_names(allowed_keywords))
+
+        if token.NAME in allowed_tokens:
+            # This means that we actually have to do type inference.
+
+            symbol_names = list(self.stack.get_node_names(grammar))
+
+            nodes = list(self.stack.get_nodes())
+
+            if "import_stmt" in symbol_names:
+                level = 0
+                only_modules = True
+                level, names = self._parse_dotted_names(nodes)
+                if "import_from" in symbol_names:
+                    if 'import' in nodes:
+                        only_modules = False
+                else:
+                    assert "import_name" in symbol_names
+
+                completion_names += self._get_importer_names(
+                    names,
+                    level,
+                    only_modules
+                )
+            elif nodes and nodes[-1] in ('as', 'def', 'class'):
+                # No completions for ``with x as foo`` and ``import x as foo``.
+                # Also true for defining names as a class or function.
+                return list(self._get_class_context_completions(is_function=True))
+            elif symbol_names[-1] == 'trailer' and nodes[-1] == '.':
+                dot = self._module.get_leaf_for_position(self._position)
+                atom_expr = call_of_leaf(dot.get_previous_leaf())
+                completion_names += self._trailer_completions(atom_expr)
+            else:
+                completion_names += self._global_completions()
+                completion_names += self._get_class_context_completions(is_function=False)
+
+            if 'trailer' in symbol_names:
+                call_signatures = self._call_signatures_method()
+                completion_names += get_call_signature_param_names(call_signatures)
+
+        return completion_names
+
+    def _get_keyword_completion_names(self, keywords_):
+        for k in keywords_:
+            yield keywords.keyword(self._evaluator, k).name
+
+    def _global_completions(self):
+        scope = get_user_scope(self._module, self._position)
+        if not scope.is_scope():  # Might be a flow (if/while/etc).
+            scope = scope.get_parent_scope()
+        scope = self._evaluator.wrap(scope)
+        debug.dbg('global completion scope: %s', scope)
+        names_dicts = global_names_dict_generator(
+            self._evaluator,
+            scope,
+            self._position
+        )
+        completion_names = []
+        for names_dict, pos in names_dicts:
+            names = list(chain.from_iterable(names_dict.values()))
+            if not names:
+                continue
+            completion_names += filter_definition_names(
+                names, self._module.get_statement_for_position(self._position), pos
+            )
+        return completion_names
+
+    def _trailer_completions(self, atom_expr):
+        scopes = self._evaluator.eval_element(atom_expr)
+        completion_names = []
+        debug.dbg('trailer completion scopes: %s', scopes)
+        for s in scopes:
+            names = []
+            for names_dict in s.names_dicts(search_global=False):
+                names += chain.from_iterable(names_dict.values())
+
+            completion_names += filter_definition_names(
+                names, self._module.get_statement_for_position(self._position)
+            )
+        return completion_names
+
+    def _parse_dotted_names(self, nodes):
+        level = 0
+        names = []
+        for node in nodes[1:]:
+            if node in ('.', '...'):
+                if not names:
+                    level += len(node.value)
+            elif node.type == 'dotted_name':
+                names += node.children[::2]
+            elif node.type == 'name':
+                names.append(node)
+            else:
+                break
+        return level, names
+
+    def _get_importer_names(self, names, level=0, only_modules=True):
+        names = [str(n) for n in names]
+        i = imports.Importer(self._evaluator, names, self._module, level)
+        return i.completion_names(self._evaluator, only_modules=only_modules)
+
+    def _get_class_context_completions(self, is_function=True):
+        """
+        Autocomplete inherited methods when overriding in child class.
+        """
+        leaf = self._module.get_leaf_for_position(self._position, include_prefixes=True)
+        cls = leaf.get_parent_until(tree.Class)
+        if isinstance(cls, (tree.Class, tree.Function)):
+            # Complete the methods that are defined in the super classes.
+            cls = self._evaluator.wrap(cls)
+        else:
+            return
+
+        if cls.start_pos[1] >= leaf.start_pos[1]:
+            return
+
+        names_dicts = cls.names_dicts(search_global=False, is_instance=True)
+        # The first dict is the dictionary of class itself.
+        next(names_dicts)
+        for names_dict in names_dicts:
+            for values in names_dict.values():
+                for value in values:
+                    if (value.parent.type == 'funcdef') == is_function:
+                        yield value
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/helpers.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/helpers.py
new file mode 100644
index 0000000..8102cc7
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/helpers.py
@@ -0,0 +1,315 @@
+"""
+Helpers for the API
+"""
+import re
+from collections import namedtuple
+
+from jedi._compatibility import u
+from jedi.evaluate.helpers import call_of_leaf
+from jedi import parser
+from jedi.parser import tokenize
+from jedi.cache import time_cache
+from jedi import common
+
+
+CompletionParts = namedtuple('CompletionParts', ['path', 'has_dot', 'name'])
+
+
+def sorted_definitions(defs):
+    # Note: `or ''` below is required because `module_path` could be
+    return sorted(defs, key=lambda x: (x.module_path or '', x.line or 0, x.column or 0))
+
+
+def get_on_completion_name(module, lines, position):
+    leaf = module.get_leaf_for_position(position)
+    if leaf is None or leaf.type in ('string', 'error_leaf'):
+        # Completions inside strings are a bit special, we need to parse the
+        # string. The same is true for comments and error_leafs.
+        line = lines[position[0] - 1]
+        # The first step of completions is to get the name
+        return re.search(r'(?!\d)\w+$|$', line[:position[1]]).group(0)
+    elif leaf.type not in ('name', 'keyword'):
+        return ''
+
+    return leaf.value[:position[1] - leaf.start_pos[1]]
+
+
+def _get_code(code_lines, start_pos, end_pos):
+    # Get relevant lines.
+    lines = code_lines[start_pos[0] - 1:end_pos[0]]
+    # Remove the parts at the end of the line.
+    lines[-1] = lines[-1][:end_pos[1]]
+    # Remove first line indentation.
+    lines[0] = lines[0][start_pos[1]:]
+    return '\n'.join(lines)
+
+
+class OnErrorLeaf(Exception):
+    @property
+    def error_leaf(self):
+        return self.args[0]
+
+
+def _is_on_comment(leaf, position):
+    # We might be on a comment.
+    if leaf.type == 'endmarker':
+        try:
+            dedent = leaf.get_previous_leaf()
+            if dedent.type == 'dedent' and dedent.prefix:
+                # TODO This is needed because the fast parser uses multiple
+                # endmarker tokens within a file which is obviously ugly.
+                # This is so ugly that I'm not even commenting how it exactly
+                # happens, but let me tell you that I want to get rid of it.
+                leaf = dedent
+        except IndexError:
+            pass
+
+    comment_lines = common.splitlines(leaf.prefix)
+    difference = leaf.start_pos[0] - position[0]
+    prefix_start_pos = leaf.get_start_pos_of_prefix()
+    if difference == 0:
+        indent = leaf.start_pos[1]
+    elif position[0] == prefix_start_pos[0]:
+        indent = prefix_start_pos[1]
+    else:
+        indent = 0
+    line = comment_lines[-difference - 1][:position[1] - indent]
+    return '#' in line
+
+
+def _get_code_for_stack(code_lines, module, position):
+    leaf = module.get_leaf_for_position(position, include_prefixes=True)
+    # It might happen that we're on whitespace or on a comment. This means
+    # that we would not get the right leaf.
+    if leaf.start_pos >= position:
+        if _is_on_comment(leaf, position):
+            return u('')
+
+        # If we're not on a comment simply get the previous leaf and proceed.
+        try:
+            leaf = leaf.get_previous_leaf()
+        except IndexError:
+            return u('')  # At the beginning of the file.
+
+    is_after_newline = leaf.type == 'newline'
+    while leaf.type == 'newline':
+        try:
+            leaf = leaf.get_previous_leaf()
+        except IndexError:
+            return u('')
+
+    if leaf.type in ('indent', 'dedent'):
+        return u('')
+    elif leaf.type == 'error_leaf' or leaf.type == 'string':
+        # Error leafs cannot be parsed, completion in strings is also
+        # impossible.
+        raise OnErrorLeaf(leaf)
+    else:
+        if leaf == ';':
+            user_stmt = leaf.parent
+        else:
+            user_stmt = leaf.get_definition()
+        if user_stmt.parent.type == 'simple_stmt':
+            user_stmt = user_stmt.parent
+
+        if is_after_newline:
+            if user_stmt.start_pos[1] > position[1]:
+                # This means that it's actually a dedent and that means that we
+                # start without context (part of a suite).
+                return u('')
+
+        # This is basically getting the relevant lines.
+        return _get_code(code_lines, user_stmt.get_start_pos_of_prefix(), position)
+
+
+def get_stack_at_position(grammar, code_lines, module, pos):
+    """
+    Returns the possible node names (e.g. import_from, xor_test or yield_stmt).
+    """
+    class EndMarkerReached(Exception):
+        pass
+
+    def tokenize_without_endmarker(code):
+        tokens = tokenize.source_tokens(code, use_exact_op_types=True)
+        for token_ in tokens:
+            if token_.string == safeword:
+                raise EndMarkerReached()
+            else:
+                yield token_
+
+    code = _get_code_for_stack(code_lines, module, pos)
+    # We use a word to tell Jedi when we have reached the start of the
+    # completion.
+    # Use Z as a prefix because it's not part of a number suffix.
+    safeword = 'ZZZ_USER_WANTS_TO_COMPLETE_HERE_WITH_JEDI'
+    # Remove as many indents from **all** code lines as possible.
+    code = code + safeword
+
+    p = parser.ParserWithRecovery(grammar, code, start_parsing=False)
+    try:
+        p.parse(tokenizer=tokenize_without_endmarker(code))
+    except EndMarkerReached:
+        return Stack(p.stack)
+    raise SystemError("This really shouldn't happen. There's a bug in Jedi.")
+
+
+class Stack(list):
+    def get_node_names(self, grammar):
+        for dfa, state, (node_number, nodes) in self:
+            yield grammar.number2symbol[node_number]
+
+    def get_nodes(self):
+        for dfa, state, (node_number, nodes) in self:
+            for node in nodes:
+                yield node
+
+
+def get_possible_completion_types(grammar, stack):
+    def add_results(label_index):
+        try:
+            grammar_labels.append(inversed_tokens[label_index])
+        except KeyError:
+            try:
+                keywords.append(inversed_keywords[label_index])
+            except KeyError:
+                t, v = grammar.labels[label_index]
+                assert t >= 256
+                # See if it's a symbol and if we're in its first set
+                inversed_keywords
+                itsdfa = grammar.dfas[t]
+                itsstates, itsfirst = itsdfa
+                for first_label_index in itsfirst.keys():
+                    add_results(first_label_index)
+
+    inversed_keywords = dict((v, k) for k, v in grammar.keywords.items())
+    inversed_tokens = dict((v, k) for k, v in grammar.tokens.items())
+
+    keywords = []
+    grammar_labels = []
+
+    def scan_stack(index):
+        dfa, state, node = stack[index]
+        states, first = dfa
+        arcs = states[state]
+
+        for label_index, new_state in arcs:
+            if label_index == 0:
+                # An accepting state, check the stack below.
+                scan_stack(index - 1)
+            else:
+                add_results(label_index)
+
+    scan_stack(-1)
+
+    return keywords, grammar_labels
+
+
+def evaluate_goto_definition(evaluator, leaf):
+    if leaf.type == 'name':
+        # In case of a name we can just use goto_definition which does all the
+        # magic itself.
+        return evaluator.goto_definitions(leaf)
+
+    node = None
+    parent = leaf.parent
+    if parent.type == 'atom':
+        node = leaf.parent
+    elif parent.type == 'trailer':
+        node = call_of_leaf(leaf)
+
+    if node is None:
+        return []
+    return evaluator.eval_element(node)
+
+
+CallSignatureDetails = namedtuple(
+    'CallSignatureDetails',
+    ['bracket_leaf', 'call_index', 'keyword_name_str']
+)
+
+
+def _get_index_and_key(nodes, position):
+    """
+    Returns the amount of commas and the keyword argument string.
+    """
+    nodes_before = [c for c in nodes if c.start_pos < position]
+    if nodes_before[-1].type == 'arglist':
+        nodes_before = [c for c in nodes_before[-1].children if c.start_pos < position]
+
+    key_str = None
+
+    if nodes_before:
+        last = nodes_before[-1]
+        if last.type == 'argument' and last.children[1].end_pos <= position:
+            # Checked if the argument
+            key_str = last.children[0].value
+        elif last == '=':
+            key_str = nodes_before[-2].value
+
+    return nodes_before.count(','), key_str
+
+
+def _get_call_signature_details_from_error_node(node, position):
+    for index, element in reversed(list(enumerate(node.children))):
+        # `index > 0` means that it's a trailer and not an atom.
+        if element == '(' and element.end_pos <= position and index > 0:
+            # It's an error node, we don't want to match too much, just
+            # until the parentheses is enough.
+            children = node.children[index:]
+            name = element.get_previous_leaf()
+            if name.type == 'name' or name.parent.type in ('trailer', 'atom'):
+                return CallSignatureDetails(
+                    element,
+                    *_get_index_and_key(children, position)
+                )
+
+
+def get_call_signature_details(module, position):
+    leaf = module.get_leaf_for_position(position, include_prefixes=True)
+    if leaf == ')':
+        if leaf.end_pos == position:
+            leaf = leaf.get_next_leaf()
+    # Now that we know where we are in the syntax tree, we start to look at
+    # parents for possible function definitions.
+    node = leaf.parent
+    while node is not None:
+        if node.type in ('funcdef', 'classdef'):
+            # Don't show call signatures if there's stuff before it that just
+            # makes it feel strange to have a call signature.
+            return None
+
+        for n in node.children[::-1]:
+            if n.start_pos < position and n.type == 'error_node':
+                result = _get_call_signature_details_from_error_node(n, position)
+                if result is not None:
+                    return result
+
+        if node.type == 'trailer' and node.children[0] == '(':
+            leaf = node.get_previous_leaf()
+            return CallSignatureDetails(
+                node.children[0], *_get_index_and_key(node.children, position))
+
+        node = node.parent
+
+    return None
+
+
+@time_cache("call_signatures_validity")
+def cache_call_signatures(evaluator, bracket_leaf, code_lines, user_pos):
+    """This function calculates the cache key."""
+    index = user_pos[0] - 1
+
+    before_cursor = code_lines[index][:user_pos[1]]
+    other_lines = code_lines[bracket_leaf.start_pos[0]:index]
+    whole = '\n'.join(other_lines + [before_cursor])
+    before_bracket = re.match(r'.*\(', whole, re.DOTALL)
+
+    module_path = bracket_leaf.get_parent_until().path
+    if module_path is None:
+        yield None  # Don't cache!
+    else:
+        yield (module_path, before_bracket, bracket_leaf.start_pos)
+    yield evaluate_goto_definition(
+        evaluator,
+        bracket_leaf.get_previous_leaf()
+    )
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/interpreter.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/interpreter.py
new file mode 100644
index 0000000..a6778a6
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/interpreter.py
@@ -0,0 +1,67 @@
+"""
+TODO Some parts of this module are still not well documented.
+"""
+import copy
+
+from jedi.cache import underscore_memoization
+from jedi.evaluate import helpers
+from jedi.evaluate.representation import ModuleWrapper
+from jedi.evaluate.compiled import mixed
+
+
+class MixedModule(object):
+    resets_positions = True
+    type = 'mixed_module'
+
+    def __init__(self, evaluator, parser_module, namespaces):
+        self._evaluator = evaluator
+        self._namespaces = namespaces
+
+        self._namespace_objects = [type('jedi_namespace', (), n) for n in namespaces]
+        self._wrapped_module = ModuleWrapper(evaluator, parser_module)
+        # Usually we are dealing with very small code sizes when it comes to
+        # interpreter modules. In this case we just copy the whole syntax tree
+        # to be able to modify it.
+        self._parser_module = copy.deepcopy(parser_module)
+
+        for child in self._parser_module.children:
+            child.parent = self
+
+    def names_dicts(self, search_global):
+        for names_dict in self._wrapped_module.names_dicts(search_global):
+            yield names_dict
+
+        for namespace_obj in self._namespace_objects:
+            m = mixed.MixedObject(self._evaluator, namespace_obj, self._parser_module.name)
+            for names_dict in m.names_dicts(False):
+                yield names_dict
+
+    def __getattr__(self, name):
+        return getattr(self._parser_module, name)
+
+
+class LazyName(helpers.FakeName):
+    def __init__(self, evaluator, module, name, value):
+        super(LazyName, self).__init__(name)
+        self._module = module
+        self._evaluator = evaluator
+        self._value = value
+        self._name = name
+
+    def is_definition(self):
+        return True
+
+    @property
+    @underscore_memoization
+    def parent(self):
+        """
+        Creating fake statements for the interpreter.
+
+        Here we are trying to link back to Python code, if possible. This means
+        we try to find the python module for a name (not the builtin).
+        """
+        return mixed.create(self._evaluator, self._value)
+
+    @parent.setter
+    def parent(self, value):
+        """Needed because the super class tries to set parent."""
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/keywords.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/keywords.py
new file mode 100644
index 0000000..d6a72b1
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/keywords.py
@@ -0,0 +1,132 @@
+import pydoc
+import keyword
+
+from jedi._compatibility import is_py3, is_py35
+from jedi import common
+from jedi.evaluate.helpers import FakeName
+from jedi.parser.tree import Leaf
+try:
+    from pydoc_data import topics as pydoc_topics
+except ImportError:
+    # Python 2
+    try:
+        import pydoc_topics
+    except ImportError:
+        # This is for Python 3 embeddable version, which dont have
+        # pydoc_data module in its file python3x.zip.
+        pydoc_topics = None
+
+if is_py3:
+    if is_py35:
+        # in python 3.5 async and await are not proper keywords, but for
+        # completion pursposes should as as though they are
+        keys = keyword.kwlist + ["async", "await"]
+    else:
+        keys = keyword.kwlist
+else:
+    keys = keyword.kwlist + ['None', 'False', 'True']
+
+
+def has_inappropriate_leaf_keyword(pos, module):
+    relevant_errors = filter(
+        lambda error: error.first_pos[0] == pos[0],
+        module.error_statement_stacks)
+
+    for error in relevant_errors:
+        if error.next_token in keys:
+            return True
+
+    return False
+
+
+def completion_names(evaluator, stmt, pos, module):
+    keyword_list = all_keywords(evaluator)
+
+    if not isinstance(stmt, Leaf) or has_inappropriate_leaf_keyword(pos, module):
+        keyword_list = filter(
+            lambda keyword: not keyword.only_valid_as_leaf,
+            keyword_list
+        )
+    return [keyword.name for keyword in keyword_list]
+
+
+def all_keywords(evaluator, pos=(0, 0)):
+    return set([Keyword(evaluator, k, pos) for k in keys])
+
+
+def keyword(evaluator, string, pos=(0, 0)):
+    if string in keys:
+        return Keyword(evaluator, string, pos)
+    else:
+        return None
+
+
+def get_operator(evaluator, string, pos):
+    return Keyword(evaluator, string, pos)
+
+
+keywords_only_valid_as_leaf = (
+    'continue',
+    'break',
+)
+
+
+class Keyword(object):
+    type = 'completion_keyword'
+
+    def __init__(self, evaluator, name, pos):
+        self.name = FakeName(name, self, pos)
+        self.start_pos = pos
+        self.parent = evaluator.BUILTINS
+
+    def get_parent_until(self):
+        return self.parent
+
+    @property
+    def only_valid_as_leaf(self):
+        return self.name.value in keywords_only_valid_as_leaf
+
+    @property
+    def names(self):
+        """ For a `parsing.Name` like comparision """
+        return [self.name]
+
+    @property
+    def docstr(self):
+        return imitate_pydoc(self.name)
+
+    def __repr__(self):
+        return '<%s: %s>' % (type(self).__name__, self.name)
+
+
+def imitate_pydoc(string):
+    """
+    It's not possible to get the pydoc's without starting the annoying pager
+    stuff.
+    """
+    if pydoc_topics is None:
+        return ''
+
+    # str needed because of possible unicode stuff in py2k (pydoc doesn't work
+    # with unicode strings)
+    string = str(string)
+    h = pydoc.help
+    with common.ignored(KeyError):
+        # try to access symbols
+        string = h.symbols[string]
+        string, _, related = string.partition(' ')
+
+    get_target = lambda s: h.topics.get(s, h.keywords.get(s))
+    while isinstance(string, str):
+        string = get_target(string)
+
+    try:
+        # is a tuple now
+        label, related = string
+    except TypeError:
+        return ''
+
+    try:
+        return pydoc_topics.topics[label] if pydoc_topics else ''
+    except KeyError:
+        return ''
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/replstartup.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/replstartup.py
new file mode 100644
index 0000000..5bfcc8c
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/replstartup.py
@@ -0,0 +1,27 @@
+"""
+To use Jedi completion in Python interpreter, add the following in your shell
+setup (e.g., ``.bashrc``)::
+
+    export PYTHONSTARTUP="$(python -m jedi repl)"
+
+Then you will be able to use Jedi completer in your Python interpreter::
+
+    $ python
+    Python 2.7.2+ (default, Jul 20 2012, 22:15:08)
+    [GCC 4.6.1] on linux2
+    Type "help", "copyright", "credits" or "license" for more information.
+    >>> import os
+    >>> os.path.join().split().in<TAB>                     # doctest: +SKIP
+    os.path.join().split().index   os.path.join().split().insert
+
+"""
+import jedi.utils
+from jedi import __version__ as __jedi_version__
+
+print('REPL completion using Jedi %s' % __jedi_version__)
+jedi.utils.setup_readline()
+
+del jedi
+
+# Note: try not to do many things here, as it will contaminate global
+# namespace of the interpreter.
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/api/usages.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/usages.py
new file mode 100644
index 0000000..ecb8856
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/api/usages.py
@@ -0,0 +1,49 @@
+from jedi._compatibility import unicode
+from jedi.api import classes
+from jedi.parser import tree
+from jedi.evaluate import imports
+
+
+def usages(evaluator, definition_names, mods):
+    """
+    :param definitions: list of Name
+    """
+    def compare_array(definitions):
+        """ `definitions` are being compared by module/start_pos, because
+        sometimes the id's of the objects change (e.g. executions).
+        """
+        result = []
+        for d in definitions:
+            module = d.get_parent_until()
+            result.append((module, d.start_pos))
+        return result
+
+    search_name = unicode(list(definition_names)[0])
+    compare_definitions = compare_array(definition_names)
+    mods |= set([d.get_parent_until() for d in definition_names])
+    definitions = []
+    for m in imports.get_modules_containing_name(evaluator, mods, search_name):
+        try:
+            check_names = m.used_names[search_name]
+        except KeyError:
+            continue
+        for name in check_names:
+
+            result = evaluator.goto(name)
+            if [c for c in compare_array(result) if c in compare_definitions]:
+                definitions.append(classes.Definition(evaluator, name))
+                # Previous definitions might be imports, so include them
+                # (because goto might return that import name).
+                compare_definitions += compare_array([name])
+    return definitions
+
+
+def usages_add_import_modules(evaluator, definitions):
+    """ Adds the modules of the imports """
+    new = set()
+    for d in definitions:
+        imp_or_stmt = d.get_definition()
+        if isinstance(imp_or_stmt, tree.Import):
+            s = imports.ImportWrapper(evaluator, d)
+            new |= set(s.follow(is_goto=True))
+    return set(definitions) | new
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/cache.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/cache.py
new file mode 100644
index 0000000..8dc8254
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/cache.py
@@ -0,0 +1,127 @@
+"""
+This caching is very important for speed and memory optimizations. There's
+nothing really spectacular, just some decorators. The following cache types are
+available:
+
+- module caching (`load_parser` and `save_parser`), which uses pickle and is
+  really important to assure low load times of modules like ``numpy``.
+- ``time_cache`` can be used to cache something for just a limited time span,
+  which can be useful if there's user interaction and the user cannot react
+  faster than a certain time.
+
+This module is one of the reasons why |jedi| is not thread-safe. As you can see
+there are global variables, which are holding the cache information. Some of
+these variables are being cleaned after every API usage.
+"""
+import time
+
+from jedi import settings
+from jedi.parser.utils import parser_cache
+from jedi.parser.utils import underscore_memoization
+
+_time_caches = {}
+
+
+def clear_time_caches(delete_all=False):
+    """ Jedi caches many things, that should be completed after each completion
+    finishes.
+
+    :param delete_all: Deletes also the cache that is normally not deleted,
+        like parser cache, which is important for faster parsing.
+    """
+    global _time_caches
+
+    if delete_all:
+        for cache in _time_caches.values():
+            cache.clear()
+        parser_cache.clear()
+    else:
+        # normally just kill the expired entries, not all
+        for tc in _time_caches.values():
+            # check time_cache for expired entries
+            for key, (t, value) in list(tc.items()):
+                if t < time.time():
+                    # delete expired entries
+                    del tc[key]
+
+
+def time_cache(time_add_setting):
+    """
+    This decorator works as follows: Call it with a setting and after that
+    use the function with a callable that returns the key.
+    But: This function is only called if the key is not available. After a
+    certain amount of time (`time_add_setting`) the cache is invalid.
+
+    If the given key is None, the function will not be cached.
+    """
+    def _temp(key_func):
+        dct = {}
+        _time_caches[time_add_setting] = dct
+
+        def wrapper(*args, **kwargs):
+            generator = key_func(*args, **kwargs)
+            key = next(generator)
+            try:
+                expiry, value = dct[key]
+                if expiry > time.time():
+                    return value
+            except KeyError:
+                pass
+
+            value = next(generator)
+            time_add = getattr(settings, time_add_setting)
+            if key is not None:
+                dct[key] = time.time() + time_add, value
+            return value
+        return wrapper
+    return _temp
+
+
+def memoize_method(method):
+    """A normal memoize function."""
+    def wrapper(self, *args, **kwargs):
+        dct = self.__dict__.setdefault('_memoize_method_dct', {})
+        key = (args, frozenset(kwargs.items()))
+        try:
+            return dct[key]
+        except KeyError:
+            result = method(self, *args, **kwargs)
+            dct[key] = result
+            return result
+    return wrapper
+
+
+def cache_star_import(func):
+    @time_cache("star_import_cache_validity")
+    def wrapper(self):
+        yield self.base  # The cache key
+        yield func(self)
+    return wrapper
+
+
+def _invalidate_star_import_cache_module(module, only_main=False):
+    """ Important if some new modules are being reparsed """
+    try:
+        t, modules = _time_caches['star_import_cache_validity'][module]
+    except KeyError:
+        pass
+    else:
+        del _time_caches['star_import_cache_validity'][module]
+
+        # This stuff was part of load_parser. However since we're most likely
+        # not going to use star import caching anymore, just ignore it.
+        #else:
+            # In case there is already a module cached and this module
+            # has to be reparsed, we also need to invalidate the import
+            # caches.
+        #    _invalidate_star_import_cache_module(parser_cache_item.parser.module)
+
+
+def invalidate_star_import_cache(path):
+    """On success returns True."""
+    try:
+        parser_cache_item = parser_cache[path]
+    except KeyError:
+        pass
+    else:
+        _invalidate_star_import_cache_module(parser_cache_item.parser.module)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/common.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/common.py
new file mode 100644
index 0000000..ae10f42
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/common.py
@@ -0,0 +1,169 @@
+""" A universal module with functions / classes without dependencies. """
+import sys
+import contextlib
+import functools
+import re
+from itertools import chain
+from ast import literal_eval
+
+from jedi._compatibility import unicode, reraise
+from jedi import settings
+
+
+class UncaughtAttributeError(Exception):
+    """
+    Important, because `__getattr__` and `hasattr` catch AttributeErrors
+    implicitly. This is really evil (mainly because of `__getattr__`).
+    `hasattr` in Python 2 is even more evil, because it catches ALL exceptions.
+    Therefore this class originally had to be derived from `BaseException`
+    instead of `Exception`.  But because I removed relevant `hasattr` from
+    the code base, we can now switch back to `Exception`.
+
+    :param base: return values of sys.exc_info().
+    """
+
+
+def safe_property(func):
+    return property(reraise_uncaught(func))
+
+
+def reraise_uncaught(func):
+    """
+    Re-throw uncaught `AttributeError`.
+
+    Usage:  Put ``@rethrow_uncaught`` in front of the function
+    which does **not** suppose to raise `AttributeError`.
+
+    AttributeError is easily get caught by `hasattr` and another
+    ``except AttributeError`` clause.  This becomes problem when you use
+    a lot of "dynamic" attributes (e.g., using ``@property``) because you
+    can't distinguish if the property does not exist for real or some code
+    inside of the "dynamic" attribute through that error.  In a well
+    written code, such error should not exist but getting there is very
+    difficult.  This decorator is to help us getting there by changing
+    `AttributeError` to `UncaughtAttributeError` to avoid unexpected catch.
+    This helps us noticing bugs earlier and facilitates debugging.
+
+    .. note:: Treating StopIteration here is easy.
+              Add that feature when needed.
+    """
+    @functools.wraps(func)
+    def wrapper(*args, **kwds):
+        try:
+            return func(*args, **kwds)
+        except AttributeError:
+            exc_info = sys.exc_info()
+            reraise(UncaughtAttributeError(exc_info[1]), exc_info[2])
+    return wrapper
+
+
+class PushBackIterator(object):
+    def __init__(self, iterator):
+        self.pushes = []
+        self.iterator = iterator
+        self.current = None
+
+    def push_back(self, value):
+        self.pushes.append(value)
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        """ Python 2 Compatibility """
+        return self.__next__()
+
+    def __next__(self):
+        if self.pushes:
+            self.current = self.pushes.pop()
+        else:
+            self.current = next(self.iterator)
+        return self.current
+
+
+@contextlib.contextmanager
+def scale_speed_settings(factor):
+    a = settings.max_executions
+    b = settings.max_until_execution_unique
+    settings.max_executions *= factor
+    settings.max_until_execution_unique *= factor
+    try:
+        yield
+    finally:
+        settings.max_executions = a
+        settings.max_until_execution_unique = b
+
+
+def indent_block(text, indention='    '):
+    """This function indents a text block with a default of four spaces."""
+    temp = ''
+    while text and text[-1] == '\n':
+        temp += text[-1]
+        text = text[:-1]
+    lines = text.split('\n')
+    return '\n'.join(map(lambda s: indention + s, lines)) + temp
+
+
+@contextlib.contextmanager
+def ignored(*exceptions):
+    """
+    Context manager that ignores all of the specified exceptions. This will
+    be in the standard library starting with Python 3.4.
+    """
+    try:
+        yield
+    except exceptions:
+        pass
+
+
+def source_to_unicode(source, encoding=None):
+    def detect_encoding():
+        """
+        For the implementation of encoding definitions in Python, look at:
+        - http://www.python.org/dev/peps/pep-0263/
+        - http://docs.python.org/2/reference/lexical_analysis.html#encoding-declarations
+        """
+        byte_mark = literal_eval(r"b'\xef\xbb\xbf'")
+        if source.startswith(byte_mark):
+            # UTF-8 byte-order mark
+            return 'utf-8'
+
+        first_two_lines = re.match(br'(?:[^\n]*\n){0,2}', source).group(0)
+        possible_encoding = re.search(br"coding[=:]\s*([-\w.]+)",
+                                      first_two_lines)
+        if possible_encoding:
+            return possible_encoding.group(1)
+        else:
+            # the default if nothing else has been set -> PEP 263
+            return encoding if encoding is not None else 'utf-8'
+
+    if isinstance(source, unicode):
+        # only cast str/bytes
+        return source
+
+    encoding = detect_encoding()
+    if not isinstance(encoding, unicode):
+        encoding = unicode(encoding, 'utf-8', 'replace')
+    # cast to unicode by default
+    return unicode(source, encoding, 'replace')
+
+
+def splitlines(string):
+    """
+    A splitlines for Python code. In contrast to Python's ``str.splitlines``,
+    looks at form feeds and other special characters as normal text. Just
+    splits ``\n`` and ``\r\n``.
+    Also different: Returns ``['']`` for an empty string input.
+    """
+    return re.split('\n|\r\n', string)
+
+
+def unite(iterable):
+    """Turns a two dimensional array into a one dimensional."""
+    return set(chain.from_iterable(iterable))
+
+
+def to_list(func):
+    def wrapper(*args, **kwargs):
+        return list(func(*args, **kwargs))
+    return wrapper
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/debug.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/debug.py
new file mode 100644
index 0000000..692f9c8
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/debug.py
@@ -0,0 +1,133 @@
+from jedi._compatibility import encoding, is_py3, u
+import inspect
+import os
+import time
+
+def _lazy_colorama_init():
+    """
+    Lazily init colorama if necessary, not to screw up stdout is debug not
+    enabled.
+
+    This version of the function does nothing.
+    """
+    pass
+
+_inited=False
+
+try:
+    if os.name == 'nt':
+        # Does not work on Windows, as pyreadline and colorama interfere
+        raise ImportError
+    else:
+        # Use colorama for nicer console output.
+        from colorama import Fore, init
+        from colorama import initialise
+        def _lazy_colorama_init():
+            """
+            Lazily init colorama if necessary, not to screw up stdout is
+            debug not enabled.
+
+            This version of the function does init colorama.
+            """
+            global _inited
+            if not _inited:
+                # pytest resets the stream at the end - causes troubles. Since
+                # after every output the stream is reset automatically we don't
+                # need this.
+                initialise.atexit_done = True
+                try:
+                    init()
+                except Exception:
+                    # Colorama fails with initializing under vim and is buggy in
+                    # version 0.3.6.
+                    pass
+            _inited = True
+
+except ImportError:
+    class Fore(object):
+        RED = ''
+        GREEN = ''
+        YELLOW = ''
+        MAGENTA = ''
+        RESET = ''
+
+NOTICE = object()
+WARNING = object()
+SPEED = object()
+
+enable_speed = False
+enable_warning = False
+enable_notice = False
+
+# callback, interface: level, str
+debug_function = None
+ignored_modules = ['jedi.parser']
+_debug_indent = 0
+_start_time = time.time()
+
+
+def reset_time():
+    global _start_time, _debug_indent
+    _start_time = time.time()
+    _debug_indent = 0
+
+
+def increase_indent(func):
+    """Decorator for makin """
+    def wrapper(*args, **kwargs):
+        global _debug_indent
+        _debug_indent += 1
+        try:
+            return func(*args, **kwargs)
+        finally:
+            _debug_indent -= 1
+    return wrapper
+
+
+def dbg(message, *args, **kwargs):
+    """ Looks at the stack, to see if a debug message should be printed. """
+    # Python 2 compatibility, because it doesn't understand default args
+    color = kwargs.pop('color', 'GREEN')
+    assert color
+
+    if debug_function and enable_notice:
+        frm = inspect.stack()[1]
+        mod = inspect.getmodule(frm[0])
+        if not (mod.__name__ in ignored_modules):
+            i = ' ' * _debug_indent
+            _lazy_colorama_init()
+            debug_function(color, i + 'dbg: ' + message % tuple(u(repr(a)) for a in args))
+
+
+def warning(message, *args, **kwargs):
+    format = kwargs.pop('format', True)
+    assert not kwargs
+
+    if debug_function and enable_warning:
+        i = ' ' * _debug_indent
+        if format:
+            message = message % tuple(u(repr(a)) for a in args)
+        debug_function('RED', i + 'warning: ' + message)
+
+
+def speed(name):
+    if debug_function and enable_speed:
+        now = time.time()
+        i = ' ' * _debug_indent
+        debug_function('YELLOW', i + 'speed: ' + '%s %s' % (name, now - _start_time))
+
+
+def print_to_stdout(color, str_out):
+    """
+    The default debug function that prints to standard out.
+
+    :param str color: A string that is an attribute of ``colorama.Fore``.
+    """
+    col = getattr(Fore, color)
+    _lazy_colorama_init()
+    if not is_py3:
+        str_out = str_out.encode(encoding, 'replace')
+    print(col + str_out + Fore.RESET)
+
+
+# debug_function = print_to_stdout
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/.sys_path.py.un~ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/.sys_path.py.un~
new file mode 100644
index 0000000..397417e
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/.sys_path.py.un~ differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__init__.py
new file mode 100644
index 0000000..9a6ad64
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__init__.py
@@ -0,0 +1,534 @@
+"""
+Evaluation of Python code in |jedi| is based on three assumptions:
+
+* The code uses as least side effects as possible. Jedi understands certain
+  list/tuple/set modifications, but there's no guarantee that Jedi detects
+  everything (list.append in different modules for example).
+* No magic is being used:
+
+  - metaclasses
+  - ``setattr()`` / ``__import__()``
+  - writing to ``globals()``, ``locals()``, ``object.__dict__``
+* The programmer is not a total dick, e.g. like `this
+  <https://github.com/davidhalter/jedi/issues/24>`_ :-)
+
+The actual algorithm is based on a principle called lazy evaluation. If you
+don't know about it, google it.  That said, the typical entry point for static
+analysis is calling ``eval_statement``. There's separate logic for
+autocompletion in the API, the evaluator is all about evaluating an expression.
+
+Now you need to understand what follows after ``eval_statement``. Let's
+make an example::
+
+    import datetime
+    datetime.date.toda# <-- cursor here
+
+First of all, this module doesn't care about completion. It really just cares
+about ``datetime.date``. At the end of the procedure ``eval_statement`` will
+return the ``date`` class.
+
+To *visualize* this (simplified):
+
+- ``Evaluator.eval_statement`` doesn't do much, because there's no assignment.
+- ``Evaluator.eval_element`` cares for resolving the dotted path
+- ``Evaluator.find_types`` searches for global definitions of datetime, which
+  it finds in the definition of an import, by scanning the syntax tree.
+- Using the import logic, the datetime module is found.
+- Now ``find_types`` is called again by ``eval_element`` to find ``date``
+  inside the datetime module.
+
+Now what would happen if we wanted ``datetime.date.foo.bar``? Two more
+calls to ``find_types``. However the second call would be ignored, because the
+first one would return nothing (there's no foo attribute in ``date``).
+
+What if the import would contain another ``ExprStmt`` like this::
+
+    from foo import bar
+    Date = bar.baz
+
+Well... You get it. Just another ``eval_statement`` recursion. It's really
+easy. Python can obviously get way more complicated then this. To understand
+tuple assignments, list comprehensions and everything else, a lot more code had
+to be written.
+
+Jedi has been tested very well, so you can just start modifying code. It's best
+to write your own test first for your "new" feature. Don't be scared of
+breaking stuff. As long as the tests pass, you're most likely to be fine.
+
+I need to mention now that lazy evaluation is really good because it
+only *evaluates* what needs to be *evaluated*. All the statements and modules
+that are not used are just being ignored.
+"""
+
+import copy
+import sys
+from itertools import chain
+
+from jedi.parser import tree
+from jedi import debug
+from jedi.evaluate import representation as er
+from jedi.evaluate import imports
+from jedi.evaluate import recursion
+from jedi.evaluate import iterable
+from jedi.evaluate.cache import memoize_default
+from jedi.evaluate import stdlib
+from jedi.evaluate import finder
+from jedi.evaluate import compiled
+from jedi.evaluate import precedence
+from jedi.evaluate import param
+from jedi.evaluate import helpers
+
+
+class Evaluator(object):
+    def __init__(self, grammar, sys_path=None):
+        self.grammar = grammar
+        self.memoize_cache = {}  # for memoize decorators
+        # To memorize modules -> equals `sys.modules`.
+        self.modules = {}  # like `sys.modules`.
+        self.compiled_cache = {}  # see `evaluate.compiled.create()`
+        self.mixed_cache = {}  # see `evaluate.compiled.mixed.create()`
+        self.analysis = []
+        self.predefined_if_name_dict_dict = {}
+        self.dynamic_params_depth = 0
+        self.is_analysis = False
+
+        if sys_path is None:
+            sys_path = sys.path
+        self.sys_path = copy.copy(sys_path)
+        try:
+            self.sys_path.remove('')
+        except ValueError:
+            pass
+
+        self.reset_recursion_limitations()
+
+        # Constants
+        self.BUILTINS = compiled.get_special_object(self, 'BUILTINS')
+
+    def reset_recursion_limitations(self):
+        self.recursion_detector = recursion.RecursionDetector(self)
+        self.execution_recursion_detector = recursion.ExecutionRecursionDetector(self)
+
+    def wrap(self, element):
+        if isinstance(element, (er.Wrapper, er.InstanceElement,
+            er.ModuleWrapper, er.FunctionExecution, er.Instance, compiled.CompiledObject)) or element is None:
+            # TODO this is so ugly, please refactor.
+            return element
+
+        if element.type == 'classdef':
+            return er.Class(self, element)
+        elif element.type == 'funcdef':
+            return er.Function(self, element)
+        elif element.type == 'lambda':
+            return er.LambdaWrapper(self, element)
+        elif element.type == 'file_input':
+            return er.ModuleWrapper(self, element)
+        else:
+            return element
+
+    def find_types(self, scope, name_str, position=None, search_global=False,
+                   is_goto=False):
+        """
+        This is the search function. The most important part to debug.
+        `remove_statements` and `filter_statements` really are the core part of
+        this completion.
+
+        :param position: Position of the last statement -> tuple of line, column
+        :return: List of Names. Their parents are the types.
+        """
+        f = finder.NameFinder(self, scope, name_str, position)
+        scopes = f.scopes(search_global)
+        if is_goto:
+            return f.filter_name(scopes)
+        return f.find(scopes, attribute_lookup=not search_global)
+
+    #@memoize_default(default=[], evaluator_is_first_arg=True)
+    #@recursion.recursion_decorator
+    @debug.increase_indent
+    def eval_statement(self, stmt, seek_name=None):
+        """
+        The starting point of the completion. A statement always owns a call
+        list, which are the calls, that a statement does. In case multiple
+        names are defined in the statement, `seek_name` returns the result for
+        this name.
+
+        :param stmt: A `tree.ExprStmt`.
+        """
+        debug.dbg('eval_statement %s (%s)', stmt, seek_name)
+        rhs = stmt.get_rhs()
+        types = self.eval_element(rhs)
+
+        if seek_name:
+            types = finder.check_tuple_assignments(self, types, seek_name)
+
+        first_operation = stmt.first_operation()
+        if first_operation not in ('=', None) and not isinstance(stmt, er.InstanceElement):  # TODO don't check for this.
+            # `=` is always the last character in aug assignments -> -1
+            operator = copy.copy(first_operation)
+            operator.value = operator.value[:-1]
+            name = str(stmt.get_defined_names()[0])
+            parent = self.wrap(stmt.get_parent_scope())
+            left = self.find_types(parent, name, stmt.start_pos, search_global=True)
+
+            for_stmt = stmt.get_parent_until(tree.ForStmt)
+            if isinstance(for_stmt, tree.ForStmt) and types \
+                    and for_stmt.defines_one_name():
+                # Iterate through result and add the values, that's possible
+                # only in for loops without clutter, because they are
+                # predictable. Also only do it, if the variable is not a tuple.
+                node = for_stmt.get_input_node()
+                for_iterables = self.eval_element(node)
+                ordered = list(iterable.py__iter__(self, for_iterables, node))
+
+                for index_types in ordered:
+                    dct = {str(for_stmt.children[1]): index_types}
+                    self.predefined_if_name_dict_dict[for_stmt] = dct
+                    t = self.eval_element(rhs)
+                    left = precedence.calculate(self, left, operator, t)
+                types = left
+                if ordered:
+                    # If there are no for entries, we cannot iterate and the
+                    # types are defined by += entries. Therefore the for loop
+                    # is never called.
+                    del self.predefined_if_name_dict_dict[for_stmt]
+            else:
+                types = precedence.calculate(self, left, operator, types)
+        debug.dbg('eval_statement result %s', types)
+        return types
+
+    def eval_element(self, element):
+        if isinstance(element, iterable.AlreadyEvaluated):
+            return set(element)
+        elif isinstance(element, iterable.MergedNodes):
+            return iterable.unite(self.eval_element(e) for e in element)
+
+        if_stmt = element.get_parent_until((tree.IfStmt, tree.ForStmt, tree.IsScope))
+        predefined_if_name_dict = self.predefined_if_name_dict_dict.get(if_stmt)
+        if predefined_if_name_dict is None and isinstance(if_stmt, tree.IfStmt):
+            if_stmt_test = if_stmt.children[1]
+            name_dicts = [{}]
+            # If we already did a check, we don't want to do it again -> If
+            # predefined_if_name_dict_dict is filled, we stop.
+            # We don't want to check the if stmt itself, it's just about
+            # the content.
+            if element.start_pos > if_stmt_test.end_pos:
+                # Now we need to check if the names in the if_stmt match the
+                # names in the suite.
+                if_names = helpers.get_names_of_node(if_stmt_test)
+                element_names = helpers.get_names_of_node(element)
+                str_element_names = [str(e) for e in element_names]
+                if any(str(i) in str_element_names for i in if_names):
+                    for if_name in if_names:
+                        definitions = self.goto_definitions(if_name)
+                        # Every name that has multiple different definitions
+                        # causes the complexity to rise. The complexity should
+                        # never fall below 1.
+                        if len(definitions) > 1:
+                            if len(name_dicts) * len(definitions) > 16:
+                                debug.dbg('Too many options for if branch evaluation %s.', if_stmt)
+                                # There's only a certain amount of branches
+                                # Jedi can evaluate, otherwise it will take to
+                                # long.
+                                name_dicts = [{}]
+                                break
+
+                            original_name_dicts = list(name_dicts)
+                            name_dicts = []
+                            for definition in definitions:
+                                new_name_dicts = list(original_name_dicts)
+                                for i, name_dict in enumerate(new_name_dicts):
+                                    new_name_dicts[i] = name_dict.copy()
+                                    new_name_dicts[i][str(if_name)] = [definition]
+
+                                name_dicts += new_name_dicts
+                        else:
+                            for name_dict in name_dicts:
+                                name_dict[str(if_name)] = definitions
+            if len(name_dicts) > 1:
+                result = set()
+                for name_dict in name_dicts:
+                    self.predefined_if_name_dict_dict[if_stmt] = name_dict
+                    try:
+                        result |= self._eval_element_not_cached(element)
+                    finally:
+                        del self.predefined_if_name_dict_dict[if_stmt]
+                return result
+            else:
+                return self._eval_element_if_evaluated(element)
+                return self._eval_element_cached(element)
+        else:
+            if predefined_if_name_dict:
+                return self._eval_element_not_cached(element)
+            else:
+                return self._eval_element_if_evaluated(element)
+                return self._eval_element_cached(element)
+
+    def _eval_element_if_evaluated(self, element):
+        """
+        TODO This function is temporary: Merge with eval_element.
+        """
+        parent = element
+        while parent is not None:
+            parent = parent.parent
+            predefined_if_name_dict = self.predefined_if_name_dict_dict.get(parent)
+            if predefined_if_name_dict is not None:
+                return self._eval_element_not_cached(element)
+        return self._eval_element_cached(element)
+
+    @memoize_default(default=set(), evaluator_is_first_arg=True)
+    def _eval_element_cached(self, element):
+        return self._eval_element_not_cached(element)
+
+    @debug.increase_indent
+    def _eval_element_not_cached(self, element):
+        debug.dbg('eval_element %s@%s', element, element.start_pos)
+        types = set()
+        if isinstance(element, (tree.Name, tree.Literal)) or tree.is_node(element, 'atom'):
+            types = self._eval_atom(element)
+        elif isinstance(element, tree.Keyword):
+            # For False/True/None
+            if element.value in ('False', 'True', 'None'):
+                types.add(compiled.builtin_from_name(self, element.value))
+            # else: print e.g. could be evaluated like this in Python 2.7
+        elif element.isinstance(tree.Lambda):
+            types = set([er.LambdaWrapper(self, element)])
+        elif element.isinstance(er.LambdaWrapper):
+            types = set([element])  # TODO this is no real evaluation.
+        elif element.type == 'expr_stmt':
+            types = self.eval_statement(element)
+        elif element.type in ('power', 'atom_expr'):
+            types = self._eval_atom(element.children[0])
+            for trailer in element.children[1:]:
+                if trailer == '**':  # has a power operation.
+                    right = self.eval_element(element.children[2])
+                    types = set(precedence.calculate(self, types, trailer, right))
+                    break
+                types = self.eval_trailer(types, trailer)
+        elif element.type in ('testlist_star_expr', 'testlist',):
+            # The implicit tuple in statements.
+            types = set([iterable.ImplicitTuple(self, element)])
+        elif element.type in ('not_test', 'factor'):
+            types = self.eval_element(element.children[-1])
+            for operator in element.children[:-1]:
+                types = set(precedence.factor_calculate(self, types, operator))
+        elif element.type == 'test':
+            # `x if foo else y` case.
+            types = (self.eval_element(element.children[0]) |
+                     self.eval_element(element.children[-1]))
+        elif element.type == 'operator':
+            # Must be an ellipsis, other operators are not evaluated.
+            assert element.value == '...'
+            types = set([compiled.create(self, Ellipsis)])
+        elif element.type == 'dotted_name':
+            types = self._eval_atom(element.children[0])
+            for next_name in element.children[2::2]:
+                types = set(chain.from_iterable(self.find_types(typ, next_name)
+                                                for typ in types))
+            types = types
+        elif element.type == 'eval_input':
+            types = self._eval_element_not_cached(element.children[0])
+        else:
+            types = precedence.calculate_children(self, element.children)
+        debug.dbg('eval_element result %s', types)
+        return types
+
+    def _eval_atom(self, atom):
+        """
+        Basically to process ``atom`` nodes. The parser sometimes doesn't
+        generate the node (because it has just one child). In that case an atom
+        might be a name or a literal as well.
+        """
+        if isinstance(atom, tree.Name):
+            # This is the first global lookup.
+            stmt = atom.get_definition()
+            scope = stmt.get_parent_until(tree.IsScope, include_current=True)
+            if isinstance(scope, (tree.Function, er.FunctionExecution)):
+                # Adjust scope: If the name is not in the suite, it's a param
+                # default or annotation and will be resolved as part of the
+                # parent scope.
+                colon = scope.children.index(':')
+                if atom.start_pos < scope.children[colon + 1].start_pos:
+                    scope = scope.get_parent_scope()
+            if isinstance(stmt, tree.CompFor):
+                stmt = stmt.get_parent_until((tree.ClassOrFunc, tree.ExprStmt))
+            if stmt.type != 'expr_stmt':
+                # We only need to adjust the start_pos for statements, because
+                # there the name cannot be used.
+                stmt = atom
+            return self.find_types(scope, atom, stmt.start_pos, search_global=True)
+        elif isinstance(atom, tree.Literal):
+            return set([compiled.create(self, atom.eval())])
+        else:
+            c = atom.children
+            if c[0].type == 'string':
+                # Will be one string.
+                types = self._eval_atom(c[0])
+                for string in c[1:]:
+                    right = self._eval_atom(string)
+                    types = precedence.calculate(self, types, '+', right)
+                return types
+            # Parentheses without commas are not tuples.
+            elif c[0] == '(' and not len(c) == 2 \
+                    and not(tree.is_node(c[1], 'testlist_comp')
+                            and len(c[1].children) > 1):
+                return self.eval_element(c[1])
+
+            try:
+                comp_for = c[1].children[1]
+            except (IndexError, AttributeError):
+                pass
+            else:
+                if comp_for == ':':
+                    # Dict comprehensions have a colon at the 3rd index.
+                    try:
+                        comp_for = c[1].children[3]
+                    except IndexError:
+                        pass
+
+                if comp_for.type == 'comp_for':
+                    return set([iterable.Comprehension.from_atom(self, atom)])
+            return set([iterable.Array(self, atom)])
+
+    def eval_trailer(self, types, trailer):
+        trailer_op, node = trailer.children[:2]
+        if node == ')':  # `arglist` is optional.
+            node = ()
+
+        new_types = set()
+        if trailer_op == '[':
+            new_types |= iterable.py__getitem__(self, types, trailer)
+        else:
+            for typ in types:
+                debug.dbg('eval_trailer: %s in scope %s', trailer, typ)
+                if trailer_op == '.':
+                    new_types |= self.find_types(typ, node)
+                elif trailer_op == '(':
+                    new_types |= self.execute(typ, node, trailer)
+        return new_types
+
+    def execute_evaluated(self, obj, *args):
+        """
+        Execute a function with already executed arguments.
+        """
+        args = [iterable.AlreadyEvaluated([arg]) for arg in args]
+        return self.execute(obj, args)
+
+    @debug.increase_indent
+    def execute(self, obj, arguments=(), trailer=None):
+        if not isinstance(arguments, param.Arguments):
+            arguments = param.Arguments(self, arguments, trailer)
+
+        if self.is_analysis:
+            arguments.eval_all()
+
+        if obj.isinstance(er.Function):
+            obj = obj.get_decorated_func()
+
+        debug.dbg('execute: %s %s', obj, arguments)
+        try:
+            # Some stdlib functions like super(), namedtuple(), etc. have been
+            # hard-coded in Jedi to support them.
+            return stdlib.execute(self, obj, arguments)
+        except stdlib.NotInStdLib:
+            pass
+
+        try:
+            func = obj.py__call__
+        except AttributeError:
+            debug.warning("no execution possible %s", obj)
+            return set()
+        else:
+            types = func(arguments)
+            debug.dbg('execute result: %s in %s', types, obj)
+            return types
+
+    def goto_definitions(self, name):
+        def_ = name.get_definition()
+        is_simple_name = name.parent.type not in ('power', 'trailer')
+        if is_simple_name:
+            if name.parent.type == 'classdef' and name.parent.name == name:
+                return [self.wrap(name.parent)]
+            if name.parent.type in ('file_input', 'funcdef'):
+                return [self.wrap(name.parent)]
+            if def_.type == 'expr_stmt' and name in def_.get_defined_names():
+                return self.eval_statement(def_, name)
+            elif def_.type == 'for_stmt':
+                container_types = self.eval_element(def_.children[3])
+                for_types = iterable.py__iter__types(self, container_types, def_.children[3])
+                return finder.check_tuple_assignments(self, for_types, name)
+            elif def_.type in ('import_from', 'import_name'):
+                return imports.ImportWrapper(self, name).follow()
+
+        call = helpers.call_of_leaf(name)
+        return self.eval_element(call)
+
+    def goto(self, name):
+        def resolve_implicit_imports(names):
+            for name in names:
+                if isinstance(name.parent, helpers.FakeImport):
+                    # Those are implicit imports.
+                    s = imports.ImportWrapper(self, name)
+                    for n in s.follow(is_goto=True):
+                        yield n
+                else:
+                    yield name
+
+        stmt = name.get_definition()
+        par = name.parent
+        if par.type == 'argument' and par.children[1] == '=' and par.children[0] == name:
+            # Named param goto.
+            trailer = par.parent
+            if trailer.type == 'arglist':
+                trailer = trailer.parent
+            if trailer.type != 'classdef':
+                if trailer.type == 'decorator':
+                    types = self.eval_element(trailer.children[1])
+                else:
+                    i = trailer.parent.children.index(trailer)
+                    to_evaluate = trailer.parent.children[:i]
+                    types = self.eval_element(to_evaluate[0])
+                    for trailer in to_evaluate[1:]:
+                        types = self.eval_trailer(types, trailer)
+                param_names = []
+                for typ in types:
+                    try:
+                        params = typ.params
+                    except AttributeError:
+                        pass
+                    else:
+                        param_names += [param.name for param in params
+                                        if param.name.value == name.value]
+                return param_names
+        elif isinstance(par, tree.ExprStmt) and name in par.get_defined_names():
+            # Only take the parent, because if it's more complicated than just
+            # a name it's something you can "goto" again.
+            return [name]
+        elif isinstance(par, (tree.Param, tree.Function, tree.Class)) and par.name is name:
+            return [name]
+        elif isinstance(stmt, tree.Import):
+            modules = imports.ImportWrapper(self, name).follow(is_goto=True)
+            return list(resolve_implicit_imports(modules))
+        elif par.type == 'dotted_name':  # Is a decorator.
+            index = par.children.index(name)
+            if index > 0:
+                new_dotted = helpers.deep_ast_copy(par)
+                new_dotted.children[index - 1:] = []
+                types = self.eval_element(new_dotted)
+                return resolve_implicit_imports(iterable.unite(
+                    self.find_types(typ, name, is_goto=True) for typ in types
+                ))
+
+        scope = name.get_parent_scope()
+        if tree.is_node(par, 'trailer') and par.children[0] == '.':
+            call = helpers.call_of_leaf(name, cut_own_trailer=True)
+            types = self.eval_element(call)
+            return resolve_implicit_imports(iterable.unite(
+                self.find_types(typ, name, is_goto=True) for typ in types
+            ))
+        else:
+            if stmt.type != 'expr_stmt':
+                # We only need to adjust the start_pos for statements, because
+                # there the name cannot be used.
+                stmt = name
+            return self.find_types(scope, name, stmt.start_pos,
+                                   search_global=True, is_goto=True)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..71527fe
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/analysis.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/analysis.cpython-35.pyc
new file mode 100644
index 0000000..accd8dd
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/analysis.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/cache.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/cache.cpython-35.pyc
new file mode 100644
index 0000000..e4f1aec
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/cache.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/docstrings.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/docstrings.cpython-35.pyc
new file mode 100644
index 0000000..04df343
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/docstrings.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/dynamic.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/dynamic.cpython-35.pyc
new file mode 100644
index 0000000..7028f2d
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/dynamic.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/finder.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/finder.cpython-35.pyc
new file mode 100644
index 0000000..00b939c
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/finder.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/flow_analysis.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/flow_analysis.cpython-35.pyc
new file mode 100644
index 0000000..1988e03
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/flow_analysis.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/helpers.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/helpers.cpython-35.pyc
new file mode 100644
index 0000000..10971fc
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/helpers.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/imports.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/imports.cpython-35.pyc
new file mode 100644
index 0000000..a7dd086
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/imports.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/iterable.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/iterable.cpython-35.pyc
new file mode 100644
index 0000000..a803249
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/iterable.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/param.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/param.cpython-35.pyc
new file mode 100644
index 0000000..032eeed
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/param.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/pep0484.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/pep0484.cpython-35.pyc
new file mode 100644
index 0000000..e87c5d1
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/pep0484.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/precedence.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/precedence.cpython-35.pyc
new file mode 100644
index 0000000..477fae2
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/precedence.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/recursion.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/recursion.cpython-35.pyc
new file mode 100644
index 0000000..262d192
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/recursion.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/representation.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/representation.cpython-35.pyc
new file mode 100644
index 0000000..290f6a4
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/representation.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/site.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/site.cpython-35.pyc
new file mode 100644
index 0000000..7fbf42e
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/site.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/stdlib.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/stdlib.cpython-35.pyc
new file mode 100644
index 0000000..6283ff9
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/stdlib.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/sys_path.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/sys_path.cpython-35.pyc
new file mode 100644
index 0000000..9f2213d
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/__pycache__/sys_path.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/analysis.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/analysis.py
new file mode 100644
index 0000000..407bc7d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/analysis.py
@@ -0,0 +1,216 @@
+"""
+Module for statical analysis.
+"""
+from jedi import debug
+from jedi.parser import tree
+from jedi.evaluate.compiled import CompiledObject
+
+from jedi.common import unite
+
+
+CODES = {
+    'attribute-error': (1, AttributeError, 'Potential AttributeError.'),
+    'name-error': (2, NameError, 'Potential NameError.'),
+    'import-error': (3, ImportError, 'Potential ImportError.'),
+    'type-error-too-many-arguments': (4, TypeError, None),
+    'type-error-too-few-arguments': (5, TypeError, None),
+    'type-error-keyword-argument': (6, TypeError, None),
+    'type-error-multiple-values': (7, TypeError, None),
+    'type-error-star-star': (8, TypeError, None),
+    'type-error-star': (9, TypeError, None),
+    'type-error-operation': (10, TypeError, None),
+    'type-error-not-iterable': (11, TypeError, None),
+    'type-error-isinstance': (12, TypeError, None),
+    'type-error-not-subscriptable': (13, TypeError, None),
+    'value-error-too-many-values': (14, ValueError, None),
+    'value-error-too-few-values': (15, ValueError, None),
+}
+
+
+class Error(object):
+    def __init__(self, name, module_path, start_pos, message=None):
+        self.path = module_path
+        self._start_pos = start_pos
+        self.name = name
+        if message is None:
+            message = CODES[self.name][2]
+        self.message = message
+
+    @property
+    def line(self):
+        return self._start_pos[0]
+
+    @property
+    def column(self):
+        return self._start_pos[1]
+
+    @property
+    def code(self):
+        # The class name start
+        first = self.__class__.__name__[0]
+        return first + str(CODES[self.name][0])
+
+    def __unicode__(self):
+        return '%s:%s:%s: %s %s' % (self.path, self.line, self.column,
+                                    self.code, self.message)
+
+    def __str__(self):
+        return self.__unicode__()
+
+    def __eq__(self, other):
+        return (self.path == other.path and self.name == other.name
+                and self._start_pos == other._start_pos)
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    def __hash__(self):
+        return hash((self.path, self._start_pos, self.name))
+
+    def __repr__(self):
+        return '<%s %s: %s@%s,%s>' % (self.__class__.__name__,
+                                      self.name, self.path,
+                                      self._start_pos[0], self._start_pos[1])
+
+
+class Warning(Error):
+    pass
+
+
+def add(evaluator, name, jedi_obj, message=None, typ=Error, payload=None):
+    from jedi.evaluate.iterable import MergedNodes
+    while isinstance(jedi_obj, MergedNodes):
+        if len(jedi_obj) != 1:
+            # TODO is this kosher?
+            return
+        jedi_obj = list(jedi_obj)[0]
+
+    exception = CODES[name][1]
+    if _check_for_exception_catch(evaluator, jedi_obj, exception, payload):
+        return
+
+    module_path = jedi_obj.get_parent_until().path
+    instance = typ(name, module_path, jedi_obj.start_pos, message)
+    debug.warning(str(instance), format=False)
+    evaluator.analysis.append(instance)
+
+
+def _check_for_setattr(instance):
+    """
+    Check if there's any setattr method inside an instance. If so, return True.
+    """
+    module = instance.get_parent_until()
+    try:
+        stmts = module.used_names['setattr']
+    except KeyError:
+        return False
+
+    return any(instance.start_pos < stmt.start_pos < instance.end_pos
+               for stmt in stmts)
+
+
+def add_attribute_error(evaluator, scope, name):
+    message = ('AttributeError: %s has no attribute %s.' % (scope, name))
+    from jedi.evaluate.representation import Instance
+    # Check for __getattr__/__getattribute__ existance and issue a warning
+    # instead of an error, if that happens.
+    if isinstance(scope, Instance):
+        typ = Warning
+        try:
+            scope.get_subscope_by_name('__getattr__')
+        except KeyError:
+            try:
+                scope.get_subscope_by_name('__getattribute__')
+            except KeyError:
+                if not _check_for_setattr(scope):
+                    typ = Error
+    else:
+        typ = Error
+
+    payload = scope, name
+    add(evaluator, 'attribute-error', name, message, typ, payload)
+
+
+def _check_for_exception_catch(evaluator, jedi_obj, exception, payload=None):
+    """
+    Checks if a jedi object (e.g. `Statement`) sits inside a try/catch and
+    doesn't count as an error (if equal to `exception`).
+    Also checks `hasattr` for AttributeErrors and uses the `payload` to compare
+    it.
+    Returns True if the exception was catched.
+    """
+    def check_match(cls, exception):
+        try:
+            return isinstance(cls, CompiledObject) and issubclass(exception, cls.obj)
+        except TypeError:
+            return False
+
+    def check_try_for_except(obj, exception):
+        # Only nodes in try
+        iterator = iter(obj.children)
+        for branch_type in iterator:
+            colon = next(iterator)
+            suite = next(iterator)
+            if branch_type == 'try' \
+                    and not (branch_type.start_pos < jedi_obj.start_pos <= suite.end_pos):
+                return False
+
+        for node in obj.except_clauses():
+            if node is None:
+                return True  # An exception block that catches everything.
+            else:
+                except_classes = evaluator.eval_element(node)
+                for cls in except_classes:
+                    from jedi.evaluate import iterable
+                    if isinstance(cls, iterable.Array) and cls.type == 'tuple':
+                        # multiple exceptions
+                        for typ in unite(cls.py__iter__()):
+                            if check_match(typ, exception):
+                                return True
+                    else:
+                        if check_match(cls, exception):
+                            return True
+
+    def check_hasattr(node, suite):
+        try:
+            assert suite.start_pos <= jedi_obj.start_pos < suite.end_pos
+            assert node.type in ('power', 'atom_expr')
+            base = node.children[0]
+            assert base.type == 'name' and base.value == 'hasattr'
+            trailer = node.children[1]
+            assert trailer.type == 'trailer'
+            arglist = trailer.children[1]
+            assert arglist.type == 'arglist'
+            from jedi.evaluate.param import Arguments
+            args = list(Arguments(evaluator, arglist).unpack())
+            # Arguments should be very simple
+            assert len(args) == 2
+
+            # Check name
+            key, values = args[1]
+            assert len(values) == 1
+            names = list(evaluator.eval_element(values[0]))
+            assert len(names) == 1 and isinstance(names[0], CompiledObject)
+            assert names[0].obj == str(payload[1])
+
+            # Check objects
+            key, values = args[0]
+            assert len(values) == 1
+            objects = evaluator.eval_element(values[0])
+            return payload[0] in objects
+        except AssertionError:
+            return False
+
+    obj = jedi_obj
+    while obj is not None and not obj.isinstance(tree.Function, tree.Class):
+        if obj.isinstance(tree.Flow):
+            # try/except catch check
+            if obj.isinstance(tree.TryStmt) and check_try_for_except(obj, exception):
+                return True
+            # hasattr check
+            if exception == AttributeError and obj.isinstance(tree.IfStmt, tree.WhileStmt):
+                if check_hasattr(obj.children[1], obj.children[3]):
+                    return True
+        obj = obj.parent
+
+    return False
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/cache.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/cache.py
new file mode 100644
index 0000000..b44f812
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/cache.py
@@ -0,0 +1,58 @@
+"""
+- the popular ``memoize_default`` works like a typical memoize and returns the
+  default otherwise.
+- ``CachedMetaClass`` uses ``memoize_default`` to do the same with classes.
+"""
+
+import inspect
+
+NO_DEFAULT = object()
+
+
+def memoize_default(default=NO_DEFAULT, evaluator_is_first_arg=False, second_arg_is_evaluator=False):
+    """ This is a typical memoization decorator, BUT there is one difference:
+    To prevent recursion it sets defaults.
+
+    Preventing recursion is in this case the much bigger use than speed. I
+    don't think, that there is a big speed difference, but there are many cases
+    where recursion could happen (think about a = b; b = a).
+    """
+    def func(function):
+        def wrapper(obj, *args, **kwargs):
+            if evaluator_is_first_arg:
+                cache = obj.memoize_cache
+            elif second_arg_is_evaluator:  # needed for meta classes
+                cache = args[0].memoize_cache
+            else:
+                cache = obj._evaluator.memoize_cache
+
+            try:
+                memo = cache[function]
+            except KeyError:
+                memo = {}
+                cache[function] = memo
+
+            key = (obj, args, frozenset(kwargs.items()))
+            if key in memo:
+                return memo[key]
+            else:
+                if default is not NO_DEFAULT:
+                    memo[key] = default
+                rv = function(obj, *args, **kwargs)
+                if inspect.isgenerator(rv):
+                    rv = list(rv)
+                memo[key] = rv
+                return rv
+        return wrapper
+    return func
+
+
+class CachedMetaClass(type):
+    """
+    This is basically almost the same than the decorator above, it just caches
+    class initializations. Either you do it this way or with decorators, but
+    with decorators you lose class access (isinstance, etc).
+    """
+    @memoize_default(None, second_arg_is_evaluator=True)
+    def __call__(self, *args, **kwargs):
+        return super(CachedMetaClass, self).__call__(*args, **kwargs)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/__init__.py
new file mode 100644
index 0000000..f004a14
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/__init__.py
@@ -0,0 +1,544 @@
+"""
+Imitate the parser representation.
+"""
+import inspect
+import re
+import sys
+import os
+from functools import partial
+
+from jedi._compatibility import builtins as _builtins, unicode
+from jedi import debug
+from jedi.cache import underscore_memoization, memoize_method
+from jedi.parser.tree import Param, Base, Operator, zero_position_modifier
+from jedi.evaluate.helpers import FakeName
+from . import fake
+
+
+_sep = os.path.sep
+if os.path.altsep is not None:
+    _sep += os.path.altsep
+_path_re = re.compile('(?:\.[^{0}]+|[{0}]__init__\.py)$'.format(re.escape(_sep)))
+del _sep
+
+
+class CheckAttribute(object):
+    """Raises an AttributeError if the attribute X isn't available."""
+    def __init__(self, func):
+        self.func = func
+        # Remove the py in front of e.g. py__call__.
+        self.check_name = func.__name__[2:]
+
+    def __get__(self, instance, owner):
+        # This might raise an AttributeError. That's wanted.
+        getattr(instance.obj, self.check_name)
+        return partial(self.func, instance)
+
+
+class CompiledObject(Base):
+    # comply with the parser
+    start_pos = 0, 0
+    path = None  # modules have this attribute - set it to None.
+    used_names = {}  # To be consistent with modules.
+
+    def __init__(self, evaluator, obj, parent=None):
+        self._evaluator = evaluator
+        self.obj = obj
+        self.parent = parent
+
+    @CheckAttribute
+    def py__call__(self, params):
+        if inspect.isclass(self.obj):
+            from jedi.evaluate.representation import Instance
+            return set([Instance(self._evaluator, self, params)])
+        else:
+            return set(self._execute_function(params))
+
+    @CheckAttribute
+    def py__class__(self):
+        return create(self._evaluator, self.obj.__class__)
+
+    @CheckAttribute
+    def py__mro__(self):
+        return tuple(create(self._evaluator, cls) for cls in self.obj.__mro__)
+
+    @CheckAttribute
+    def py__bases__(self):
+        return tuple(create(self._evaluator, cls) for cls in self.obj.__bases__)
+
+    def py__bool__(self):
+        return bool(self.obj)
+
+    def py__file__(self):
+        return self.obj.__file__
+
+    def is_class(self):
+        return inspect.isclass(self.obj)
+
+    @property
+    def doc(self):
+        return inspect.getdoc(self.obj) or ''
+
+    @property
+    def params(self):
+        params_str, ret = self._parse_function_doc()
+        tokens = params_str.split(',')
+        if inspect.ismethoddescriptor(self.obj):
+            tokens.insert(0, 'self')
+        params = []
+        for p in tokens:
+            parts = [FakeName(part) for part in p.strip().split('=')]
+            if len(parts) > 1:
+                parts.insert(1, Operator(zero_position_modifier, '=', (0, 0)))
+            params.append(Param(parts, self))
+        return params
+
+    def __repr__(self):
+        return '<%s: %s>' % (type(self).__name__, repr(self.obj))
+
+    @underscore_memoization
+    def _parse_function_doc(self):
+        if self.doc is None:
+            return '', ''
+
+        return _parse_function_doc(self.doc)
+
+    def api_type(self):
+        obj = self.obj
+        if inspect.isclass(obj):
+            return 'class'
+        elif inspect.ismodule(obj):
+            return 'module'
+        elif inspect.isbuiltin(obj) or inspect.ismethod(obj) \
+                or inspect.ismethoddescriptor(obj) or inspect.isfunction(obj):
+            return 'function'
+        # Everything else...
+        return 'instance'
+
+    @property
+    def type(self):
+        """Imitate the tree.Node.type values."""
+        cls = self._get_class()
+        if inspect.isclass(cls):
+            return 'classdef'
+        elif inspect.ismodule(cls):
+            return 'file_input'
+        elif inspect.isbuiltin(cls) or inspect.ismethod(cls) or \
+                inspect.ismethoddescriptor(cls):
+            return 'funcdef'
+
+    @underscore_memoization
+    def _cls(self):
+        """
+        We used to limit the lookups for instantiated objects like list(), but
+        this is not the case anymore. Python itself
+        """
+        # Ensures that a CompiledObject is returned that is not an instance (like list)
+        return self
+
+    def _get_class(self):
+        if not fake.is_class_instance(self.obj) or \
+                inspect.ismethoddescriptor(self.obj):  # slots
+            return self.obj
+
+        try:
+            return self.obj.__class__
+        except AttributeError:
+            # happens with numpy.core.umath._UFUNC_API (you get it
+            # automatically by doing `import numpy`.
+            return type
+
+    @property
+    def names_dict(self):
+        # For compatibility with `representation.Class`.
+        return self.names_dicts(False)[0]
+
+    def names_dicts(self, search_global, is_instance=False):
+        return self._names_dict_ensure_one_dict(is_instance)
+
+    @memoize_method
+    def _names_dict_ensure_one_dict(self, is_instance):
+        """
+        search_global shouldn't change the fact that there's one dict, this way
+        there's only one `object`.
+        """
+        return [LazyNamesDict(self._evaluator, self, is_instance)]
+
+    def get_subscope_by_name(self, name):
+        if name in dir(self.obj):
+            return CompiledName(self._evaluator, self, name).parent
+        else:
+            raise KeyError("CompiledObject doesn't have an attribute '%s'." % name)
+
+    @CheckAttribute
+    def py__getitem__(self, index):
+        if type(self.obj) not in (str, list, tuple, unicode, bytes, bytearray, dict):
+            # Get rid of side effects, we won't call custom `__getitem__`s.
+            return set()
+
+        return set([create(self._evaluator, self.obj[index])])
+
+    @CheckAttribute
+    def py__iter__(self):
+        if type(self.obj) not in (str, list, tuple, unicode, bytes, bytearray, dict):
+            # Get rid of side effects, we won't call custom `__getitem__`s.
+            return
+
+        for part in self.obj:
+            yield set([create(self._evaluator, part)])
+
+    @property
+    def name(self):
+        try:
+            name = self._get_class().__name__
+        except AttributeError:
+            name = repr(self.obj)
+        return FakeName(name, self)
+
+    def _execute_function(self, params):
+        if self.type != 'funcdef':
+            return
+
+        for name in self._parse_function_doc()[1].split():
+            try:
+                bltn_obj = getattr(_builtins, name)
+            except AttributeError:
+                continue
+            else:
+                if bltn_obj is None:
+                    # We want to evaluate everything except None.
+                    # TODO do we?
+                    continue
+                bltn_obj = create(self._evaluator, bltn_obj)
+                for result in self._evaluator.execute(bltn_obj, params):
+                    yield result
+
+    @property
+    @underscore_memoization
+    def subscopes(self):
+        """
+        Returns only the faked scopes - the other ones are not important for
+        internal analysis.
+        """
+        module = self.get_parent_until()
+        faked_subscopes = []
+        for name in dir(self.obj):
+            try:
+                faked_subscopes.append(
+                    fake.get_faked(module.obj, self.obj, parent=self, name=name)
+                )
+            except fake.FakeDoesNotExist:
+                pass
+        return faked_subscopes
+
+    def is_scope(self):
+        return True
+
+    def get_self_attributes(self):
+        return []  # Instance compatibility
+
+    def get_imports(self):
+        return []  # Builtins don't have imports
+
+
+class CompiledName(FakeName):
+    def __init__(self, evaluator, compiled_obj, name):
+        super(CompiledName, self).__init__(name)
+        self._evaluator = evaluator
+        self._compiled_obj = compiled_obj
+        self.name = name
+
+    def __repr__(self):
+        try:
+            name = self._compiled_obj.name  # __name__ is not defined all the time
+        except AttributeError:
+            name = None
+        return '<%s: (%s).%s>' % (type(self).__name__, name, self.name)
+
+    def is_definition(self):
+        return True
+
+    @property
+    @underscore_memoization
+    def parent(self):
+        module = self._compiled_obj.get_parent_until()
+        return _create_from_name(self._evaluator, module, self._compiled_obj, self.name)
+
+    @parent.setter
+    def parent(self, value):
+        pass  # Just ignore this, FakeName tries to overwrite the parent attribute.
+
+
+class LazyNamesDict(object):
+    """
+    A names_dict instance for compiled objects, resembles the parser.tree.
+    """
+    name_class = CompiledName
+
+    def __init__(self, evaluator, compiled_obj, is_instance=False):
+        self._evaluator = evaluator
+        self._compiled_obj = compiled_obj
+        self._is_instance = is_instance
+
+    def __iter__(self):
+        return (v[0].value for v in self.values())
+
+    @memoize_method
+    def __getitem__(self, name):
+        try:
+            getattr(self._compiled_obj.obj, name)
+        except AttributeError:
+            raise KeyError('%s in %s not found.' % (name, self._compiled_obj))
+        except Exception:
+            # This is a bit ugly. We're basically returning this to make
+            # lookups possible without having the actual attribute. However
+            # this makes proper completion possible.
+            return [FakeName(name, create(self._evaluator, None), is_definition=True)]
+        return [self.name_class(self._evaluator, self._compiled_obj, name)]
+
+    def values(self):
+        obj = self._compiled_obj.obj
+
+        values = []
+        for name in dir(obj):
+            try:
+                values.append(self[name])
+            except KeyError:
+                # The dir function can be wrong.
+                pass
+
+        is_instance = self._is_instance or fake.is_class_instance(obj)
+        # ``dir`` doesn't include the type names.
+        if not inspect.ismodule(obj) and obj != type and not is_instance:
+            values += create(self._evaluator, type).names_dict.values()
+        return values
+
+
+def dotted_from_fs_path(fs_path, sys_path):
+    """
+    Changes `/usr/lib/python3.4/email/utils.py` to `email.utils`.  I.e.
+    compares the path with sys.path and then returns the dotted_path. If the
+    path is not in the sys.path, just returns None.
+    """
+    if os.path.basename(fs_path).startswith('__init__.'):
+        # We are calculating the path. __init__ files are not interesting.
+        fs_path = os.path.dirname(fs_path)
+
+    # prefer
+    #   - UNIX
+    #     /path/to/pythonX.Y/lib-dynload
+    #     /path/to/pythonX.Y/site-packages
+    #   - Windows
+    #     C:\path\to\DLLs
+    #     C:\path\to\Lib\site-packages
+    # over
+    #   - UNIX
+    #     /path/to/pythonX.Y
+    #   - Windows
+    #     C:\path\to\Lib
+    path = ''
+    for s in sys_path:
+        if (fs_path.startswith(s) and len(path) < len(s)):
+            path = s
+
+    # - Window
+    # X:\path\to\lib-dynload/datetime.pyd => datetime
+    module_path = fs_path[len(path):].lstrip(os.path.sep).lstrip('/')
+    # - Window
+    # Replace like X:\path\to\something/foo/bar.py
+    return _path_re.sub('', module_path).replace(os.path.sep, '.').replace('/', '.')
+
+
+def load_module(evaluator, path=None, name=None):
+    sys_path = evaluator.sys_path
+    if path is not None:
+        dotted_path = dotted_from_fs_path(path, sys_path=sys_path)
+    else:
+        dotted_path = name
+
+    if dotted_path is None:
+        p, _, dotted_path = path.partition(os.path.sep)
+        sys_path.insert(0, p)
+
+    temp, sys.path = sys.path, sys_path
+    try:
+        __import__(dotted_path)
+    except RuntimeError:
+        if 'PySide' in dotted_path or 'PyQt' in dotted_path:
+            # RuntimeError: the PyQt4.QtCore and PyQt5.QtCore modules both wrap
+            # the QObject class.
+            # See https://github.com/davidhalter/jedi/pull/483
+            return None
+        raise
+    except ImportError:
+        # If a module is "corrupt" or not really a Python module or whatever.
+        debug.warning('Module %s not importable.', path)
+        return None
+    finally:
+        sys.path = temp
+
+    # Just access the cache after import, because of #59 as well as the very
+    # complicated import structure of Python.
+    module = sys.modules[dotted_path]
+
+    return create(evaluator, module)
+
+
+docstr_defaults = {
+    'floating point number': 'float',
+    'character': 'str',
+    'integer': 'int',
+    'dictionary': 'dict',
+    'string': 'str',
+}
+
+
+def _parse_function_doc(doc):
+    """
+    Takes a function and returns the params and return value as a tuple.
+    This is nothing more than a docstring parser.
+
+    TODO docstrings like utime(path, (atime, mtime)) and a(b [, b]) -> None
+    TODO docstrings like 'tuple of integers'
+    """
+    # parse round parentheses: def func(a, (b,c))
+    try:
+        count = 0
+        start = doc.index('(')
+        for i, s in enumerate(doc[start:]):
+            if s == '(':
+                count += 1
+            elif s == ')':
+                count -= 1
+            if count == 0:
+                end = start + i
+                break
+        param_str = doc[start + 1:end]
+    except (ValueError, UnboundLocalError):
+        # ValueError for doc.index
+        # UnboundLocalError for undefined end in last line
+        debug.dbg('no brackets found - no param')
+        end = 0
+        param_str = ''
+    else:
+        # remove square brackets, that show an optional param ( = None)
+        def change_options(m):
+            args = m.group(1).split(',')
+            for i, a in enumerate(args):
+                if a and '=' not in a:
+                    args[i] += '=None'
+            return ','.join(args)
+
+        while True:
+            param_str, changes = re.subn(r' ?\[([^\[\]]+)\]',
+                                         change_options, param_str)
+            if changes == 0:
+                break
+    param_str = param_str.replace('-', '_')  # see: isinstance.__doc__
+
+    # parse return value
+    r = re.search('-[>-]* ', doc[end:end + 7])
+    if r is None:
+        ret = ''
+    else:
+        index = end + r.end()
+        # get result type, which can contain newlines
+        pattern = re.compile(r'(,\n|[^\n-])+')
+        ret_str = pattern.match(doc, index).group(0).strip()
+        # New object -> object()
+        ret_str = re.sub(r'[nN]ew (.*)', r'\1()', ret_str)
+
+        ret = docstr_defaults.get(ret_str, ret_str)
+
+    return param_str, ret
+
+
+def _create_from_name(evaluator, module, parent, name):
+    try:
+        return fake.get_faked(module.obj, parent.obj, parent=parent, name=name)
+    except fake.FakeDoesNotExist:
+        pass
+
+    try:
+        obj = getattr(parent.obj, name)
+    except AttributeError:
+        # Happens e.g. in properties of
+        # PyQt4.QtGui.QStyleOptionComboBox.currentText
+        # -> just set it to None
+        obj = None
+    return create(evaluator, obj, parent)
+
+
+def builtin_from_name(evaluator, string):
+    bltn_obj = getattr(_builtins, string)
+    return create(evaluator, bltn_obj)
+
+
+def _a_generator(foo):
+    """Used to have an object to return for generators."""
+    yield 42
+    yield foo
+
+
+_SPECIAL_OBJECTS = {
+    'FUNCTION_CLASS': type(load_module),
+    'METHOD_CLASS': type(CompiledObject.is_class),
+    'MODULE_CLASS': type(os),
+    'GENERATOR_OBJECT': _a_generator(1.0),
+    'BUILTINS': _builtins,
+}
+
+
+def get_special_object(evaluator, identifier):
+    obj = _SPECIAL_OBJECTS[identifier]
+    return create(evaluator, obj, parent=create(evaluator, _builtins))
+
+
+def compiled_objects_cache(attribute_name):
+    def decorator(func):
+        """
+        This decorator caches just the ids, oopposed to caching the object itself.
+        Caching the id has the advantage that an object doesn't need to be
+        hashable.
+        """
+        def wrapper(evaluator, obj, parent=None, module=None):
+            cache = getattr(evaluator, attribute_name)
+            # Do a very cheap form of caching here.
+            key = id(obj), id(parent)
+            try:
+                return cache[key][0]
+            except KeyError:
+                # TODO this whole decorator looks way too ugly and this if
+                # doesn't make it better. Find a more generic solution.
+                if parent or module:
+                    result = func(evaluator, obj, parent, module)
+                else:
+                    result = func(evaluator, obj)
+                # Need to cache all of them, otherwise the id could be overwritten.
+                cache[key] = result, obj, parent, module
+                return result
+        return wrapper
+
+    return decorator
+
+
+@compiled_objects_cache('compiled_cache')
+def create(evaluator, obj, parent=None, module=None):
+    """
+    A very weird interface class to this module. The more options provided the
+    more acurate loading compiled objects is.
+    """
+    if inspect.ismodule(obj):
+        if parent is not None:
+            # Modules don't have parents, be careful with caching: recurse.
+            return create(evaluator, obj)
+    else:
+        if parent is None and obj != _builtins:
+            return create(evaluator, obj, create(evaluator, _builtins))
+
+        try:
+            return fake.get_faked(module and module.obj, obj, parent=parent)
+        except fake.FakeDoesNotExist:
+            pass
+
+    return CompiledObject(evaluator, obj, parent)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..f55a9d3
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/__pycache__/fake.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/__pycache__/fake.cpython-35.pyc
new file mode 100644
index 0000000..0b2418d
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/__pycache__/fake.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/__pycache__/mixed.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/__pycache__/mixed.cpython-35.pyc
new file mode 100644
index 0000000..2b16d57
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/__pycache__/mixed.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake.py
new file mode 100644
index 0000000..0338b96
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake.py
@@ -0,0 +1,203 @@
+"""
+Loads functions that are mixed in to the standard library. E.g. builtins are
+written in C (binaries), but my autocompletion only understands Python code. By
+mixing in Python code, the autocompletion should work much better for builtins.
+"""
+
+import os
+import inspect
+import types
+
+from jedi._compatibility import is_py3, builtins, unicode, is_py34
+from jedi.parser import ParserWithRecovery, load_grammar
+from jedi.parser import tree as pt
+from jedi.evaluate.helpers import FakeName
+
+modules = {}
+
+
+MethodDescriptorType = type(str.replace)
+# These are not considered classes and access is granted even though they have
+# a __class__ attribute.
+NOT_CLASS_TYPES = (
+    types.BuiltinFunctionType,
+    types.CodeType,
+    types.FrameType,
+    types.FunctionType,
+    types.GeneratorType,
+    types.GetSetDescriptorType,
+    types.LambdaType,
+    types.MemberDescriptorType,
+    types.MethodType,
+    types.ModuleType,
+    types.TracebackType,
+    MethodDescriptorType
+)
+
+if is_py3:
+    NOT_CLASS_TYPES += (
+        types.MappingProxyType,
+        types.SimpleNamespace
+    )
+    if is_py34:
+        NOT_CLASS_TYPES += (types.DynamicClassAttribute,)
+
+
+class FakeDoesNotExist(Exception):
+    pass
+
+
+def _load_faked_module(module):
+    module_name = module.__name__
+    if module_name == '__builtin__' and not is_py3:
+        module_name = 'builtins'
+
+    try:
+        return modules[module_name]
+    except KeyError:
+        path = os.path.dirname(os.path.abspath(__file__))
+        try:
+            with open(os.path.join(path, 'fake', module_name) + '.pym') as f:
+                source = f.read()
+        except IOError:
+            modules[module_name] = None
+            return
+        grammar = load_grammar(version='3.4')
+        module = ParserWithRecovery(grammar, unicode(source), module_name).module
+        modules[module_name] = module
+
+        if module_name == 'builtins' and not is_py3:
+            # There are two implementations of `open` for either python 2/3.
+            # -> Rename the python2 version (`look at fake/builtins.pym`).
+            open_func = search_scope(module, 'open')
+            open_func.children[1] = FakeName('open_python3')
+            open_func = search_scope(module, 'open_python2')
+            open_func.children[1] = FakeName('open')
+        return module
+
+
+def search_scope(scope, obj_name):
+    for s in scope.subscopes:
+        if str(s.name) == obj_name:
+            return s
+
+
+def get_module(obj):
+    if inspect.ismodule(obj):
+        return obj
+    try:
+        obj = obj.__objclass__
+    except AttributeError:
+        pass
+
+    try:
+        imp_plz = obj.__module__
+    except AttributeError:
+        # Unfortunately in some cases like `int` there's no __module__
+        return builtins
+    else:
+        if imp_plz is None:
+            # Happens for example in `(_ for _ in []).send.__module__`.
+            return builtins
+        else:
+            try:
+                return __import__(imp_plz)
+            except ImportError:
+                # __module__ can be something arbitrary that doesn't exist.
+                return builtins
+
+
+def _faked(module, obj, name):
+    # Crazy underscore actions to try to escape all the internal madness.
+    if module is None:
+        module = get_module(obj)
+
+    faked_mod = _load_faked_module(module)
+    if faked_mod is None:
+        return None
+
+    # Having the module as a `parser.representation.module`, we need to scan
+    # for methods.
+    if name is None:
+        if inspect.isbuiltin(obj):
+            return search_scope(faked_mod, obj.__name__)
+        elif not inspect.isclass(obj):
+            # object is a method or descriptor
+            try:
+                objclass = obj.__objclass__
+            except AttributeError:
+                return None
+            else:
+                cls = search_scope(faked_mod, objclass.__name__)
+                if cls is None:
+                    return None
+                return search_scope(cls, obj.__name__)
+    else:
+        if obj == module:
+            return search_scope(faked_mod, name)
+        else:
+            try:
+                cls_name = obj.__name__
+            except AttributeError:
+                return None
+            cls = search_scope(faked_mod, cls_name)
+            if cls is None:
+                return None
+            return search_scope(cls, name)
+
+
+def memoize_faked(obj):
+    """
+    A typical memoize function that ignores issues with non hashable results.
+    """
+    cache = obj.cache = {}
+
+    def memoizer(*args, **kwargs):
+        key = (obj, args, frozenset(kwargs.items()))
+        try:
+            result = cache[key]
+        except TypeError:
+            return obj(*args, **kwargs)
+        except KeyError:
+            result = obj(*args, **kwargs)
+            if result is not None:
+                cache[key] = obj(*args, **kwargs)
+            return result
+        else:
+            return result
+    return memoizer
+
+
+@memoize_faked
+def _get_faked(module, obj, name=None):
+    obj = type(obj) if is_class_instance(obj) else obj
+    result = _faked(module, obj, name)
+    if result is None or isinstance(result, pt.Class):
+        # We're not interested in classes. What we want is functions.
+        raise FakeDoesNotExist
+    else:
+        # Set the docstr which was previously not set (faked modules don't
+        # contain it).
+        doc = '"""%s"""' % obj.__doc__  # TODO need escapes.
+        suite = result.children[-1]
+        string = pt.String(pt.zero_position_modifier, doc, (0, 0), '')
+        new_line = pt.Newline('\n', (0, 0), '')
+        docstr_node = pt.Node('simple_stmt', [string, new_line])
+        suite.children.insert(2, docstr_node)
+        return result
+
+
+def get_faked(module, obj, name=None, parent=None):
+    faked = _get_faked(module, obj, name)
+    faked.parent = parent
+    return faked
+
+
+def is_class_instance(obj):
+    """Like inspect.* methods."""
+    try:
+        cls = obj.__class__
+    except AttributeError:
+        return False
+    else:
+        return cls != type and not issubclass(cls, NOT_CLASS_TYPES)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/_functools.pym b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/_functools.pym
new file mode 100644
index 0000000..909ef03
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/_functools.pym
@@ -0,0 +1,9 @@
+class partial():
+    def __init__(self, func, *args, **keywords):
+        self.__func = func
+        self.__args = args
+        self.__keywords = keywords
+
+    def __call__(self, *args, **kwargs):
+        # TODO should be **dict(self.__keywords, **kwargs)
+        return self.__func(*(self.__args + args), **self.__keywords)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/_sqlite3.pym b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/_sqlite3.pym
new file mode 100644
index 0000000..2151e65
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/_sqlite3.pym
@@ -0,0 +1,26 @@
+def connect(database, timeout=None, isolation_level=None, detect_types=None, factory=None):
+    return Connection()
+
+
+class Connection():
+    def cursor(self):
+        return Cursor()
+
+
+class Cursor():
+    def cursor(self):
+        return Cursor()
+
+    def fetchone(self):
+        return Row()
+
+    def fetchmany(self, size=cursor.arraysize):
+        return [self.fetchone()]
+
+    def fetchall(self):
+        return [self.fetchone()]
+
+
+class Row():
+    def keys(self):
+        return ['']
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/_sre.pym b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/_sre.pym
new file mode 100644
index 0000000..217be56
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/_sre.pym
@@ -0,0 +1,99 @@
+def compile():
+    class SRE_Match():
+        endpos = int()
+        lastgroup = int()
+        lastindex = int()
+        pos = int()
+        string = str()
+        regs = ((int(), int()),)
+
+        def __init__(self, pattern):
+            self.re = pattern
+
+        def start(self):
+            return int()
+
+        def end(self):
+            return int()
+
+        def span(self):
+            return int(), int()
+
+        def expand(self):
+            return str()
+
+        def group(self, nr):
+            return str()
+
+        def groupdict(self):
+            return {str(): str()}
+
+        def groups(self):
+            return (str(),)
+
+    class SRE_Pattern():
+        flags = int()
+        groupindex = {}
+        groups = int()
+        pattern = str()
+
+        def findall(self, string, pos=None, endpos=None):
+            """
+            findall(string[, pos[, endpos]]) --> list.
+            Return a list of all non-overlapping matches of pattern in string.
+            """
+            return [str()]
+
+        def finditer(self, string, pos=None, endpos=None):
+            """
+            finditer(string[, pos[, endpos]]) --> iterator.
+            Return an iterator over all non-overlapping matches for the
+            RE pattern in string. For each match, the iterator returns a
+            match object.
+            """
+            yield SRE_Match(self)
+
+        def match(self, string, pos=None, endpos=None):
+            """
+            match(string[, pos[, endpos]]) --> match object or None.
+            Matches zero or more characters at the beginning of the string
+            pattern
+            """
+            return SRE_Match(self)
+
+        def scanner(self, string, pos=None, endpos=None):
+            pass
+
+        def search(self, string, pos=None, endpos=None):
+            """
+            search(string[, pos[, endpos]]) --> match object or None.
+            Scan through string looking for a match, and return a corresponding
+            MatchObject instance. Return None if no position in the string matches.
+            """
+            return SRE_Match(self)
+
+        def split(self, string, maxsplit=0]):
+            """
+            split(string[, maxsplit = 0])  --> list.
+            Split string by the occurrences of pattern.
+            """
+            return [str()]
+
+        def sub(self, repl, string, count=0):
+            """
+            sub(repl, string[, count = 0]) --> newstring
+            Return the string obtained by replacing the leftmost non-overlapping
+            occurrences of pattern in string by the replacement repl.
+            """
+            return str()
+
+        def subn(self, repl, string, count=0):
+            """
+            subn(repl, string[, count = 0]) --> (newstring, number of subs)
+            Return the tuple (new_string, number_of_subs_made) found by replacing
+            the leftmost non-overlapping occurrences of pattern with the
+            replacement repl.
+            """
+            return (str(), int())
+
+    return SRE_Pattern()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/_weakref.pym b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/_weakref.pym
new file mode 100644
index 0000000..8d21a2c
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/_weakref.pym
@@ -0,0 +1,8 @@
+def proxy(object, callback=None):
+    return object
+
+class weakref():
+    def __init__(self, object, callback=None):
+        self.__object = object
+    def __call__(self):
+        return self.__object
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/builtins.pym b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/builtins.pym
new file mode 100644
index 0000000..1d5314b
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/builtins.pym
@@ -0,0 +1,262 @@
+"""
+Pure Python implementation of some builtins.
+This code is not going to be executed anywhere.
+These implementations are not always correct, but should work as good as
+possible for the auto completion.
+"""
+
+
+def next(iterator, default=None):
+    if random.choice([0, 1]):
+        if hasattr("next"):
+            return iterator.next()
+        else:
+            return iterator.__next__()
+    else:
+        if default is not None:
+            return default
+
+
+def iter(collection, sentinel=None):
+    if sentinel:
+        yield collection()
+    else:
+        for c in collection:
+            yield c
+
+
+def range(start, stop=None, step=1):
+    return [0]
+
+
+class file():
+    def __iter__(self):
+        yield ''
+    def next(self):
+        return ''
+
+
+class xrange():
+    # Attention: this function doesn't exist in Py3k (there it is range).
+    def __iter__(self):
+        yield 1
+
+    def count(self):
+        return 1
+
+    def index(self):
+        return 1
+
+
+def open(file, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True):
+    import io
+    return io.TextIOWrapper(file, mode, buffering, encoding, errors, newline, closefd)
+
+
+def open_python2(name, mode=None, buffering=None):
+    return file(name, mode, buffering)
+
+
+#--------------------------------------------------------
+# descriptors
+#--------------------------------------------------------
+class property():
+    def __init__(self, fget, fset=None, fdel=None, doc=None):
+        self.fget = fget
+        self.fset = fset
+        self.fdel = fdel
+        self.__doc__ = doc
+
+    def __get__(self, obj, cls):
+        return self.fget(obj)
+
+    def __set__(self, obj, value):
+        self.fset(obj, value)
+
+    def __delete__(self, obj):
+        self.fdel(obj)
+
+    def setter(self, func):
+        self.fset = func
+        return self
+
+    def getter(self, func):
+        self.fget = func
+        return self
+
+    def deleter(self, func):
+        self.fdel = func
+        return self
+
+
+class staticmethod():
+    def __init__(self, func):
+        self.__func = func
+
+    def __get__(self, obj, cls):
+        return self.__func
+
+
+class classmethod():
+    def __init__(self, func):
+        self.__func = func
+
+    def __get__(self, obj, cls):
+        def _method(*args, **kwargs):
+            return self.__func(cls, *args, **kwargs)
+        return _method
+
+
+#--------------------------------------------------------
+# array stuff
+#--------------------------------------------------------
+class list():
+    def __init__(self, iterable=[]):
+        self.__iterable = []
+        for i in iterable:
+            self.__iterable += [i]
+
+    def __iter__(self):
+        for i in self.__iterable:
+            yield i
+
+    def __getitem__(self, y):
+        return self.__iterable[y]
+
+    def pop(self):
+        return self.__iterable[int()]
+
+
+class tuple():
+    def __init__(self, iterable=[]):
+        self.__iterable = []
+        for i in iterable:
+            self.__iterable += [i]
+
+    def __iter__(self):
+        for i in self.__iterable:
+            yield i
+
+    def __getitem__(self, y):
+        return self.__iterable[y]
+
+    def index(self):
+        return 1
+
+    def count(self):
+        return 1
+
+
+class set():
+    def __init__(self, iterable=[]):
+        self.__iterable = iterable
+
+    def __iter__(self):
+        for i in self.__iterable:
+            yield i
+
+    def pop(self):
+        return list(self.__iterable)[-1]
+
+    def copy(self):
+        return self
+
+    def difference(self, other):
+        return self - other
+
+    def intersection(self, other):
+        return self & other
+
+    def symmetric_difference(self, other):
+        return self ^ other
+
+    def union(self, other):
+        return self | other
+
+
+class frozenset():
+    def __init__(self, iterable=[]):
+        self.__iterable = iterable
+
+    def __iter__(self):
+        for i in self.__iterable:
+            yield i
+
+    def copy(self):
+        return self
+
+
+class dict():
+    def __init__(self, **elements):
+        self.__elements = elements
+
+    def clear(self):
+        # has a strange docstr
+        pass
+
+    def get(self, k, d=None):
+        # TODO implement
+        try:
+            #return self.__elements[k]
+            pass
+        except KeyError:
+            return d
+
+    def values(self):
+        return self.__elements.values()
+
+    def setdefault(self, k, d):
+        # TODO maybe also return the content
+        return d
+
+
+class enumerate():
+    def __init__(self, sequence, start=0):
+        self.__sequence = sequence
+
+    def __iter__(self):
+        for i in self.__sequence:
+            yield 1, i
+
+    def __next__(self):
+        return next(self.__iter__())
+
+    def next(self):
+        return next(self.__iter__())
+
+
+class reversed():
+    def __init__(self, sequence):
+        self.__sequence = sequence
+
+    def __iter__(self):
+        for i in self.__sequence:
+            yield i
+
+    def __next__(self):
+        return next(self.__iter__())
+
+    def next(self):
+        return next(self.__iter__())
+
+
+def sorted(iterable, cmp=None, key=None, reverse=False):
+    return iterable
+
+
+#--------------------------------------------------------
+# basic types
+#--------------------------------------------------------
+class int():
+    def __init__(self, x, base=None):
+        pass
+
+
+class str():
+    def __init__(self, obj):
+        pass
+
+
+class type():
+    def mro():
+        return [object]
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/datetime.pym b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/datetime.pym
new file mode 100644
index 0000000..823ac5b
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/datetime.pym
@@ -0,0 +1,4 @@
+class datetime():
+    @staticmethod
+    def now():
+        return datetime()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/io.pym b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/io.pym
new file mode 100644
index 0000000..87b02ee
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/io.pym
@@ -0,0 +1,6 @@
+class TextIOWrapper():
+    def __next__(self):
+        return str()
+
+    def __iter__(self):
+        yield str()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/posix.pym b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/posix.pym
new file mode 100644
index 0000000..4417f7c
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/fake/posix.pym
@@ -0,0 +1,5 @@
+def getcwd():
+    return ''
+
+def getcwdu():
+    return ''
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/mixed.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/mixed.py
new file mode 100644
index 0000000..69119f1
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/compiled/mixed.py
@@ -0,0 +1,158 @@
+"""
+Used only for REPL Completion.
+"""
+
+import inspect
+import os
+
+from jedi import common
+from jedi.parser.fast import FastParser
+from jedi.evaluate import compiled
+from jedi.cache import underscore_memoization
+
+
+class MixedObject(object):
+    """
+    A ``MixedObject`` is used in two ways:
+
+    1. It uses the default logic of ``parser.tree`` objects,
+    2. except for getattr calls. The names dicts are generated in a fashion
+       like ``CompiledObject``.
+
+    This combined logic makes it possible to provide more powerful REPL
+    completion. It allows side effects that are not noticable with the default
+    parser structure to still be completeable.
+
+    The biggest difference from CompiledObject to MixedObject is that we are
+    generally dealing with Python code and not with C code. This will generate
+    fewer special cases, because we in Python you don't have the same freedoms
+    to modify the runtime.
+    """
+    def __init__(self, evaluator, obj, node_name):
+        self._evaluator = evaluator
+        self.obj = obj
+        self.node_name = node_name
+        self.definition = node_name.get_definition()
+
+    @property
+    def names_dict(self):
+        return LazyMixedNamesDict(self._evaluator, self)
+
+    def names_dicts(self, search_global):
+        # TODO is this needed?
+        assert search_global is False
+        return [self.names_dict]
+
+    def api_type(self):
+        mappings = {
+            'expr_stmt': 'statement',
+            'classdef': 'class',
+            'funcdef': 'function',
+            'file_input': 'module',
+        }
+        return mappings[self.definition.type]
+
+    def __repr__(self):
+        return '<%s: %s>' % (type(self).__name__, repr(self.obj))
+
+    def __getattr__(self, name):
+        return getattr(self.definition, name)
+
+
+class MixedName(compiled.CompiledName):
+    """
+    The ``CompiledName._compiled_object`` is our MixedObject.
+    """
+    @property
+    @underscore_memoization
+    def parent(self):
+        return create(self._evaluator, getattr(self._compiled_obj.obj, self.name))
+
+    @parent.setter
+    def parent(self, value):
+        pass  # Just ignore this, Name tries to overwrite the parent attribute.
+
+    @property
+    def start_pos(self):
+        if isinstance(self.parent, MixedObject):
+            return self.parent.node_name.start_pos
+
+        # This means a start_pos that doesn't exist (compiled objects).
+        return (0, 0)
+
+
+class LazyMixedNamesDict(compiled.LazyNamesDict):
+    name_class = MixedName
+
+
+def parse(grammar, path):
+    with open(path) as f:
+        source = f.read()
+    source = common.source_to_unicode(source)
+    return FastParser(grammar, source, path)
+
+
+def _load_module(evaluator, path, python_object):
+    module = parse(evaluator.grammar, path).module
+    python_module = inspect.getmodule(python_object)
+
+    evaluator.modules[python_module.__name__] = module
+    return module
+
+
+def find_syntax_node_name(evaluator, python_object):
+    try:
+        path = inspect.getsourcefile(python_object)
+    except TypeError:
+        # The type might not be known (e.g. class_with_dict.__weakref__)
+        return None
+    if path is None or not os.path.exists(path):
+        # The path might not exist or be e.g. <stdin>.
+        return None
+
+    module = _load_module(evaluator, path, python_object)
+
+    if inspect.ismodule(python_object):
+        # We don't need to check names for modules, because there's not really
+        # a way to write a module in a module in Python (and also __name__ can
+        # be something like ``email.utils``).
+        return module
+
+    name_str = python_object.__name__
+    if name_str == '<lambda>':
+        return None  # It's too hard to find lambdas.
+
+    names = module.used_names[name_str]
+    names = [n for n in names if n.is_definition()]
+
+    try:
+        code = python_object.__code__
+        # By using the line number of a code object we make the lookup in a
+        # file pretty easy. There's still a possibility of people defining
+        # stuff like ``a = 3; foo(a); a = 4`` on the same line, but if people
+        # do so we just don't care.
+        line_nr = code.co_firstlineno
+    except AttributeError:
+        pass
+    else:
+        line_names = [name for name in names if name.start_pos[0] == line_nr]
+        # There's a chance that the object is not available anymore, because
+        # the code has changed in the background.
+        if line_names:
+            return line_names[-1]
+
+    # It's really hard to actually get the right definition, here as a last
+    # resort we just return the last one. This chance might lead to odd
+    # completions at some points but will lead to mostly correct type
+    # inference, because people tend to define a public name in a module only
+    # once.
+    return names[-1]
+
+
+@compiled.compiled_objects_cache('mixed_cache')
+def create(evaluator, obj):
+    name = find_syntax_node_name(evaluator, obj)
+    if name is None:
+        return compiled.create(evaluator, obj)
+    else:
+        return MixedObject(evaluator, obj, name)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/docstrings.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/docstrings.py
new file mode 100644
index 0000000..d2ab34e
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/docstrings.py
@@ -0,0 +1,204 @@
+"""
+Docstrings are another source of information for functions and classes.
+:mod:`jedi.evaluate.dynamic` tries to find all executions of functions, while
+the docstring parsing is much easier. There are two different types of
+docstrings that |jedi| understands:
+
+- `Sphinx <http://sphinx-doc.org/markup/desc.html#info-field-lists>`_
+- `Epydoc <http://epydoc.sourceforge.net/manual-fields.html>`_
+
+For example, the sphinx annotation ``:type foo: str`` clearly states that the
+type of ``foo`` is ``str``.
+
+As an addition to parameter searching, this module also provides return
+annotations.
+"""
+
+from ast import literal_eval
+import re
+from itertools import chain
+from textwrap import dedent
+
+from jedi.evaluate.cache import memoize_default
+from jedi.parser import ParserWithRecovery, load_grammar
+from jedi.parser.tree import Class
+from jedi.common import indent_block
+from jedi.evaluate.iterable import Array, FakeSequence, AlreadyEvaluated
+
+
+DOCSTRING_PARAM_PATTERNS = [
+    r'\s*:type\s+%s:\s*([^\n]+)',  # Sphinx
+    r'\s*:param\s+(\w+)\s+%s:[^\n]+',  # Sphinx param with type
+    r'\s*@type\s+%s:\s*([^\n]+)',  # Epydoc
+]
+
+DOCSTRING_RETURN_PATTERNS = [
+    re.compile(r'\s*:rtype:\s*([^\n]+)', re.M),  # Sphinx
+    re.compile(r'\s*@rtype:\s*([^\n]+)', re.M),  # Epydoc
+]
+
+REST_ROLE_PATTERN = re.compile(r':[^`]+:`([^`]+)`')
+
+
+try:
+    from numpydoc.docscrape import NumpyDocString
+except ImportError:
+    def _search_param_in_numpydocstr(docstr, param_str):
+        return []
+else:
+    def _search_param_in_numpydocstr(docstr, param_str):
+        """Search `docstr` (in numpydoc format) for type(-s) of `param_str`."""
+        params = NumpyDocString(docstr)._parsed_data['Parameters']
+        for p_name, p_type, p_descr in params:
+            if p_name == param_str:
+                m = re.match('([^,]+(,[^,]+)*?)(,[ ]*optional)?$', p_type)
+                if m:
+                    p_type = m.group(1)
+
+                if p_type.startswith('{'):
+                    types = set(type(x).__name__ for x in literal_eval(p_type))
+                    return list(types)
+                else:
+                    return [p_type]
+        return []
+
+
+def _search_param_in_docstr(docstr, param_str):
+    """
+    Search `docstr` for type(-s) of `param_str`.
+
+    >>> _search_param_in_docstr(':type param: int', 'param')
+    ['int']
+    >>> _search_param_in_docstr('@type param: int', 'param')
+    ['int']
+    >>> _search_param_in_docstr(
+    ...   ':type param: :class:`threading.Thread`', 'param')
+    ['threading.Thread']
+    >>> bool(_search_param_in_docstr('no document', 'param'))
+    False
+    >>> _search_param_in_docstr(':param int param: some description', 'param')
+    ['int']
+
+    """
+    # look at #40 to see definitions of those params
+    patterns = [re.compile(p % re.escape(param_str))
+                for p in DOCSTRING_PARAM_PATTERNS]
+    for pattern in patterns:
+        match = pattern.search(docstr)
+        if match:
+            return [_strip_rst_role(match.group(1))]
+
+    return (_search_param_in_numpydocstr(docstr, param_str) or
+            [])
+
+
+def _strip_rst_role(type_str):
+    """
+    Strip off the part looks like a ReST role in `type_str`.
+
+    >>> _strip_rst_role(':class:`ClassName`')  # strip off :class:
+    'ClassName'
+    >>> _strip_rst_role(':py:obj:`module.Object`')  # works with domain
+    'module.Object'
+    >>> _strip_rst_role('ClassName')  # do nothing when not ReST role
+    'ClassName'
+
+    See also:
+    http://sphinx-doc.org/domains.html#cross-referencing-python-objects
+
+    """
+    match = REST_ROLE_PATTERN.match(type_str)
+    if match:
+        return match.group(1)
+    else:
+        return type_str
+
+
+def _evaluate_for_statement_string(evaluator, string, module):
+    code = dedent("""
+    def pseudo_docstring_stuff():
+        # Create a pseudo function for docstring statements.
+    %s
+    """)
+    if string is None:
+        return []
+
+    for element in re.findall('((?:\w+\.)*\w+)\.', string):
+        # Try to import module part in dotted name.
+        # (e.g., 'threading' in 'threading.Thread').
+        string = 'import %s\n' % element + string
+
+    # Take the default grammar here, if we load the Python 2.7 grammar here, it
+    # will be impossible to use `...` (Ellipsis) as a token. Docstring types
+    # don't need to conform with the current grammar.
+    p = ParserWithRecovery(load_grammar(), code % indent_block(string))
+    try:
+        pseudo_cls = p.module.subscopes[0]
+        # First pick suite, then simple_stmt (-2 for DEDENT) and then the node,
+        # which is also not the last item, because there's a newline.
+        stmt = pseudo_cls.children[-1].children[-2].children[-2]
+    except (AttributeError, IndexError):
+        return []
+
+    # Use the module of the param.
+    # TODO this module is not the module of the param in case of a function
+    # call. In that case it's the module of the function call.
+    # stuffed with content from a function call.
+    pseudo_cls.parent = module
+    return list(_execute_types_in_stmt(evaluator, stmt))
+
+
+def _execute_types_in_stmt(evaluator, stmt):
+    """
+    Executing all types or general elements that we find in a statement. This
+    doesn't include tuple, list and dict literals, because the stuff they
+    contain is executed. (Used as type information).
+    """
+    definitions = evaluator.eval_element(stmt)
+    return chain.from_iterable(_execute_array_values(evaluator, d) for d in definitions)
+
+
+def _execute_array_values(evaluator, array):
+    """
+    Tuples indicate that there's not just one return value, but the listed
+    ones.  `(str, int)` means that it returns a tuple with both types.
+    """
+    if isinstance(array, Array):
+        values = []
+        for types in array.py__iter__():
+            objects = set(chain.from_iterable(_execute_array_values(evaluator, typ) for typ in types))
+            values.append(AlreadyEvaluated(objects))
+        return [FakeSequence(evaluator, values, array.type)]
+    else:
+        return evaluator.execute(array)
+
+
+@memoize_default(None, evaluator_is_first_arg=True)
+def follow_param(evaluator, param):
+    def eval_docstring(docstring):
+        return set(
+            [p for param_str in _search_param_in_docstr(docstring, str(param.name))
+                for p in _evaluate_for_statement_string(evaluator, param_str, module)]
+        )
+    func = param.parent_function
+    module = param.get_parent_until()
+
+    types = eval_docstring(func.raw_doc)
+    if func.name.value == '__init__':
+        cls = func.get_parent_until(Class)
+        if cls.type == 'classdef':
+            types |= eval_docstring(cls.raw_doc)
+
+    return types
+
+
+@memoize_default(None, evaluator_is_first_arg=True)
+def find_return_types(evaluator, func):
+    def search_return_in_docstr(code):
+        for p in DOCSTRING_RETURN_PATTERNS:
+            match = p.search(code)
+            if match:
+                return _strip_rst_role(match.group(1))
+
+    type_str = search_return_in_docstr(func.raw_doc)
+    return _evaluate_for_statement_string(evaluator, type_str, func.get_parent_until())
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/dynamic.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/dynamic.py
new file mode 100644
index 0000000..d0570b5
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/dynamic.py
@@ -0,0 +1,149 @@
+"""
+One of the really important features of |jedi| is to have an option to
+understand code like this::
+
+    def foo(bar):
+        bar. # completion here
+    foo(1)
+
+There's no doubt wheter bar is an ``int`` or not, but if there's also a call
+like ``foo('str')``, what would happen? Well, we'll just show both. Because
+that's what a human would expect.
+
+It works as follows:
+
+- |Jedi| sees a param
+- search for function calls named ``foo``
+- execute these calls and check the input. This work with a ``ParamListener``.
+"""
+from itertools import chain
+
+from jedi._compatibility import unicode
+from jedi.parser import tree
+from jedi import settings
+from jedi import debug
+from jedi.evaluate.cache import memoize_default
+from jedi.evaluate import imports
+
+
+MAX_PARAM_SEARCHES = 20
+
+
+class ParamListener(object):
+    """
+    This listener is used to get the params for a function.
+    """
+    def __init__(self):
+        self.param_possibilities = []
+
+    def execute(self, params):
+        self.param_possibilities += params
+
+
+@debug.increase_indent
+def search_params(evaluator, param):
+    """
+    A dynamic search for param values. If you try to complete a type:
+
+    >>> def func(foo):
+    ...     foo
+    >>> func(1)
+    >>> func("")
+
+    It is not known what the type ``foo`` without analysing the whole code. You
+    have to look for all calls to ``func`` to find out what ``foo`` possibly
+    is.
+    """
+    if not settings.dynamic_params:
+        return set()
+
+    evaluator.dynamic_params_depth += 1
+    try:
+        func = param.get_parent_until(tree.Function)
+        debug.dbg('Dynamic param search for %s in %s.', param, str(func.name), color='MAGENTA')
+        # Compare the param names.
+        names = [n for n in search_function_call(evaluator, func)
+                 if n.value == param.name.value]
+        # Evaluate the ExecutedParams to types.
+        result = set(chain.from_iterable(n.parent.eval(evaluator) for n in names))
+        debug.dbg('Dynamic param result %s', result, color='MAGENTA')
+        return result
+    finally:
+        evaluator.dynamic_params_depth -= 1
+
+
+@memoize_default([], evaluator_is_first_arg=True)
+def search_function_call(evaluator, func):
+    """
+    Returns a list of param names.
+    """
+    from jedi.evaluate import representation as er
+
+    def get_possible_nodes(module, func_name):
+            try:
+                names = module.used_names[func_name]
+            except KeyError:
+                return
+
+            for name in names:
+                bracket = name.get_next_leaf()
+                trailer = bracket.parent
+                if trailer.type == 'trailer' and bracket == '(':
+                    yield name, trailer
+
+    def undecorate(typ):
+        # We have to remove decorators, because they are not the
+        # "original" functions, this way we can easily compare.
+        # At the same time we also have to remove InstanceElements.
+        if typ.isinstance(er.Function, er.Instance) \
+                and typ.decorates is not None:
+            return typ.decorates
+        elif isinstance(typ, er.InstanceElement):
+            return typ.var
+        else:
+            return typ
+
+    current_module = func.get_parent_until()
+    func_name = unicode(func.name)
+    compare = func
+    if func_name == '__init__':
+        cls = func.get_parent_scope()
+        if isinstance(cls, tree.Class):
+            func_name = unicode(cls.name)
+            compare = cls
+
+    # add the listener
+    listener = ParamListener()
+    func.listeners.add(listener)
+
+    try:
+        result = []
+        i = 0
+        for mod in imports.get_modules_containing_name(evaluator, [current_module], func_name):
+            for name, trailer in get_possible_nodes(mod, func_name):
+                i += 1
+
+                # This is a simple way to stop Jedi's dynamic param recursion
+                # from going wild: The deeper Jedi's in the recursin, the less
+                # code should be evaluated.
+                if i * evaluator.dynamic_params_depth > MAX_PARAM_SEARCHES:
+                    return listener.param_possibilities
+
+                for typ in evaluator.goto_definitions(name):
+                    undecorated = undecorate(typ)
+                    if evaluator.wrap(compare) == undecorated:
+                        # Only if we have the correct function we execute
+                        # it, otherwise just ignore it.
+                        evaluator.eval_trailer([typ], trailer)
+
+            result = listener.param_possibilities
+
+            # If there are results after processing a module, we're probably
+            # good to process.
+            if result:
+                return result
+    finally:
+        # cleanup: remove the listener; important: should not stick.
+        func.listeners.remove(listener)
+
+    return set()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/finder.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/finder.py
new file mode 100644
index 0000000..2095959
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/finder.py
@@ -0,0 +1,632 @@
+"""
+Searching for names with given scope and name. This is very central in Jedi and
+Python. The name resolution is quite complicated with descripter,
+``__getattribute__``, ``__getattr__``, ``global``, etc.
+
+If you want to understand name resolution, please read the first few chapters
+in http://blog.ionelmc.ro/2015/02/09/understanding-python-metaclasses/.
+
+Flow checks
++++++++++++
+
+Flow checks are not really mature. There's only a check for ``isinstance``.  It
+would check whether a flow has the form of ``if isinstance(a, type_or_tuple)``.
+Unfortunately every other thing is being ignored (e.g. a == '' would be easy to
+check for -> a is a string). There's big potential in these checks.
+"""
+from itertools import chain
+
+from jedi._compatibility import unicode
+from jedi.parser import tree
+from jedi import debug
+from jedi import common
+from jedi.common import unite
+from jedi import settings
+from jedi.evaluate import representation as er
+from jedi.evaluate import dynamic
+from jedi.evaluate import compiled
+from jedi.evaluate import docstrings
+from jedi.evaluate import pep0484
+from jedi.evaluate import iterable
+from jedi.evaluate import imports
+from jedi.evaluate import analysis
+from jedi.evaluate import flow_analysis
+from jedi.evaluate import param
+from jedi.evaluate import helpers
+from jedi.evaluate.cache import memoize_default
+
+
+def filter_after_position(names, position):
+    """
+    Removes all names after a certain position. If position is None, just
+    returns the names list.
+    """
+    if position is None:
+        return names
+
+    names_new = []
+    for n in names:
+        # Filter positions and also allow list comprehensions and lambdas.
+        if n.start_pos[0] is not None and n.start_pos < position \
+                or isinstance(n.get_definition(), (tree.CompFor, tree.Lambda)):
+            names_new.append(n)
+    return names_new
+
+
+def filter_definition_names(names, origin, position=None):
+    """
+    Filter names that are actual definitions in a scope. Names that are just
+    used will be ignored.
+    """
+    if not names:
+        return []
+
+    # Just calculate the scope from the first
+    stmt = names[0].get_definition()
+    scope = stmt.get_parent_scope()
+
+    if not (isinstance(scope, er.FunctionExecution) and
+            isinstance(scope.base, er.LambdaWrapper)):
+        names = filter_after_position(names, position)
+    names = [name for name in names if name.is_definition()]
+
+    # Private name mangling (compile.c) disallows access on names
+    # preceeded by two underscores `__` if used outside of the class. Names
+    # that also end with two underscores (e.g. __id__) are not affected.
+    for name in list(names):
+        if name.value.startswith('__') and not name.value.endswith('__'):
+            if filter_private_variable(scope, origin):
+                names.remove(name)
+    return names
+
+
+class NameFinder(object):
+    def __init__(self, evaluator, scope, name_str, position=None):
+        self._evaluator = evaluator
+        # Make sure that it's not just a syntax tree node.
+        self.scope = evaluator.wrap(scope)
+        self.name_str = name_str
+        self.position = position
+        self._found_predefined_if_name = None
+
+    @debug.increase_indent
+    def find(self, scopes, attribute_lookup):
+        """
+        :params bool attribute_lookup: Tell to logic if we're accessing the
+            attribute or the contents of e.g. a function.
+        """
+        # TODO rename scopes to names_dicts
+
+        names = self.filter_name(scopes)
+        if self._found_predefined_if_name is not None:
+            return self._found_predefined_if_name
+
+        types = self._names_to_types(names, attribute_lookup)
+
+        if not names and not types \
+                and not (isinstance(self.name_str, tree.Name) and
+                         isinstance(self.name_str.parent.parent, tree.Param)):
+            if not isinstance(self.name_str, (str, unicode)):  # TODO Remove?
+                if attribute_lookup:
+                    analysis.add_attribute_error(self._evaluator,
+                                                 self.scope, self.name_str)
+                else:
+                    message = ("NameError: name '%s' is not defined."
+                               % self.name_str)
+                    analysis.add(self._evaluator, 'name-error', self.name_str,
+                                 message)
+
+        debug.dbg('finder._names_to_types: %s -> %s', names, types)
+        return types
+
+    def scopes(self, search_global=False):
+        if search_global:
+            return global_names_dict_generator(self._evaluator, self.scope, self.position)
+        else:
+            return ((n, None) for n in self.scope.names_dicts(search_global))
+
+    def names_dict_lookup(self, names_dict, position):
+        def get_param(scope, el):
+            if isinstance(el.get_parent_until(tree.Param), tree.Param):
+                return scope.param_by_name(str(el))
+            return el
+
+        search_str = str(self.name_str)
+        try:
+            names = names_dict[search_str]
+            if not names:  # We want names, otherwise stop.
+                return []
+        except KeyError:
+            return []
+
+        names = filter_definition_names(names, self.name_str, position)
+
+        name_scope = None
+        # Only the names defined in the last position are valid definitions.
+        last_names = []
+        for name in reversed(sorted(names, key=lambda name: name.start_pos)):
+            stmt = name.get_definition()
+            name_scope = self._evaluator.wrap(stmt.get_parent_scope())
+
+            if isinstance(self.scope, er.Instance) and not isinstance(name_scope, er.Instance):
+                # Instances should not be checked for positioning, because we
+                # don't know in which order the functions are called.
+                last_names.append(name)
+                continue
+
+            if isinstance(name_scope, compiled.CompiledObject):
+                # Let's test this. TODO need comment. shouldn't this be
+                # filtered before?
+                last_names.append(name)
+                continue
+
+            if isinstance(stmt, er.ModuleWrapper):
+                # In case of REPL completion, we can infer modules names that
+                # don't really have a definition (because they are really just
+                # namespaces). In this case we can just add it.
+                last_names.append(name)
+                continue
+
+            if isinstance(name, compiled.CompiledName) \
+                    or isinstance(name, er.InstanceName) and isinstance(name._origin_name, compiled.CompiledName):
+                last_names.append(name)
+                continue
+
+            if isinstance(self.name_str, tree.Name):
+                origin_scope = self.name_str.get_parent_until(tree.Scope, reverse=True)
+                scope = self.name_str
+                check = None
+                while True:
+                    scope = scope.parent
+                    if scope.type in ("if_stmt", "for_stmt", "comp_for"):
+                        try:
+                            name_dict = self._evaluator.predefined_if_name_dict_dict[scope]
+                            types = set(name_dict[str(self.name_str)])
+                        except KeyError:
+                            continue
+                        else:
+                            if self.name_str.start_pos < scope.children[1].end_pos:
+                                # It doesn't make any sense to check if
+                                # statements in the if statement itself, just
+                                # deliver types.
+                                self._found_predefined_if_name = types
+                            else:
+                                check = flow_analysis.break_check(self._evaluator, self.scope,
+                                                                  origin_scope)
+                                if check is flow_analysis.UNREACHABLE:
+                                    self._found_predefined_if_name = set()
+                                else:
+                                    self._found_predefined_if_name = types
+                            break
+                    if isinstance(scope, tree.IsScope) or scope is None:
+                        break
+            else:
+                origin_scope = None
+
+            if isinstance(stmt.parent, compiled.CompiledObject):
+                # TODO seriously? this is stupid.
+                continue
+            check = flow_analysis.break_check(self._evaluator, name_scope,
+                                              stmt, origin_scope)
+            if check is not flow_analysis.UNREACHABLE:
+                last_names.append(name)
+
+            if check is flow_analysis.REACHABLE:
+                break
+
+        if isinstance(name_scope, er.FunctionExecution):
+            # Replace params
+            return [get_param(name_scope, n) for n in last_names]
+        return last_names
+
+    def filter_name(self, names_dicts):
+        """
+        Searches names that are defined in a scope (the different
+        `names_dicts`), until a name fits.
+        """
+        names = []
+        for names_dict, position in names_dicts:
+            names = self.names_dict_lookup(names_dict, position)
+            if names:
+                break
+
+        debug.dbg('finder.filter_name "%s" in (%s): %s@%s', self.name_str,
+                  self.scope, names, self.position)
+        return list(self._clean_names(names))
+
+    def _clean_names(self, names):
+        """
+        ``NameFinder.filter_name`` should only output names with correct
+        wrapper parents. We don't want to see AST classes out in the
+        evaluation, so remove them already here!
+        """
+        for n in names:
+            definition = n.parent
+            if isinstance(definition, (compiled.CompiledObject,
+                iterable.BuiltinMethod)):
+                # TODO this if should really be removed by changing the type of
+                #      those classes.
+                yield n
+            elif definition.type in ('funcdef', 'classdef', 'file_input'):
+                yield self._evaluator.wrap(definition).name
+            else:
+                yield n
+
+    def _check_getattr(self, inst):
+        """Checks for both __getattr__ and __getattribute__ methods"""
+        result = set()
+        # str is important, because it shouldn't be `Name`!
+        name = compiled.create(self._evaluator, str(self.name_str))
+        with common.ignored(KeyError):
+            result = inst.execute_subscope_by_name('__getattr__', name)
+        if not result:
+            # This is a little bit special. `__getattribute__` is in Python
+            # executed before `__getattr__`. But: I know no use case, where
+            # this could be practical and where jedi would return wrong types.
+            # If you ever find something, let me know!
+            # We are inversing this, because a hand-crafted `__getattribute__`
+            # could still call another hand-crafted `__getattr__`, but not the
+            # other way around.
+            with common.ignored(KeyError):
+                result = inst.execute_subscope_by_name('__getattribute__', name)
+        return result
+
+    def _names_to_types(self, names, attribute_lookup):
+        types = set()
+
+        # Add isinstance and other if/assert knowledge.
+        if isinstance(self.name_str, tree.Name):
+            # Ignore FunctionExecution parents for now.
+            flow_scope = self.name_str
+            until = flow_scope.get_parent_until(er.FunctionExecution)
+            while not isinstance(until, er.FunctionExecution):
+                flow_scope = flow_scope.get_parent_scope(include_flows=True)
+                if flow_scope is None:
+                    break
+                # TODO check if result is in scope -> no evaluation necessary
+                n = check_flow_information(self._evaluator, flow_scope,
+                                           self.name_str, self.position)
+                if n:
+                    return n
+
+        for name in names:
+            new_types = _name_to_types(self._evaluator, name, self.scope)
+            if isinstance(self.scope, (er.Class, er.Instance)) and attribute_lookup:
+                types |= set(self._resolve_descriptors(name, new_types))
+            else:
+                types |= set(new_types)
+        if not names and isinstance(self.scope, er.Instance):
+            # handling __getattr__ / __getattribute__
+            return self._check_getattr(self.scope)
+
+        return types
+
+    def _resolve_descriptors(self, name, types):
+        # The name must not be in the dictionary, but part of the class
+        # definition. __get__ is only called if the descriptor is defined in
+        # the class dictionary.
+        name_scope = name.get_definition().get_parent_scope()
+        if not isinstance(name_scope, (er.Instance, tree.Class)):
+            return types
+
+        result = set()
+        for r in types:
+            try:
+                desc_return = r.get_descriptor_returns
+            except AttributeError:
+                result.add(r)
+            else:
+                result |= desc_return(self.scope)
+        return result
+
+
+def _get_global_stmt_scopes(evaluator, global_stmt, name):
+    global_stmt_scope = global_stmt.get_parent_scope()
+    module = global_stmt_scope.get_parent_until()
+    for used_name in module.used_names[str(name)]:
+        if used_name.parent.type == 'global_stmt':
+            yield evaluator.wrap(used_name.get_parent_scope())
+
+
+@memoize_default(set(), evaluator_is_first_arg=True)
+def _name_to_types(evaluator, name, scope):
+    types = []
+    typ = name.get_definition()
+    if typ.isinstance(tree.ForStmt):
+        types = pep0484.find_type_from_comment_hint_for(evaluator, typ, name)
+        if types:
+            return types
+    if typ.isinstance(tree.WithStmt):
+        types = pep0484.find_type_from_comment_hint_with(evaluator, typ, name)
+        if types:
+            return types
+    if typ.isinstance(tree.ForStmt, tree.CompFor):
+        container_types = evaluator.eval_element(typ.children[3])
+        for_types = iterable.py__iter__types(evaluator, container_types, typ.children[3])
+        types = check_tuple_assignments(evaluator, for_types, name)
+    elif isinstance(typ, tree.Param):
+        types = _eval_param(evaluator, typ, scope)
+    elif typ.isinstance(tree.ExprStmt):
+        types = _remove_statements(evaluator, typ, name)
+    elif typ.isinstance(tree.WithStmt):
+        types = evaluator.eval_element(typ.node_from_name(name))
+    elif isinstance(typ, tree.Import):
+        types = imports.ImportWrapper(evaluator, name).follow()
+    elif typ.type == 'global_stmt':
+        for s in _get_global_stmt_scopes(evaluator, typ, name):
+            finder = NameFinder(evaluator, s, str(name))
+            names_dicts = finder.scopes(search_global=True)
+            # For global_stmt lookups, we only need the first possible scope,
+            # which means the function itself.
+            names_dicts = [next(names_dicts)]
+            types += finder.find(names_dicts, attribute_lookup=False)
+    elif isinstance(typ, tree.TryStmt):
+        # TODO an exception can also be a tuple. Check for those.
+        # TODO check for types that are not classes and add it to
+        # the static analysis report.
+        exceptions = evaluator.eval_element(name.get_previous_sibling().get_previous_sibling())
+        types = set(chain.from_iterable(evaluator.execute(t) for t in exceptions))
+    else:
+        if typ.isinstance(er.Function):
+            typ = typ.get_decorated_func()
+        types = set([typ])
+    return types
+
+
+def _remove_statements(evaluator, stmt, name):
+    """
+    This is the part where statements are being stripped.
+
+    Due to lazy evaluation, statements like a = func; b = a; b() have to be
+    evaluated.
+    """
+    types = set()
+    # Remove the statement docstr stuff for now, that has to be
+    # implemented with the evaluator class.
+    #if stmt.docstr:
+        #res_new.append(stmt)
+
+    check_instance = None
+    if isinstance(stmt, er.InstanceElement) and stmt.is_class_var:
+        check_instance = stmt.instance
+        stmt = stmt.var
+
+    pep0484types = \
+        pep0484.find_type_from_comment_hint_assign(evaluator, stmt, name)
+    if pep0484types:
+        return pep0484types
+    types |= evaluator.eval_statement(stmt, seek_name=name)
+
+    if check_instance is not None:
+        # class renames
+        types = set([er.get_instance_el(evaluator, check_instance, a, True)
+                     if isinstance(a, (er.Function, tree.Function))
+                     else a for a in types])
+    return types
+
+
+def _eval_param(evaluator, param, scope):
+    res_new = set()
+    func = param.get_parent_scope()
+
+    cls = func.parent.get_parent_until((tree.Class, tree.Function))
+
+    from jedi.evaluate.param import ExecutedParam, Arguments
+    if isinstance(cls, tree.Class) and param.position_nr == 0 \
+            and not isinstance(param, ExecutedParam):
+        # This is where we add self - if it has never been
+        # instantiated.
+        if isinstance(scope, er.InstanceElement):
+            res_new.add(scope.instance)
+        else:
+            inst = er.Instance(evaluator, evaluator.wrap(cls),
+                               Arguments(evaluator, ()), is_generated=True)
+            res_new.add(inst)
+        return res_new
+
+    # Instances are typically faked, if the instance is not called from
+    # outside. Here we check it for __init__ functions and return.
+    if isinstance(func, er.InstanceElement) \
+            and func.instance.is_generated and str(func.name) == '__init__':
+        param = func.var.params[param.position_nr]
+
+    # Add pep0484 and docstring knowledge.
+    pep0484_hints = pep0484.follow_param(evaluator, param)
+    doc_params = docstrings.follow_param(evaluator, param)
+    if pep0484_hints or doc_params:
+        return list(set(pep0484_hints) | set(doc_params))
+
+    if isinstance(param, ExecutedParam):
+        return res_new | param.eval(evaluator)
+    else:
+        # Param owns no information itself.
+        res_new |= dynamic.search_params(evaluator, param)
+        if not res_new:
+            if param.stars:
+                t = 'tuple' if param.stars == 1 else 'dict'
+                typ = list(evaluator.find_types(evaluator.BUILTINS, t))[0]
+                res_new = evaluator.execute(typ)
+        if param.default:
+            res_new |= evaluator.eval_element(param.default)
+        return res_new
+
+
+def check_flow_information(evaluator, flow, search_name, pos):
+    """ Try to find out the type of a variable just with the information that
+    is given by the flows: e.g. It is also responsible for assert checks.::
+
+        if isinstance(k, str):
+            k.  # <- completion here
+
+    ensures that `k` is a string.
+    """
+    if not settings.dynamic_flow_information:
+        return None
+
+    result = set()
+    if flow.is_scope():
+        # Check for asserts.
+        try:
+            names = reversed(flow.names_dict[search_name.value])
+        except (KeyError, AttributeError):
+            names = []
+
+        for name in names:
+            ass = name.get_parent_until(tree.AssertStmt)
+            if isinstance(ass, tree.AssertStmt) and pos is not None and ass.start_pos < pos:
+                result = _check_isinstance_type(evaluator, ass.assertion(), search_name)
+                if result:
+                    break
+
+    if isinstance(flow, (tree.IfStmt, tree.WhileStmt)):
+        potential_ifs = [c for c in flow.children[1::4] if c != ':']
+        for if_test in reversed(potential_ifs):
+            if search_name.start_pos > if_test.end_pos:
+                return _check_isinstance_type(evaluator, if_test, search_name)
+    return result
+
+
+def _check_isinstance_type(evaluator, element, search_name):
+    try:
+        assert element.type in ('power', 'atom_expr')
+        # this might be removed if we analyze and, etc
+        assert len(element.children) == 2
+        first, trailer = element.children
+        assert isinstance(first, tree.Name) and first.value == 'isinstance'
+        assert trailer.type == 'trailer' and trailer.children[0] == '('
+        assert len(trailer.children) == 3
+
+        # arglist stuff
+        arglist = trailer.children[1]
+        args = param.Arguments(evaluator, arglist, trailer)
+        lst = list(args.unpack())
+        # Disallow keyword arguments
+        assert len(lst) == 2 and lst[0][0] is None and lst[1][0] is None
+        name = lst[0][1][0]  # first argument, values, first value
+        # Do a simple get_code comparison. They should just have the same code,
+        # and everything will be all right.
+        classes = lst[1][1][0]
+        call = helpers.call_of_leaf(search_name)
+        assert name.get_code(normalized=True) == call.get_code(normalized=True)
+    except AssertionError:
+        return set()
+
+    result = set()
+    for cls_or_tup in evaluator.eval_element(classes):
+        if isinstance(cls_or_tup, iterable.Array) and cls_or_tup.type == 'tuple':
+            for typ in unite(cls_or_tup.py__iter__()):
+                result |= evaluator.execute(typ)
+        else:
+            result |= evaluator.execute(cls_or_tup)
+    return result
+
+
+def global_names_dict_generator(evaluator, scope, position):
+    """
+    For global name lookups. Yields tuples of (names_dict, position). If the
+    position is None, the position does not matter anymore in that scope.
+
+    This function is used to include names from outer scopes. For example, when
+    the current scope is function:
+
+    >>> from jedi._compatibility import u, no_unicode_pprint
+    >>> from jedi.parser import ParserWithRecovery, load_grammar
+    >>> parser = ParserWithRecovery(load_grammar(), u('''
+    ... x = ['a', 'b', 'c']
+    ... def func():
+    ...     y = None
+    ... '''))
+    >>> scope = parser.module.subscopes[0]
+    >>> scope
+    <Function: func@3-5>
+
+    `global_names_dict_generator` is a generator.  First it yields names from
+    most inner scope.
+
+    >>> from jedi.evaluate import Evaluator
+    >>> evaluator = Evaluator(load_grammar())
+    >>> scope = evaluator.wrap(scope)
+    >>> pairs = list(global_names_dict_generator(evaluator, scope, (4, 0)))
+    >>> no_unicode_pprint(pairs[0])
+    ({'func': [], 'y': [<Name: y@4,4>]}, (4, 0))
+
+    Then it yields the names from one level "lower". In this example, this
+    is the most outer scope. As you can see, the position in the tuple is now
+    None, because typically the whole module is loaded before the function is
+    called.
+
+    >>> no_unicode_pprint(pairs[1])
+    ({'func': [<Name: func@3,4>], 'x': [<Name: x@2,0>]}, None)
+
+    After that we have a few underscore names that are part of the module.
+
+    >>> sorted(pairs[2][0].keys())
+    ['__doc__', '__file__', '__name__', '__package__']
+    >>> pairs[3]  # global names -> there are none in our example.
+    ({}, None)
+    >>> pairs[4]  # package modules -> Also none.
+    ({}, None)
+
+    Finally, it yields names from builtin, if `include_builtin` is
+    true (default).
+
+    >>> pairs[5][0].values()                              #doctest: +ELLIPSIS
+    [[<CompiledName: ...>], ...]
+    """
+    in_func = False
+    while scope is not None:
+        if not (scope.type == 'classdef' and in_func):
+            # Names in methods cannot be resolved within the class.
+
+            for names_dict in scope.names_dicts(True):
+                yield names_dict, position
+                if hasattr(scope, 'resets_positions'):
+                    # TODO This is so ugly, seriously. However there's
+                    #      currently no good way of influencing
+                    #      global_names_dict_generator when it comes to certain
+                    #      objects.
+                    position = None
+            if scope.type == 'funcdef':
+                # The position should be reset if the current scope is a function.
+                in_func = True
+                position = None
+        scope = evaluator.wrap(scope.get_parent_scope())
+
+    # Add builtins to the global scope.
+    for names_dict in evaluator.BUILTINS.names_dicts(True):
+        yield names_dict, None
+
+
+def check_tuple_assignments(evaluator, types, name):
+    """
+    Checks if tuples are assigned.
+    """
+    for index, node in name.assignment_indexes():
+        iterated = iterable.py__iter__(evaluator, types, node)
+        for _ in range(index + 1):
+            try:
+                types = next(iterated)
+            except StopIteration:
+                # We could do this with the default param in next. But this
+                # would allow this loop to run for a very long time if the
+                # index number is high. Therefore break if the loop is
+                # finished.
+                types = set()
+                break
+    return types
+
+
+def filter_private_variable(scope, origin_node):
+    """Check if a variable is defined inside the same class or outside."""
+    instance = scope.get_parent_scope()
+    coming_from = origin_node
+    while coming_from is not None \
+            and not isinstance(coming_from, (tree.Class, compiled.CompiledObject)):
+        coming_from = coming_from.get_parent_scope()
+
+    # CompiledObjects don't have double underscore attributes, but Jedi abuses
+    # those for fakes (builtins.pym -> list).
+    if isinstance(instance, compiled.CompiledObject):
+        return instance != coming_from
+    else:
+        return isinstance(instance, er.Instance) and instance.base.base != coming_from
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/flow_analysis.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/flow_analysis.py
new file mode 100644
index 0000000..e188264
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/flow_analysis.py
@@ -0,0 +1,91 @@
+from jedi.parser import tree
+
+
+class Status(object):
+    lookup_table = {}
+
+    def __init__(self, value, name):
+        self._value = value
+        self._name = name
+        Status.lookup_table[value] = self
+
+    def invert(self):
+        if self is REACHABLE:
+            return UNREACHABLE
+        elif self is UNREACHABLE:
+            return REACHABLE
+        else:
+            return UNSURE
+
+    def __and__(self, other):
+        if UNSURE in (self, other):
+            return UNSURE
+        else:
+            return REACHABLE if self._value and other._value else UNREACHABLE
+
+    def __repr__(self):
+        return '<%s: %s>' % (type(self).__name__, self._name)
+
+
+REACHABLE = Status(True, 'reachable')
+UNREACHABLE = Status(False, 'unreachable')
+UNSURE = Status(None, 'unsure')
+
+
+def break_check(evaluator, base_scope, stmt, origin_scope=None):
+    element_scope = evaluator.wrap(stmt.get_parent_scope(include_flows=True))
+    # Direct parents get resolved, we filter scopes that are separate branches.
+    # This makes sense for autocompletion and static analysis. For actual
+    # Python it doesn't matter, because we're talking about potentially
+    # unreachable code.
+    # e.g. `if 0:` would cause all name lookup within the flow make
+    # unaccessible. This is not a "problem" in Python, because the code is
+    # never called. In Jedi though, we still want to infer types.
+    while origin_scope is not None:
+        if element_scope == origin_scope:
+            return REACHABLE
+        origin_scope = origin_scope.parent
+    x = _break_check(evaluator, stmt, base_scope, element_scope)
+    return x
+
+
+def _break_check(evaluator, stmt, base_scope, element_scope):
+    element_scope = evaluator.wrap(element_scope)
+    base_scope = evaluator.wrap(base_scope)
+
+    reachable = REACHABLE
+    if isinstance(element_scope, tree.IfStmt):
+        if element_scope.node_after_else(stmt):
+            for check_node in element_scope.check_nodes():
+                reachable = _check_if(evaluator, check_node)
+                if reachable in (REACHABLE, UNSURE):
+                    break
+            reachable = reachable.invert()
+        else:
+            node = element_scope.node_in_which_check_node(stmt)
+            if node is not None:
+                reachable = _check_if(evaluator, node)
+    elif isinstance(element_scope, (tree.TryStmt, tree.WhileStmt)):
+        return UNSURE
+
+    # Only reachable branches need to be examined further.
+    if reachable in (UNREACHABLE, UNSURE):
+        return reachable
+
+    if element_scope.type == 'file_input':
+        # The definition is in another module and therefore just return what we
+        # have generated.
+        return reachable
+    if base_scope != element_scope and base_scope != element_scope.parent:
+        return reachable & _break_check(evaluator, stmt, base_scope, element_scope.parent)
+    else:
+        return reachable
+
+
+def _check_if(evaluator, node):
+    types = evaluator.eval_element(node)
+    values = set(x.py__bool__() for x in types)
+    if len(values) == 1:
+        return Status.lookup_table[values.pop()]
+    else:
+        return UNSURE
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/helpers.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/helpers.py
new file mode 100644
index 0000000..27293ed
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/helpers.py
@@ -0,0 +1,200 @@
+import copy
+from itertools import chain
+
+from jedi.parser import tree
+
+
+def deep_ast_copy(obj, parent=None, new_elements=None):
+    """
+    Much, much faster than copy.deepcopy, but just for Parser elements (Doesn't
+    copy parents).
+    """
+
+    if new_elements is None:
+        new_elements = {}
+
+    def copy_node(obj):
+        # If it's already in the cache, just return it.
+        try:
+            return new_elements[obj]
+        except KeyError:
+            # Actually copy and set attributes.
+            new_obj = copy.copy(obj)
+            new_elements[obj] = new_obj
+
+        # Copy children
+        new_children = []
+        for child in obj.children:
+            typ = child.type
+            if typ in ('newline', 'operator', 'keyword', 'number', 'string',
+                       'indent', 'dedent', 'endmarker', 'error_leaf'):
+                # At the moment we're not actually copying those primitive
+                # elements, because there's really no need to. The parents are
+                # obviously wrong, but that's not an issue.
+                new_child = child
+            elif typ == 'name':
+                new_elements[child] = new_child = copy.copy(child)
+                new_child.parent = new_obj
+            else:  # Is a BaseNode.
+                new_child = copy_node(child)
+                new_child.parent = new_obj
+            new_children.append(new_child)
+        new_obj.children = new_children
+
+        # Copy the names_dict (if there is one).
+        try:
+            names_dict = obj.names_dict
+        except AttributeError:
+            pass
+        else:
+            try:
+                new_obj.names_dict = new_names_dict = {}
+            except AttributeError:  # Impossible to set CompFor.names_dict
+                pass
+            else:
+                for string, names in names_dict.items():
+                    new_names_dict[string] = [new_elements[n] for n in names]
+        return new_obj
+
+    if isinstance(obj, tree.BaseNode):
+        new_obj = copy_node(obj)
+    else:
+        # Special case of a Name object.
+        new_elements[obj] = new_obj = copy.copy(obj)
+
+    if parent is not None:
+        new_obj.parent = parent
+    return new_obj
+
+
+def call_of_leaf(leaf, cut_own_trailer=False):
+    """
+    Creates a "call" node that consist of all ``trailer`` and ``power``
+    objects.  E.g. if you call it with ``append``::
+
+        list([]).append(3) or None
+
+    You would get a node with the content ``list([]).append`` back.
+
+    This generates a copy of the original ast node.
+
+    If you're using the leaf, e.g. the bracket `)` it will return ``list([])``.
+
+    # TODO remove cut_own_trailer option, since its always used with it. Just
+    #      ignore it, It's not what we want anyway. Or document it better?
+    """
+    trailer = leaf.parent
+    # The leaf may not be the last or first child, because there exist three
+    # different trailers: `( x )`, `[ x ]` and `.x`. In the first two examples
+    # we should not match anything more than x.
+    if trailer.type != 'trailer' or leaf not in (trailer.children[0], trailer.children[-1]):
+        if trailer.type == 'atom':
+            return trailer
+        return leaf
+
+    power = trailer.parent
+    index = power.children.index(trailer)
+    power = deep_ast_copy(power)
+    if cut_own_trailer:
+        cut = index
+    else:
+        cut = index + 1
+    power.children[cut:] = []
+
+    if power.type == 'error_node':
+        start = index
+        while True:
+            start -= 1
+            if power.children[start].type != 'trailer':
+                break
+        transformed = tree.Node('power', power.children[start:])
+        transformed.parent = power.parent
+        return transformed
+
+    return power
+
+
+def get_names_of_node(node):
+    try:
+        children = node.children
+    except AttributeError:
+        if node.type == 'name':
+            return [node]
+        else:
+            return []
+    else:
+        return list(chain.from_iterable(get_names_of_node(c) for c in children))
+
+
+def get_module_names(module, all_scopes):
+    """
+    Returns a dictionary with name parts as keys and their call paths as
+    values.
+    """
+    if all_scopes:
+        dct = module.used_names
+    else:
+        dct = module.names_dict
+    return chain.from_iterable(dct.values())
+
+
+class FakeImport(tree.ImportName):
+    def __init__(self, name, parent, level=0):
+        super(FakeImport, self).__init__([])
+        self.parent = parent
+        self._level = level
+        self.name = name
+
+    def get_defined_names(self):
+        return [self.name]
+
+    def aliases(self):
+        return {}
+
+    @property
+    def level(self):
+        return self._level
+
+    @property
+    def start_pos(self):
+        return 0, 0
+
+    def paths(self):
+        return [[self.name]]
+
+    def is_definition(self):
+        return True
+
+
+class FakeName(tree.Name):
+    def __init__(self, name_str, parent=None, start_pos=(0, 0), is_definition=None):
+        """
+        In case is_definition is defined (not None), that bool value will be
+        returned.
+        """
+        super(FakeName, self).__init__(tree.zero_position_modifier, name_str, start_pos)
+        self.parent = parent
+        self._is_definition = is_definition
+
+    def get_definition(self):
+        return self.parent
+
+    def is_definition(self):
+        if self._is_definition is None:
+            return super(FakeName, self).is_definition()
+        else:
+            return self._is_definition
+
+
+class LazyName(FakeName):
+    def __init__(self, name, parent_callback, is_definition=None):
+        super(LazyName, self).__init__(name, is_definition=is_definition)
+        self._parent_callback = parent_callback
+
+    @property
+    def parent(self):
+        return self._parent_callback()
+
+    @parent.setter
+    def parent(self, value):
+        pass  # Do nothing, super classes can try to set the parent.
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/imports.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/imports.py
new file mode 100644
index 0000000..d65d897
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/imports.py
@@ -0,0 +1,517 @@
+"""
+:mod:`jedi.evaluate.imports` is here to resolve import statements and return
+the modules/classes/functions/whatever, which they stand for. However there's
+not any actual importing done. This module is about finding modules in the
+filesystem. This can be quite tricky sometimes, because Python imports are not
+always that simple.
+
+This module uses imp for python up to 3.2 and importlib for python 3.3 on; the
+correct implementation is delegated to _compatibility.
+
+This module also supports import autocompletion, which means to complete
+statements like ``from datetim`` (curser at the end would return ``datetime``).
+"""
+import imp
+import os
+import pkgutil
+import sys
+from itertools import chain
+
+from jedi._compatibility import find_module, unicode
+from jedi import common
+from jedi import debug
+from jedi.parser import fast
+from jedi.parser import tree
+from jedi.parser.utils import save_parser, load_parser, parser_cache
+from jedi.evaluate import sys_path
+from jedi.evaluate import helpers
+from jedi import settings
+from jedi.common import source_to_unicode
+from jedi.evaluate import compiled
+from jedi.evaluate import analysis
+from jedi.evaluate.cache import memoize_default, NO_DEFAULT
+
+
+def completion_names(evaluator, imp, pos):
+    name = imp.name_for_position(pos)
+    module = evaluator.wrap(imp.get_parent_until())
+    if name is None:
+        level = 0
+        for node in imp.children:
+            if node.end_pos <= pos:
+                if node in ('.', '...'):
+                    level += len(node.value)
+        import_path = []
+    else:
+        # Completion on an existing name.
+
+        # The import path needs to be reduced by one, because we're completing.
+        import_path = imp.path_for_name(name)[:-1]
+        level = imp.level
+
+    importer = Importer(evaluator, tuple(import_path), module, level)
+    if isinstance(imp, tree.ImportFrom):
+        c = imp.children
+        only_modules = c[c.index('import')].start_pos >= pos
+    else:
+        only_modules = True
+    return importer.completion_names(evaluator, only_modules)
+
+
+class ImportWrapper(tree.Base):
+    def __init__(self, evaluator, name):
+        self._evaluator = evaluator
+        self._name = name
+
+        self._import = name.get_parent_until(tree.Import)
+        self.import_path = self._import.path_for_name(name)
+
+    @memoize_default()
+    def follow(self, is_goto=False):
+        module = self._evaluator.wrap(self._import.get_parent_until())
+        import_path = self._import.path_for_name(self._name)
+        from_import_name = None
+        try:
+            from_names = self._import.get_from_names()
+        except AttributeError:
+            # Is an import_name
+            pass
+        else:
+            if len(from_names) + 1 == len(import_path):
+                # We have to fetch the from_names part first and then check
+                # if from_names exists in the modules.
+                from_import_name = import_path[-1]
+                import_path = from_names
+
+        importer = Importer(self._evaluator, tuple(import_path),
+                            module, self._import.level)
+
+        types = importer.follow()
+
+        #if self._import.is_nested() and not self.nested_resolve:
+        #    scopes = [NestedImportModule(module, self._import)]
+
+        if from_import_name is not None:
+            types = set(chain.from_iterable(
+                self._evaluator.find_types(t, unicode(from_import_name),
+                                           is_goto=is_goto)
+                for t in types))
+
+            if not types:
+                path = import_path + [from_import_name]
+                importer = Importer(self._evaluator, tuple(path),
+                                    module, self._import.level)
+                types = importer.follow()
+                # goto only accepts `Name`
+                if is_goto:
+                    types = set(s.name for s in types)
+        else:
+            # goto only accepts `Name`
+            if is_goto:
+                types = set(s.name for s in types)
+
+        debug.dbg('after import: %s', types)
+        return types
+
+
+class NestedImportModule(tree.Module):
+    """
+    TODO while there's no use case for nested import module right now, we might
+        be able to use them for static analysis checks later on.
+    """
+    def __init__(self, module, nested_import):
+        self._module = module
+        self._nested_import = nested_import
+
+    def _get_nested_import_name(self):
+        """
+        Generates an Import statement, that can be used to fake nested imports.
+        """
+        i = self._nested_import
+        # This is not an existing Import statement. Therefore, set position to
+        # 0 (0 is not a valid line number).
+        zero = (0, 0)
+        names = [unicode(name) for name in i.namespace_names[1:]]
+        name = helpers.FakeName(names, self._nested_import)
+        new = tree.Import(i._sub_module, zero, zero, name)
+        new.parent = self._module
+        debug.dbg('Generated a nested import: %s', new)
+        return helpers.FakeName(str(i.namespace_names[1]), new)
+
+    def __getattr__(self, name):
+        return getattr(self._module, name)
+
+    def __repr__(self):
+        return "<%s: %s of %s>" % (self.__class__.__name__, self._module,
+                                   self._nested_import)
+
+
+def _add_error(evaluator, name, message=None):
+    if hasattr(name, 'parent'):
+        # Should be a name, not a string!
+        analysis.add(evaluator, 'import-error', name, message)
+
+
+def get_init_path(directory_path):
+    """
+    The __init__ file can be searched in a directory. If found return it, else
+    None.
+    """
+    for suffix, _, _ in imp.get_suffixes():
+        path = os.path.join(directory_path, '__init__' + suffix)
+        if os.path.exists(path):
+            return path
+    return None
+
+
+class Importer(object):
+    def __init__(self, evaluator, import_path, module, level=0):
+        """
+        An implementation similar to ``__import__``. Use `follow`
+        to actually follow the imports.
+
+        *level* specifies whether to use absolute or relative imports. 0 (the
+        default) means only perform absolute imports. Positive values for level
+        indicate the number of parent directories to search relative to the
+        directory of the module calling ``__import__()`` (see PEP 328 for the
+        details).
+
+        :param import_path: List of namespaces (strings or Names).
+        """
+        debug.speed('import %s' % (import_path,))
+        self._evaluator = evaluator
+        self.level = level
+        self.module = module
+        try:
+            self.file_path = module.py__file__()
+        except AttributeError:
+            # Can be None for certain compiled modules like 'builtins'.
+            self.file_path = None
+
+        if level:
+            base = module.py__package__().split('.')
+            if base == ['']:
+                base = []
+            if level > len(base):
+                path = module.py__file__()
+                if path is not None:
+                    import_path = list(import_path)
+                    for i in range(level):
+                        path = os.path.dirname(path)
+                    dir_name = os.path.basename(path)
+                    # This is not the proper way to do relative imports. However, since
+                    # Jedi cannot be sure about the entry point, we just calculate an
+                    # absolute path here.
+                    if dir_name:
+                        import_path.insert(0, dir_name)
+                    else:
+                        _add_error(self._evaluator, import_path[-1])
+                        import_path = []
+                        # TODO add import error.
+                        debug.warning('Attempted relative import beyond top-level package.')
+            else:
+                # Here we basically rewrite the level to 0.
+                import_path = tuple(base) + tuple(import_path)
+        self.import_path = import_path
+
+    @property
+    def str_import_path(self):
+        """Returns the import path as pure strings instead of `Name`."""
+        return tuple(str(name) for name in self.import_path)
+
+    @memoize_default()
+    def sys_path_with_modifications(self):
+        in_path = []
+        sys_path_mod = list(sys_path.sys_path_with_modifications(self._evaluator, self.module))
+        if self.file_path is not None:
+            # If you edit e.g. gunicorn, there will be imports like this:
+            # `from gunicorn import something`. But gunicorn is not in the
+            # sys.path. Therefore look if gunicorn is a parent directory, #56.
+            if self.import_path:  # TODO is this check really needed?
+                for path in sys_path.traverse_parents(self.file_path):
+                    if os.path.basename(path) == self.str_import_path[0]:
+                        in_path.append(os.path.dirname(path))
+
+            # Since we know nothing about the call location of the sys.path,
+            # it's a possibility that the current directory is the origin of
+            # the Python execution.
+            sys_path_mod.insert(0, os.path.dirname(self.file_path))
+
+        return in_path + sys_path_mod
+
+    @memoize_default(NO_DEFAULT)
+    def follow(self):
+        if not self.import_path:
+            return set()
+        return self._do_import(self.import_path, self.sys_path_with_modifications())
+
+    def _do_import(self, import_path, sys_path):
+        """
+        This method is very similar to importlib's `_gcd_import`.
+        """
+        import_parts = [str(i) for i in import_path]
+
+        # Handle "magic" Flask extension imports:
+        # ``flask.ext.foo`` is really ``flask_foo`` or ``flaskext.foo``.
+        if len(import_path) > 2 and import_parts[:2] == ['flask', 'ext']:
+            # New style.
+            ipath = ('flask_' + str(import_parts[2]),) + import_path[3:]
+            modules = self._do_import(ipath, sys_path)
+            if modules:
+                return modules
+            else:
+                # Old style
+                return self._do_import(('flaskext',) + import_path[2:], sys_path)
+
+        module_name = '.'.join(import_parts)
+        try:
+            return set([self._evaluator.modules[module_name]])
+        except KeyError:
+            pass
+
+        if len(import_path) > 1:
+            # This is a recursive way of importing that works great with
+            # the module cache.
+            bases = self._do_import(import_path[:-1], sys_path)
+            if not bases:
+                return set()
+            # We can take the first element, because only the os special
+            # case yields multiple modules, which is not important for
+            # further imports.
+            parent_module = list(bases)[0]
+
+            # This is a huge exception, we follow a nested import
+            # ``os.path``, because it's a very important one in Python
+            # that is being achieved by messing with ``sys.modules`` in
+            # ``os``.
+            if [str(i) for i in import_path] == ['os', 'path']:
+                return self._evaluator.find_types(parent_module, 'path')
+
+            try:
+                paths = parent_module.py__path__()
+            except AttributeError:
+                # The module is not a package.
+                _add_error(self._evaluator, import_path[-1])
+                return set()
+            else:
+                debug.dbg('search_module %s in paths %s', module_name, paths)
+                for path in paths:
+                    # At the moment we are only using one path. So this is
+                    # not important to be correct.
+                    try:
+                        module_file, module_path, is_pkg = \
+                            find_module(import_parts[-1], [path])
+                        break
+                    except ImportError:
+                        module_path = None
+                if module_path is None:
+                    _add_error(self._evaluator, import_path[-1])
+                    return set()
+        else:
+            parent_module = None
+            try:
+                debug.dbg('search_module %s in %s', import_parts[-1], self.file_path)
+                # Override the sys.path. It works only good that way.
+                # Injecting the path directly into `find_module` did not work.
+                sys.path, temp = sys_path, sys.path
+                try:
+                    module_file, module_path, is_pkg = \
+                        find_module(import_parts[-1])
+                finally:
+                    sys.path = temp
+            except ImportError:
+                # The module is not a package.
+                _add_error(self._evaluator, import_path[-1])
+                return set()
+
+        source = None
+        if is_pkg:
+            # In this case, we don't have a file yet. Search for the
+            # __init__ file.
+            if module_path.endswith(('.zip', '.egg')):
+                source = module_file.loader.get_source(module_name)
+            else:
+                module_path = get_init_path(module_path)
+        elif module_file:
+            source = module_file.read()
+            module_file.close()
+
+        if module_file is None and not module_path.endswith(('.py', '.zip', '.egg')):
+            module = compiled.load_module(self._evaluator, module_path)
+        else:
+            module = _load_module(self._evaluator, module_path, source, sys_path, parent_module)
+
+        if module is None:
+            # The file might raise an ImportError e.g. and therefore not be
+            # importable.
+            return set()
+
+        self._evaluator.modules[module_name] = module
+        return set([module])
+
+    def _generate_name(self, name):
+        # Create a pseudo import to be able to follow them.
+        name = helpers.FakeName(name)
+        imp = helpers.FakeImport(name, parent=self.module)
+        name.parent = imp
+        return name
+
+    def _get_module_names(self, search_path=None):
+        """
+        Get the names of all modules in the search_path. This means file names
+        and not names defined in the files.
+        """
+
+        names = []
+        # add builtin module names
+        if search_path is None:
+            names += [self._generate_name(name) for name in sys.builtin_module_names]
+
+        if search_path is None:
+            search_path = self.sys_path_with_modifications()
+        for module_loader, name, is_pkg in pkgutil.iter_modules(search_path):
+            names.append(self._generate_name(name))
+        return names
+
+    def completion_names(self, evaluator, only_modules=False):
+        """
+        :param only_modules: Indicates wheter it's possible to import a
+            definition that is not defined in a module.
+        """
+        from jedi.evaluate import finder
+        names = []
+        if self.import_path:
+            # flask
+            if self.str_import_path == ('flask', 'ext'):
+                # List Flask extensions like ``flask_foo``
+                for mod in self._get_module_names():
+                    modname = str(mod)
+                    if modname.startswith('flask_'):
+                        extname = modname[len('flask_'):]
+                        names.append(self._generate_name(extname))
+                # Now the old style: ``flaskext.foo``
+                for dir in self.sys_path_with_modifications():
+                    flaskext = os.path.join(dir, 'flaskext')
+                    if os.path.isdir(flaskext):
+                        names += self._get_module_names([flaskext])
+
+            for scope in self.follow():
+                # Non-modules are not completable.
+                if not scope.type == 'file_input':  # not a module
+                    continue
+
+                # namespace packages
+                if isinstance(scope, tree.Module) and scope.path.endswith('__init__.py'):
+                    paths = scope.py__path__()
+                    names += self._get_module_names(paths)
+
+                if only_modules:
+                    # In the case of an import like `from x.` we don't need to
+                    # add all the variables.
+                    if ('os',) == self.str_import_path and not self.level:
+                        # os.path is a hardcoded exception, because it's a
+                        # ``sys.modules`` modification.
+                        names.append(self._generate_name('path'))
+
+                    continue
+
+                for names_dict in scope.names_dicts(search_global=False):
+                    _names = list(chain.from_iterable(names_dict.values()))
+                    if not _names:
+                        continue
+                    _names = finder.filter_definition_names(_names, scope)
+                    names += _names
+        else:
+            # Empty import path=completion after import
+            if not self.level:
+                names += self._get_module_names()
+
+            if self.file_path is not None:
+                path = os.path.abspath(self.file_path)
+                for i in range(self.level - 1):
+                    path = os.path.dirname(path)
+                names += self._get_module_names([path])
+
+        return names
+
+
+def _load_module(evaluator, path=None, source=None, sys_path=None, parent_module=None):
+    def load(source):
+        dotted_path = path and compiled.dotted_from_fs_path(path, sys_path)
+        if path is not None and path.endswith(('.py', '.zip', '.egg')) \
+                and dotted_path not in settings.auto_import_modules:
+            if source is None:
+                with open(path, 'rb') as f:
+                    source = f.read()
+        else:
+            return compiled.load_module(evaluator, path)
+        p = path
+        p = fast.FastParser(evaluator.grammar, common.source_to_unicode(source), p)
+        save_parser(path, p)
+        from jedi.evaluate.representation import ModuleWrapper
+        return ModuleWrapper(evaluator, p.module, parent_module)
+
+    if sys_path is None:
+        sys_path = evaluator.sys_path
+
+    cached = load_parser(path)
+    module = load(source) if cached is None else cached.module
+    module = evaluator.wrap(module)
+    return module
+
+
+def add_module(evaluator, module_name, module):
+    if '.' not in module_name:
+        # We cannot add paths with dots, because that would collide with
+        # the sepatator dots for nested packages. Therefore we return
+        # `__main__` in ModuleWrapper.py__name__(), which is similar to
+        # Python behavior.
+        evaluator.modules[module_name] = module
+
+
+def get_modules_containing_name(evaluator, mods, name):
+    """
+    Search a name in the directories of modules.
+    """
+    def check_python_file(path):
+        try:
+            return parser_cache[path].parser.module
+        except KeyError:
+            try:
+                return check_fs(path)
+            except IOError:
+                return None
+
+    def check_fs(path):
+        with open(path, 'rb') as f:
+            source = source_to_unicode(f.read())
+            if name in source:
+                module_name = os.path.basename(path)[:-3]  # Remove `.py`.
+                module = _load_module(evaluator, path, source)
+                add_module(evaluator, module_name, module)
+                return module
+
+    # skip non python modules
+    mods = set(m for m in mods if not isinstance(m, compiled.CompiledObject))
+    mod_paths = set()
+    for m in mods:
+        mod_paths.add(m.path)
+        yield m
+
+    if settings.dynamic_params_for_other_modules:
+        paths = set(settings.additional_dynamic_modules)
+        for p in mod_paths:
+            if p is not None:
+                # We need abspath, because the seetings paths might not already
+                # have been converted to absolute paths.
+                d = os.path.dirname(os.path.abspath(p))
+                for entry in os.listdir(d):
+                    if entry not in mod_paths:
+                        if entry.endswith('.py'):
+                            paths.add(d + os.path.sep + entry)
+
+        for p in sorted(paths):
+            # make testing easier, sort it - same results on every interpreter
+            c = check_python_file(p)
+            if c is not None and c not in mods and not isinstance(c, compiled.CompiledObject):
+                yield c
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/iterable.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/iterable.py
new file mode 100644
index 0000000..79a1a0e
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/iterable.py
@@ -0,0 +1,863 @@
+"""
+Contains all classes and functions to deal with lists, dicts, generators and
+iterators in general.
+
+Array modifications
+*******************
+
+If the content of an array (``set``/``list``) is requested somewhere, the
+current module will be checked for appearances of ``arr.append``,
+``arr.insert``, etc.  If the ``arr`` name points to an actual array, the
+content will be added
+
+This can be really cpu intensive, as you can imagine. Because |jedi| has to
+follow **every** ``append`` and check wheter it's the right array. However this
+works pretty good, because in *slow* cases, the recursion detector and other
+settings will stop this process.
+
+It is important to note that:
+
+1. Array modfications work only in the current module.
+2. Jedi only checks Array additions; ``list.pop``, etc are ignored.
+"""
+from jedi.common import unite, safe_property
+from jedi import debug
+from jedi import settings
+from jedi._compatibility import use_metaclass, unicode, zip_longest
+from jedi.parser import tree
+from jedi.evaluate import compiled
+from jedi.evaluate import helpers
+from jedi.evaluate.cache import CachedMetaClass, memoize_default
+from jedi.evaluate import analysis
+from jedi.evaluate import pep0484
+from jedi import common
+
+
+class IterableWrapper(tree.Base):
+    def is_class(self):
+        return False
+
+    @memoize_default()
+    def _get_names_dict(self, names_dict):
+        builtin_methods = {}
+        for cls in reversed(type(self).mro()):
+            try:
+                builtin_methods.update(cls.builtin_methods)
+            except AttributeError:
+                pass
+
+        if not builtin_methods:
+            return names_dict
+
+        dct = {}
+        for names in names_dict.values():
+            for name in names:
+                name_str = name.value
+                try:
+                    method = builtin_methods[name_str, self.type]
+                except KeyError:
+                    dct[name_str] = [name]
+                else:
+                    parent = BuiltinMethod(self, method, name.parent)
+                    dct[name_str] = [helpers.FakeName(name_str, parent, is_definition=True)]
+        return dct
+
+
+class BuiltinMethod(IterableWrapper):
+    """``Generator.__next__`` ``dict.values`` methods and so on."""
+    def __init__(self, builtin, method, builtin_func):
+        self._builtin = builtin
+        self._method = method
+        self._builtin_func = builtin_func
+
+    def py__call__(self, params):
+        return self._method(self._builtin)
+
+    def __getattr__(self, name):
+        return getattr(self._builtin_func, name)
+
+
+def has_builtin_methods(cls):
+    cls.builtin_methods = {}
+    for func in cls.__dict__.values():
+        try:
+            cls.builtin_methods.update(func.registered_builtin_methods)
+        except AttributeError:
+            pass
+    return cls
+
+
+def register_builtin_method(method_name, type=None):
+    def wrapper(func):
+        dct = func.__dict__.setdefault('registered_builtin_methods', {})
+        dct[method_name, type] = func
+        return func
+    return wrapper
+
+
+@has_builtin_methods
+class GeneratorMixin(object):
+    type = None
+
+    @register_builtin_method('send')
+    @register_builtin_method('next')
+    @register_builtin_method('__next__')
+    def py__next__(self):
+        # TODO add TypeError if params are given.
+        return unite(self.py__iter__())
+
+    @memoize_default()
+    def names_dicts(self, search_global=False):  # is always False
+        gen_obj = compiled.get_special_object(self._evaluator, 'GENERATOR_OBJECT')
+        yield self._get_names_dict(gen_obj.names_dict)
+
+    def py__bool__(self):
+        return True
+
+    def py__class__(self):
+        gen_obj = compiled.get_special_object(self._evaluator, 'GENERATOR_OBJECT')
+        return gen_obj.py__class__()
+
+
+class Generator(use_metaclass(CachedMetaClass, IterableWrapper, GeneratorMixin)):
+    """Handling of `yield` functions."""
+
+    def __init__(self, evaluator, func, var_args):
+        super(Generator, self).__init__()
+        self._evaluator = evaluator
+        self.func = func
+        self.var_args = var_args
+
+    def py__iter__(self):
+        from jedi.evaluate.representation import FunctionExecution
+        f = FunctionExecution(self._evaluator, self.func, self.var_args)
+        return f.get_yield_types()
+
+    def __getattr__(self, name):
+        if name not in ['start_pos', 'end_pos', 'parent', 'get_imports',
+                        'doc', 'docstr', 'get_parent_until',
+                        'get_code', 'subscopes']:
+            raise AttributeError("Accessing %s of %s is not allowed."
+                                 % (self, name))
+        return getattr(self.func, name)
+
+    def __repr__(self):
+        return "<%s of %s>" % (type(self).__name__, self.func)
+
+
+class Comprehension(IterableWrapper):
+    @staticmethod
+    def from_atom(evaluator, atom):
+        bracket = atom.children[0]
+        if bracket == '{':
+            if atom.children[1].children[1] == ':':
+                cls = DictComprehension
+            else:
+                cls = SetComprehension
+        elif bracket == '(':
+            cls = GeneratorComprehension
+        elif bracket == '[':
+            cls = ListComprehension
+        return cls(evaluator, atom)
+
+    def __init__(self, evaluator, atom):
+        self._evaluator = evaluator
+        self._atom = atom
+
+    def _get_comprehension(self):
+        # The atom contains a testlist_comp
+        return self._atom.children[1]
+
+    def _get_comp_for(self):
+        # The atom contains a testlist_comp
+        return self._get_comprehension().children[1]
+
+    @memoize_default()
+    def _eval_node(self, index=0):
+        """
+        The first part `x + 1` of the list comprehension:
+
+            [x + 1 for x in foo]
+        """
+        comp_for = self._get_comp_for()
+        # For nested comprehensions we need to search the last one.
+        from jedi.evaluate.representation import InstanceElement
+        node = self._get_comprehension().children[index]
+        if isinstance(node, InstanceElement):
+            # This seems to be a strange case that I haven't found a way to
+            # write tests against. However since it's my new goal to get rid of
+            # InstanceElement anyway, I don't care.
+            node = node.var
+        last_comp = list(comp_for.get_comp_fors())[-1]
+        return helpers.deep_ast_copy(node, parent=last_comp)
+
+    def _nested(self, comp_fors):
+        evaluator = self._evaluator
+        comp_for = comp_fors[0]
+        input_node = comp_for.children[3]
+        input_types = evaluator.eval_element(input_node)
+
+        iterated = py__iter__(evaluator, input_types, input_node)
+        exprlist = comp_for.children[1]
+        for i, types in enumerate(iterated):
+            evaluator.predefined_if_name_dict_dict[comp_for] = \
+                unpack_tuple_to_dict(evaluator, types, exprlist)
+            try:
+                for result in self._nested(comp_fors[1:]):
+                    yield result
+            except IndexError:
+                iterated = evaluator.eval_element(self._eval_node())
+                if self.type == 'dict':
+                    yield iterated, evaluator.eval_element(self._eval_node(2))
+                else:
+                    yield iterated
+            finally:
+                del evaluator.predefined_if_name_dict_dict[comp_for]
+
+    @memoize_default(default=[])
+    @common.to_list
+    def _iterate(self):
+        comp_fors = tuple(self._get_comp_for().get_comp_fors())
+        for result in self._nested(comp_fors):
+            yield result
+
+    def py__iter__(self):
+        return self._iterate()
+
+    def __repr__(self):
+        return "<%s of %s>" % (type(self).__name__, self._atom)
+
+
+@has_builtin_methods
+class ArrayMixin(object):
+    @memoize_default()
+    def names_dicts(self, search_global=False):  # Always False.
+        # `array.type` is a string with the type, e.g. 'list'.
+        scope = compiled.builtin_from_name(self._evaluator, self.type)
+        # builtins only have one class -> [0]
+        scopes = self._evaluator.execute_evaluated(scope, self)
+        names_dicts = list(scopes)[0].names_dicts(search_global)
+        #yield names_dicts[0]
+        yield self._get_names_dict(names_dicts[1])
+
+    def py__bool__(self):
+        return None  # We don't know the length, because of appends.
+
+    def py__class__(self):
+        return compiled.builtin_from_name(self._evaluator, self.type)
+
+    @safe_property
+    def parent(self):
+        return self._evaluator.BUILTINS
+
+    @property
+    def name(self):
+        return FakeSequence(self._evaluator, [], self.type).name
+
+    @memoize_default()
+    def dict_values(self):
+        return unite(self._evaluator.eval_element(v) for k, v in self._items())
+
+    @register_builtin_method('values', type='dict')
+    def _imitate_values(self):
+        items = self.dict_values()
+        return create_evaluated_sequence_set(self._evaluator, items, sequence_type='list')
+        #return set([FakeSequence(self._evaluator, [AlreadyEvaluated(items)], 'tuple')])
+
+    @register_builtin_method('items', type='dict')
+    def _imitate_items(self):
+        items = [set([FakeSequence(self._evaluator, (k, v), 'tuple')])
+                 for k, v in self._items()]
+
+        return create_evaluated_sequence_set(self._evaluator, *items, sequence_type='list')
+
+
+class ListComprehension(Comprehension, ArrayMixin):
+    type = 'list'
+
+    def py__getitem__(self, index):
+        all_types = list(self.py__iter__())
+        result = all_types[index]
+        if isinstance(index, slice):
+            return create_evaluated_sequence_set(
+                self._evaluator,
+                unite(result),
+                sequence_type='list'
+            )
+        return result
+
+
+class SetComprehension(Comprehension, ArrayMixin):
+    type = 'set'
+
+
+@has_builtin_methods
+class DictComprehension(Comprehension, ArrayMixin):
+    type = 'dict'
+
+    def _get_comp_for(self):
+        return self._get_comprehension().children[3]
+
+    def py__iter__(self):
+        for keys, values in self._iterate():
+            yield keys
+
+    def py__getitem__(self, index):
+        for keys, values in self._iterate():
+            for k in keys:
+                if isinstance(k, compiled.CompiledObject):
+                    if k.obj == index:
+                        return values
+        return self.dict_values()
+
+    def dict_values(self):
+        return unite(values for keys, values in self._iterate())
+
+    @register_builtin_method('items', type='dict')
+    def _imitate_items(self):
+        items = set(FakeSequence(self._evaluator,
+                    (AlreadyEvaluated(keys), AlreadyEvaluated(values)), 'tuple')
+                    for keys, values in self._iterate())
+
+        return create_evaluated_sequence_set(self._evaluator, items, sequence_type='list')
+
+
+class GeneratorComprehension(Comprehension, GeneratorMixin):
+    pass
+
+
+class Array(IterableWrapper, ArrayMixin):
+    mapping = {'(': 'tuple',
+               '[': 'list',
+               '{': 'dict'}
+
+    def __init__(self, evaluator, atom):
+        self._evaluator = evaluator
+        self.atom = atom
+        self.type = Array.mapping[atom.children[0]]
+        """The builtin name of the array (list, set, tuple or dict)."""
+
+        c = self.atom.children
+        array_node = c[1]
+        if self.type == 'dict' and array_node != '}' \
+                and (not hasattr(array_node, 'children')
+                     or ':' not in array_node.children):
+            self.type = 'set'
+
+    @property
+    def name(self):
+        return helpers.FakeName(self.type, parent=self)
+
+    def py__getitem__(self, index):
+        """Here the index is an int/str. Raises IndexError/KeyError."""
+        if self.type == 'dict':
+            for key, value in self._items():
+                for k in self._evaluator.eval_element(key):
+                    if isinstance(k, compiled.CompiledObject) \
+                            and index == k.obj:
+                        return self._evaluator.eval_element(value)
+            raise KeyError('No key found in dictionary %s.' % self)
+
+        # Can raise an IndexError
+        if isinstance(index, slice):
+            return set([self])
+        else:
+            return self._evaluator.eval_element(self._items()[index])
+
+    def __getattr__(self, name):
+        if name not in ['start_pos', 'get_only_subelement', 'parent',
+                        'get_parent_until', 'items']:
+            raise AttributeError('Strange access on %s: %s.' % (self, name))
+        return getattr(self.atom, name)
+
+    # @memoize_default()
+    def py__iter__(self):
+        """
+        While values returns the possible values for any array field, this
+        function returns the value for a certain index.
+        """
+        if self.type == 'dict':
+            # Get keys.
+            types = set()
+            for k, _ in self._items():
+                types |= self._evaluator.eval_element(k)
+            # We don't know which dict index comes first, therefore always
+            # yield all the types.
+            for _ in types:
+                yield types
+        else:
+            for value in self._items():
+                yield self._evaluator.eval_element(value)
+
+            additions = check_array_additions(self._evaluator, self)
+            if additions:
+                yield additions
+
+    def _values(self):
+        """Returns a list of a list of node."""
+        if self.type == 'dict':
+            return unite(v for k, v in self._items())
+        else:
+            return self._items()
+
+    def _items(self):
+        c = self.atom.children
+        array_node = c[1]
+        if array_node in (']', '}', ')'):
+            return []  # Direct closing bracket, doesn't contain items.
+
+        if tree.is_node(array_node, 'testlist_comp'):
+            return array_node.children[::2]
+        elif tree.is_node(array_node, 'dictorsetmaker'):
+            kv = []
+            iterator = iter(array_node.children)
+            for key in iterator:
+                op = next(iterator, None)
+                if op is None or op == ',':
+                    kv.append(key)  # A set.
+                else:
+                    assert op == ':'  # A dict.
+                    kv.append((key, next(iterator)))
+                    next(iterator, None)  # Possible comma.
+            return kv
+        else:
+            return [array_node]
+
+    def __repr__(self):
+        return "<%s of %s>" % (type(self).__name__, self.atom)
+
+
+class _FakeArray(Array):
+    def __init__(self, evaluator, container, type):
+        self.type = type
+        self._evaluator = evaluator
+        self.atom = container
+
+
+class ImplicitTuple(_FakeArray):
+    def __init__(self, evaluator, testlist):
+        super(ImplicitTuple, self).__init__(evaluator, testlist, 'tuple')
+        self._testlist = testlist
+
+    def _items(self):
+        return self._testlist.children[::2]
+
+
+class FakeSequence(_FakeArray):
+    def __init__(self, evaluator, sequence_values, type):
+        """
+        type should be one of "tuple", "list"
+        """
+        super(FakeSequence, self).__init__(evaluator, sequence_values, type)
+        self._sequence_values = sequence_values
+
+    def _items(self):
+        return self._sequence_values
+
+
+def create_evaluated_sequence_set(evaluator, *types_order, **kwargs):
+    """
+    ``sequence_type`` is a named argument, that doesn't work in Python2. For backwards
+    compatibility reasons, we're now using kwargs.
+    """
+    sequence_type = kwargs.pop('sequence_type')
+    assert not kwargs
+
+    sets = tuple(AlreadyEvaluated(types) for types in types_order)
+    return set([FakeSequence(evaluator, sets, sequence_type)])
+
+
+class AlreadyEvaluated(frozenset):
+    """A simple container to add already evaluated objects to an array."""
+    def get_code(self, normalized=False):
+        # For debugging purposes.
+        return str(self)
+
+
+class MergedNodes(frozenset):
+    pass
+
+
+class FakeDict(_FakeArray):
+    def __init__(self, evaluator, dct):
+        super(FakeDict, self).__init__(evaluator, dct, 'dict')
+        self._dct = dct
+
+    def py__iter__(self):
+        yield set(compiled.create(self._evaluator, key) for key in self._dct)
+
+    def py__getitem__(self, index):
+        return unite(self._evaluator.eval_element(v) for v in self._dct[index])
+
+    def _items(self):
+        for key, values in self._dct.items():
+            # TODO this is not proper. The values could be multiple values?!
+            yield key, values[0]
+
+
+class MergedArray(_FakeArray):
+    def __init__(self, evaluator, arrays):
+        super(MergedArray, self).__init__(evaluator, arrays, arrays[-1].type)
+        self._arrays = arrays
+
+    def py__iter__(self):
+        for array in self._arrays:
+            for types in array.py__iter__():
+                yield types
+
+    def py__getitem__(self, index):
+        return unite(self.py__iter__())
+
+    def _items(self):
+        for array in self._arrays:
+            for a in array._items():
+                yield a
+
+    def __len__(self):
+        return sum(len(a) for a in self._arrays)
+
+
+def unpack_tuple_to_dict(evaluator, types, exprlist):
+    """
+    Unpacking tuple assignments in for statements and expr_stmts.
+    """
+    if exprlist.type == 'name':
+        return {exprlist.value: types}
+    elif exprlist.type == 'atom' and exprlist.children[0] in '([':
+        return unpack_tuple_to_dict(evaluator, types, exprlist.children[1])
+    elif exprlist.type in ('testlist', 'testlist_comp', 'exprlist',
+                           'testlist_star_expr'):
+        dct = {}
+        parts = iter(exprlist.children[::2])
+        n = 0
+        for iter_types in py__iter__(evaluator, types, exprlist):
+            n += 1
+            try:
+                part = next(parts)
+            except StopIteration:
+                analysis.add(evaluator, 'value-error-too-many-values', part,
+                             message="ValueError: too many values to unpack (expected %s)" % n)
+            else:
+                dct.update(unpack_tuple_to_dict(evaluator, iter_types, part))
+        has_parts = next(parts, None)
+        if types and has_parts is not None:
+            analysis.add(evaluator, 'value-error-too-few-values', has_parts,
+                         message="ValueError: need more than %s values to unpack" % n)
+        return dct
+    elif exprlist.type == 'power' or exprlist.type == 'atom_expr':
+        # Something like ``arr[x], var = ...``.
+        # This is something that is not yet supported, would also be difficult
+        # to write into a dict.
+        return {}
+    elif exprlist.type == 'star_expr':  # `a, *b, c = x` type unpackings
+        # Currently we're not supporting them.
+        return {}
+    raise NotImplementedError
+
+
+def py__iter__(evaluator, types, node=None):
+    debug.dbg('py__iter__')
+    type_iters = []
+    for typ in types:
+        try:
+            iter_method = typ.py__iter__
+        except AttributeError:
+            if node is not None:
+                analysis.add(evaluator, 'type-error-not-iterable', node,
+                             message="TypeError: '%s' object is not iterable" % typ)
+        else:
+            type_iters.append(iter_method())
+            #for result in iter_method():
+                #yield result
+
+    for t in zip_longest(*type_iters, fillvalue=set()):
+        yield unite(t)
+
+
+def py__iter__types(evaluator, types, node=None):
+    """
+    Calls `py__iter__`, but ignores the ordering in the end and just returns
+    all types that it contains.
+    """
+    return unite(py__iter__(evaluator, types, node))
+
+
+def py__getitem__(evaluator, types, trailer):
+    from jedi.evaluate.representation import Class
+    result = set()
+
+    trailer_op, node, trailer_cl = trailer.children
+    assert trailer_op == "["
+    assert trailer_cl == "]"
+
+    # special case: PEP0484 typing module, see
+    # https://github.com/davidhalter/jedi/issues/663
+    for typ in list(types):
+        if isinstance(typ, Class):
+            typing_module_types = \
+                pep0484.get_types_for_typing_module(evaluator, typ, node)
+            if typing_module_types is not None:
+                types.remove(typ)
+                result |= typing_module_types
+
+    if not types:
+        # all consumed by special cases
+        return result
+
+    for index in create_index_types(evaluator, node):
+        if isinstance(index, (compiled.CompiledObject, Slice)):
+            index = index.obj
+
+        if type(index) not in (float, int, str, unicode, slice):
+            # If the index is not clearly defined, we have to get all the
+            # possiblities.
+            for typ in list(types):
+                if isinstance(typ, Array) and typ.type == 'dict':
+                    types.remove(typ)
+                    result |= typ.dict_values()
+            return result | py__iter__types(evaluator, types)
+
+        for typ in types:
+            # The actual getitem call.
+            try:
+                getitem = typ.py__getitem__
+            except AttributeError:
+                analysis.add(evaluator, 'type-error-not-subscriptable', trailer_op,
+                             message="TypeError: '%s' object is not subscriptable" % typ)
+            else:
+                try:
+                    result |= getitem(index)
+                except IndexError:
+                    result |= py__iter__types(evaluator, set([typ]))
+                except KeyError:
+                    # Must be a dict. Lists don't raise KeyErrors.
+                    result |= typ.dict_values()
+    return result
+
+
+def check_array_additions(evaluator, array):
+    """ Just a mapper function for the internal _check_array_additions """
+    if array.type not in ('list', 'set'):
+        # TODO also check for dict updates
+        return set()
+
+    is_list = array.type == 'list'
+    try:
+        current_module = array.atom.get_parent_until()
+    except AttributeError:
+        # If there's no get_parent_until, it's a FakeSequence or another Fake
+        # type. Those fake types are used inside Jedi's engine. No values may
+        # be added to those after their creation.
+        return set()
+    return _check_array_additions(evaluator, array, current_module, is_list)
+
+
+@memoize_default(default=set(), evaluator_is_first_arg=True)
+@debug.increase_indent
+def _check_array_additions(evaluator, compare_array, module, is_list):
+    """
+    Checks if a `Array` has "add" (append, insert, extend) statements:
+
+    >>> a = [""]
+    >>> a.append(1)
+    """
+    debug.dbg('Dynamic array search for %s' % compare_array, color='MAGENTA')
+    if not settings.dynamic_array_additions or isinstance(module, compiled.CompiledObject):
+        debug.dbg('Dynamic array search aborted.', color='MAGENTA')
+        return set()
+
+    def check_additions(arglist, add_name):
+        params = list(param.Arguments(evaluator, arglist).unpack())
+        result = set()
+        if add_name in ['insert']:
+            params = params[1:]
+        if add_name in ['append', 'add', 'insert']:
+            for key, nodes in params:
+                result |= unite(evaluator.eval_element(node) for node in nodes)
+        elif add_name in ['extend', 'update']:
+            for key, nodes in params:
+                for node in nodes:
+                    types = evaluator.eval_element(node)
+                    result |= py__iter__types(evaluator, types, node)
+        return result
+
+    from jedi.evaluate import representation as er, param
+
+    def get_execution_parent(element):
+        """ Used to get an Instance/FunctionExecution parent """
+        if isinstance(element, Array):
+            node = element.atom
+        else:
+            # Is an Instance with an
+            # Arguments([AlreadyEvaluated([_ArrayInstance])]) inside
+            # Yeah... I know... It's complicated ;-)
+            node = list(element.var_args.argument_node[0])[0].var_args.trailer
+        if isinstance(node, er.InstanceElement) or node is None:
+            return node
+        return node.get_parent_until(er.FunctionExecution)
+
+    temp_param_add, settings.dynamic_params_for_other_modules = \
+        settings.dynamic_params_for_other_modules, False
+
+    search_names = ['append', 'extend', 'insert'] if is_list else ['add', 'update']
+    comp_arr_parent = get_execution_parent(compare_array)
+
+    added_types = set()
+    for add_name in search_names:
+        try:
+            possible_names = module.used_names[add_name]
+        except KeyError:
+            continue
+        else:
+            for name in possible_names:
+                # Check if the original scope is an execution. If it is, one
+                # can search for the same statement, that is in the module
+                # dict. Executions are somewhat special in jedi, since they
+                # literally copy the contents of a function.
+                if isinstance(comp_arr_parent, er.FunctionExecution):
+                    if comp_arr_parent.start_pos < name.start_pos < comp_arr_parent.end_pos:
+                        name = comp_arr_parent.name_for_position(name.start_pos)
+                    else:
+                        # Don't check definitions that are not defined in the
+                        # same function. This is not "proper" anyway. It also
+                        # improves Jedi's speed for array lookups, since we
+                        # don't have to check the whole source tree anymore.
+                        continue
+                trailer = name.parent
+                power = trailer.parent
+                trailer_pos = power.children.index(trailer)
+                try:
+                    execution_trailer = power.children[trailer_pos + 1]
+                except IndexError:
+                    continue
+                else:
+                    if execution_trailer.type != 'trailer' \
+                            or execution_trailer.children[0] != '(' \
+                            or execution_trailer.children[1] == ')':
+                        continue
+                power = helpers.call_of_leaf(name, cut_own_trailer=True)
+                # InstanceElements are special, because they don't get copied,
+                # but have this wrapper around them.
+                if isinstance(comp_arr_parent, er.InstanceElement):
+                    power = er.get_instance_el(evaluator, comp_arr_parent.instance, power)
+
+                if evaluator.recursion_detector.push_stmt(power):
+                    # Check for recursion. Possible by using 'extend' in
+                    # combination with function calls.
+                    continue
+                try:
+                    if compare_array in evaluator.eval_element(power):
+                        # The arrays match. Now add the results
+                        added_types |= check_additions(execution_trailer.children[1], add_name)
+                finally:
+                    evaluator.recursion_detector.pop_stmt()
+    # reset settings
+    settings.dynamic_params_for_other_modules = temp_param_add
+    debug.dbg('Dynamic array result %s' % added_types, color='MAGENTA')
+    return added_types
+
+
+def check_array_instances(evaluator, instance):
+    """Used for set() and list() instances."""
+    if not settings.dynamic_array_additions:
+        return instance.var_args
+
+    ai = _ArrayInstance(evaluator, instance)
+    from jedi.evaluate import param
+    return param.Arguments(evaluator, [AlreadyEvaluated([ai])])
+
+
+class _ArrayInstance(IterableWrapper):
+    """
+    Used for the usage of set() and list().
+    This is definitely a hack, but a good one :-)
+    It makes it possible to use set/list conversions.
+
+    In contrast to Array, ListComprehension and all other iterable types, this
+    is something that is only used inside `evaluate/compiled/fake/builtins.py`
+    and therefore doesn't need `names_dicts`, `py__bool__` and so on, because
+    we don't use these operations in `builtins.py`.
+    """
+    def __init__(self, evaluator, instance):
+        self._evaluator = evaluator
+        self.instance = instance
+        self.var_args = instance.var_args
+
+    def py__iter__(self):
+        try:
+            _, first_nodes = next(self.var_args.unpack())
+        except StopIteration:
+            types = set()
+        else:
+            types = unite(self._evaluator.eval_element(node) for node in first_nodes)
+            for types in py__iter__(self._evaluator, types, first_nodes[0]):
+                yield types
+
+        module = self.var_args.get_parent_until()
+        if module is None:
+            return
+        is_list = str(self.instance.name) == 'list'
+        additions = _check_array_additions(self._evaluator, self.instance, module, is_list)
+        if additions:
+            yield additions
+
+
+class Slice(object):
+    def __init__(self, evaluator, start, stop, step):
+        self._evaluator = evaluator
+        # all of them are either a Precedence or None.
+        self._start = start
+        self._stop = stop
+        self._step = step
+
+    @property
+    def obj(self):
+        """
+        Imitate CompiledObject.obj behavior and return a ``builtin.slice()``
+        object.
+        """
+        def get(element):
+            if element is None:
+                return None
+
+            result = self._evaluator.eval_element(element)
+            if len(result) != 1:
+                # For simplicity, we want slices to be clear defined with just
+                # one type.  Otherwise we will return an empty slice object.
+                raise IndexError
+            try:
+                return list(result)[0].obj
+            except AttributeError:
+                return None
+
+        try:
+            return slice(get(self._start), get(self._stop), get(self._step))
+        except IndexError:
+            return slice(None, None, None)
+
+
+def create_index_types(evaluator, index):
+    """
+    Handles slices in subscript nodes.
+    """
+    if index == ':':
+        # Like array[:]
+        return set([Slice(evaluator, None, None, None)])
+    elif tree.is_node(index, 'subscript'):  # subscript is a slice operation.
+        # Like array[:3]
+        result = []
+        for el in index.children:
+            if el == ':':
+                if not result:
+                    result.append(None)
+            elif tree.is_node(el, 'sliceop'):
+                if len(el.children) == 2:
+                    result.append(el.children[1])
+            else:
+                result.append(el)
+        result += [None] * (3 - len(result))
+
+        return set([Slice(evaluator, *result)])
+
+    # No slices
+    return evaluator.eval_element(index)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/jedi_typing.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/jedi_typing.py
new file mode 100644
index 0000000..f48a567
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/jedi_typing.py
@@ -0,0 +1,100 @@
+"""
+This module is not intended to be used in jedi, rather it will be fed to the
+jedi-parser to replace classes in the typing module
+"""
+
+try:
+    from collections import abc
+except ImportError:
+    # python 2
+    import collections as abc
+
+
+def factory(typing_name, indextypes):
+    class Iterable(abc.Iterable):
+        def __iter__(self):
+            while True:
+                yield indextypes[0]()
+
+    class Iterator(Iterable, abc.Iterator):
+        def next(self):
+            """ needed for python 2 """
+            return self.__next__()
+
+        def __next__(self):
+            return indextypes[0]()
+
+    class Sequence(abc.Sequence):
+        def __getitem__(self, index):
+            return indextypes[0]()
+
+    class MutableSequence(Sequence, abc.MutableSequence):
+        pass
+
+    class List(MutableSequence, list):
+        pass
+
+    class Tuple(Sequence, tuple):
+        def __getitem__(self, index):
+            if indextypes[1] == Ellipsis:
+                # https://www.python.org/dev/peps/pep-0484/#the-typing-module
+                # Tuple[int, ...] means a tuple of ints of indetermined length
+                return indextypes[0]()
+            else:
+                return indextypes[index]()
+
+    class AbstractSet(Iterable, abc.Set):
+        pass
+
+    class MutableSet(AbstractSet, abc.MutableSet):
+        pass
+
+    class KeysView(Iterable, abc.KeysView):
+        pass
+
+    class ValuesView(abc.ValuesView):
+        def __iter__(self):
+            while True:
+                yield indextypes[1]()
+
+    class ItemsView(abc.ItemsView):
+        def __iter__(self):
+            while True:
+                yield (indextypes[0](), indextypes[1]())
+
+    class Mapping(Iterable, abc.Mapping):
+        def __getitem__(self, item):
+            return indextypes[1]()
+
+        def keys(self):
+            return KeysView()
+
+        def values(self):
+            return ValuesView()
+
+        def items(self):
+            return ItemsView()
+
+    class MutableMapping(Mapping, abc.MutableMapping):
+        pass
+
+    class Dict(MutableMapping, dict):
+        pass
+
+    dct = {
+        "Sequence": Sequence,
+        "MutableSequence": MutableSequence,
+        "List": List,
+        "Iterable": Iterable,
+        "Iterator": Iterator,
+        "AbstractSet": AbstractSet,
+        "MutableSet": MutableSet,
+        "Mapping": Mapping,
+        "MutableMapping": MutableMapping,
+        "Tuple": Tuple,
+        "KeysView": KeysView,
+        "ItemsView": ItemsView,
+        "ValuesView": ValuesView,
+        "Dict": Dict,
+    }
+    return dct[typing_name]
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/param.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/param.py
new file mode 100644
index 0000000..997e079
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/param.py
@@ -0,0 +1,438 @@
+from collections import defaultdict
+from itertools import chain
+
+from jedi._compatibility import unicode, zip_longest
+from jedi import debug
+from jedi import common
+from jedi.parser import tree
+from jedi.evaluate import iterable
+from jedi.evaluate import analysis
+from jedi.evaluate import precedence
+from jedi.evaluate.helpers import FakeName
+from jedi.cache import underscore_memoization
+
+
+def try_iter_content(types, depth=0):
+    """Helper method for static analysis."""
+    if depth > 10:
+        # It's possible that a loop has references on itself (especially with
+        # CompiledObject). Therefore don't loop infinitely.
+        return
+
+    for typ in types:
+        try:
+            f = typ.py__iter__
+        except AttributeError:
+            pass
+        else:
+            for iter_types in f():
+                try_iter_content(iter_types, depth + 1)
+
+
+class Arguments(tree.Base):
+    def __init__(self, evaluator, argument_node, trailer=None):
+        """
+        The argument_node is either a parser node or a list of evaluated
+        objects. Those evaluated objects may be lists of evaluated objects
+        themselves (one list for the first argument, one for the second, etc).
+
+        :param argument_node: May be an argument_node or a list of nodes.
+        """
+        self.argument_node = argument_node
+        self._evaluator = evaluator
+        self.trailer = trailer  # Can be None, e.g. in a class definition.
+
+    def _split(self):
+        if isinstance(self.argument_node, (tuple, list)):
+            for el in self.argument_node:
+                yield 0, el
+        else:
+            if not (tree.is_node(self.argument_node, 'arglist') or (
+                    # in python 3.5 **arg is an argument, not arglist
+                    (tree.is_node(self.argument_node, 'argument') and
+                     self.argument_node.children[0] in ('*', '**')))):
+                yield 0, self.argument_node
+                return
+
+            iterator = iter(self.argument_node.children)
+            for child in iterator:
+                if child == ',':
+                    continue
+                elif child in ('*', '**'):
+                    yield len(child.value), next(iterator)
+                elif tree.is_node(child, 'argument') and \
+                        child.children[0] in ('*', '**'):
+                    assert len(child.children) == 2
+                    yield len(child.children[0].value), child.children[1]
+                else:
+                    yield 0, child
+
+    def get_parent_until(self, *args, **kwargs):
+        if self.trailer is None:
+            try:
+                element = self.argument_node[0]
+                from jedi.evaluate.iterable import AlreadyEvaluated
+                if isinstance(element, AlreadyEvaluated):
+                    element = list(self._evaluator.eval_element(element))[0]
+            except IndexError:
+                return None
+            else:
+                return element.get_parent_until(*args, **kwargs)
+        else:
+            return self.trailer.get_parent_until(*args, **kwargs)
+
+    def as_tuple(self):
+        for stars, argument in self._split():
+            if tree.is_node(argument, 'argument'):
+                argument, default = argument.children[::2]
+            else:
+                default = None
+            yield argument, default, stars
+
+    def unpack(self, func=None):
+        named_args = []
+        for stars, el in self._split():
+            if stars == 1:
+                arrays = self._evaluator.eval_element(el)
+                iterators = [_iterate_star_args(self._evaluator, a, el, func)
+                             for a in arrays]
+                iterators = list(iterators)
+                for values in list(zip_longest(*iterators)):
+                    yield None, [v for v in values if v is not None]
+            elif stars == 2:
+                arrays = self._evaluator.eval_element(el)
+                dicts = [_star_star_dict(self._evaluator, a, el, func)
+                         for a in arrays]
+                for dct in dicts:
+                    for key, values in dct.items():
+                        yield key, values
+            else:
+                if tree.is_node(el, 'argument'):
+                    c = el.children
+                    if len(c) == 3:  # Keyword argument.
+                        named_args.append((c[0].value, (c[2],)))
+                    else:  # Generator comprehension.
+                        # Include the brackets with the parent.
+                        comp = iterable.GeneratorComprehension(
+                            self._evaluator, self.argument_node.parent)
+                        yield None, (iterable.AlreadyEvaluated([comp]),)
+                elif isinstance(el, (list, tuple)):
+                    yield None, el
+                else:
+                    yield None, (el,)
+
+        # Reordering var_args is necessary, because star args sometimes appear
+        # after named argument, but in the actual order it's prepended.
+        for key_arg in named_args:
+            yield key_arg
+
+    def _reorder_var_args(var_args):
+        named_index = None
+        new_args = []
+        for i, stmt in enumerate(var_args):
+            if isinstance(stmt, tree.ExprStmt):
+                if named_index is None and stmt.assignment_details:
+                    named_index = i
+
+                if named_index is not None:
+                    expression_list = stmt.expression_list()
+                    if expression_list and expression_list[0] == '*':
+                        new_args.insert(named_index, stmt)
+                        named_index += 1
+                        continue
+
+            new_args.append(stmt)
+        return new_args
+
+    def eval_argument_clinic(self, arguments):
+        """Uses a list with argument clinic information (see PEP 436)."""
+        iterator = self.unpack()
+        for i, (name, optional, allow_kwargs) in enumerate(arguments):
+            key, va_values = next(iterator, (None, []))
+            if key is not None:
+                raise NotImplementedError
+            if not va_values and not optional:
+                debug.warning('TypeError: %s expected at least %s arguments, got %s',
+                              name, len(arguments), i)
+                raise ValueError
+            values = set(chain.from_iterable(self._evaluator.eval_element(el)
+                                             for el in va_values))
+            if not values and not optional:
+                # For the stdlib we always want values. If we don't get them,
+                # that's ok, maybe something is too hard to resolve, however,
+                # we will not proceed with the evaluation of that function.
+                debug.warning('argument_clinic "%s" not resolvable.', name)
+                raise ValueError
+            yield values
+
+    def scope(self):
+        # Returns the scope in which the arguments are used.
+        return (self.trailer or self.argument_node).get_parent_until(tree.IsScope)
+
+    def eval_args(self):
+        # TODO this method doesn't work with named args and a lot of other
+        # things. Use unpack.
+        return [self._evaluator.eval_element(el) for stars, el in self._split()]
+
+    def __repr__(self):
+        return '<%s: %s>' % (type(self).__name__, self.argument_node)
+
+    def get_calling_var_args(self):
+        if tree.is_node(self.argument_node, 'arglist', 'argument') \
+                or self.argument_node == () and self.trailer is not None:
+            return _get_calling_var_args(self._evaluator, self)
+        else:
+            return None
+
+    def eval_all(self, func=None):
+        """
+        Evaluates all arguments as a support for static analysis
+        (normally Jedi).
+        """
+        for key, element_values in self.unpack():
+            for element in element_values:
+                types = self._evaluator.eval_element(element)
+                try_iter_content(types)
+
+
+class ExecutedParam(tree.Param):
+    """Fake a param and give it values."""
+    def __init__(self, original_param, var_args, values):
+        self._original_param = original_param
+        self.var_args = var_args
+        self._values = values
+
+    def eval(self, evaluator):
+        types = set()
+        for v in self._values:
+            types |= evaluator.eval_element(v)
+        return types
+
+    @property
+    def position_nr(self):
+        # Need to use the original logic here, because it uses the parent.
+        return self._original_param.position_nr
+
+    @property
+    @underscore_memoization
+    def name(self):
+        return FakeName(str(self._original_param.name), self, self.start_pos)
+
+    def __getattr__(self, name):
+        return getattr(self._original_param, name)
+
+
+def _get_calling_var_args(evaluator, var_args):
+    old_var_args = None
+    while var_args != old_var_args:
+        old_var_args = var_args
+        for name, default, stars in reversed(list(var_args.as_tuple())):
+            if not stars or not isinstance(name, tree.Name):
+                continue
+
+            names = evaluator.goto(name)
+            if len(names) != 1:
+                break
+            param = names[0].get_definition()
+            if not isinstance(param, ExecutedParam):
+                if isinstance(param, tree.Param):
+                    # There is no calling var_args in this case - there's just
+                    # a param without any input.
+                    return None
+                break
+            # We never want var_args to be a tuple. This should be enough for
+            # now, we can change it later, if we need to.
+            if isinstance(param.var_args, Arguments):
+                var_args = param.var_args
+    return var_args.argument_node or var_args.trailer
+
+
+def get_params(evaluator, func, var_args):
+    param_names = []
+    param_dict = {}
+    for param in func.params:
+        param_dict[str(param.name)] = param
+    unpacked_va = list(var_args.unpack(func))
+    from jedi.evaluate.representation import InstanceElement
+    if isinstance(func, InstanceElement):
+        # Include self at this place.
+        unpacked_va.insert(0, (None, [iterable.AlreadyEvaluated([func.instance])]))
+    var_arg_iterator = common.PushBackIterator(iter(unpacked_va))
+
+    non_matching_keys = defaultdict(lambda: [])
+    keys_used = {}
+    keys_only = False
+    had_multiple_value_error = False
+    for param in func.params:
+        # The value and key can both be null. There, the defaults apply.
+        # args / kwargs will just be empty arrays / dicts, respectively.
+        # Wrong value count is just ignored. If you try to test cases that are
+        # not allowed in Python, Jedi will maybe not show any completions.
+        default = [] if param.default is None else [param.default]
+        key, va_values = next(var_arg_iterator, (None, default))
+        while key is not None:
+            keys_only = True
+            k = unicode(key)
+            try:
+                key_param = param_dict[unicode(key)]
+            except KeyError:
+                non_matching_keys[key] = va_values
+            else:
+                param_names.append(ExecutedParam(key_param, var_args, va_values).name)
+
+            if k in keys_used:
+                had_multiple_value_error = True
+                m = ("TypeError: %s() got multiple values for keyword argument '%s'."
+                     % (func.name, k))
+                calling_va = _get_calling_var_args(evaluator, var_args)
+                if calling_va is not None:
+                    analysis.add(evaluator, 'type-error-multiple-values',
+                                 calling_va, message=m)
+            else:
+                try:
+                    keys_used[k] = param_names[-1]
+                except IndexError:
+                    # TODO this is wrong stupid and whatever.
+                    pass
+            key, va_values = next(var_arg_iterator, (None, ()))
+
+        values = []
+        if param.stars == 1:
+            # *args param
+            lst_values = [iterable.MergedNodes(va_values)] if va_values else []
+            for key, va_values in var_arg_iterator:
+                # Iterate until a key argument is found.
+                if key:
+                    var_arg_iterator.push_back((key, va_values))
+                    break
+                if va_values:
+                    lst_values.append(iterable.MergedNodes(va_values))
+            seq = iterable.FakeSequence(evaluator, lst_values, 'tuple')
+            values = [iterable.AlreadyEvaluated([seq])]
+        elif param.stars == 2:
+            # **kwargs param
+            dct = iterable.FakeDict(evaluator, dict(non_matching_keys))
+            values = [iterable.AlreadyEvaluated([dct])]
+            non_matching_keys = {}
+        else:
+            # normal param
+            if va_values:
+                values = va_values
+            else:
+                # No value: Return an empty container
+                values = []
+                if not keys_only:
+                    calling_va = var_args.get_calling_var_args()
+                    if calling_va is not None:
+                        m = _error_argument_count(func, len(unpacked_va))
+                        analysis.add(evaluator, 'type-error-too-few-arguments',
+                                     calling_va, message=m)
+
+        # Now add to result if it's not one of the previously covered cases.
+        if (not keys_only or param.stars == 2):
+            param_names.append(ExecutedParam(param, var_args, values).name)
+            keys_used[unicode(param.name)] = param_names[-1]
+
+    if keys_only:
+        # All arguments should be handed over to the next function. It's not
+        # about the values inside, it's about the names. Jedi needs to now that
+        # there's nothing to find for certain names.
+        for k in set(param_dict) - set(keys_used):
+            param = param_dict[k]
+            values = [] if param.default is None else [param.default]
+            param_names.append(ExecutedParam(param, var_args, values).name)
+
+            if not (non_matching_keys or had_multiple_value_error
+                    or param.stars or param.default):
+                # add a warning only if there's not another one.
+                calling_va = _get_calling_var_args(evaluator, var_args)
+                if calling_va is not None:
+                    m = _error_argument_count(func, len(unpacked_va))
+                    analysis.add(evaluator, 'type-error-too-few-arguments',
+                                 calling_va, message=m)
+
+    for key, va_values in non_matching_keys.items():
+        m = "TypeError: %s() got an unexpected keyword argument '%s'." \
+            % (func.name, key)
+        for value in va_values:
+            analysis.add(evaluator, 'type-error-keyword-argument', value.parent, message=m)
+
+    remaining_params = list(var_arg_iterator)
+    if remaining_params:
+        m = _error_argument_count(func, len(unpacked_va))
+        # Just report an error for the first param that is not needed (like
+        # cPython).
+        first_key, first_values = remaining_params[0]
+        for v in first_values:
+            if first_key is not None:
+                # Is a keyword argument, return the whole thing instead of just
+                # the value node.
+                v = v.parent
+                try:
+                    non_kw_param = keys_used[first_key]
+                except KeyError:
+                    pass
+                else:
+                    origin_args = non_kw_param.parent.var_args.argument_node
+                    # TODO  calculate the var_args tree and check if it's in
+                    # the tree (if not continue).
+                    # print('\t\tnonkw', non_kw_param.parent.var_args.argument_node, )
+                    if origin_args not in [f.parent.parent for f in first_values]:
+                        continue
+            analysis.add(evaluator, 'type-error-too-many-arguments',
+                         v, message=m)
+    return param_names
+
+
+def _iterate_star_args(evaluator, array, input_node, func=None):
+    from jedi.evaluate.representation import Instance
+    if isinstance(array, iterable.Array):
+        # TODO ._items is not the call we want here. Replace in the future.
+        for node in array._items():
+            yield node
+    elif isinstance(array, iterable.Generator):
+        for types in array.py__iter__():
+            yield iterable.AlreadyEvaluated(types)
+    elif isinstance(array, Instance) and array.name.get_code() == 'tuple':
+        debug.warning('Ignored a tuple *args input %s' % array)
+    else:
+        if func is not None:
+            m = "TypeError: %s() argument after * must be a sequence, not %s" \
+                % (func.name.value, array)
+            analysis.add(evaluator, 'type-error-star', input_node, message=m)
+
+
+def _star_star_dict(evaluator, array, input_node, func):
+    dct = defaultdict(lambda: [])
+    from jedi.evaluate.representation import Instance
+    if isinstance(array, Instance) and array.name.get_code() == 'dict':
+        # For now ignore this case. In the future add proper iterators and just
+        # make one call without crazy isinstance checks.
+        return {}
+
+    if isinstance(array, iterable.FakeDict):
+        return array._dct
+    elif isinstance(array, iterable.Array) and array.type == 'dict':
+        # TODO bad call to non-public API
+        for key_node, value in array._items():
+            for key in evaluator.eval_element(key_node):
+                if precedence.is_string(key):
+                    dct[key.obj].append(value)
+
+    else:
+        if func is not None:
+            m = "TypeError: %s argument after ** must be a mapping, not %s" \
+                % (func.name.value, array)
+            analysis.add(evaluator, 'type-error-star-star', input_node, message=m)
+    return dict(dct)
+
+
+def _error_argument_count(func, actual_count):
+    default_arguments = sum(1 for p in func.params if p.default or p.stars)
+
+    if default_arguments == 0:
+        before = 'exactly '
+    else:
+        before = 'from %s to ' % (len(func.params) - default_arguments)
+    return ('TypeError: %s() takes %s%s arguments (%s given).'
+            % (func.name, before, len(func.params), actual_count))
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/pep0484.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/pep0484.py
new file mode 100644
index 0000000..2387fe6
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/pep0484.py
@@ -0,0 +1,195 @@
+"""
+PEP 0484 ( https://www.python.org/dev/peps/pep-0484/ ) describes type hints
+through function annotations. There is a strong suggestion in this document
+that only the type of type hinting defined in PEP0484 should be allowed
+as annotations in future python versions.
+
+The (initial / probably incomplete) implementation todo list for pep-0484:
+v Function parameter annotations with builtin/custom type classes
+v Function returntype annotations with builtin/custom type classes
+v Function parameter annotations with strings (forward reference)
+v Function return type annotations with strings (forward reference)
+v Local variable type hints
+v Assigned types: `Url = str\ndef get(url:Url) -> str:`
+v Type hints in `with` statements
+x Stub files support
+x support `@no_type_check` and `@no_type_check_decorator`
+x support for typing.cast() operator
+x support for type hint comments for functions, `# type: (int, str) -> int`.
+    See comment from Guido https://github.com/davidhalter/jedi/issues/662
+"""
+
+import itertools
+
+import os
+from jedi.parser import \
+    Parser, load_grammar, ParseError, ParserWithRecovery, tree
+from jedi.evaluate.cache import memoize_default
+from jedi.common import unite
+from jedi.evaluate import compiled
+from jedi import debug
+from jedi import _compatibility
+import re
+
+
+def _evaluate_for_annotation(evaluator, annotation, index=None):
+    """
+    Evaluates a string-node, looking for an annotation
+    If index is not None, the annotation is expected to be a tuple
+    and we're interested in that index
+    """
+    if annotation is not None:
+        definitions = evaluator.eval_element(
+            _fix_forward_reference(evaluator, annotation))
+        if index is not None:
+            definitions = list(itertools.chain.from_iterable(
+                definition.py__getitem__(index) for definition in definitions
+                if definition.type == 'tuple' and
+                len(list(definition.py__iter__())) >= index))
+        return list(itertools.chain.from_iterable(
+            evaluator.execute(d) for d in definitions))
+    else:
+        return []
+
+
+def _fix_forward_reference(evaluator, node):
+    evaled_nodes = evaluator.eval_element(node)
+    if len(evaled_nodes) != 1:
+        debug.warning("Eval'ed typing index %s should lead to 1 object, "
+                      " not %s" % (node, evaled_nodes))
+        return node
+    evaled_node = list(evaled_nodes)[0]
+    if isinstance(evaled_node, compiled.CompiledObject) and \
+            isinstance(evaled_node.obj, str):
+        try:
+            p = Parser(load_grammar(), _compatibility.unicode(evaled_node.obj),
+                       start_symbol='eval_input')
+            newnode = p.get_parsed_node()
+        except ParseError:
+            debug.warning('Annotation not parsed: %s' % evaled_node.obj)
+            return node
+        else:
+            module = node.get_parent_until()
+            p.position_modifier.line = module.end_pos[0]
+            newnode.parent = module
+            return newnode
+    else:
+        return node
+
+
+@memoize_default(None, evaluator_is_first_arg=True)
+def follow_param(evaluator, param):
+    annotation = param.annotation()
+    return _evaluate_for_annotation(evaluator, annotation)
+
+
+@memoize_default(None, evaluator_is_first_arg=True)
+def find_return_types(evaluator, func):
+    annotation = func.py__annotations__().get("return", None)
+    return _evaluate_for_annotation(evaluator, annotation)
+
+
+_typing_module = None
+
+
+def _get_typing_replacement_module():
+    """
+    The idea is to return our jedi replacement for the PEP-0484 typing module
+    as discussed at https://github.com/davidhalter/jedi/issues/663
+    """
+    global _typing_module
+    if _typing_module is None:
+        typing_path = \
+            os.path.abspath(os.path.join(__file__, "../jedi_typing.py"))
+        with open(typing_path) as f:
+            code = _compatibility.unicode(f.read())
+        p = ParserWithRecovery(load_grammar(), code)
+        _typing_module = p.module
+    return _typing_module
+
+
+def get_types_for_typing_module(evaluator, typ, node):
+    from jedi.evaluate.iterable import FakeSequence
+    if not typ.base.get_parent_until().name.value == "typing":
+        return None
+    # we assume that any class using [] in a module called
+    # "typing" with a name for which we have a replacement
+    # should be replaced by that class. This is not 100%
+    # airtight but I don't have a better idea to check that it's
+    # actually the PEP-0484 typing module and not some other
+    if tree.is_node(node, "subscriptlist"):
+        nodes = node.children[::2]  # skip the commas
+    else:
+        nodes = [node]
+    del node
+
+    nodes = [_fix_forward_reference(evaluator, node) for node in nodes]
+
+    # hacked in Union and Optional, since it's hard to do nicely in parsed code
+    if typ.name.value == "Union":
+        return unite(evaluator.eval_element(node) for node in nodes)
+    if typ.name.value == "Optional":
+        return evaluator.eval_element(nodes[0])
+
+    typing = _get_typing_replacement_module()
+    factories = evaluator.find_types(typing, "factory")
+    assert len(factories) == 1
+    factory = list(factories)[0]
+    assert factory
+    function_body_nodes = factory.children[4].children
+    valid_classnames = set(child.name.value
+                           for child in function_body_nodes
+                           if isinstance(child, tree.Class))
+    if typ.name.value not in valid_classnames:
+        return None
+    compiled_classname = compiled.create(evaluator, typ.name.value)
+
+    args = FakeSequence(evaluator, nodes, "tuple")
+
+    result = evaluator.execute_evaluated(factory, compiled_classname, args)
+    return result
+
+
+def find_type_from_comment_hint_for(evaluator, node, name):
+    return \
+        _find_type_from_comment_hint(evaluator, node, node.children[1], name)
+
+
+def find_type_from_comment_hint_with(evaluator, node, name):
+    assert len(node.children[1].children) == 3, \
+        "Can only be here when children[1] is 'foo() as f'"
+    return _find_type_from_comment_hint(
+        evaluator, node, node.children[1].children[2], name)
+
+
+def find_type_from_comment_hint_assign(evaluator, node, name):
+    return \
+        _find_type_from_comment_hint(evaluator, node, node.children[0], name)
+
+
+def _find_type_from_comment_hint(evaluator, node, varlist, name):
+    index = None
+    if varlist.type in ("testlist_star_expr", "exprlist"):
+        # something like "a, b = 1, 2"
+        index = 0
+        for child in varlist.children:
+            if child == name:
+                break
+            if child.type == "operator":
+                continue
+            index += 1
+        else:
+            return []
+
+    comment = node.get_following_comment_same_line()
+    if comment is None:
+        return []
+    match = re.match(r"^#\s*type:\s*([^#]*)", comment)
+    if not match:
+        return []
+    annotation = tree.String(
+        tree.zero_position_modifier,
+        repr(str(match.group(1).strip())),
+        node.start_pos)
+    annotation.parent = node.parent
+    return _evaluate_for_annotation(evaluator, annotation, index)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/precedence.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/precedence.py
new file mode 100644
index 0000000..5225aa6
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/precedence.py
@@ -0,0 +1,178 @@
+"""
+Handles operator precedence.
+"""
+import operator
+
+from jedi._compatibility import unicode
+from jedi.parser import tree
+from jedi import debug
+from jedi.evaluate.compiled import CompiledObject, create, builtin_from_name
+from jedi.evaluate import analysis
+
+# Maps Python syntax to the operator module.
+COMPARISON_OPERATORS = {
+    '==': operator.eq,
+    '!=': operator.ne,
+    'is': operator.is_,
+    'is not': operator.is_not,
+    '<': operator.lt,
+    '<=': operator.le,
+    '>': operator.gt,
+    '>=': operator.ge,
+}
+
+
+def literals_to_types(evaluator, result):
+    # Changes literals ('a', 1, 1.0, etc) to its type instances (str(),
+    # int(), float(), etc).
+    new_result = set()
+    for typ in result:
+        if is_literal(typ):
+            # Literals are only valid as long as the operations are
+            # correct. Otherwise add a value-free instance.
+            cls = builtin_from_name(evaluator, typ.name.value)
+            new_result |= evaluator.execute(cls)
+        else:
+            new_result.add(typ)
+    return new_result
+
+
+def calculate_children(evaluator, children):
+    """
+    Calculate a list of children with operators.
+    """
+    iterator = iter(children)
+    types = evaluator.eval_element(next(iterator))
+    for operator in iterator:
+        right = next(iterator)
+        if tree.is_node(operator, 'comp_op'):  # not in / is not
+            operator = ' '.join(str(c.value) for c in operator.children)
+
+        # handle lazy evaluation of and/or here.
+        if operator in ('and', 'or'):
+            left_bools = set([left.py__bool__() for left in types])
+            if left_bools == set([True]):
+                if operator == 'and':
+                    types = evaluator.eval_element(right)
+            elif left_bools == set([False]):
+                if operator != 'and':
+                    types = evaluator.eval_element(right)
+            # Otherwise continue, because of uncertainty.
+        else:
+            types = calculate(evaluator, types, operator,
+                              evaluator.eval_element(right))
+    debug.dbg('calculate_children types %s', types)
+    return types
+
+
+def calculate(evaluator, left_result, operator, right_result):
+    result = set()
+    if not left_result or not right_result:
+        # illegal slices e.g. cause left/right_result to be None
+        result = (left_result or set()) | (right_result or set())
+        result = literals_to_types(evaluator, result)
+    else:
+        # I don't think there's a reasonable chance that a string
+        # operation is still correct, once we pass something like six
+        # objects.
+        if len(left_result) * len(right_result) > 6:
+            result = literals_to_types(evaluator, left_result | right_result)
+        else:
+            for left in left_result:
+                for right in right_result:
+                    result |= _element_calculate(evaluator, left, operator, right)
+    return result
+
+
+def factor_calculate(evaluator, types, operator):
+    """
+    Calculates `+`, `-`, `~` and `not` prefixes.
+    """
+    for typ in types:
+        if operator == '-':
+            if _is_number(typ):
+                yield create(evaluator, -typ.obj)
+        elif operator == 'not':
+            value = typ.py__bool__()
+            if value is None:  # Uncertainty.
+                return
+            yield create(evaluator, not value)
+        else:
+            yield typ
+
+
+def _is_number(obj):
+    return isinstance(obj, CompiledObject) \
+        and isinstance(obj.obj, (int, float))
+
+
+def is_string(obj):
+    return isinstance(obj, CompiledObject) \
+        and isinstance(obj.obj, (str, unicode))
+
+
+def is_literal(obj):
+    return _is_number(obj) or is_string(obj)
+
+
+def _is_tuple(obj):
+    from jedi.evaluate import iterable
+    return isinstance(obj, iterable.Array) and obj.type == 'tuple'
+
+
+def _is_list(obj):
+    from jedi.evaluate import iterable
+    return isinstance(obj, iterable.Array) and obj.type == 'list'
+
+
+def _element_calculate(evaluator, left, operator, right):
+    from jedi.evaluate import iterable, representation as er
+    l_is_num = _is_number(left)
+    r_is_num = _is_number(right)
+    if operator == '*':
+        # for iterables, ignore * operations
+        if isinstance(left, iterable.Array) or is_string(left):
+            return set([left])
+        elif isinstance(right, iterable.Array) or is_string(right):
+            return set([right])
+    elif operator == '+':
+        if l_is_num and r_is_num or is_string(left) and is_string(right):
+            return set([create(evaluator, left.obj + right.obj)])
+        elif _is_tuple(left) and _is_tuple(right) or _is_list(left) and _is_list(right):
+            return set([iterable.MergedArray(evaluator, (left, right))])
+    elif operator == '-':
+        if l_is_num and r_is_num:
+            return set([create(evaluator, left.obj - right.obj)])
+    elif operator == '%':
+        # With strings and numbers the left type typically remains. Except for
+        # `int() % float()`.
+        return set([left])
+    elif operator in COMPARISON_OPERATORS:
+        operation = COMPARISON_OPERATORS[operator]
+        if isinstance(left, CompiledObject) and isinstance(right, CompiledObject):
+            # Possible, because the return is not an option. Just compare.
+            left = left.obj
+            right = right.obj
+
+        try:
+            result = operation(left, right)
+        except TypeError:
+            # Could be True or False.
+            return set([create(evaluator, True), create(evaluator, False)])
+        else:
+            return set([create(evaluator, result)])
+    elif operator == 'in':
+        return set()
+
+    def check(obj):
+        """Checks if a Jedi object is either a float or an int."""
+        return isinstance(obj, er.Instance) and obj.name.get_code() in ('int', 'float')
+
+    # Static analysis, one is a number, the other one is not.
+    if operator in ('+', '-') and l_is_num != r_is_num \
+            and not (check(left) or check(right)):
+        message = "TypeError: unsupported operand type(s) for +: %s and %s"
+        analysis.add(evaluator, 'type-error-operation', operator,
+                     message % (left, right))
+
+    return set([left, right])
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/recursion.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/recursion.py
new file mode 100644
index 0000000..9b95fad
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/recursion.py
@@ -0,0 +1,157 @@
+"""
+Recursions are the recipe of |jedi| to conquer Python code. However, someone
+must stop recursions going mad. Some settings are here to make |jedi| stop at
+the right time. You can read more about them :ref:`here <settings-recursion>`.
+
+Next to :mod:`jedi.evaluate.cache` this module also makes |jedi| not
+thread-safe. Why?  ``execution_recursion_decorator`` uses class variables to
+count the function calls.
+"""
+from jedi import debug
+from jedi import settings
+from jedi.evaluate import iterable
+
+
+def recursion_decorator(func):
+    def run(evaluator, stmt, *args, **kwargs):
+        rec_detect = evaluator.recursion_detector
+        if rec_detect.push_stmt(stmt):
+            return set()
+        else:
+            result = func(evaluator, stmt, *args, **kwargs)
+            rec_detect.pop_stmt()
+        return result
+    return run
+
+
+class RecursionDetector(object):
+    """
+    A decorator to detect recursions in statements. In a recursion a statement
+    at the same place, in the same module may not be executed two times.
+    """
+    def __init__(self, evaluator):
+        self.top = None
+        self.current = None
+        self._evaluator = evaluator
+
+    def push_stmt(self, stmt):
+        self.current = _RecursionNode(self._evaluator, stmt, self.current)
+        check = self._check_recursion()
+        if check:
+            debug.warning('catched stmt recursion: %s against %s @%s', stmt,
+                          check.stmt, stmt.start_pos)
+            self.pop_stmt()
+            return True
+        return False
+
+    def pop_stmt(self):
+        if self.current is not None:
+            # I don't know how current can be None, but sometimes it happens
+            # with Python3.
+            self.current = self.current.parent
+
+    def _check_recursion(self):
+        test = self.current
+        while True:
+            test = test.parent
+            if self.current == test:
+                return test
+            if not test:
+                return False
+
+    def node_statements(self):
+        result = []
+        n = self.current
+        while n:
+            result.insert(0, n.stmt)
+            n = n.parent
+        return result
+
+
+class _RecursionNode(object):
+    """ A node of the RecursionDecorator. """
+    def __init__(self, evaluator, stmt, parent):
+        self._evaluator = evaluator
+        self.script = stmt.get_parent_until()
+        self.position = stmt.start_pos
+        self.parent = parent
+        self.stmt = stmt
+
+        # Don't check param instances, they are not causing recursions
+        # The same's true for the builtins, because the builtins are really
+        # simple.
+        self.is_ignored = self.script == self._evaluator.BUILTINS
+
+    def __eq__(self, other):
+        if not other:
+            return None
+
+        return self.script == other.script \
+            and self.position == other.position \
+            and not self.is_ignored and not other.is_ignored
+
+
+def execution_recursion_decorator(func):
+    def run(execution, **kwargs):
+        detector = execution._evaluator.execution_recursion_detector
+        if detector.push_execution(execution):
+            result = set()
+        else:
+            result = func(execution, **kwargs)
+        detector.pop_execution()
+        return result
+
+    return run
+
+
+class ExecutionRecursionDetector(object):
+    """
+    Catches recursions of executions.
+    """
+    def __init__(self, evaluator):
+        self.recursion_level = 0
+        self.parent_execution_funcs = []
+        self.execution_funcs = set()
+        self.execution_count = 0
+        self._evaluator = evaluator
+
+    def __call__(self, execution):
+        debug.dbg('Execution recursions: %s', execution, self.recursion_level,
+                  self.execution_count, len(self.execution_funcs))
+        if self.check_recursion(execution):
+            result = set()
+        else:
+            result = self.func(execution)
+        self.pop_execution()
+        return result
+
+    def pop_execution(self):
+        self.parent_execution_funcs.pop()
+        self.recursion_level -= 1
+
+    def push_execution(self, execution):
+        in_par_execution_funcs = execution.base in self.parent_execution_funcs
+        in_execution_funcs = execution.base in self.execution_funcs
+        self.recursion_level += 1
+        self.execution_count += 1
+        self.execution_funcs.add(execution.base)
+        self.parent_execution_funcs.append(execution.base)
+
+        if self.execution_count > settings.max_executions:
+            return True
+
+        if isinstance(execution.base, (iterable.Array, iterable.Generator)):
+            return False
+        module = execution.get_parent_until()
+        if module == self._evaluator.BUILTINS:
+            return False
+
+        if in_par_execution_funcs:
+            if self.recursion_level > settings.max_function_recursion_level:
+                return True
+        if in_execution_funcs and \
+                len(self.execution_funcs) > settings.max_until_execution_unique:
+            return True
+        if self.execution_count > settings.max_executions_without_builtins:
+            return True
+        return False
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/representation.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/representation.py
new file mode 100644
index 0000000..8f3d642
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/representation.py
@@ -0,0 +1,974 @@
+"""
+Like described in the :mod:`jedi.parser.tree` module,
+there's a need for an ast like module to represent the states of parsed
+modules.
+
+But now there are also structures in Python that need a little bit more than
+that. An ``Instance`` for example is only a ``Class`` before it is
+instantiated. This class represents these cases.
+
+So, why is there also a ``Class`` class here? Well, there are decorators and
+they change classes in Python 3.
+
+Representation modules also define "magic methods". Those methods look like
+``py__foo__`` and are typically mappable to the Python equivalents ``__call__``
+and others. Here's a list:
+
+====================================== ========================================
+**Method**                             **Description**
+-------------------------------------- ----------------------------------------
+py__call__(params: Array)              On callable objects, returns types.
+py__bool__()                           Returns True/False/None; None means that
+                                       there's no certainty.
+py__bases__()                          Returns a list of base classes.
+py__mro__()                            Returns a list of classes (the mro).
+py__iter__()                           Returns a generator of a set of types.
+py__class__()                          Returns the class of an instance.
+py__getitem__(index: int/str)          Returns a a set of types of the index.
+                                       Can raise an IndexError/KeyError.
+py__file__()                           Only on modules.
+py__package__()                        Only on modules. For the import system.
+py__path__()                           Only on modules. For the import system.
+====================================== ========================================
+
+__
+"""
+import os
+import pkgutil
+import imp
+import re
+from itertools import chain
+
+from jedi._compatibility import use_metaclass, unicode, Python3Method, is_py3
+from jedi.parser import tree
+from jedi import debug
+from jedi import common
+from jedi.cache import underscore_memoization, cache_star_import
+from jedi.evaluate.cache import memoize_default, CachedMetaClass, NO_DEFAULT
+from jedi.evaluate import compiled
+from jedi.evaluate.compiled import mixed
+from jedi.evaluate import recursion
+from jedi.evaluate import iterable
+from jedi.evaluate import docstrings
+from jedi.evaluate import pep0484
+from jedi.evaluate import helpers
+from jedi.evaluate import param
+from jedi.evaluate import flow_analysis
+from jedi.evaluate import imports
+
+
+class Executed(tree.Base):
+    """
+    An instance is also an executable - because __init__ is called
+    :param var_args: The param input array, consist of a parser node or a list.
+    """
+    def __init__(self, evaluator, base, var_args=()):
+        self._evaluator = evaluator
+        self.base = base
+        self.var_args = var_args
+
+    def is_scope(self):
+        return True
+
+    def get_parent_until(self, *args, **kwargs):
+        return tree.Base.get_parent_until(self, *args, **kwargs)
+
+    @common.safe_property
+    def parent(self):
+        return self.base.parent
+
+
+class Instance(use_metaclass(CachedMetaClass, Executed)):
+    """
+    This class is used to evaluate instances.
+    """
+    def __init__(self, evaluator, base, var_args, is_generated=False):
+        super(Instance, self).__init__(evaluator, base, var_args)
+        self.decorates = None
+        # Generated instances are classes that are just generated by self
+        # (No var_args) used.
+        self.is_generated = is_generated
+
+        if base.name.get_code() in ['list', 'set'] \
+                and evaluator.BUILTINS == base.get_parent_until():
+            # compare the module path with the builtin name.
+            self.var_args = iterable.check_array_instances(evaluator, self)
+        elif not is_generated:
+            # Need to execute the __init__ function, because the dynamic param
+            # searching needs it.
+            try:
+                method = self.get_subscope_by_name('__init__')
+            except KeyError:
+                pass
+            else:
+                evaluator.execute(method, self.var_args)
+
+    def is_class(self):
+        return False
+
+    @property
+    def py__call__(self):
+        def actual(params):
+            return self._evaluator.execute(method, params)
+
+        try:
+            method = self.get_subscope_by_name('__call__')
+        except KeyError:
+            # Means the Instance is not callable.
+            raise AttributeError
+
+        return actual
+
+    def py__class__(self):
+        return self.base
+
+    def py__bool__(self):
+        # Signalize that we don't know about the bool type.
+        return None
+
+    @memoize_default()
+    def _get_method_execution(self, func):
+        func = get_instance_el(self._evaluator, self, func, True)
+        return FunctionExecution(self._evaluator, func, self.var_args)
+
+    def _get_func_self_name(self, func):
+        """
+        Returns the name of the first param in a class method (which is
+        normally self.
+        """
+        try:
+            return str(func.params[0].name)
+        except IndexError:
+            return None
+
+    def _self_names_dict(self, add_mro=True):
+        names = {}
+        # This loop adds the names of the self object, copies them and removes
+        # the self.
+        for sub in self.base.subscopes:
+            if isinstance(sub, tree.Class):
+                continue
+            # Get the self name, if there's one.
+            self_name = self._get_func_self_name(sub)
+            if self_name is None:
+                continue
+
+            if sub.name.value == '__init__' and not self.is_generated:
+                # ``__init__`` is special because the params need are injected
+                # this way. Therefore an execution is necessary.
+                if not sub.get_decorators():
+                    # __init__ decorators should generally just be ignored,
+                    # because to follow them and their self variables is too
+                    # complicated.
+                    sub = self._get_method_execution(sub)
+            for name_list in sub.names_dict.values():
+                for name in name_list:
+                    if name.value == self_name and name.get_previous_sibling() is None:
+                        trailer = name.get_next_sibling()
+                        if tree.is_node(trailer, 'trailer') \
+                                and len(trailer.children) == 2 \
+                                and trailer.children[0] == '.':
+                            name = trailer.children[1]  # After dot.
+                            if name.is_definition():
+                                arr = names.setdefault(name.value, [])
+                                arr.append(get_instance_el(self._evaluator, self, name))
+        return names
+
+    def get_subscope_by_name(self, name):
+        sub = self.base.get_subscope_by_name(name)
+        return get_instance_el(self._evaluator, self, sub, True)
+
+    def execute_subscope_by_name(self, name, *args):
+        method = self.get_subscope_by_name(name)
+        return self._evaluator.execute_evaluated(method, *args)
+
+    def get_descriptor_returns(self, obj):
+        """ Throws a KeyError if there's no method. """
+        # Arguments in __get__ descriptors are obj, class.
+        # `method` is the new parent of the array, don't know if that's good.
+        none_obj = compiled.create(self._evaluator, None)
+        args = [obj, obj.base] if isinstance(obj, Instance) else [none_obj, obj]
+        try:
+            return self.execute_subscope_by_name('__get__', *args)
+        except KeyError:
+            return set([self])
+
+    @memoize_default()
+    def names_dicts(self, search_global):
+        yield self._self_names_dict()
+
+        for s in self.base.py__mro__()[1:]:
+            if not isinstance(s, compiled.CompiledObject):
+                # Compiled objects don't have `self.` names.
+                for inst in self._evaluator.execute(s):
+                    yield inst._self_names_dict(add_mro=False)
+
+        for names_dict in self.base.names_dicts(search_global=False, is_instance=True):
+            yield LazyInstanceDict(self._evaluator, self, names_dict)
+
+    def py__getitem__(self, index):
+        try:
+            method = self.get_subscope_by_name('__getitem__')
+        except KeyError:
+            debug.warning('No __getitem__, cannot access the array.')
+            return set()
+        else:
+            index_obj = compiled.create(self._evaluator, index)
+            return self._evaluator.execute_evaluated(method, index_obj)
+
+    def py__iter__(self):
+        try:
+            method = self.get_subscope_by_name('__iter__')
+        except KeyError:
+            debug.warning('No __iter__ on %s.' % self)
+            return
+        else:
+            iters = self._evaluator.execute(method)
+            for generator in iters:
+                if isinstance(generator, Instance):
+                    # `__next__` logic.
+                    name = '__next__' if is_py3 else 'next'
+                    try:
+                        yield generator.execute_subscope_by_name(name)
+                    except KeyError:
+                        debug.warning('Instance has no __next__ function in %s.', generator)
+                else:
+                    for typ in generator.py__iter__():
+                        yield typ
+
+    @property
+    @underscore_memoization
+    def name(self):
+        name = self.base.name
+        return helpers.FakeName(unicode(name), self, name.start_pos)
+
+    def __getattr__(self, name):
+        if name not in ['start_pos', 'end_pos', 'get_imports', 'type',
+                        'doc', 'raw_doc']:
+            raise AttributeError("Instance %s: Don't touch this (%s)!"
+                                 % (self, name))
+        return getattr(self.base, name)
+
+    def __repr__(self):
+        dec = ''
+        if self.decorates is not None:
+            dec = " decorates " + repr(self.decorates)
+        return "<%s of %s(%s)%s>" % (type(self).__name__, self.base,
+                                     self.var_args, dec)
+
+
+class LazyInstanceDict(object):
+    def __init__(self, evaluator, instance, dct):
+        self._evaluator = evaluator
+        self._instance = instance
+        self._dct = dct
+
+    def __getitem__(self, name):
+        return [get_instance_el(self._evaluator, self._instance, var, True)
+                for var in self._dct[name]]
+
+    def values(self):
+        return [self[key] for key in self._dct]
+
+
+class InstanceName(tree.Name):
+    def __init__(self, origin_name, parent):
+        super(InstanceName, self).__init__(tree.zero_position_modifier,
+                                           origin_name.value,
+                                           origin_name.start_pos)
+        self._origin_name = origin_name
+        self.parent = parent
+
+    def is_definition(self):
+        return self._origin_name.is_definition()
+
+
+def get_instance_el(evaluator, instance, var, is_class_var=False):
+    """
+    Returns an InstanceElement if it makes sense, otherwise leaves the object
+    untouched.
+
+    Basically having an InstanceElement is context information. That is needed
+    in quite a lot of cases, which includes Nodes like ``power``, that need to
+    know where a self name comes from for example.
+    """
+    if isinstance(var, tree.Name):
+        parent = get_instance_el(evaluator, instance, var.parent, is_class_var)
+        return InstanceName(var, parent)
+    elif var.type != 'funcdef' \
+            and isinstance(var, (Instance, compiled.CompiledObject, tree.Leaf,
+                           tree.Module, FunctionExecution)):
+        return var
+
+    var = evaluator.wrap(var)
+    return InstanceElement(evaluator, instance, var, is_class_var)
+
+
+class InstanceElement(use_metaclass(CachedMetaClass, tree.Base)):
+    """
+    InstanceElement is a wrapper for any object, that is used as an instance
+    variable (e.g. self.variable or class methods).
+    """
+    def __init__(self, evaluator, instance, var, is_class_var):
+        self._evaluator = evaluator
+        self.instance = instance
+        self.var = var
+        self.is_class_var = is_class_var
+
+    @common.safe_property
+    @memoize_default()
+    def parent(self):
+        par = self.var.parent
+        if isinstance(par, Class) and par == self.instance.base \
+                or isinstance(par, tree.Class) \
+                and par == self.instance.base.base:
+            par = self.instance
+        else:
+            par = get_instance_el(self._evaluator, self.instance, par,
+                                  self.is_class_var)
+        return par
+
+    def get_parent_until(self, *args, **kwargs):
+        return tree.BaseNode.get_parent_until(self, *args, **kwargs)
+
+    def get_definition(self):
+        return self.get_parent_until((tree.ExprStmt, tree.IsScope, tree.Import))
+
+    def get_decorated_func(self):
+        """ Needed because the InstanceElement should not be stripped """
+        func = self.var.get_decorated_func()
+        func = get_instance_el(self._evaluator, self.instance, func)
+        return func
+
+    def get_rhs(self):
+        return get_instance_el(self._evaluator, self.instance,
+                               self.var.get_rhs(), self.is_class_var)
+
+    def is_definition(self):
+        return self.var.is_definition()
+
+    @property
+    def children(self):
+        # Copy and modify the array.
+        return [get_instance_el(self._evaluator, self.instance, command, self.is_class_var)
+                for command in self.var.children]
+
+    @property
+    @memoize_default()
+    def name(self):
+        name = self.var.name
+        return helpers.FakeName(unicode(name), self, name.start_pos)
+
+    def __iter__(self):
+        for el in self.var.__iter__():
+            yield get_instance_el(self._evaluator, self.instance, el,
+                                  self.is_class_var)
+
+    def __getitem__(self, index):
+        return get_instance_el(self._evaluator, self.instance, self.var[index],
+                               self.is_class_var)
+
+    def __getattr__(self, name):
+        return getattr(self.var, name)
+
+    def isinstance(self, *cls):
+        return isinstance(self.var, cls)
+
+    def is_scope(self):
+        """
+        Since we inherit from Base, it would overwrite the action we want here.
+        """
+        return self.var.is_scope()
+
+    def py__call__(self, params):
+        if isinstance(self.var, compiled.CompiledObject):
+            # This check is a bit strange, but CompiledObject itself is a bit
+            # more complicated than we would it actually like to be.
+            return self.var.py__call__(params)
+        else:
+            return Function.py__call__(self, params)
+
+    def __repr__(self):
+        return "<%s of %s>" % (type(self).__name__, self.var)
+
+
+class Wrapper(tree.Base):
+    def is_scope(self):
+        return True
+
+    def is_class(self):
+        return False
+
+    def py__bool__(self):
+        """
+        Since Wrapper is a super class for classes, functions and modules,
+        the return value will always be true.
+        """
+        return True
+
+    @property
+    @underscore_memoization
+    def name(self):
+        name = self.base.name
+        return helpers.FakeName(unicode(name), self, name.start_pos)
+
+
+class Class(use_metaclass(CachedMetaClass, Wrapper)):
+    """
+    This class is not only important to extend `tree.Class`, it is also a
+    important for descriptors (if the descriptor methods are evaluated or not).
+    """
+    def __init__(self, evaluator, base):
+        self._evaluator = evaluator
+        self.base = base
+
+    @memoize_default(default=())
+    def py__mro__(self):
+        def add(cls):
+            if cls not in mro:
+                mro.append(cls)
+
+        mro = [self]
+        # TODO Do a proper mro resolution. Currently we are just listing
+        # classes. However, it's a complicated algorithm.
+        for cls in self.py__bases__():
+            # TODO detect for TypeError: duplicate base class str,
+            # e.g.  `class X(str, str): pass`
+            try:
+                mro_method = cls.py__mro__
+            except AttributeError:
+                # TODO add a TypeError like:
+                """
+                >>> class Y(lambda: test): pass
+                Traceback (most recent call last):
+                  File "<stdin>", line 1, in <module>
+                TypeError: function() argument 1 must be code, not str
+                >>> class Y(1): pass
+                Traceback (most recent call last):
+                  File "<stdin>", line 1, in <module>
+                TypeError: int() takes at most 2 arguments (3 given)
+                """
+                pass
+            else:
+                add(cls)
+                for cls_new in mro_method():
+                    add(cls_new)
+        return tuple(mro)
+
+    @memoize_default(default=())
+    def py__bases__(self):
+        arglist = self.base.get_super_arglist()
+        if arglist:
+            args = param.Arguments(self._evaluator, arglist)
+            return list(chain.from_iterable(args.eval_args()))
+        else:
+            return [compiled.create(self._evaluator, object)]
+
+    def py__call__(self, params):
+        return set([Instance(self._evaluator, self, params)])
+
+    def py__class__(self):
+        return compiled.create(self._evaluator, type)
+
+    @property
+    def params(self):
+        try:
+            return self.get_subscope_by_name('__init__').params
+        except KeyError:
+            return []  # object.__init__
+
+    def names_dicts(self, search_global, is_instance=False):
+        if search_global:
+            yield self.names_dict
+        else:
+            for scope in self.py__mro__():
+                if isinstance(scope, compiled.CompiledObject):
+                    yield scope.names_dicts(False, is_instance)[0]
+                else:
+                    yield scope.names_dict
+
+    def is_class(self):
+        return True
+
+    def get_subscope_by_name(self, name):
+        for s in self.py__mro__():
+            for sub in reversed(s.subscopes):
+                if sub.name.value == name:
+                    return sub
+        raise KeyError("Couldn't find subscope.")
+
+    def __getattr__(self, name):
+        if name not in ['start_pos', 'end_pos', 'parent', 'raw_doc',
+                        'doc', 'get_imports', 'get_parent_until', 'get_code',
+                        'subscopes', 'names_dict', 'type']:
+            raise AttributeError("Don't touch this: %s of %s !" % (name, self))
+        return getattr(self.base, name)
+
+    def __repr__(self):
+        return "<e%s of %s>" % (type(self).__name__, self.base)
+
+
+class Function(use_metaclass(CachedMetaClass, Wrapper)):
+    """
+    Needed because of decorators. Decorators are evaluated here.
+    """
+    def __init__(self, evaluator, func, is_decorated=False):
+        """ This should not be called directly """
+        self._evaluator = evaluator
+        self.base = self.base_func = func
+        self.is_decorated = is_decorated
+        # A property that is set by the decorator resolution.
+        self.decorates = None
+
+    @memoize_default()
+    def get_decorated_func(self):
+        """
+        Returns the function, that should to be executed in the end.
+        This is also the places where the decorators are processed.
+        """
+        f = self.base_func
+        decorators = self.base_func.get_decorators()
+
+        if not decorators or self.is_decorated:
+            return self
+
+        # Only enter it, if has not already been processed.
+        if not self.is_decorated:
+            for dec in reversed(decorators):
+                debug.dbg('decorator: %s %s', dec, f)
+                dec_results = self._evaluator.eval_element(dec.children[1])
+                trailer = dec.children[2:-1]
+                if trailer:
+                    # Create a trailer and evaluate it.
+                    trailer = tree.Node('trailer', trailer)
+                    trailer.parent = dec
+                    dec_results = self._evaluator.eval_trailer(dec_results, trailer)
+
+                if not len(dec_results):
+                    debug.warning('decorator not found: %s on %s', dec, self.base_func)
+                    return self
+                decorator = dec_results.pop()
+                if dec_results:
+                    debug.warning('multiple decorators found %s %s',
+                                  self.base_func, dec_results)
+
+                # Create param array.
+                if isinstance(f, Function):
+                    old_func = f  # TODO this is just hacky. change.
+                elif f.type == 'funcdef':
+                    old_func = Function(self._evaluator, f, is_decorated=True)
+                else:
+                    old_func = f
+
+                wrappers = self._evaluator.execute_evaluated(decorator, old_func)
+                if not len(wrappers):
+                    debug.warning('no wrappers found %s', self.base_func)
+                    return self
+                if len(wrappers) > 1:
+                    # TODO resolve issue with multiple wrappers -> multiple types
+                    debug.warning('multiple wrappers found %s %s',
+                                  self.base_func, wrappers)
+                f = list(wrappers)[0]
+                if isinstance(f, (Instance, Function)):
+                    f.decorates = self
+
+                debug.dbg('decorator end %s', f)
+        return f
+
+    def names_dicts(self, search_global):
+        if search_global:
+            yield self.names_dict
+        else:
+            scope = self.py__class__()
+            for names_dict in scope.names_dicts(False):
+                yield names_dict
+
+    @Python3Method
+    def py__call__(self, params):
+        if self.base.is_generator():
+            return set([iterable.Generator(self._evaluator, self, params)])
+        else:
+            return FunctionExecution(self._evaluator, self, params).get_return_types()
+
+    @memoize_default()
+    def py__annotations__(self):
+        parser_func = self.base
+        return_annotation = parser_func.annotation()
+        if return_annotation:
+            dct = {'return': return_annotation}
+        else:
+            dct = {}
+        for function_param in parser_func.params:
+            param_annotation = function_param.annotation()
+            if param_annotation is not None:
+                dct[function_param.name.value] = param_annotation
+        return dct
+
+    def py__class__(self):
+        # This differentiation is only necessary for Python2. Python3 does not
+        # use a different method class.
+        if isinstance(self.base.get_parent_scope(), tree.Class):
+            name = 'METHOD_CLASS'
+        else:
+            name = 'FUNCTION_CLASS'
+        return compiled.get_special_object(self._evaluator, name)
+
+    def __getattr__(self, name):
+        return getattr(self.base_func, name)
+
+    def __repr__(self):
+        dec = ''
+        if self.decorates is not None:
+            dec = " decorates " + repr(self.decorates)
+        return "<e%s of %s%s>" % (type(self).__name__, self.base_func, dec)
+
+
+class LambdaWrapper(Function):
+    def get_decorated_func(self):
+        return self
+
+
+class FunctionExecution(Executed):
+    """
+    This class is used to evaluate functions and their returns.
+
+    This is the most complicated class, because it contains the logic to
+    transfer parameters. It is even more complicated, because there may be
+    multiple calls to functions and recursion has to be avoided. But this is
+    responsibility of the decorators.
+    """
+    type = 'funcdef'
+
+    def __init__(self, evaluator, base, *args, **kwargs):
+        super(FunctionExecution, self).__init__(evaluator, base, *args, **kwargs)
+        self._copy_dict = {}
+        funcdef = base.base_func
+        if isinstance(funcdef, mixed.MixedObject):
+            # The extra information in mixed is not needed anymore. We can just
+            # unpack it and give it the tree object.
+            funcdef = funcdef.definition
+
+        # Just overwrite the old version. We don't need it anymore.
+        funcdef = helpers.deep_ast_copy(funcdef, new_elements=self._copy_dict)
+        for child in funcdef.children:
+            if child.type not in ('operator', 'keyword'):
+                # Not all nodes are properly copied by deep_ast_copy.
+                child.parent = self
+        self.children = funcdef.children
+        self.names_dict = funcdef.names_dict
+
+    @memoize_default(default=set())
+    @recursion.execution_recursion_decorator
+    def get_return_types(self, check_yields=False):
+        func = self.base
+
+        if func.isinstance(LambdaWrapper):
+            return self._evaluator.eval_element(self.children[-1])
+
+        if func.listeners:
+            # Feed the listeners, with the params.
+            for listener in func.listeners:
+                listener.execute(self._get_params())
+            # If we do have listeners, that means that there's not a regular
+            # execution ongoing. In this case Jedi is interested in the
+            # inserted params, not in the actual execution of the function.
+            return set()
+
+        if check_yields:
+            types = set()
+            returns = self.yields
+        else:
+            returns = self.returns
+            types = set(docstrings.find_return_types(self._evaluator, func))
+            types |= set(pep0484.find_return_types(self._evaluator, func))
+
+        for r in returns:
+            check = flow_analysis.break_check(self._evaluator, self, r)
+            if check is flow_analysis.UNREACHABLE:
+                debug.dbg('Return unreachable: %s', r)
+            else:
+                if check_yields:
+                    types |= iterable.unite(self._eval_yield(r))
+                else:
+                    types |= self._evaluator.eval_element(r.children[1])
+            if check is flow_analysis.REACHABLE:
+                debug.dbg('Return reachable: %s', r)
+                break
+        return types
+
+    def _eval_yield(self, yield_expr):
+        element = yield_expr.children[1]
+        if element.type == 'yield_arg':
+            # It must be a yield from.
+            yield_from_types = self._evaluator.eval_element(element.children[1])
+            for result in iterable.py__iter__(self._evaluator, yield_from_types, element):
+                yield result
+        else:
+            yield self._evaluator.eval_element(element)
+
+    @recursion.execution_recursion_decorator
+    def get_yield_types(self):
+        yields = self.yields
+        stopAt = tree.ForStmt, tree.WhileStmt, FunctionExecution, tree.IfStmt
+        for_parents = [(x, x.get_parent_until((stopAt))) for x in yields]
+
+        # Calculate if the yields are placed within the same for loop.
+        yields_order = []
+        last_for_stmt = None
+        for yield_, for_stmt in for_parents:
+            # For really simple for loops we can predict the order. Otherwise
+            # we just ignore it.
+            parent = for_stmt.parent
+            if parent.type == 'suite':
+                parent = parent.parent
+            if for_stmt.type == 'for_stmt' and parent == self \
+                    and for_stmt.defines_one_name():  # Simplicity for now.
+                if for_stmt == last_for_stmt:
+                    yields_order[-1][1].append(yield_)
+                else:
+                    yields_order.append((for_stmt, [yield_]))
+            elif for_stmt == self:
+                yields_order.append((None, [yield_]))
+            else:
+                yield self.get_return_types(check_yields=True)
+                return
+            last_for_stmt = for_stmt
+
+        evaluator = self._evaluator
+        for for_stmt, yields in yields_order:
+            if for_stmt is None:
+                # No for_stmt, just normal yields.
+                for yield_ in yields:
+                    for result in self._eval_yield(yield_):
+                        yield result
+            else:
+                input_node = for_stmt.get_input_node()
+                for_types = evaluator.eval_element(input_node)
+                ordered = iterable.py__iter__(evaluator, for_types, input_node)
+                for index_types in ordered:
+                    dct = {str(for_stmt.children[1]): index_types}
+                    evaluator.predefined_if_name_dict_dict[for_stmt] = dct
+                    for yield_in_same_for_stmt in yields:
+                        for result in self._eval_yield(yield_in_same_for_stmt):
+                            yield result
+                    del evaluator.predefined_if_name_dict_dict[for_stmt]
+
+    def names_dicts(self, search_global):
+        yield self.names_dict
+
+    @memoize_default(default=NO_DEFAULT)
+    def _get_params(self):
+        """
+        This returns the params for an TODO and is injected as a
+        'hack' into the tree.Function class.
+        This needs to be here, because Instance can have __init__ functions,
+        which act the same way as normal functions.
+        """
+        return param.get_params(self._evaluator, self.base, self.var_args)
+
+    def param_by_name(self, name):
+        return [n for n in self._get_params() if str(n) == name][0]
+
+    def name_for_position(self, position):
+        return tree.Function.name_for_position(self, position)
+
+    def __getattr__(self, name):
+        if name not in ['start_pos', 'end_pos', 'imports', 'name', 'type']:
+            raise AttributeError('Tried to access %s: %s. Why?' % (name, self))
+        return getattr(self.base, name)
+
+    @common.safe_property
+    @memoize_default()
+    def returns(self):
+        return tree.Scope._search_in_scope(self, tree.ReturnStmt)
+
+    @common.safe_property
+    @memoize_default()
+    def yields(self):
+        return tree.Scope._search_in_scope(self, tree.YieldExpr)
+
+    @common.safe_property
+    @memoize_default()
+    def statements(self):
+        return tree.Scope._search_in_scope(self, tree.ExprStmt)
+
+    @common.safe_property
+    @memoize_default()
+    def subscopes(self):
+        return tree.Scope._search_in_scope(self, tree.Scope)
+
+    def __repr__(self):
+        return "<%s of %s>" % (type(self).__name__, self.base)
+
+
+class GlobalName(helpers.FakeName):
+    def __init__(self, name):
+        """
+        We need to mark global names somehow. Otherwise they are just normal
+        names that are not definitions.
+        """
+        super(GlobalName, self).__init__(name.value, name.parent,
+                                         name.start_pos, is_definition=True)
+
+
+class ModuleWrapper(use_metaclass(CachedMetaClass, tree.Module, Wrapper)):
+    def __init__(self, evaluator, module, parent_module=None):
+        self._evaluator = evaluator
+        self.base = self._module = module
+        self._parent_module = parent_module
+
+    def names_dicts(self, search_global):
+        yield self.base.names_dict
+        yield self._module_attributes_dict()
+
+        for star_module in self.star_imports():
+            yield star_module.names_dict
+
+        yield dict((str(n), [GlobalName(n)]) for n in self.base.global_names)
+        yield self._sub_modules_dict()
+
+    # I'm not sure if the star import cache is really that effective anymore
+    # with all the other really fast import caches. Recheck. Also we would need
+    # to push the star imports into Evaluator.modules, if we reenable this.
+    #@cache_star_import
+    @memoize_default([])
+    def star_imports(self):
+        modules = []
+        for i in self.base.imports:
+            if i.is_star_import():
+                name = i.star_import_name()
+                new = imports.ImportWrapper(self._evaluator, name).follow()
+                for module in new:
+                    if isinstance(module, tree.Module):
+                        modules += module.star_imports()
+                modules += new
+        return modules
+
+    @memoize_default()
+    def _module_attributes_dict(self):
+        def parent_callback():
+            # Create a string type object (without a defined string in it):
+            return list(self._evaluator.execute(compiled.create(self._evaluator, str)))[0]
+
+        names = ['__file__', '__package__', '__doc__', '__name__']
+        # All the additional module attributes are strings.
+        return dict((n, [helpers.LazyName(n, parent_callback, is_definition=True)])
+                    for n in names)
+
+    @property
+    @memoize_default()
+    def name(self):
+        return helpers.FakeName(unicode(self.base.name), self, (1, 0))
+
+    def _get_init_directory(self):
+        """
+        :return: The path to the directory of a package. None in case it's not
+                 a package.
+        """
+        for suffix, _, _ in imp.get_suffixes():
+            ending = '__init__' + suffix
+            py__file__ = self.py__file__()
+            if py__file__ is not None and py__file__.endswith(ending):
+                # Remove the ending, including the separator.
+                return self.py__file__()[:-len(ending) - 1]
+        return None
+
+    def py__name__(self):
+        for name, module in self._evaluator.modules.items():
+            if module == self:
+                return name
+
+        return '__main__'
+
+    def py__file__(self):
+        """
+        In contrast to Python's __file__ can be None.
+        """
+        if self._module.path is None:
+            return None
+
+        return os.path.abspath(self._module.path)
+
+    def py__package__(self):
+        if self._get_init_directory() is None:
+            return re.sub(r'\.?[^\.]+$', '', self.py__name__())
+        else:
+            return self.py__name__()
+
+    def _py__path__(self):
+        if self._parent_module is None:
+            search_path = self._evaluator.sys_path
+        else:
+            search_path = self._parent_module.py__path__()
+        init_path = self.py__file__()
+        if os.path.basename(init_path) == '__init__.py':
+            with open(init_path, 'rb') as f:
+                content = common.source_to_unicode(f.read())
+                # these are strings that need to be used for namespace packages,
+                # the first one is ``pkgutil``, the second ``pkg_resources``.
+                options = ('declare_namespace(__name__)', 'extend_path(__path__')
+                if options[0] in content or options[1] in content:
+                    # It is a namespace, now try to find the rest of the
+                    # modules on sys_path or whatever the search_path is.
+                    paths = set()
+                    for s in search_path:
+                        other = os.path.join(s, unicode(self.name))
+                        if os.path.isdir(other):
+                            paths.add(other)
+                    return list(paths)
+        # Default to this.
+        return [self._get_init_directory()]
+
+    @property
+    def py__path__(self):
+        """
+        Not seen here, since it's a property. The callback actually uses a
+        variable, so use it like::
+
+            foo.py__path__(sys_path)
+
+        In case of a package, this returns Python's __path__ attribute, which
+        is a list of paths (strings).
+        Raises an AttributeError if the module is not a package.
+        """
+        path = self._get_init_directory()
+
+        if path is None:
+            raise AttributeError('Only packages have __path__ attributes.')
+        else:
+            return self._py__path__
+
+    @memoize_default()
+    def _sub_modules_dict(self):
+        """
+        Lists modules in the directory of this module (if this module is a
+        package).
+        """
+        path = self._module.path
+        names = {}
+        if path is not None and path.endswith(os.path.sep + '__init__.py'):
+            mods = pkgutil.iter_modules([os.path.dirname(path)])
+            for module_loader, name, is_pkg in mods:
+                fake_n = helpers.FakeName(name)
+                # It's obviously a relative import to the current module.
+                imp = helpers.FakeImport(fake_n, self, level=1)
+                fake_n.parent = imp
+                names[name] = [fake_n]
+
+        # TODO add something like this in the future, its cleaner than the
+        #   import hacks.
+        # ``os.path`` is a hardcoded exception, because it's a
+        # ``sys.modules`` modification.
+        #if str(self.name) == 'os':
+        #    names.append(helpers.FakeName('path', parent=self))
+
+        return names
+
+    def py__class__(self):
+        return compiled.get_special_object(self._evaluator, 'MODULE_CLASS')
+
+    def __getattr__(self, name):
+        return getattr(self._module, name)
+
+    def __repr__(self):
+        return "<%s: %s>" % (type(self).__name__, self._module)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/site.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/site.py
new file mode 100644
index 0000000..bf884fa
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/site.py
@@ -0,0 +1,110 @@
+"""An adapted copy of relevant site-packages functionality from Python stdlib.
+
+This file contains some functions related to handling site-packages in Python
+with jedi-specific modifications:
+
+- the functions operate on sys_path argument rather than global sys.path
+
+- in .pth files "import ..." lines that allow execution of arbitrary code are
+  skipped to prevent code injection into jedi interpreter
+
+"""
+
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012, 2013, 2014, 2015 Python Software Foundation; All Rights Reserved
+
+from __future__ import print_function
+
+import sys
+import os
+
+
+def makepath(*paths):
+    dir = os.path.join(*paths)
+    try:
+        dir = os.path.abspath(dir)
+    except OSError:
+        pass
+    return dir, os.path.normcase(dir)
+
+
+def _init_pathinfo(sys_path):
+    """Return a set containing all existing directory entries from sys_path"""
+    d = set()
+    for dir in sys_path:
+        try:
+            if os.path.isdir(dir):
+                dir, dircase = makepath(dir)
+                d.add(dircase)
+        except TypeError:
+            continue
+    return d
+
+
+def addpackage(sys_path, sitedir, name, known_paths):
+    """Process a .pth file within the site-packages directory:
+       For each line in the file, either combine it with sitedir to a path
+       and add that to known_paths, or execute it if it starts with 'import '.
+    """
+    if known_paths is None:
+        known_paths = _init_pathinfo(sys_path)
+        reset = 1
+    else:
+        reset = 0
+    fullname = os.path.join(sitedir, name)
+    try:
+        f = open(fullname, "r")
+    except OSError:
+        return
+    with f:
+        for n, line in enumerate(f):
+            if line.startswith("#"):
+                continue
+            try:
+                if line.startswith(("import ", "import\t")):
+                    # Change by immerrr: don't evaluate import lines to prevent
+                    # code injection into jedi through pth files.
+                    #
+                    # exec(line)
+                    continue
+                line = line.rstrip()
+                dir, dircase = makepath(sitedir, line)
+                if not dircase in known_paths and os.path.exists(dir):
+                    sys_path.append(dir)
+                    known_paths.add(dircase)
+            except Exception:
+                print("Error processing line {:d} of {}:\n".format(n+1, fullname),
+                      file=sys.stderr)
+                import traceback
+                for record in traceback.format_exception(*sys.exc_info()):
+                    for line in record.splitlines():
+                        print('  '+line, file=sys.stderr)
+                print("\nRemainder of file ignored", file=sys.stderr)
+                break
+    if reset:
+        known_paths = None
+    return known_paths
+
+
+def addsitedir(sys_path, sitedir, known_paths=None):
+    """Add 'sitedir' argument to sys_path if missing and handle .pth files in
+    'sitedir'"""
+    if known_paths is None:
+        known_paths = _init_pathinfo(sys_path)
+        reset = 1
+    else:
+        reset = 0
+    sitedir, sitedircase = makepath(sitedir)
+    if not sitedircase in known_paths:
+        sys_path.append(sitedir)        # Add path component
+        known_paths.add(sitedircase)
+    try:
+        names = os.listdir(sitedir)
+    except OSError:
+        return
+    names = [name for name in names if name.endswith(".pth")]
+    for name in sorted(names):
+        addpackage(sys_path, sitedir, name, known_paths)
+    if reset:
+        known_paths = None
+    return known_paths
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/stdlib.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/stdlib.py
new file mode 100644
index 0000000..f0c4346
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/stdlib.py
@@ -0,0 +1,280 @@
+"""
+Implementations of standard library functions, because it's not possible to
+understand them with Jedi.
+
+To add a new implementation, create a function and add it to the
+``_implemented`` dict at the bottom of this module.
+
+Note that this module exists only to implement very specific functionality in
+the standard library. The usual way to understand the standard library is the
+compiled module that returns the types for C-builtins.
+"""
+import collections
+import re
+
+from jedi._compatibility import unicode
+from jedi.common import unite
+from jedi.evaluate import compiled
+from jedi.evaluate import representation as er
+from jedi.evaluate import iterable
+from jedi.parser import ParserWithRecovery
+from jedi.parser import tree
+from jedi import debug
+from jedi.evaluate import precedence
+from jedi.evaluate import param
+from jedi.evaluate import analysis
+
+
+class NotInStdLib(LookupError):
+    pass
+
+
+def execute(evaluator, obj, arguments):
+    try:
+        obj_name = str(obj.name)
+    except AttributeError:
+        pass
+    else:
+        if obj.parent == evaluator.BUILTINS:
+            module_name = 'builtins'
+        elif isinstance(obj.parent, tree.Module):
+            module_name = str(obj.parent.name)
+        else:
+            module_name = ''
+
+        # for now we just support builtin functions.
+        try:
+            func = _implemented[module_name][obj_name]
+        except KeyError:
+            pass
+        else:
+            return func(evaluator, obj, arguments)
+    raise NotInStdLib()
+
+
+def _follow_param(evaluator, arguments, index):
+    try:
+        key, values = list(arguments.unpack())[index]
+    except IndexError:
+        return set()
+    else:
+        return unite(evaluator.eval_element(v) for v in values)
+
+
+def argument_clinic(string, want_obj=False, want_scope=False, want_arguments=False):
+    """
+    Works like Argument Clinic (PEP 436), to validate function params.
+    """
+    clinic_args = []
+    allow_kwargs = False
+    optional = False
+    while string:
+        # Optional arguments have to begin with a bracket. And should always be
+        # at the end of the arguments. This is therefore not a proper argument
+        # clinic implementation. `range()` for exmple allows an optional start
+        # value at the beginning.
+        match = re.match('(?:(?:(\[),? ?|, ?|)(\w+)|, ?/)\]*', string)
+        string = string[len(match.group(0)):]
+        if not match.group(2):  # A slash -> allow named arguments
+            allow_kwargs = True
+            continue
+        optional = optional or bool(match.group(1))
+        word = match.group(2)
+        clinic_args.append((word, optional, allow_kwargs))
+
+    def f(func):
+        def wrapper(evaluator, obj, arguments):
+            debug.dbg('builtin start %s' % obj, color='MAGENTA')
+            try:
+                lst = list(arguments.eval_argument_clinic(clinic_args))
+            except ValueError:
+                return set()
+            else:
+                kwargs = {}
+                if want_scope:
+                    kwargs['scope'] = arguments.scope()
+                if want_obj:
+                    kwargs['obj'] = obj
+                if want_arguments:
+                    kwargs['arguments'] = arguments
+                return func(evaluator, *lst, **kwargs)
+            finally:
+                debug.dbg('builtin end', color='MAGENTA')
+
+        return wrapper
+    return f
+
+
+@argument_clinic('object, name[, default], /')
+def builtins_getattr(evaluator, objects, names, defaults=None):
+    # follow the first param
+    for obj in objects:
+        if not isinstance(obj, (er.Instance, er.Class, tree.Module, compiled.CompiledObject)):
+            debug.warning('getattr called without instance')
+            continue
+
+        for name in names:
+            if precedence.is_string(name):
+                return evaluator.find_types(obj, name.obj)
+            else:
+                debug.warning('getattr called without str')
+                continue
+    return set()
+
+
+@argument_clinic('object[, bases, dict], /')
+def builtins_type(evaluator, objects, bases, dicts):
+    if bases or dicts:
+        # It's a type creation... maybe someday...
+        return set()
+    else:
+        return set([o.py__class__() for o in objects])
+
+
+class SuperInstance(er.Instance):
+    """To be used like the object ``super`` returns."""
+    def __init__(self, evaluator, cls):
+        su = cls.py_mro()[1]
+        super().__init__(evaluator, su and su[0] or self)
+
+
+@argument_clinic('[type[, obj]], /', want_scope=True)
+def builtins_super(evaluator, types, objects, scope):
+    # TODO make this able to detect multiple inheritance super
+    accept = (tree.Function, er.FunctionExecution)
+    if scope.isinstance(*accept):
+        wanted = (tree.Class, er.Instance)
+        cls = scope.get_parent_until(accept + wanted,
+                                     include_current=False)
+        if isinstance(cls, wanted):
+            if isinstance(cls, tree.Class):
+                cls = er.Class(evaluator, cls)
+            elif isinstance(cls, er.Instance):
+                cls = cls.base
+            su = cls.py__bases__()
+            if su:
+                return evaluator.execute(su[0])
+    return set()
+
+
+@argument_clinic('sequence, /', want_obj=True, want_arguments=True)
+def builtins_reversed(evaluator, sequences, obj, arguments):
+    # While we could do without this variable (just by using sequences), we
+    # want static analysis to work well. Therefore we need to generated the
+    # values again.
+    first_arg = next(arguments.as_tuple())[0]
+    ordered = list(iterable.py__iter__(evaluator, sequences, first_arg))
+
+    rev = [iterable.AlreadyEvaluated(o) for o in reversed(ordered)]
+    # Repack iterator values and then run it the normal way. This is
+    # necessary, because `reversed` is a function and autocompletion
+    # would fail in certain cases like `reversed(x).__iter__` if we
+    # just returned the result directly.
+    rev = iterable.AlreadyEvaluated(
+        [iterable.FakeSequence(evaluator, rev, 'list')]
+    )
+    return set([er.Instance(evaluator, obj, param.Arguments(evaluator, [rev]))])
+
+
+@argument_clinic('obj, type, /', want_arguments=True)
+def builtins_isinstance(evaluator, objects, types, arguments):
+    bool_results = set([])
+    for o in objects:
+        try:
+            mro_func = o.py__class__().py__mro__
+        except AttributeError:
+            # This is temporary. Everything should have a class attribute in
+            # Python?! Maybe we'll leave it here, because some numpy objects or
+            # whatever might not.
+            return set([compiled.create(True), compiled.create(False)])
+
+        mro = mro_func()
+
+        for cls_or_tup in types:
+            if cls_or_tup.is_class():
+                bool_results.add(cls_or_tup in mro)
+            elif str(cls_or_tup.name) == 'tuple' \
+                    and cls_or_tup.get_parent_scope() == evaluator.BUILTINS:
+                # Check for tuples.
+                classes = unite(cls_or_tup.py__iter__())
+                bool_results.add(any(cls in mro for cls in classes))
+            else:
+                _, nodes = list(arguments.unpack())[1]
+                for node in nodes:
+                    message = 'TypeError: isinstance() arg 2 must be a ' \
+                              'class, type, or tuple of classes and types, ' \
+                              'not %s.' % cls_or_tup
+                    analysis.add(evaluator, 'type-error-isinstance', node, message)
+
+    return set(compiled.create(evaluator, x) for x in bool_results)
+
+
+def collections_namedtuple(evaluator, obj, arguments):
+    """
+    Implementation of the namedtuple function.
+
+    This has to be done by processing the namedtuple class template and
+    evaluating the result.
+
+    .. note:: |jedi| only supports namedtuples on Python >2.6.
+
+    """
+    # Namedtuples are not supported on Python 2.6
+    if not hasattr(collections, '_class_template'):
+        return set()
+
+    # Process arguments
+    # TODO here we only use one of the types, we should use all.
+    name = list(_follow_param(evaluator, arguments, 0))[0].obj
+    _fields = list(_follow_param(evaluator, arguments, 1))[0]
+    if isinstance(_fields, compiled.CompiledObject):
+        fields = _fields.obj.replace(',', ' ').split()
+    elif isinstance(_fields, iterable.Array):
+        try:
+            fields = [v.obj for v in unite(_fields.py__iter__())]
+        except AttributeError:
+            return set()
+    else:
+        return set()
+
+    # Build source
+    source = collections._class_template.format(
+        typename=name,
+        field_names=fields,
+        num_fields=len(fields),
+        arg_list=', '.join(fields),
+        repr_fmt=', '.join(collections._repr_template.format(name=name) for name in fields),
+        field_defs='\n'.join(collections._field_template.format(index=index, name=name)
+                             for index, name in enumerate(fields))
+    )
+
+    # Parse source
+    generated_class = ParserWithRecovery(evaluator.grammar, unicode(source)).module.subscopes[0]
+    return set([er.Class(evaluator, generated_class)])
+
+
+@argument_clinic('first, /')
+def _return_first_param(evaluator, firsts):
+    return firsts
+
+
+_implemented = {
+    'builtins': {
+        'getattr': builtins_getattr,
+        'type': builtins_type,
+        'super': builtins_super,
+        'reversed': builtins_reversed,
+        'isinstance': builtins_isinstance,
+    },
+    'copy': {
+        'copy': _return_first_param,
+        'deepcopy': _return_first_param,
+    },
+    'json': {
+        'load': lambda *args: set(),
+        'loads': lambda *args: set(),
+    },
+    'collections': {
+        'namedtuple': collections_namedtuple,
+    },
+}
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/sys_path.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/sys_path.py
new file mode 100644
index 0000000..f69b1a4
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/evaluate/sys_path.py
@@ -0,0 +1,284 @@
+import glob
+import os
+import sys
+from jedi.evaluate.site import addsitedir
+
+from jedi._compatibility import exec_function, unicode
+from jedi.parser import tree
+from jedi.parser import ParserWithRecovery
+from jedi.evaluate.cache import memoize_default
+from jedi import debug
+from jedi import common
+from jedi.parser.utils import load_parser, save_parser
+
+
+def get_venv_path(venv):
+    """Get sys.path for specified virtual environment."""
+    sys_path = _get_venv_path_dirs(venv)
+    with common.ignored(ValueError):
+        sys_path.remove('')
+    sys_path = _get_sys_path_with_egglinks(sys_path)
+    # As of now, get_venv_path_dirs does not scan built-in pythonpath and
+    # user-local site-packages, let's approximate them using path from Jedi
+    # interpreter.
+    return sys_path + sys.path
+
+
+
+def _get_sys_path_with_egglinks(sys_path):
+    """Find all paths including those referenced by egg-links.
+
+    Egg-link-referenced directories are inserted into path immediately before
+    the directory on which their links were found.  Such directories are not
+    taken into consideration by normal import mechanism, but they are traversed
+    when doing pkg_resources.require.
+    """
+    result = []
+    for p in sys_path:
+        # pkg_resources does not define a specific order for egg-link files
+        # using os.listdir to enumerate them, we're sorting them to have
+        # reproducible tests.
+        for egg_link in sorted(glob.glob(os.path.join(p, '*.egg-link'))):
+            with open(egg_link) as fd:
+                for line in fd:
+                    line = line.strip()
+                    if line:
+                        result.append(os.path.join(p, line))
+                        # pkg_resources package only interprets the first
+                        # non-empty line in egg-link files.
+                        break
+        result.append(p)
+    return result
+
+
+def _get_venv_path_dirs(venv):
+    """Get sys.path for venv without starting up the interpreter."""
+    venv = os.path.abspath(venv)
+    sitedir = _get_venv_sitepackages(venv)
+    sys_path = []
+    addsitedir(sys_path, sitedir)
+    return sys_path
+
+
+def _get_venv_sitepackages(venv):
+    if os.name == 'nt':
+        p = os.path.join(venv, 'lib', 'site-packages')
+    else:
+        p = os.path.join(venv, 'lib', 'python%d.%d' % sys.version_info[:2],
+                         'site-packages')
+    return p
+
+
+def _execute_code(module_path, code):
+    c = "import os; from os.path import *; result=%s"
+    variables = {'__file__': module_path}
+    try:
+        exec_function(c % code, variables)
+    except Exception:
+        debug.warning('sys.path manipulation detected, but failed to evaluate.')
+    else:
+        try:
+            res = variables['result']
+            if isinstance(res, str):
+                return [os.path.abspath(res)]
+        except KeyError:
+            pass
+    return []
+
+
+def _paths_from_assignment(evaluator, expr_stmt):
+    """
+    Extracts the assigned strings from an assignment that looks as follows::
+
+    >>> sys.path[0:0] = ['module/path', 'another/module/path']
+
+    This function is in general pretty tolerant (and therefore 'buggy').
+    However, it's not a big issue usually to add more paths to Jedi's sys_path,
+    because it will only affect Jedi in very random situations and by adding
+    more paths than necessary, it usually benefits the general user.
+    """
+    for assignee, operator in zip(expr_stmt.children[::2], expr_stmt.children[1::2]):
+        try:
+            assert operator in ['=', '+=']
+            assert tree.is_node(assignee, 'power', 'atom_expr') and \
+                len(assignee.children) > 1
+            c = assignee.children
+            assert c[0].type == 'name' and c[0].value == 'sys'
+            trailer = c[1]
+            assert trailer.children[0] == '.' and trailer.children[1].value == 'path'
+            # TODO Essentially we're not checking details on sys.path
+            # manipulation. Both assigment of the sys.path and changing/adding
+            # parts of the sys.path are the same: They get added to the current
+            # sys.path.
+            """
+            execution = c[2]
+            assert execution.children[0] == '['
+            subscript = execution.children[1]
+            assert subscript.type == 'subscript'
+            assert ':' in subscript.children
+            """
+        except AssertionError:
+            continue
+
+        from jedi.evaluate.iterable import py__iter__
+        from jedi.evaluate.precedence import is_string
+        types = evaluator.eval_element(expr_stmt)
+        for types in py__iter__(evaluator, types, expr_stmt):
+            for typ in types:
+                if is_string(typ):
+                    yield typ.obj
+
+
+def _paths_from_list_modifications(module_path, trailer1, trailer2):
+    """ extract the path from either "sys.path.append" or "sys.path.insert" """
+    # Guarantee that both are trailers, the first one a name and the second one
+    # a function execution with at least one param.
+    if not (tree.is_node(trailer1, 'trailer') and trailer1.children[0] == '.'
+            and tree.is_node(trailer2, 'trailer') and trailer2.children[0] == '('
+            and len(trailer2.children) == 3):
+        return []
+
+    name = trailer1.children[1].value
+    if name not in ['insert', 'append']:
+        return []
+    arg = trailer2.children[1]
+    if name == 'insert' and len(arg.children) in (3, 4):  # Possible trailing comma.
+        arg = arg.children[2]
+    return _execute_code(module_path, arg.get_code())
+
+
+def _check_module(evaluator, module):
+    """
+    Detect sys.path modifications within module.
+    """
+    def get_sys_path_powers(names):
+        for name in names:
+            power = name.parent.parent
+            if tree.is_node(power, 'power', 'atom_expr'):
+                c = power.children
+                if isinstance(c[0], tree.Name) and c[0].value == 'sys' \
+                        and tree.is_node(c[1], 'trailer'):
+                    n = c[1].children[1]
+                    if isinstance(n, tree.Name) and n.value == 'path':
+                        yield name, power
+
+    sys_path = list(evaluator.sys_path)  # copy
+    try:
+        possible_names = module.used_names['path']
+    except KeyError:
+        # module.used_names is MergedNamesDict whose getitem never throws
+        # keyerror, this is superfluous.
+        pass
+    else:
+        for name, power in get_sys_path_powers(possible_names):
+            stmt = name.get_definition()
+            if len(power.children) >= 4:
+                sys_path.extend(_paths_from_list_modifications(module.path, *power.children[2:4]))
+            elif name.get_definition().type == 'expr_stmt':
+                sys_path.extend(_paths_from_assignment(evaluator, stmt))
+    return sys_path
+
+
+@memoize_default(evaluator_is_first_arg=True, default=[])
+def sys_path_with_modifications(evaluator, module):
+    if module.path is None:
+        # Support for modules without a path is bad, therefore return the
+        # normal path.
+        return list(evaluator.sys_path)
+
+    curdir = os.path.abspath(os.curdir)
+    #TODO why do we need a chdir?
+    with common.ignored(OSError):
+        os.chdir(os.path.dirname(module.path))
+
+    buildout_script_paths = set()
+
+    result = _check_module(evaluator, module)
+    result += _detect_django_path(module.path)
+    for buildout_script in _get_buildout_scripts(module.path):
+        for path in _get_paths_from_buildout_script(evaluator, buildout_script):
+            buildout_script_paths.add(path)
+    # cleanup, back to old directory
+    os.chdir(curdir)
+    return list(result) + list(buildout_script_paths)
+
+
+def _get_paths_from_buildout_script(evaluator, buildout_script):
+    def load(buildout_script):
+        try:
+            with open(buildout_script, 'rb') as f:
+                source = common.source_to_unicode(f.read())
+        except IOError:
+            debug.dbg('Error trying to read buildout_script: %s', buildout_script)
+            return
+
+        p = ParserWithRecovery(evaluator.grammar, source, buildout_script)
+        save_parser(buildout_script, p)
+        return p.module
+
+    cached = load_parser(buildout_script)
+    module = cached and cached.module or load(buildout_script)
+    if not module:
+        return
+
+    for path in _check_module(evaluator, module):
+        yield path
+
+
+def traverse_parents(path):
+    while True:
+        new = os.path.dirname(path)
+        if new == path:
+            return
+        path = new
+        yield path
+
+
+def _get_parent_dir_with_file(path, filename):
+    for parent in traverse_parents(path):
+        if os.path.isfile(os.path.join(parent, filename)):
+            return parent
+    return None
+
+
+def _detect_django_path(module_path):
+    """ Detects the path of the very well known Django library (if used) """
+    result = []
+
+    for parent in traverse_parents(module_path):
+        with common.ignored(IOError):
+            with open(parent + os.path.sep + 'manage.py'):
+                debug.dbg('Found django path: %s', module_path)
+                result.append(parent)
+    return result
+
+
+def _get_buildout_scripts(module_path):
+    """
+    if there is a 'buildout.cfg' file in one of the parent directories of the
+    given module it will return a list of all files in the buildout bin
+    directory that look like python files.
+
+    :param module_path: absolute path to the module.
+    :type module_path: str
+    """
+    project_root = _get_parent_dir_with_file(module_path, 'buildout.cfg')
+    if not project_root:
+        return []
+    bin_path = os.path.join(project_root, 'bin')
+    if not os.path.exists(bin_path):
+        return []
+    extra_module_paths = []
+    for filename in os.listdir(bin_path):
+        try:
+            filepath = os.path.join(bin_path, filename)
+            with open(filepath, 'r') as f:
+                firstline = f.readline()
+                if firstline.startswith('#!') and 'python' in firstline:
+                    extra_module_paths.append(filepath)
+        except (UnicodeDecodeError, IOError) as e:
+            # Probably a binary file; permission error or race cond. because file got deleted
+            # ignore
+            debug.warning(unicode(e))
+            continue
+    return extra_module_paths
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__init__.py
new file mode 100644
index 0000000..22f3860
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__init__.py
@@ -0,0 +1,409 @@
+"""
+The ``Parser`` tries to convert the available Python code in an easy to read
+format, something like an abstract syntax tree. The classes who represent this
+tree, are sitting in the :mod:`jedi.parser.tree` module.
+
+The Python module ``tokenize`` is a very important part in the ``Parser``,
+because it splits the code into different words (tokens).  Sometimes it looks a
+bit messy. Sorry for that! You might ask now: "Why didn't you use the ``ast``
+module for this? Well, ``ast`` does a very good job understanding proper Python
+code, but fails to work as soon as there's a single line of broken code.
+
+There's one important optimization that needs to be known: Statements are not
+being parsed completely. ``Statement`` is just a representation of the tokens
+within the statement. This lowers memory usage and cpu time and reduces the
+complexity of the ``Parser`` (there's another parser sitting inside
+``Statement``, which produces ``Array`` and ``Call``).
+"""
+import os
+import re
+
+from jedi.parser import tree as pt
+from jedi.parser import tokenize
+from jedi.parser.token import (DEDENT, INDENT, ENDMARKER, NEWLINE, NUMBER,
+                               STRING)
+from jedi.parser.pgen2.pgen import generate_grammar
+from jedi.parser.pgen2.parse import PgenParser
+
+OPERATOR_KEYWORDS = 'and', 'for', 'if', 'else', 'in', 'is', 'lambda', 'not', 'or'
+# Not used yet. In the future I intend to add something like KeywordStatement
+STATEMENT_KEYWORDS = 'assert', 'del', 'global', 'nonlocal', 'raise', \
+    'return', 'yield', 'pass', 'continue', 'break'
+
+
+_loaded_grammars = {}
+
+
+class ParseError(Exception):
+    """
+    Signals you that the code you fed the Parser was not correct Python code.
+    """
+
+
+def load_grammar(version='3.4'):
+    # For now we only support two different Python syntax versions: The latest
+    # Python 3 and Python 2. This may change.
+    if version in ('3.2', '3.3'):
+        version = '3.4'
+    elif version == '2.6':
+        version = '2.7'
+
+    file = 'grammar' + version + '.txt'
+
+    global _loaded_grammars
+    path = os.path.join(os.path.dirname(__file__), file)
+    try:
+        return _loaded_grammars[path]
+    except KeyError:
+        return _loaded_grammars.setdefault(path, generate_grammar(path))
+
+
+class ParserSyntaxError(object):
+    def __init__(self, message, position):
+        self.message = message
+        self.position = position
+
+
+class Parser(object):
+    AST_MAPPING = {
+        'expr_stmt': pt.ExprStmt,
+        'classdef': pt.Class,
+        'funcdef': pt.Function,
+        'file_input': pt.Module,
+        'import_name': pt.ImportName,
+        'import_from': pt.ImportFrom,
+        'break_stmt': pt.KeywordStatement,
+        'continue_stmt': pt.KeywordStatement,
+        'return_stmt': pt.ReturnStmt,
+        'raise_stmt': pt.KeywordStatement,
+        'yield_expr': pt.YieldExpr,
+        'del_stmt': pt.KeywordStatement,
+        'pass_stmt': pt.KeywordStatement,
+        'global_stmt': pt.GlobalStmt,
+        'nonlocal_stmt': pt.KeywordStatement,
+        'print_stmt': pt.KeywordStatement,
+        'assert_stmt': pt.AssertStmt,
+        'if_stmt': pt.IfStmt,
+        'with_stmt': pt.WithStmt,
+        'for_stmt': pt.ForStmt,
+        'while_stmt': pt.WhileStmt,
+        'try_stmt': pt.TryStmt,
+        'comp_for': pt.CompFor,
+        'decorator': pt.Decorator,
+        'lambdef': pt.Lambda,
+        'old_lambdef': pt.Lambda,
+        'lambdef_nocond': pt.Lambda,
+    }
+
+    def __init__(self, grammar, source, start_symbol='file_input',
+                 tokenizer=None, start_parsing=True):
+        # Todo Remove start_parsing (with False)
+
+        self._used_names = {}
+        self._scope_names_stack = [{}]
+        self._last_failed_start_pos = (0, 0)
+        self._global_names = []
+
+        # For the fast parser.
+        self.position_modifier = pt.PositionModifier()
+
+        self._added_newline = False
+        # The Python grammar needs a newline at the end of each statement.
+        if not source.endswith('\n') and start_symbol == 'file_input':
+            source += '\n'
+            self._added_newline = True
+
+        self.source = source
+        self._start_symbol = start_symbol
+        self._grammar = grammar
+
+        self._parsed = None
+
+        if start_parsing:
+            if tokenizer is None:
+                tokenizer = tokenize.source_tokens(source, use_exact_op_types=True)
+            self.parse(tokenizer)
+
+    def parse(self, tokenizer):
+        if self._parsed is not None:
+            return self._parsed
+
+        start_number = self._grammar.symbol2number[self._start_symbol]
+        pgen_parser = PgenParser(
+            self._grammar, self.convert_node, self.convert_leaf,
+            self.error_recovery, start_number
+        )
+
+        try:
+            self._parsed = pgen_parser.parse(tokenizer)
+        finally:
+            self.stack = pgen_parser.stack
+
+        if self._start_symbol == 'file_input' != self._parsed.type:
+            # If there's only one statement, we get back a non-module. That's
+            # not what we want, we want a module, so we add it here:
+            self._parsed = self.convert_node(self._grammar,
+                                             self._grammar.symbol2number['file_input'],
+                                             [self._parsed])
+
+        if self._added_newline:
+            self.remove_last_newline()
+
+    def get_parsed_node(self):
+        # TODO rename to get_root_node
+        return self._parsed
+
+    def error_recovery(self, grammar, stack, arcs, typ, value, start_pos, prefix,
+                       add_token_callback):
+        raise ParseError
+
+    def convert_node(self, grammar, type, children):
+        """
+        Convert raw node information to a Node instance.
+
+        This is passed to the parser driver which calls it whenever a reduction of a
+        grammar rule produces a new complete node, so that the tree is build
+        strictly bottom-up.
+        """
+        symbol = grammar.number2symbol[type]
+        try:
+            new_node = Parser.AST_MAPPING[symbol](children)
+        except KeyError:
+            new_node = pt.Node(symbol, children)
+
+        # We need to check raw_node always, because the same node can be
+        # returned by convert multiple times.
+        if symbol == 'global_stmt':
+            self._global_names += new_node.get_global_names()
+        elif isinstance(new_node, pt.Lambda):
+            new_node.names_dict = self._scope_names_stack.pop()
+        elif isinstance(new_node, (pt.ClassOrFunc, pt.Module)) \
+                and symbol in ('funcdef', 'classdef', 'file_input'):
+            # scope_name_stack handling
+            scope_names = self._scope_names_stack.pop()
+            if isinstance(new_node, pt.ClassOrFunc):
+                n = new_node.name
+                scope_names[n.value].remove(n)
+                # Set the func name of the current node
+                arr = self._scope_names_stack[-1].setdefault(n.value, [])
+                arr.append(n)
+            new_node.names_dict = scope_names
+        elif isinstance(new_node, pt.CompFor):
+            # The name definitions of comprehenions shouldn't be part of the
+            # current scope. They are part of the comprehension scope.
+            for n in new_node.get_defined_names():
+                self._scope_names_stack[-1][n.value].remove(n)
+        return new_node
+
+    def convert_leaf(self, grammar, type, value, prefix, start_pos):
+        # print('leaf', repr(value), token.tok_name[type])
+        if type == tokenize.NAME:
+            if value in grammar.keywords:
+                if value in ('def', 'class', 'lambda'):
+                    self._scope_names_stack.append({})
+
+                return pt.Keyword(self.position_modifier, value, start_pos, prefix)
+            else:
+                name = pt.Name(self.position_modifier, value, start_pos, prefix)
+                # Keep a listing of all used names
+                arr = self._used_names.setdefault(name.value, [])
+                arr.append(name)
+                arr = self._scope_names_stack[-1].setdefault(name.value, [])
+                arr.append(name)
+                return name
+        elif type == STRING:
+            return pt.String(self.position_modifier, value, start_pos, prefix)
+        elif type == NUMBER:
+            return pt.Number(self.position_modifier, value, start_pos, prefix)
+        elif type == NEWLINE:
+            return pt.Newline(self.position_modifier, value, start_pos, prefix)
+        elif type == INDENT:
+            return pt.Indent(self.position_modifier, value, start_pos, prefix)
+        elif type == DEDENT:
+            return pt.Dedent(self.position_modifier, value, start_pos, prefix)
+        elif type == ENDMARKER:
+            return pt.EndMarker(self.position_modifier, value, start_pos, prefix)
+        else:
+            return pt.Operator(self.position_modifier, value, start_pos, prefix)
+
+    def remove_last_newline(self):
+        """
+        In all of this we need to work with _start_pos, because if we worked
+        with start_pos, we would need to check the position_modifier as well
+        (which is accounted for in the start_pos property).
+        """
+        endmarker = self._parsed.children[-1]
+        # The newline is either in the endmarker as a prefix or the previous
+        # leaf as a newline token.
+        prefix = endmarker.prefix
+        if prefix.endswith('\n'):
+            endmarker.prefix = prefix = prefix[:-1]
+            last_end = 0
+            if '\n' not in prefix:
+                # Basically if the last line doesn't end with a newline. we
+                # have to add the previous line's end_position.
+                try:
+                    last_end = endmarker.get_previous_leaf().end_pos[1]
+                except IndexError:
+                    pass
+            last_line = re.sub('.*\n', '', prefix)
+            endmarker._start_pos = endmarker._start_pos[0] - 1, last_end + len(last_line)
+        else:
+            try:
+                newline = endmarker.get_previous_leaf()
+            except IndexError:
+                return  # This means that the parser is empty.
+            while True:
+                if newline.value == '':
+                    # Must be a DEDENT, just continue.
+                    try:
+                        newline = newline.get_previous_leaf()
+                    except IndexError:
+                        # If there's a statement that fails to be parsed, there
+                        # will be no previous leaf. So just ignore it.
+                        break
+                elif newline.value != '\n':
+                    # TODO REMOVE, error recovery was simplified.
+                    # This may happen if error correction strikes and removes
+                    # a whole statement including '\n'.
+                    break
+                else:
+                    newline.value = ''
+                    if self._last_failed_start_pos > newline._start_pos:
+                        # It may be the case that there was a syntax error in a
+                        # function. In that case error correction removes the
+                        # right newline. So we use the previously assigned
+                        # _last_failed_start_pos variable to account for that.
+                        endmarker._start_pos = self._last_failed_start_pos
+                    else:
+                        endmarker._start_pos = newline._start_pos
+                    break
+
+
+class ParserWithRecovery(Parser):
+    """
+    This class is used to parse a Python file, it then divides them into a
+    class structure of different scopes.
+
+    :param grammar: The grammar object of pgen2. Loaded by load_grammar.
+    :param source: The codebase for the parser. Must be unicode.
+    :param module_path: The path of the module in the file system, may be None.
+    :type module_path: str
+    """
+    def __init__(self, grammar, source, module_path=None, tokenizer=None,
+                 start_parsing=True):
+        self.syntax_errors = []
+
+        self._omit_dedent_list = []
+        self._indent_counter = 0
+
+        # TODO do print absolute import detection here.
+        # try:
+        #     del python_grammar_no_print_statement.keywords["print"]
+        # except KeyError:
+        #     pass  # Doesn't exist in the Python 3 grammar.
+
+        # if self.options["print_function"]:
+        #     python_grammar = pygram.python_grammar_no_print_statement
+        # else:
+        super(ParserWithRecovery, self).__init__(
+            grammar, source,
+            tokenizer=tokenizer,
+            start_parsing=start_parsing
+        )
+        if start_parsing:
+            self.module = self._parsed
+            self.module.used_names = self._used_names
+            self.module.path = module_path
+            self.module.global_names = self._global_names
+
+    def parse(self, tokenizer):
+        return super(ParserWithRecovery, self).parse(self._tokenize(self._tokenize(tokenizer)))
+
+    def error_recovery(self, grammar, stack, arcs, typ, value, start_pos, prefix,
+                       add_token_callback):
+        """
+        This parser is written in a dynamic way, meaning that this parser
+        allows using different grammars (even non-Python). However, error
+        recovery is purely written for Python.
+        """
+        def current_suite(stack):
+            # For now just discard everything that is not a suite or
+            # file_input, if we detect an error.
+            for index, (dfa, state, (type_, nodes)) in reversed(list(enumerate(stack))):
+                # `suite` can sometimes be only simple_stmt, not stmt.
+                symbol = grammar.number2symbol[type_]
+                if symbol == 'file_input':
+                    break
+                elif symbol == 'suite' and len(nodes) > 1:
+                    # suites without an indent in them get discarded.
+                    break
+                elif symbol == 'simple_stmt' and len(nodes) > 1:
+                    # simple_stmt can just be turned into a Node, if there are
+                    # enough statements. Ignore the rest after that.
+                    break
+            return index, symbol, nodes
+
+        index, symbol, nodes = current_suite(stack)
+        if symbol == 'simple_stmt':
+            index -= 2
+            (_, _, (type_, suite_nodes)) = stack[index]
+            symbol = grammar.number2symbol[type_]
+            suite_nodes.append(pt.Node(symbol, list(nodes)))
+            # Remove
+            nodes[:] = []
+            nodes = suite_nodes
+            stack[index]
+
+        # print('err', token.tok_name[typ], repr(value), start_pos, len(stack), index)
+        if self._stack_removal(grammar, stack, arcs, index + 1, value, start_pos):
+            add_token_callback(typ, value, start_pos, prefix)
+        else:
+            if typ == INDENT:
+                # For every deleted INDENT we have to delete a DEDENT as well.
+                # Otherwise the parser will get into trouble and DEDENT too early.
+                self._omit_dedent_list.append(self._indent_counter)
+            else:
+                error_leaf = pt.ErrorLeaf(self.position_modifier, typ, value, start_pos, prefix)
+                stack[-1][2][1].append(error_leaf)
+
+    def _stack_removal(self, grammar, stack, arcs, start_index, value, start_pos):
+        failed_stack = []
+        found = False
+        all_nodes = []
+        for dfa, state, (typ, nodes) in stack[start_index:]:
+            if nodes:
+                found = True
+            if found:
+                symbol = grammar.number2symbol[typ]
+                failed_stack.append((symbol, nodes))
+                all_nodes += nodes
+            if nodes and nodes[0] in ('def', 'class', 'lambda'):
+                self._scope_names_stack.pop()
+        if failed_stack:
+            stack[start_index - 1][2][1].append(pt.ErrorNode(all_nodes))
+
+        self._last_failed_start_pos = start_pos
+
+        stack[start_index:] = []
+        return failed_stack
+
+    def _tokenize(self, tokenizer):
+        for typ, value, start_pos, prefix in tokenizer:
+            # print(tokenize.tok_name[typ], repr(value), start_pos, repr(prefix))
+            if typ == DEDENT:
+                # We need to count indents, because if we just omit any DEDENT,
+                # we might omit them in the wrong place.
+                o = self._omit_dedent_list
+                if o and o[-1] == self._indent_counter:
+                    o.pop()
+                    continue
+
+                self._indent_counter -= 1
+            elif typ == INDENT:
+                self._indent_counter += 1
+
+            yield typ, value, start_pos, prefix
+
+    def __repr__(self):
+        return "<%s: %s>" % (type(self).__name__, self.module)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..76178be
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/fast.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/fast.cpython-35.pyc
new file mode 100644
index 0000000..0f99ff5
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/fast.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/token.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/token.cpython-35.pyc
new file mode 100644
index 0000000..3f4c430
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/token.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/tokenize.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/tokenize.cpython-35.pyc
new file mode 100644
index 0000000..54ed5b8
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/tokenize.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/tree.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/tree.cpython-35.pyc
new file mode 100644
index 0000000..319854f
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/tree.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/utils.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/utils.cpython-35.pyc
new file mode 100644
index 0000000..18f8ed5
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/__pycache__/utils.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/fast.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/fast.py
new file mode 100644
index 0000000..9c471fd
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/fast.py
@@ -0,0 +1,621 @@
+"""
+Basically a parser that is faster, because it tries to parse only parts and if
+anything changes, it only reparses the changed parts. But because it's not
+finished (and still not working as I want), I won't document it any further.
+"""
+import re
+from itertools import chain
+
+from jedi._compatibility import use_metaclass
+from jedi import settings
+from jedi.parser import ParserWithRecovery
+from jedi.parser import tree
+from jedi.parser.utils import underscore_memoization, parser_cache
+from jedi import debug
+from jedi.parser.tokenize import (source_tokens, NEWLINE,
+                                  ENDMARKER, INDENT, DEDENT)
+
+FLOWS = 'if', 'else', 'elif', 'while', 'with', 'try', 'except', 'finally', 'for'
+
+
+class FastModule(tree.Module):
+    type = 'file_input'
+
+    def __init__(self, module_path):
+        super(FastModule, self).__init__([])
+        self.modules = []
+        self.reset_caches()
+        self.names_dict = {}
+        self.path = module_path
+
+    def reset_caches(self):
+        self.modules = []
+        try:
+            del self._used_names  # Remove the used names cache.
+        except AttributeError:
+            pass  # It was never used.
+
+    @property
+    @underscore_memoization
+    def used_names(self):
+        return MergedNamesDict([m.used_names for m in self.modules])
+
+    @property
+    def global_names(self):
+        return [name for m in self.modules for name in m.global_names]
+
+    @property
+    def error_statements(self):
+        return [e for m in self.modules for e in m.error_statements]
+
+    def __repr__(self):
+        return "<fast.%s: %s@%s-%s>" % (type(self).__name__, self.name,
+                                        self.start_pos[0], self.end_pos[0])
+
+    # To avoid issues with with the `parser.ParserWithRecovery`, we need
+    # setters that do nothing, because if pickle comes along and sets those
+    # values.
+    @global_names.setter
+    def global_names(self, value):
+        pass
+
+    @error_statements.setter
+    def error_statements(self, value):
+        pass
+
+    @used_names.setter
+    def used_names(self, value):
+        pass
+
+
+class MergedNamesDict(object):
+    def __init__(self, dicts):
+        self.dicts = dicts
+
+    def __iter__(self):
+        return iter(set(key for dct in self.dicts for key in dct))
+
+    def __getitem__(self, value):
+        return list(chain.from_iterable(dct.get(value, []) for dct in self.dicts))
+
+    def items(self):
+        dct = {}
+        for d in self.dicts:
+            for key, values in d.items():
+                try:
+                    dct_values = dct[key]
+                    dct_values += values
+                except KeyError:
+                    dct[key] = list(values)
+        return dct.items()
+
+    def values(self):
+        lst = []
+        for dct in self.dicts:
+            lst += dct.values()
+        return lst
+
+
+class CachedFastParser(type):
+    """ This is a metaclass for caching `FastParser`. """
+    def __call__(self, grammar, source, module_path=None):
+        if not settings.fast_parser:
+            return ParserWithRecovery(grammar, source, module_path)
+
+        pi = parser_cache.get(module_path, None)
+        if pi is None or isinstance(pi.parser, ParserWithRecovery):
+            p = super(CachedFastParser, self).__call__(grammar, source, module_path)
+        else:
+            p = pi.parser  # pi is a `cache.ParserCacheItem`
+            p.update(source)
+        return p
+
+
+class ParserNode(object):
+    def __init__(self, fast_module, parser, source):
+        self._fast_module = fast_module
+        self.parent = None
+        self._node_children = []
+
+        self.source = source
+        self.hash = hash(source)
+        self.parser = parser
+        if source:
+            self._end_pos = parser.module.end_pos
+        else:
+            self._end_pos = 1, 0
+
+        try:
+            # With fast_parser we have either 1 subscope or only statements.
+            self._content_scope = parser.module.subscopes[0]
+            # A parsed node's content will be in the first indent, because
+            # everything that's parsed is within this subscope.
+            self._is_class_or_def = True
+        except IndexError:
+            self._content_scope = parser.module
+            self._is_class_or_def = False
+        else:
+            self._rewrite_last_newline()
+
+        # We need to be able to reset the original children of a parser.
+        self._old_children = list(self._content_scope.children)
+
+    def is_root_node(self):
+        return self.parent is None
+
+    def _rewrite_last_newline(self):
+        """
+        The ENDMARKER can contain a newline in the prefix. However this prefix
+        really belongs to the function - respectively to the next function or
+        parser node. If we don't rewrite that newline, we end up with a newline
+        in the wrong position, i.d. at the end of the file instead of in the
+        middle.
+        """
+        c = self._content_scope.children
+        if tree.is_node(c[-1], 'suite'):  # In a simple_stmt there's no DEDENT.
+            end_marker = self.parser.module.children[-1]
+            # Set the DEDENT prefix instead of the ENDMARKER.
+            c[-1].children[-1].prefix = end_marker.prefix
+            end_marker.prefix = ''
+
+    def __repr__(self):
+        module = self.parser.module
+        try:
+            return '<%s: %s-%s>' % (type(self).__name__, module.start_pos, module.end_pos)
+        except IndexError:
+            # There's no module yet.
+            return '<%s: empty>' % type(self).__name__
+
+    @property
+    def end_pos(self):
+        return self._end_pos[0] + self.parser.position_modifier.line, self._end_pos[1]
+
+    def reset_node(self):
+        """
+        Removes changes that were applied in this class.
+        """
+        self._node_children = []
+        scope = self._content_scope
+        scope.children = list(self._old_children)
+        try:
+            # This works if it's a MergedNamesDict.
+            # We are correcting it, because the MergedNamesDicts are artificial
+            # and can change after closing a node.
+            scope.names_dict = scope.names_dict.dicts[0]
+        except AttributeError:
+            pass
+
+    def close(self):
+        """
+        Closes the current parser node. This means that after this no further
+        nodes should be added anymore.
+        """
+        # We only need to replace the dict if multiple dictionaries are used:
+        if self._node_children:
+            dcts = [n.parser.module.names_dict for n in self._node_children]
+            # Need to insert the own node as well.
+            dcts.insert(0, self._content_scope.names_dict)
+            self._content_scope.names_dict = MergedNamesDict(dcts)
+            endmarker = self.parser.get_parsed_node().children[-1]
+            assert endmarker.type == 'endmarker'
+            last_parser = self._node_children[-1].parser
+            endmarker.start_pos = last_parser.get_parsed_node().end_pos
+
+    @property
+    def _indent(self):
+        if self.is_root_node():
+            return 0
+
+        return self.parser.module.children[0].start_pos[1]
+
+    def add_node(self, node, start_line, indent):
+        """
+        Adding a node means adding a node that was either just parsed or one
+        that can be reused.
+        """
+        # Content that is not a subscope can never be part of the current node,
+        # because it's basically a sister node, that sits next to it and not
+        # within it.
+        if (self._indent >= indent or not self._is_class_or_def) and \
+                not self.is_root_node():
+            self.close()
+            return self.parent.add_node(node, start_line, indent)
+
+        # Changing the line offsets is very important, because if they don't
+        # fit, all the start_pos values will be wrong.
+        m = node.parser.module
+        node.parser.position_modifier.line = start_line - 1
+        self._fast_module.modules.append(m)
+        node.parent = self
+
+        self._node_children.append(node)
+
+        # Insert parser objects into current structure. We only need to set the
+        # parents and children in a good way.
+        scope = self._content_scope
+        for child in m.children:
+            child.parent = scope
+            scope.children.append(child)
+
+        return node
+
+    def all_sub_nodes(self):
+        """
+        Returns all nodes including nested ones.
+        """
+        for n in self._node_children:
+            yield n
+            for y in n.all_sub_nodes():
+                yield y
+
+    @underscore_memoization  # Should only happen once!
+    def remove_last_newline(self):
+        self.parser.remove_last_newline()
+
+
+class FastParser(use_metaclass(CachedFastParser)):
+    _FLOWS_NEED_SPACE = 'if', 'elif', 'while', 'with', 'except', 'for'
+    _FLOWS_NEED_COLON = 'else', 'try', 'except', 'finally'
+    _keyword_re = re.compile('^[ \t]*(def |class |@|(?:%s)|(?:%s)\s*:)'
+                             % ('|'.join(_FLOWS_NEED_SPACE),
+                                '|'.join(_FLOWS_NEED_COLON)))
+
+    def __init__(self, grammar, source, module_path=None):
+        # set values like `tree.Module`.
+        self._grammar = grammar
+        self.module_path = module_path
+        self._reset_caches()
+        self.update(source)
+
+    def _reset_caches(self):
+        self.module = FastModule(self.module_path)
+        self.root_node = self.current_node = ParserNode(self.module, self, '')
+
+    def get_parsed_node(self):
+        return self.module
+
+    def update(self, source):
+        # Variables for testing purposes: It is important that the number of
+        # parsers used can be minimized. With these variables we can test
+        # against that.
+        self.number_parsers_used = 0
+        self.number_of_splits = 0
+        self.number_of_misses = 0
+        self.module.reset_caches()
+        self.source = source
+        try:
+            self._parse(source)
+        except:
+            # FastParser is cached, be careful with exceptions.
+            self._reset_caches()
+            raise
+
+    def _split_parts(self, source):
+        """
+        Split the source code into different parts. This makes it possible to
+        parse each part seperately and therefore cache parts of the file and
+        not everything.
+        """
+        def gen_part():
+            text = ''.join(current_lines)
+            del current_lines[:]
+            self.number_of_splits += 1
+            return text
+
+        def just_newlines(current_lines):
+            for line in current_lines:
+                line = line.lstrip('\t \n\r')
+                if line and line[0] != '#':
+                    return False
+            return True
+
+        # Split only new lines. Distinction between \r\n is the tokenizer's
+        # job.
+        # It seems like there's no problem with form feed characters here,
+        # because we're not counting lines.
+        self._lines = source.splitlines(True)
+        current_lines = []
+        is_decorator = False
+        # Use -1, because that indent is always smaller than any other.
+        indent_list = [-1, 0]
+        new_indent = False
+        parentheses_level = 0
+        flow_indent = None
+        previous_line = None
+        # All things within flows are simply being ignored.
+        for i, l in enumerate(self._lines):
+            # Handle backslash newline escaping.
+            if l.endswith('\\\n') or l.endswith('\\\r\n'):
+                if previous_line is not None:
+                    previous_line += l
+                else:
+                    previous_line = l
+                continue
+            if previous_line is not None:
+                l = previous_line + l
+                previous_line = None
+
+            # check for dedents
+            s = l.lstrip('\t \n\r')
+            indent = len(l) - len(s)
+            if not s or s[0] == '#':
+                current_lines.append(l)  # Just ignore comments and blank lines
+                continue
+
+            if new_indent and not parentheses_level:
+                if indent > indent_list[-2]:
+                    # Set the actual indent, not just the random old indent + 1.
+                    indent_list[-1] = indent
+                new_indent = False
+
+            while indent < indent_list[-1]:  # -> dedent
+                indent_list.pop()
+                # This automatically resets the flow_indent if there was a
+                # dedent or a flow just on one line (with one simple_stmt).
+                new_indent = False
+                if flow_indent is None and current_lines and not parentheses_level:
+                    yield gen_part()
+                flow_indent = None
+
+            # Check lines for functions/classes and split the code there.
+            if flow_indent is None:
+                m = self._keyword_re.match(l)
+                if m:
+                    # Strip whitespace and colon from flows as a check.
+                    if m.group(1).strip(' \t\r\n:') in FLOWS:
+                        if not parentheses_level:
+                            flow_indent = indent
+                    else:
+                        if not is_decorator and not just_newlines(current_lines):
+                            yield gen_part()
+                    is_decorator = '@' == m.group(1)
+                    if not is_decorator:
+                        parentheses_level = 0
+                        # The new indent needs to be higher
+                        indent_list.append(indent + 1)
+                        new_indent = True
+                elif is_decorator:
+                    is_decorator = False
+
+            parentheses_level = \
+                max(0, (l.count('(') + l.count('[') + l.count('{') -
+                        l.count(')') - l.count(']') - l.count('}')))
+
+            current_lines.append(l)
+
+        if previous_line is not None:
+            current_lines.append(previous_line)
+        if current_lines:
+            yield gen_part()
+
+    def _parse(self, source):
+        """ :type source: str """
+        added_newline = False
+        if not source or source[-1] != '\n':
+            # To be compatible with Pythons grammar, we need a newline at the
+            # end. The parser would handle it, but since the fast parser abuses
+            # the normal parser in various ways, we need to care for this
+            # ourselves.
+            source += '\n'
+            added_newline = True
+
+        next_code_part_end_line = code_part_end_line = 1
+        start = 0
+        nodes = list(self.root_node.all_sub_nodes())
+        # Now we can reset the node, because we have all the old nodes.
+        self.root_node.reset_node()
+        self.current_node = self.root_node
+        last_end_line = 1
+
+        for code_part in self._split_parts(source):
+            next_code_part_end_line += code_part.count('\n')
+            # If the last code part parsed isn't equal to the current end_pos,
+            # we know that the parser went further (`def` start in a
+            # docstring). So just parse the next part.
+            if code_part_end_line == last_end_line:
+                self._parse_part(code_part, source[start:], code_part_end_line, nodes)
+            else:
+                self.number_of_misses += 1
+                # Means that some lines where not fully parsed. Parse it now.
+                # This is a very rare case. Should only happens with very
+                # strange code bits.
+                while last_end_line < next_code_part_end_line:
+                    code_part_end_line = last_end_line
+                    # We could calculate the src in a more complicated way to
+                    # make caching here possible as well. However, this is
+                    # complicated and error-prone. Since this is not very often
+                    # called - just ignore it.
+                    src = ''.join(self._lines[code_part_end_line - 1:])
+                    self._parse_part(code_part, src, code_part_end_line, nodes)
+                    last_end_line = self.current_node.end_pos[0]
+                debug.dbg("While parsing %s, starting with line %s wasn't included in split.",
+                          self.module_path, code_part_end_line)
+                #assert code_part_end_line > last_end_line
+                # This means that the parser parsed faster than the last given
+                # `code_part`.
+                debug.dbg('While parsing %s, line %s slowed down the fast parser.',
+                          self.module_path, code_part_end_line)
+
+            code_part_end_line = next_code_part_end_line
+            start += len(code_part)
+
+            last_end_line = self.current_node.end_pos[0]
+
+        if added_newline:
+            self.current_node.remove_last_newline()
+
+        # Now that the for loop is finished, we still want to close all nodes.
+        node = self.current_node
+        while node is not None:
+            node.close()
+            node = node.parent
+
+        debug.dbg('Parsed %s, with %s parsers in %s splits.'
+                  % (self.module_path, self.number_parsers_used,
+                     self.number_of_splits))
+
+    def _parse_part(self, source, parser_code, code_part_end_line, nodes):
+        """
+        Side effect: Alters the list of nodes.
+        """
+        h = hash(source)
+        for index, node in enumerate(nodes):
+            if node.hash == h and node.source == source:
+                node.reset_node()
+                nodes.remove(node)
+                parser_code = source
+                break
+        else:
+            tokenizer = FastTokenizer(parser_code)
+            self.number_parsers_used += 1
+            p = ParserWithRecovery(self._grammar, parser_code, self.module_path, tokenizer=tokenizer)
+
+            end = code_part_end_line - 1 + p.module.end_pos[0]
+            used_lines = self._lines[code_part_end_line - 1:end - 1]
+            code_part_actually_used = ''.join(used_lines)
+
+            node = ParserNode(self.module, p, code_part_actually_used)
+
+        indent = len(parser_code) - len(parser_code.lstrip('\t '))
+
+        self.current_node.add_node(node, code_part_end_line, indent)
+        self.current_node = node
+
+
+class FastTokenizer(object):
+    """
+    Breaks when certain conditions are met, i.e. a new function or class opens.
+    """
+    def __init__(self, source):
+        self.source = source
+        self._gen = source_tokens(source, use_exact_op_types=True)
+        self._closed = False
+
+        # fast parser options
+        self.current = self.previous = NEWLINE, '', (0, 0)
+        self._in_flow = False
+        self._is_decorator = False
+        self._first_stmt = True
+        self._parentheses_level = 0
+        self._indent_counter = 0
+        self._flow_indent_counter = 0
+        self._returned_endmarker = False
+        self._expect_indent = False
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        """ Python 2 Compatibility """
+        return self.__next__()
+
+    def __next__(self):
+        if self._closed:
+            return self._finish_dedents()
+
+        typ, value, start_pos, prefix = current = next(self._gen)
+        if typ == ENDMARKER:
+            self._closed = True
+            self._returned_endmarker = True
+            return current
+
+        self.previous = self.current
+        self.current = current
+
+        if typ == INDENT:
+            self._indent_counter += 1
+            if not self._expect_indent and not self._first_stmt and not self._in_flow:
+                # This does not mean that there is an actual flow, it means
+                # that the INDENT is syntactically wrong.
+                self._flow_indent_counter = self._indent_counter - 1
+                self._in_flow = True
+            self._expect_indent = False
+        elif typ == DEDENT:
+            self._indent_counter -= 1
+            if self._in_flow:
+                if self._indent_counter == self._flow_indent_counter:
+                    self._in_flow = False
+            else:
+                self._closed = True
+            return current
+
+        previous_type = self.previous[0]
+        if value in ('def', 'class') and self._parentheses_level:
+            # Account for the fact that an open parentheses before a function
+            # will reset the parentheses counter, but new lines before will
+            # still be ignored. So check the prefix.
+
+            # TODO what about flow parentheses counter resets in the tokenizer?
+            self._parentheses_level = 0
+            # We need to simulate a newline before the indent, because the
+            # open parentheses ignored them.
+            if re.search('\n\s*', prefix):
+                previous_type = NEWLINE
+
+        # Parentheses ignore the indentation rules. The other three stand for
+        # new lines.
+        if previous_type in (NEWLINE, INDENT, DEDENT) \
+                and not self._parentheses_level and typ not in (INDENT, DEDENT):
+            if not self._in_flow:
+                if value in FLOWS:
+                    self._flow_indent_counter = self._indent_counter
+                    self._first_stmt = False
+                elif value in ('def', 'class', '@'):
+                    # The values here are exactly the same check as in
+                    # _split_parts, but this time with tokenize and therefore
+                    # precise.
+                    if not self._first_stmt and not self._is_decorator:
+                        return self._close()
+
+                    self._is_decorator = '@' == value
+                    if not self._is_decorator:
+                        self._first_stmt = False
+                        self._expect_indent = True
+                elif self._expect_indent:
+                    return self._close()
+                else:
+                    self._first_stmt = False
+
+        if value in '([{' and value:
+            self._parentheses_level += 1
+        elif value in ')]}' and value:
+            # Ignore closing parentheses, because they are all
+            # irrelevant for the indentation.
+            self._parentheses_level = max(self._parentheses_level - 1, 0)
+        return current
+
+    def _close(self):
+        if self._first_stmt:
+            # Continue like nothing has happened, because we want to enter
+            # the first class/function.
+            if self.current[1] != '@':
+                self._first_stmt = False
+            return self.current
+        else:
+            self._closed = True
+            return self._finish_dedents()
+
+    def _finish_dedents(self):
+        if self._indent_counter:
+            self._indent_counter -= 1
+            return DEDENT, '', self.current[2], ''
+        elif not self._returned_endmarker:
+            self._returned_endmarker = True
+            return ENDMARKER, '', self.current[2], self._get_prefix()
+        else:
+            raise StopIteration
+
+    def _get_prefix(self):
+        """
+        We're using the current prefix for the endmarker to not loose any
+        information. However we care about "lost" lines. The prefix of the
+        current line (indent) will always be included in the current line.
+        """
+        cur = self.current
+        while cur[0] == DEDENT:
+            cur = next(self._gen)
+        prefix = cur[3]
+
+        # \Z for the end of the string. $ is bugged, because it has the
+        # same behavior with or without re.MULTILINE.
+        return re.sub(r'[^\n]+\Z', '', prefix)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/grammar2.7.txt b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/grammar2.7.txt
new file mode 100644
index 0000000..515dea6
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/grammar2.7.txt
@@ -0,0 +1,152 @@
+# Grammar for 2to3. This grammar supports Python 2.x and 3.x.
+
+# Note:  Changing the grammar specified in this file will most likely
+#        require corresponding changes in the parser module
+#        (../Modules/parsermodule.c).  If you can't make the changes to
+#        that module yourself, please co-ordinate the required changes
+#        with someone who can; ask around on python-dev for help.  Fred
+#        Drake <fdrake@acm.org> will probably be listening there.
+
+# NOTE WELL: You should also follow all the steps listed in PEP 306,
+# "How to Change Python's Grammar"
+
+
+# Start symbols for the grammar:
+#	    file_input is a module or sequence of commands read from an input file;
+#	    single_input is a single interactive statement;
+#	    eval_input is the input for the eval() and input() functions.
+# NB: compound_stmt in single_input is followed by extra NEWLINE!
+file_input: (NEWLINE | stmt)* ENDMARKER
+single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
+eval_input: testlist NEWLINE* ENDMARKER
+
+decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
+decorators: decorator+
+decorated: decorators (classdef | funcdef)
+funcdef: 'def' NAME parameters ['->' test] ':' suite
+parameters: '(' [typedargslist] ')'
+typedargslist: ((tfpdef ['=' test] ',')*
+                ('*' [tname] (',' tname ['=' test])* [',' '**' tname] | '**' tname)
+                | tfpdef ['=' test] (',' tfpdef ['=' test])* [','])
+tname: NAME [':' test]
+tfpdef: tname | '(' tfplist ')'
+tfplist: tfpdef (',' tfpdef)* [',']
+varargslist: ((vfpdef ['=' test] ',')*
+              ('*' [vname] (',' vname ['=' test])*  [',' '**' vname] | '**' vname)
+              | vfpdef ['=' test] (',' vfpdef ['=' test])* [','])
+vname: NAME
+vfpdef: vname | '(' vfplist ')'
+vfplist: vfpdef (',' vfpdef)* [',']
+
+stmt: simple_stmt | compound_stmt
+simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
+small_stmt: (expr_stmt | print_stmt  | del_stmt | pass_stmt | flow_stmt |
+             import_stmt | global_stmt | exec_stmt | assert_stmt)
+expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) |
+                     ('=' (yield_expr|testlist_star_expr))*)
+testlist_star_expr: (test|star_expr) (',' (test|star_expr))* [',']
+augassign: ('+=' | '-=' | '*=' | '/=' | '%=' | '&=' | '|=' | '^=' |
+            '<<=' | '>>=' | '**=' | '//=')
+# For normal assignments, additional restrictions enforced by the interpreter
+print_stmt: 'print' ( [ test (',' test)* [','] ] |
+                      '>>' test [ (',' test)+ [','] ] )
+del_stmt: 'del' exprlist
+pass_stmt: 'pass'
+flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt | yield_stmt
+break_stmt: 'break'
+continue_stmt: 'continue'
+return_stmt: 'return' [testlist]
+yield_stmt: yield_expr
+raise_stmt: 'raise' [test [',' test [',' test]]]
+import_stmt: import_name | import_from
+import_name: 'import' dotted_as_names
+# note below: the ('.' | '...') is necessary because '...' is tokenized as ELLIPSIS
+import_from: ('from' (('.' | '...')* dotted_name | ('.' | '...')+)
+              'import' ('*' | '(' import_as_names ')' | import_as_names))
+import_as_name: NAME ['as' NAME]
+dotted_as_name: dotted_name ['as' NAME]
+import_as_names: import_as_name (',' import_as_name)* [',']
+dotted_as_names: dotted_as_name (',' dotted_as_name)*
+dotted_name: NAME ('.' NAME)*
+global_stmt: 'global' NAME (',' NAME)*
+exec_stmt: 'exec' expr ['in' test [',' test]]
+assert_stmt: 'assert' test [',' test]
+
+compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | with_stmt | funcdef | classdef | decorated
+if_stmt: 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
+while_stmt: 'while' test ':' suite ['else' ':' suite]
+for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite]
+try_stmt: ('try' ':' suite
+           ((except_clause ':' suite)+
+	        ['else' ':' suite]
+	        ['finally' ':' suite] |
+	       'finally' ':' suite))
+with_stmt: 'with' with_item (',' with_item)*  ':' suite
+with_item: test ['as' expr]
+with_var: 'as' expr
+# NB compile.c makes sure that the default except clause is last
+except_clause: 'except' [test [(',' | 'as') test]]
+# Edit by David Halter: The stmt is now optional. This reflects how Jedi allows
+# classes and functions to be empty, which is beneficial for autocompletion.
+suite: simple_stmt | NEWLINE INDENT stmt* DEDENT
+
+# Backward compatibility cruft to support:
+# [ x for x in lambda: True, lambda: False if x() ]
+# even while also allowing:
+# lambda x: 5 if x else 2
+# (But not a mix of the two)
+testlist_safe: old_test [(',' old_test)+ [',']]
+old_test: or_test | old_lambdef
+old_lambdef: 'lambda' [varargslist] ':' old_test
+
+test: or_test ['if' or_test 'else' test] | lambdef
+or_test: and_test ('or' and_test)*
+and_test: not_test ('and' not_test)*
+not_test: 'not' not_test | comparison
+comparison: expr (comp_op expr)*
+comp_op: '<'|'>'|'=='|'>='|'<='|'<>'|'!='|'in'|'not' 'in'|'is'|'is' 'not'
+star_expr: '*' expr
+expr: xor_expr ('|' xor_expr)*
+xor_expr: and_expr ('^' and_expr)*
+and_expr: shift_expr ('&' shift_expr)*
+shift_expr: arith_expr (('<<'|'>>') arith_expr)*
+arith_expr: term (('+'|'-') term)*
+term: factor (('*'|'/'|'%'|'//') factor)*
+factor: ('+'|'-'|'~') factor | power
+power: atom trailer* ['**' factor]
+atom: ('(' [yield_expr|testlist_comp] ')' |
+       '[' [testlist_comp] ']' |
+       '{' [dictorsetmaker] '}' |
+       '`' testlist1 '`' |
+       NAME | NUMBER | STRING+ | '.' '.' '.')
+# Modification by David Halter, remove `testlist_gexp` and `listmaker`
+testlist_comp: (test|star_expr) ( comp_for | (',' (test|star_expr))* [','] )
+lambdef: 'lambda' [varargslist] ':' test
+trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME
+subscriptlist: subscript (',' subscript)* [',']
+subscript: test | [test] ':' [test] [sliceop]
+sliceop: ':' [test]
+exprlist: (expr|star_expr) (',' (expr|star_expr))* [',']
+testlist: test (',' test)* [',']
+# Modification by David Halter, dictsetmaker -> dictorsetmaker (so that it's
+# the same as in the 3.4 grammar).
+dictorsetmaker: ( (test ':' test (comp_for | (',' test ':' test)* [','])) |
+                (test (comp_for | (',' test)* [','])) )
+
+classdef: 'class' NAME ['(' [arglist] ')'] ':' suite
+
+arglist: (argument ',')* (argument [',']
+                         |'*' test (',' argument)* [',' '**' test] 
+                         |'**' test)
+argument: test [comp_for] | test '=' test  # Really [keyword '='] test
+
+comp_iter: comp_for | comp_if
+comp_for: 'for' exprlist 'in' testlist_safe [comp_iter]
+comp_if: 'if' old_test [comp_iter]
+
+testlist1: test (',' test)*
+
+# not used in grammar, but may appear in "node" passed from Parser to Compiler
+encoding_decl: NAME
+
+yield_expr: 'yield' [testlist]
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/grammar3.4.txt b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/grammar3.4.txt
new file mode 100644
index 0000000..d4a32b8
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/grammar3.4.txt
@@ -0,0 +1,135 @@
+# Grammar for Python
+
+# Note:  Changing the grammar specified in this file will most likely
+#        require corresponding changes in the parser module
+#        (../Modules/parsermodule.c).  If you can't make the changes to
+#        that module yourself, please co-ordinate the required changes
+#        with someone who can; ask around on python-dev for help.  Fred
+#        Drake <fdrake@acm.org> will probably be listening there.
+
+# NOTE WELL: You should also follow all the steps listed in PEP 306,
+# "How to Change Python's Grammar"
+
+# Start symbols for the grammar:
+#       single_input is a single interactive statement;
+#       file_input is a module or sequence of commands read from an input file;
+#       eval_input is the input for the eval() functions.
+# NB: compound_stmt in single_input is followed by extra NEWLINE!
+file_input: (NEWLINE | stmt)* ENDMARKER
+single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
+eval_input: testlist NEWLINE* ENDMARKER
+
+decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
+decorators: decorator+
+decorated: decorators (classdef | funcdef)
+funcdef: 'def' NAME parameters ['->' test] ':' suite
+parameters: '(' [typedargslist] ')'
+typedargslist: (tfpdef ['=' test] (',' tfpdef ['=' test])* [','
+       ['*' [tfpdef] (',' tfpdef ['=' test])* [',' '**' tfpdef] | '**' tfpdef]]
+     |  '*' [tfpdef] (',' tfpdef ['=' test])* [',' '**' tfpdef] | '**' tfpdef)
+tfpdef: NAME [':' test]
+varargslist: (vfpdef ['=' test] (',' vfpdef ['=' test])* [','
+       ['*' [vfpdef] (',' vfpdef ['=' test])* [',' '**' vfpdef] | '**' vfpdef]]
+     |  '*' [vfpdef] (',' vfpdef ['=' test])* [',' '**' vfpdef] | '**' vfpdef)
+vfpdef: NAME
+
+stmt: simple_stmt | compound_stmt
+simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
+small_stmt: (expr_stmt | del_stmt | pass_stmt | flow_stmt |
+             import_stmt | global_stmt | nonlocal_stmt | assert_stmt)
+expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) |
+                     ('=' (yield_expr|testlist_star_expr))*)
+testlist_star_expr: (test|star_expr) (',' (test|star_expr))* [',']
+augassign: ('+=' | '-=' | '*=' | '/=' | '%=' | '&=' | '|=' | '^=' |
+            '<<=' | '>>=' | '**=' | '//=')
+# For normal assignments, additional restrictions enforced by the interpreter
+del_stmt: 'del' exprlist
+pass_stmt: 'pass'
+flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt | yield_stmt
+break_stmt: 'break'
+continue_stmt: 'continue'
+return_stmt: 'return' [testlist]
+yield_stmt: yield_expr
+raise_stmt: 'raise' [test ['from' test]]
+import_stmt: import_name | import_from
+import_name: 'import' dotted_as_names
+# note below: the ('.' | '...') is necessary because '...' is tokenized as ELLIPSIS
+import_from: ('from' (('.' | '...')* dotted_name | ('.' | '...')+)
+              'import' ('*' | '(' import_as_names ')' | import_as_names))
+import_as_name: NAME ['as' NAME]
+dotted_as_name: dotted_name ['as' NAME]
+import_as_names: import_as_name (',' import_as_name)* [',']
+dotted_as_names: dotted_as_name (',' dotted_as_name)*
+dotted_name: NAME ('.' NAME)*
+global_stmt: 'global' NAME (',' NAME)*
+nonlocal_stmt: 'nonlocal' NAME (',' NAME)*
+assert_stmt: 'assert' test [',' test]
+
+compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | with_stmt | funcdef | classdef | decorated
+if_stmt: 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
+while_stmt: 'while' test ':' suite ['else' ':' suite]
+for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite]
+try_stmt: ('try' ':' suite
+           ((except_clause ':' suite)+
+            ['else' ':' suite]
+            ['finally' ':' suite] |
+           'finally' ':' suite))
+with_stmt: 'with' with_item (',' with_item)*  ':' suite
+with_item: test ['as' expr]
+# NB compile.c makes sure that the default except clause is last
+except_clause: 'except' [test ['as' NAME]]
+# Edit by David Halter: The stmt is now optional. This reflects how Jedi allows
+# classes and functions to be empty, which is beneficial for autocompletion.
+suite: simple_stmt | NEWLINE INDENT stmt* DEDENT
+
+test: or_test ['if' or_test 'else' test] | lambdef
+test_nocond: or_test | lambdef_nocond
+lambdef: 'lambda' [varargslist] ':' test
+lambdef_nocond: 'lambda' [varargslist] ':' test_nocond
+or_test: and_test ('or' and_test)*
+and_test: not_test ('and' not_test)*
+not_test: 'not' not_test | comparison
+comparison: expr (comp_op expr)*
+# <> isn't actually a valid comparison operator in Python. It's here for the
+# sake of a __future__ import described in PEP 401
+comp_op: '<'|'>'|'=='|'>='|'<='|'<>'|'!='|'in'|'not' 'in'|'is'|'is' 'not'
+star_expr: '*' expr
+expr: xor_expr ('|' xor_expr)*
+xor_expr: and_expr ('^' and_expr)*
+and_expr: shift_expr ('&' shift_expr)*
+shift_expr: arith_expr (('<<'|'>>') arith_expr)*
+arith_expr: term (('+'|'-') term)*
+term: factor (('*'|'/'|'%'|'//') factor)*
+factor: ('+'|'-'|'~') factor | power
+power: atom trailer* ['**' factor]
+atom: ('(' [yield_expr|testlist_comp] ')' |
+       '[' [testlist_comp] ']' |
+       '{' [dictorsetmaker] '}' |
+       NAME | NUMBER | STRING+ | '...' | 'None' | 'True' | 'False')
+testlist_comp: (test|star_expr) ( comp_for | (',' (test|star_expr))* [','] )
+trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME
+subscriptlist: subscript (',' subscript)* [',']
+subscript: test | [test] ':' [test] [sliceop]
+sliceop: ':' [test]
+exprlist: (expr|star_expr) (',' (expr|star_expr))* [',']
+testlist: test (',' test)* [',']
+dictorsetmaker: ( (test ':' test (comp_for | (',' test ':' test)* [','])) |
+                  (test (comp_for | (',' test)* [','])) )
+
+classdef: 'class' NAME ['(' [arglist] ')'] ':' suite
+
+arglist: (argument ',')* (argument [',']
+                         |'*' test (',' argument)* [',' '**' test] 
+                         |'**' test)
+# The reason that keywords are test nodes instead of NAME is that using NAME
+# results in an ambiguity. ast.c makes sure it's a NAME.
+argument: test [comp_for] | test '=' test  # Really [keyword '='] test
+comp_iter: comp_for | comp_if
+comp_for: 'for' exprlist 'in' or_test [comp_iter]
+comp_if: 'if' test_nocond [comp_iter]
+
+# not used in grammar, but may appear in "node" passed from Parser to Compiler
+encoding_decl: NAME
+
+yield_expr: 'yield' [yield_arg]
+yield_arg: 'from' test | testlist
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/grammar3.5.txt b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/grammar3.5.txt
new file mode 100644
index 0000000..96a7271
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/grammar3.5.txt
@@ -0,0 +1,154 @@
+# Grammar for Python
+
+# Note:  Changing the grammar specified in this file will most likely
+#        require corresponding changes in the parser module
+#        (../Modules/parsermodule.c).  If you can't make the changes to
+#        that module yourself, please co-ordinate the required changes
+#        with someone who can; ask around on python-dev for help.  Fred
+#        Drake <fdrake@acm.org> will probably be listening there.
+
+# NOTE WELL: You should also follow all the steps listed at
+# https://docs.python.org/devguide/grammar.html
+
+# Start symbols for the grammar:
+#       single_input is a single interactive statement;
+#       file_input is a module or sequence of commands read from an input file;
+#       eval_input is the input for the eval() functions.
+# NB: compound_stmt in single_input is followed by extra NEWLINE!
+file_input: (NEWLINE | stmt)* ENDMARKER
+single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
+eval_input: testlist NEWLINE* ENDMARKER
+
+decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
+decorators: decorator+
+decorated: decorators (classdef | funcdef | async_funcdef)
+
+# NOTE: Reinoud Elhorst, using ASYNC/AWAIT keywords instead of tokens
+# skipping python3.5 compatibility, in favour of 3.7 solution
+async_funcdef: 'async' funcdef
+funcdef: 'def' NAME parameters ['->' test] ':' suite
+
+parameters: '(' [typedargslist] ')'
+typedargslist: (tfpdef ['=' test] (',' tfpdef ['=' test])* [','
+       ['*' [tfpdef] (',' tfpdef ['=' test])* [',' '**' tfpdef] | '**' tfpdef]]
+     |  '*' [tfpdef] (',' tfpdef ['=' test])* [',' '**' tfpdef] | '**' tfpdef)
+tfpdef: NAME [':' test]
+varargslist: (vfpdef ['=' test] (',' vfpdef ['=' test])* [','
+       ['*' [vfpdef] (',' vfpdef ['=' test])* [',' '**' vfpdef] | '**' vfpdef]]
+     |  '*' [vfpdef] (',' vfpdef ['=' test])* [',' '**' vfpdef] | '**' vfpdef)
+vfpdef: NAME
+
+stmt: simple_stmt | compound_stmt
+simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
+small_stmt: (expr_stmt | del_stmt | pass_stmt | flow_stmt |
+             import_stmt | global_stmt | nonlocal_stmt | assert_stmt)
+expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) |
+                     ('=' (yield_expr|testlist_star_expr))*)
+testlist_star_expr: (test|star_expr) (',' (test|star_expr))* [',']
+augassign: ('+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' |
+            '<<=' | '>>=' | '**=' | '//=')
+# For normal assignments, additional restrictions enforced by the interpreter
+del_stmt: 'del' exprlist
+pass_stmt: 'pass'
+flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt | yield_stmt
+break_stmt: 'break'
+continue_stmt: 'continue'
+return_stmt: 'return' [testlist]
+yield_stmt: yield_expr
+raise_stmt: 'raise' [test ['from' test]]
+import_stmt: import_name | import_from
+import_name: 'import' dotted_as_names
+# note below: the ('.' | '...') is necessary because '...' is tokenized as ELLIPSIS
+import_from: ('from' (('.' | '...')* dotted_name | ('.' | '...')+)
+              'import' ('*' | '(' import_as_names ')' | import_as_names))
+import_as_name: NAME ['as' NAME]
+dotted_as_name: dotted_name ['as' NAME]
+import_as_names: import_as_name (',' import_as_name)* [',']
+dotted_as_names: dotted_as_name (',' dotted_as_name)*
+dotted_name: NAME ('.' NAME)*
+global_stmt: 'global' NAME (',' NAME)*
+nonlocal_stmt: 'nonlocal' NAME (',' NAME)*
+assert_stmt: 'assert' test [',' test]
+
+compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | with_stmt | funcdef | classdef | decorated | async_stmt
+async_stmt: 'async' (funcdef | with_stmt | for_stmt)
+if_stmt: 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
+while_stmt: 'while' test ':' suite ['else' ':' suite]
+for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite]
+try_stmt: ('try' ':' suite
+           ((except_clause ':' suite)+
+            ['else' ':' suite]
+            ['finally' ':' suite] |
+           'finally' ':' suite))
+with_stmt: 'with' with_item (',' with_item)*  ':' suite
+with_item: test ['as' expr]
+# NB compile.c makes sure that the default except clause is last
+except_clause: 'except' [test ['as' NAME]]
+# Edit by David Halter: The stmt is now optional. This reflects how Jedi allows
+# classes and functions to be empty, which is beneficial for autocompletion.
+suite: simple_stmt | NEWLINE INDENT stmt* DEDENT
+
+test: or_test ['if' or_test 'else' test] | lambdef
+test_nocond: or_test | lambdef_nocond
+lambdef: 'lambda' [varargslist] ':' test
+lambdef_nocond: 'lambda' [varargslist] ':' test_nocond
+or_test: and_test ('or' and_test)*
+and_test: not_test ('and' not_test)*
+not_test: 'not' not_test | comparison
+comparison: expr (comp_op expr)*
+# <> isn't actually a valid comparison operator in Python. It's here for the
+# sake of a __future__ import described in PEP 401 (which really works :-)
+comp_op: '<'|'>'|'=='|'>='|'<='|'<>'|'!='|'in'|'not' 'in'|'is'|'is' 'not'
+star_expr: '*' expr
+expr: xor_expr ('|' xor_expr)*
+xor_expr: and_expr ('^' and_expr)*
+and_expr: shift_expr ('&' shift_expr)*
+shift_expr: arith_expr (('<<'|'>>') arith_expr)*
+arith_expr: term (('+'|'-') term)*
+term: factor (('*'|'@'|'/'|'%'|'//') factor)*
+factor: ('+'|'-'|'~') factor | power
+power: atom_expr ['**' factor]
+atom_expr: ['await'] atom trailer*
+atom: ('(' [yield_expr|testlist_comp] ')' |
+       '[' [testlist_comp] ']' |
+       '{' [dictorsetmaker] '}' |
+       NAME | NUMBER | STRING+ | '...' | 'None' | 'True' | 'False')
+testlist_comp: (test|star_expr) ( comp_for | (',' (test|star_expr))* [','] )
+trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME
+subscriptlist: subscript (',' subscript)* [',']
+subscript: test | [test] ':' [test] [sliceop]
+sliceop: ':' [test]
+exprlist: (expr|star_expr) (',' (expr|star_expr))* [',']
+testlist: test (',' test)* [',']
+dictorsetmaker: ( ((test ':' test | '**' expr)
+                   (comp_for | (',' (test ':' test | '**' expr))* [','])) |
+                  ((test | star_expr)
+                   (comp_for | (',' (test | star_expr))* [','])) )
+
+classdef: 'class' NAME ['(' [arglist] ')'] ':' suite
+
+arglist: argument (',' argument)*  [',']
+
+# The reason that keywords are test nodes instead of NAME is that using NAME
+# results in an ambiguity. ast.c makes sure it's a NAME.
+# "test '=' test" is really "keyword '=' test", but we have no such token.
+# These need to be in a single rule to avoid grammar that is ambiguous
+# to our LL(1) parser. Even though 'test' includes '*expr' in star_expr,
+# we explicitly match '*' here, too, to give it proper precedence.
+# Illegal combinations and orderings are blocked in ast.c:
+# multiple (test comp_for) arguements are blocked; keyword unpackings
+# that precede iterable unpackings are blocked; etc.
+argument: ( test [comp_for] |
+            test '=' test |
+            '**' test |
+            '*' test )
+
+comp_iter: comp_for | comp_if
+comp_for: 'for' exprlist 'in' or_test [comp_iter]
+comp_if: 'if' test_nocond [comp_iter]
+
+# not used in grammar, but may appear in "node" passed from Parser to Compiler
+encoding_decl: NAME
+
+yield_expr: 'yield' [yield_arg]
+yield_arg: 'from' test | testlist
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__init__.py
new file mode 100644
index 0000000..1ddae5f
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__init__.py
@@ -0,0 +1,8 @@
+# Copyright 2004-2005 Elemental Security, Inc. All Rights Reserved.
+# Licensed to PSF under a Contributor Agreement.
+
+# Modifications:
+# Copyright 2006 Google, Inc. All Rights Reserved.
+# Licensed to PSF under a Contributor Agreement.
+# Copyright 2014 David Halter. Integration into Jedi.
+# Modifications are dual-licensed: MIT and PSF.
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..c6fa84f
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__pycache__/grammar.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__pycache__/grammar.cpython-35.pyc
new file mode 100644
index 0000000..99ca4f6
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__pycache__/grammar.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__pycache__/parse.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__pycache__/parse.cpython-35.pyc
new file mode 100644
index 0000000..7dadbf6
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__pycache__/parse.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__pycache__/pgen.cpython-35.pyc b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__pycache__/pgen.cpython-35.pyc
new file mode 100644
index 0000000..b6d18a3
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/__pycache__/pgen.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/grammar.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/grammar.py
new file mode 100644
index 0000000..414c0db
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/grammar.py
@@ -0,0 +1,125 @@
+# Copyright 2004-2005 Elemental Security, Inc. All Rights Reserved.
+# Licensed to PSF under a Contributor Agreement.
+
+# Modifications:
+# Copyright 2014 David Halter. Integration into Jedi.
+# Modifications are dual-licensed: MIT and PSF.
+
+"""This module defines the data structures used to represent a grammar.
+
+These are a bit arcane because they are derived from the data
+structures used by Python's 'pgen' parser generator.
+
+There's also a table here mapping operators to their names in the
+token module; the Python tokenize module reports all operators as the
+fallback token code OP, but the parser needs the actual token code.
+
+"""
+
+# Python imports
+import pickle
+
+
+class Grammar(object):
+    """Pgen parsing tables conversion class.
+
+    Once initialized, this class supplies the grammar tables for the
+    parsing engine implemented by parse.py.  The parsing engine
+    accesses the instance variables directly.  The class here does not
+    provide initialization of the tables; several subclasses exist to
+    do this (see the conv and pgen modules).
+
+    The load() method reads the tables from a pickle file, which is
+    much faster than the other ways offered by subclasses.  The pickle
+    file is written by calling dump() (after loading the grammar
+    tables using a subclass).  The report() method prints a readable
+    representation of the tables to stdout, for debugging.
+
+    The instance variables are as follows:
+
+    symbol2number -- a dict mapping symbol names to numbers.  Symbol
+                     numbers are always 256 or higher, to distinguish
+                     them from token numbers, which are between 0 and
+                     255 (inclusive).
+
+    number2symbol -- a dict mapping numbers to symbol names;
+                     these two are each other's inverse.
+
+    states        -- a list of DFAs, where each DFA is a list of
+                     states, each state is a list of arcs, and each
+                     arc is a (i, j) pair where i is a label and j is
+                     a state number.  The DFA number is the index into
+                     this list.  (This name is slightly confusing.)
+                     Final states are represented by a special arc of
+                     the form (0, j) where j is its own state number.
+
+    dfas          -- a dict mapping symbol numbers to (DFA, first)
+                     pairs, where DFA is an item from the states list
+                     above, and first is a set of tokens that can
+                     begin this grammar rule (represented by a dict
+                     whose values are always 1).
+
+    labels        -- a list of (x, y) pairs where x is either a token
+                     number or a symbol number, and y is either None
+                     or a string; the strings are keywords.  The label
+                     number is the index in this list; label numbers
+                     are used to mark state transitions (arcs) in the
+                     DFAs.
+
+    start         -- the number of the grammar's start symbol.
+
+    keywords      -- a dict mapping keyword strings to arc labels.
+
+    tokens        -- a dict mapping token numbers to arc labels.
+
+    """
+
+    def __init__(self):
+        self.symbol2number = {}
+        self.number2symbol = {}
+        self.states = []
+        self.dfas = {}
+        self.labels = [(0, "EMPTY")]
+        self.keywords = {}
+        self.tokens = {}
+        self.symbol2label = {}
+        self.start = 256
+
+    def dump(self, filename):
+        """Dump the grammar tables to a pickle file."""
+        with open(filename, "wb") as f:
+            pickle.dump(self.__dict__, f, 2)
+
+    def load(self, filename):
+        """Load the grammar tables from a pickle file."""
+        with open(filename, "rb") as f:
+            d = pickle.load(f)
+        self.__dict__.update(d)
+
+    def copy(self):
+        """
+        Copy the grammar.
+        """
+        new = self.__class__()
+        for dict_attr in ("symbol2number", "number2symbol", "dfas", "keywords",
+                          "tokens", "symbol2label"):
+            setattr(new, dict_attr, getattr(self, dict_attr).copy())
+        new.labels = self.labels[:]
+        new.states = self.states[:]
+        new.start = self.start
+        return new
+
+    def report(self):
+        """Dump the grammar tables to standard output, for debugging."""
+        from pprint import pprint
+        print("s2n")
+        pprint(self.symbol2number)
+        print("n2s")
+        pprint(self.number2symbol)
+        print("states")
+        pprint(self.states)
+        print("dfas")
+        pprint(self.dfas)
+        print("labels")
+        pprint(self.labels)
+        print("start", self.start)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/parse.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/parse.py
new file mode 100644
index 0000000..9e74838
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/parse.py
@@ -0,0 +1,213 @@
+# Copyright 2004-2005 Elemental Security, Inc. All Rights Reserved.
+# Licensed to PSF under a Contributor Agreement.
+
+# Modifications:
+# Copyright 2014 David Halter. Integration into Jedi.
+# Modifications are dual-licensed: MIT and PSF.
+
+"""
+Parser engine for the grammar tables generated by pgen.
+
+The grammar table must be loaded first.
+
+See Parser/parser.c in the Python distribution for additional info on
+how this parsing engine works.
+"""
+
+# Local imports
+from jedi.parser import tokenize
+
+
+class InternalParseError(Exception):
+    """
+    Exception to signal the parser is stuck and error recovery didn't help.
+    Basically this shouldn't happen. It's a sign that something is really
+    wrong.
+    """
+
+    def __init__(self, msg, type, value, start_pos):
+        Exception.__init__(self, "%s: type=%r, value=%r, start_pos=%r" %
+                           (msg, tokenize.tok_name[type], value, start_pos))
+        self.msg = msg
+        self.type = type
+        self.value = value
+        self.start_pos = start_pos
+
+
+def token_to_ilabel(grammar, type_, value):
+    # Map from token to label
+    if type_ == tokenize.NAME:
+        # Check for reserved words (keywords)
+        try:
+            return grammar.keywords[value]
+        except KeyError:
+            pass
+
+    try:
+        return grammar.tokens[type_]
+    except KeyError:
+        return None
+
+
+class PgenParser(object):
+    """Parser engine.
+
+    The proper usage sequence is:
+
+    p = Parser(grammar, [converter])  # create instance
+    p.setup([start])                  # prepare for parsing
+    <for each input token>:
+        if p.addtoken(...):           # parse a token
+            break
+    root = p.rootnode                 # root of abstract syntax tree
+
+    A Parser instance may be reused by calling setup() repeatedly.
+
+    A Parser instance contains state pertaining to the current token
+    sequence, and should not be used concurrently by different threads
+    to parse separate token sequences.
+
+    See driver.py for how to get input tokens by tokenizing a file or
+    string.
+
+    Parsing is complete when addtoken() returns True; the root of the
+    abstract syntax tree can then be retrieved from the rootnode
+    instance variable.  When a syntax error occurs, error_recovery()
+    is called. There is no error recovery; the parser cannot be used
+    after a syntax error was reported (but it can be reinitialized by
+    calling setup()).
+
+    """
+
+    def __init__(self, grammar, convert_node, convert_leaf, error_recovery, start):
+        """Constructor.
+
+        The grammar argument is a grammar.Grammar instance; see the
+        grammar module for more information.
+
+        The parser is not ready yet for parsing; you must call the
+        setup() method to get it started.
+
+        The optional convert argument is a function mapping concrete
+        syntax tree nodes to abstract syntax tree nodes.  If not
+        given, no conversion is done and the syntax tree produced is
+        the concrete syntax tree.  If given, it must be a function of
+        two arguments, the first being the grammar (a grammar.Grammar
+        instance), and the second being the concrete syntax tree node
+        to be converted.  The syntax tree is converted from the bottom
+        up.
+
+        A concrete syntax tree node is a (type, nodes) tuple, where
+        type is the node type (a token or symbol number) and nodes
+        is a list of children for symbols, and None for tokens.
+
+        An abstract syntax tree node may be anything; this is entirely
+        up to the converter function.
+
+        """
+        self.grammar = grammar
+        self.convert_node = convert_node
+        self.convert_leaf = convert_leaf
+
+        # Each stack entry is a tuple: (dfa, state, node).
+        # A node is a tuple: (type, children),
+        # where children is a list of nodes or None
+        newnode = (start, [])
+        stackentry = (self.grammar.dfas[start], 0, newnode)
+        self.stack = [stackentry]
+        self.rootnode = None
+        self.error_recovery = error_recovery
+
+    def parse(self, tokenizer):
+        for type_, value, start_pos, prefix in tokenizer:
+            if self.addtoken(type_, value, start_pos, prefix):
+                break
+        else:
+            # We never broke out -- EOF is too soon -- Unfinished statement.
+            # However, the error recovery might have added the token again, if
+            # the stack is empty, we're fine.
+            if self.stack:
+                raise InternalParseError("incomplete input", type_, value, start_pos)
+        return self.rootnode
+
+    def addtoken(self, type_, value, start_pos, prefix):
+        """Add a token; return True if this is the end of the program."""
+        ilabel = token_to_ilabel(self.grammar, type_, value)
+
+        # Loop until the token is shifted; may raise exceptions
+        while True:
+            dfa, state, node = self.stack[-1]
+            states, first = dfa
+            arcs = states[state]
+            # Look for a state with this label
+            for i, newstate in arcs:
+                t, v = self.grammar.labels[i]
+                if ilabel == i:
+                    # Look it up in the list of labels
+                    assert t < 256
+                    # Shift a token; we're done with it
+                    self.shift(type_, value, newstate, prefix, start_pos)
+                    # Pop while we are in an accept-only state
+                    state = newstate
+                    while states[state] == [(0, state)]:
+                        self.pop()
+                        if not self.stack:
+                            # Done parsing!
+                            return True
+                        dfa, state, node = self.stack[-1]
+                        states, first = dfa
+                    # Done with this token
+                    return False
+                elif t >= 256:
+                    # See if it's a symbol and if we're in its first set
+                    itsdfa = self.grammar.dfas[t]
+                    itsstates, itsfirst = itsdfa
+                    if ilabel in itsfirst:
+                        # Push a symbol
+                        self.push(t, itsdfa, newstate)
+                        break  # To continue the outer while loop
+            else:
+                if (0, state) in arcs:
+                    # An accepting state, pop it and try something else
+                    self.pop()
+                    if not self.stack:
+                        # Done parsing, but another token is input
+                        raise InternalParseError("too much input", type_, value, start_pos)
+                else:
+                    self.error_recovery(self.grammar, self.stack, arcs, type_,
+                                        value, start_pos, prefix, self.addtoken)
+                    break
+
+    def shift(self, type_, value, newstate, prefix, start_pos):
+        """Shift a token.  (Internal)"""
+        dfa, state, node = self.stack[-1]
+        newnode = self.convert_leaf(self.grammar, type_, value, prefix, start_pos)
+        node[-1].append(newnode)
+        self.stack[-1] = (dfa, newstate, node)
+
+    def push(self, type_, newdfa, newstate):
+        """Push a nonterminal.  (Internal)"""
+        dfa, state, node = self.stack[-1]
+        newnode = (type_, [])
+        self.stack[-1] = (dfa, newstate, node)
+        self.stack.append((newdfa, 0, newnode))
+
+    def pop(self):
+        """Pop a nonterminal.  (Internal)"""
+        popdfa, popstate, (type_, children) = self.stack.pop()
+        # If there's exactly one child, return that child instead of creating a
+        # new node.  We still create expr_stmt and file_input though, because a
+        # lot of Jedi depends on its logic.
+        if len(children) == 1:
+            newnode = children[0]
+        else:
+            newnode = self.convert_node(self.grammar, type_, children)
+
+        try:
+            # Equal to:
+            # dfa, state, node = self.stack[-1]
+            # symbol, children = node
+            self.stack[-1][2][1].append(newnode)
+        except IndexError:
+            # Stack is empty, set the rootnode.
+            self.rootnode = newnode
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/pgen.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/pgen.py
new file mode 100644
index 0000000..fa2742d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/pgen2/pgen.py
@@ -0,0 +1,394 @@
+# Copyright 2004-2005 Elemental Security, Inc. All Rights Reserved.
+# Licensed to PSF under a Contributor Agreement.
+
+# Modifications:
+# Copyright 2014 David Halter. Integration into Jedi.
+# Modifications are dual-licensed: MIT and PSF.
+
+# Pgen imports
+from . import grammar
+from jedi.parser import token
+from jedi.parser import tokenize
+
+
+class ParserGenerator(object):
+    def __init__(self, filename, stream=None):
+        close_stream = None
+        if stream is None:
+            stream = open(filename)
+            close_stream = stream.close
+        self.filename = filename
+        self.stream = stream
+        self.generator = tokenize.generate_tokens(stream.readline)
+        self.gettoken()  # Initialize lookahead
+        self.dfas, self.startsymbol = self.parse()
+        if close_stream is not None:
+            close_stream()
+        self.first = {}  # map from symbol name to set of tokens
+        self.addfirstsets()
+
+    def make_grammar(self):
+        c = grammar.Grammar()
+        names = list(self.dfas.keys())
+        names.sort()
+        names.remove(self.startsymbol)
+        names.insert(0, self.startsymbol)
+        for name in names:
+            i = 256 + len(c.symbol2number)
+            c.symbol2number[name] = i
+            c.number2symbol[i] = name
+        for name in names:
+            dfa = self.dfas[name]
+            states = []
+            for state in dfa:
+                arcs = []
+                for label, next in state.arcs.items():
+                    arcs.append((self.make_label(c, label), dfa.index(next)))
+                if state.isfinal:
+                    arcs.append((0, dfa.index(state)))
+                states.append(arcs)
+            c.states.append(states)
+            c.dfas[c.symbol2number[name]] = (states, self.make_first(c, name))
+        c.start = c.symbol2number[self.startsymbol]
+        return c
+
+    def make_first(self, c, name):
+        rawfirst = self.first[name]
+        first = {}
+        for label in rawfirst:
+            ilabel = self.make_label(c, label)
+            ##assert ilabel not in first # XXX failed on <> ... !=
+            first[ilabel] = 1
+        return first
+
+    def make_label(self, c, label):
+        # XXX Maybe this should be a method on a subclass of converter?
+        ilabel = len(c.labels)
+        if label[0].isalpha():
+            # Either a symbol name or a named token
+            if label in c.symbol2number:
+                # A symbol name (a non-terminal)
+                if label in c.symbol2label:
+                    return c.symbol2label[label]
+                else:
+                    c.labels.append((c.symbol2number[label], None))
+                    c.symbol2label[label] = ilabel
+                    return ilabel
+            else:
+                # A named token (NAME, NUMBER, STRING)
+                itoken = getattr(token, label, None)
+                assert isinstance(itoken, int), label
+                assert itoken in token.tok_name, label
+                if itoken in c.tokens:
+                    return c.tokens[itoken]
+                else:
+                    c.labels.append((itoken, None))
+                    c.tokens[itoken] = ilabel
+                    return ilabel
+        else:
+            # Either a keyword or an operator
+            assert label[0] in ('"', "'"), label
+            value = eval(label)
+            if value[0].isalpha():
+                # A keyword
+                if value in c.keywords:
+                    return c.keywords[value]
+                else:
+                    c.labels.append((token.NAME, value))
+                    c.keywords[value] = ilabel
+                    return ilabel
+            else:
+                # An operator (any non-numeric token)
+                itoken = token.opmap[value]  # Fails if unknown token
+                if itoken in c.tokens:
+                    return c.tokens[itoken]
+                else:
+                    c.labels.append((itoken, None))
+                    c.tokens[itoken] = ilabel
+                    return ilabel
+
+    def addfirstsets(self):
+        names = list(self.dfas.keys())
+        names.sort()
+        for name in names:
+            if name not in self.first:
+                self.calcfirst(name)
+            #print name, self.first[name].keys()
+
+    def calcfirst(self, name):
+        dfa = self.dfas[name]
+        self.first[name] = None  # dummy to detect left recursion
+        state = dfa[0]
+        totalset = {}
+        overlapcheck = {}
+        for label, next in state.arcs.items():
+            if label in self.dfas:
+                if label in self.first:
+                    fset = self.first[label]
+                    if fset is None:
+                        raise ValueError("recursion for rule %r" % name)
+                else:
+                    self.calcfirst(label)
+                    fset = self.first[label]
+                totalset.update(fset)
+                overlapcheck[label] = fset
+            else:
+                totalset[label] = 1
+                overlapcheck[label] = {label: 1}
+        inverse = {}
+        for label, itsfirst in overlapcheck.items():
+            for symbol in itsfirst:
+                if symbol in inverse:
+                    raise ValueError("rule %s is ambiguous; %s is in the"
+                                     " first sets of %s as well as %s" %
+                                     (name, symbol, label, inverse[symbol]))
+                inverse[symbol] = label
+        self.first[name] = totalset
+
+    def parse(self):
+        dfas = {}
+        startsymbol = None
+        # MSTART: (NEWLINE | RULE)* ENDMARKER
+        while self.type != token.ENDMARKER:
+            while self.type == token.NEWLINE:
+                self.gettoken()
+            # RULE: NAME ':' RHS NEWLINE
+            name = self.expect(token.NAME)
+            self.expect(token.OP, ":")
+            a, z = self.parse_rhs()
+            self.expect(token.NEWLINE)
+            #self.dump_nfa(name, a, z)
+            dfa = self.make_dfa(a, z)
+            #self.dump_dfa(name, dfa)
+            # oldlen = len(dfa)
+            self.simplify_dfa(dfa)
+            # newlen = len(dfa)
+            dfas[name] = dfa
+            #print name, oldlen, newlen
+            if startsymbol is None:
+                startsymbol = name
+        return dfas, startsymbol
+
+    def make_dfa(self, start, finish):
+        # To turn an NFA into a DFA, we define the states of the DFA
+        # to correspond to *sets* of states of the NFA.  Then do some
+        # state reduction.  Let's represent sets as dicts with 1 for
+        # values.
+        assert isinstance(start, NFAState)
+        assert isinstance(finish, NFAState)
+
+        def closure(state):
+            base = {}
+            addclosure(state, base)
+            return base
+
+        def addclosure(state, base):
+            assert isinstance(state, NFAState)
+            if state in base:
+                return
+            base[state] = 1
+            for label, next in state.arcs:
+                if label is None:
+                    addclosure(next, base)
+
+        states = [DFAState(closure(start), finish)]
+        for state in states:  # NB states grows while we're iterating
+            arcs = {}
+            for nfastate in state.nfaset:
+                for label, next in nfastate.arcs:
+                    if label is not None:
+                        addclosure(next, arcs.setdefault(label, {}))
+            for label, nfaset in arcs.items():
+                for st in states:
+                    if st.nfaset == nfaset:
+                        break
+                else:
+                    st = DFAState(nfaset, finish)
+                    states.append(st)
+                state.addarc(st, label)
+        return states  # List of DFAState instances; first one is start
+
+    def dump_nfa(self, name, start, finish):
+        print("Dump of NFA for", name)
+        todo = [start]
+        for i, state in enumerate(todo):
+            print("  State", i, state is finish and "(final)" or "")
+            for label, next in state.arcs:
+                if next in todo:
+                    j = todo.index(next)
+                else:
+                    j = len(todo)
+                    todo.append(next)
+                if label is None:
+                    print("    -> %d" % j)
+                else:
+                    print("    %s -> %d" % (label, j))
+
+    def dump_dfa(self, name, dfa):
+        print("Dump of DFA for", name)
+        for i, state in enumerate(dfa):
+            print("  State", i, state.isfinal and "(final)" or "")
+            for label, next in state.arcs.items():
+                print("    %s -> %d" % (label, dfa.index(next)))
+
+    def simplify_dfa(self, dfa):
+        # This is not theoretically optimal, but works well enough.
+        # Algorithm: repeatedly look for two states that have the same
+        # set of arcs (same labels pointing to the same nodes) and
+        # unify them, until things stop changing.
+
+        # dfa is a list of DFAState instances
+        changes = True
+        while changes:
+            changes = False
+            for i, state_i in enumerate(dfa):
+                for j in range(i + 1, len(dfa)):
+                    state_j = dfa[j]
+                    if state_i == state_j:
+                        #print "  unify", i, j
+                        del dfa[j]
+                        for state in dfa:
+                            state.unifystate(state_j, state_i)
+                        changes = True
+                        break
+
+    def parse_rhs(self):
+        # RHS: ALT ('|' ALT)*
+        a, z = self.parse_alt()
+        if self.value != "|":
+            return a, z
+        else:
+            aa = NFAState()
+            zz = NFAState()
+            aa.addarc(a)
+            z.addarc(zz)
+            while self.value == "|":
+                self.gettoken()
+                a, z = self.parse_alt()
+                aa.addarc(a)
+                z.addarc(zz)
+            return aa, zz
+
+    def parse_alt(self):
+        # ALT: ITEM+
+        a, b = self.parse_item()
+        while (self.value in ("(", "[") or
+               self.type in (token.NAME, token.STRING)):
+            c, d = self.parse_item()
+            b.addarc(c)
+            b = d
+        return a, b
+
+    def parse_item(self):
+        # ITEM: '[' RHS ']' | ATOM ['+' | '*']
+        if self.value == "[":
+            self.gettoken()
+            a, z = self.parse_rhs()
+            self.expect(token.OP, "]")
+            a.addarc(z)
+            return a, z
+        else:
+            a, z = self.parse_atom()
+            value = self.value
+            if value not in ("+", "*"):
+                return a, z
+            self.gettoken()
+            z.addarc(a)
+            if value == "+":
+                return a, z
+            else:
+                return a, a
+
+    def parse_atom(self):
+        # ATOM: '(' RHS ')' | NAME | STRING
+        if self.value == "(":
+            self.gettoken()
+            a, z = self.parse_rhs()
+            self.expect(token.OP, ")")
+            return a, z
+        elif self.type in (token.NAME, token.STRING):
+            a = NFAState()
+            z = NFAState()
+            a.addarc(z, self.value)
+            self.gettoken()
+            return a, z
+        else:
+            self.raise_error("expected (...) or NAME or STRING, got %s/%s",
+                             self.type, self.value)
+
+    def expect(self, type, value=None):
+        if self.type != type or (value is not None and self.value != value):
+            self.raise_error("expected %s/%s, got %s/%s",
+                             type, value, self.type, self.value)
+        value = self.value
+        self.gettoken()
+        return value
+
+    def gettoken(self):
+        tup = next(self.generator)
+        while tup[0] in (token.COMMENT, token.NL):
+            tup = next(self.generator)
+        self.type, self.value, self.begin, prefix = tup
+        #print tokenize.tok_name[self.type], repr(self.value)
+
+    def raise_error(self, msg, *args):
+        if args:
+            try:
+                msg = msg % args
+            except:
+                msg = " ".join([msg] + list(map(str, args)))
+        line = open(self.filename).readlines()[self.begin[0]]
+        raise SyntaxError(msg, (self.filename, self.begin[0],
+                                self.begin[1], line))
+
+
+class NFAState(object):
+    def __init__(self):
+        self.arcs = []  # list of (label, NFAState) pairs
+
+    def addarc(self, next, label=None):
+        assert label is None or isinstance(label, str)
+        assert isinstance(next, NFAState)
+        self.arcs.append((label, next))
+
+
+class DFAState(object):
+    def __init__(self, nfaset, final):
+        assert isinstance(nfaset, dict)
+        assert isinstance(next(iter(nfaset)), NFAState)
+        assert isinstance(final, NFAState)
+        self.nfaset = nfaset
+        self.isfinal = final in nfaset
+        self.arcs = {}  # map from label to DFAState
+
+    def addarc(self, next, label):
+        assert isinstance(label, str)
+        assert label not in self.arcs
+        assert isinstance(next, DFAState)
+        self.arcs[label] = next
+
+    def unifystate(self, old, new):
+        for label, next in self.arcs.items():
+            if next is old:
+                self.arcs[label] = new
+
+    def __eq__(self, other):
+        # Equality test -- ignore the nfaset instance variable
+        assert isinstance(other, DFAState)
+        if self.isfinal != other.isfinal:
+            return False
+        # Can't just return self.arcs == other.arcs, because that
+        # would invoke this method recursively, with cycles...
+        if len(self.arcs) != len(other.arcs):
+            return False
+        for label, next in self.arcs.items():
+            if next is not other.arcs.get(label):
+                return False
+        return True
+
+    __hash__ = None  # For Py3 compatibility.
+
+
+def generate_grammar(filename="Grammar.txt"):
+    p = ParserGenerator(filename)
+    return p.make_grammar()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/token.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/token.py
new file mode 100644
index 0000000..0cb846d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/token.py
@@ -0,0 +1,90 @@
+from __future__ import absolute_import
+
+from jedi._compatibility import is_py3, is_py35
+from token import *
+
+
+COMMENT = N_TOKENS
+tok_name[COMMENT] = 'COMMENT'
+N_TOKENS += 1
+
+NL = N_TOKENS
+tok_name[NL] = 'NL'
+N_TOKENS += 1
+
+if is_py3:
+    BACKQUOTE = N_TOKENS
+    tok_name[BACKQUOTE] = 'BACKQUOTE'
+    N_TOKENS += 1
+else:
+    RARROW = N_TOKENS
+    tok_name[RARROW] = 'RARROW'
+    N_TOKENS += 1
+    ELLIPSIS = N_TOKENS
+    tok_name[ELLIPSIS] = 'ELLIPSIS'
+    N_TOKENS += 1
+
+if not is_py35:
+    ATEQUAL = N_TOKENS
+    tok_name[ATEQUAL] = 'ATEQUAL'
+    N_TOKENS += 1
+
+
+
+# Map from operator to number (since tokenize doesn't do this)
+
+opmap_raw = """\
+( LPAR
+) RPAR
+[ LSQB
+] RSQB
+: COLON
+, COMMA
+; SEMI
++ PLUS
+- MINUS
+* STAR
+/ SLASH
+| VBAR
+& AMPER
+< LESS
+> GREATER
+= EQUAL
+. DOT
+% PERCENT
+` BACKQUOTE
+{ LBRACE
+} RBRACE
+@ AT
+== EQEQUAL
+!= NOTEQUAL
+<> NOTEQUAL
+<= LESSEQUAL
+>= GREATEREQUAL
+~ TILDE
+^ CIRCUMFLEX
+<< LEFTSHIFT
+>> RIGHTSHIFT
+** DOUBLESTAR
++= PLUSEQUAL
+-= MINEQUAL
+*= STAREQUAL
+/= SLASHEQUAL
+%= PERCENTEQUAL
+&= AMPEREQUAL
+|= VBAREQUAL
+@= ATEQUAL
+^= CIRCUMFLEXEQUAL
+<<= LEFTSHIFTEQUAL
+>>= RIGHTSHIFTEQUAL
+**= DOUBLESTAREQUAL
+// DOUBLESLASH
+//= DOUBLESLASHEQUAL
+-> RARROW
+... ELLIPSIS
+"""
+
+opmap = {}
+for line in opmap_raw.splitlines():
+    op, name = line.split()
+    opmap[op] = globals()[name]
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/tokenize.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/tokenize.py
new file mode 100644
index 0000000..233c6d8
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/tokenize.py
@@ -0,0 +1,329 @@
+# -*- coding: utf-8 -*-
+"""
+This tokenizer has been copied from the ``tokenize.py`` standard library
+tokenizer. The reason was simple: The standard library tokenizer fails
+if the indentation is not right. The fast parser of jedi however requires
+"wrong" indentation.
+
+Basically this is a stripped down version of the standard library module, so
+you can read the documentation there. Additionally we included some speed and
+memory optimizations here.
+"""
+from __future__ import absolute_import
+
+import string
+import re
+from collections import namedtuple
+from io import StringIO
+
+from jedi.parser.token import (tok_name, N_TOKENS, ENDMARKER, STRING, NUMBER, opmap,
+                               NAME, OP, ERRORTOKEN, NEWLINE, INDENT, DEDENT)
+from jedi._compatibility import is_py3
+
+
+cookie_re = re.compile("coding[:=]\s*([-\w.]+)")
+
+
+if is_py3:
+    # Python 3 has str.isidentifier() to check if a char is a valid identifier
+    is_identifier = str.isidentifier
+else:
+    namechars = string.ascii_letters + '_'
+    is_identifier = lambda s: s in namechars
+
+
+COMMENT = N_TOKENS
+tok_name[COMMENT] = 'COMMENT'
+
+
+def group(*choices):
+    return '(' + '|'.join(choices) + ')'
+
+
+def maybe(*choices):
+    return group(*choices) + '?'
+
+
+# Note: we use unicode matching for names ("\w") but ascii matching for
+# number literals.
+whitespace = r'[ \f\t]*'
+comment = r'#[^\r\n]*'
+name = r'\w+'
+
+hex_number = r'0[xX][0-9a-fA-F]+'
+bin_number = r'0[bB][01]+'
+if is_py3:
+    oct_number = r'0[oO][0-7]+'
+else:
+    oct_number = '0[0-7]+'
+dec_number = r'(?:0+|[1-9][0-9]*)'
+int_number = group(hex_number, bin_number, oct_number, dec_number)
+exponent = r'[eE][-+]?[0-9]+'
+point_float = group(r'[0-9]+\.[0-9]*', r'\.[0-9]+') + maybe(exponent)
+Expfloat = r'[0-9]+' + exponent
+float_number = group(point_float, Expfloat)
+imag_number = group(r'[0-9]+[jJ]', float_number + r'[jJ]')
+number = group(imag_number, float_number, int_number)
+
+# Tail end of ' string.
+single = r"[^'\\]*(?:\\.[^'\\]*)*'"
+# Tail end of " string.
+double = r'[^"\\]*(?:\\.[^"\\]*)*"'
+# Tail end of ''' string.
+single3 = r"[^'\\]*(?:(?:\\.|'(?!''))[^'\\]*)*'''"
+# Tail end of """ string.
+double3 = r'[^"\\]*(?:(?:\\.|"(?!""))[^"\\]*)*"""'
+triple = group("[uUbB]?[rR]?'''", '[uUbB]?[rR]?"""')
+# Single-line ' or " string.
+
+# Because of leftmost-then-longest match semantics, be sure to put the
+# longest operators first (e.g., if = came before ==, == would get
+# recognized as two instances of =).
+operator = group(r"\*\*=?", r">>=?", r"<<=?", r"!=",
+                 r"//=?", r"->",
+                 r"[+\-*@/%&|^=<>]=?",
+                 r"~")
+
+bracket = '[][(){}]'
+special = group(r'\r?\n', r'\.\.\.', r'[:;.,@]')
+funny = group(operator, bracket, special)
+
+# First (or only) line of ' or " string.
+cont_str = group(r"[bBuU]?[rR]?'[^\n'\\]*(?:\\.[^\n'\\]*)*" +
+                 group("'", r'\\\r?\n'),
+                 r'[bBuU]?[rR]?"[^\n"\\]*(?:\\.[^\n"\\]*)*' +
+                 group('"', r'\\\r?\n'))
+pseudo_extras = group(r'\\\r?\n', comment, triple)
+pseudo_token = group(whitespace) + \
+    group(pseudo_extras, number, funny, cont_str, name)
+
+
+def _compile(expr):
+    return re.compile(expr, re.UNICODE)
+
+
+pseudoprog, single3prog, double3prog = map(
+    _compile, (pseudo_token, single3, double3))
+
+endprogs = {"'": _compile(single), '"': _compile(double),
+            "'''": single3prog, '"""': double3prog,
+            "r'''": single3prog, 'r"""': double3prog,
+            "b'''": single3prog, 'b"""': double3prog,
+            "u'''": single3prog, 'u"""': double3prog,
+            "R'''": single3prog, 'R"""': double3prog,
+            "B'''": single3prog, 'B"""': double3prog,
+            "U'''": single3prog, 'U"""': double3prog,
+            "br'''": single3prog, 'br"""': double3prog,
+            "bR'''": single3prog, 'bR"""': double3prog,
+            "Br'''": single3prog, 'Br"""': double3prog,
+            "BR'''": single3prog, 'BR"""': double3prog,
+            "ur'''": single3prog, 'ur"""': double3prog,
+            "uR'''": single3prog, 'uR"""': double3prog,
+            "Ur'''": single3prog, 'Ur"""': double3prog,
+            "UR'''": single3prog, 'UR"""': double3prog,
+            'r': None, 'R': None, 'b': None, 'B': None}
+
+triple_quoted = {}
+for t in ("'''", '"""',
+          "r'''", 'r"""', "R'''", 'R"""',
+          "b'''", 'b"""', "B'''", 'B"""',
+          "u'''", 'u"""', "U'''", 'U"""',
+          "br'''", 'br"""', "Br'''", 'Br"""',
+          "bR'''", 'bR"""', "BR'''", 'BR"""',
+          "ur'''", 'ur"""', "Ur'''", 'Ur"""',
+          "uR'''", 'uR"""', "UR'''", 'UR"""'):
+    triple_quoted[t] = t
+single_quoted = {}
+for t in ("'", '"',
+          "r'", 'r"', "R'", 'R"',
+          "b'", 'b"', "B'", 'B"',
+          "u'", 'u"', "U'", 'U"',
+          "br'", 'br"', "Br'", 'Br"',
+          "bR'", 'bR"', "BR'", 'BR"',
+          "ur'", 'ur"', "Ur'", 'Ur"',
+          "uR'", 'uR"', "UR'", 'UR"'):
+    single_quoted[t] = t
+
+del _compile
+
+tabsize = 8
+
+# TODO add with?
+ALWAYS_BREAK_TOKENS = (';', 'import', 'class', 'def', 'try', 'except',
+                       'finally', 'while', 'return')
+
+
+class TokenInfo(namedtuple('Token', ['type', 'string', 'start_pos', 'prefix'])):
+    def __repr__(self):
+        annotated_type = tok_name[self.type]
+        return ('TokenInfo(type=%s, string=%r, start=%r, prefix=%r)' %
+                self._replace(type=annotated_type))
+
+    @property
+    def exact_type(self):
+        if self.type == OP and self.string in opmap:
+            return opmap[self.string]
+        else:
+            return self.type
+
+
+def source_tokens(source, use_exact_op_types=False):
+    """Generate tokens from a the source code (string)."""
+    source = source
+    readline = StringIO(source).readline
+    return generate_tokens(readline, use_exact_op_types)
+
+
+def generate_tokens(readline, use_exact_op_types=False):
+    """
+    A heavily modified Python standard library tokenizer.
+
+    Additionally to the default information, yields also the prefix of each
+    token. This idea comes from lib2to3. The prefix contains all information
+    that is irrelevant for the parser like newlines in parentheses or comments.
+    """
+    paren_level = 0  # count parentheses
+    indents = [0]
+    lnum = 0
+    max = 0
+    numchars = '0123456789'
+    contstr = ''
+    contline = None
+    # We start with a newline. This makes indent at the first position
+    # possible. It's not valid Python, but still better than an INDENT in the
+    # second line (and not in the first). This makes quite a few things in
+    # Jedi's fast parser possible.
+    new_line = True
+    prefix = ''  # Should never be required, but here for safety
+    additional_prefix = ''
+    while True:            # loop over lines in stream
+        line = readline()  # readline returns empty when finished. See StringIO
+        if not line:
+            if contstr:
+                yield TokenInfo(ERRORTOKEN, contstr, contstr_start, prefix)
+            break
+
+        lnum += 1
+        pos, max = 0, len(line)
+
+        if contstr:                                         # continued string
+            endmatch = endprog.match(line)
+            if endmatch:
+                pos = endmatch.end(0)
+                yield TokenInfo(STRING, contstr + line[:pos], contstr_start, prefix)
+                contstr = ''
+                contline = None
+            else:
+                contstr = contstr + line
+                contline = contline + line
+                continue
+
+        while pos < max:
+            pseudomatch = pseudoprog.match(line, pos)
+            if not pseudomatch:                             # scan for tokens
+                txt = line[pos]
+                if line[pos] in '"\'':
+                    # If a literal starts but doesn't end the whole rest of the
+                    # line is an error token.
+                    txt = line[pos:]
+                yield TokenInfo(ERRORTOKEN, txt, (lnum, pos), prefix)
+                pos += 1
+                continue
+
+            prefix = additional_prefix + pseudomatch.group(1)
+            additional_prefix = ''
+            start, pos = pseudomatch.span(2)
+            spos = (lnum, start)
+            token, initial = line[start:pos], line[start]
+
+            if new_line and initial not in '\r\n#':
+                new_line = False
+                if paren_level == 0:
+                    i = 0
+                    while line[i] == '\f':
+                        i += 1
+                        start -= 1
+                    if start > indents[-1]:
+                        yield TokenInfo(INDENT, '', spos, '')
+                        indents.append(start)
+                    while start < indents[-1]:
+                        yield TokenInfo(DEDENT, '', spos, '')
+                        indents.pop()
+
+            if (initial in numchars or                      # ordinary number
+                    (initial == '.' and token != '.' and token != '...')):
+                yield TokenInfo(NUMBER, token, spos, prefix)
+            elif initial in '\r\n':
+                if not new_line and paren_level == 0:
+                    yield TokenInfo(NEWLINE, token, spos, prefix)
+                else:
+                    additional_prefix = prefix + token
+                new_line = True
+            elif initial == '#':  # Comments
+                assert not token.endswith("\n")
+                additional_prefix = prefix + token
+            elif token in triple_quoted:
+                endprog = endprogs[token]
+                endmatch = endprog.match(line, pos)
+                if endmatch:                                # all on one line
+                    pos = endmatch.end(0)
+                    token = line[start:pos]
+                    yield TokenInfo(STRING, token, spos, prefix)
+                else:
+                    contstr_start = (lnum, start)           # multiple lines
+                    contstr = line[start:]
+                    contline = line
+                    break
+            elif initial in single_quoted or \
+                    token[:2] in single_quoted or \
+                    token[:3] in single_quoted:
+                if token[-1] == '\n':                       # continued string
+                    contstr_start = lnum, start
+                    endprog = (endprogs.get(initial) or endprogs.get(token[1])
+                               or endprogs.get(token[2]))
+                    contstr = line[start:]
+                    contline = line
+                    break
+                else:                                       # ordinary string
+                    yield TokenInfo(STRING, token, spos, prefix)
+            elif is_identifier(initial):                      # ordinary name
+                if token in ALWAYS_BREAK_TOKENS:
+                    paren_level = 0
+                    while True:
+                        indent = indents.pop()
+                        if indent > start:
+                            yield TokenInfo(DEDENT, '', spos, '')
+                        else:
+                            indents.append(indent)
+                            break
+                yield TokenInfo(NAME, token, spos, prefix)
+            elif initial == '\\' and line[start:] in ('\\\n', '\\\r\n'):  # continued stmt
+                additional_prefix += prefix + line[start:]
+                break
+            else:
+                if token in '([{':
+                    paren_level += 1
+                elif token in ')]}':
+                    paren_level -= 1
+
+                try:
+                    # This check is needed in any case to check if it's a valid
+                    # operator or just some random unicode character.
+                    exact_type = opmap[token]
+                except KeyError:
+                    exact_type = typ = ERRORTOKEN
+                if use_exact_op_types:
+                    typ = exact_type
+                else:
+                    typ = OP
+                yield TokenInfo(typ, token, spos, prefix)
+
+    if new_line or additional_prefix[-1:] == '\n':
+        end_pos = lnum + 1, 0
+    else:
+        end_pos = lnum, max
+    # As the last position we just take the maximally possible position. We
+    # remove -1 for the last new line.
+    for indent in indents[1:]:
+        yield TokenInfo(DEDENT, '', end_pos, '')
+    yield TokenInfo(ENDMARKER, '', end_pos, additional_prefix)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/tree.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/tree.py
new file mode 100644
index 0000000..c5a2d55
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/tree.py
@@ -0,0 +1,1658 @@
+"""
+If you know what an abstract syntax tree (AST) is, you'll see that this module
+is pretty much that. The classes represent syntax elements like functions and
+imports.
+
+This is the "business logic" part of the parser. There's a lot of logic here
+that makes it easier for Jedi (and other libraries to deal with a Python syntax
+tree.
+
+By using `get_code` on a module, you can get back the 1-to-1 representation of
+the input given to the parser. This is important if you are using refactoring.
+
+The easiest way to play with this module is to use :class:`parsing.Parser`.
+:attr:`parsing.Parser.module` holds an instance of :class:`Module`:
+
+>>> from jedi._compatibility import u
+>>> from jedi.parser import ParserWithRecovery, load_grammar
+>>> parser = ParserWithRecovery(load_grammar(), u('import os'), 'example.py')
+>>> submodule = parser.module
+>>> submodule
+<Module: example.py@1-1>
+
+Any subclasses of :class:`Scope`, including :class:`Module` has an attribute
+:attr:`imports <Scope.imports>`:
+
+>>> submodule.imports
+[<ImportName: import os@1,0>]
+
+See also :attr:`Scope.subscopes` and :attr:`Scope.statements`.
+
+For static analysis purposes there exists a method called
+``nodes_to_execute`` on all nodes and leaves. It's documented in the static
+anaylsis documentation.
+"""
+import os
+import re
+from inspect import cleandoc
+from itertools import chain
+import textwrap
+import abc
+
+from jedi._compatibility import (Python3Method, encoding, is_py3, utf8_repr,
+                                 literal_eval, use_metaclass, unicode)
+from jedi.parser import token
+from jedi.parser.utils import underscore_memoization
+
+
+def is_node(node, *symbol_names):
+    try:
+        type = node.type
+    except AttributeError:
+        return False
+    else:
+        return type in symbol_names
+
+
+class PositionModifier(object):
+    """A start_pos modifier for the fast parser."""
+    def __init__(self):
+        self.line = 0
+
+
+zero_position_modifier = PositionModifier()
+
+
+class DocstringMixin(object):
+    __slots__ = ()
+
+    @property
+    def raw_doc(self):
+        """ Returns a cleaned version of the docstring token. """
+        if isinstance(self, Module):
+            node = self.children[0]
+        elif isinstance(self, ClassOrFunc):
+            node = self.children[self.children.index(':') + 1]
+            if is_node(node, 'suite'):  # Normally a suite
+                node = node.children[2]  # -> NEWLINE INDENT stmt
+        else:  # ExprStmt
+            simple_stmt = self.parent
+            c = simple_stmt.parent.children
+            index = c.index(simple_stmt)
+            if not index:
+                return ''
+            node = c[index - 1]
+
+        if is_node(node, 'simple_stmt'):
+            node = node.children[0]
+
+        if node.type == 'string':
+            # TODO We have to check next leaves until there are no new
+            # leaves anymore that might be part of the docstring. A
+            # docstring can also look like this: ``'foo' 'bar'
+            # Returns a literal cleaned version of the ``Token``.
+            cleaned = cleandoc(literal_eval(node.value))
+            # Since we want the docstr output to be always unicode, just
+            # force it.
+            if is_py3 or isinstance(cleaned, unicode):
+                return cleaned
+            else:
+                return unicode(cleaned, 'UTF-8', 'replace')
+        return ''
+
+
+class Base(object):
+    """
+    This is just here to have an isinstance check, which is also used on
+    evaluate classes. But since they have sometimes a special type of
+    delegation, it is important for those classes to override this method.
+
+    I know that there is a chance to do such things with __instancecheck__, but
+    since Python 2.5 doesn't support it, I decided to do it this way.
+    """
+    __slots__ = ()
+
+    def isinstance(self, *cls):
+        return isinstance(self, cls)
+
+    @Python3Method
+    def get_parent_until(self, classes=(), reverse=False,
+                         include_current=True):
+        """
+        Searches the parent "chain" until the object is an instance of
+        classes. If classes is empty return the last parent in the chain
+        (is without a parent).
+        """
+        if type(classes) not in (tuple, list):
+            classes = (classes,)
+        scope = self if include_current else self.parent
+        while scope.parent is not None:
+            # TODO why if classes?
+            if classes and reverse != scope.isinstance(*classes):
+                break
+            scope = scope.parent
+        return scope
+
+    def get_parent_scope(self, include_flows=False):
+        """
+        Returns the underlying scope.
+        """
+        scope = self.parent
+        while scope is not None:
+            if include_flows and isinstance(scope, Flow):
+                return scope
+            if scope.is_scope():
+                break
+            scope = scope.parent
+        return scope
+
+    def get_definition(self):
+        if self.type in ('newline', 'dedent', 'indent', 'endmarker'):
+            raise ValueError('Cannot get the indentation of whitespace or indentation.')
+        scope = self
+        while scope.parent is not None:
+            parent = scope.parent
+            if scope.isinstance(Node, Leaf) and parent.type != 'simple_stmt':
+                if scope.type == 'testlist_comp':
+                    try:
+                        if isinstance(scope.children[1], CompFor):
+                            return scope.children[1]
+                    except IndexError:
+                        pass
+                scope = parent
+            else:
+                break
+        return scope
+
+    def assignment_indexes(self):
+        """
+        Returns an array of tuple(int, node) of the indexes that are used in
+        tuple assignments.
+
+        For example if the name is ``y`` in the following code::
+
+            x, (y, z) = 2, ''
+
+        would result in ``[(1, xyz_node), (0, yz_node)]``.
+        """
+        indexes = []
+        node = self.parent
+        compare = self
+        while node is not None:
+            if is_node(node, 'testlist_comp', 'testlist_star_expr', 'exprlist'):
+                for i, child in enumerate(node.children):
+                    if child == compare:
+                        indexes.insert(0, (int(i / 2), node))
+                        break
+                else:
+                    raise LookupError("Couldn't find the assignment.")
+            elif isinstance(node, (ExprStmt, CompFor)):
+                break
+
+            compare = node
+            node = node.parent
+        return indexes
+
+    def is_scope(self):
+        # Default is not being a scope. Just inherit from Scope.
+        return False
+
+    @abc.abstractmethod
+    def nodes_to_execute(self, last_added=False):
+        raise NotImplementedError()
+
+    def get_next_sibling(self):
+        """
+        The node immediately following the invocant in their parent's children
+        list. If the invocant does not have a next sibling, it is None
+        """
+        # Can't use index(); we need to test by identity
+        for i, child in enumerate(self.parent.children):
+            if child is self:
+                try:
+                    return self.parent.children[i + 1]
+                except IndexError:
+                    return None
+
+    def get_previous_sibling(self):
+        """
+        The node/leaf immediately preceding the invocant in their parent's
+        children list. If the invocant does not have a previous sibling, it is
+        None.
+        """
+        # Can't use index(); we need to test by identity
+        for i, child in enumerate(self.parent.children):
+            if child is self:
+                if i == 0:
+                    return None
+                return self.parent.children[i - 1]
+
+    def get_previous_leaf(self):
+        """
+        Returns the previous leaf in the parser tree.
+        Raises an IndexError if it's the first element.
+        """
+        node = self
+        while True:
+            c = node.parent.children
+            i = c.index(node)
+            if i == 0:
+                node = node.parent
+                if node.parent is None:
+                    raise IndexError('Cannot access the previous element of the first one.')
+            else:
+                node = c[i - 1]
+                break
+
+        while True:
+            try:
+                node = node.children[-1]
+            except AttributeError:  # A Leaf doesn't have children.
+                return node
+
+    def get_next_leaf(self):
+        """
+        Returns the previous leaf in the parser tree.
+        Raises an IndexError if it's the last element.
+        """
+        node = self
+        while True:
+            c = node.parent.children
+            i = c.index(node)
+            if i == len(c) - 1:
+                node = node.parent
+                if node.parent is None:
+                    raise IndexError('Cannot access the next element of the last one.')
+            else:
+                node = c[i + 1]
+                break
+
+        while True:
+            try:
+                node = node.children[0]
+            except AttributeError:  # A Leaf doesn't have children.
+                return node
+
+
+class Leaf(Base):
+    __slots__ = ('position_modifier', 'value', 'parent', '_start_pos', 'prefix')
+
+    def __init__(self, position_modifier, value, start_pos, prefix=''):
+        self.position_modifier = position_modifier
+        self.value = value
+        self._start_pos = start_pos
+        self.prefix = prefix
+        self.parent = None
+
+    @property
+    def start_pos(self):
+        return self._start_pos[0] + self.position_modifier.line, self._start_pos[1]
+
+    @start_pos.setter
+    def start_pos(self, value):
+        self._start_pos = value[0] - self.position_modifier.line, value[1]
+
+    def get_start_pos_of_prefix(self):
+        try:
+            previous_leaf = self
+            while True:
+                previous_leaf = previous_leaf.get_previous_leaf()
+                if previous_leaf.type not in ('indent', 'dedent'):
+                    return previous_leaf.end_pos
+        except IndexError:
+            return 1, 0  # It's the first leaf.
+
+    @property
+    def end_pos(self):
+        return (self._start_pos[0] + self.position_modifier.line,
+                self._start_pos[1] + len(self.value))
+
+    def move(self, line_offset, column_offset):
+        self._start_pos = (self._start_pos[0] + line_offset,
+                           self._start_pos[1] + column_offset)
+
+    def first_leaf(self):
+        return self
+
+    def get_code(self, normalized=False, include_prefix=True):
+        if normalized:
+            return self.value
+        if include_prefix:
+            return self.prefix + self.value
+        else:
+            return self.value
+
+    def nodes_to_execute(self, last_added=False):
+        return []
+
+    @utf8_repr
+    def __repr__(self):
+        return "<%s: %s>" % (type(self).__name__, self.value)
+
+
+class LeafWithNewLines(Leaf):
+    __slots__ = ()
+
+    @property
+    def end_pos(self):
+        """
+        Literals and whitespace end_pos are more complicated than normal
+        end_pos, because the containing newlines may change the indexes.
+        """
+        end_pos_line, end_pos_col = self.start_pos
+        lines = self.value.split('\n')
+        end_pos_line += len(lines) - 1
+        # Check for multiline token
+        if self.start_pos[0] == end_pos_line:
+            end_pos_col += len(lines[-1])
+        else:
+            end_pos_col = len(lines[-1])
+        return end_pos_line, end_pos_col
+
+    @utf8_repr
+    def __repr__(self):
+        return "<%s: %r>" % (type(self).__name__, self.value)
+
+
+class EndMarker(Leaf):
+    __slots__ = ()
+    type = 'endmarker'
+
+
+class Newline(LeafWithNewLines):
+    """Contains NEWLINE and ENDMARKER tokens."""
+    __slots__ = ()
+    type = 'newline'
+
+    @utf8_repr
+    def __repr__(self):
+        return "<%s: %s>" % (type(self).__name__, repr(self.value))
+
+
+class Name(Leaf):
+    """
+    A string. Sometimes it is important to know if the string belongs to a name
+    or not.
+    """
+    type = 'name'
+    __slots__ = ()
+
+    def __str__(self):
+        return self.value
+
+    def __unicode__(self):
+        return self.value
+
+    def __repr__(self):
+        return "<%s: %s@%s,%s>" % (type(self).__name__, self.value,
+                                   self.start_pos[0], self.start_pos[1])
+
+    def is_definition(self):
+        if self.parent.type in ('power', 'atom_expr'):
+            # In `self.x = 3` self is not a definition, but x is.
+            return False
+
+        stmt = self.get_definition()
+        if stmt.type in ('funcdef', 'classdef', 'file_input', 'param'):
+            return self == stmt.name
+        elif stmt.type == 'for_stmt':
+            return self.start_pos < stmt.children[2].start_pos
+        elif stmt.type == 'try_stmt':
+            return self.get_previous_sibling() == 'as'
+        else:
+            return stmt.type in ('expr_stmt', 'import_name', 'import_from',
+                                 'comp_for', 'with_stmt') \
+                and self in stmt.get_defined_names()
+
+    def nodes_to_execute(self, last_added=False):
+        if last_added is False:
+            yield self
+
+
+class Literal(LeafWithNewLines):
+    __slots__ = ()
+
+    def eval(self):
+        return literal_eval(self.value)
+
+
+class Number(Literal):
+    type = 'number'
+    __slots__ = ()
+
+
+class String(Literal):
+    type = 'string'
+    __slots__ = ()
+
+
+class Indent(Leaf):
+    type = 'indent'
+    __slots__ = ()
+
+
+class Dedent(Leaf):
+    type = 'dedent'
+    __slots__ = ()
+
+
+class Operator(Leaf):
+    type = 'operator'
+    __slots__ = ()
+
+    def __str__(self):
+        return self.value
+
+    def __eq__(self, other):
+        """
+        Make comparisons with strings easy.
+        Improves the readability of the parser.
+        """
+        if isinstance(other, Operator):
+            return self is other
+        else:
+            return self.value == other
+
+    def __ne__(self, other):
+        """Python 2 compatibility."""
+        return self.value != other
+
+    def __hash__(self):
+        return hash(self.value)
+
+
+class Keyword(Leaf):
+    type = 'keyword'
+    __slots__ = ()
+
+    def __eq__(self, other):
+        """
+        Make comparisons with strings easy.
+        Improves the readability of the parser.
+        """
+        if isinstance(other, Keyword):
+            return self is other
+        return self.value == other
+
+    def __ne__(self, other):
+        """Python 2 compatibility."""
+        return not self.__eq__(other)
+
+    def __hash__(self):
+        return hash(self.value)
+
+
+class BaseNode(Base):
+    """
+    The super class for Scope, Import, Name and Statement. Every object in
+    the parser tree inherits from this class.
+    """
+    __slots__ = ('children', 'parent')
+    type = None
+
+    def __init__(self, children):
+        """
+        Initialize :class:`BaseNode`.
+
+        :param children: The module in which this Python object locates.
+        """
+        for c in children:
+            c.parent = self
+        self.children = children
+        self.parent = None
+
+    def move(self, line_offset, column_offset):
+        """
+        Move the Node's start_pos.
+        """
+        for c in self.children:
+            c.move(line_offset, column_offset)
+
+    @property
+    def start_pos(self):
+        return self.children[0].start_pos
+
+    def get_start_pos_of_prefix(self):
+        return self.children[0].get_start_pos_of_prefix()
+
+    @property
+    def end_pos(self):
+        return self.children[-1].end_pos
+
+    def get_code(self, normalized=False, include_prefix=True):
+        # TODO implement normalized (depending on context).
+        if include_prefix:
+            return "".join(c.get_code(normalized) for c in self.children)
+        else:
+            first = self.children[0].get_code(include_prefix=False)
+            return first + "".join(c.get_code(normalized) for c in self.children[1:])
+
+    @Python3Method
+    def name_for_position(self, position):
+        for c in self.children:
+            if isinstance(c, Leaf):
+                if isinstance(c, Name) and c.start_pos <= position <= c.end_pos:
+                    return c
+            else:
+                result = c.name_for_position(position)
+                if result is not None:
+                    return result
+        return None
+
+    def get_leaf_for_position(self, position, include_prefixes=False):
+        for c in self.children:
+            if include_prefixes:
+                start_pos = c.get_start_pos_of_prefix()
+            else:
+                start_pos = c.start_pos
+
+            if start_pos <= position <= c.end_pos:
+                try:
+                    return c.get_leaf_for_position(position, include_prefixes)
+                except AttributeError:
+                    while c.type in ('indent', 'dedent'):
+                        # We'd rather not have indents and dedents as a leaf,
+                        # because they don't contain indentation information.
+                        c = c.get_next_leaf()
+                    return c
+
+        return None
+
+    @Python3Method
+    def get_statement_for_position(self, pos):
+        for c in self.children:
+            if c.start_pos <= pos <= c.end_pos:
+                if c.type not in ('decorated', 'simple_stmt', 'suite') \
+                        and not isinstance(c, (Flow, ClassOrFunc)):
+                    return c
+                else:
+                    try:
+                        return c.get_statement_for_position(pos)
+                    except AttributeError:
+                        pass  # Must be a non-scope
+        return None
+
+    def first_leaf(self):
+        try:
+            return self.children[0].first_leaf()
+        except AttributeError:
+            return self.children[0]
+
+    def get_next_leaf(self):
+        """
+        Raises an IndexError if it's the last node. (Would be the module)
+        """
+        c = self.parent.children
+        index = c.index(self)
+        if index == len(c) - 1:
+            # TODO WTF? recursion?
+            return self.get_next_leaf()
+        else:
+            return c[index + 1]
+
+    def last_leaf(self):
+        try:
+            return self.children[-1].last_leaf()
+        except AttributeError:
+            return self.children[-1]
+
+    def get_following_comment_same_line(self):
+        """
+        returns (as string) any comment that appears on the same line,
+        after the node, including the #
+        """
+        try:
+            if self.isinstance(ForStmt):
+                whitespace = self.children[5].first_leaf().prefix
+            elif self.isinstance(WithStmt):
+                whitespace = self.children[3].first_leaf().prefix
+            else:
+                whitespace = self.last_leaf().get_next_leaf().prefix
+        except AttributeError:
+            return None
+        except ValueError:
+            # TODO in some particular cases, the tree doesn't seem to be linked
+            # correctly
+            return None
+        if "#" not in whitespace:
+            return None
+        comment = whitespace[whitespace.index("#"):]
+        if "\r" in comment:
+            comment = comment[:comment.index("\r")]
+        if "\n" in comment:
+            comment = comment[:comment.index("\n")]
+        return comment
+
+    @utf8_repr
+    def __repr__(self):
+        code = self.get_code().replace('\n', ' ').strip()
+        if not is_py3:
+            code = code.encode(encoding, 'replace')
+        return "<%s: %s@%s,%s>" % \
+            (type(self).__name__, code, self.start_pos[0], self.start_pos[1])
+
+
+class Node(BaseNode):
+    """Concrete implementation for interior nodes."""
+    __slots__ = ('type',)
+
+    _IGNORE_EXECUTE_NODES = set([
+        'suite', 'subscriptlist', 'subscript', 'simple_stmt', 'sliceop',
+        'testlist_comp', 'dictorsetmaker', 'trailer', 'decorators',
+        'decorated', 'arglist', 'argument', 'exprlist', 'testlist',
+        'testlist_safe', 'testlist1'
+    ])
+
+    def __init__(self, type, children):
+        """
+        Initializer.
+
+        Takes a type constant (a symbol number >= 256), a sequence of
+        child nodes, and an optional context keyword argument.
+
+        As a side effect, the parent pointers of the children are updated.
+        """
+        super(Node, self).__init__(children)
+        self.type = type
+
+    def nodes_to_execute(self, last_added=False):
+        """
+        For static analysis.
+        """
+        result = []
+        if self.type not in Node._IGNORE_EXECUTE_NODES and not last_added:
+            result.append(self)
+            last_added = True
+
+        for child in self.children:
+            result += child.nodes_to_execute(last_added)
+        return result
+
+    def __repr__(self):
+        return "%s(%s, %r)" % (self.__class__.__name__, self.type, self.children)
+
+
+class ErrorNode(BaseNode):
+    """
+    TODO doc
+    """
+    __slots__ = ()
+    type = 'error_node'
+
+    def nodes_to_execute(self, last_added=False):
+        return []
+
+
+class ErrorLeaf(LeafWithNewLines):
+    """
+    TODO doc
+    """
+    __slots__ = ('original_type')
+    type = 'error_leaf'
+
+    def __init__(self, position_modifier, original_type, value, start_pos, prefix=''):
+        super(ErrorLeaf, self).__init__(position_modifier, value, start_pos, prefix)
+        self.original_type = original_type
+
+    def __repr__(self):
+        token_type = token.tok_name[self.original_type]
+        return "<%s: %s, %s)>" % (type(self).__name__, token_type, self.start_pos)
+
+
+class IsScopeMeta(type):
+    def __instancecheck__(self, other):
+        return other.is_scope()
+
+
+class IsScope(use_metaclass(IsScopeMeta)):
+    pass
+
+
+class Scope(BaseNode, DocstringMixin):
+    """
+    Super class for the parser tree, which represents the state of a python
+    text file.
+    A Scope manages and owns its subscopes, which are classes and functions, as
+    well as variables and imports. It is used to access the structure of python
+    files.
+
+    :param start_pos: The position (line and column) of the scope.
+    :type start_pos: tuple(int, int)
+    """
+    __slots__ = ('names_dict',)
+
+    def __init__(self, children):
+        super(Scope, self).__init__(children)
+
+    @property
+    def returns(self):
+        # Needed here for fast_parser, because the fast_parser splits and
+        # returns will be in "normal" modules.
+        return self._search_in_scope(ReturnStmt)
+
+    @property
+    def subscopes(self):
+        return self._search_in_scope(Scope)
+
+    @property
+    def flows(self):
+        return self._search_in_scope(Flow)
+
+    @property
+    def imports(self):
+        return self._search_in_scope(Import)
+
+    @Python3Method
+    def _search_in_scope(self, typ):
+        def scan(children):
+            elements = []
+            for element in children:
+                if isinstance(element, typ):
+                    elements.append(element)
+                if is_node(element, 'suite', 'simple_stmt', 'decorated') \
+                        or isinstance(element, Flow):
+                    elements += scan(element.children)
+            return elements
+
+        return scan(self.children)
+
+    @property
+    def statements(self):
+        return self._search_in_scope((ExprStmt, KeywordStatement))
+
+    def is_scope(self):
+        return True
+
+    def __repr__(self):
+        try:
+            name = self.path
+        except AttributeError:
+            try:
+                name = self.name
+            except AttributeError:
+                name = self.command
+
+        return "<%s: %s@%s-%s>" % (type(self).__name__, name,
+                                   self.start_pos[0], self.end_pos[0])
+
+    def walk(self):
+        yield self
+        for s in self.subscopes:
+            for scope in s.walk():
+                yield scope
+
+        for r in self.statements:
+            while isinstance(r, Flow):
+                for scope in r.walk():
+                    yield scope
+                r = r.next
+
+
+class Module(Scope):
+    """
+    The top scope, which is always a module.
+    Depending on the underlying parser this may be a full module or just a part
+    of a module.
+    """
+    __slots__ = ('path', 'global_names', 'used_names', '_name')
+    type = 'file_input'
+
+    def __init__(self, children):
+        """
+        Initialize :class:`Module`.
+
+        :type path: str
+        :arg  path: File path to this module.
+
+        .. todo:: Document `top_module`.
+        """
+        super(Module, self).__init__(children)
+        self.path = None  # Set later.
+
+    @property
+    @underscore_memoization
+    def name(self):
+        """ This is used for the goto functions. """
+        if self.path is None:
+            string = ''  # no path -> empty name
+        else:
+            sep = (re.escape(os.path.sep),) * 2
+            r = re.search(r'([^%s]*?)(%s__init__)?(\.py|\.so)?$' % sep, self.path)
+            # Remove PEP 3149 names
+            string = re.sub('\.[a-z]+-\d{2}[mud]{0,3}$', '', r.group(1))
+        # Positions are not real, but a module starts at (1, 0)
+        p = (1, 0)
+        name = Name(zero_position_modifier, string, p)
+        name.parent = self
+        return name
+
+    @property
+    def has_explicit_absolute_import(self):
+        """
+        Checks if imports in this module are explicitly absolute, i.e. there
+        is a ``__future__`` import.
+        """
+        # TODO this is a strange scan and not fully correct. I think Python's
+        # parser does it in a different way and scans for the first
+        # statement/import with a tokenizer (to check for syntax changes like
+        # the future print statement).
+        for imp in self.imports:
+            if imp.type == 'import_from' and imp.level == 0:
+                for path in imp.paths():
+                    if [str(name) for name in path] == ['__future__', 'absolute_import']:
+                        return True
+        return False
+
+    def nodes_to_execute(self, last_added=False):
+        # Yield itself, class needs to be executed for decorator checks.
+        result = []
+        for child in self.children:
+            result += child.nodes_to_execute()
+        return result
+
+
+class Decorator(BaseNode):
+    type = 'decorator'
+    __slots__ = ()
+
+    def nodes_to_execute(self, last_added=False):
+        if self.children[-2] == ')':
+            node = self.children[-3]
+            if node != '(':
+                return node.nodes_to_execute()
+        return []
+
+
+class ClassOrFunc(Scope):
+    __slots__ = ()
+
+    @property
+    def name(self):
+        return self.children[1]
+
+    def get_decorators(self):
+        decorated = self.parent
+        if is_node(decorated, 'decorated'):
+            if is_node(decorated.children[0], 'decorators'):
+                return decorated.children[0].children
+            else:
+                return decorated.children[:1]
+        else:
+            return []
+
+
+class Class(ClassOrFunc):
+    """
+    Used to store the parsed contents of a python class.
+
+    :param name: The Class name.
+    :type name: str
+    :param supers: The super classes of a Class.
+    :type supers: list
+    :param start_pos: The start position (line, column) of the class.
+    :type start_pos: tuple(int, int)
+    """
+    type = 'classdef'
+    __slots__ = ()
+
+    def __init__(self, children):
+        super(Class, self).__init__(children)
+
+    def get_super_arglist(self):
+        if self.children[2] != '(':  # Has no parentheses
+            return None
+        else:
+            if self.children[3] == ')':  # Empty parentheses
+                return None
+            else:
+                return self.children[3]
+
+    @property
+    def doc(self):
+        """
+        Return a document string including call signature of __init__.
+        """
+        docstr = self.raw_doc
+        for sub in self.subscopes:
+            if str(sub.name) == '__init__':
+                return '%s\n\n%s' % (
+                    sub.get_call_signature(func_name=self.name), docstr)
+        return docstr
+
+    def nodes_to_execute(self, last_added=False):
+        # Yield itself, class needs to be executed for decorator checks.
+        yield self
+        # Super arguments.
+        arglist = self.get_super_arglist()
+        try:
+            children = arglist.children
+        except AttributeError:
+            if arglist is not None:
+                for node_to_execute in arglist.nodes_to_execute():
+                    yield node_to_execute
+        else:
+            for argument in children:
+                if argument.type == 'argument':
+                    # metaclass= or list comprehension or */**
+                    raise NotImplementedError('Metaclasses not implemented')
+                else:
+                    for node_to_execute in argument.nodes_to_execute():
+                        yield node_to_execute
+
+        # care for the class suite:
+        for node in self.children[self.children.index(':'):]:
+            # This could be easier without the fast parser. But we need to find
+            # the position of the colon, because everything after it can be a
+            # part of the class, not just its suite.
+            for node_to_execute in node.nodes_to_execute():
+                yield node_to_execute
+
+
+def _create_params(parent, argslist_list):
+    """
+    `argslist_list` is a list that can contain an argslist as a first item, but
+    most not. It's basically the items between the parameter brackets (which is
+    at most one item).
+    This function modifies the parser structure. It generates `Param` objects
+    from the normal ast. Those param objects do not exist in a normal ast, but
+    make the evaluation of the ast tree so much easier.
+    You could also say that this function replaces the argslist node with a
+    list of Param objects.
+    """
+    def check_python2_nested_param(node):
+        """
+        Python 2 allows params to look like ``def x(a, (b, c))``, which is
+        basically a way of unpacking tuples in params. Python 3 has ditched
+        this behavior. Jedi currently just ignores those constructs.
+        """
+        return node.type == 'tfpdef' and node.children[0] == '('
+
+    try:
+        first = argslist_list[0]
+    except IndexError:
+        return []
+
+    if first.type in ('name', 'tfpdef'):
+        if check_python2_nested_param(first):
+            return [first]
+        else:
+            return [Param([first], parent)]
+    elif first == '*':
+        return [first]
+    else:  # argslist is a `typedargslist` or a `varargslist`.
+        children = first.children
+        new_children = []
+        start = 0
+        # Start with offset 1, because the end is higher.
+        for end, child in enumerate(children + [None], 1):
+            if child is None or child == ',':
+                param_children = children[start:end]
+                if param_children:  # Could as well be comma and then end.
+                    if check_python2_nested_param(param_children[0]):
+                        new_children += param_children
+                    elif param_children[0] == '*' and param_children[1] == ',':
+                        new_children += param_children
+                    else:
+                        new_children.append(Param(param_children, parent))
+                    start = end
+        return new_children
+
+
+class Function(ClassOrFunc):
+    """
+    Used to store the parsed contents of a python function.
+
+    Children:
+      0) <Keyword: def>
+      1) <Name>
+      2) parameter list (including open-paren and close-paren <Operator>s)
+      3) <Operator: :>
+      4) Node() representing function body
+      5) ??
+      6) annotation (if present)
+    """
+    __slots__ = ('listeners',)
+    type = 'funcdef'
+
+    def __init__(self, children):
+        super(Function, self).__init__(children)
+        self.listeners = set()  # not used here, but in evaluation.
+        parameters = self.children[2]  # After `def foo`
+        parameters.children[1:-1] = _create_params(parameters, parameters.children[1:-1])
+
+    @property
+    def params(self):
+        return [p for p in self.children[2].children if p.type == 'param']
+
+    @property
+    def name(self):
+        return self.children[1]  # First token after `def`
+
+    @property
+    def yields(self):
+        # TODO This is incorrect, yields are also possible in a statement.
+        return self._search_in_scope(YieldExpr)
+
+    def is_generator(self):
+        return bool(self.yields)
+
+    def annotation(self):
+        try:
+            if self.children[3] == "->":
+                return self.children[4]
+            assert self.children[3] == ":"
+            return None
+        except IndexError:
+            return None
+
+    def get_call_signature(self, width=72, func_name=None):
+        """
+        Generate call signature of this function.
+
+        :param width: Fold lines if a line is longer than this value.
+        :type width: int
+        :arg func_name: Override function name when given.
+        :type func_name: str
+
+        :rtype: str
+        """
+        func_name = func_name or self.name
+        code = unicode(func_name) + self._get_paramlist_code()
+        return '\n'.join(textwrap.wrap(code, width))
+
+    def _get_paramlist_code(self):
+        return self.children[2].get_code()
+
+    @property
+    def doc(self):
+        """ Return a document string including call signature. """
+        docstr = self.raw_doc
+        return '%s\n\n%s' % (self.get_call_signature(), docstr)
+
+    def nodes_to_execute(self, last_added=False):
+        # Yield itself, functions needs to be executed for decorator checks.
+        yield self
+        for param in self.params:
+            if param.default is not None:
+                yield param.default
+        # care for the function suite:
+        for node in self.children[4:]:
+            # This could be easier without the fast parser. The fast parser
+            # allows that the 4th position is empty or that there's even a
+            # fifth element (another function/class). So just scan everything
+            # after colon.
+            for node_to_execute in node.nodes_to_execute():
+                yield node_to_execute
+
+
+class Lambda(Function):
+    """
+    Lambdas are basically trimmed functions, so give it the same interface.
+
+    Children:
+       0) <Keyword: lambda>
+       *) <Param x> for each argument x
+      -2) <Operator: :>
+      -1) Node() representing body
+    """
+    type = 'lambda'
+    __slots__ = ()
+
+    def __init__(self, children):
+        # We don't want to call the Function constructor, call its parent.
+        super(Function, self).__init__(children)
+        self.listeners = set()  # not used here, but in evaluation.
+        lst = self.children[1:-2]  # Everything between `lambda` and the `:` operator is a parameter.
+        self.children[1:-2] = _create_params(self, lst)
+
+    @property
+    def name(self):
+        # Borrow the position of the <Keyword: lambda> AST node.
+        return Name(self.children[0].position_modifier, '<lambda>', self.children[0].start_pos)
+
+    def _get_paramlist_code(self):
+        return '(' + ''.join(param.get_code() for param in self.params).strip() + ')'
+
+    @property
+    def params(self):
+        return self.children[1:-2]
+
+    def is_generator(self):
+        return False
+
+    def annotation(self):
+        # lambda functions do not support annotations
+        return None
+
+    @property
+    def yields(self):
+        return []
+
+    def nodes_to_execute(self, last_added=False):
+        for param in self.params:
+            if param.default is not None:
+                yield param.default
+        # Care for the lambda test (last child):
+        for node_to_execute in self.children[-1].nodes_to_execute():
+            yield node_to_execute
+
+    def __repr__(self):
+        return "<%s@%s>" % (self.__class__.__name__, self.start_pos)
+
+
+class Flow(BaseNode):
+    __slots__ = ()
+
+    def nodes_to_execute(self, last_added=False):
+        for child in self.children:
+            for node_to_execute in child.nodes_to_execute():
+                yield node_to_execute
+
+
+class IfStmt(Flow):
+    type = 'if_stmt'
+    __slots__ = ()
+
+    def check_nodes(self):
+        """
+        Returns all the `test` nodes that are defined as x, here:
+
+            if x:
+                pass
+            elif x:
+                pass
+        """
+        for i, c in enumerate(self.children):
+            if c in ('elif', 'if'):
+                yield self.children[i + 1]
+
+    def node_in_which_check_node(self, node):
+        """
+        Returns the check node (see function above) that a node is contained
+        in. However if it the node is in the check node itself and not in the
+        suite return None.
+        """
+        start_pos = node.start_pos
+        for check_node in reversed(list(self.check_nodes())):
+            if check_node.start_pos < start_pos:
+                if start_pos < check_node.end_pos:
+                    return None
+                    # In this case the node is within the check_node itself,
+                    # not in the suite
+                else:
+                    return check_node
+
+    def node_after_else(self, node):
+        """
+        Checks if a node is defined after `else`.
+        """
+        for c in self.children:
+            if c == 'else':
+                if node.start_pos > c.start_pos:
+                    return True
+        else:
+            return False
+
+
+class WhileStmt(Flow):
+    type = 'while_stmt'
+    __slots__ = ()
+
+
+class ForStmt(Flow):
+    type = 'for_stmt'
+    __slots__ = ()
+
+    def get_input_node(self):
+        """
+        Returns the input node ``y`` from: ``for x in y:``.
+        """
+        return self.children[3]
+
+    def defines_one_name(self):
+        """
+        Returns True if only one name is returned: ``for x in y``.
+        Returns False if the for loop is more complicated: ``for x, z in y``.
+
+        :returns: bool
+        """
+        return self.children[1].type == 'name'
+
+
+class TryStmt(Flow):
+    type = 'try_stmt'
+    __slots__ = ()
+
+    def except_clauses(self):
+        """
+        Returns the ``test`` nodes found in ``except_clause`` nodes.
+        Returns ``[None]`` for except clauses without an exception given.
+        """
+        for node in self.children:
+            if node.type == 'except_clause':
+                yield node.children[1]
+            elif node == 'except':
+                yield None
+
+    def nodes_to_execute(self, last_added=False):
+        result = []
+        for child in self.children[2::3]:
+            result += child.nodes_to_execute()
+        for child in self.children[0::3]:
+            if child.type == 'except_clause':
+                # Add the test node and ignore the `as NAME` definition.
+                result += child.children[1].nodes_to_execute()
+        return result
+
+
+class WithStmt(Flow):
+    type = 'with_stmt'
+    __slots__ = ()
+
+    def get_defined_names(self):
+        names = []
+        for with_item in self.children[1:-2:2]:
+            # Check with items for 'as' names.
+            if is_node(with_item, 'with_item'):
+                names += _defined_names(with_item.children[2])
+        return names
+
+    def node_from_name(self, name):
+        node = name
+        while True:
+            node = node.parent
+            if is_node(node, 'with_item'):
+                return node.children[0]
+
+    def nodes_to_execute(self, last_added=False):
+        result = []
+        for child in self.children[1::2]:
+            if child.type == 'with_item':
+                # Just ignore the `as EXPR` part - at least for now, because
+                # most times it's just a name.
+                child = child.children[0]
+            result += child.nodes_to_execute()
+        return result
+
+
+class Import(BaseNode):
+    __slots__ = ()
+
+    def path_for_name(self, name):
+        try:
+            # The name may be an alias. If it is, just map it back to the name.
+            name = self.aliases()[name]
+        except KeyError:
+            pass
+
+        for path in self.paths():
+            if name in path:
+                return path[:path.index(name) + 1]
+        raise ValueError('Name should be defined in the import itself')
+
+    def is_nested(self):
+        return False  # By default, sub classes may overwrite this behavior
+
+    def is_star_import(self):
+        return self.children[-1] == '*'
+
+    def nodes_to_execute(self, last_added=False):
+        """
+        `nodes_to_execute` works a bit different for imports, because the names
+        itself cannot directly get resolved (except on itself).
+        """
+        # TODO couldn't we return the names? Would be nicer.
+        return [self]
+
+
+class ImportFrom(Import):
+    type = 'import_from'
+    __slots__ = ()
+
+    def get_defined_names(self):
+        return [alias or name for name, alias in self._as_name_tuples()]
+
+    def aliases(self):
+        """Mapping from alias to its corresponding name."""
+        return dict((alias, name) for name, alias in self._as_name_tuples()
+                    if alias is not None)
+
+    def get_from_names(self):
+        for n in self.children[1:]:
+            if n not in ('.', '...'):
+                break
+        if is_node(n, 'dotted_name'):  # from x.y import
+            return n.children[::2]
+        elif n == 'import':  # from . import
+            return []
+        else:  # from x import
+            return [n]
+
+    @property
+    def level(self):
+        """The level parameter of ``__import__``."""
+        level = 0
+        for n in self.children[1:]:
+            if n in ('.', '...'):
+                level += len(n.value)
+            else:
+                break
+        return level
+
+    def _as_name_tuples(self):
+        last = self.children[-1]
+        if last == ')':
+            last = self.children[-2]
+        elif last == '*':
+            return  # No names defined directly.
+
+        if is_node(last, 'import_as_names'):
+            as_names = last.children[::2]
+        else:
+            as_names = [last]
+        for as_name in as_names:
+            if as_name.type == 'name':
+                yield as_name, None
+            else:
+                yield as_name.children[::2]  # yields x, y -> ``x as y``
+
+    def star_import_name(self):
+        """
+        The last name defined in a star import.
+        """
+        return self.paths()[-1][-1]
+
+    def paths(self):
+        """
+        The import paths defined in an import statement. Typically an array
+        like this: ``[<Name: datetime>, <Name: date>]``.
+        """
+        dotted = self.get_from_names()
+
+        if self.children[-1] == '*':
+            return [dotted]
+        return [dotted + [name] for name, alias in self._as_name_tuples()]
+
+
+class ImportName(Import):
+    """For ``import_name`` nodes. Covers normal imports without ``from``."""
+    type = 'import_name'
+    __slots__ = ()
+
+    def get_defined_names(self):
+        return [alias or path[0] for path, alias in self._dotted_as_names()]
+
+    @property
+    def level(self):
+        """The level parameter of ``__import__``."""
+        return 0  # Obviously 0 for imports without from.
+
+    def paths(self):
+        return [path for path, alias in self._dotted_as_names()]
+
+    def _dotted_as_names(self):
+        """Generator of (list(path), alias) where alias may be None."""
+        dotted_as_names = self.children[1]
+        if is_node(dotted_as_names, 'dotted_as_names'):
+            as_names = dotted_as_names.children[::2]
+        else:
+            as_names = [dotted_as_names]
+
+        for as_name in as_names:
+            if is_node(as_name, 'dotted_as_name'):
+                alias = as_name.children[2]
+                as_name = as_name.children[0]
+            else:
+                alias = None
+            if as_name.type == 'name':
+                yield [as_name], alias
+            else:
+                # dotted_names
+                yield as_name.children[::2], alias
+
+    def is_nested(self):
+        """
+        This checks for the special case of nested imports, without aliases and
+        from statement::
+
+            import foo.bar
+        """
+        return [1 for path, alias in self._dotted_as_names()
+                if alias is None and len(path) > 1]
+
+    def aliases(self):
+        return dict((alias, path[-1]) for path, alias in self._dotted_as_names()
+                    if alias is not None)
+
+
+class KeywordStatement(BaseNode):
+    """
+    For the following statements: `assert`, `del`, `global`, `nonlocal`,
+    `raise`, `return`, `yield`, `return`, `yield`.
+
+    `pass`, `continue` and `break` are not in there, because they are just
+    simple keywords and the parser reduces it to a keyword.
+    """
+    __slots__ = ()
+
+    @property
+    def type(self):
+        """
+        Keyword statements start with the keyword and end with `_stmt`. You can
+        crosscheck this with the Python grammar.
+        """
+        return '%s_stmt' % self.keyword
+
+    @property
+    def keyword(self):
+        return self.children[0].value
+
+    def nodes_to_execute(self, last_added=False):
+        result = []
+        for child in self.children:
+            result += child.nodes_to_execute()
+        return result
+
+
+class AssertStmt(KeywordStatement):
+    __slots__ = ()
+
+    def assertion(self):
+        return self.children[1]
+
+
+class GlobalStmt(KeywordStatement):
+    __slots__ = ()
+
+    def get_defined_names(self):
+        return []
+
+    def get_global_names(self):
+        return self.children[1::2]
+
+    def nodes_to_execute(self, last_added=False):
+        """
+        The global keyword allows to define any name. Even if it doesn't
+        exist.
+        """
+        return []
+
+
+class ReturnStmt(KeywordStatement):
+    __slots__ = ()
+
+
+class YieldExpr(BaseNode):
+    __slots__ = ()
+
+    @property
+    def type(self):
+        return 'yield_expr'
+
+    def nodes_to_execute(self, last_added=False):
+        if len(self.children) > 1:
+            return self.children[1].nodes_to_execute()
+        else:
+            return []
+
+
+def _defined_names(current):
+    """
+    A helper function to find the defined names in statements, for loops and
+    list comprehensions.
+    """
+    names = []
+    if is_node(current, 'testlist_star_expr', 'testlist_comp', 'exprlist'):
+        for child in current.children[::2]:
+            names += _defined_names(child)
+    elif is_node(current, 'atom', 'star_expr'):
+        names += _defined_names(current.children[1])
+    elif is_node(current, 'power', 'atom_expr'):
+        if current.children[-2] != '**':  # Just if there's no operation
+            trailer = current.children[-1]
+            if trailer.children[0] == '.':
+                names.append(trailer.children[1])
+    else:
+        names.append(current)
+    return names
+
+
+class ExprStmt(BaseNode, DocstringMixin):
+    type = 'expr_stmt'
+    __slots__ = ()
+
+    def get_defined_names(self):
+        return list(chain.from_iterable(_defined_names(self.children[i])
+                                        for i in range(0, len(self.children) - 2, 2)
+                                        if '=' in self.children[i + 1].value))
+
+    def get_rhs(self):
+        """Returns the right-hand-side of the equals."""
+        return self.children[-1]
+
+    def first_operation(self):
+        """
+        Returns `+=`, `=`, etc or None if there is no operation.
+        """
+        try:
+            return self.children[1]
+        except IndexError:
+            return None
+
+    def nodes_to_execute(self, last_added=False):
+        # I think evaluating the statement (and possibly returned arrays),
+        # should be enough for static analysis.
+        result = [self]
+        for child in self.children:
+            result += child.nodes_to_execute(last_added=True)
+        return result
+
+
+class Param(BaseNode):
+    """
+    It's a helper class that makes business logic with params much easier. The
+    Python grammar defines no ``param`` node. It defines it in a different way
+    that is not really suited to working with parameters.
+    """
+    type = 'param'
+
+    def __init__(self, children, parent):
+        super(Param, self).__init__(children)
+        self.parent = parent
+        for child in children:
+            child.parent = self
+
+    @property
+    def stars(self):
+        first = self.children[0]
+        if first in ('*', '**'):
+            return len(first.value)
+        return 0
+
+    @property
+    def default(self):
+        try:
+            return self.children[int(self.children[0] in ('*', '**')) + 2]
+        except IndexError:
+            return None
+
+    def annotation(self):
+        tfpdef = self._tfpdef()
+        if is_node(tfpdef, 'tfpdef'):
+            assert tfpdef.children[1] == ":"
+            assert len(tfpdef.children) == 3
+            annotation = tfpdef.children[2]
+            return annotation
+        else:
+            return None
+
+    def _tfpdef(self):
+        """
+        tfpdef: see grammar.txt.
+        """
+        offset = int(self.children[0] in ('*', '**'))
+        return self.children[offset]
+
+    @property
+    def name(self):
+        if is_node(self._tfpdef(), 'tfpdef'):
+            return self._tfpdef().children[0]
+        else:
+            return self._tfpdef()
+
+    @property
+    def position_nr(self):
+        return self.parent.children.index(self) - 1
+
+    @property
+    def parent_function(self):
+        return self.get_parent_until(IsScope)
+
+    def __repr__(self):
+        default = '' if self.default is None else '=%s' % self.default
+        return '<%s: %s>' % (type(self).__name__, str(self._tfpdef()) + default)
+
+
+class CompFor(BaseNode):
+    type = 'comp_for'
+    __slots__ = ()
+
+    def get_comp_fors(self):
+        yield self
+        last = self.children[-1]
+        while True:
+            if isinstance(last, CompFor):
+                yield last
+            elif not is_node(last, 'comp_if'):
+                break
+            last = last.children[-1]
+
+    def is_scope(self):
+        return True
+
+    @property
+    def names_dict(self):
+        dct = {}
+        for name in self.get_defined_names():
+            arr = dct.setdefault(name.value, [])
+            arr.append(name)
+        return dct
+
+    def names_dicts(self, search_global):
+        yield self.names_dict
+
+    def get_defined_names(self):
+        return _defined_names(self.children[1])
+
+    def nodes_to_execute(self, last_added=False):
+        last = self.children[-1]
+        if last.type == 'comp_if':
+            for node in last.children[-1].nodes_to_execute():
+                yield node
+            last = self.children[-2]
+        elif last.type == 'comp_for':
+            for node in last.nodes_to_execute():
+                yield node
+            last = self.children[-2]
+        for node in last.nodes_to_execute():
+            yield node
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/utils.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/utils.py
new file mode 100644
index 0000000..9098b09
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/parser/utils.py
@@ -0,0 +1,198 @@
+import inspect
+import time
+import os
+import sys
+import json
+import hashlib
+import gc
+import shutil
+import pickle
+
+from jedi import settings
+from jedi import debug
+
+
+def underscore_memoization(func):
+    """
+    Decorator for methods::
+
+        class A(object):
+            def x(self):
+                if self._x:
+                    self._x = 10
+                return self._x
+
+    Becomes::
+
+        class A(object):
+            @underscore_memoization
+            def x(self):
+                return 10
+
+    A now has an attribute ``_x`` written by this decorator.
+    """
+    name = '_' + func.__name__
+
+    def wrapper(self):
+        try:
+            return getattr(self, name)
+        except AttributeError:
+            result = func(self)
+            if inspect.isgenerator(result):
+                result = list(result)
+            setattr(self, name, result)
+            return result
+
+    return wrapper
+
+
+# for fast_parser, should not be deleted
+parser_cache = {}
+
+
+class ParserCacheItem(object):
+    def __init__(self, parser, change_time=None):
+        self.parser = parser
+        if change_time is None:
+            change_time = time.time()
+        self.change_time = change_time
+
+
+def load_parser(path):
+    """
+    Returns the module or None, if it fails.
+    """
+    p_time = os.path.getmtime(path) if path else None
+    try:
+        parser_cache_item = parser_cache[path]
+        if not path or p_time <= parser_cache_item.change_time:
+            return parser_cache_item.parser
+    except KeyError:
+        if settings.use_filesystem_cache:
+            return ParserPickling.load_parser(path, p_time)
+
+
+def save_parser(path, parser, pickling=True):
+    try:
+        p_time = None if path is None else os.path.getmtime(path)
+    except OSError:
+        p_time = None
+        pickling = False
+
+    item = ParserCacheItem(parser, p_time)
+    parser_cache[path] = item
+    if settings.use_filesystem_cache and pickling:
+        ParserPickling.save_parser(path, item)
+
+
+class ParserPickling(object):
+
+    version = 26
+    """
+    Version number (integer) for file system cache.
+
+    Increment this number when there are any incompatible changes in
+    parser representation classes.  For example, the following changes
+    are regarded as incompatible.
+
+    - Class name is changed.
+    - Class is moved to another module.
+    - Defined slot of the class is changed.
+    """
+
+    def __init__(self):
+        self.__index = None
+        self.py_tag = 'cpython-%s%s' % sys.version_info[:2]
+        """
+        Short name for distinguish Python implementations and versions.
+
+        It's like `sys.implementation.cache_tag` but for Python < 3.3
+        we generate something similar.  See:
+        http://docs.python.org/3/library/sys.html#sys.implementation
+
+        .. todo:: Detect interpreter (e.g., PyPy).
+        """
+
+    def load_parser(self, path, original_changed_time):
+        try:
+            pickle_changed_time = self._index[path]
+        except KeyError:
+            return None
+        if original_changed_time is not None \
+                and pickle_changed_time < original_changed_time:
+            # the pickle file is outdated
+            return None
+
+        with open(self._get_hashed_path(path), 'rb') as f:
+            try:
+                gc.disable()
+                parser_cache_item = pickle.load(f)
+            finally:
+                gc.enable()
+
+        debug.dbg('pickle loaded: %s', path)
+        parser_cache[path] = parser_cache_item
+        return parser_cache_item.parser
+
+    def save_parser(self, path, parser_cache_item):
+        self.__index = None
+        try:
+            files = self._index
+        except KeyError:
+            files = {}
+            self._index = files
+
+        with open(self._get_hashed_path(path), 'wb') as f:
+            pickle.dump(parser_cache_item, f, pickle.HIGHEST_PROTOCOL)
+            files[path] = parser_cache_item.change_time
+
+        self._flush_index()
+
+    @property
+    def _index(self):
+        if self.__index is None:
+            try:
+                with open(self._get_path('index.json')) as f:
+                    data = json.load(f)
+            except (IOError, ValueError):
+                self.__index = {}
+            else:
+                # 0 means version is not defined (= always delete cache):
+                if data.get('version', 0) != self.version:
+                    self.clear_cache()
+                else:
+                    self.__index = data['index']
+        return self.__index
+
+    def _remove_old_modules(self):
+        # TODO use
+        change = False
+        if change:
+            self._flush_index(self)
+            self._index  # reload index
+
+    def _flush_index(self):
+        data = {'version': self.version, 'index': self._index}
+        with open(self._get_path('index.json'), 'w') as f:
+            json.dump(data, f)
+        self.__index = None
+
+    def clear_cache(self):
+        shutil.rmtree(self._cache_directory())
+        self.__index = {}
+
+    def _get_hashed_path(self, path):
+        return self._get_path('%s.pkl' % hashlib.md5(path.encode("utf-8")).hexdigest())
+
+    def _get_path(self, file):
+        dir = self._cache_directory()
+        if not os.path.exists(dir):
+            os.makedirs(dir)
+        return os.path.join(dir, file)
+
+    def _cache_directory(self):
+        return os.path.join(settings.cache_directory, self.py_tag)
+
+
+# is a singleton
+ParserPickling = ParserPickling()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/refactoring.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/refactoring.py
new file mode 100644
index 0000000..a342f08
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/refactoring.py
@@ -0,0 +1,202 @@
+"""
+Introduce some basic refactoring functions to |jedi|. This module is still in a
+very early development stage and needs much testing and improvement.
+
+.. warning:: I won't do too much here, but if anyone wants to step in, please
+             do. Refactoring is none of my priorities
+
+It uses the |jedi| `API <plugin-api.html>`_ and supports currently the
+following functions (sometimes bug-prone):
+
+- rename
+- extract variable
+- inline variable
+"""
+import difflib
+
+from jedi import common
+from jedi.evaluate import helpers
+from jedi.parser import tree as pt
+
+
+class Refactoring(object):
+    def __init__(self, change_dct):
+        """
+        :param change_dct: dict(old_path=(new_path, old_lines, new_lines))
+        """
+        self.change_dct = change_dct
+
+    def old_files(self):
+        dct = {}
+        for old_path, (new_path, old_l, new_l) in self.change_dct.items():
+            dct[new_path] = '\n'.join(new_l)
+        return dct
+
+    def new_files(self):
+        dct = {}
+        for old_path, (new_path, old_l, new_l) in self.change_dct.items():
+            dct[new_path] = '\n'.join(new_l)
+        return dct
+
+    def diff(self):
+        texts = []
+        for old_path, (new_path, old_l, new_l) in self.change_dct.items():
+            if old_path:
+                udiff = difflib.unified_diff(old_l, new_l)
+            else:
+                udiff = difflib.unified_diff(old_l, new_l, old_path, new_path)
+            texts.append('\n'.join(udiff))
+        return '\n'.join(texts)
+
+
+def rename(script, new_name):
+    """ The `args` / `kwargs` params are the same as in `api.Script`.
+    :param operation: The refactoring operation to execute.
+    :type operation: str
+    :type source: str
+    :return: list of changed lines/changed files
+    """
+    return Refactoring(_rename(script.usages(), new_name))
+
+
+def _rename(names, replace_str):
+    """ For both rename and inline. """
+    order = sorted(names, key=lambda x: (x.module_path, x.line, x.column),
+                   reverse=True)
+
+    def process(path, old_lines, new_lines):
+        if new_lines is not None:  # goto next file, save last
+            dct[path] = path, old_lines, new_lines
+
+    dct = {}
+    current_path = object()
+    new_lines = old_lines = None
+    for name in order:
+        if name.in_builtin_module():
+            continue
+        if current_path != name.module_path:
+            current_path = name.module_path
+
+            process(current_path, old_lines, new_lines)
+            if current_path is not None:
+                # None means take the source that is a normal param.
+                with open(current_path) as f:
+                    source = f.read()
+
+            new_lines = common.splitlines(common.source_to_unicode(source))
+            old_lines = new_lines[:]
+
+        nr, indent = name.line, name.column
+        line = new_lines[nr - 1]
+        new_lines[nr - 1] = line[:indent] + replace_str + \
+            line[indent + len(name.name):]
+    process(current_path, old_lines, new_lines)
+    return dct
+
+
+def extract(script, new_name):
+    """ The `args` / `kwargs` params are the same as in `api.Script`.
+    :param operation: The refactoring operation to execute.
+    :type operation: str
+    :type source: str
+    :return: list of changed lines/changed files
+    """
+    new_lines = common.splitlines(common.source_to_unicode(script.source))
+    old_lines = new_lines[:]
+
+    user_stmt = script._parser.user_stmt()
+
+    # TODO care for multiline extracts
+    dct = {}
+    if user_stmt:
+        pos = script._pos
+        line_index = pos[0] - 1
+        arr, index = helpers.array_for_pos(user_stmt, pos)
+        if arr is not None:
+            start_pos = arr[index].start_pos
+            end_pos = arr[index].end_pos
+
+            # take full line if the start line is different from end line
+            e = end_pos[1] if end_pos[0] == start_pos[0] else None
+            start_line = new_lines[start_pos[0] - 1]
+            text = start_line[start_pos[1]:e]
+            for l in range(start_pos[0], end_pos[0] - 1):
+                text += '\n' + l
+            if e is None:
+                end_line = new_lines[end_pos[0] - 1]
+                text += '\n' + end_line[:end_pos[1]]
+
+            # remove code from new lines
+            t = text.lstrip()
+            del_start = start_pos[1] + len(text) - len(t)
+
+            text = t.rstrip()
+            del_end = len(t) - len(text)
+            if e is None:
+                new_lines[end_pos[0] - 1] = end_line[end_pos[1] - del_end:]
+                e = len(start_line)
+            else:
+                e = e - del_end
+            start_line = start_line[:del_start] + new_name + start_line[e:]
+            new_lines[start_pos[0] - 1] = start_line
+            new_lines[start_pos[0]:end_pos[0] - 1] = []
+
+            # add parentheses in multiline case
+            open_brackets = ['(', '[', '{']
+            close_brackets = [')', ']', '}']
+            if '\n' in text and not (text[0] in open_brackets and text[-1] ==
+                                     close_brackets[open_brackets.index(text[0])]):
+                text = '(%s)' % text
+
+            # add new line before statement
+            indent = user_stmt.start_pos[1]
+            new = "%s%s = %s" % (' ' * indent, new_name, text)
+            new_lines.insert(line_index, new)
+    dct[script.path] = script.path, old_lines, new_lines
+    return Refactoring(dct)
+
+
+def inline(script):
+    """
+    :type script: api.Script
+    """
+    new_lines = common.splitlines(common.source_to_unicode(script.source))
+
+    dct = {}
+
+    definitions = script.goto_assignments()
+    with common.ignored(AssertionError):
+        assert len(definitions) == 1
+        stmt = definitions[0]._definition
+        usages = script.usages()
+        inlines = [r for r in usages
+                   if not stmt.start_pos <= (r.line, r.column) <= stmt.end_pos]
+        inlines = sorted(inlines, key=lambda x: (x.module_path, x.line, x.column),
+                         reverse=True)
+        expression_list = stmt.expression_list()
+        # don't allow multiline refactorings for now.
+        assert stmt.start_pos[0] == stmt.end_pos[0]
+        index = stmt.start_pos[0] - 1
+
+        line = new_lines[index]
+        replace_str = line[expression_list[0].start_pos[1]:stmt.end_pos[1] + 1]
+        replace_str = replace_str.strip()
+        # tuples need parentheses
+        if expression_list and isinstance(expression_list[0], pr.Array):
+            arr = expression_list[0]
+            if replace_str[0] not in ['(', '[', '{'] and len(arr) > 1:
+                replace_str = '(%s)' % replace_str
+
+        # if it's the only assignment, remove the statement
+        if len(stmt.get_defined_names()) == 1:
+            line = line[:stmt.start_pos[1]] + line[stmt.end_pos[1]:]
+
+        dct = _rename(inlines, replace_str)
+        # remove the empty line
+        new_lines = dct[script.path][2]
+        if line.strip():
+            new_lines[index] = line
+        else:
+            new_lines.pop(index)
+
+    return Refactoring(dct)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/settings.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/settings.py
new file mode 100644
index 0000000..13dcfd4
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/settings.py
@@ -0,0 +1,233 @@
+"""
+This module contains variables with global |jedi| settings. To change the
+behavior of |jedi|, change the variables defined in :mod:`jedi.settings`.
+
+Plugins should expose an interface so that the user can adjust the
+configuration.
+
+
+Example usage::
+
+    from jedi import settings
+    settings.case_insensitive_completion = True
+
+
+Completion output
+~~~~~~~~~~~~~~~~~
+
+.. autodata:: case_insensitive_completion
+.. autodata:: add_dot_after_module
+.. autodata:: add_bracket_after_function
+.. autodata:: no_completion_duplicates
+
+
+Filesystem cache
+~~~~~~~~~~~~~~~~
+
+.. autodata:: cache_directory
+.. autodata:: use_filesystem_cache
+
+
+Parser
+~~~~~~
+
+.. autodata:: fast_parser
+
+
+Dynamic stuff
+~~~~~~~~~~~~~
+
+.. autodata:: dynamic_array_additions
+.. autodata:: dynamic_params
+.. autodata:: dynamic_params_for_other_modules
+.. autodata:: additional_dynamic_modules
+.. autodata:: auto_import_modules
+
+
+.. _settings-recursion:
+
+Recursions
+~~~~~~~~~~
+
+Recursion settings are important if you don't want extremly
+recursive python code to go absolutely crazy. First of there is a
+global limit :data:`max_executions`. This limit is important, to set
+a maximum amount of time, the completion may use.
+
+The default values are based on experiments while completing the |jedi| library
+itself (inception!). But I don't think there's any other Python library that
+uses recursion in a similarly extreme way. These settings make the completion
+definitely worse in some cases. But a completion should also be fast.
+
+.. autodata:: max_until_execution_unique
+.. autodata:: max_function_recursion_level
+.. autodata:: max_executions_without_builtins
+.. autodata:: max_executions
+.. autodata:: max_dynamic_params_depth
+.. autodata:: scale_call_signatures
+
+
+Caching
+~~~~~~~
+
+.. autodata:: star_import_cache_validity
+.. autodata:: call_signatures_validity
+
+
+"""
+import os
+import platform
+
+# ----------------
+# completion output settings
+# ----------------
+
+case_insensitive_completion = True
+"""
+The completion is by default case insensitive.
+"""
+
+add_bracket_after_function = False
+"""
+Adds an opening bracket after a function, because that's normal behaviour.
+Removed it again, because in VIM that is not very practical.
+"""
+
+no_completion_duplicates = True
+"""
+If set, completions with the same name don't appear in the output anymore,
+but are in the `same_name_completions` attribute.
+"""
+
+# ----------------
+# Filesystem cache
+# ----------------
+
+use_filesystem_cache = True
+"""
+Use filesystem cache to save once parsed files with pickle.
+"""
+
+if platform.system().lower() == 'windows':
+    _cache_directory = os.path.join(os.getenv('APPDATA') or '~', 'Jedi',
+                                    'Jedi')
+elif platform.system().lower() == 'darwin':
+    _cache_directory = os.path.join('~', 'Library', 'Caches', 'Jedi')
+else:
+    _cache_directory = os.path.join(os.getenv('XDG_CACHE_HOME') or '~/.cache',
+                                    'jedi')
+cache_directory = os.path.expanduser(_cache_directory)
+"""
+The path where all the caches can be found.
+
+On Linux, this defaults to ``~/.cache/jedi/``, on OS X to
+``~/Library/Caches/Jedi/`` and on Windows to ``%APPDATA%\\Jedi\\Jedi\\``.
+On Linux, if environment variable ``$XDG_CACHE_HOME`` is set,
+``$XDG_CACHE_HOME/jedi`` is used instead of the default one.
+"""
+
+# ----------------
+# parser
+# ----------------
+
+fast_parser = True
+"""
+Use the fast parser. This means that reparsing is only being done if
+something has been changed e.g. to a function. If this happens, only the
+function is being reparsed.
+"""
+
+# ----------------
+# dynamic stuff
+# ----------------
+
+dynamic_array_additions = True
+"""
+check for `append`, etc. on arrays: [], {}, () as well as list/set calls.
+"""
+
+dynamic_params = True
+"""
+A dynamic param completion, finds the callees of the function, which define
+the params of a function.
+"""
+
+dynamic_params_for_other_modules = True
+"""
+Do the same for other modules.
+"""
+
+additional_dynamic_modules = []
+"""
+Additional modules in which |jedi| checks if statements are to be found. This
+is practical for IDEs, that want to administrate their modules themselves.
+"""
+
+dynamic_flow_information = True
+"""
+Check for `isinstance` and other information to infer a type.
+"""
+
+auto_import_modules = [
+    'hashlib',  # setattr
+]
+"""
+Modules that are not analyzed but imported, although they contain Python code.
+This improves autocompletion for libraries that use ``setattr`` or
+``globals()`` modifications a lot.
+"""
+
+# ----------------
+# recursions
+# ----------------
+
+max_until_execution_unique = 50
+"""
+This limit is probably the most important one, because if this limit is
+exceeded, functions can only be one time executed. So new functions will be
+executed, complex recursions with the same functions again and again, are
+ignored.
+"""
+
+max_function_recursion_level = 5
+"""
+`max_function_recursion_level` is more about whether the recursions are
+stopped in deepth or in width. The ratio beetween this and
+`max_until_execution_unique` is important here. It stops a recursion (after
+the number of function calls in the recursion), if it was already used
+earlier.
+"""
+
+max_executions_without_builtins = 200
+"""
+.. todo:: Document this.
+"""
+
+max_executions = 250
+"""
+A maximum amount of time, the completion may use.
+"""
+
+scale_call_signatures = 0.1
+"""
+Because call_signatures is normally used on every single key hit, it has
+to be faster than a normal completion. This is the factor that is used to
+scale `max_executions` and `max_until_execution_unique`:
+"""
+
+# ----------------
+# caching validity (time)
+# ----------------
+
+star_import_cache_validity = 60.0
+"""
+In huge packages like numpy, checking all star imports on every completion
+might be slow, therefore we do a star import caching, that lasts a certain
+time span (in seconds).
+"""
+
+call_signatures_validity = 3.0
+"""
+Finding function calls might be slow (0.1-0.5s). This is not acceptible for
+normal writing. Therefore cache it for a short time.
+"""
diff --git a/vim-plugins/bundle/jedi-vim/jedi/jedi/utils.py b/vim-plugins/bundle/jedi-vim/jedi/jedi/utils.py
new file mode 100644
index 0000000..44f7c0d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/jedi/utils.py
@@ -0,0 +1,131 @@
+"""
+Utilities for end-users.
+"""
+
+from __future__ import absolute_import
+import __main__
+from collections import namedtuple
+import logging
+import traceback
+import re
+import os
+import sys
+
+from jedi import Interpreter
+from jedi.api.helpers import get_on_completion_name
+from jedi import common
+
+
+READLINE_DEBUG = False
+
+
+def setup_readline(namespace_module=__main__):
+    """
+    Install Jedi completer to :mod:`readline`.
+
+    This function setups :mod:`readline` to use Jedi in Python interactive
+    shell.  If you want to use a custom ``PYTHONSTARTUP`` file (typically
+    ``$HOME/.pythonrc.py``), you can add this piece of code::
+
+        try:
+            from jedi.utils import setup_readline
+            setup_readline()
+        except ImportError:
+            # Fallback to the stdlib readline completer if it is installed.
+            # Taken from http://docs.python.org/2/library/rlcompleter.html
+            print("Jedi is not installed, falling back to readline")
+            try:
+                import readline
+                import rlcompleter
+                readline.parse_and_bind("tab: complete")
+            except ImportError:
+                print("Readline is not installed either. No tab completion is enabled.")
+
+    This will fallback to the readline completer if Jedi is not installed.
+    The readline completer will only complete names in the global namespace,
+    so for example::
+
+        ran<TAB>
+
+    will complete to ``range``
+
+    with both Jedi and readline, but::
+
+        range(10).cou<TAB>
+
+    will show complete to ``range(10).count`` only with Jedi.
+
+    You'll also need to add ``export PYTHONSTARTUP=$HOME/.pythonrc.py`` to
+    your shell profile (usually ``.bash_profile`` or ``.profile`` if you use
+    bash).
+
+    """
+    if READLINE_DEBUG:
+        logging.basicConfig(
+            filename='/tmp/jedi.log',
+            filemode='a',
+            level=logging.DEBUG
+        )
+
+    class JediRL(object):
+        def complete(self, text, state):
+            """
+            This complete stuff is pretty weird, a generator would make
+            a lot more sense, but probably due to backwards compatibility
+            this is still the way how it works.
+
+            The only important part is stuff in the ``state == 0`` flow,
+            everything else has been copied from the ``rlcompleter`` std.
+            library module.
+            """
+            if state == 0:
+                sys.path.insert(0, os.getcwd())
+                # Calling python doesn't have a path, so add to sys.path.
+                try:
+                    logging.debug("Start REPL completion: " + repr(text))
+                    interpreter = Interpreter(text, [namespace_module.__dict__])
+
+                    lines = common.splitlines(text)
+                    position = (len(lines), len(lines[-1]))
+                    name = get_on_completion_name(interpreter._get_module(), lines, position)
+                    before = text[:len(text) - len(name)]
+                    completions = interpreter.completions()
+                except:
+                    logging.error("REPL Completion error:\n" + traceback.format_exc())
+                    raise
+                finally:
+                    sys.path.pop(0)
+
+                self.matches = [before + c.name_with_symbols for c in completions]
+            try:
+                return self.matches[state]
+            except IndexError:
+                return None
+
+    try:
+        import readline
+    except ImportError:
+        print("Jedi: Module readline not available.")
+    else:
+        readline.set_completer(JediRL().complete)
+        readline.parse_and_bind("tab: complete")
+        # jedi itself does the case matching
+        readline.parse_and_bind("set completion-ignore-case on")
+        # because it's easier to hit the tab just once
+        readline.parse_and_bind("set show-all-if-unmodified")
+        readline.parse_and_bind("set show-all-if-ambiguous on")
+        # don't repeat all the things written in the readline all the time
+        readline.parse_and_bind("set completion-prefix-display-length 2")
+        # No delimiters, Jedi handles that.
+        readline.set_completer_delims('')
+
+
+def version_info():
+    """
+    Returns a namedtuple of Jedi's version, similar to Python's
+    ``sys.version_info``.
+    """
+    Version = namedtuple('Version', 'major, minor, micro')
+    from jedi import __version__
+    tupl = re.findall('[a-z]+|\d+', __version__)
+    return Version(*[x if i == 3 else int(x) for i, x in enumerate(tupl)])
diff --git a/vim-plugins/bundle/jedi-vim/jedi/pytest.ini b/vim-plugins/bundle/jedi-vim/jedi/pytest.ini
new file mode 100644
index 0000000..6fafa94
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/pytest.ini
@@ -0,0 +1,10 @@
+[pytest]
+addopts = --doctest-modules
+
+# Ignore broken files in blackbox test directories
+norecursedirs = .* docs completion refactor absolute_import namespace_package scripts extensions speed static_analysis not_in_sys_path buildout_project sample_venvs init_extension_module
+
+# Activate `clean_jedi_cache` fixture for all tests.  This should be
+# fine as long as we are using `clean_jedi_cache` as a session scoped
+# fixture.
+usefixtures = clean_jedi_cache
diff --git a/vim-plugins/bundle/jedi-vim/jedi/scripts/memory_check.py b/vim-plugins/bundle/jedi-vim/jedi/scripts/memory_check.py
new file mode 100755
index 0000000..7bbcad2
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/scripts/memory_check.py
@@ -0,0 +1,58 @@
+#! /usr/bin/env python
+"""
+This is a convenience script to test the speed and memory usage of Jedi with
+large libraries.
+
+Each library is preloaded by jedi, recording the time and memory consumed by
+each operation.
+
+You can provide additional libraries via command line arguments.
+
+Note: This requires the psutil library, available on PyPI.
+"""
+import time
+import sys
+import os
+import psutil
+sys.path.insert(0, os.path.abspath(os.path.dirname(__file__) + '/..'))
+import jedi
+
+
+def used_memory():
+    """Return the total MB of System Memory in use."""
+    return psutil.virtual_memory().used / 2 ** 20
+
+
+def profile_preload(mod):
+    """Preload a module into Jedi, recording time and memory used."""
+    base = used_memory()
+    t0 = time.time()
+    jedi.preload_module(mod)
+    elapsed = time.time() - t0
+    used = used_memory() - base
+    return elapsed, used
+
+
+def main(mods):
+    """Preload the modules, and print the time and memory used."""
+    t0 = time.time()
+    baseline = used_memory()
+    print('Time (s) | Mem (MB) | Package')
+    print('------------------------------')
+    for mod in mods:
+        elapsed, used = profile_preload(mod)
+        if used > 0:
+            print('%8.2f | %8d | %s' % (elapsed, used, mod))
+    print('------------------------------')
+    elapsed = time.time() - t0
+    used = used_memory() - baseline
+    print('%8.2f | %8d | %s' % (elapsed, used, 'Total'))
+
+
+if __name__ == '__main__':
+    if sys.argv[1:]:
+        mods = sys.argv[1:]
+    else:
+        mods = ['re', 'numpy', 'scipy', 'scipy.sparse', 'scipy.stats',
+                'wx', 'decimal', 'PyQt4.QtGui', 'PySide.QtGui', 'Tkinter']
+    main(mods)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/scripts/profile.py b/vim-plugins/bundle/jedi-vim/jedi/scripts/profile.py
new file mode 100755
index 0000000..44028b0
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/scripts/profile.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+"""
+Profile a piece of Python code with ``cProfile``. Tries a completion on a
+certain piece of code.
+
+Usage:
+  profile.py [<code>] [-n <number>] [-d] [-o] [-s <sort>]
+  profile.py -h | --help
+
+Options:
+  -h --help     Show this screen.
+  -n <number>   Number of passes before profiling [default: 1].
+  -d --debug    Enable Jedi internal debugging.
+  -o --omit     Omit profiler, just do a normal run.
+  -s <sort>     Sort the profile results, e.g. cum, name [default: time].
+"""
+
+import time
+import cProfile
+
+from docopt import docopt
+import jedi
+
+
+def run(code, index):
+    start = time.time()
+    result = jedi.Script(code).completions()
+    print('Used %ss for the %sth run.' % (time.time() - start, index + 1))
+    return result
+
+
+def main(args):
+    code = args['<code>']
+    n = int(args['-n'])
+    for i in range(n):
+        run(code, i)
+
+    jedi.set_debug_function(notices=args['--debug'])
+    if args['--omit']:
+        run(code, n)
+    else:
+        cProfile.runctx('run(code, n)', globals(), locals(), sort=args['-s'])
+
+
+if __name__ == '__main__':
+    args = docopt(__doc__)
+    if args['<code>'] is None:
+        args['<code>'] = 'import numpy; numpy.array([0])'
+    main(args)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/scripts/wx_check.py b/vim-plugins/bundle/jedi-vim/jedi/scripts/wx_check.py
new file mode 100755
index 0000000..1e48c39
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/scripts/wx_check.py
@@ -0,0 +1,61 @@
+#! /usr/bin/env python
+"""
+Depends: ``objgraph`` (third party Python library)
+
+``wx._core`` is a very nice module to test Jedi's speed and memory performance
+on big Python modules. Its size is ~16kLOC (one file). It also seems to look
+like a typical big Python modules. A mix between a lot of different Python
+things.
+
+You can view a markup version of it here:
+http://svn.wxwidgets.org/viewvc/wx/wxPython/trunk/src/gtk/_core.py?view=markup
+"""
+
+import resource
+import time
+import sys
+try:
+    import urllib.request as urllib2
+except ImportError:
+    import urllib2
+import gc
+from os.path import abspath, dirname
+
+import objgraph
+
+sys.path.insert(0, dirname(dirname(abspath(__file__))))
+import jedi
+
+
+def process_memory():
+    """
+    In kB according to
+    http://stackoverflow.com/questions/938733/total-memory-used-by-python-process
+    """
+    return resource.getrusage(resource.RUSAGE_SELF).ru_maxrss
+
+uri = 'http://svn.wxwidgets.org/viewvc/wx/wxPython/trunk/src/gtk/_core.py?revision=74740&content-type=text%2Fplain&view=co'
+
+wx_core = urllib2.urlopen(uri).read()
+
+
+def run():
+    start = time.time()
+    print('Process Memory before: %skB' % process_memory())
+    # After this the module should be cached.
+    # Need to invent a path so that it's really cached.
+    jedi.Script(wx_core, path='foobar.py').completions()
+
+    gc.collect()  # make sure that it's all fair and the gc did its job.
+    print('Process Memory after: %skB' % process_memory())
+
+    print(objgraph.most_common_types(limit=50))
+    print('\nIt took %s seconds to parse the file.' % (time.time() - start))
+
+
+print('First pass')
+run()
+print('\nSecond pass')
+run()
+print('\nThird pass')
+run()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/setup.py b/vim-plugins/bundle/jedi-vim/jedi/setup.py
new file mode 100755
index 0000000..89ff880
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/setup.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+
+from __future__ import with_statement
+try:
+    from setuptools import setup
+except ImportError:
+    # Distribute is not actually required to install
+    from distutils.core import setup
+
+__AUTHOR__ = 'David Halter'
+__AUTHOR_EMAIL__ = 'davidhalter88@gmail.com'
+
+readme = open('README.rst').read() + '\n\n' + open('CHANGELOG.rst').read()
+packages = ['jedi', 'jedi.parser', 'jedi.parser.pgen2',
+            'jedi.evaluate', 'jedi.evaluate.compiled', 'jedi.api']
+
+import jedi
+
+setup(name='jedi',
+      version=jedi.__version__,
+      description='An autocompletion tool for Python that can be used for text editors.',
+      author=__AUTHOR__,
+      author_email=__AUTHOR_EMAIL__,
+      maintainer=__AUTHOR__,
+      maintainer_email=__AUTHOR_EMAIL__,
+      url='https://github.com/davidhalter/jedi',
+      license='MIT',
+      keywords='python completion refactoring vim',
+      long_description=readme,
+      packages=packages,
+      package_data={'jedi': ['evaluate/compiled/fake/*.pym', 'parser/grammar*.txt']},
+      platforms=['any'],
+      classifiers=[
+          'Development Status :: 4 - Beta',
+          'Environment :: Plugins',
+          'Intended Audience :: Developers',
+          'License :: OSI Approved :: MIT License',
+          'Operating System :: OS Independent',
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 2.6',
+          'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3.3',
+          'Programming Language :: Python :: 3.4',
+          'Programming Language :: Python :: 3.5',
+          'Topic :: Software Development :: Libraries :: Python Modules',
+          'Topic :: Text Editors :: Integrated Development Environments (IDE)',
+          'Topic :: Utilities',
+      ],
+      )
diff --git a/vim-plugins/bundle/jedi-vim/jedi/sith.py b/vim-plugins/bundle/jedi-vim/jedi/sith.py
new file mode 100755
index 0000000..903ef0e
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/sith.py
@@ -0,0 +1,220 @@
+#!/usr/bin/env python
+
+"""
+Sith attacks (and helps debugging) Jedi.
+
+Randomly search Python files and run Jedi on it.  Exception and used
+arguments are recorded to ``./record.json`` (specified by --record)::
+
+    ./sith.py random /path/to/sourcecode
+
+Redo recorded exception::
+
+    ./sith.py redo
+
+Show recorded exception::
+
+    ./sith.py show
+
+Run a specific operation
+
+    ./sith.py run <operation> </path/to/source/file.py> <line> <col>
+
+Where operation is one of completions, goto_assignments, goto_definitions,
+usages, or call_signatures.
+
+Note: Line numbers start at 1; columns start at 0 (this is consistent with
+many text editors, including Emacs).
+
+Usage:
+  sith.py [--pdb|--ipdb|--pudb] [-d] [-n=<nr>] [-f] [--record=<file>] random [-s] [<path>]
+  sith.py [--pdb|--ipdb|--pudb] [-d] [-f] [--record=<file>] redo
+  sith.py [--pdb|--ipdb|--pudb] [-d] [-f] run <operation> <path> <line> <column>
+  sith.py show [--record=<file>]
+  sith.py -h | --help
+
+Options:
+  -h --help             Show this screen.
+  --record=<file>       Exceptions are recorded in here [default: record.json].
+  -f, --fs-cache        By default, file system cache is off for reproducibility.
+  -n, --maxtries=<nr>   Maximum of random tries [default: 100]
+  -d, --debug           Jedi print debugging when an error is raised.
+  -s                    Shows the path/line numbers of every completion before it starts.
+  --pdb                 Launch pdb when error is raised.
+  --ipdb                Launch ipdb when error is raised.
+  --pudb                Launch pudb when error is raised.
+"""
+
+from __future__ import print_function, division, unicode_literals
+from docopt import docopt
+
+import json
+import os
+import random
+import sys
+import traceback
+
+import jedi
+
+
+class SourceFinder(object):
+    _files = None
+
+    @staticmethod
+    def fetch(file_path):
+        if not os.path.isdir(file_path):
+            yield file_path
+            return
+        for root, dirnames, filenames in os.walk(file_path):
+            for name in filenames:
+                if name.endswith('.py'):
+                    yield os.path.join(root, name)
+
+    @classmethod
+    def files(cls, file_path):
+        if cls._files is None:
+            cls._files = list(cls.fetch(file_path))
+        return cls._files
+
+
+class TestCase(object):
+    def __init__(self, operation, path, line, column, traceback=None):
+        if operation not in self.operations:
+            raise ValueError("%s is not a valid operation" % operation)
+
+        # Set other attributes
+        self.operation = operation
+        self.path = path
+        self.line = line
+        self.column = column
+        self.traceback = traceback
+
+    @classmethod
+    def from_cache(cls, record):
+        with open(record) as f:
+            args = json.load(f)
+        return cls(*args)
+
+    operations = [
+        'completions', 'goto_assignments', 'goto_definitions', 'usages',
+        'call_signatures']
+
+    @classmethod
+    def generate(cls, file_path):
+        operation = random.choice(cls.operations)
+
+        path = random.choice(SourceFinder.files(file_path))
+        with open(path) as f:
+            source = f.read()
+            lines = source.splitlines()
+
+        if not lines:
+            lines = ['']
+        line = random.randint(1, len(lines))
+        column = random.randint(0, len(lines[line - 1]))
+        return cls(operation, path, line, column)
+
+    def run(self, debugger, record=None, print_result=False):
+        try:
+            with open(self.path) as f:
+                self.script = jedi.Script(f.read(), self.line, self.column, self.path)
+            kwargs = {}
+            if self.operation == 'goto_assignments':
+                kwargs['follow_imports'] = random.choice([False, True])
+
+            self.objects = getattr(self.script, self.operation)(**kwargs)
+            if print_result:
+                print("{path}: Line {line} column {column}".format(**self.__dict__))
+                self.show_location(self.line, self.column)
+                self.show_operation()
+        except jedi.NotFoundError:
+            pass
+        except Exception:
+            self.traceback = traceback.format_exc()
+            if record is not None:
+                call_args = (self.operation, self.path, self.line, self.column, self.traceback)
+                with open(record, 'w') as f:
+                    json.dump(call_args, f)
+            self.show_errors()
+            if debugger:
+                einfo = sys.exc_info()
+                pdb = __import__(debugger)
+                if debugger == 'pudb':
+                    pdb.post_mortem(einfo[2], einfo[0], einfo[1])
+                else:
+                    pdb.post_mortem(einfo[2])
+            exit(1)
+
+    def show_location(self, lineno, column, show=3):
+        # Three lines ought to be enough
+        lower = lineno - show if lineno - show > 0 else 0
+        prefix = '  |'
+        for i, line in enumerate(self.script.source.split('\n')[lower:lineno]):
+            print(prefix, lower + i + 1, line)
+        print(prefix, '   ', ' ' * (column + len(str(lineno))), '^')
+
+    def show_operation(self):
+        print("%s:\n" % self.operation.capitalize())
+        if self.operation == 'completions':
+            self.show_completions()
+        else:
+            self.show_definitions()
+
+    def show_completions(self):
+        for completion in self.objects:
+            print(completion.name)
+
+    def show_definitions(self):
+        for completion in self.objects:
+            print(completion.desc_with_module)
+            if completion.module_path is None:
+                continue
+            if os.path.abspath(completion.module_path) == os.path.abspath(self.path):
+                self.show_location(completion.line, completion.column)
+
+    def show_errors(self):
+        print(self.traceback)
+        print(("Error with running Script(...).{operation}() with\n"
+              "\tpath:   {path}\n"
+              "\tline:   {line}\n"
+              "\tcolumn: {column}").format(**self.__dict__))
+
+
+def main(arguments):
+    debugger = 'pdb' if arguments['--pdb'] else \
+               'ipdb' if arguments['--ipdb'] else \
+               'pudb' if arguments['--pudb'] else None
+    record = arguments['--record']
+
+    jedi.settings.use_filesystem_cache = arguments['--fs-cache']
+    if arguments['--debug']:
+        jedi.set_debug_function()
+
+    if arguments['redo'] or arguments['show']:
+        t = TestCase.from_cache(record)
+        if arguments['show']:
+            t.show_errors()
+        else:
+            t.run(debugger)
+    elif arguments['run']:
+            TestCase(
+                arguments['<operation>'], arguments['<path>'],
+                int(arguments['<line>']), int(arguments['<column>'])
+            ).run(debugger, print_result=True)
+    else:
+        for _ in range(int(arguments['--maxtries'])):
+            t = TestCase.generate(arguments['<path>'] or '.')
+            if arguments['-s']:
+                print('%s %s %s %s ' % (t.operation, t.path, t.line, t.column))
+                sys.stdout.flush()
+            else:
+                print('.', end='')
+            t.run(debugger, record)
+
+            sys.stdout.flush()
+        print()
+
+
+if __name__ == '__main__':
+    arguments = docopt(__doc__)
+    main(arguments)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/blabla_test_documentation.py b/vim-plugins/bundle/jedi-vim/jedi/test/blabla_test_documentation.py
new file mode 100644
index 0000000..db31bf0
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/blabla_test_documentation.py
@@ -0,0 +1,30 @@
+# todo probably remove test_integration_keyword
+
+def test_keyword_doc():
+    r = list(Script("or", 1, 1).goto_definitions())
+    assert len(r) == 1
+    assert len(r[0].doc) > 100
+
+    r = list(Script("asfdasfd", 1, 1).goto_definitions())
+    assert len(r) == 0
+
+    k = Script("fro").completions()[0]
+    imp_start = '\nThe ``import'
+    assert k.raw_doc.startswith(imp_start)
+    assert k.doc.startswith(imp_start)
+
+
+def test_blablabla():
+    defs = Script("import").goto_definitions()
+    assert len(defs) == 1 and [1 for d in defs if d.doc]
+    # unrelated to #44
+
+
+def test_operator_doc(self):
+    r = list(Script("a == b", 1, 3).goto_definitions())
+    assert len(r) == 1
+    assert len(r[0].doc) > 100
+
+def test_lambda():
+    defs = Script('lambda x: x', column=0).goto_definitions()
+    assert [d.type for d in defs] == ['keyword']
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/__init__.py
new file mode 100644
index 0000000..374dd94
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/__init__.py
@@ -0,0 +1,3 @@
+""" needed for some modules to test against packages. """
+
+some_variable = 1
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/arrays.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/arrays.py
new file mode 100644
index 0000000..dcbbe37
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/arrays.py
@@ -0,0 +1,430 @@
+# -----------------
+# basic array lookups
+# -----------------
+
+
+#? int()
+[1,""][0]
+#? str()
+[1,""][1]
+#? int() str()
+[1,""][2]
+#? int() str()
+[1,""][20]
+#? int() str()
+[1,""][str(hello)]
+
+a = list()
+#? list()
+[a][0]
+
+#? list()
+[[a,a,a]][2][100]
+
+c = [[a,""]]
+#? str()
+c[0][1]
+
+b = [6,7]
+
+#? int()
+b[8-7]
+
+# -----------------
+# Slices
+# -----------------
+#? list()
+b[8:]
+
+#? list()
+b[int():]
+
+#? list()
+b[:]
+
+
+class _StrangeSlice():
+    def __getitem__(self, sliced):
+        return sliced
+
+# Should not result in an error, just because the slice itself is returned.
+#? slice()
+_StrangeSlice()[1:2]
+
+
+# -----------------
+# iterable multiplication
+# -----------------
+a = ['']*2
+#? list()
+a
+
+# -----------------
+# tuple assignments
+# -----------------
+a1, b1 = (1, "")
+#? int()
+a1
+#? str()
+b1
+
+(a2, b2) = (1, "")
+#? int()
+a2
+#? str()
+b2
+
+# list assignment
+[list1, list2] = (1, "")
+#? int()
+list1
+#? str()
+list2
+
+[list3, list4] = [1, ""]
+#? int()
+list3
+#? str()
+list4
+
+# -----------------
+# subtuple assignment
+# -----------------
+(a3, (b3, c3)) = (1, ("", list))
+#? list
+c3
+
+a4, (b4, c4) = (1, ("", list))
+#? list
+c4
+#? int()
+a4
+#? str()
+b4
+
+
+# -----------------
+# multiple assignments
+# -----------------
+a = b = 1
+#? int()
+a
+#? int()
+b
+
+(a, b) = (c, (e, f)) = ('2', (3, 4))
+#? str()
+a
+#? tuple()
+b
+#? str()
+c
+#? int()
+e
+#? int()
+f
+
+
+# -----------------
+# unnessecary braces
+# -----------------
+a = (1)
+#? int()
+a
+#? int()
+(1)
+#? int()
+((1))
+#? int()
+((1)+1)
+
+u, v = 1, ""
+#? int()
+u
+
+((u1, v1)) = 1, ""
+#? int()
+u1
+#? int()
+(u1)
+
+(a), b = 1, ''
+#? int()
+a
+
+def a(): return ''
+#? str()
+(a)()
+#? str()
+(a)().replace()
+#? int()
+(tuple).index()
+#? int()
+(tuple)().index()
+
+class C():
+    def __init__(self):
+        self.a = (str()).upper()
+
+#? str()
+C().a
+
+# -----------------
+# imbalanced sides
+# -----------------
+(f, g) = (1,)
+#? int()
+f
+#? []
+g.
+
+(f, g, h) = (1,'')
+#? int()
+f
+#? str()
+g
+#? []
+h.
+
+(f1, g1) = 1
+#? []
+f1.
+#? []
+g1.
+
+(f, g) = (1,'',1.0)
+#? int()
+f
+#? str()
+g
+
+# -----------------
+# dicts
+# -----------------
+dic2 = {'asdf': 3, 'b': 'str'}
+#? int()
+dic2['asdf']
+
+# string literal
+#? int()
+dic2[r'asdf']
+#? int()
+dic2[r'asdf']
+#? int()
+dic2[r'as' 'd' u'f']
+#? int() str()
+dic2['just_something']
+
+# unpacking
+a, b = dic2
+#? str()
+a
+a, b = {1: 'x', 2.0: 1j}
+#? int() float()
+a
+#? int() float()
+b
+
+
+def f():
+    """ github #83 """
+    r = {}
+    r['status'] = (200, 'ok')
+    return r
+
+#? dict()
+f()
+
+# completion within dicts
+#? 9 ['str']
+{str: str}
+
+# iteration problem (detected with sith)
+d = dict({'a':''})
+def y(a):
+    return a
+#?
+y(**d)
+
+# problem with more complicated casts
+dic = {str(key): ''}
+#? str()
+dic['']
+
+
+for x in {1: 3.0, '': 1j}:
+    #? int() str()
+    x
+
+# -----------------
+# with variable as index
+# -----------------
+a = (1, "")
+index = 1
+#? str()
+a[index]
+
+# these should just ouput the whole array
+index = int
+#? int() str()
+a[index]
+index = int()
+#? int() str()
+a[index]
+
+# dicts
+index = 'asdf'
+
+dic2 = {'asdf': 3, 'b': 'str'}
+#? int()
+dic2[index]
+
+# -----------------
+# __getitem__
+# -----------------
+
+class GetItem():
+    def __getitem__(self, index):
+        return 1.0
+
+#? float()
+GetItem()[0]
+
+class GetItem():
+    def __init__(self, el):
+        self.el = el
+
+    def __getitem__(self, index):
+        return self.el
+
+#? str()
+GetItem("")[1]
+
+class GetItemWithList():
+    def __getitem__(self, index):
+        return [1, 1.0, 's'][index]
+
+#? float()
+GetItemWithList()[1]
+
+for i in 0, 2:
+    #? int() str()
+    GetItemWithList()[i]
+
+
+# With super
+class SuperYeah(list):
+    def __getitem__(self, index):
+        return super()[index]
+
+#?
+SuperYeah([1])[0]
+#?
+SuperYeah()[0]
+
+# -----------------
+# conversions
+# -----------------
+
+a = [1, ""]
+#? int() str()
+list(a)[1]
+
+#? int() str()
+list(a)[0]
+#?
+set(a)[0]
+
+#? int() str()
+list(set(a))[1]
+#? int() str()
+list(list(set(a)))[1]
+
+# does not yet work, because the recursion catching is not good enough (catches # to much)
+#? int() str()
+list(set(list(set(a))))[1]
+#? int() str()
+list(set(set(a)))[1]
+
+# frozenset
+#? int() str()
+list(frozenset(a))[1]
+#? int() str()
+list(set(frozenset(a)))[1]
+
+# iter
+#? int() str()
+list(iter(a))[1]
+#? int() str()
+list(iter(list(set(a))))[1]
+
+# tuple
+#? int() str()
+tuple(a)[1]
+#? int() str()
+tuple(list(set(a)))[1]
+
+#? int()
+tuple({1})[0]
+#? int()
+tuple((1,))[0]
+
+# implementation detail for lists, should not be visible
+#? []
+list().__iterable
+
+# With a list comprehension.
+for i in set(a for a in [1]):
+    #? int()
+    i
+
+
+# -----------------
+# Merged Arrays
+# -----------------
+
+for x in [1] + ['']:
+    #? int() str()
+    x
+
+# -----------------
+# For loops with attribute assignment.
+# -----------------
+def test_func():
+    x = 'asdf'
+    for x.something in [6,7,8]:
+        pass
+    #? str()
+    x
+
+    for x.something, b in [[6, 6.0]]:
+        pass
+    #? str()
+    x
+
+
+# -----------------
+# PEP 3132 Extended Iterable Unpacking (star unpacking)
+# -----------------
+
+a, *b, c = [1, 'b', list, dict]
+#? int()
+a
+#? str()
+b
+#? list
+c
+
+# Not valid syntax
+a, *b, *c = [1, 'd', list]
+#? int()
+a
+#? str()
+b
+#? list
+c
+
+lc = [x for a, *x in [(1, '', 1.0)]]
+
+#?
+lc[0][0]
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/basic.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/basic.py
new file mode 100644
index 0000000..5b4f909
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/basic.py
@@ -0,0 +1,293 @@
+# -----------------
+# cursor position
+# -----------------
+#? 0 int
+int()
+#? 3 int
+int()
+#? 4 str
+int(str)
+
+
+# -----------------
+# should not complete
+# -----------------
+#? []
+.
+#? []
+str..
+#? []
+a(0):.
+
+# -----------------
+# if/else/elif
+# -----------------
+
+if (random.choice([0, 1])):
+    1
+elif(random.choice([0, 1])):
+    a = 3
+else:
+    a = ''
+#? int() str()
+a
+def func():
+    if random.choice([0, 1]):
+        1
+    elif(random.choice([0, 1])):
+        a = 3
+    else:
+        a = ''
+    #? int() str()
+    return a
+#? int() str()
+func()
+
+# -----------------
+# keywords
+# -----------------
+
+#? list()
+assert []
+
+def focus_return():
+    #? list()
+    return []
+
+
+# -----------------
+# for loops
+# -----------------
+
+for a in [1,2]:
+    #? int()
+    a
+
+for a1 in 1,"":
+    #? int() str()
+    a1
+
+for a3, b3 in (1,""), (1,""), (1,""):
+    #? int()
+    a3
+    #? str()
+    b3
+
+for a4, (b4, c4) in (1,("", list)), (1,("", list)):
+    #? int()
+    a4
+    #? str()
+    b4
+    #? list
+    c4
+
+a = []
+for i in [1,'']:
+    #? int() str()
+    i
+    a += [i]
+
+#? int() str()
+a[0]
+
+for i in list([1,'']):
+    #? int() str()
+    i
+
+#? int() str()
+for x in [1,'']: x
+
+a = []
+b = [1.0,'']
+for i in b:
+    a += [i]
+
+#? float() str()
+a[0]
+
+for i in [1,2,3]:
+    #? int()
+    i
+else:
+    i
+
+
+# -----------------
+# range()
+# -----------------
+for i in range(10):
+    #? int()
+    i
+
+# -----------------
+# ternary operator
+# -----------------
+
+a = 3
+b = '' if a else set()
+#? str() set()
+b
+
+def ret(a):
+    return ['' if a else set()]
+
+#? str() set()
+ret(1)[0]
+#? str() set()
+ret()[0]
+
+# -----------------
+# with statements
+# -----------------
+
+with open('') as f:
+    #? ['closed']
+    f.closed
+    for line in f:
+        #? str()
+        line
+
+with open('') as f1, open('') as f2:
+    #? ['closed']
+    f1.closed
+    #? ['closed']
+    f2.closed
+
+
+# -----------------
+# global vars
+# -----------------
+
+def global_define():
+    global global_var_in_func
+    global_var_in_func = 3
+
+#? int()
+global_var_in_func
+
+
+def funct1():
+    # From issue #610
+    global global_dict_var
+    global_dict_var = dict()
+def funct2():
+    global global_dict_var
+    #? dict()
+    global_dict_var
+
+
+# -----------------
+# within docstrs
+# -----------------
+
+def a():
+    """
+    #? ['global_define']
+    global_define
+    """
+    pass
+
+#?
+# str literals in comment """ upper
+
+def completion_in_comment():
+    #? ['Exception']
+    # might fail because the comment is not a leaf: Exception
+    pass
+
+some_word
+#? ['Exception']
+# Very simple comment completion: Exception
+# Commment after it
+
+# -----------------
+# magic methods
+# -----------------
+
+class A(object): pass
+class B(): pass
+
+#? ['__init__']
+A.__init__
+#? ['__init__']
+B.__init__
+
+#? ['__init__']
+int().__init__
+
+# -----------------
+# comments
+# -----------------
+
+class A():
+    def __init__(self):
+        self.hello = {}  # comment shouldn't be a string
+#? dict()
+A().hello
+
+# -----------------
+# unicode
+# -----------------
+a = 'smörbröd'
+#? str()
+a
+xyz = 'smörbröd.py'
+if 1:
+    #? str()
+    xyz
+
+#?
+¹.
+
+# -----------------
+# exceptions
+# -----------------
+try:
+    import math
+except ImportError as i_a:
+    #? ['i_a']
+    i_a
+    #? ImportError()
+    i_a
+try:
+    import math
+except ImportError, i_b:
+    # TODO check this only in Python2
+    ##? ['i_b']
+    i_b
+    ##? ImportError()
+    i_b
+
+
+class MyException(Exception):
+    def __init__(self, my_attr):
+        self.my_attr = my_attr
+
+try:
+    raise MyException(1)
+except MyException as e:
+    #? ['my_attr']
+    e.my_attr
+    #? 22 ['my_attr']
+    for x in e.my_attr:
+        pass
+
+
+# -----------------
+# continuations
+# -----------------
+
+foo = \
+1
+#? int()
+foo
+
+# -----------------
+# module attributes
+# -----------------
+
+# Don't move this to imports.py, because there's a star import.
+#? str()
+__file__
+#? ['__file__']
+__file__
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/classes.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/classes.py
new file mode 100644
index 0000000..6aa226b
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/classes.py
@@ -0,0 +1,470 @@
+def find_class():
+    """ This scope is special, because its in front of TestClass """
+    #? ['ret']
+    TestClass.ret
+    if 1:
+        #? ['ret']
+        TestClass.ret
+
+class FindClass():
+    #? []
+    TestClass.ret
+    if a:
+        #? []
+        TestClass.ret
+
+    def find_class(self):
+        #? ['ret']
+        TestClass.ret
+        if 1:
+            #? ['ret']
+            TestClass.ret
+
+#? []
+FindClass().find_class.self
+#? []
+FindClass().find_class.self.find_class
+
+# set variables, which should not be included, because they don't belong to the
+# class
+second = 1
+second = ""
+class TestClass(object):
+    var_class = TestClass(1)
+
+    def __init__(self2, first_param, second_param, third=1.0):
+        self2.var_inst = first_param
+        self2.second = second_param
+        self2.first = first_param
+        a = 3
+
+    def var_func(self):
+        return 1
+
+    def get_first(self):
+        # traversal
+        self.second_new = self.second
+        return self.var_inst
+
+    def values(self):
+        self.var_local = 3
+        #? ['var_class', 'var_func', 'var_inst', 'var_local']
+        self.var_
+
+    def ret(self, a1):
+        # should not know any class functions!
+        #? []
+        values
+        #? ['return']
+        ret
+        return a1
+
+# should not work
+#? []
+var_local
+#? []
+var_inst
+#? []
+var_func
+
+# instance
+inst = TestClass(1)
+
+#? ['var_class', 'var_func', 'var_inst', 'var_local']
+inst.var
+
+#? ['var_class', 'var_func']
+TestClass.var
+
+#? int()
+inst.var_local
+#? []
+TestClass.var_local.
+
+#? int()
+TestClass().ret(1)
+# Should not return int(), because we want the type before `.ret(1)`.
+#? 11 TestClass()
+TestClass().ret(1)
+#? int()
+inst.ret(1)
+
+myclass = TestClass(1, '', 3.0)
+#? int()
+myclass.get_first()
+#? []
+myclass.get_first.real
+
+# too many params
+#? int()
+TestClass(1,1,1).var_inst
+
+# too few params
+#? int()
+TestClass(1).first
+#? []
+TestClass(1).second.
+
+# complicated variable settings in class
+#? str()
+myclass.second
+#? str()
+myclass.second_new
+
+# multiple classes / ordering
+ints = TestClass(1, 1.0)
+strs = TestClass("", '')
+#? float()
+ints.second
+#? str()
+strs.second
+
+#? ['var_class']
+TestClass.var_class.var_class.var_class.var_class
+
+# operations (+, *, etc) shouldn't be InstanceElements - #246
+class A():
+    def __init__(self):
+        self.addition = 1 + 2
+#? int()
+A().addition
+
+# should also work before `=`
+#? 8 int()
+A().addition = None
+#? 8 int()
+A(1).addition = None
+#? 1 A
+A(1).addition = None
+a = A()
+#? 8 int()
+a.addition = None
+
+
+# -----------------
+# inheritance
+# -----------------
+
+class Base(object):
+    def method_base(self):
+        return 1
+
+class SuperClass(Base):
+    class_super = 3
+    def __init__(self):
+        self.var_super = ''
+    def method_super(self):
+        self.var2_super = list
+
+class Mixin(SuperClass):
+    def method_mixin(self):
+        return int
+
+#? 20 SuperClass
+class SubClass(SuperClass):
+    class_sub = 3
+    def __init__(self):
+        self.var_sub = ''
+    def method_sub(self):
+        self.var_sub = list
+        return tuple
+
+instance = SubClass()
+
+#? ['method_base', 'method_sub', 'method_super']
+instance.method_
+#? ['var2_super', 'var_sub', 'var_super']
+instance.var
+#? ['class_sub', 'class_super']
+instance.class_
+
+#? ['method_base', 'method_sub', 'method_super']
+SubClass.method_
+#? []
+SubClass.var
+#? ['class_sub', 'class_super']
+SubClass.class_
+
+# -----------------
+# inheritance of builtins
+# -----------------
+
+class Base(str):
+    pass
+
+#? ['upper']
+Base.upper
+#? ['upper']
+Base().upper
+
+# -----------------
+# dynamic inheritance
+# -----------------
+
+class Angry(object):
+    def shout(self):
+        return 'THIS IS MALARKEY!'
+
+def classgetter():
+    return Angry
+
+class Dude(classgetter()):
+    def react(self):
+        #? ['shout']
+        self.s
+
+# -----------------
+# __call__
+# -----------------
+
+class CallClass():
+    def __call__(self):
+        return 1
+
+#? int()
+CallClass()()
+
+# -----------------
+# variable assignments
+# -----------------
+
+class V:
+    def __init__(self, a):
+        self.a = a
+
+    def ret(self):
+        return self.a
+
+    d = b
+    b = ret
+    if 1:
+        c = b
+
+#? int()
+V(1).b()
+#? int()
+V(1).c()
+#?
+V(1).d()
+# Only keywords should be possible to complete.
+#? ['is', 'in', 'not', 'and', 'or', 'if']
+V(1).d()
+
+
+# -----------------
+# ordering
+# -----------------
+class A():
+    def b(self):
+        #? int()
+        a_func()
+        #? str()
+        self.a_func()
+        return a_func()
+
+    def a_func(self):
+        return ""
+
+def a_func():
+    return 1
+
+#? int()
+A().b()
+#? str()
+A().a_func()
+
+# -----------------
+# nested classes
+# -----------------
+class A():
+    class B():
+        pass
+    def b(self):
+        return 1.0
+
+#? float()
+A().b()
+
+class A():
+    def b(self):
+        class B():
+            def b(self):
+                return []
+        return B().b()
+
+#? list()
+A().b()
+
+# -----------------
+# ducktyping
+# -----------------
+
+def meth(self):
+    return self.a, self.b
+
+class WithoutMethod():
+    a = 1
+    def __init__(self):
+        self.b = 1.0
+    def blub(self):
+        return self.b
+    m = meth
+
+class B():
+    b = ''
+
+a = WithoutMethod().m()
+#? int()
+a[0]
+#? float()
+a[1]
+
+#? float()
+WithoutMethod.blub(WithoutMethod())
+#? str()
+WithoutMethod.blub(B())
+
+# -----------------
+# __getattr__ / getattr() / __getattribute__
+# -----------------
+
+#? str().upper
+getattr(str(), 'upper')
+#? str.upper
+getattr(str, 'upper')
+
+# some strange getattr calls
+#?
+getattr(str, 1)
+#?
+getattr()
+#?
+getattr(str)
+#?
+getattr(getattr, 1)
+#?
+getattr(str, [])
+
+
+class Base():
+    def ret(self, b):
+        return b
+
+class Wrapper():
+    def __init__(self, obj):
+        self.obj = obj
+
+    def __getattr__(self, name):
+        return getattr(self.obj, name)
+
+class Wrapper2():
+    def __getattribute__(self, name):
+        return getattr(Base(), name)
+
+#? int()
+Wrapper(Base()).ret(3)
+
+#? int()
+Wrapper2(Base()).ret(3)
+
+class GetattrArray():
+    def __getattr__(self, name):
+        return [1]
+
+#? int()
+GetattrArray().something[0]
+
+
+# -----------------
+# private vars
+# -----------------
+class PrivateVar():
+    def __init__(self):
+        self.__var = 1
+        #? int()
+        self.__var
+        #? ['__var']
+        self.__var
+#? []
+PrivateVar().__var
+#?
+PrivateVar().__var
+
+# -----------------
+# super
+# -----------------
+class Super(object):
+    a = 3
+    def return_sup(self):
+        return 1
+
+class TestSuper(Super):
+    #?
+    super()
+    def test(self):
+        #? Super()
+        super()
+        #? ['a']
+        super().a
+        if 1:
+            #? Super()
+            super()
+        def a():
+            #?
+            super()
+
+    def return_sup(self):
+        #? int()
+        return super().return_sup()
+
+#? int()
+TestSuper().return_sup()
+
+
+# -----------------
+# if flow at class level
+# -----------------
+class TestX(object):
+    def normal_method(self):
+        return 1
+
+    if True:
+        def conditional_method(self):
+            var = self.normal_method()
+            #? int()
+            var
+            return 2
+
+    def other_method(self):
+        var = self.conditional_method()
+        #? int()
+        var
+
+# -----------------
+# mro method
+# -----------------
+
+class A(object):
+    a = 3
+
+#? ['mro']
+A.mro
+#? []
+A().mro
+
+
+# -----------------
+# mro resolution
+# -----------------
+
+class B(A()):
+    b = 3
+
+#?
+B.a
+#?
+B().a
+#? int()
+B.b
+#? int()
+B().b
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/completion.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/completion.py
new file mode 100644
index 0000000..91bc2aa
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/completion.py
@@ -0,0 +1,26 @@
+"""
+Special cases of completions (typically special positions that caused issues
+with context parsing.
+"""
+
+def pass_decorator(func):
+    return func
+
+
+def x():
+    return (
+        1,
+#? ["tuple"]
+tuple
+    )
+
+    # Comment just somewhere
+
+
+class MyClass:
+    @pass_decorator
+    def x(foo,
+#? 5 ["tuple"]
+tuple,
+          ):
+        return 1
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/complex.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/complex.py
new file mode 100644
index 0000000..3ea8327
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/complex.py
@@ -0,0 +1,14 @@
+""" Mostly for stupid error reports of @dbrgn. :-) """
+
+import time
+
+class Foo(object):
+    global time
+    asdf = time
+
+def asdfy():
+    return Foo
+
+xorz = getattr(asdfy()(), 'asdf')
+#? time
+xorz
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/comprehensions.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/comprehensions.py
new file mode 100644
index 0000000..a0a709c
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/comprehensions.py
@@ -0,0 +1,200 @@
+# -----------------
+# list comprehensions
+# -----------------
+
+# basics:
+
+a = ['' for a in [1]]
+#? str()
+a[0]
+#? ['insert']
+a.insert
+
+a = [a for a in [1]]
+#? int()
+a[0]
+
+y = 1.0
+# Should not leak.
+[y for y in [3]]
+#? float()
+y
+
+a = [a for a in (1, 2)]
+#? int()
+a[0]
+
+a = [a for a,b in [(1,'')]]
+#? int()
+a[0]
+
+arr = [1,'']
+a = [a for a in arr]
+#? int()
+a[0]
+#? str()
+a[1]
+#? int() str()
+a[2]
+
+a = [a if 1.0 else '' for a in [1] if [1.0]]
+#? int() str()
+a[0]
+
+# name resolve should be correct
+left, right = 'a', 'b'
+left, right = [x for x in (left, right)]
+#? str()
+left
+
+# with a dict literal
+#? int()
+[a for a in {1:'x'}][0]
+
+# list comprehensions should also work in combination with functions
+def listen(arg):
+    for x in arg:
+        #? str()
+        x
+
+listen(['' for x in [1]])
+#?
+([str for x in []])[0]
+
+# with a set literal
+#? int()
+[a for a in {1, 2, 3}][0]
+
+# -----------------
+# nested list comprehensions
+# -----------------
+
+b = [a for arr in [[1]] for a in arr]
+#? int()
+b[0]
+
+b = [a for arr in [[1]] if '' for a in arr if '']
+#? int()
+b[0]
+
+b = [b for arr in [[[1.0]]] for a in arr for b in a]
+#? float()
+b[0]
+
+# jedi issue #26
+#? list()
+a = [[int(v) for v in line.strip().split() if v] for line in ["123", "123", "123"] if line]
+#? list()
+a[0]
+#? int()
+a[0][0]
+
+# -----------------
+# generator comprehensions
+# -----------------
+
+left, right = (i for i in (1, ''))
+
+#? int()
+left
+#? str()
+right
+
+gen = (i for i in (1,))
+
+#? int()
+next(gen)
+#?
+gen[0]
+
+gen = (a for arr in [[1.0]] for a in arr)
+#? float()
+next(gen)
+
+#? int()
+(i for i in (1,)).send()
+
+# issues with different formats
+left, right = (i for i in
+                       ('1', 2))
+#? str()
+left
+#? int()
+right
+
+# -----------------
+# dict comprehensions
+# -----------------
+
+#? int()
+list({a - 1: 3 for a in [1]})[0]
+
+d = {a - 1: b for a, b in {1: 'a', 3: 1.0}.items()}
+#? int()
+list(d)[0]
+#? str() float()
+d.values()[0]
+#? str()
+d[0]
+#? float() str()
+d[1]
+#? float()
+d[2]
+
+# -----------------
+# set comprehensions
+# -----------------
+
+#? set()
+{a - 1 for a in [1]}
+
+#? set()
+{a for a in range(10)}
+
+#? int()
+[x for x in {a for a in range(10)}][0]
+
+#? int()
+{a for a in range(10)}.pop()
+#? float() str()
+{b for a in [[3.0], ['']] for b in a}.pop()
+
+#? int()
+next(iter({a for a in range(10)}))
+
+
+# -----------------
+# name resolution in comprehensions.
+# -----------------
+
+def x():
+    """Should not try to resolve to the if hio, which was a bug."""
+    #? 22
+    [a for a in h if hio]
+    if hio: pass
+
+# -----------------
+# slices
+# -----------------
+
+#? list()
+foo = [x for x in [1, '']][:1]
+#? int()
+foo[0]
+
+# -----------------
+# In class
+# -----------------
+
+class X():
+    def __init__(self, bar):
+        self.bar = bar
+
+    def foo(self):
+        x = [a for a in self.bar][0]
+        #? int()
+        x
+        return x
+
+#? int()
+X([1]).foo()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/context.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/context.py
new file mode 100644
index 0000000..0f0b288
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/context.py
@@ -0,0 +1,32 @@
+class Base():
+    myfoobar = 3
+
+
+class X(Base):
+    def func(self, foo):
+        pass
+
+
+class Y(X):
+    def actual_function(self):
+        pass
+
+    #? []
+    def actual_function
+    #? ['func']
+    def f
+
+    #? []
+    def __class__
+
+    #? ['__repr__']
+    def __repr__
+
+    #? []
+    def mro
+
+    #? ['myfoobar']
+    myfoobar
+
+#? []
+myfoobar
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/decorators.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/decorators.py
new file mode 100644
index 0000000..702c3f3
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/decorators.py
@@ -0,0 +1,306 @@
+# -----------------
+# normal decorators
+# -----------------
+
+def decorator(func):
+    def wrapper(*args):
+        return func(1, *args)
+    return wrapper
+
+@decorator
+def decorated(a,b):
+    return a,b
+
+exe = decorated(set, '')
+
+#? set
+exe[1]
+
+#? int()
+exe[0]
+
+# more complicated with args/kwargs
+def dec(func):
+    def wrapper(*args, **kwargs):
+        return func(*args, **kwargs)
+    return wrapper
+
+@dec
+def fu(a, b, c, *args, **kwargs):
+    return a, b, c, args, kwargs
+
+exe = fu(list, c=set, b=3, d='')
+
+#? list
+exe[0]
+#? int()
+exe[1]
+#? set
+exe[2]
+#? []
+exe[3][0].
+#? str()
+exe[4]['d']
+
+
+exe = fu(list, set, 3, '', d='')
+
+#? str()
+exe[3][0]
+
+# -----------------
+# multiple decorators
+# -----------------
+def dec2(func2):
+    def wrapper2(first_arg, *args2, **kwargs2):
+        return func2(first_arg, *args2, **kwargs2)
+    return wrapper2
+
+@dec2
+@dec
+def fu2(a, b, c, *args, **kwargs):
+    return a, b, c, args, kwargs
+
+exe = fu2(list, c=set, b=3, d='str')
+
+#? list
+exe[0]
+#? int()
+exe[1]
+#? set
+exe[2]
+#? []
+exe[3][0].
+#? str()
+exe[4]['d']
+
+
+# -----------------
+# Decorator is a class
+# -----------------
+def same_func(func):
+    return func
+
+class Decorator(object):
+    def __init__(self, func):
+        self.func = func
+
+    def __call__(self, *args, **kwargs):
+        return self.func(1, *args, **kwargs)
+
+@Decorator
+def nothing(a,b,c):
+    return a,b,c
+
+#? int()
+nothing("")[0]
+#? str()
+nothing("")[1]
+
+
+@same_func
+@Decorator
+def nothing(a,b,c):
+    return a,b,c
+
+#? int()
+nothing("")[0]
+
+class MethodDecoratorAsClass():
+    class_var = 3
+    @Decorator
+    def func_without_self(arg, arg2):
+        return arg, arg2
+
+    @Decorator
+    def func_with_self(self, arg):
+        return self.class_var
+
+#? int()
+MethodDecoratorAsClass().func_without_self('')[0]
+#? str()
+MethodDecoratorAsClass().func_without_self('')[1]
+#? 
+MethodDecoratorAsClass().func_with_self(1)
+
+
+class SelfVars():
+    """Init decorator problem as an instance, #247"""
+    @Decorator
+    def __init__(self):
+        """
+        __init__ decorators should be ignored when looking up variables in the
+        class.
+        """
+        self.c = list
+
+    @Decorator
+    def shouldnt_expose_var(not_self):
+        """
+        Even though in real Python this shouldn't expose the variable, in this
+        case Jedi exposes the variable, because these kind of decorators are
+        normally descriptors, which SHOULD be exposed (at least 90%).
+        """
+        not_self.b = 1.0
+
+    def other_method(self):
+        #? float()
+        self.b
+        #? list
+        self.c
+
+# -----------------
+# not found decorators (are just ignored)
+# -----------------
+@not_found_decorator
+def just_a_func():
+    return 1
+
+#? int()
+just_a_func()
+
+#? ['__closure__']
+just_a_func.__closure__
+
+
+class JustAClass:
+    @not_found_decorator2
+    def a(self):
+        return 1
+
+#? ['__call__']
+JustAClass().a.__call__
+#? int()
+JustAClass().a()
+#? ['__call__']
+JustAClass.a.__call__
+#? int()
+JustAClass.a()
+
+# -----------------
+# illegal decorators
+# -----------------
+
+class DecoratorWithoutCall():
+    def __init__(self, func):
+        self.func = func
+
+@DecoratorWithoutCall
+def f():
+    return 1
+
+# cannot be resolved - should be ignored
+@DecoratorWithoutCall(None)
+def g():
+    return 1
+
+#? 
+f()
+#? int()
+g()
+
+
+class X():
+    @str
+    def x(self):
+        pass
+
+    def y(self):
+        #? str()
+        self.x
+        #?
+        self.x()
+
+# -----------------
+# method decorators
+# -----------------
+
+def dec(f):
+    def wrapper(s):
+        return f(s)
+    return wrapper
+
+class MethodDecorators():
+    _class_var = 1
+    def __init__(self):
+        self._method_var = ''
+
+    @dec
+    def constant(self):
+        return 1.0
+
+    @dec
+    def class_var(self):
+        return self._class_var
+
+    @dec
+    def method_var(self):
+        return self._method_var
+
+#? float()
+MethodDecorators().constant()
+#? int()
+MethodDecorators().class_var()
+#? str()
+MethodDecorators().method_var()
+
+
+class Base():
+    @not_existing
+    def __init__(self):
+        pass
+    @not_existing
+    def b(self):
+        return ''
+    @dec
+    def c(self):
+        return 1
+
+class MethodDecoratorDoesntExist(Base):
+    """#272 github: combination of method decorators and super()"""
+    def a(self):
+        #? 
+        super().__init__()
+        #? str()
+        super().b()
+        #? int()
+        super().c()
+        #? float()
+        self.d()
+
+    @doesnt_exist
+    def d(self):
+        return 1.0
+
+# -----------------
+# others
+# -----------------
+def memoize(function):
+        def wrapper(*args):
+            if random.choice([0, 1]):
+                pass
+            else:
+                rv = function(*args)
+                return rv
+        return wrapper
+
+@memoize
+def follow_statement(stmt):
+    return stmt
+
+# here we had problems with the else clause, because the parent was not right.
+#? int()
+follow_statement(1)
+
+# -----------------
+# class decorators
+# -----------------
+
+# class decorators should just be ignored
+@should_ignore
+class A():
+    def ret(self):
+        return 1
+
+#? int()
+A().ret()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/definition.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/definition.py
new file mode 100644
index 0000000..f896984
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/definition.py
@@ -0,0 +1,68 @@
+"""
+Fallback to callee definition when definition not found.
+- https://github.com/davidhalter/jedi/issues/131
+- https://github.com/davidhalter/jedi/pull/149
+"""
+
+"""Parenthesis closed at next line."""
+
+# Ignore these definitions for a little while, not sure if we really want them.
+# python <= 2.5
+
+#? isinstance
+isinstance(
+)
+
+#? isinstance
+isinstance( 
+)
+
+#? isinstance
+isinstance(None,
+)
+
+#? isinstance
+isinstance(None, 
+)
+
+"""Parenthesis closed at same line."""
+
+# Note: len('isinstance(') == 11
+#? 11 isinstance
+isinstance()
+
+# Note: len('isinstance(None,') == 16
+##? 16 isinstance
+isinstance(None,)
+
+# Note: len('isinstance(None,') == 16
+##? 16 isinstance
+isinstance(None, )
+
+# Note: len('isinstance(None, ') == 17
+##? 17 isinstance
+isinstance(None, )
+
+# Note: len('isinstance( ') == 12
+##? 12 isinstance
+isinstance( )
+
+"""Unclosed parenthesis."""
+
+#? isinstance
+isinstance(
+
+def x(): pass  # acts like EOF
+
+##? isinstance
+isinstance( 
+
+def x(): pass  # acts like EOF
+
+#? isinstance
+isinstance(None,
+
+def x(): pass  # acts like EOF
+
+##? isinstance
+isinstance(None, 
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/descriptors.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/descriptors.py
new file mode 100644
index 0000000..4741778
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/descriptors.py
@@ -0,0 +1,219 @@
+class RevealAccess(object):
+    """
+    A data descriptor that sets and returns values
+    normally and prints a message logging their access.
+    """
+    def __init__(self, initval=None, name='var'):
+        self.val = initval
+        self.name = name
+
+    def __get__(self, obj, objtype):
+        print('Retrieving', self.name)
+        return self.val
+
+    def __set__(self, obj, val):
+        print('Updating', self.name)
+        self.val = val
+
+    def just_a_method(self):
+        pass
+
+class C(object):
+    x = RevealAccess(10, 'var "x"')
+    #? RevealAccess()
+    x
+    #? ['just_a_method']
+    x.just_a_method
+    y = 5.0
+    def __init__(self):
+        #? int()
+        self.x
+
+        #? []
+        self.just_a_method
+        #? []
+        C.just_a_method
+
+m = C()
+#? int()
+m.x
+#? float()
+m.y
+#? int()
+C.x
+
+#? []
+m.just_a_method
+#? []
+C.just_a_method
+
+# -----------------
+# properties
+# -----------------
+class B():
+    @property
+    def r(self):
+        return 1
+    @r.setter
+    def r(self, value):
+        return ''
+    def t(self):
+        return ''
+    p = property(t)
+
+#? []
+B().r().
+#? int()
+B().r
+
+#? str()
+B().p
+#? []
+B().p().
+
+class PropClass():
+    def __init__(self, a):
+        self.a = a
+    @property
+    def ret(self):
+        return self.a
+
+    @ret.setter
+    def ret(self, value):
+        return 1.0
+
+    def ret2(self):
+        return self.a
+    ret2 = property(ret2)
+
+    @property
+    def nested(self):
+        """ causes recusions in properties, should work """
+        return self.ret
+
+    @property
+    def nested2(self):
+        """ causes recusions in properties, should not work """
+        return self.nested2
+
+    @property
+    def join1(self):
+        """ mutual recusion """
+        return self.join2
+
+    @property
+    def join2(self):
+        """ mutual recusion """
+        return self.join1
+
+#? str()
+PropClass("").ret
+#? []
+PropClass().ret.
+
+#? str()
+PropClass("").ret2
+#? 
+PropClass().ret2
+
+#? int()
+PropClass(1).nested
+#? []
+PropClass().nested.
+
+#? 
+PropClass(1).nested2
+#? []
+PropClass().nested2.
+
+#? 
+PropClass(1).join1
+# -----------------
+# staticmethod/classmethod
+# -----------------
+
+class E(object):
+    a = ''
+    def __init__(self, a):
+        self.a = a
+
+    def f(x):
+        return x
+    f = staticmethod(f)
+
+    @staticmethod
+    def g(x):
+        return x
+
+    def s(cls, x):
+        return x
+    s = classmethod(s)
+
+    @classmethod
+    def t(cls, x):
+        return x
+
+    @classmethod
+    def u(cls, x):
+        return cls.a
+
+e = E(1)
+#? int()
+e.f(1)
+#? int()
+E.f(1)
+#? int()
+e.g(1)
+#? int()
+E.g(1)
+
+#? int()
+e.s(1)
+#? int()
+E.s(1)
+#? int()
+e.t(1)
+#? int()
+E.t(1)
+
+#? str()
+e.u(1)
+#? str()
+E.u(1)
+
+# -----------------
+# Conditions
+# -----------------
+
+from functools import partial
+
+
+class Memoize():
+    def __init__(self, func):
+        self.func = func
+
+    def __get__(self, obj, objtype):
+        if obj is None:
+            return self.func
+
+        return partial(self, obj)
+
+    def __call__(self, *args, **kwargs):
+        # We don't do caching here, but that's what would normally happen.
+        return self.func(*args, **kwargs)
+
+
+class MemoizeTest():
+    def __init__(self, x):
+        self.x = x
+
+    @Memoize
+    def some_func(self):
+        return self.x
+
+
+#? int()
+MemoizeTest(10).some_func()
+# Now also call the same function over the class (see if clause above).
+#? float()
+MemoizeTest.some_func(MemoizeTest(10.0))
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/docstring.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/docstring.py
new file mode 100644
index 0000000..338080a
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/docstring.py
@@ -0,0 +1,235 @@
+""" Test docstrings in functions and classes, which are used to infer types """
+
+# -----------------
+# sphinx style
+# -----------------
+def sphinxy(a, b, c, d, x):
+    """ asdfasdf
+    :param a: blablabla
+    :type a: str
+    :type b: (str, int)
+    :type c: random.Random
+    :type d: :class:`random.Random`
+    :param str x: blablabla
+    :rtype: dict
+    """
+    #? str()
+    a
+    #? str()
+    b[0]
+    #? int()
+    b[1]
+    #? ['seed']
+    c.seed
+    #? ['seed']
+    d.seed
+    #? ['lower']
+    x.lower
+
+#? dict()
+sphinxy()
+
+# wrong declarations
+def sphinxy2(a, b, x):
+    """
+    :param a: Forgot type declaration
+    :type a:
+    :param b: Just something
+    :type b: ``
+    :param x: Just something without type
+    :rtype:
+    """
+    #? 
+    a
+    #? 
+    b
+    #?
+    x
+
+#? 
+sphinxy2()
+
+# local classes -> github #370
+class ProgramNode():
+    pass
+
+def local_classes(node, node2):
+    """
+    :type node: ProgramNode
+    ... and the class definition after this func definition:
+    :type node2: ProgramNode2
+    """
+    #? ProgramNode()
+    node
+    #? ProgramNode2()
+    node2
+
+class ProgramNode2():
+    pass
+
+
+def list_with_non_imports(lst):
+    """
+    Should be able to work with tuples and lists and still import stuff.
+
+    :type lst: (random.Random, [collections.defaultdict, ...])
+    """
+    #? ['seed']
+    lst[0].seed
+
+    import collections as col
+    # use some weird index
+    #? col.defaultdict()
+    lst[1][10]
+
+
+def two_dots(a):
+    """
+    :type a: json.decoder.JSONDecoder
+    """
+    #? ['raw_decode']
+    a.raw_decode
+
+
+# sphinx returns
+def return_module_object():
+    """
+    :rtype: :class:`random.Random`
+    """
+
+#? ['seed']
+return_module_object().seed
+
+
+# -----------------
+# epydoc style
+# -----------------
+def epydoc(a, b):
+    """ asdfasdf
+    @type a: str
+    @param a: blablabla
+    @type b: (str, int)
+    @param b: blablah
+    @rtype: list
+    """
+    #? str()
+    a
+    #? str()
+    b[0]
+
+    #? int()
+    b[1]
+
+#? list()
+epydoc()
+
+
+# Returns with param type only
+def rparam(a,b):
+    """
+    @type a: str
+    """
+    return a
+
+#? str()
+rparam()
+
+
+# Composite types
+def composite():
+    """
+    @rtype: (str, int, dict)
+    """
+
+x, y, z = composite()
+#? str()
+x
+#? int()
+y
+#? dict()
+z
+
+
+# Both docstring and calculated return type
+def both():
+    """
+    @rtype: str
+    """
+    return 23
+
+#? str() int()
+both()
+
+class Test(object):
+    def __init__(self):
+        self.teststr = ""
+    """
+    # jedi issue #210
+    """
+    def test(self):
+        #? ['teststr']
+        self.teststr
+
+# -----------------
+# statement docstrings
+# -----------------
+d = ''
+""" bsdf """
+#? str()
+d.upper()
+
+# -----------------
+# class docstrings
+# -----------------
+
+class InInit():
+    def __init__(self, foo):
+        """
+        :type foo: str
+        """
+        #? str()
+        foo
+
+
+class InClass():
+    """
+    :type foo: str
+    """
+    def __init__(self, foo):
+        #? str()
+        foo
+
+
+class InBoth():
+    """
+    :type foo: str
+    """
+    def __init__(self, foo):
+        """
+        :type foo: int
+        """
+        #? str() int()
+        foo
+
+
+def __init__(foo):
+    """
+    :type foo: str
+    """
+    #? str()
+    foo
+
+
+# -----------------
+# Renamed imports (#507)
+# -----------------
+
+import datetime
+from datetime import datetime as datetime_imported
+
+def import_issues(foo):
+    """
+    @type foo: datetime_imported
+    """
+    #? datetime.datetime()
+    foo
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/dynamic_arrays.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/dynamic_arrays.py
new file mode 100644
index 0000000..19cb920
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/dynamic_arrays.py
@@ -0,0 +1,306 @@
+"""
+Checking for ``list.append`` and all the other possible array modifications.
+"""
+# -----------------
+# list.append
+# -----------------
+arr = []
+for a in [1,2]:
+    arr.append(a);
+
+arr.append  # should not cause an exception
+arr.append()  # should not cause an exception
+
+#? int()
+arr[10]
+
+arr = [tuple()]
+for a in [1,2]:
+    arr.append(a);
+
+#? int() tuple()
+arr[10]
+#? int()
+arr[10].index()
+
+arr = list([])
+arr.append(1)
+#? int()
+arr[0]
+
+# -----------------
+# list.insert
+# -----------------
+arr = [""]
+arr.insert(0, 1.0)
+
+# on exception due to this, please!
+arr.insert(0)
+arr.insert()
+
+#? float() str()
+arr[10]
+
+for a in arr:
+    #? float() str()
+    a
+
+#? float() str()
+list(arr)[10]
+
+# -----------------
+# set.add
+# -----------------
+st = {1.0}
+for a in [1,2]:
+    st.add(a)
+
+st.append('')  # lists should not have an influence
+
+st.add  # should not cause an exception
+st.add()
+
+# -----------------
+# list.extend / set.update
+# -----------------
+
+arr = [1.0]
+arr.extend([1,2,3])
+arr.extend([])
+arr.extend("")  # should ignore
+
+#? float() int()
+arr[100]
+
+a = set(arr)
+a.update(list(["", 1]))
+
+#? float() int() str()
+list(a)[0]
+# -----------------
+# set/list initialized as functions
+# -----------------
+
+st = set()
+st.add(1)
+
+#? int()
+for s in st: s
+
+lst = list()
+lst.append(1)
+
+#? int()
+for i in lst: i
+
+# -----------------
+# renames / type changes
+# -----------------
+arr = []
+arr2 = arr
+arr2.append('')
+#? str()
+arr2[0]
+
+
+st = {1.0}
+st.add(1)
+lst = list(st)
+
+lst.append('')
+
+#? float() int() str()
+lst[0]
+
+lst = [1]
+lst.append(1.0)
+s = set(lst)
+s.add("")
+lst = list(s)
+lst.append({})
+
+#? dict() int() float() str()
+lst[0]
+
+# should work with tuple conversion, too.
+#? dict() int() float() str()
+tuple(lst)[0]
+
+# but not with an iterator
+#? 
+iter(lst)[0]
+
+# -----------------
+# complex including +=
+# -----------------
+class C(): pass
+class D(): pass
+class E(): pass
+lst = [1]
+lst.append(1.0)
+lst += [C]
+s = set(lst)
+s.add("")
+s += [D]
+lst = list(s)
+lst.append({})
+lst += [E]
+
+##? dict() int() float() str() C D E
+lst[0]
+
+# -----------------
+# functions
+# -----------------
+
+def arr_append(arr4, a):
+    arr4.append(a)
+
+def add_to_arr(arr2, a):
+    arr2.append(a)
+    return arr2
+
+def app(a):
+    arr3.append(a)
+
+arr3 = [1.0]
+res = add_to_arr(arr3, 1)
+arr_append(arr3, 'str')
+app(set())
+
+#? float() str() int() set()
+arr3[10]
+
+#? float() str() int() set()
+res[10]
+
+# -----------------
+# returns, special because the module dicts are not correct here.
+# -----------------
+def blub():
+    a = []
+    a.append(1.0)
+    #? float()
+    a[0]
+    return a
+
+#? float()
+blub()[0]
+
+# list with default
+def blub():
+    a = list([1])
+    a.append(1.0)
+    return a
+
+#? int() float()
+blub()[0]
+
+# empty list
+def blub():
+    a = list()
+    a.append(1.0)
+    return a
+#? float()
+blub()[0]
+
+# with if
+def blub():
+    if 1:
+        a = []
+        a.append(1.0)
+        return a
+
+#? float()
+blub()[0]
+
+# with else clause
+def blub():
+    if random.choice([0, 1]):
+         1
+    else:
+        a = []
+        a.append(1)
+        return a
+
+#? int()
+blub()[0]
+# -----------------
+# returns, the same for classes
+# -----------------
+class C():
+    def blub(self, b):
+        if 1:
+            a = []
+            a.append(b)
+            return a
+
+    def blub2(self):
+        """ mapper function """
+        a = self.blub(1.0)
+        #? float()
+        a[0]
+        return a
+
+    def literal_arr(self, el):
+        self.a = []
+        self.a.append(el)
+        #? int()
+        self.a[0]
+        return self.a
+
+    def list_arr(self, el):
+        self.b = list([])
+        self.b.append(el)
+        #? float()
+        self.b[0]
+        return self.b
+
+#? int()
+C().blub(1)[0]
+#? float()
+C().blub2(1)[0]
+
+#? int()
+C().a[0]
+#? int()
+C().literal_arr(1)[0]
+
+#? float()
+C().b[0]
+#? float()
+C().list_arr(1.0)[0]
+
+# -----------------
+# array recursions
+# -----------------
+
+a = set([1.0])
+a.update(a)
+a.update([1])
+
+#? float() int()
+list(a)[0]
+
+def first(a):
+    b = []
+    b.append(a)
+    b.extend(second(a))
+    return list(b)
+
+def second(a):
+    b = []
+    b.extend(first(a))
+    return list(b)
+
+#? float()
+first(1.0)[0]
+
+def third():
+    b = []
+    b.extend
+    extend()
+    b.extend(first())
+    return list(b)
+#? 
+third()[0]
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/dynamic_params.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/dynamic_params.py
new file mode 100644
index 0000000..2afc986
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/dynamic_params.py
@@ -0,0 +1,134 @@
+"""
+This is used for dynamic object completion.
+Jedi tries to guess param types with a backtracking approach.
+"""
+def func(a, default_arg=2):
+    #? int()
+    default_arg
+    #? int() str()
+    return a
+
+#? int()
+func(1)
+
+func
+
+int(1) + (int(2))+ func('')
+
+# Again the same function, but with another call.
+def func(a):
+    #? float()
+    return a
+
+func(1.0)
+
+# Again the same function, but with no call.
+def func(a):
+    #? 
+    return a
+
+def func(a):
+    #? float()
+    return a
+str(func(1.0))
+
+# -----------------
+# *args, **args
+# -----------------
+def arg(*args):
+    #? tuple()
+    args
+    #? int()
+    args[0]
+
+arg(1,"")
+# -----------------
+# decorators
+# -----------------
+def def_func(f):
+    def wrapper(*args, **kwargs):
+        return f(*args, **kwargs)
+    return wrapper
+
+@def_func
+def func(c):
+    #? str()
+    return c
+
+#? str()
+func("str")
+
+@def_func
+def func(c=1):
+    #? int() float()
+    return c
+
+func(1.0)
+
+def tricky_decorator(func):
+    def wrapper(*args):
+        return func(1, *args)
+
+    return wrapper
+
+
+@tricky_decorator
+def func(a, b):
+    #? int()
+    a
+    #? float()
+    b
+
+func(1.0)
+
+# Needs to be here, because in this case func is an import -> shouldn't lead to
+# exceptions.
+import sys as func
+func.sys
+
+# -----------------
+# classes
+# -----------------
+
+class A():
+    def __init__(self, a):
+        #? str()
+        a
+
+A("s")
+
+class A():
+    def __init__(self, a):
+        #? int()
+        a
+        self.a = a
+
+    def test(self, a):
+        #? float()
+        a
+        self.c = self.test2()
+
+    def test2(self):
+        #? int()
+        return self.a
+
+    def test3(self):
+        #? int()
+        self.test2()
+        #? int()
+        self.c
+
+A(3).test(2.0)
+A(3).test2()
+
+
+# -----------------
+# list comprehensions
+# -----------------
+
+def from_comprehension(foo):
+    #? int() float()
+    return foo
+
+[from_comprehension(1.0) for n in (1,)]
+[from_comprehension(n) for n in (1,)]
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/flow_analysis.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/flow_analysis.py
new file mode 100644
index 0000000..2840d9e
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/flow_analysis.py
@@ -0,0 +1,257 @@
+def foo(x):
+    if 1.0:
+        return 1
+    else:
+        return ''
+
+#? int()
+foo(1)
+
+
+#  Exceptions are not analyzed. So check both if branches
+def try_except(x):
+    try:
+        if 0:
+            return 1
+        else:
+            return ''
+    except AttributeError:
+        return 1.0
+
+#? float() str()
+try_except(1)
+
+
+#  Exceptions are not analyzed. So check both if branches
+def try_except(x):
+    try:
+        if 0:
+            return 1
+        else:
+            return ''
+    except AttributeError:
+        return 1.0
+
+#? float() str()
+try_except(1)
+
+
+# -----------------
+# elif
+# -----------------
+
+def elif_flows1(x):
+    if False:
+        return 1
+    elif True:
+        return 1.0
+    else:
+        return ''
+
+#? float()
+elif_flows1(1)
+
+
+def elif_flows2(x):
+    try:
+        if False:
+            return 1
+        elif 0:
+            return 1.0
+        else:
+            return ''
+    except ValueError:
+        return set
+
+#? str() set
+elif_flows2(1)
+
+
+def elif_flows3(x):
+    try:
+        if True:
+            return 1
+        elif 0:
+            return 1.0
+        else:
+            return ''
+    except ValueError:
+        return set
+
+#? int() set
+elif_flows3(1)
+
+# -----------------
+# mid-difficulty if statements
+# -----------------
+def check(a):
+    if a is None:
+        return 1
+    return ''
+    return set
+
+#? int()
+check(None)
+#? str()
+check('asb')
+
+a = list
+if 2 == True:
+    a = set
+elif 1 == True:
+    a = 0
+
+#? int()
+a
+if check != 1:
+    a = ''
+#? str()
+a
+if check == check:
+    a = list
+#? list
+a
+if check != check:
+    a = set
+else:
+    a = dict
+#? dict
+a
+if not (check is not check):
+    a = 1
+#? int()
+a
+
+
+# -----------------
+# name resolution
+# -----------------
+
+a = list
+def elif_name(x):
+    try:
+        if True:
+            a = 1
+        elif 0:
+            a = 1.0
+        else:
+            return ''
+    except ValueError:
+        a = x
+    return a
+
+#? int() set
+elif_name(set)
+
+if 0:
+    a = ''
+else:
+    a = int
+
+#? int
+a
+
+# -----------------
+# isinstance
+# -----------------
+
+class A(): pass
+
+def isinst(x):
+    if isinstance(x, A):
+        return dict
+    elif isinstance(x, int) and x == 1 or x is True:
+        return set
+    elif isinstance(x, (float, reversed)):
+        return list
+    elif not isinstance(x, str):
+        return tuple
+    return 1
+
+#? dict
+isinst(A())
+#? set
+isinst(True)
+#? set
+isinst(1)
+#? tuple
+isinst(2)
+#? list
+isinst(1.0)
+#? tuple
+isinst(False)
+#? int()
+isinst('')
+
+# -----------------
+# flows that are not reachable should be able to access parent scopes.
+# -----------------
+
+foobar = ''
+
+if 0:
+    within_flow = 1.0
+    #? float()
+    within_flow
+    #? str()
+    foobar
+    if 0:
+        nested = 1
+        #? int()
+        nested
+        #? float()
+        within_flow
+        #? str()
+        foobar
+    #?
+    nested
+
+# -----------------
+# True objects like modules
+# -----------------
+
+class X():
+    pass
+if X:
+    a = 1
+else:
+    a = ''
+#? int()
+a
+
+
+# -----------------
+# Recursion issues
+# -----------------
+
+def possible_recursion_error(filename):
+    if filename == 'a':
+        return filename
+    # It seems like without the brackets there wouldn't be a RecursionError.
+    elif type(filename) == str:
+        return filename
+
+
+if NOT_DEFINED:
+    s = str()
+else:
+    s = str()
+#? str()
+possible_recursion_error(s)
+
+
+# -----------------
+# In combination with imports
+# -----------------
+
+from import_tree import flow_import
+
+if 1 == flow_import.env:
+    a = 1
+elif 2 == flow_import.env:
+    a = ''
+elif 3 == flow_import.env:
+    a = 1.0
+
+#? int() str()
+a
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/functions.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/functions.py
new file mode 100644
index 0000000..c1a40e5
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/functions.py
@@ -0,0 +1,475 @@
+def array(first_param):
+    #? ['first_param']
+    first_param
+    return list()
+
+#? []
+array.first_param
+#? []
+array.first_param.
+func = array
+#? []
+func.first_param
+
+#? list()
+array()
+
+#? ['array']
+arr
+
+
+def inputs(param):
+    return param
+
+#? list
+inputs(list)
+
+def variable_middle():
+    var = 3
+    return var
+
+#? int()
+variable_middle()
+
+def variable_rename(param):
+    var = param
+    return var
+
+#? int()
+variable_rename(1)
+
+def multi_line_func(a, # comment blabla
+
+                    b):
+    return b
+
+#? str()
+multi_line_func(1,'')
+
+def multi_line_call(b):
+    return b
+
+
+multi_line_call(
+#? int()
+  b=1)
+
+
+# nothing after comma
+def asdf(a):
+    return a
+
+x = asdf(a=1,
+    )
+#? int()
+x
+
+# -----------------
+# double execution
+# -----------------
+def double_exe(param):
+    return param
+
+#? str()
+variable_rename(double_exe)("")
+
+# -> shouldn't work (and throw no error)
+#? []
+variable_rename(list())().
+#? []
+variable_rename(1)().
+
+# -----------------
+# recursions (should ignore)
+# -----------------
+def recursion(a, b):
+    if a:
+        return b
+    else:
+        return recursion(a+".", b+1)
+
+# Does not also return int anymore, because we now support operators in simple cases.
+#? float()
+recursion("a", 1.0)
+
+def other(a):
+    return recursion2(a)
+
+def recursion2(a):
+    if random.choice([0, 1]):
+        return other(a)
+    else:
+        if random.choice([0, 1]):
+            return recursion2("")
+        else:
+            return a
+
+#? int() str()
+recursion2(1)
+
+# -----------------
+# ordering
+# -----------------
+
+def a():
+    #? int()
+    b()
+    return b()
+
+def b():
+    return 1
+
+#? int()
+a()
+
+# -----------------
+# keyword arguments
+# -----------------
+
+def func(a=1, b=''):
+    return a, b
+
+exe = func(b=list, a=tuple)
+#? tuple
+exe[0]
+
+#? list
+exe[1]
+
+# -----------------
+# default arguments
+# -----------------
+
+#? int()
+func()[0]
+#? str()
+func()[1]
+#? float()
+func(1.0)[0]
+#? str()
+func(1.0)[1]
+
+
+#? float()
+func(a=1.0)[0]
+#? str()
+func(a=1.0)[1]
+#? int()
+func(b=1.0)[0]
+#? float()
+func(b=1.0)[1]
+#? list
+func(a=list, b=set)[0]
+#? set
+func(a=list, b=set)[1]
+
+
+def func_default(a, b=1):
+    return a, b
+
+
+def nested_default(**kwargs):
+    return func_default(**kwargs)
+
+#? float()
+nested_default(a=1.0)[0]
+#? int()
+nested_default(a=1.0)[1]
+#? str()
+nested_default(a=1.0, b='')[1]
+
+# Defaults should only work if they are defined before - not after.
+def default_function(a=default):
+    #?
+    return a
+
+#?
+default_function()
+
+default = int()
+
+def default_function(a=default):
+    #? int()
+    return a
+
+#? int()
+default_function()
+
+
+# -----------------
+# closures
+# -----------------
+def a():
+    l = 3
+    def func_b():
+        l = ''
+        #? str()
+        l
+    #? ['func_b']
+    func_b
+    #? int()
+    l
+
+# -----------------
+# *args
+# -----------------
+
+def args_func(*args):
+    #? tuple()
+    return args
+
+exe = args_func(1, "")
+#? int()
+exe[0]
+#? str()
+exe[1]
+
+# illegal args (TypeError)
+#?
+args_func(*1)[0]
+# iterator
+#? int()
+args_func(*iter([1]))[0]
+
+# different types
+e = args_func(*[1+"", {}])
+#? int() str()
+e[0]
+#? dict()
+e[1]
+
+_list = [1,""]
+exe2 = args_func(_list)[0]
+
+#? str()
+exe2[1]
+
+exe3 = args_func([1,""])[0]
+
+#? str()
+exe3[1]
+
+def args_func(arg1, *args):
+    return arg1, args
+
+exe = args_func(1, "", list)
+#? int()
+exe[0]
+#? tuple()
+exe[1]
+#? list
+exe[1][1]
+
+
+# In a dynamic search, both inputs should be given.
+def simple(a):
+    #? int() str()
+    return a
+def xargs(*args):
+    return simple(*args)
+
+xargs(1)
+xargs('')
+
+
+# *args without a self symbol
+def memoize(func):
+    def wrapper(*args, **kwargs):
+        return func(*args, **kwargs)
+    return wrapper
+
+
+class Something():
+    @memoize
+    def x(self, a, b=1):
+        return a
+
+#? int()
+Something().x(1)
+
+
+# -----------------
+# ** kwargs
+# -----------------
+def kwargs_func(**kwargs):
+    #? ['keys']
+    kwargs.keys
+    #? dict()
+    return kwargs
+
+exe = kwargs_func(a=3,b=4.0)
+#? dict()
+exe
+#? int()
+exe['a']
+#? float()
+exe['b']
+#? int() float()
+exe['c']
+
+a = 'a'
+exe2 = kwargs_func(**{a:3,
+                      'b':4.0})
+#? int()
+exe2['a']
+#? float()
+exe2['b']
+#? int() float()
+exe2['c']
+
+# -----------------
+# *args / ** kwargs
+# -----------------
+
+def func_without_call(*args, **kwargs):
+    #? tuple()
+    args
+    #? dict()
+    kwargs
+
+def fu(a=1, b="", *args, **kwargs):
+    return a, b, args, kwargs
+
+exe = fu(list, 1, "", c=set, d="")
+
+#? list
+exe[0]
+#? int()
+exe[1]
+#? tuple()
+exe[2]
+#? str()
+exe[2][0]
+#? dict()
+exe[3]
+#? set
+exe[3]['c']
+
+
+def kwargs_iteration(**kwargs):
+    return kwargs
+
+for x in kwargs_iteration(d=3):
+    #? float()
+    {'d': 1.0, 'c': '1'}[x]
+
+
+# -----------------
+# nested *args
+# -----------------
+def function_args(a, b, c):
+    return b
+
+def nested_args(*args):
+    return function_args(*args)
+
+def nested_args2(*args, **kwargs):
+    return nested_args(*args)
+
+#? int()
+nested_args('', 1, 1.0, list)
+#? []
+nested_args('').
+
+#? int()
+nested_args2('', 1, 1.0)
+#? []
+nested_args2('').
+
+# -----------------
+# nested **kwargs
+# -----------------
+def nested_kw(**kwargs1):
+    return function_args(**kwargs1)
+
+def nested_kw2(**kwargs2):
+    return nested_kw(**kwargs2)
+
+# invalid command, doesn't need to return anything
+#? 
+nested_kw(b=1, c=1.0, list)
+#? int()
+nested_kw(b=1)
+# invalid command, doesn't need to return anything
+#?  
+nested_kw(d=1.0, b=1, list)
+#? int()
+nested_kw(a=3.0, b=1)
+#? int()
+nested_kw(b=1, a=r"")
+#? []
+nested_kw(1, '').
+#? []
+nested_kw(a='').
+
+#? int()
+nested_kw2(b=1)
+#? int()
+nested_kw2(b=1, c=1.0)
+#? int()
+nested_kw2(c=1.0, b=1)
+#? []
+nested_kw2('').
+#? []
+nested_kw2(a='').
+#? []
+nested_kw2('', b=1).
+
+# -----------------
+# nested *args/**kwargs
+# -----------------
+def nested_both(*args, **kwargs):
+    return function_args(*args, **kwargs)
+
+def nested_both2(*args, **kwargs):
+    return nested_both(*args, **kwargs)
+
+# invalid commands, may return whatever.
+#? list
+nested_both('', b=1, c=1.0, list)
+#? list
+nested_both('', c=1.0, b=1, list)
+
+#? []
+nested_both('').
+
+#? int()
+nested_both2('', b=1, c=1.0)
+#? int()
+nested_both2('', c=1.0, b=1)
+#? []
+nested_both2('').
+
+# -----------------
+# nested *args/**kwargs with a default arg
+# -----------------
+def function_def(a, b, c):
+    return a, b
+
+def nested_def(a, *args, **kwargs):
+    return function_def(a, *args, **kwargs)
+
+def nested_def2(*args, **kwargs):
+    return nested_def(*args, **kwargs)
+
+#? str()
+nested_def2('', 1, 1.0)[0]
+#? str()
+nested_def2('', b=1, c=1.0)[0]
+#? str()
+nested_def2('', c=1.0, b=1)[0]
+#? int()
+nested_def2('', 1, 1.0)[1]
+#? int()
+nested_def2('', b=1, c=1.0)[1]
+#? int()
+nested_def2('', c=1.0, b=1)[1]
+#? []
+nested_def2('')[1].
+
+# -----------------
+# magic methods
+# -----------------
+def a(): pass
+#? ['__closure__']
+a.__closure__
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/generators.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/generators.py
new file mode 100644
index 0000000..d8eba2d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/generators.py
@@ -0,0 +1,199 @@
+# -----------------
+# yield statement
+# -----------------
+def gen():
+    if random.choice([0, 1]):
+        yield 1
+    else:
+        yield ""
+
+gen_exe = gen()
+#? int() str()
+next(gen_exe)
+
+#? int() str() list
+next(gen_exe, list)
+
+
+def gen_ret(value):
+    yield value
+
+#? int()
+next(gen_ret(1))
+
+#? []
+next(gen_ret()).
+
+# generators evaluate to true if cast by bool.
+a = ''
+if gen_ret():
+    a = 3
+#? int()
+a
+
+
+# -----------------
+# generators should not be indexable
+# -----------------
+def get(param):
+    if random.choice([0, 1]):
+        yield 1
+    else:
+        yield ""
+
+#? []
+get()[0].
+
+# -----------------
+# __iter__
+# -----------------
+for a in get():
+    #? int() str()
+    a
+
+
+class Get():
+    def __iter__(self):
+        if random.choice([0, 1]):
+            yield 1
+        else:
+            yield ""
+
+b = []
+for a in Get():
+    #? int() str()
+    a
+    b += [a]
+
+#? list()
+b
+#? int() str()
+b[0]
+
+g = iter(Get())
+#? int() str()
+next(g)
+
+g = iter([1.0])
+#? float()
+next(g)
+
+
+# -----------------
+# __next__
+# -----------------
+class Counter:
+    def __init__(self, low, high):
+        self.current = low
+        self.high = high
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        """ need to have both __next__ and next, because of py2/3 testing """
+        return self.__next__()
+
+    def __next__(self):
+        if self.current > self.high:
+            raise StopIteration
+        else:
+            self.current += 1
+            return self.current - 1
+
+
+for c in Counter(3, 8):
+    #? int()
+    print c
+
+
+# -----------------
+# tuples
+# -----------------
+def gen():
+    if random.choice([0,1]):
+        yield 1, ""
+    else:
+        yield 2, 1.0
+
+
+a, b = next(gen())
+#? int()
+a
+#? str() float()
+b
+
+
+def simple():
+    if random.choice([0, 1]):
+        yield 1
+    else:
+        yield ""
+
+a, b = simple()
+#? int() str()
+a
+# For now this is ok.
+#?
+b
+
+
+def simple2():
+    yield 1
+    yield ""
+
+a, b = simple2()
+#? int()
+a
+#? str()
+b
+
+
+# -----------------
+# More complicated access
+# -----------------
+
+# `close` is a method wrapper.
+#? ['__call__']
+gen().close.__call__
+
+#? 
+gen().throw()
+
+#? ['co_consts']
+gen().gi_code.co_consts
+
+#? []
+gen.gi_code.co_consts
+
+# `send` is also a method wrapper.
+#? ['__call__']
+gen().send.__call__
+
+#? tuple()
+gen().send()
+
+#? 
+gen()()
+
+# -----------------
+# yield from
+# -----------------
+
+# python >= 3.3
+
+def yield_from():
+    yield from iter([1])
+
+#? int()
+next(yield_from())
+
+def yield_from_multiple():
+    yield from iter([1])
+    yield str()
+
+x, y = yield_from_multiple()
+#? int()
+x
+#? str()
+y
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/goto.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/goto.py
new file mode 100644
index 0000000..ef9938c
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/goto.py
@@ -0,0 +1,231 @@
+# goto_assignments command tests are different in syntax
+
+definition = 3
+#! 0 ['a = definition']
+a = definition
+
+#! []
+b
+#! ['a = definition']
+a
+
+b = a
+c = b
+#! ['c = b']
+c
+
+cd = 1
+#! 1 ['cd = c']
+cd = c
+#! 0 ['cd = e']
+cd = e
+
+#! ['module math']
+import math
+#! ['import math']
+math
+
+#! ['import math']
+b = math
+#! ['b = math']
+b
+
+#! 18 ['foo = 10']
+foo = 10;print(foo)
+
+# -----------------
+# classes
+# -----------------
+class C(object):
+    def b(self):
+        #! ['b = math']
+        b
+        #! ['def b']
+        self.b
+        #! 14 ['def b']
+        self.b()
+        #! 11 ['self']
+        self.b
+        return 1
+
+    #! ['def b']
+    b
+
+#! ['b = math']
+b
+
+#! ['def b']
+C.b
+#! ['def b']
+C().b
+#! 0 ['class C']
+C().b
+#! 0 ['class C']
+C().b
+
+D = C
+#! ['def b']
+D.b
+#! ['def b']
+D().b
+
+#! 0 ['D = C']
+D().b
+#! 0 ['D = C']
+D().b
+
+def c():
+    return ''
+
+#! ['def c']
+c
+#! 0 ['def c']
+c()
+
+
+class ClassVar():
+    x = 3
+
+#! ['x = 3']
+ClassVar.x
+#! ['x = 3']
+ClassVar().x
+
+# before assignments
+#! 10 ['x = 3']
+ClassVar.x = ''
+#! 12 ['x = 3']
+ClassVar().x = ''
+
+# Recurring use of the same var name, github #315
+def f(t=None):
+    #! 9 ['t=None']
+    t = t or 1
+
+
+class X():
+    pass
+
+#! 3 []
+X(foo=x)
+
+# -----------------
+# imports
+# -----------------
+
+#! ['module import_tree']
+import import_tree
+#! ["a = ''"]
+import_tree.a
+
+#! ['module mod1']
+import import_tree.mod1
+#! ['a = 1']
+import_tree.mod1.a
+
+#! ['module pkg']
+import import_tree.pkg
+#! ['a = list']
+import_tree.pkg.a
+
+#! ['module mod1']
+import import_tree.pkg.mod1
+#! ['a = 1.0']
+import_tree.pkg.mod1.a
+#! ["a = ''"]
+import_tree.a
+
+#! ['module mod1']
+from import_tree.pkg import mod1
+#! ['a = 1.0']
+mod1.a
+
+#! ['module mod1']
+from import_tree import mod1
+#! ['a = 1']
+mod1.a
+
+#! ['a = 1.0']
+from import_tree.pkg.mod1 import a
+
+#! ['import os']
+from .imports import os
+
+#! ['some_variable = 1']
+from . import some_variable
+
+# -----------------
+# anonymous classes
+# -----------------
+def func():
+    class A():
+        def b(self):
+            return 1
+    return A()
+
+#! 8 ['def b']
+func().b()
+
+# -----------------
+# on itself
+# -----------------
+
+#! 7 ['class ClassDef']
+class ClassDef():
+    """ abc """
+    pass
+
+# -----------------
+# params
+# -----------------
+
+param = ClassDef
+#! 8 ['param']
+def ab1(param): pass
+#! 9 ['param']
+def ab2(param): pass
+#! 11 ['param = ClassDef']
+def ab3(a=param): pass
+
+ab1(ClassDef);ab2(ClassDef);ab3(ClassDef)
+
+# -----------------
+# for loops
+# -----------------
+
+for i in range(1):
+    #! ['for i in range(1): i']
+    i
+
+for key, value in [(1,2)]:
+    #! ['for key, value in [(1,2)]: key']
+    key
+
+for i in []:
+    #! ['for i in []: i']
+    i
+
+# -----------------
+# decorator
+# -----------------
+def dec(dec_param=3):
+    pass
+
+#! 8 ['dec_param=3']
+@dec(dec_param=5)
+def y():
+    pass
+
+class ClassDec():
+    def class_func(func):
+        return func
+
+#! 14 ['def class_func']
+@ClassDec.class_func
+def x():
+    pass
+
+#! 2 ['class ClassDec']
+@ClassDec.class_func
+def z():
+    pass
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/__init__.py
new file mode 100644
index 0000000..5cbbcd7
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/__init__.py
@@ -0,0 +1,7 @@
+a = ''
+
+from . import invisible_pkg
+
+the_pkg = invisible_pkg
+
+invisible_pkg = 1
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/flow_import.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/flow_import.py
new file mode 100644
index 0000000..a0a779e
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/flow_import.py
@@ -0,0 +1,4 @@
+if name:
+    env = 1
+else:
+    env = 2
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/invisible_pkg.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/invisible_pkg.py
new file mode 100644
index 0000000..9c78ce2
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/invisible_pkg.py
@@ -0,0 +1,7 @@
+"""
+It should not be possible to import this pkg except for the import_tree itself,
+because it is overwritten there. (It would be possible with a sys.path
+modification, though).
+"""
+
+foo = 1.0
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/mod1.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/mod1.py
new file mode 100644
index 0000000..bd696d6
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/mod1.py
@@ -0,0 +1,4 @@
+a = 1
+from import_tree.random import a as c
+
+foobarbaz = 3.0
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/mod2.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/mod2.py
new file mode 100644
index 0000000..19914f5
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/mod2.py
@@ -0,0 +1 @@
+from . import mod1 as fake
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/pkg/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/pkg/__init__.py
new file mode 100644
index 0000000..480f222
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/pkg/__init__.py
@@ -0,0 +1,3 @@
+a = list
+
+from math import *
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/pkg/mod1.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/pkg/mod1.py
new file mode 100644
index 0000000..2b6777c
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/pkg/mod1.py
@@ -0,0 +1 @@
+a = 1.0
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/random.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/random.py
new file mode 100644
index 0000000..a63ed05
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/random.py
@@ -0,0 +1,4 @@
+"""
+Here because random is also a builtin module.
+"""
+a = set
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/recurse_class1.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/recurse_class1.py
new file mode 100644
index 0000000..773408c
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/recurse_class1.py
@@ -0,0 +1,5 @@
+import recurse_class2
+
+class C(recurse_class2.C):
+    def a(self):
+        pass
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/recurse_class2.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/recurse_class2.py
new file mode 100644
index 0000000..42f84ef
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/recurse_class2.py
@@ -0,0 +1,4 @@
+import recurse_class1
+
+class C(recurse_class1.C):
+    pass
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/rename1.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/rename1.py
new file mode 100644
index 0000000..bdc3315
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/rename1.py
@@ -0,0 +1,3 @@
+""" used for renaming tests """
+
+abc = 3
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/rename2.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/rename2.py
new file mode 100644
index 0000000..8423895
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/import_tree/rename2.py
@@ -0,0 +1,6 @@
+""" used for renaming tests """
+
+
+from rename1 import abc
+
+abc
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/imports.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/imports.py
new file mode 100644
index 0000000..246b91e
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/imports.py
@@ -0,0 +1,285 @@
+# -----------------
+# own structure
+# -----------------
+
+# do separate scopes
+def scope_basic():
+    from import_tree import mod1
+
+    #? int()
+    mod1.a
+
+    #? []
+    import_tree.a
+
+    #? []
+    import_tree.mod1
+
+    import import_tree
+    #? str()
+    import_tree.a
+
+
+def scope_pkg():
+    import import_tree.mod1
+
+    #? str()
+    import_tree.a
+
+    #? ['mod1']
+    import_tree.mod1
+
+    #? int()
+    import_tree.mod1.a
+
+def scope_nested():
+    import import_tree.pkg.mod1
+
+    #? str()
+    import_tree.a
+
+    #? list
+    import_tree.pkg.a
+
+    #? ['sqrt']
+    import_tree.pkg.sqrt
+
+    #? ['pkg']
+    import_tree.p
+
+    #? float()
+    import_tree.pkg.mod1.a
+    #? ['a', '__name__', '__package__', '__file__', '__doc__']
+    a = import_tree.pkg.mod1.
+
+    import import_tree.random
+    #? set
+    import_tree.random.a
+
+def scope_nested2():
+    """Multiple modules should be indexable, if imported"""
+    import import_tree.mod1
+    import import_tree.pkg
+    #? ['mod1']
+    import_tree.mod1
+    #? ['pkg']
+    import_tree.pkg
+
+    # With the latest changes this completion also works, because submodules
+    # are always included (some nested import structures lead to this,
+    # typically).
+    #? ['rename1']
+    import_tree.rename1
+
+def scope_from_import_variable():
+    """
+    All of them shouldn't work, because "fake" imports don't work in python
+    without the use of ``sys.modules`` modifications (e.g. ``os.path`` see also
+    github issue #213 for clarification.
+    """
+    a = 3
+    #? 
+    from import_tree.mod2.fake import a
+    #? 
+    from import_tree.mod2.fake import c
+
+    #? 
+    a
+    #? 
+    c
+
+def scope_from_import_variable_with_parenthesis():
+    from import_tree.mod2.fake import (
+        a, foobarbaz
+    )
+
+    #? 
+    a
+    #? 
+    foobarbaz
+    # shouldn't complete, should still list the name though.
+    #? ['foobarbaz']
+    foobarbaz
+
+
+def as_imports():
+    from import_tree.mod1 import a as xyz
+    #? int()
+    xyz
+    import not_existant, import_tree.mod1 as foo
+    #? int()
+    foo.a
+    import import_tree.mod1 as bar
+    #? int()
+    bar.a
+
+
+def test_import_priorities():
+    """
+    It's possible to overwrite import paths in an ``__init__.py`` file, by
+    just assigining something there.
+
+    See also #536.
+    """
+    from import_tree import the_pkg, invisible_pkg
+    #? int()
+    invisible_pkg
+    # In real Python, this would be the module, but it's not, because Jedi
+    # doesn't care about most stateful issues such as __dict__, which it would
+    # need to, to do this in a correct way.
+    #? int()
+    the_pkg
+    # Importing foo is still possible, even though inivisible_pkg got changed.
+    #? float()
+    from import_tree.invisible_pkg import foo
+
+
+# -----------------
+# std lib modules
+# -----------------
+import tokenize
+#? ['tok_name']
+tokenize.tok_name
+
+from pyclbr import *
+
+#? ['readmodule_ex']
+readmodule_ex
+import os
+
+#? ['dirname']
+os.path.dirname
+
+from os.path import (
+    expanduser
+)
+
+#? os.path.expanduser
+expanduser
+
+from itertools import (tee,
+                       islice)
+#? ['islice']
+islice
+
+from functools import (partial, wraps)
+#? ['wraps']
+wraps
+
+from keyword import kwlist, \
+                    iskeyword
+#? ['kwlist']
+kwlist
+
+#? []
+from keyword import not_existing1, not_existing2
+
+from tokenize import io
+tokenize.generate_tokens
+
+# -----------------
+# builtins
+# -----------------
+
+import sys
+#? ['prefix']
+sys.prefix
+
+#? ['append']
+sys.path.append
+
+from math import *
+#? ['cos', 'cosh']
+cos
+
+def func_with_import():
+    import time
+    return time
+
+#? ['sleep']
+func_with_import().sleep
+
+# -----------------
+# relative imports
+# -----------------
+
+from .import_tree import mod1
+#? int()
+mod1.a
+
+from ..import_tree import mod1
+#? 
+mod1.a
+
+from .......import_tree import mod1
+#? 
+mod1.a
+
+from .. import helpers
+#? int()
+helpers.sample_int
+
+from ..helpers import sample_int as f
+#? int()
+f
+
+from . import run
+#? []
+run.
+
+from . import import_tree as imp_tree
+#? str()
+imp_tree.a
+
+from . import datetime as mod1
+#? []
+mod1.
+
+# self import
+# this can cause recursions
+from imports import *
+
+# -----------------
+# packages
+# -----------------
+
+from import_tree.mod1 import c
+#? set
+c
+
+from import_tree import recurse_class1
+
+#? ['a']
+recurse_class1.C.a
+# github #239 RecursionError
+#? ['a']
+recurse_class1.C().a
+
+# -----------------
+# Jedi debugging
+# -----------------
+
+# memoizing issues (check git history for the fix)
+import not_existing_import
+
+if not_existing_import:
+    a = not_existing_import
+else:
+    a = not_existing_import
+#? 
+a
+
+# -----------------
+# module underscore descriptors
+# -----------------
+
+def underscore():
+    import keyword
+    #? ['__file__']
+    keyword.__file__
+    #? str()
+    keyword.__file__
+
+    # Does that also work for the our own module?
+    #? ['__file__']
+    __file__
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/invalid.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/invalid.py
new file mode 100644
index 0000000..7c047e6
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/invalid.py
@@ -0,0 +1,214 @@
+"""
+This file is less about the results and much more about the fact, that no
+exception should be thrown.
+
+Basically this file could change depending on the current implementation. But
+there should never be any errors.
+"""
+
+# wait until keywords are out of definitions (pydoc function).
+##? 5 
+'s'()
+
+#? []
+str()).upper
+
+# -----------------
+# funcs
+# -----------------
+def asdf(a or b): # multiple param names
+    return a
+
+#? 
+asdf(2)
+
+asdf = ''
+
+from a import (b
+def blub():
+    return 0
+def wrong_indents():
+    asdf = 3
+     asdf
+    asdf(
+    # TODO this seems to be wrong now?
+    ##? int()
+    asdf
+def openbrace():
+    asdf = 3
+    asdf(
+    #? int()
+    asdf
+    return 1
+
+#? int()
+openbrace()
+
+blub([
+#? int()
+openbrace()
+
+def indentfault():
+    asd(
+ indentback
+
+#? []
+indentfault().
+
+def openbrace2():
+    asd(
+def normalfunc():
+    return 1
+
+#? int()
+normalfunc()
+
+# dots in param
+def f(seq1...=None):
+    return seq1
+#?
+f(1)
+
+@
+def test_empty_decorator():
+    return 1
+
+#? int()
+test_empty_decorator()
+
+def invalid_param(param=):
+    #? 
+    param
+# -----------------
+# flows
+# -----------------
+
+# first part not complete (raised errors)
+if a
+    a
+else:
+    #? ['AttributeError']
+    AttributeError
+
+try
+#? ['AttributeError']
+except AttributeError
+    pass
+finally:
+    pass
+
+#? ['isinstance']
+if isi
+try:
+    except TypeError:
+        #? str()
+        str()
+
+def break(): pass
+# wrong ternary expression
+a = ''
+a = 1 if
+#? str()
+a
+
+# No completions for for loops without the right syntax
+for for_local in :
+    for_local
+#? []
+for_local
+#? 
+for_local
+
+
+# -----------------
+# list comprehensions
+# -----------------
+
+a2 = [for a2 in [0]]
+#? 
+a2[0]
+
+a3 = [for xyz in]
+#? 
+a3[0]
+
+a3 = [a4 for in 'b']
+#? 
+a3[0]
+
+a3 = [a4 for a in for x in y]
+#? 
+a3[0]
+
+a = [for a in
+def break(): pass
+
+#? 
+a[0]
+
+a = [a for a in [1,2]
+def break(): pass
+#?
+a[0]
+
+#? []
+int()).real
+
+# -----------------
+# keywords
+# -----------------
+
+#! []
+as
+
+def empty_assert():
+    x = 3
+    assert
+    #? int()
+    x
+
+import datetime as 
+
+
+# -----------------
+# statements
+# -----------------
+
+call = ''
+invalid = .call
+#? 
+invalid
+
+invalid = call?.call
+#? str()
+invalid
+
+# comma
+invalid = ,call
+#? str()
+invalid
+
+
+# -----------------
+# classes
+# -----------------
+
+class BrokenPartsOfClass():
+    def foo(self):
+        # This construct contains two places where Jedi with Python 3 can fail.
+        # It should just ignore those constructs and still execute `bar`.
+        pass
+        if 2:
+            try:
+                pass
+            except ValueError, e:
+                raise TypeError, e
+        else:
+            pass
+
+    def bar(self):
+        self.x = 3
+        return ''
+
+#? str()
+BrokenPartsOfClass().bar()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/isinstance.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/isinstance.py
new file mode 100644
index 0000000..7101150
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/isinstance.py
@@ -0,0 +1,100 @@
+if isinstance(i, str):
+    #? str()
+    i
+
+if isinstance(j, (str, int)):
+    #? str() int()
+    j
+
+while isinstance(k, (str, int)):
+    #? str() int()
+    k
+
+if not isinstance(k, (str, int)):
+    #? 
+    k
+
+while not isinstance(k, (str, int)):
+    #? 
+    k
+
+assert isinstance(ass, int)
+#? int()
+ass
+
+assert isinstance(ass, str)
+assert not isinstance(ass, int)
+
+if 2:
+    #? str()
+    ass
+
+# -----------------
+# invalid arguments
+# -----------------
+
+if isinstance(wrong, str()):
+    #?
+    wrong
+
+# -----------------
+# in functions
+# -----------------
+
+import datetime
+
+
+def fooooo(obj):
+    if isinstance(obj, datetime.datetime):
+        #? datetime.datetime()
+        obj
+
+
+def fooooo2(obj):
+    if isinstance(obj, datetime.date):
+        return obj
+    else:
+        return 1
+
+a
+# In earlier versions of Jedi, this returned both datetime and int, but now
+# Jedi does flow checks and realizes that the top return isn't executed.
+#? int()
+fooooo2('')
+
+
+def isinstance_func(arr):
+    for value in arr:
+        if isinstance(value, dict):
+            # Shouldn't fail, even with the dot.
+            #? 17 dict()
+            value.
+        elif isinstance(value, int):
+            x = value
+            #? int()
+            x
+
+# -----------------
+# Names with multiple indices.
+# -----------------
+
+class Test():
+    def __init__(self, testing):
+        if isinstance(testing, str):
+            self.testing = testing
+        else:
+            self.testing = 10
+
+    def boo(self):
+        if isinstance(self.testing, str):
+            #? str()
+            self.testing
+            #? Test()
+            self
+
+# -----------------
+# Syntax
+# -----------------
+
+#?
+isinstance(1, int())
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/keywords.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/keywords.py
new file mode 100644
index 0000000..9631e8d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/keywords.py
@@ -0,0 +1,59 @@
+
+#? ['raise']
+raise
+
+#? ['Exception']
+except
+
+#? []
+b + continu
+
+#? []
+b + continue
+
+#? ['continue']
+b; continue
+
+#? ['continue']
+b; continu
+
+#? []
+c + brea
+
+#? []
+a + break
+
+#? ['break']
+b; break
+
+# -----------------
+# Keywords should not appear everywhere.
+# -----------------
+
+#? []
+with open() as f
+#? []
+def i
+#? []
+class i
+
+#? []
+continue i
+
+# More syntax details, e.g. while only after newline, but not after semicolon,
+# continue also after semicolon
+#? ['while']
+while
+#? []
+x while
+#? []
+x; while
+#? ['continue']
+x; continue
+
+#? []
+and
+#? ['and']
+x and
+#? []
+x * and
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/lambdas.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/lambdas.py
new file mode 100644
index 0000000..d739169
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/lambdas.py
@@ -0,0 +1,106 @@
+# -----------------
+# lambdas
+# -----------------
+a = lambda: 3
+#? int()
+a()
+
+x = []
+a = lambda x: x
+#? int()
+a(0)
+
+#? float()
+(lambda x: x)(3.0)
+
+arg_l = lambda x, y: y, x
+#? float()
+arg_l[0]('', 1.0)
+#? list()
+arg_l[1]
+
+arg_l = lambda x, y: (y, x)
+args = 1,""
+result = arg_l(*args)
+#? tuple()
+result
+#? str()
+result[0]
+#? int()
+result[1]
+
+def with_lambda(callable_lambda, *args, **kwargs):
+    return callable_lambda(1, *args, **kwargs)
+
+#? int()
+with_lambda(arg_l, 1.0)[1]
+#? float()
+with_lambda(arg_l, 1.0)[0]
+#? float()
+with_lambda(arg_l, y=1.0)[0]
+#? int()
+with_lambda(lambda x: x)
+#? float()
+with_lambda(lambda x, y: y, y=1.0)
+
+arg_func = lambda *args, **kwargs: (args[0], kwargs['a'])
+#? int()
+arg_func(1, 2, a='', b=10)[0]
+#? list()
+arg_func(1, 2, a=[], b=10)[1]
+
+# magic method
+a = lambda: 3
+#? ['__closure__']
+a.__closure__
+
+class C():
+    def __init__(self, foo=1.0):
+        self.a = lambda: 1
+        self.foo = foo
+
+    def ret(self):
+        return lambda: self.foo
+
+    def with_param(self):
+        return lambda x: x + self.a()
+
+#? int()
+C().a()
+
+#? str()
+C('foo').ret()()
+
+index = C().with_param()(1)
+#? float()
+['', 1, 1.0][index]
+
+
+def xy(param):
+    def ret(a, b):
+        return a + b
+
+    return lambda b: ret(param, b)
+
+#? int()
+xy(1)(2)
+
+# -----------------
+# lambda param (#379)
+# -----------------
+class Test(object):
+    def __init__(self, pred=lambda a, b: a):
+        self.a = 1
+        #? int()
+        self.a
+        #? float()
+        pred(1.0, 2)
+
+# -----------------
+# test_nocond in grammar (happens in list comprehensions with `if`)
+# -----------------
+# Doesn't need to do anything yet. It should just not raise an error. These
+# nocond lambdas make no sense at all.
+
+#? int()
+[a for a in [1,2] if lambda: 3][0]
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/named_param.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/named_param.py
new file mode 100644
index 0000000..b420df1
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/named_param.py
@@ -0,0 +1,48 @@
+"""
+Named Params:
+>>> def a(abc): pass
+...
+>>> a(abc=3)  # <- this stuff (abc)
+"""
+
+def a(abc):
+    pass
+
+#? 5 ['abc']
+a(abc)
+
+
+def a(*some_args, **some_kwargs):
+    pass
+
+#? 11 []
+a(some_args)
+
+#? 13 []
+a(some_kwargs)
+
+def multiple(foo, bar):
+    pass
+
+#? 17 ['bar']
+multiple(foo, bar)
+
+#? ['bar']
+multiple(foo, bar
+
+my_lambda = lambda lambda_param: lambda_param + 1
+#? 22 ['lambda_param']
+my_lambda(lambda_param)
+
+# __call__
+class Test(object):
+    def __init__(self, hello_other):
+        pass
+
+    def __call__(self, hello):
+        pass
+
+#? 12 ['hello']
+Test()(hello=)
+#? 11 []
+Test()(self=)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/on_import.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/on_import.py
new file mode 100644
index 0000000..dfaad45
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/on_import.py
@@ -0,0 +1,108 @@
+def from_names():
+    #? ['mod1']
+    from import_tree.pkg.
+    #? ['path']
+    from os.
+
+def from_names_goto():
+    from import_tree import pkg
+    #? pkg
+    from import_tree.pkg
+
+def builtin_test():
+    #? ['math']
+    import math
+
+# -----------------
+# completions within imports
+# -----------------
+
+#? ['sqlite3']
+import sqlite3
+
+#? ['classes']
+import classes
+
+#? ['timedelta']
+from datetime import timedel
+#? 21 []
+from datetime.timedel import timedel
+
+# should not be possible, because names can only be looked up 1 level deep.
+#? []
+from datetime.timedelta import resolution
+#? []
+from datetime.timedelta import 
+
+#? ['Cursor']
+from sqlite3 import Cursor
+
+#? ['some_variable']
+from . import some_variable
+#? ['arrays']
+from . import arrays
+#? []
+from . import import_tree as ren
+
+import os
+#? os.path.join
+from os.path import join
+
+# -----------------
+# special positions -> edge cases
+# -----------------
+import datetime
+
+#? 6 datetime
+from datetime.time import time
+
+#? []
+import datetime.
+#? []
+import datetime.date
+
+#? 21 ['import']
+from import_tree.pkg import pkg
+#? 49 ['a', '__name__', '__doc__', '__file__', '__package__']
+from import_tree.pkg.mod1 import not_existant,    # whitespace before
+#? ['a', '__name__', '__doc__', '__file__', '__package__']
+from import_tree.pkg.mod1 import not_existant, 
+#? 22 ['mod1']
+from import_tree.pkg. import mod1
+#? 17 ['mod1', 'mod2', 'random', 'pkg', 'rename1', 'rename2', 'recurse_class1', 'recurse_class2', 'invisible_pkg', 'flow_import']
+from import_tree. import pkg
+
+#? 18 ['pkg']
+from import_tree.p import pkg
+
+#? 17 ['import_tree']
+from .import_tree import 
+#? 10 ['run']
+from ..run import 
+#? ['run']
+from ..run
+#? 10 ['run']
+from ..run.
+#? []
+from ..run.
+
+#? ['run']
+from .. import run
+
+#? []
+from not_a_module import 
+
+
+#137
+import json
+#? 23 json.dump
+from json import load, dump
+#? 17 json.load
+from json import load, dump
+# without the from clause:
+import json, datetime
+#? 7 json
+import json, datetime
+#? 13 datetime
+import json, datetime
+
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/ordering.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/ordering.py
new file mode 100644
index 0000000..61eb192
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/ordering.py
@@ -0,0 +1,195 @@
+# -----------------
+# normal
+# -----------------
+a = ""
+a = 1
+
+#? int()
+a
+#? []
+a.append
+
+a = list
+
+b = 1; b = ""
+#? str()
+b
+
+# temp should not be accessible before definition
+#? []
+temp
+
+a = 1
+temp = b;
+b = a
+a = temp
+#? int()
+b
+#? int()
+b
+#? str()
+a
+
+a = tuple
+if 1:
+    a = list
+
+#? ['append']
+a.append
+#? ['index']
+a.index
+
+# -----------------
+# tuples exchanges
+# -----------------
+a, b = 1, ""
+#? int()
+a
+#? str()
+b
+
+b, a = a, b
+#? int()
+b
+#? str()
+a
+
+b, a = a, b
+#? int()
+a
+#? str()
+b
+
+# -----------------
+# function
+# -----------------
+def a(a=3):
+    #? int()
+    a
+    #? []
+    a.func
+    return a
+
+#? int()
+a(2)
+#? []
+a(2).func
+
+a_param = 3
+def func(a_param):
+    # should not be int
+    #? []
+    a_param.
+
+from os import path
+
+
+# should not return a function, because `a` is a function above
+def f(b, a): return a
+#? []
+f(b=3).
+
+# -----------------
+# closure
+# -----------------
+
+def x():
+    a = 0
+
+    def x():
+        return a
+
+    a = 3.0
+    return x()
+
+#? float()
+x()
+
+# -----------------
+# class
+# -----------------
+class A(object):
+    a = ""
+    a = 3
+    #? int()
+    a
+    a = list()
+    def __init__(self):
+        self.b = ""
+
+    def before(self):
+        self.b = 3
+        # TODO should this be so? include entries after cursor?
+        #? int() str() list
+        self.b
+        self.b = list
+
+        self.a = 1
+        #? str() int()
+        self.a
+
+        #? ['after']
+        self.after
+
+        self.c = 3
+        #? int()
+        self.c
+
+    def after(self):
+        self.a = ''
+
+    c = set()
+
+#? list()
+A.a
+
+a = A()
+#? ['after']
+a.after
+#? []
+a.upper
+#? []
+a.append
+#? []
+a.real
+
+#? str() int()
+a.a
+
+a = 3
+class a():
+    def __init__(self, a):
+        self.a = a
+
+#? float()
+a(1.0).a
+#? 
+a().a
+
+# -----------------
+# imports
+# -----------------
+
+math = 3
+import math
+#? ['cosh']
+math.cosh
+#? []
+math.real
+
+math = 3
+#? int()
+math
+#? []
+math.cos
+
+# do the same for star imports
+cosh = 3
+from math import *
+# cosh doesn't work, but that's not a problem, star imports should be at the
+# start of EVERY script!
+cosh.real
+
+cosh = 3
+#? int()
+cosh
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/parser.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/parser.py
new file mode 100644
index 0000000..68793f4
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/parser.py
@@ -0,0 +1,43 @@
+"""
+Issues with the parser and not the type inference should be part of this file.
+"""
+
+class IndentIssues():
+    """
+    issue jedi-vim#288
+    Which is really a fast parser issue. It used to start a new block at the
+    parentheses, because it had problems with the indentation.
+    """
+    def one_param(
+        self,
+    ):
+        return 1
+
+    def with_param(
+        self,
+    y):
+        return y
+
+
+
+#? int()
+IndentIssues().one_param()
+
+#? str()
+IndentIssues().with_param('')
+
+
+"""
+Just because there's a def keyword, doesn't mean it should not be able to
+complete to definition.
+"""
+definition = 0
+#? ['definition']
+str(def
+
+
+# It might be hard to determine the context
+class Foo(object):
+    @property
+    #? ['str']
+    def bar(str
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/pep0484.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/pep0484.py
new file mode 100644
index 0000000..b944cd1
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/pep0484.py
@@ -0,0 +1,160 @@
+""" Pep-0484 type hinting """
+
+# python >= 3.2
+
+
+class A():
+    pass
+
+
+def function_parameters(a: A, b, c: str, d: int, e: str, f: str, g: int=4):
+    """
+    :param e: if docstring and annotation agree, only one should be returned
+    :type e: str
+    :param f: if docstring and annotation disagree, both should be returned
+    :type f: int
+    """
+    #? A()
+    a
+    #?
+    b
+    #? str()
+    c
+    #? int()
+    d
+    #? str()
+    e
+    #? int() str()
+    f
+    # int()
+    g
+
+
+def return_unspecified():
+    pass
+
+#?
+return_unspecified()
+
+
+def return_none() -> None:
+    """
+    Return type None means the same as no return type as far as jedi
+    is concerned
+    """
+    pass
+
+#?
+return_none()
+
+
+def return_str() -> str:
+    pass
+
+#? str()
+return_str()
+
+
+def return_custom_class() -> A:
+    pass
+
+#? A()
+return_custom_class()
+
+
+def return_annotation_and_docstring() -> str:
+    """
+    :rtype: int
+    """
+    pass
+
+#? str() int()
+return_annotation_and_docstring()
+
+
+def return_annotation_and_docstring_different() -> str:
+    """
+    :rtype: str
+    """
+    pass
+
+#? str()
+return_annotation_and_docstring_different()
+
+
+def annotation_forward_reference(b: "B") -> "B":
+    #? B()
+    b
+
+#? ["test_element"]
+annotation_forward_reference(1).t
+
+class B:
+    test_element = 1
+    pass
+
+#? B()
+annotation_forward_reference(1)
+
+
+class SelfReference:
+    test_element = 1
+    def test_method(self, x: "SelfReference") -> "SelfReference":
+        #? SelfReference()
+        x
+        #? ["test_element", "test_method"]
+        self.t
+        #? ["test_element", "test_method"]
+        x.t
+        #? ["test_element", "test_method"]
+        self.test_method(1).t
+
+#? SelfReference()
+SelfReference().test_method()
+
+def function_with_non_pep_0484_annotation(
+        x: "I can put anything here",
+        xx: "",
+        yy: "\r\n\0;+*&^564835(---^&*34",
+        y: 3 + 3,
+        zz: float) -> int("42"):
+    # infers int from function call
+    #? int()
+    x
+    # infers int from function call
+    #? int()
+    xx
+    # infers int from function call
+    #? int()
+    yy
+    # infers str from function call
+    #? str()
+    y
+    #? float()
+    zz
+#?
+function_with_non_pep_0484_annotation(1, 2, 3, "force string")
+
+def function_forward_reference_dynamic(
+        x: return_str_type(),
+        y: "return_str_type()") -> None:
+    #?
+    x
+    #? str()
+    y
+
+def return_str_type():
+    return str
+
+
+X = str
+def function_with_assined_class_in_reference(x: X, y: "Y"):
+    #? str()
+    x
+    #? int()
+    y
+Y = int
+
+def just_because_we_can(x: "flo" + "at"):
+    #? float()
+    x
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/pep0484_comments.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/pep0484_comments.py
new file mode 100644
index 0000000..7d5f7c2
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/pep0484_comments.py
@@ -0,0 +1,109 @@
+a = 3  # type: str
+#? str()
+a
+
+b = 3  # type: str but I write more
+#? int()
+b
+
+c = 3  # type: str # I comment more
+#? str()
+c
+
+d = "It should not read comments from the next line"
+# type: int
+#? str()
+d
+
+# type: int
+e = "It should not read comments from the previous line"
+#? str()
+e
+
+class BB: pass
+
+def test(a, b):
+    a = a  # type: BB
+    c = a  # type: str
+    d = a
+    # type: str
+    e = a                 # type: str           # Should ignore long whitespace
+
+    #? BB()
+    a
+    #? str()
+    c
+    #? BB()
+    d
+    #? str()
+    e
+
+a,b = 1, 2 # type: str, float
+#? str()
+a
+#? float()
+b
+
+class Employee:
+    pass
+
+# The typing library is not installable for Python 2.6, therefore ignore the
+# following tests.
+# python >= 2.7
+
+from typing import List
+x = []   # type: List[Employee]
+#? Employee()
+x[1]
+x, y, z = [], [], []  # type: List[int], List[int], List[str]
+#? int()
+y[2]
+x, y, z = [], [], []  # type: (List[float], List[float], List[BB])
+for zi in z:
+    #? BB()
+    zi
+
+x = [
+   1,
+   2,
+]  # type: List[str]
+
+#? str()
+x[1]
+
+
+for bar in foo():  # type: str
+    #? str()
+    bar
+
+for bar, baz in foo():  # type: int, float
+    #? int()
+    bar
+    #? float()
+    baz
+
+for bar, baz in foo():
+    # type: str, str
+    """ type hinting on next line should not work """
+    #?
+    bar
+    #?
+    baz
+
+with foo():  # type: int
+    ...
+
+with foo() as f:  # type: str
+    #? str()
+    f
+
+with foo() as f:
+    # type: str
+    """ type hinting on next line should not work """
+    #?
+    f
+
+aaa = some_extremely_long_function_name_that_doesnt_leave_room_for_hints() \
+    # type: float # We should be able to put hints on the next line with a \
+#? float()
+aaa
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/pep0484_typing.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/pep0484_typing.py
new file mode 100644
index 0000000..75c1c0b
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/pep0484_typing.py
@@ -0,0 +1,263 @@
+"""
+Test the typing library, with docstrings. This is needed since annotations
+are not supported in python 2.7 else then annotating by comment (and this is
+still TODO at 2016-01-23)
+"""
+# There's no Python 2.6 typing module.
+# python >= 2.7
+import typing
+class B:
+    pass
+
+def we_can_has_sequence(p, q, r, s, t, u):
+    """
+    :type p: typing.Sequence[int]
+    :type q: typing.Sequence[B]
+    :type r: typing.Sequence[int]
+    :type s: typing.Sequence["int"]
+    :type t: typing.MutableSequence[dict]
+    :type u: typing.List[float]
+    """
+    #? ["count"]
+    p.c
+    #? int()
+    p[1]
+    #? ["count"]
+    q.c
+    #? B()
+    q[1]
+    #? ["count"]
+    r.c
+    #? int()
+    r[1]
+    #? ["count"]
+    s.c
+    #? int()
+    s[1]
+    #? []
+    s.a
+    #? ["append"]
+    t.a
+    #? dict()
+    t[1]
+    #? ["append"]
+    u.a
+    #? float()
+    u[1]
+
+def iterators(ps, qs, rs, ts):
+    """
+    :type ps: typing.Iterable[int]
+    :type qs: typing.Iterator[str]
+    :type rs: typing.Sequence["ForwardReference"]
+    :type ts: typing.AbstractSet["float"]
+    """
+    for p in ps:
+        #? int()
+        p
+    #?
+    next(ps)
+    a, b = ps
+    #? int()
+    a
+    ##? int()  --- TODO fix support for tuple assignment
+    # https://github.com/davidhalter/jedi/pull/663#issuecomment-172317854
+    # test below is just to make sure that in case it gets fixed by accident
+    # these tests will be fixed as well the way they should be
+    #?
+    b
+
+    for q in qs:
+        #? str()
+        q
+    #? str()
+    next(qs)
+    for r in rs:
+        #? ForwardReference()
+        r
+    #?
+    next(rs)
+    for t in ts:
+        #? float()
+        t
+
+def sets(p, q):
+    """
+    :type p: typing.AbstractSet[int]
+    :type q: typing.MutableSet[float]
+    """
+    #? []
+    p.a
+    #? ["add"]
+    q.a
+
+def tuple(p, q, r):
+    """
+    :type p: typing.Tuple[int]
+    :type q: typing.Tuple[int, str, float]
+    :type r: typing.Tuple[B, ...]
+    """
+    #? int()
+    p[0]
+    #? int()
+    q[0]
+    #? str()
+    q[1]
+    #? float()
+    q[2]
+    #? B()
+    r[0]
+    #? B()
+    r[1]
+    #? B()
+    r[2]
+    #? B()
+    r[10000]
+    i, s, f = q
+    #? int()
+    i
+    ##? str()  --- TODO fix support for tuple assignment
+    # https://github.com/davidhalter/jedi/pull/663#issuecomment-172317854
+    #?
+    s
+    ##? float()  --- TODO fix support for tuple assignment
+    # https://github.com/davidhalter/jedi/pull/663#issuecomment-172317854
+    #?
+    f
+
+class Key:
+    pass
+
+class Value:
+    pass
+
+def mapping(p, q, d, r, s, t):
+    """
+    :type p: typing.Mapping[Key, Value]
+    :type q: typing.MutableMapping[Key, Value]
+    :type d: typing.Dict[Key, Value]
+    :type r: typing.KeysView[Key]
+    :type s: typing.ValuesView[Value]
+    :type t: typing.ItemsView[Key, Value]
+    """
+    #? []
+    p.setd
+    #? ["setdefault"]
+    q.setd
+    #? ["setdefault"]
+    d.setd
+    #? Value()
+    p[1]
+    for key in p:
+        #? Key()
+        key
+    for key in p.keys():
+        #? Key()
+        key
+    for value in p.values():
+        #? Value()
+        value
+    for item in p.items():
+        #? Key()
+        item[0]
+        #? Value()
+        item[1]
+        (key, value) = item
+        #? Key()
+        key
+        #? Value()
+        value
+    for key, value in p.items():
+        #? Key()
+        key
+        #? Value()
+        value
+    for key in r:
+        #? Key()
+        key
+    for value in s:
+        #? Value()
+        value
+    for key, value in t:
+        #? Key()
+        key
+        #? Value()
+        value
+
+def union(p, q, r, s, t):
+    """
+    :type p: typing.Union[int]
+    :type q: typing.Union[int, int]
+    :type r: typing.Union[int, str, "int"]
+    :type s: typing.Union[int, typing.Union[str, "typing.Union['float', 'dict']"]]
+    :type t: typing.Union[int, None]
+    """
+    #? int()
+    p
+    #? int()
+    q
+    #? int() str()
+    r
+    #? int() str() float() dict()
+    s
+    #? int()
+    t
+
+def optional(p):
+    """
+    :type p: typing.Optional[int]
+    Optional does not do anything special. However it should be recognised
+    as being of that type. Jedi doesn't do anything with the extra into that
+    it can be None as well
+    """
+    #? int()
+    p
+
+class ForwardReference:
+    pass
+
+class TestDict(typing.Dict[str, int]):
+    def setdud(self):
+        pass
+
+def testdict(x):
+    """
+    :type x: TestDict
+    """
+    #? ["setdud", "setdefault"]
+    x.setd
+    for key in x.keys():
+        #? str()
+        key
+    for value in x.values():
+        #? int()
+        value
+
+x = TestDict()
+#? ["setdud", "setdefault"]
+x.setd
+for key in x.keys():
+    #? str()
+    key
+for value in x.values():
+    #? int()
+    value
+# python >= 3.2
+"""
+docstrings have some auto-import, annotations can use all of Python's
+import logic
+"""
+import typing as t
+def union2(x: t.Union[int, str]):
+    #? int() str()
+    x
+
+from typing import Union
+def union3(x: Union[int, str]):
+    #? int() str()
+    x
+
+from typing import Union as U
+def union4(x: U[int, str]):
+    #? int() str()
+    x
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/precedence.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/precedence.py
new file mode 100644
index 0000000..6078115
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/precedence.py
@@ -0,0 +1,138 @@
+"""
+Test Jedi's operation understanding. Jedi should understand simple additions,
+multiplications, etc.
+"""
+# -----------------
+# numbers
+# -----------------
+x = [1, 'a', 1.0]
+
+#? int() str() float()
+x[12]
+
+#? float()
+x[1 + 1]
+
+index = 0 + 1
+
+#? str()
+x[index]
+
+#? int()
+x[1 + (-1)]
+
+def calculate(number):
+    return number + constant
+
+constant = 1
+
+#? float()
+x[calculate(1)]
+
+def calculate(number):
+    return number + constant
+
+# -----------------
+# strings
+# -----------------
+
+x = 'upp' + 'e'
+
+#? str.upper
+getattr(str, x + 'r')
+
+a = "a"*3
+#? str()
+a
+a = 3 * "a"
+#? str()
+a
+
+a = 3 * "a"
+#? str()
+a
+
+#? int()
+(3 ** 3)
+#? int() str()
+(3 ** 'a')
+
+# -----------------
+# assignments
+# -----------------
+
+x = [1, 'a', 1.0]
+
+i = 0
+i += 1
+i += 1
+#? float()
+x[i]
+
+i = 1
+i += 1
+i -= 3
+i += 1
+#? int()
+x[i]
+
+# -----------------
+# in
+# -----------------
+
+if 'X' in 'Y':
+    a = 3
+else:
+    a = ''
+# For now don't really check for truth values. So in should return both
+# results.
+#? str() int()
+a
+
+# -----------------
+# for flow assignments
+# -----------------
+
+class FooBar(object):
+    fuu = 0.1
+    raboof = 'fourtytwo'
+
+# targets should be working
+target = ''
+for char in ['f', 'u', 'u']:
+    target += char
+#? float()
+getattr(FooBar, target)
+
+# github #24
+target = u''
+for char in reversed(['f', 'o', 'o', 'b', 'a', 'r']):
+    target += char
+
+#? str()
+getattr(FooBar, target)
+
+
+# -----------------
+# repetition problems -> could be very slow and memory expensive - shouldn't
+# be.
+# -----------------
+
+b = [str(1)]
+l = list
+for x in [l(0), l(1), l(2), l(3), l(4), l(5), l(6), l(7), l(8), l(9), l(10),
+          l(11), l(12), l(13), l(14), l(15), l(16), l(17), l(18), l(19), l(20),
+          l(21), l(22), l(23), l(24), l(25), l(26), l(27), l(28), l(29)]:
+    b += x
+
+#? str()
+b[1]
+
+
+# -----------------
+# undefined names
+# -----------------
+a = foobarbaz + 'hello'
+
+#? int() float()
+{'hello': 1, 'bar': 1.0}[a]
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/recursion.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/recursion.py
new file mode 100644
index 0000000..77e5b24
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/recursion.py
@@ -0,0 +1,51 @@
+"""
+Code that might cause recursion issues (or has caused in the past).
+"""
+
+def Recursion():
+    def recurse(self):
+        self.a = self.a
+        self.b = self.b.recurse()
+
+#?
+Recursion().a
+
+#?
+Recursion().b
+
+
+class X():
+    def __init__(self):
+        self.recursive = [1, 3]
+
+    def annoying(self):
+        self.recursive = [self.recursive[0]]
+
+    def recurse(self):
+        self.recursive = [self.recursive[1]]
+
+#? int()
+X().recursive[0]
+
+
+def to_list(iterable):
+    return list(set(iterable))
+
+
+def recursion1(foo):
+    return to_list(to_list(foo)) + recursion1(foo)
+
+#? int()
+recursion1([1,2])[0]
+
+
+class FooListComp():
+    def __init__(self):
+        self.recursive = [1]
+
+    def annoying(self):
+        self.recursive = [x for x in self.recursive]
+
+
+#? int()
+FooListComp().recursive[0]
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/stdlib.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/stdlib.py
new file mode 100644
index 0000000..92b7929
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/stdlib.py
@@ -0,0 +1,224 @@
+"""
+std library stuff
+"""
+
+# -----------------
+# builtins
+# -----------------
+arr = ['']
+
+#? str()
+sorted(arr)[0]
+
+#? str()
+next(reversed(arr))
+next(reversed(arr))
+
+# should not fail if there's no return value.
+def yielder():
+    yield None
+
+#? None
+next(reversed(yielder()))
+
+# empty reversed should not raise an error
+#?
+next(reversed())
+
+#? str()
+next(open(''))
+
+#? int()
+{'a':2}.setdefault('a', 3)
+
+# Compiled classes should have the meta class attributes.
+#? ['__itemsize__']
+tuple.__itemsize__
+
+# -----------------
+# type() calls with one parameter
+# -----------------
+#? int
+type(1)
+#? int
+type(int())
+#? type
+type(int)
+#? type
+type(type)
+#? list
+type([])
+
+def x():
+    yield 1
+generator = type(x())
+#? generator
+type(x for x in [])
+#? type(x)
+type(lambda: x)
+
+import math
+import os
+#? type(os)
+type(math)
+class X(): pass
+#? type
+type(X)
+
+# -----------------
+# enumerate
+# -----------------
+for i, j in enumerate(["as", "ad"]):
+    #? int()
+    i
+    #? str()
+    j
+
+# -----------------
+# re
+# -----------------
+import re
+c = re.compile(r'a')
+# re.compile should not return str -> issue #68
+#? []
+c.startswith
+#? int()
+c.match().start()
+
+#? int()
+re.match(r'a', 'a').start()
+
+for a in re.finditer('a', 'a'):
+    #? int()
+    a.start()
+
+#? str()
+re.sub('a', 'a')
+
+# -----------------
+# ref
+# -----------------
+import weakref
+
+#? int()
+weakref.proxy(1)
+
+#? weakref.ref()
+weakref.ref(1)
+#? int()
+weakref.ref(1)()
+
+# -----------------
+# functools
+# -----------------
+import functools
+
+basetwo = functools.partial(int, base=2)
+#? int()
+basetwo()
+
+def function(a, b):
+    return a, b
+a = functools.partial(function, 0)
+
+#? int()
+a('')[0]
+#? str()
+a('')[1]
+
+kw = functools.partial(function, b=1.0)
+tup = kw(1)
+#? int()
+tup[0]
+#? float()
+tup[1]
+
+def my_decorator(f):
+    @functools.wraps(f)
+    def wrapper(*args, **kwds):
+        return f(*args, **kwds)
+    return wrapper
+
+@my_decorator
+def example(a):
+    return a
+
+#? str()
+example('')
+
+
+# -----------------
+# sqlite3 (#84)
+# -----------------
+
+import sqlite3
+#? sqlite3.Connection()
+con = sqlite3.connect()
+#? sqlite3.Cursor()
+c = con.cursor()
+#? sqlite3.Row()
+row = c.fetchall()[0]
+#? str()
+row.keys()[0]
+
+def huhu(db):
+    """
+        :type db: sqlite3.Connection
+        :param db: the db connection
+    """
+    #? sqlite3.Connection()
+    db
+
+# -----------------
+# hashlib
+# -----------------
+
+import hashlib
+
+#? ['md5']
+hashlib.md5
+
+# -----------------
+# copy
+# -----------------
+
+import copy
+#? int()
+copy.deepcopy(1)
+
+#?
+copy.copy()
+
+# -----------------
+# json
+# -----------------
+
+# We don't want any results for json, because it depends on IO.
+import json
+#?
+json.load('asdf')
+#?
+json.loads('[1]')
+
+# -----------------
+# random
+# -----------------
+
+import random
+class A(object):
+    def say(self): pass
+class B(object):
+    def shout(self): pass
+cls = random.choice([A, B])
+#? ['say', 'shout']
+cls().s
+
+# -----------------
+# random
+# -----------------
+
+import zipfile
+z = zipfile.ZipFile("foo")
+# It's too slow. So we don't run it at the moment.
+##? ['upper']
+z.read('name').upper
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/sys_path.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/sys_path.py
new file mode 100644
index 0000000..ebaccc2
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/sys_path.py
@@ -0,0 +1,25 @@
+
+import sys
+import os
+from os import dirname
+
+sys.path.insert(0, '../../jedi')
+sys.path.append(dirname(os.path.abspath('thirdparty' + os.path.sep + 'asdf')))
+
+# modifications, that should fail:
+# because of sys module
+sys.path.append(sys.path[1] + '/thirdparty')
+# syntax err
+sys.path.append('a' +* '/thirdparty')
+
+#? ['evaluate']
+import evaluate
+
+#? ['Evaluator']
+evaluate.Evaluator
+
+#? ['jedi_']
+import jedi_
+
+#? ['el']
+jedi_.el
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/PyQt4_.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/PyQt4_.py
new file mode 100644
index 0000000..f4e4183
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/PyQt4_.py
@@ -0,0 +1,19 @@
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+
+#? ['QActionGroup']
+QActionGroup
+
+#? ['currentText']
+QStyleOptionComboBox().currentText
+
+#? []
+QStyleOptionComboBox().currentText.
+
+from PyQt4 import QtGui
+
+#? ['currentText']
+QtGui.QStyleOptionComboBox().currentText
+
+#? []
+QtGui.QStyleOptionComboBox().currentText.
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/django_.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/django_.py
new file mode 100644
index 0000000..9914a6d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/django_.py
@@ -0,0 +1,11 @@
+#! ['class ObjectDoesNotExist']
+from django.core.exceptions import ObjectDoesNotExist
+import django
+
+#? ['get_version']
+django.get_version
+
+from django.conf import settings
+
+#? ['configured']
+settings.configured
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/jedi_.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/jedi_.py
new file mode 100644
index 0000000..dc384b1
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/jedi_.py
@@ -0,0 +1,52 @@
+
+from jedi import functions, evaluate, parsing
+
+el = functions.completions()[0]
+#? ['description']
+el.description
+
+#? str()
+el.description
+
+
+scopes, path, dot, like = \
+    api._prepare_goto(source, row, column, path, True)
+
+# has problems with that (sometimes) very deep nesting.
+#? set()
+el = scopes
+
+# get_names_for_scope is also recursion stuff
+#? tuple()
+el = list(evaluate.get_names_for_scope())[0]
+
+#? int() parsing.Module()
+el = list(evaluate.get_names_for_scope(1))[0][0]
+#? parsing.Module()
+el = list(evaluate.get_names_for_scope())[0][0]
+
+#? list()
+el = list(evaluate.get_names_for_scope(1))[0][1]
+#? list()
+el = list(evaluate.get_names_for_scope())[0][1]
+
+#? list()
+parsing.Scope((0,0)).get_set_vars()
+#? parsing.Import() parsing.Name()
+parsing.Scope((0,0)).get_set_vars()[0]
+# TODO access parent is not possible, because that is not set in the class
+## parsing.Class()
+parsing.Scope((0,0)).get_set_vars()[0].parent
+
+#? parsing.Import() parsing.Name()
+el = list(evaluate.get_names_for_scope())[0][1][0]
+
+#? evaluate.Array() evaluate.Class() evaluate.Function() evaluate.Instance()
+list(evaluate.follow_call())[0]
+
+# With the right recursion settings, this should be possible (and maybe more):
+# Array Class Function Generator Instance Module
+# However, this was produced with the recursion settings 10/350/10000, and
+# lasted 18.5 seconds. So we just have to be content with the results.
+#? evaluate.Class() evaluate.Function()
+evaluate.get_scopes_for_name()[0]
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/psycopg2_.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/psycopg2_.py
new file mode 100644
index 0000000..834704b
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/psycopg2_.py
@@ -0,0 +1,11 @@
+import psycopg2
+
+conn = psycopg2.connect('dbname=test')
+
+#? ['cursor']
+conn.cursor
+
+cur = conn.cursor()
+
+#? ['fetchall']
+cur.fetchall
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/pylab_.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/pylab_.py
new file mode 100644
index 0000000..ab132a4
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/thirdparty/pylab_.py
@@ -0,0 +1,36 @@
+import pylab
+
+# two gotos
+#! ['module numpy']
+import numpy
+
+#! ['module random']
+import numpy.random
+
+#? ['array2string']
+numpy.array2string
+
+#? ['shape']
+numpy.matrix().shape
+
+#? ['random_integers']
+pylab.random_integers
+
+#? []
+numpy.random_integers
+
+#? ['random_integers']
+numpy.random.random_integers
+#? ['sample']
+numpy.random.sample
+
+import numpy
+na = numpy.array([1,2])
+#? ['shape']
+na.shape
+
+# shouldn't raise an error #29, jedi-vim
+# doesn't return something, because matplotlib uses __import__
+fig = pylab.figure()
+#? 
+fig.add_subplot
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/types.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/types.py
new file mode 100644
index 0000000..768b660
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/types.py
@@ -0,0 +1,127 @@
+# -----------------
+# non array
+# -----------------
+
+#? ['imag']
+int.imag
+
+#? []
+int.is_integer
+
+#? ['is_integer']
+float.is_int
+
+#? ['is_integer']
+1.0.is_integer
+
+#? ['upper']
+"".upper
+
+#? ['upper']
+r"".upper
+
+# strangely this didn't work, because the = is used for assignments
+#? ['upper']
+"=".upper
+a = "="
+#? ['upper']
+a.upper
+
+
+# -----------------
+# lists
+# -----------------
+arr = []
+#? ['append']
+arr.app
+
+#? ['append']
+list().app
+#? ['append']
+[].append
+
+arr2 = [1,2,3]
+#? ['append']
+arr2.app
+
+#? int()
+arr.count(1)
+
+x = []
+#?
+x.pop()
+x = [3]
+#? int()
+x.pop()
+x = []
+x.append(1.0)
+#? float()
+x.pop()
+
+# -----------------
+# dicts
+# -----------------
+dic = {}
+
+#? ['copy', 'clear']
+dic.c
+
+dic2 = dict(a=1, b=2)
+#? ['pop', 'popitem']
+dic2.p
+#? ['popitem']
+{}.popitem
+
+dic2 = {'asdf': 3}
+#? ['popitem']
+dic2.popitem
+
+#? int()
+dic2['asdf']
+
+d = {'a': 3, 1.0: list}
+
+#? int() list
+d.values()[0]
+##? int() list
+dict(d).values()[0]
+
+#? str()
+d.items()[0][0]
+#? int()
+d.items()[0][1]
+
+# -----------------
+# set
+# -----------------
+set_t = {1,2}
+
+#? ['clear', 'copy']
+set_t.c
+
+set_t2 = set()
+
+#? ['clear', 'copy']
+set_t2.c
+
+# -----------------
+# tuples
+# -----------------
+tup = ('',2)
+
+#? ['count']
+tup.c
+
+tup2 = tuple()
+#? ['index']
+tup2.i
+#? ['index']
+().i
+
+tup3 = 1,""
+#? ['index']
+tup3.index
+
+tup4 = 1,""
+#? ['index']
+tup4.index
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/completion/usages.py b/vim-plugins/bundle/jedi-vim/jedi/test/completion/usages.py
new file mode 100644
index 0000000..3805152
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/completion/usages.py
@@ -0,0 +1,275 @@
+"""
+Renaming tests. This means search for usages.
+I always leave a little bit of space to add room for additions, because the
+results always contain position informations.
+"""
+#< 4 (0,4), (3,0), (5,0), (17,0), (12,4), (14,5), (15,0)
+def abc(): pass
+
+#< 0 (-3,4), (0,0), (2,0), (14,0), (9,4), (11,5), (12,0)
+abc.d.a.bsaasd.abc.d
+
+abc
+# unicode chars shouldn't be a problem.
+x['smörbröd'].abc
+
+# With the new parser these statements are not recognized as stateents, because
+# they are not valid Python.
+if 1:
+    abc = 
+else:
+    (abc) = 
+abc = 
+#< (-17,4), (-14,0), (-12,0), (0,0), (-2,0), (-3,5), (-5,4)
+abc
+
+abc = 5
+
+
+Abc = 3
+
+#< 6 (0,6), (2,4), (5,8), (17,0)
+class Abc():
+    #< (-2,6), (0,4), (3,8), (15,0)
+    Abc
+
+    def Abc(self):
+        Abc; self.c = 3
+
+    #< 17 (0,16), (2,8)
+    def a(self, Abc):
+        #< 10 (-2,16), (0,8)
+        Abc
+
+    #< 19 (0,18), (2,8)
+    def self_test(self):
+        #< 12 (-2,18), (0,8)
+        self.b
+
+Abc.d.Abc
+
+
+#< 4 (0,4), (5,1)
+def blubi():
+    pass
+
+
+#< (-5,4), (0,1)
+@blubi
+def a(): pass
+
+
+#< 0 (0,0), (1,0)
+set_object_var = object()
+set_object_var.var = 1
+
+
+response = 5
+#< 0 (0,0), (1,0), (2,0), (4,0)
+response = HttpResponse(mimetype='application/pdf')
+response['Content-Disposition'] = 'attachment; filename=%s.pdf' % id
+response.write(pdf)
+#< (-4,0), (-3,0), (-2,0), (0,0)
+response
+
+
+# -----------------
+# imports
+# -----------------
+#< (0,7), (3,0)
+import module_not_exists
+
+#< (-3,7), (0,0)
+module_not_exists
+
+
+#< ('rename1', 1,0), (0,24), (3,0), (6,17), ('rename2', 4,5), (10,17), (13,17), ('imports', 72, 16)
+from import_tree import rename1
+
+#< (0,8), ('rename1',3,0), ('rename2',4,20), ('rename2',6,0), (3,32), (7,32), (4,0)
+rename1.abc
+
+#< (-3,8), ('rename1', 3,0), ('rename2', 4,20), ('rename2', 6,0), (0,32), (4,32), (1,0)
+from import_tree.rename1 import abc
+abc
+
+#< 20 ('rename1', 1,0), ('rename2', 4,5), (-10,24), (-7,0), (-4,17), (0,17), (3,17), ('imports', 72, 16)
+from import_tree.rename1 import abc
+
+#< (0, 32),
+from import_tree.rename1 import not_existing
+
+# Shouldn't raise an error or do anything weird.
+from not_existing import *
+
+# -----------------
+# classes
+# -----------------
+
+class TestMethods(object):
+    #< 8 (0,8), (2,13)
+    def a_method(self):
+        #< 13 (-2,8), (0,13)
+        self.a_method()
+        #< 13 (2,8), (0,13), (3,13)
+        self.b_method()
+
+    def b_method(self):
+        self.b_method
+
+
+class TestClassVar(object):
+    #< 4 (0,4), (5,13), (7,21)
+    class_v = 1
+    def a(self):
+        class_v = 1
+
+        #< (-5,4), (0,13), (2,21)
+        self.class_v
+        #< (-7,4), (-2,13), (0,21)
+        TestClassVar.class_v
+        #< (0,8), (-7, 8)
+        class_v
+
+class TestInstanceVar():
+    def a(self):
+        #< 13 (4,13), (0,13)
+        self._instance_var = 3
+
+    def b(self):
+        #< (-4,13), (0,13)
+        self._instance_var
+        # A call to self used to trigger an error, because it's also a trailer
+        # with two children.
+        self()
+
+
+class NestedClass():
+    def __getattr__(self, name):
+        return self
+
+# Shouldn't find a definition, because there's other `instance`.
+# TODO reenable that test
+##< (0, 14),
+NestedClass().instance
+
+
+# -----------------
+# inheritance
+# -----------------
+class Super(object):
+    #< 4 (0,4), (23,18), (25,13)
+    base_class = 1
+    #< 4 (0,4),
+    class_var = 1
+
+    #< 8 (0,8),
+    def base_method(self):
+        #< 13 (0,13), (20,13)
+        self.base_var = 1
+        #< 13 (0,13),
+        self.instance_var = 1
+
+    #< 8 (0,8),
+    def just_a_method(self): pass
+
+
+#< 20 (0,16), (-18,6)
+class TestClass(Super):
+    #< 4 (0,4),
+    class_var = 1
+
+    def x_method(self):
+
+        #< (0,18), (2,13), (-23,4)
+        TestClass.base_class
+        #< (-2,18), (0,13), (-25,4)
+        self.base_class
+        #< (-20,13), (0,13)
+        self.base_var
+        #< 
+        TestClass.base_var
+
+
+        #< 13 (5,13), (0,13)
+        self.instance_var = 3
+
+    #< 9 (0,8), 
+    def just_a_method(self):
+        #< (-5,13), (0,13)
+        self.instance_var
+
+
+# -----------------
+# properties
+# -----------------
+class TestProperty:
+
+    @property
+    #< 10 (0,8), (5,13)
+    def prop(self):
+        return 1
+
+    def a(self):
+        #< 13 (-5,8), (0,13)
+        self.prop
+
+    @property
+    #< 13 (0,8), (4,5)
+    def rw_prop(self):
+        return self._rw_prop
+
+    #< 8 (-4,8), (0,5)
+    @rw_prop.setter
+    #< 8 (0,8), (5,13)
+    def rw_prop(self, value):
+        self._rw_prop = value
+
+    def b(self):
+        #< 13 (-5,8), (0,13)
+        self.rw_prop
+
+# -----------------
+# *args, **kwargs
+# -----------------
+#< 11 (1,11), (0,8)
+def f(**kwargs):
+    return kwargs
+
+
+# -----------------
+# No result
+# -----------------
+if isinstance(j, int):
+    #< 
+    j
+
+# -----------------
+# Dynamic Param Search
+# -----------------
+
+class DynamicParam():
+    def foo(self):
+        return
+
+def check(instance):
+    #< 13 (-5,8), (0,13)
+    instance.foo()
+
+check(DynamicParam())
+
+# -----------------
+# Compiled Objects
+# -----------------
+
+import _sre
+
+#< 0 (-3,7), (0,0), ('_sre', None, None)
+_sre
+
+# -----------------
+# on syntax
+# -----------------
+
+#< 0
+import undefined
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/conftest.py b/vim-plugins/bundle/jedi-vim/jedi/test/conftest.py
new file mode 100644
index 0000000..ac04e26
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/conftest.py
@@ -0,0 +1,130 @@
+import os
+import re
+
+import pytest
+
+from . import helpers
+from . import run
+from . import refactor
+
+import jedi
+from jedi.evaluate.analysis import Warning
+from jedi import settings
+
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--integration-case-dir",
+        default=os.path.join(helpers.test_dir, 'completion'),
+        help="Directory in which integration test case files locate.")
+    parser.addoption(
+        "--refactor-case-dir",
+        default=os.path.join(helpers.test_dir, 'refactor'),
+        help="Directory in which refactoring test case files locate.")
+    parser.addoption(
+        "--test-files", "-T", default=[], action='append',
+        help=(
+            "Specify test files using FILE_NAME[:LINE[,LINE[,...]]]. "
+            "For example: -T generators.py:10,13,19. "
+            "Note that you can use -m to specify the test case by id."))
+    parser.addoption(
+        "--thirdparty", action='store_true',
+        help="Include integration tests that requires third party modules.")
+
+
+def parse_test_files_option(opt):
+    """
+    Parse option passed to --test-files into a key-value pair.
+
+    >>> parse_test_files_option('generators.py:10,13,19')
+    ('generators.py', [10, 13, 19])
+    """
+    opt = str(opt)
+    if ':' in opt:
+        (f_name, rest) = opt.split(':', 1)
+        return (f_name, list(map(int, rest.split(','))))
+    else:
+        return (opt, [])
+
+
+def pytest_generate_tests(metafunc):
+    """
+    :type metafunc: _pytest.python.Metafunc
+    """
+    test_files = dict(map(parse_test_files_option,
+                          metafunc.config.option.test_files))
+    if 'case' in metafunc.fixturenames:
+        base_dir = metafunc.config.option.integration_case_dir
+        thirdparty = metafunc.config.option.thirdparty
+        cases = list(run.collect_dir_tests(base_dir, test_files))
+        if thirdparty:
+            cases.extend(run.collect_dir_tests(
+                os.path.join(base_dir, 'thirdparty'), test_files, True))
+        ids = ["%s:%s" % (c.module_name, c.line_nr_test) for c in cases]
+        metafunc.parametrize('case', cases, ids=ids)
+
+    if 'refactor_case' in metafunc.fixturenames:
+        base_dir = metafunc.config.option.refactor_case_dir
+        metafunc.parametrize(
+            'refactor_case',
+            refactor.collect_dir_tests(base_dir, test_files))
+
+    if 'static_analysis_case' in metafunc.fixturenames:
+        base_dir = os.path.join(os.path.dirname(__file__), 'static_analysis')
+        metafunc.parametrize(
+            'static_analysis_case',
+            collect_static_analysis_tests(base_dir, test_files))
+
+
+def collect_static_analysis_tests(base_dir, test_files):
+    for f_name in os.listdir(base_dir):
+        files_to_execute = [a for a in test_files.items() if a[0] in f_name]
+        if f_name.endswith(".py") and (not test_files or files_to_execute):
+            path = os.path.join(base_dir, f_name)
+            yield StaticAnalysisCase(path)
+
+
+class StaticAnalysisCase(object):
+    """
+    Static Analysis cases lie in the static_analysis folder.
+    The tests also start with `#!`, like the goto_definition tests.
+    """
+    def __init__(self, path):
+        self._path = path
+        with open(path) as f:
+            self._source = f.read()
+
+        self.skip = False
+        for line in self._source.splitlines():
+            self.skip = self.skip or run.skip_python_version(line)
+
+
+    def collect_comparison(self):
+        cases = []
+        for line_nr, line in enumerate(self._source.splitlines(), 1):
+            match = re.match(r'(\s*)#! (\d+ )?(.*)$', line)
+            if match is not None:
+                column = int(match.group(2) or 0) + len(match.group(1))
+                cases.append((line_nr + 1, column, match.group(3)))
+        return cases
+
+    def run(self, compare_cb):
+        analysis = jedi.Script(self._source, path=self._path)._analysis()
+        typ_str = lambda inst: 'warning ' if isinstance(inst, Warning) else ''
+        analysis = [(r.line, r.column, typ_str(r) + r.name)
+                    for r in analysis]
+        compare_cb(self, analysis, self.collect_comparison())
+
+    def __repr__(self):
+        return "<%s: %s>" % (self.__class__.__name__, os.path.basename(self._path))
+
+
+@pytest.fixture()
+def isolated_jedi_cache(monkeypatch, tmpdir):
+    """
+    Set `jedi.settings.cache_directory` to a temporary directory during test.
+
+    Same as `clean_jedi_cache`, but create the temporary directory for
+    each test case (scope='function').
+    """
+    monkeypatch.setattr(settings, 'cache_directory', str(tmpdir))
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/helpers.py b/vim-plugins/bundle/jedi-vim/jedi/test/helpers.py
new file mode 100644
index 0000000..111b859
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/helpers.py
@@ -0,0 +1,40 @@
+"""
+A helper module for testing, improves compatibility for testing (as
+``jedi._compatibility``) as well as introducing helper functions.
+"""
+
+import sys
+if sys.hexversion < 0x02070000:
+    import unittest2 as unittest
+else:
+    import unittest
+TestCase = unittest.TestCase
+
+import os
+from os.path import abspath, dirname
+import functools
+
+test_dir = dirname(abspath(__file__))
+root_dir = dirname(test_dir)
+
+sample_int = 1  # This is used in completion/imports.py
+
+def cwd_at(path):
+    """
+    Decorator to run function at `path`.
+
+    :type path: str
+    :arg  path: relative path from repository root (e.g., ``'jedi'``).
+    """
+    def decorator(func):
+        @functools.wraps(func)
+        def wrapper(*args, **kwds):
+            try:
+                oldcwd = os.getcwd()
+                repo_root = os.path.dirname(test_dir)
+                os.chdir(os.path.join(repo_root, path))
+                return func(*args, **kwds)
+            finally:
+                os.chdir(oldcwd)
+        return wrapper
+    return decorator
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/refactor.py b/vim-plugins/bundle/jedi-vim/jedi/test/refactor.py
new file mode 100755
index 0000000..9cc10fd
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/refactor.py
@@ -0,0 +1,99 @@
+#!/usr/bin/env python
+"""
+Refactoring tests work a little bit similar to Black Box tests. But the idea is
+here to compare two versions of code. **Note: Refactoring is currently not in
+active development (and was never stable), the tests are therefore not really
+valuable - just ignore them.**
+"""
+from __future__ import with_statement
+import os
+import re
+
+from functools import reduce
+import jedi
+from jedi import refactoring
+
+
+class RefactoringCase(object):
+
+    def __init__(self, name, source, line_nr, index, path,
+                 new_name, start_line_test, desired):
+        self.name = name
+        self.source = source
+        self.line_nr = line_nr
+        self.index = index
+        self.path = path
+        self.new_name = new_name
+        self.start_line_test = start_line_test
+        self.desired = desired
+
+    def refactor(self):
+        script = jedi.Script(self.source, self.line_nr, self.index, self.path)
+        f_name = os.path.basename(self.path)
+        refactor_func = getattr(refactoring, f_name.replace('.py', ''))
+        args = (self.new_name,) if self.new_name else ()
+        return refactor_func(script, *args)
+
+    def run(self):
+        refactor_object = self.refactor()
+
+        # try to get the right excerpt of the newfile
+        f = refactor_object.new_files()[self.path]
+        lines = f.splitlines()[self.start_line_test:]
+
+        end = self.start_line_test + len(lines)
+        pop_start = None
+        for i, l in enumerate(lines):
+            if l.startswith('# +++'):
+                end = i
+                break
+            elif '#? ' in l:
+                pop_start = i
+        lines.pop(pop_start)
+        self.result = '\n'.join(lines[:end - 1]).strip()
+        return self.result
+
+    def check(self):
+        return self.run() == self.desired
+
+    def __repr__(self):
+        return '<%s: %s:%s>' % (self.__class__.__name__,
+                                self.name, self.line_nr - 1)
+
+
+def collect_file_tests(source, path, lines_to_execute):
+    r = r'^# --- ?([^\n]*)\n((?:(?!\n# \+\+\+).)*)' \
+        r'\n# \+\+\+((?:(?!\n# ---).)*)'
+    for match in re.finditer(r, source, re.DOTALL | re.MULTILINE):
+        name = match.group(1).strip()
+        first = match.group(2).strip()
+        second = match.group(3).strip()
+        start_line_test = source[:match.start()].count('\n') + 1
+
+        # get the line with the position of the operation
+        p = re.match(r'((?:(?!#\?).)*)#\? (\d*) ?([^\n]*)', first, re.DOTALL)
+        if p is None:
+            print("Please add a test start.")
+            continue
+        until = p.group(1)
+        index = int(p.group(2))
+        new_name = p.group(3)
+
+        line_nr = start_line_test + until.count('\n') + 2
+        if lines_to_execute and line_nr - 1 not in lines_to_execute:
+            continue
+
+        yield RefactoringCase(name, source, line_nr, index, path,
+                              new_name, start_line_test, second)
+
+
+def collect_dir_tests(base_dir, test_files):
+    for f_name in os.listdir(base_dir):
+        files_to_execute = [a for a in test_files.items() if a[0] in f_name]
+        lines_to_execute = reduce(lambda x, y: x + y[1], files_to_execute, [])
+        if f_name.endswith(".py") and (not test_files or files_to_execute):
+            path = os.path.join(base_dir, f_name)
+            with open(path) as f:
+                source = f.read()
+            for case in collect_file_tests(source, path, lines_to_execute):
+                yield case
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/refactor/extract.py b/vim-plugins/bundle/jedi-vim/jedi/test/refactor/extract.py
new file mode 100644
index 0000000..312aced
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/refactor/extract.py
@@ -0,0 +1,47 @@
+# --- simple
+def test():
+    #? 35 a
+    return test(100, (30 + b, c) + 1)
+
+# +++
+def test():
+    a = (30 + b, c) + 1
+    return test(100, a)
+
+
+# --- simple #2
+def test():
+    #? 25 a
+    return test(100, (30 + b, c) + 1)
+
+# +++
+def test():
+    a = 30 + b
+    return test(100, (a, c) + 1)
+
+
+# --- multiline
+def test():
+    #? 30 x
+    return test(1, (30 + b, c) 
+                            + 1)
+# +++
+def test():
+    x = ((30 + b, c) 
+                            + 1)
+    return test(1, x
+)
+
+
+# --- multiline #2
+def test():
+    #? 25 x
+    return test(1, (30 + b, c) 
+                            + 1)
+# +++
+def test():
+    x = 30 + b
+    return test(1, (x, c) 
+                            + 1)
+
+
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/refactor/inline.py b/vim-plugins/bundle/jedi-vim/jedi/test/refactor/inline.py
new file mode 100644
index 0000000..c373be2
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/refactor/inline.py
@@ -0,0 +1,18 @@
+# --- simple
+def test():
+    #? 4
+    a = (30 + b, c) + 1
+    return test(100, a)
+# +++
+def test():
+    return test(100, (30 + b, c) + 1)
+
+
+# --- simple
+if 1:
+    #? 4
+    a = 1, 2
+    return test(100, a)
+# +++
+if 1:
+    return test(100, (1, 2))
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/refactor/rename.py b/vim-plugins/bundle/jedi-vim/jedi/test/refactor/rename.py
new file mode 100644
index 0000000..e98c589
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/refactor/rename.py
@@ -0,0 +1,17 @@
+"""
+Test coverage for renaming is mostly being done by testing
+`Script.usages`.
+"""
+
+# --- simple
+def test1():
+    #? 7 blabla
+    test1()
+    AssertionError
+    return test1, test1.not_existing
+# +++
+def blabla():
+    blabla()
+    AssertionError
+    return blabla, blabla.not_existing
+
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/run.py b/vim-plugins/bundle/jedi-vim/jedi/test/run.py
new file mode 100755
index 0000000..8337f7c
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/run.py
@@ -0,0 +1,444 @@
+#!/usr/bin/env python
+"""
+|jedi| is mostly being tested by what I would call "Blackbox Tests". These
+tests are just testing the interface and do input/output testing. This makes a
+lot of sense for |jedi|. Jedi supports so many different code structures, that
+it is just stupid to write 200'000 unittests in the manner of
+``regression.py``. Also, it is impossible to do doctests/unittests on most of
+the internal data structures. That's why |jedi| uses mostly these kind of
+tests.
+
+There are different kind of tests:
+
+- completions / goto_definitions ``#?``
+- goto_assignments: ``#!``
+- usages: ``#<``
+
+How to run tests?
++++++++++++++++++
+
+Jedi uses pytest_ to run unit and integration tests.  To run tests,
+simply run ``py.test``.  You can also use tox_ to run tests for
+multiple Python versions.
+
+.. _pytest: http://pytest.org
+.. _tox: http://testrun.org/tox
+
+Integration test cases are located in ``test/completion`` directory
+and each test case is indicated by either the comment ``#?`` (completions /
+definitions), ``#!`` (assignments), or ``#<`` (usages).
+There is also support for third party libraries. In a normal test run they are
+not being executed, you have to provide a ``--thirdparty`` option.
+
+In addition to standard `-k` and `-m` options in py.test, you can use
+`-T` (`--test-files`) option to specify integration test cases to run.
+It takes the format of ``FILE_NAME[:LINE[,LINE[,...]]]`` where
+``FILE_NAME`` is a file in ``test/completion`` and ``LINE`` is a line
+number of the test comment.  Here is some recipes:
+
+Run tests only in ``basic.py`` and ``imports.py``::
+
+    py.test test/test_integration.py -T basic.py -T imports.py
+
+Run test at line 4, 6, and 8 in ``basic.py``::
+
+    py.test test/test_integration.py -T basic.py:4,6,8
+
+See ``py.test --help`` for more information.
+
+If you want to debug a test, just use the ``--pdb`` option.
+
+Alternate Test Runner
++++++++++++++++++++++
+
+If you don't like the output of ``py.test``, there's an alternate test runner
+that you can start by running ``./run.py``. The above example could be run by::
+
+    ./run.py basic 4 6 8 50-80
+
+The advantage of this runner is simplicity and more customized error reports.
+Using both runners will help you to have a quicker overview of what's
+happening.
+
+
+Auto-Completion
++++++++++++++++
+
+Uses comments to specify a test in the next line. The comment says which
+results are expected. The comment always begins with `#?`. The last row
+symbolizes the cursor.
+
+For example::
+
+    #? ['real']
+    a = 3; a.rea
+
+Because it follows ``a.rea`` and a is an ``int``, which has a ``real``
+property.
+
+Goto Definitions
+++++++++++++++++
+
+Definition tests use the same symbols like completion tests. This is
+possible because the completion tests are defined with a list::
+
+    #? int()
+    ab = 3; ab
+
+Goto Assignments
+++++++++++++++++
+
+Tests look like this::
+
+    abc = 1
+    #! ['abc=1']
+    abc
+
+Additionally it is possible to specify the column by adding a number, which
+describes the position of the test (otherwise it's just the end of line)::
+
+    #! 2 ['abc=1']
+    abc
+
+Usages
+++++++
+
+Tests look like this::
+
+    abc = 1
+    #< abc@1,0 abc@3,0
+    abc
+"""
+import os
+import re
+import sys
+import operator
+from ast import literal_eval
+from io import StringIO
+from functools import reduce
+
+import jedi
+from jedi._compatibility import unicode, is_py3
+from jedi.parser import Parser, load_grammar
+from jedi.api.classes import Definition
+
+
+TEST_COMPLETIONS = 0
+TEST_DEFINITIONS = 1
+TEST_ASSIGNMENTS = 2
+TEST_USAGES = 3
+
+
+class IntegrationTestCase(object):
+    def __init__(self, test_type, correct, line_nr, column, start, line,
+                 path=None, skip=None):
+        self.test_type = test_type
+        self.correct = correct
+        self.line_nr = line_nr
+        self.column = column
+        self.start = start
+        self.line = line
+        self.path = path
+        self.skip = skip
+
+    @property
+    def module_name(self):
+        return os.path.splitext(os.path.basename(self.path))[0]
+
+    @property
+    def line_nr_test(self):
+        """The test is always defined on the line before."""
+        return self.line_nr - 1
+
+    def __repr__(self):
+        return '<%s: %s:%s:%s>' % (self.__class__.__name__, self.module_name,
+                                   self.line_nr_test, self.line.rstrip())
+
+    def script(self):
+        return jedi.Script(self.source, self.line_nr, self.column, self.path)
+
+    def run(self, compare_cb):
+        testers = {
+            TEST_COMPLETIONS: self.run_completion,
+            TEST_DEFINITIONS: self.run_goto_definitions,
+            TEST_ASSIGNMENTS: self.run_goto_assignments,
+            TEST_USAGES: self.run_usages,
+        }
+        return testers[self.test_type](compare_cb)
+
+    def run_completion(self, compare_cb):
+        completions = self.script().completions()
+        #import cProfile; cProfile.run('script.completions()')
+
+        comp_str = set([c.name for c in completions])
+        return compare_cb(self, comp_str, set(literal_eval(self.correct)))
+
+    def run_goto_definitions(self, compare_cb):
+        script = self.script()
+        evaluator = script._evaluator
+
+        def comparison(definition):
+            suffix = '()' if definition.type == 'instance' else ''
+            return definition.desc_with_module + suffix
+
+        def definition(correct, correct_start, path):
+            should_be = set()
+            for match in re.finditer('(?:[^ ]+)', correct):
+                string = match.group(0)
+                parser = Parser(load_grammar(), string, start_symbol='eval_input')
+                parser.position_modifier.line = self.line_nr
+                element = parser.get_parsed_node()
+                element.parent = jedi.api.completion.get_user_scope(
+                    script._get_module(),
+                    (self.line_nr, self.column)
+                )
+                results = evaluator.eval_element(element)
+                if not results:
+                    raise Exception('Could not resolve %s on line %s'
+                                    % (match.string, self.line_nr - 1))
+
+                should_be |= set(Definition(evaluator, r) for r in results)
+
+            # Because the objects have different ids, `repr`, then compare.
+            should = set(comparison(r) for r in should_be)
+            return should
+
+        should = definition(self.correct, self.start, script.path)
+        result = script.goto_definitions()
+        is_str = set(comparison(r) for r in result)
+        return compare_cb(self, is_str, should)
+
+    def run_goto_assignments(self, compare_cb):
+        result = self.script().goto_assignments()
+        comp_str = str(sorted(str(r.description) for r in result))
+        return compare_cb(self, comp_str, self.correct)
+
+    def run_usages(self, compare_cb):
+        result = self.script().usages()
+        self.correct = self.correct.strip()
+        compare = sorted((r.module_name, r.line, r.column) for r in result)
+        wanted = []
+        if not self.correct:
+            positions = []
+        else:
+            positions = literal_eval(self.correct)
+        for pos_tup in positions:
+            if type(pos_tup[0]) == str:
+                # this means that there is a module specified
+                wanted.append(pos_tup)
+            else:
+                line = pos_tup[0]
+                if pos_tup[0] is not None:
+                    line += self.line_nr
+                wanted.append((self.module_name, line, pos_tup[1]))
+
+        return compare_cb(self, compare, sorted(wanted))
+
+
+def skip_python_version(line):
+    comp_map = {
+        '==': 'eq',
+        '<=': 'le',
+        '>=': 'ge',
+        '<': 'lt',
+        '>': 'gt',
+    }
+    # check for python minimal version number
+    match = re.match(r" *# *python *([<>]=?|==) *(\d+(?:\.\d+)?)$", line)
+    if match:
+        minimal_python_version = tuple(
+            map(int, match.group(2).split(".")))
+        operation = getattr(operator, comp_map[match.group(1)])
+        if not operation(sys.version_info, minimal_python_version):
+            return "Minimal python version %s %s" % (match.group(1), match.group(2))
+
+    return None
+
+
+def collect_file_tests(path, lines, lines_to_execute):
+    def makecase(t):
+        return IntegrationTestCase(t, correct, line_nr, column,
+                                   start, line, path=path, skip=skip)
+
+    start = None
+    correct = None
+    test_type = None
+    skip = None
+    for line_nr, line in enumerate(lines, 1):
+        if correct is not None:
+            r = re.match('^(\d+)\s*(.*)$', correct)
+            if r:
+                column = int(r.group(1))
+                correct = r.group(2)
+                start += r.regs[2][0]  # second group, start index
+            else:
+                column = len(line) - 1  # -1 for the \n
+            if test_type == '!':
+                yield makecase(TEST_ASSIGNMENTS)
+            elif test_type == '<':
+                yield makecase(TEST_USAGES)
+            elif correct.startswith('['):
+                yield makecase(TEST_COMPLETIONS)
+            else:
+                yield makecase(TEST_DEFINITIONS)
+            correct = None
+        else:
+            skip = skip or skip_python_version(line)
+            try:
+                r = re.search(r'(?:^|(?<=\s))#([?!<])\s*([^\n]*)', line)
+                # test_type is ? for completion and ! for goto_assignments
+                test_type = r.group(1)
+                correct = r.group(2)
+                # Quick hack to make everything work (not quite a bloody unicorn hack though).
+                if correct == '':
+                    correct = ' '
+                start = r.start()
+            except AttributeError:
+                correct = None
+            else:
+                # Skip the test, if this is not specified test.
+                for l in lines_to_execute:
+                    if isinstance(l, tuple) and l[0] <= line_nr <= l[1] \
+                            or line_nr == l:
+                        break
+                else:
+                    if lines_to_execute:
+                        correct = None
+
+
+def collect_dir_tests(base_dir, test_files, check_thirdparty=False):
+    for f_name in os.listdir(base_dir):
+        files_to_execute = [a for a in test_files.items() if f_name.startswith(a[0])]
+        lines_to_execute = reduce(lambda x, y: x + y[1], files_to_execute, [])
+        if f_name.endswith(".py") and (not test_files or files_to_execute):
+            skip = None
+            if check_thirdparty:
+                lib = f_name.replace('_.py', '')
+                try:
+                    # there is always an underline at the end.
+                    # It looks like: completion/thirdparty/pylab_.py
+                    __import__(lib)
+                except ImportError:
+                    skip = 'Thirdparty-Library %s not found.' % lib
+
+            path = os.path.join(base_dir, f_name)
+
+            if is_py3:
+                source = open(path, encoding='utf-8').read()
+            else:
+                source = unicode(open(path).read(), 'UTF-8')
+
+            for case in collect_file_tests(path, StringIO(source),
+                                           lines_to_execute):
+                case.source = source
+                if skip:
+                    case.skip = skip
+                yield case
+
+
+docoptstr = """
+Using run.py to make debugging easier with integration tests.
+
+An alternative testing format, which is much more hacky, but very nice to
+work with.
+
+Usage:
+    run.py [--pdb] [--debug] [--thirdparty] [<rest>...]
+    run.py --help
+
+Options:
+    -h --help       Show this screen.
+    --pdb           Enable pdb debugging on fail.
+    -d, --debug     Enable text output debugging (please install ``colorama``).
+    --thirdparty    Also run thirdparty tests (in ``completion/thirdparty``).
+"""
+if __name__ == '__main__':
+    import docopt
+    arguments = docopt.docopt(docoptstr)
+
+    import time
+    t_start = time.time()
+    # Sorry I didn't use argparse here. It's because argparse is not in the
+    # stdlib in 2.5.
+    import sys
+
+    if arguments['--debug']:
+        jedi.set_debug_function()
+
+    # get test list, that should be executed
+    test_files = {}
+    last = None
+    for arg in arguments['<rest>']:
+        match = re.match('(\d+)-(\d+)', arg)
+        if match:
+            start, end = match.groups()
+            test_files[last].append((int(start), int(end)))
+        elif arg.isdigit():
+            if last is None:
+                continue
+            test_files[last].append(int(arg))
+        else:
+            test_files[arg] = []
+            last = arg
+
+    # completion tests:
+    dir_ = os.path.dirname(os.path.realpath(__file__))
+    completion_test_dir = os.path.join(dir_, '../test/completion')
+    completion_test_dir = os.path.abspath(completion_test_dir)
+    summary = []
+    tests_fail = 0
+
+    # execute tests
+    cases = list(collect_dir_tests(completion_test_dir, test_files))
+    if test_files or arguments['--thirdparty']:
+        completion_test_dir += '/thirdparty'
+        cases += collect_dir_tests(completion_test_dir, test_files, True)
+
+    def file_change(current, tests, fails):
+        if current is not None:
+            current = os.path.basename(current)
+        print('%s \t\t %s tests and %s fails.' % (current, tests, fails))
+
+    def report(case, actual, desired):
+        if actual == desired:
+            return 0
+        else:
+            print("\ttest fail @%d, actual = %s, desired = %s"
+                  % (case.line_nr - 1, actual, desired))
+            return 1
+
+    import traceback
+    current = cases[0].path if cases else None
+    count = fails = 0
+    for c in cases:
+        if c.skip:
+            continue
+        if current != c.path:
+            file_change(current, count, fails)
+            current = c.path
+            count = fails = 0
+
+        try:
+            if c.run(report):
+                tests_fail += 1
+                fails += 1
+        except Exception:
+            traceback.print_exc()
+            print("\ttest fail @%d" % (c.line_nr - 1))
+            tests_fail += 1
+            fails += 1
+            if arguments['--pdb']:
+                import pdb
+                pdb.post_mortem()
+
+        count += 1
+
+    file_change(current, count, fails)
+
+    print('\nSummary: (%s fails of %s tests) in %.3fs'
+          % (tests_fail, len(cases), time.time() - t_start))
+    for s in summary:
+        print(s)
+
+    exit_code = 1 if tests_fail else 0
+    sys.exit(exit_code)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/speed/precedence.py b/vim-plugins/bundle/jedi-vim/jedi/test/speed/precedence.py
new file mode 100644
index 0000000..afd8824
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/speed/precedence.py
@@ -0,0 +1,37 @@
+def marks(code):
+    if '.' in code:
+        another(code[:code.index(',') - 1] + '!')
+    else:
+        another(code + '.')
+
+
+def another(code2):
+    call(numbers(code2 + 'haha'))
+
+marks('start1 ')
+marks('start2 ')
+
+
+def alphabet(code4):
+    if 1:
+        if 2:
+            return code4 + 'a'
+        else:
+            return code4 + 'b'
+    else:
+        if 2:
+            return code4 + 'c'
+        else:
+            return code4 + 'd'
+
+
+def numbers(code5):
+    if 2:
+        return alphabet(code5 + '1')
+    else:
+        return alphabet(code5 + '2')
+
+
+def call(code3):
+    code3 = numbers(numbers('end')) + numbers(code3)
+    code3.partition
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/arguments.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/arguments.py
new file mode 100644
index 0000000..2fc8e81
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/arguments.py
@@ -0,0 +1,73 @@
+# -----------------
+# normal arguments (no keywords)
+# -----------------
+
+
+def simple(a):
+    return a
+
+simple(1)
+#! 6 type-error-too-few-arguments
+simple()
+#! 10 type-error-too-many-arguments
+simple(1, 2)
+
+
+#! 10 type-error-too-many-arguments
+simple(1, 2, 3)
+
+# -----------------
+# keyword arguments
+# -----------------
+
+simple(a=1)
+#! 7 type-error-keyword-argument
+simple(b=1)
+#! 10 type-error-too-many-arguments
+simple(1, a=1)
+
+
+def two_params(x, y):
+    return y
+
+
+two_params(y=2, x=1)
+two_params(1, y=2)
+
+#! 11 type-error-multiple-values
+two_params(1, x=2)
+#! 17 type-error-too-many-arguments
+two_params(1, 2, y=3)
+
+# -----------------
+# default arguments
+# -----------------
+
+def default(x, y=1, z=2):
+    return x
+
+#! 7 type-error-too-few-arguments
+default()
+default(1)
+default(1, 2)
+default(1, 2, 3)
+#! 17 type-error-too-many-arguments
+default(1, 2, 3, 4)
+
+default(x=1)
+
+# -----------------
+# class arguments
+# -----------------
+
+class Instance():
+    def __init__(self, foo):
+        self.foo = foo
+
+Instance(1).foo
+Instance(foo=1).foo
+
+#! 12 type-error-too-many-arguments
+Instance(1, 2).foo
+#! 8 type-error-too-few-arguments
+Instance().foo
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/attribute_error.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/attribute_error.py
new file mode 100644
index 0000000..4b084c1
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/attribute_error.py
@@ -0,0 +1,119 @@
+class Cls():
+    class_attr = ''
+    def __init__(self, input):
+        self.instance_attr = 3
+        self.input = input
+
+    def f(self):
+        #! 12 attribute-error
+        return self.not_existing
+
+    def undefined_object(self, obj):
+        """
+        Uses an arbitrary object and performs an operation on it, shouldn't
+        be a problem.
+        """
+        obj.arbitrary_lookup
+
+    def defined_lookup(self, obj):
+        """
+        `obj` is defined by a call into this function.
+        """
+        obj.upper
+        #! 4 attribute-error
+        obj.arbitrary_lookup
+
+    #! 13 name-error
+    class_attr = a
+
+Cls(1).defined_lookup('')
+
+c = Cls(1)
+c.class_attr
+Cls.class_attr
+#! 4 attribute-error
+Cls.class_attr_error
+c.instance_attr
+#! 2 attribute-error
+c.instance_attr_error
+
+
+c.something = None
+
+#! 12 name-error
+something = a
+something
+
+# -----------------
+# Unused array variables should still raise attribute errors.
+# -----------------
+
+# should not raise anything.
+for loop_variable in [1, 2]:
+    #! 4 name-error
+    x = undefined
+    loop_variable
+
+#! 28 name-error
+for loop_variable in [1, 2, undefined]:
+    pass
+
+#! 7 attribute-error
+[1, ''.undefined_attr]
+
+
+def return_one(something):
+    return 1
+
+#! 14 attribute-error
+return_one(''.undefined_attribute)
+
+#! 12 name-error
+[r for r in undefined]
+
+#! 1 name-error
+[undefined for r in [1, 2]]
+
+[r for r in [1, 2]]
+
+# some random error that showed up
+class NotCalled():
+    def match_something(self, param):
+        seems_to_need_an_assignment = param
+        return [value.match_something() for value in []]
+
+# -----------------
+# decorators
+# -----------------
+
+#! 1 name-error
+@undefined_decorator
+def func():
+    return 1
+
+# -----------------
+# operators
+# -----------------
+
+string = '%s %s' % (1, 2)
+
+# Shouldn't raise an error, because `string` is really just a string, not an
+# array or something.
+string.upper
+
+# -----------------
+# imports
+# -----------------
+
+# Star imports and the like in modules should not cause attribute errors in
+# this module.
+import import_tree
+
+import_tree.a
+import_tree.b
+
+# This is something that raised an error, because it was using a complex
+# mixture of Jedi fakes and compiled objects.
+import _sre
+#! 15 attribute-error
+_sre.compile().not_existing
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/attribute_warnings.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/attribute_warnings.py
new file mode 100644
index 0000000..0e1e5e9
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/attribute_warnings.py
@@ -0,0 +1,46 @@
+"""
+Jedi issues warnings for possible errors if ``__getattr__``,
+``__getattribute__`` or ``setattr`` are used.
+"""
+
+# -----------------
+# __getattr*__
+# -----------------
+
+
+class Cls():
+    def __getattr__(self, name):
+        return getattr(str, name)
+
+
+Cls().upper
+
+#! 6 warning attribute-error
+Cls().undefined
+
+
+class Inherited(Cls):
+    pass
+
+Inherited().upper
+
+#! 12 warning attribute-error
+Inherited().undefined
+
+# -----------------
+# setattr
+# -----------------
+
+
+class SetattrCls():
+    def __init__(self, dct):
+        # Jedi doesn't even try to understand such code
+        for k, v in dct.items():
+            setattr(self, k, v)
+
+        self.defined = 3
+
+c = SetattrCls({'a': 'b'})
+c.defined
+#! 2 warning attribute-error
+c.undefined
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/branches.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/branches.py
new file mode 100644
index 0000000..6828d33
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/branches.py
@@ -0,0 +1,46 @@
+# -----------------
+# Simple tests
+# -----------------
+
+import random
+
+if random.choice([0, 1]):
+    x = ''
+else:
+    x = 1
+if random.choice([0, 1]):
+    y = ''
+else:
+    y = 1
+
+# A simple test
+if x != 1:
+    x.upper()
+else:
+    #! 2 attribute-error
+    x.upper()
+    pass
+
+# This operation is wrong, because the types could be different.
+#! 6 type-error-operation
+z = x + y
+# However, here we have correct types.
+if x == y:
+    z = x + y
+else:
+    #! 6 type-error-operation
+    z = x + y
+
+# -----------------
+# With a function
+# -----------------
+
+def addition(a, b):
+    if type(a) == type(b):
+        return a + b
+    else:
+        #! 9 type-error-operation
+        return a + b
+
+addition(1, 1)
+addition(1.0, '')
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/builtins.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/builtins.py
new file mode 100644
index 0000000..86caca6
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/builtins.py
@@ -0,0 +1,11 @@
+# ----------
+# isinstance
+# ----------
+
+isinstance(1, int)
+isinstance(1, (int, str))
+
+#! 14 type-error-isinstance
+isinstance(1, 1)
+#! 14 type-error-isinstance
+isinstance(1, [int, str])
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/class_simple.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/class_simple.py
new file mode 100644
index 0000000..3f84fde
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/class_simple.py
@@ -0,0 +1,13 @@
+class Base(object):
+    class Nested():
+        def foo():
+            pass
+
+
+class X(Base.Nested):
+    pass
+
+
+X().foo()
+#! 4 attribute-error
+X().bar()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/comprehensions.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/comprehensions.py
new file mode 100644
index 0000000..4af799d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/comprehensions.py
@@ -0,0 +1,41 @@
+[a + 1 for a in [1, 2]]
+
+#! 3 type-error-operation
+[a + '' for a in [1, 2]]
+#! 3 type-error-operation
+(a + '' for a in [1, 2])
+
+#! 12 type-error-not-iterable
+[a for a in 1]
+
+tuple(str(a) for a in [1])
+
+#! 8 type-error-operation
+tuple(a + 3 for a in [''])
+
+# ----------
+# Some variables within are not defined
+# ----------
+
+#! 12 name-error
+[1 for a in NOT_DEFINFED for b in a if 1]
+
+#! 25 name-error
+[1 for a in [1] for b in NOT_DEFINED if 1]
+
+#! 12 name-error
+[1 for a in NOT_DEFINFED for b in [1] if 1]
+
+#! 19 name-error
+(1 for a in [1] if NOT_DEFINED)
+
+# ----------
+# unbalanced sides.
+# ----------
+
+# ok
+(1 for a, b in [(1, 2)])
+#! 13 value-error-too-few-values
+(1 for a, b, c in [(1, 2)])
+#! 10 value-error-too-many-values
+(1 for a, b in [(1, 2, 3)])
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/descriptors.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/descriptors.py
new file mode 100644
index 0000000..0fc5d15
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/descriptors.py
@@ -0,0 +1,13 @@
+# classmethod
+class TarFile():
+    @classmethod
+    def open(cls, name, **kwargs):
+        return cls.taropen(name, **kwargs)
+
+    @classmethod
+    def taropen(cls, name, **kwargs):
+        return name
+
+
+# should just work
+TarFile.open('hallo')
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/generators.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/generators.py
new file mode 100644
index 0000000..b941800
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/generators.py
@@ -0,0 +1,7 @@
+def generator():
+    yield 1
+
+#! 11 type-error-not-subscriptable
+generator()[0]
+
+list(generator())[0]
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/import_tree/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/import_tree/__init__.py
new file mode 100644
index 0000000..cb485f1
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/import_tree/__init__.py
@@ -0,0 +1,5 @@
+"""
+Another import tree, this time not for completion, but static analysis.
+"""
+
+from .a import *
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/import_tree/a.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/import_tree/a.py
new file mode 100644
index 0000000..b02981c
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/import_tree/a.py
@@ -0,0 +1 @@
+from . import b
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/import_tree/b.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/import_tree/b.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/imports.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/imports.py
new file mode 100644
index 0000000..0df9bac
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/imports.py
@@ -0,0 +1,25 @@
+
+#! 7 import-error
+import not_existing
+
+import os
+
+from os.path import abspath
+#! 20 import-error
+from os.path import not_existing
+
+from datetime import date
+date.today
+
+#! 5 attribute-error
+date.not_existing_attribute
+
+#! 14 import-error
+from datetime.date import today
+
+#! 16 import-error
+import datetime.date
+#! 7 import-error
+import not_existing_nested.date
+
+import os.path
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/iterable.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/iterable.py
new file mode 100644
index 0000000..0eae367
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/iterable.py
@@ -0,0 +1,21 @@
+
+a, b = {'asdf': 3, 'b': 'str'}
+a
+
+x = [1]
+x[0], b = {'a': 1, 'b': '2'}
+
+dct = {3: ''}
+for x in dct:
+    pass
+
+#! 4 type-error-not-iterable
+for x, y in dct:
+    pass
+
+# Shouldn't cause issues, because if there are no types (or we don't know what
+# the types are, we should just ignore it.
+#! 0 value-error-too-few-values
+a, b = []
+#! 7 name-error
+a, b = NOT_DEFINED
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/keywords.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/keywords.py
new file mode 100644
index 0000000..e3fcaa4
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/keywords.py
@@ -0,0 +1,7 @@
+def raises():
+    raise KeyError()
+
+
+def wrong_name():
+    #! 6 name-error
+    raise NotExistingException()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/operations.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/operations.py
new file mode 100644
index 0000000..05e1406
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/operations.py
@@ -0,0 +1,16 @@
+-1 + 1
+1 + 1.0
+#! 2 type-error-operation
+1 + '1'
+#! 2 type-error-operation
+1 - '1'
+
+-1 - - 1
+-1 - int()
+int() - float()
+float() - 3.0
+
+a = 3
+b = ''
+#! 2 type-error-operation
+a + b
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/python2.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/python2.py
new file mode 100644
index 0000000..4d896e3
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/python2.py
@@ -0,0 +1,11 @@
+"""
+Some special cases of Python 2.
+"""
+# python <= 2.7
+
+# print is syntax:
+print 1
+print(1)
+
+#! 6 name-error
+print NOT_DEFINED
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/star_arguments.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/star_arguments.py
new file mode 100644
index 0000000..34be43b
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/star_arguments.py
@@ -0,0 +1,119 @@
+# -----------------
+# *args
+# -----------------
+
+
+def simple(a):
+    return a
+
+
+def nested(*args):
+    return simple(*args)
+
+nested(1)
+#! 6 type-error-too-few-arguments
+nested()
+
+
+def nested_no_call_to_function(*args):
+    return simple(1, *args)
+
+
+def simple2(a, b, c):
+    return b
+def nested(*args):
+    return simple2(1, *args)
+def nested_twice(*args1):
+    return nested(*args1)
+
+nested_twice(2, 3)
+#! 13 type-error-too-few-arguments
+nested_twice(2)
+#! 19 type-error-too-many-arguments
+nested_twice(2, 3, 4)
+
+
+# A named argument can be located before *args.
+def star_args_with_named(*args):
+    return simple2(c='', *args)
+
+star_args_with_named(1, 2)
+# -----------------
+# **kwargs
+# -----------------
+
+
+def kwargs_test(**kwargs):
+    return simple2(1, **kwargs)
+
+kwargs_test(c=3, b=2)
+#! 12 type-error-too-few-arguments
+kwargs_test(c=3)
+#! 12 type-error-too-few-arguments
+kwargs_test(b=2)
+#! 22 type-error-keyword-argument
+kwargs_test(b=2, c=3, d=4)
+#! 12 type-error-multiple-values
+kwargs_test(b=2, c=3, a=4)
+
+
+def kwargs_nested(**kwargs):
+    return kwargs_test(b=2, **kwargs)
+
+kwargs_nested(c=3)
+#! 13 type-error-too-few-arguments
+kwargs_nested()
+#! 19 type-error-keyword-argument
+kwargs_nested(c=2, d=4)
+#! 14 type-error-multiple-values
+kwargs_nested(c=2, a=4)
+# TODO reenable
+##! 14 type-error-multiple-values
+#kwargs_nested(b=3, c=2)
+
+# -----------------
+# mixed *args/**kwargs
+# -----------------
+
+def simple_mixed(a, b, c):
+    return b
+
+def mixed(*args, **kwargs):
+    return simple_mixed(1, *args, **kwargs)
+
+mixed(1, 2)
+mixed(1, c=2)
+mixed(b=2, c=3)
+mixed(c=4, b='')
+
+# need separate functions, otherwise these might swallow the errors
+def mixed2(*args, **kwargs):
+    return simple_mixed(1, *args, **kwargs)
+
+
+#! 7 type-error-too-few-arguments
+mixed2(c=2)
+#! 7 type-error-too-few-arguments
+mixed2(3)
+#! 13 type-error-too-many-arguments
+mixed2(3, 4, 5)
+# TODO reenable
+##! 13 type-error-too-many-arguments
+#mixed2(3, 4, c=5)
+#! 7 type-error-multiple-values
+mixed2(3, b=5)
+
+# -----------------
+# plain wrong arguments
+# -----------------
+
+#! 12 type-error-star-star
+simple(1, **[])
+#! 12 type-error-star-star
+simple(1, **1)
+class A(): pass
+#! 12 type-error-star-star
+simple(1, **A())
+
+#! 11 type-error-star
+simple(1, *1)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/try_except.py b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/try_except.py
new file mode 100644
index 0000000..e654328
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/static_analysis/try_except.py
@@ -0,0 +1,89 @@
+try:
+    #! 4 attribute-error
+    str.not_existing
+except TypeError:
+    pass
+
+try:
+    str.not_existing
+except AttributeError:
+    #! 4 attribute-error
+    str.not_existing
+    pass
+
+try:
+    import not_existing_import
+except ImportError:
+    pass
+try:
+    #! 7 import-error
+    import not_existing_import
+except AttributeError:
+    pass
+
+# -----------------
+# multi except
+# -----------------
+try:
+    str.not_existing
+except (TypeError, AttributeError): pass
+
+try:
+    str.not_existing
+except ImportError:
+    pass
+except (NotImplementedError, AttributeError): pass
+
+try:
+    #! 4 attribute-error
+    str.not_existing
+except (TypeError, NotImplementedError): pass
+
+# -----------------
+# detailed except
+# -----------------
+try:
+    str.not_existing
+except ((AttributeError)): pass
+try:
+    #! 4 attribute-error
+    str.not_existing
+except [AttributeError]: pass
+
+# Should be able to detect errors in except statement as well.
+try:
+    pass
+#! 7 name-error
+except Undefined:
+    pass
+
+# -----------------
+# inheritance
+# -----------------
+
+try:
+    undefined
+except Exception:
+    pass
+
+# should catch everything
+try:
+    undefined
+except:
+    pass
+
+# -----------------
+# kind of similar: hasattr
+# -----------------
+
+if hasattr(str, 'undefined'):
+    str.undefined
+    str.upper
+    #! 4 attribute-error
+    str.undefined2
+    #! 4 attribute-error
+    int.undefined
+else:
+    str.upper
+    #! 4 attribute-error
+    str.undefined
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_api/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_api.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_api.py
new file mode 100644
index 0000000..d388c51
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_api.py
@@ -0,0 +1,179 @@
+"""
+Test all things related to the ``jedi.api`` module.
+"""
+
+from textwrap import dedent
+
+from jedi import api
+from jedi._compatibility import is_py3
+from pytest import raises
+from jedi.parser import utils
+
+
+def test_preload_modules():
+    def check_loaded(*modules):
+        # +1 for None module (currently used)
+        assert len(parser_cache) == len(modules) + 1
+        for i in modules:
+            assert [i in k for k in parser_cache.keys() if k is not None]
+
+    temp_cache, utils.parser_cache = utils.parser_cache, {}
+    parser_cache = utils.parser_cache
+
+    api.preload_module('sys')
+    check_loaded()  # compiled (c_builtin) modules shouldn't be in the cache.
+    api.preload_module('json', 'token')
+    check_loaded('json', 'token')
+
+    utils.parser_cache = temp_cache
+
+
+def test_empty_script():
+    assert api.Script('')
+
+
+def test_line_number_errors():
+    """
+    Script should raise a ValueError if line/column numbers are not in a
+    valid range.
+    """
+    s = 'hello'
+    # lines
+    with raises(ValueError):
+        api.Script(s, 2, 0)
+    with raises(ValueError):
+        api.Script(s, 0, 0)
+
+    # columns
+    with raises(ValueError):
+        api.Script(s, 1, len(s) + 1)
+    with raises(ValueError):
+        api.Script(s, 1, -1)
+
+    # ok
+    api.Script(s, 1, 0)
+    api.Script(s, 1, len(s))
+
+
+def _check_number(source, result='float'):
+    completions = api.Script(source).completions()
+    assert completions[0].parent().name == result
+
+
+def test_completion_on_number_literals():
+    # No completions on an int literal (is a float).
+    assert [c.name for c in api.Script('1.').completions()] \
+        == ['and', 'if', 'in', 'is', 'not', 'or']
+
+    # Multiple points after an int literal basically mean that there's a float
+    # and a call after that.
+    _check_number('1..')
+    _check_number('1.0.')
+
+    # power notation
+    _check_number('1.e14.')
+    _check_number('1.e-3.')
+    _check_number('9e3.')
+    assert api.Script('1.e3..').completions() == []
+    assert api.Script('1.e-13..').completions() == []
+
+
+def test_completion_on_hex_literals():
+    assert api.Script('0x1..').completions() == []
+    _check_number('0x1.', 'int')  # hexdecimal
+    # Completing binary literals doesn't work if they are not actually binary
+    # (invalid statements).
+    assert api.Script('0b2.b').completions() == []
+    _check_number('0b1.', 'int')  # binary
+
+    _check_number('0x2e.', 'int')
+    _check_number('0xE7.', 'int')
+    _check_number('0xEa.', 'int')
+    # theoretically, but people can just check for syntax errors:
+    #assert api.Script('0x.').completions() == []
+
+
+def test_completion_on_complex_literals():
+    assert api.Script('1j..').completions() == []
+    _check_number('1j.', 'complex')
+    _check_number('44.j.', 'complex')
+    _check_number('4.0j.', 'complex')
+    # No dot no completion - I thought, but 4j is actually a literall after
+    # which a keyword like or is allowed. Good times, haha!
+    assert (set([c.name for c in api.Script('4j').completions()]) ==
+            set(['if', 'and', 'in', 'is', 'not', 'or']))
+
+
+def test_goto_assignments_on_non_name():
+    assert api.Script('for').goto_assignments() == []
+
+    assert api.Script('assert').goto_assignments() == []
+    if is_py3:
+        assert api.Script('True').goto_assignments() == []
+    else:
+        # In Python 2.7 True is still a name.
+        assert api.Script('True').goto_assignments()[0].description == 'class bool'
+
+
+def test_goto_definitions_on_non_name():
+    assert api.Script('import x', column=0).goto_definitions() == []
+
+
+def test_goto_definition_not_multiple():
+    """
+    There should be only one Definition result if it leads back to the same
+    origin (e.g. instance method)
+    """
+
+    s = dedent('''\
+            import random
+            class A():
+                def __init__(self, a):
+                    self.a = 3
+
+                def foo(self):
+                    pass
+
+            if random.randint(0, 1):
+                a = A(2)
+            else:
+                a = A(1)
+            a''')
+    assert len(api.Script(s).goto_definitions()) == 1
+
+
+def test_usage_description():
+    descs = [u.description for u in api.Script("foo = ''; foo").usages()]
+    assert set(descs) == set(["foo = ''", 'foo'])
+
+
+def test_get_line_code():
+    def get_line_code(source, line=None, **kwargs):
+        return api.Script(source, line=line).completions()[0].get_line_code(**kwargs)
+
+    # On builtin
+    assert get_line_code('') == ''
+
+    # On custom code
+    line = '    foo'
+    assert get_line_code('def foo():\n%s' % line) == line
+
+    # With before/after
+    line = '    foo'
+    source = 'def foo():\n%s\nother_line' % line
+    assert get_line_code(source, line=2) == line
+    assert get_line_code(source, line=2, after=1) == line + '\nother_line'
+    assert get_line_code(source, line=2, after=1, before=1) == source
+
+
+def test_goto_assignments_follow_imports():
+    code = dedent("""
+    import inspect
+    inspect.isfunction""")
+    definition, = api.Script(code, column=0).goto_assignments(follow_imports=True)
+    assert 'inspect.py' in definition.module_path
+    assert definition.start_pos == (1, 0)
+
+    definition, = api.Script(code).goto_assignments(follow_imports=True)
+    assert 'inspect.py' in definition.module_path
+    assert definition.start_pos > (1, 0)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_api_classes_follow_definition.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_api_classes_follow_definition.py
new file mode 100644
index 0000000..ffc0cb6
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_api_classes_follow_definition.py
@@ -0,0 +1,62 @@
+from itertools import chain
+
+import jedi
+from ..helpers import cwd_at
+
+
+def test_import_empty():
+    """ github #340, return the full word. """
+    completion = jedi.Script("import ").completions()[0]
+    definition = completion.follow_definition()[0]
+    assert definition
+
+
+def check_follow_definition_types(source):
+    # nested import
+    completions = jedi.Script(source, path='some_path.py').completions()
+    defs = chain.from_iterable(c.follow_definition() for c in completions)
+    return [d.type for d in defs]
+
+
+def test_follow_import_incomplete():
+    """
+    Completion on incomplete imports should always take the full completion
+    to do any evaluation.
+    """
+    datetime = check_follow_definition_types("import itertool")
+    assert datetime == ['module']
+
+    # empty `from * import` parts
+    itert = jedi.Script("from itertools import ").completions()
+    definitions = [d for d in itert if d.name == 'chain']
+    assert len(definitions) == 1
+    assert [d.type for d in definitions[0].follow_definition()] == ['class']
+
+    # incomplete `from * import` part
+    datetime = check_follow_definition_types("from datetime import datetim")
+    assert set(datetime) == set(['class', 'instance'])  # py33: builtin and pure py version
+
+    # os.path check
+    ospath = check_follow_definition_types("from os.path import abspat")
+    assert ospath == ['function']
+
+    # alias
+    alias = check_follow_definition_types("import io as abcd; abcd")
+    assert alias == ['module']
+
+
+@cwd_at('test/completion/import_tree')
+def test_follow_definition_nested_import():
+    types = check_follow_definition_types("import pkg.mod1; pkg")
+    assert types == ['module']
+
+    types = check_follow_definition_types("import pkg.mod1; pkg.mod1")
+    assert types == ['module']
+
+    types = check_follow_definition_types("import pkg.mod1; pkg.mod1.a")
+    assert types == ['instance']
+
+
+def test_follow_definition_land_on_import():
+    types = check_follow_definition_types("import datetime; datetim")
+    assert types == ['module']
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_call_signatures.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_call_signatures.py
new file mode 100644
index 0000000..1add2ab
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_call_signatures.py
@@ -0,0 +1,389 @@
+from textwrap import dedent
+import inspect
+
+from ..helpers import TestCase
+from jedi import Script
+from jedi import cache
+from jedi._compatibility import is_py33
+
+
+def assert_signature(source, expected_name, expected_index=0, line=None, column=None):
+    signatures = Script(source, line, column).call_signatures()
+
+    assert len(signatures) <= 1
+
+    if not signatures:
+        assert expected_name is None, \
+            'There are no signatures, but `%s` expected.' % expected_name
+    else:
+        assert signatures[0].name == expected_name
+        assert signatures[0].index == expected_index
+        return signatures[0]
+
+
+class TestCallSignatures(TestCase):
+    def _run_simple(self, source, name, index=0, column=None, line=1):
+        assert_signature(source, name, index, line, column)
+
+    def test_valid_call(self):
+        assert_signature('str()', 'str', column=4)
+
+    def test_simple(self):
+        run = self._run_simple
+
+        # simple
+        s1 = "sorted(a, str("
+        run(s1, 'sorted', 0, 7)
+        run(s1, 'sorted', 1, 9)
+        run(s1, 'sorted', 1, 10)
+        run(s1, 'sorted', 1, 11)
+        run(s1, 'str', 0, 14)
+
+        s2 = "abs(), "
+        run(s2, 'abs', 0, 4)
+        run(s2, None, column=5)
+        run(s2, None)
+
+        s3 = "abs()."
+        run(s3, None, column=5)
+        run(s3, None)
+
+    def test_more_complicated(self):
+        run = self._run_simple
+        '''
+        s4 = 'abs(zip(), , set,'
+        run(s4, None, column=3)
+        run(s4, 'abs', 0, 4)
+        run(s4, 'zip', 0, 8)
+        run(s4, 'abs', 0, 9)
+        #run(s4, 'abs', 1, 10)
+        '''
+
+        s5 = "sorted(1,\nif 2:\n def a():"
+        run(s5, 'sorted', 0, 7)
+        run(s5, 'sorted', 1, 9)
+
+        s6 = "str().center("
+        run(s6, 'center', 0)
+        run(s6, 'str', 0, 4)
+
+        s7 = "str().upper().center("
+        s8 = "str(int[zip("
+        run(s7, 'center', 0)
+        run(s8, 'zip', 0)
+        run(s8, 'str', 0, 8)
+
+        run("import time; abc = time; abc.sleep(", 'sleep', 0)
+
+    def test_issue_57(self):
+        # jedi #57
+        s = "def func(alpha, beta): pass\n" \
+            "func(alpha='101',"
+        self._run_simple(s, 'func', 0, column=13, line=2)
+
+    def test_flows(self):
+        # jedi-vim #9
+        self._run_simple("with open(", 'open', 0)
+
+        # jedi-vim #11
+        self._run_simple("for sorted(", 'sorted', 0)
+        self._run_simple("for s in sorted(", 'sorted', 0)
+
+    def test_complex(self):
+        s = """
+                def abc(a,b):
+                    pass
+
+                def a(self):
+                    abc(
+
+                if 1:
+                    pass
+            """
+        assert_signature(s, 'abc', 0, line=6, column=24)
+        s = """
+                import re
+                def huhu(it):
+                    re.compile(
+                    return it * 2
+            """
+        assert_signature(s, 'compile', 0, line=4, column=31)
+
+        # jedi-vim #70
+        s = """def foo("""
+        assert Script(s).call_signatures() == []
+
+        # jedi-vim #116
+        s = """import itertools; test = getattr(itertools, 'chain'); test("""
+        assert_signature(s, 'chain', 0)
+
+    def test_call_signature_on_module(self):
+        """github issue #240"""
+        s = 'import datetime; datetime('
+        # just don't throw an exception (if numpy doesn't exist, just ignore it)
+        assert Script(s).call_signatures() == []
+
+    def test_call_signatures_empty_parentheses_pre_space(self):
+        s = dedent("""\
+        def f(a, b):
+            pass
+        f( )""")
+        assert_signature(s, 'f', 0, line=3, column=3)
+
+    def test_multiple_signatures(self):
+        s = dedent("""\
+        if x:
+            def f(a, b):
+                pass
+        else:
+            def f(a, b):
+                pass
+        f(""")
+        assert len(Script(s).call_signatures()) == 2
+
+    def test_call_signatures_whitespace(self):
+        s = dedent("""\
+        abs( 
+        def x():
+            pass
+        """)
+        assert_signature(s, 'abs', 0, line=1, column=5)
+
+    def test_decorator_in_class(self):
+        """
+        There's still an implicit param, with a decorator.
+        Github issue #319.
+        """
+        s = dedent("""\
+        def static(func):
+            def wrapped(obj, *args):
+                return f(type(obj), *args)
+            return wrapped
+
+        class C(object):
+            @static
+            def test(cls):
+                return 10
+
+        C().test(""")
+
+        signatures = Script(s).call_signatures()
+        assert len(signatures) == 1
+        x = [p.description for p in signatures[0].params]
+        assert x == ['*args']
+
+    def test_additional_brackets(self):
+        assert_signature('str((', 'str', 0)
+
+    def test_unterminated_strings(self):
+        assert_signature('str(";', 'str', 0)
+
+    def test_whitespace_before_bracket(self):
+        assert_signature('str (', 'str', 0)
+        assert_signature('str (";', 'str', 0)
+        assert_signature('str\n(', None)
+
+    def test_brackets_in_string_literals(self):
+        assert_signature('str (" (', 'str', 0)
+        assert_signature('str (" )', 'str', 0)
+
+    def test_function_definitions_should_break(self):
+        """
+        Function definitions (and other tokens that cannot exist within call
+        signatures) should break and not be able to return a call signature.
+        """
+        assert_signature('str(\ndef x', 'str', 0)
+        assert not Script('str(\ndef x(): pass').call_signatures()
+
+    def test_flow_call(self):
+        assert not Script('if (1').call_signatures()
+
+    def test_chained_calls(self):
+        source = dedent('''
+        class B():
+          def test2(self, arg):
+            pass
+
+        class A():
+          def test1(self):
+            return B()
+
+        A().test1().test2(''')
+
+        assert_signature(source, 'test2', 0)
+
+    def test_return(self):
+        source = dedent('''
+        def foo():
+            return '.'.join()''')
+
+        assert_signature(source, 'join', 0, column=len("    return '.'.join("))
+
+
+class TestParams(TestCase):
+    def params(self, source, line=None, column=None):
+        signatures = Script(source, line, column).call_signatures()
+        assert len(signatures) == 1
+        return signatures[0].params
+
+    def test_param_name(self):
+        if not is_py33:
+            p = self.params('''int(''')
+            # int is defined as: `int(x[, base])`
+            assert p[0].name == 'x'
+            # `int` docstring has been redefined:
+            # http://bugs.python.org/issue14783
+            # TODO have multiple call signatures for int (like in the docstr)
+            #assert p[1].name == 'base'
+
+        p = self.params('''open(something,''')
+        assert p[0].name in ['file', 'name']
+        assert p[1].name == 'mode'
+
+    def test_builtins(self):
+        """
+        The self keyword should be visible even for builtins, if not
+        instantiated.
+        """
+        p = self.params('str.endswith(')
+        assert p[0].name == 'self'
+        assert p[1].name == 'suffix'
+        p = self.params('str().endswith(')
+        assert p[0].name == 'suffix'
+
+
+def test_signature_is_definition():
+    """
+    Through inheritance, a call signature is a sub class of Definition.
+    Check if the attributes match.
+    """
+    s = """class Spam(): pass\nSpam"""
+    signature = Script(s + '(').call_signatures()[0]
+    definition = Script(s + '(', column=0).goto_definitions()[0]
+    signature.line == 1
+    signature.column == 6
+
+    # Now compare all the attributes that a CallSignature must also have.
+    for attr_name in dir(definition):
+        dont_scan = ['defined_names', 'line_nr', 'start_pos', 'documentation',
+                     'doc', 'parent', 'goto_assignments']
+        if attr_name.startswith('_') or attr_name in dont_scan:
+            continue
+        attribute = getattr(definition, attr_name)
+        signature_attribute = getattr(signature, attr_name)
+        if inspect.ismethod(attribute):
+            assert attribute() == signature_attribute()
+        else:
+            assert attribute == signature_attribute
+
+
+def test_no_signature():
+    # str doesn't have a __call__ method
+    assert Script('str()(').call_signatures() == []
+
+    s = dedent("""\
+    class X():
+        pass
+    X()(""")
+    assert Script(s).call_signatures() == []
+    assert len(Script(s, column=2).call_signatures()) == 1
+
+
+def test_dict_literal_in_incomplete_call():
+    source = """\
+    import json
+
+    def foo():
+        json.loads(
+
+        json.load.return_value = {'foo': [],
+                                  'bar': True}
+
+        c = Foo()
+    """
+
+    script = Script(dedent(source), line=4, column=15)
+    assert script.call_signatures()
+
+
+def test_completion_interference():
+    """Seems to cause problems, see also #396."""
+    cache.parser_cache.pop(None, None)
+    assert Script('open(').call_signatures()
+
+    # complete something usual, before doing the same call_signatures again.
+    assert Script('from datetime import ').completions()
+
+    assert Script('open(').call_signatures()
+
+
+def test_keyword_argument_index():
+    def get(source, column=None):
+        return Script(source, column=column).call_signatures()[0]
+
+    assert get('sorted([], key=a').index == 2
+    assert get('sorted([], key=').index == 2
+    assert get('sorted([], no_key=a').index is None
+
+    kw_func = 'def foo(a, b): pass\nfoo(b=3, a=4)'
+    assert get(kw_func, column=len('foo(b')).index == 0
+    assert get(kw_func, column=len('foo(b=')).index == 1
+    assert get(kw_func, column=len('foo(b=3, a=')).index == 0
+
+    kw_func_simple = 'def foo(a, b): pass\nfoo(b=4)'
+    assert get(kw_func_simple, column=len('foo(b')).index == 0
+    assert get(kw_func_simple, column=len('foo(b=')).index == 1
+
+    args_func = 'def foo(*kwargs): pass\n'
+    assert get(args_func + 'foo(a').index == 0
+    assert get(args_func + 'foo(a, b').index == 0
+
+    kwargs_func = 'def foo(**kwargs): pass\n'
+    assert get(kwargs_func + 'foo(a=2').index == 0
+    assert get(kwargs_func + 'foo(a=2, b=2').index == 0
+
+    both = 'def foo(*args, **kwargs): pass\n'
+    assert get(both + 'foo(a=2').index == 1
+    assert get(both + 'foo(a=2, b=2').index == 1
+    assert get(both + 'foo(a=2, b=2)', column=len('foo(b=2, a=2')).index == 1
+    assert get(both + 'foo(a, b, c').index == 0
+
+
+def test_bracket_start():
+    def bracket_start(src):
+        signatures = Script(src).call_signatures()
+        assert len(signatures) == 1
+        return signatures[0].bracket_start
+
+    assert bracket_start('str(') == (1, 3)
+
+
+def test_different_caller():
+    """
+    It's possible to not use names, but another function result or an array
+    index and then get the call signature of it.
+    """
+
+    assert_signature('[str][0](', 'str', 0)
+    assert_signature('[str][0]()', 'str', 0, column=len('[str][0]('))
+
+    assert_signature('(str)(', 'str', 0)
+    assert_signature('(str)()', 'str', 0, column=len('(str)('))
+
+
+def test_in_function():
+    code = dedent('''\
+    class X():
+        @property
+        def func(''')
+    assert not Script(code).call_signatures()
+
+
+def test_lambda_params():
+    code = dedent('''\
+    my_lambda = lambda x: x+1
+    my_lambda(1)''')
+    sig, = Script(code, column=11).call_signatures()
+    assert sig.index == 0
+    assert sig.name == '<lambda>'
+    assert [p.name for p in sig.params] == ['x']
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_classes.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_classes.py
new file mode 100644
index 0000000..64d9264
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_classes.py
@@ -0,0 +1,354 @@
+""" Test all things related to the ``jedi.api_classes`` module.
+"""
+
+from textwrap import dedent
+from inspect import cleandoc
+
+import pytest
+
+from jedi import Script, defined_names, __doc__ as jedi_doc, names
+from ..helpers import cwd_at
+from ..helpers import TestCase
+
+
+def test_is_keyword():
+    #results = Script('import ', 1, 1, None).goto_definitions()
+    #assert len(results) == 1 and results[0].is_keyword is True
+    results = Script('str', 1, 1, None).goto_definitions()
+    assert len(results) == 1 and results[0].is_keyword is False
+
+
+def make_definitions():
+    """
+    Return a list of definitions for parametrized tests.
+
+    :rtype: [jedi.api_classes.BaseDefinition]
+    """
+    source = dedent("""
+    import sys
+
+    class C:
+        pass
+
+    x = C()
+
+    def f():
+        pass
+
+    def g():
+        yield
+
+    h = lambda: None
+    """)
+
+    definitions = []
+    definitions += defined_names(source)
+
+    source += dedent("""
+    variable = sys or C or x or f or g or g() or h""")
+    lines = source.splitlines()
+    script = Script(source, len(lines), len('variable'), None)
+    definitions += script.goto_definitions()
+
+    script2 = Script(source, 4, len('class C'), None)
+    definitions += script2.usages()
+
+    source_param = "def f(a): return a"
+    script_param = Script(source_param, 1, len(source_param), None)
+    definitions += script_param.goto_assignments()
+
+    return definitions
+
+
+@pytest.mark.parametrize('definition', make_definitions())
+def test_basedefinition_type(definition):
+    assert definition.type in ('module', 'class', 'instance', 'function',
+                               'generator', 'statement', 'import', 'param')
+
+
+def test_basedefinition_type_import():
+    def get_types(source, **kwargs):
+        return set([t.type for t in Script(source, **kwargs).completions()])
+
+    # import one level
+    assert get_types('import t') == set(['module'])
+    assert get_types('import ') == set(['module'])
+    assert get_types('import datetime; datetime') == set(['module'])
+
+    # from
+    assert get_types('from datetime import timedelta') == set(['class'])
+    assert get_types('from datetime import timedelta; timedelta') == set(['class'])
+    assert get_types('from json import tool') == set(['module'])
+    assert get_types('from json import tool; tool') == set(['module'])
+
+    # import two levels
+    assert get_types('import json.tool; json') == set(['module'])
+    assert get_types('import json.tool; json.tool') == set(['module'])
+    assert get_types('import json.tool; json.tool.main') == set(['function'])
+    assert get_types('import json.tool') == set(['module'])
+    assert get_types('import json.tool', column=9) == set(['module'])
+
+
+def test_function_call_signature_in_doc():
+    defs = Script("""
+    def f(x, y=1, z='a'):
+        pass
+    f""").goto_definitions()
+    doc = defs[0].doc
+    assert "f(x, y=1, z='a')" in str(doc)
+
+
+def test_class_call_signature():
+    defs = Script("""
+    class Foo:
+        def __init__(self, x, y=1, z='a'):
+            pass
+    Foo""").goto_definitions()
+    doc = defs[0].doc
+    assert "Foo(self, x, y=1, z='a')" in str(doc)
+
+
+def test_position_none_if_builtin():
+    gotos = Script('import sys; sys.path').goto_assignments()
+    assert gotos[0].line is None
+    assert gotos[0].column is None
+
+
+@cwd_at('.')
+def test_completion_docstring():
+    """
+    Jedi should follow imports in certain conditions
+    """
+    def docstr(src, result):
+        c = Script(src).completions()[0]
+        assert c.docstring(raw=True, fast=False) == cleandoc(result)
+
+    c = Script('import jedi\njed').completions()[0]
+    assert c.docstring(fast=False) == cleandoc(jedi_doc)
+
+    docstr('import jedi\njedi.Scr', cleandoc(Script.__doc__))
+
+    docstr('abcd=3;abcd', '')
+    docstr('"hello"\nabcd=3\nabcd', 'hello')
+    # It works with a ; as well.
+    docstr('"hello"\nabcd=3;abcd', 'hello')
+    # Shouldn't work with a tuple.
+    docstr('"hello",0\nabcd=3\nabcd', '')
+
+
+def test_completion_params():
+    c = Script('import string; string.capwords').completions()[0]
+    assert [p.name for p in c.params] == ['s', 'sep']
+
+
+def test_signature_params():
+    def check(defs):
+        params = defs[0].params
+        assert len(params) == 1
+        assert params[0].name == 'bar'
+
+    s = dedent('''
+    def foo(bar):
+        pass
+    foo''')
+
+    check(Script(s).goto_definitions())
+
+    check(Script(s).goto_assignments())
+    check(Script(s + '\nbar=foo\nbar').goto_assignments())
+
+
+def test_param_endings():
+    """
+    Params should be represented without the comma and whitespace they have
+    around them.
+    """
+    sig = Script('def x(a, b=5, c=""): pass\n x(').call_signatures()[0]
+    assert [p.description for p in sig.params] == ['a', 'b=5', 'c=""']
+
+
+class TestIsDefinition(TestCase):
+    def _def(self, source, index=-1):
+        return names(dedent(source), references=True, all_scopes=True)[index]
+
+    def _bool_is_definitions(self, source):
+        ns = names(dedent(source), references=True, all_scopes=True)
+        # Assure that names are definitely sorted.
+        ns = sorted(ns, key=lambda name: (name.line, name.column))
+        return [name.is_definition() for name in ns]
+
+    def test_name(self):
+        d = self._def('name')
+        assert d.name == 'name'
+        assert not d.is_definition()
+
+    def test_stmt(self):
+        src = 'a = f(x)'
+        d = self._def(src, 0)
+        assert d.name == 'a'
+        assert d.is_definition()
+        d = self._def(src, 1)
+        assert d.name == 'f'
+        assert not d.is_definition()
+        d = self._def(src)
+        assert d.name == 'x'
+        assert not d.is_definition()
+
+    def test_import(self):
+        assert self._bool_is_definitions('import x as a') == [False, True]
+        assert self._bool_is_definitions('from x import y') == [False, True]
+        assert self._bool_is_definitions('from x.z import y') == [False, False, True]
+
+
+class TestParent(TestCase):
+    def _parent(self, source, line=None, column=None):
+        defs = Script(dedent(source), line, column).goto_assignments()
+        assert len(defs) == 1
+        return defs[0].parent()
+
+    def test_parent(self):
+        parent = self._parent('foo=1\nfoo')
+        assert parent.type == 'module'
+
+        parent = self._parent('''
+            def spam():
+                if 1:
+                    y=1
+                    y''')
+        assert parent.name == 'spam'
+        assert parent.parent().type == 'module'
+
+    def test_on_function(self):
+        parent = self._parent('''\
+            def spam():
+                pass''', 1, len('def spam'))
+        assert parent.name == ''
+        assert parent.type == 'module'
+
+    def test_parent_on_completion(self):
+        parent = Script(dedent('''\
+            class Foo():
+                def bar(): pass
+            Foo().bar''')).completions()[0].parent()
+        assert parent.name == 'Foo'
+        assert parent.type == 'instance'
+
+        parent = Script('str.join').completions()[0].parent()
+        assert parent.name == 'str'
+        assert parent.type == 'class'
+
+
+def test_type():
+    """
+    Github issue #397, type should never raise an error.
+    """
+    for c in Script('import os; os.path.').completions():
+        assert c.type
+
+
+class TestGotoAssignments(TestCase):
+    """
+    This tests the BaseDefinition.goto_assignments function, not the jedi
+    function. They are not really different in functionality, but really
+    different as an implementation.
+    """
+    def test_repetition(self):
+        defs = names('a = 1; a', references=True, definitions=False)
+        # Repeat on the same variable. Shouldn't change once we're on a
+        # definition.
+        for _ in range(3):
+            assert len(defs) == 1
+            ass = defs[0].goto_assignments()
+            assert ass[0].description == 'a = 1'
+
+    def test_named_params(self):
+        src = """\
+                def foo(a=1, bar=2):
+                    pass
+                foo(bar=1)
+              """
+        bar = names(dedent(src), references=True)[-1]
+        param = bar.goto_assignments()[0]
+        assert param.start_pos == (1, 13)
+        assert param.type == 'param'
+
+    def test_class_call(self):
+        src = 'from threading import Thread; Thread(group=1)'
+        n = names(src, references=True)[-1]
+        assert n.name == 'group'
+        param_def = n.goto_assignments()[0]
+        assert param_def.name == 'group'
+        assert param_def.type == 'param'
+
+    def test_parentheses(self):
+        n = names('("").upper', references=True)[-1]
+        assert n.goto_assignments()[0].name == 'upper'
+
+    def test_import(self):
+        nms = names('from json import load', references=True)
+        assert nms[0].name == 'json'
+        assert nms[0].type == 'import'
+        n = nms[0].goto_assignments()[0]
+        assert n.name == 'json'
+        assert n.type == 'module'
+
+        assert nms[1].name == 'load'
+        assert nms[1].type == 'import'
+        n = nms[1].goto_assignments()[0]
+        assert n.name == 'load'
+        assert n.type == 'function'
+
+        nms = names('import os; os.path', references=True)
+        assert nms[0].name == 'os'
+        assert nms[0].type == 'import'
+        n = nms[0].goto_assignments()[0]
+        assert n.name == 'os'
+        assert n.type == 'module'
+
+        n = nms[2].goto_assignments()[0]
+        assert n.name == 'path'
+        assert n.type == 'import'
+
+        nms = names('import os.path', references=True)
+        n = nms[0].goto_assignments()[0]
+        assert n.name == 'os'
+        assert n.type == 'module'
+        n = nms[1].goto_assignments()[0]
+        # This is very special, normally the name doesn't chance, but since
+        # os.path is a sys.modules hack, it does.
+        assert n.name in ('ntpath', 'posixpath', 'os2emxpath')
+        assert n.type == 'module'
+
+    def test_import_alias(self):
+        nms = names('import json as foo', references=True)
+        assert nms[0].name == 'json'
+        assert nms[0].type == 'import'
+        n = nms[0].goto_assignments()[0]
+        assert n.name == 'json'
+        assert n.type == 'module'
+
+        assert nms[1].name == 'foo'
+        assert nms[1].type == 'import'
+        ass = nms[1].goto_assignments()
+        assert len(ass) == 1
+        assert ass[0].name == 'json'
+        assert ass[0].type == 'module'
+
+
+def test_added_equals_to_params():
+    def run(rest_source):
+        source = dedent("""
+        def foo(bar, baz):
+            pass
+        """)
+        results = Script(source + rest_source).completions()
+        assert len(results) == 1
+        return results[0]
+
+    assert run('foo(bar').name_with_symbols == 'bar='
+    assert run('foo(bar').complete == '='
+    assert run('foo(bar, baz').complete == '='
+    assert run('    bar').name_with_symbols == 'bar'
+    assert run('    bar').complete == ''
+    x = run('foo(bar=isins').name_with_symbols
+    assert x == 'isinstance'
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_completion_context.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_completion_context.py
new file mode 100644
index 0000000..fee4f0e
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_completion_context.py
@@ -0,0 +1,9 @@
+from textwrap import dedent
+from jedi import Script
+
+
+def test_in_whitespace():
+    code = dedent('''
+    def x():
+        pass''')
+    assert len(Script(code, column=2).completions()) > 20
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_defined_names.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_defined_names.py
new file mode 100644
index 0000000..aae1f6c
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_defined_names.py
@@ -0,0 +1,92 @@
+"""
+Tests for `api.defined_names`.
+"""
+
+from textwrap import dedent
+
+from jedi import defined_names, names
+from ..helpers import TestCase
+
+
+class TestDefinedNames(TestCase):
+    def assert_definition_names(self, definitions, names_):
+        assert [d.name for d in definitions] == names_
+
+    def check_defined_names(self, source, names_):
+        definitions = names(dedent(source))
+        self.assert_definition_names(definitions, names_)
+        return definitions
+
+    def test_get_definitions_flat(self):
+        self.check_defined_names("""
+        import module
+        class Class:
+            pass
+        def func():
+            pass
+        data = None
+        """, ['module', 'Class', 'func', 'data'])
+
+    def test_dotted_assignment(self):
+        self.check_defined_names("""
+        x = Class()
+        x.y.z = None
+        """, ['x', 'z'])  # TODO is this behavior what we want?
+
+    def test_multiple_assignment(self):
+        self.check_defined_names("""
+        x = y = None
+        """, ['x', 'y'])
+
+    def test_multiple_imports(self):
+        self.check_defined_names("""
+        from module import a, b
+        from another_module import *
+        """, ['a', 'b'])
+
+    def test_nested_definitions(self):
+        definitions = self.check_defined_names("""
+        class Class:
+            def f():
+                pass
+            def g():
+                pass
+        """, ['Class'])
+        subdefinitions = definitions[0].defined_names()
+        self.assert_definition_names(subdefinitions, ['f', 'g'])
+        self.assertEqual([d.full_name for d in subdefinitions],
+                         ['Class.f', 'Class.g'])
+
+    def test_nested_class(self):
+        definitions = self.check_defined_names("""
+        class L1:
+            class L2:
+                class L3:
+                    def f(): pass
+                def f(): pass
+            def f(): pass
+        def f(): pass
+        """, ['L1', 'f'])
+        subdefs = definitions[0].defined_names()
+        subsubdefs = subdefs[0].defined_names()
+        self.assert_definition_names(subdefs, ['L2', 'f'])
+        self.assert_definition_names(subsubdefs, ['L3', 'f'])
+        self.assert_definition_names(subsubdefs[0].defined_names(), ['f'])
+
+
+def test_follow_imports():
+    # github issue #344
+    imp = defined_names('import datetime')[0]
+    assert imp.name == 'datetime'
+    datetime_names = [str(d.name) for d in imp.defined_names()]
+    assert 'timedelta' in datetime_names
+
+
+def test_names_twice():
+    source = dedent('''
+    def lol():
+        pass
+    ''')
+
+    defs = names(source=source)
+    assert defs[0].defined_names() == []
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_full_name.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_full_name.py
new file mode 100644
index 0000000..b96c548
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_full_name.py
@@ -0,0 +1,91 @@
+"""
+Tests for :attr:`.BaseDefinition.full_name`.
+
+There are three kinds of test:
+
+#. Test classes derived from :class:`MixinTestFullName`.
+   Child class defines :attr:`.operation` to alter how
+   the api definition instance is created.
+
+#. :class:`TestFullDefinedName` is to test combination of
+   ``obj.full_name`` and ``jedi.defined_names``.
+
+#. Misc single-function tests.
+"""
+
+import textwrap
+
+import pytest
+
+import jedi
+from ..helpers import TestCase
+
+
+class MixinTestFullName(object):
+    operation = None
+
+    def check(self, source, desired):
+        script = jedi.Script(textwrap.dedent(source))
+        definitions = getattr(script, type(self).operation)()
+        for d in definitions:
+            self.assertEqual(d.full_name, desired)
+
+    def test_os_path_join(self):
+        self.check('import os; os.path.join', 'os.path.join')
+
+    def test_builtin(self):
+        self.check('TypeError', 'TypeError')
+
+
+class TestFullNameWithGotoDefinitions(MixinTestFullName, TestCase):
+    operation = 'goto_definitions'
+
+    @pytest.mark.skipif('sys.version_info[0] < 3', reason='Python 2 also yields None.')
+    def test_tuple_mapping(self):
+        self.check("""
+        import re
+        any_re = re.compile('.*')
+        any_re""", '_sre.compile.SRE_Pattern')
+
+    def test_from_import(self):
+        self.check('from os import path', 'os.path')
+
+
+class TestFullNameWithCompletions(MixinTestFullName, TestCase):
+    operation = 'completions'
+
+
+class TestFullDefinedName(TestCase):
+    """
+    Test combination of ``obj.full_name`` and ``jedi.defined_names``.
+    """
+
+    def check(self, source, desired):
+        definitions = jedi.defined_names(textwrap.dedent(source))
+        full_names = [d.full_name for d in definitions]
+        self.assertEqual(full_names, desired)
+
+    def test_local_names(self):
+        self.check("""
+        def f(): pass
+        class C: pass
+        """, ['f', 'C'])
+
+    def test_imports(self):
+        self.check("""
+        import os
+        from os import path
+        from os.path import join
+        from os import path as opath
+        """, ['os', 'os.path', 'os.path.join', 'os.path'])
+
+
+def test_sub_module():
+    """
+    ``full_name needs to check sys.path to actually find it's real path module
+    path.
+    """
+    defs = jedi.Script('from jedi.api import classes; classes').goto_definitions()
+    assert [d.full_name for d in defs] == ['jedi.api.classes']
+    defs = jedi.Script('import jedi.api; jedi.api').goto_definitions()
+    assert [d.full_name for d in defs] == ['jedi.api']
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_interpreter.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_interpreter.py
new file mode 100644
index 0000000..0976241
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_interpreter.py
@@ -0,0 +1,160 @@
+"""
+Tests of ``jedi.api.Interpreter``.
+"""
+
+from ..helpers import TestCase
+import jedi
+from jedi._compatibility import is_py33
+from jedi.evaluate.compiled import mixed
+
+class _GlobalNameSpace():
+    class SideEffectContainer():
+        pass
+
+
+def get_completion(source, namespace):
+    i = jedi.Interpreter(source, [namespace])
+    completions = i.completions()
+    assert len(completions) == 1
+    return completions[0]
+
+
+def test_builtin_details():
+    import keyword
+
+    class EmptyClass:
+        pass
+
+    variable = EmptyClass()
+
+    def func():
+        pass
+
+    cls = get_completion('EmptyClass', locals())
+    var = get_completion('variable', locals())
+    f = get_completion('func', locals())
+    m = get_completion('keyword', locals())
+    assert cls.type == 'class'
+    assert var.type == 'instance'
+    assert f.type == 'function'
+    assert m.type == 'module'
+
+
+def test_nested_resolve():
+    class XX():
+        def x():
+            pass
+
+    cls = get_completion('XX', locals())
+    func = get_completion('XX.x', locals())
+    assert func.start_pos == (cls.start_pos[0] + 1, 12)
+
+
+def test_side_effect_completion():
+    """
+    In the repl it's possible to cause side effects that are not documented in
+    Python code, however we want references to Python code as well. Therefore
+    we need some mixed kind of magic for tests.
+    """
+    _GlobalNameSpace.SideEffectContainer.foo = 1
+    side_effect = get_completion('SideEffectContainer', _GlobalNameSpace.__dict__)
+
+    # It's a class that contains MixedObject.
+    assert isinstance(side_effect._definition.base, mixed.MixedObject)
+    foo = get_completion('SideEffectContainer.foo', _GlobalNameSpace.__dict__)
+    assert foo.name == 'foo'
+
+
+class TestInterpreterAPI(TestCase):
+    def check_interpreter_complete(self, source, namespace, completions,
+                                   **kwds):
+        script = jedi.Interpreter(source, [namespace], **kwds)
+        cs = script.completions()
+        actual = [c.name for c in cs]
+        self.assertEqual(sorted(actual), sorted(completions))
+
+    def test_complete_raw_function(self):
+        from os.path import join
+        self.check_interpreter_complete('join("").up',
+                                        locals(),
+                                        ['upper'])
+
+    def test_complete_raw_function_different_name(self):
+        from os.path import join as pjoin
+        self.check_interpreter_complete('pjoin("").up',
+                                        locals(),
+                                        ['upper'])
+
+    def test_complete_raw_module(self):
+        import os
+        self.check_interpreter_complete('os.path.join("a").up',
+                                        locals(),
+                                        ['upper'])
+
+    def test_complete_raw_instance(self):
+        import datetime
+        dt = datetime.datetime(2013, 1, 1)
+        completions = ['time', 'timetz', 'timetuple']
+        if is_py33:
+            completions += ['timestamp']
+        self.check_interpreter_complete('(dt - dt).ti',
+                                        locals(),
+                                        completions)
+
+    def test_list(self):
+        array = ['haha', 1]
+        self.check_interpreter_complete('array[0].uppe',
+                                        locals(),
+                                        ['upper'])
+        self.check_interpreter_complete('array[0].real',
+                                        locals(),
+                                        [])
+
+        # something different, no index given, still just return the right
+        self.check_interpreter_complete('array[int].real',
+                                        locals(),
+                                        ['real'])
+        self.check_interpreter_complete('array[int()].real',
+                                        locals(),
+                                        ['real'])
+        # inexistent index
+        self.check_interpreter_complete('array[2].upper',
+                                        locals(),
+                                        ['upper'])
+
+    def test_slice(self):
+        class Foo():
+            bar = []
+        baz = 'xbarx'
+        self.check_interpreter_complete('getattr(Foo, baz[1:-1]).append',
+                                        locals(),
+                                        ['append'])
+
+    def test_getitem_side_effects(self):
+        class Foo():
+            def __getitem__(self, index):
+                # possible side effects here, should therefore not call this.
+                return index
+
+        foo = Foo()
+        self.check_interpreter_complete('foo[0].', locals(), [])
+
+    def test_property_error(self):
+        class Foo():
+            @property
+            def bar(self):
+                raise ValueError
+
+        foo = Foo()
+        self.check_interpreter_complete('foo.bar', locals(), ['bar'])
+        self.check_interpreter_complete('foo.bar.baz', locals(), [])
+
+    def test_param_completion(self):
+        def foo(bar):
+            pass
+
+        lambd = lambda xyz: 3
+
+        self.check_interpreter_complete('foo(bar', locals(), ['bar'])
+        # TODO we're not yet using the Python3.5 inspect.signature, yet.
+        assert not jedi.Interpreter('lambd(xyz', [locals()]).completions()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_unicode.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_unicode.py
new file mode 100644
index 0000000..bcd8ad4
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_unicode.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+"""
+All character set and unicode related tests.
+"""
+from jedi import Script
+from jedi._compatibility import u, unicode
+
+
+def test_unicode_script():
+    """ normally no unicode objects are being used. (<=2.7) """
+    s = unicode("import datetime; datetime.timedelta")
+    completions = Script(s).completions()
+    assert len(completions)
+    assert type(completions[0].description) is unicode
+
+    s = u("author='öä'; author")
+    completions = Script(s).completions()
+    x = completions[0].description
+    assert type(x) is unicode
+
+    s = u("#-*- coding: iso-8859-1 -*-\nauthor='öä'; author")
+    s = s.encode('latin-1')
+    completions = Script(s).completions()
+    assert type(completions[0].description) is unicode
+
+
+def test_unicode_attribute():
+    """ github jedi-vim issue #94 """
+    s1 = u('#-*- coding: utf-8 -*-\nclass Person():\n'
+           '    name = "e"\n\nPerson().name.')
+    completions1 = Script(s1).completions()
+    assert 'strip' in [c.name for c in completions1]
+    s2 = u('#-*- coding: utf-8 -*-\nclass Person():\n'
+           '    name = "é"\n\nPerson().name.')
+    completions2 = Script(s2).completions()
+    assert 'strip' in [c.name for c in completions2]
+
+
+def test_multibyte_script():
+    """ `jedi.Script` must accept multi-byte string source. """
+    try:
+        code = u("import datetime; datetime.d")
+        comment = u("# multi-byte comment �����ä")
+        s = (u('%s\n%s') % (code, comment)).encode('utf-8')
+    except NameError:
+        pass  # python 3 has no unicode method
+    else:
+        assert len(Script(s, 1, len(code)).completions())
+
+
+def test_goto_definition_at_zero():
+    """At zero usually sometimes raises unicode issues."""
+    assert Script("a", 1, 1).goto_definitions() == []
+    s = Script("str", 1, 1).goto_definitions()
+    assert len(s) == 1
+    assert list(s)[0].description == 'class str'
+    assert Script("", 1, 0).goto_definitions() == []
+
+
+def test_complete_at_zero():
+    s = Script("str", 1, 3).completions()
+    assert len(s) == 1
+    assert list(s)[0].name == 'str'
+
+    s = Script("", 1, 0).completions()
+    assert len(s) > 0
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_usages.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_usages.py
new file mode 100644
index 0000000..1325e41
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_api/test_usages.py
@@ -0,0 +1,6 @@
+import jedi
+
+
+def test_import_usage():
+    s = jedi.Script("from .. import foo", line=1, column=18, path="foo.py")
+    assert [usage.line for usage in s.usages()] == [1]
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_cache.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_cache.py
new file mode 100644
index 0000000..7cff4d4
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_cache.py
@@ -0,0 +1,109 @@
+"""
+Test all things related to the ``jedi.cache`` module.
+"""
+
+import time
+
+import pytest
+
+import jedi
+from jedi import settings, cache
+from jedi.parser.utils import ParserCacheItem, ParserPickling
+
+
+ParserPicklingCls = type(ParserPickling)
+ParserPickling = ParserPicklingCls()
+
+
+def test_modulepickling_change_cache_dir(monkeypatch, tmpdir):
+    """
+    ParserPickling should not save old cache when cache_directory is changed.
+
+    See: `#168 <https://github.com/davidhalter/jedi/pull/168>`_
+    """
+    dir_1 = str(tmpdir.mkdir('first'))
+    dir_2 = str(tmpdir.mkdir('second'))
+
+    item_1 = ParserCacheItem('fake parser 1')
+    item_2 = ParserCacheItem('fake parser 2')
+    path_1 = 'fake path 1'
+    path_2 = 'fake path 2'
+
+    monkeypatch.setattr(settings, 'cache_directory', dir_1)
+    ParserPickling.save_parser(path_1, item_1)
+    cached = load_stored_item(ParserPickling, path_1, item_1)
+    assert cached == item_1.parser
+
+    monkeypatch.setattr(settings, 'cache_directory', dir_2)
+    ParserPickling.save_parser(path_2, item_2)
+    cached = load_stored_item(ParserPickling, path_1, item_1)
+    assert cached is None
+
+
+def load_stored_item(cache, path, item):
+    """Load `item` stored at `path` in `cache`."""
+    return cache.load_parser(path, item.change_time - 1)
+
+
+@pytest.mark.usefixtures("isolated_jedi_cache")
+def test_modulepickling_delete_incompatible_cache():
+    item = ParserCacheItem('fake parser')
+    path = 'fake path'
+
+    cache1 = ParserPicklingCls()
+    cache1.version = 1
+    cache1.save_parser(path, item)
+    cached1 = load_stored_item(cache1, path, item)
+    assert cached1 == item.parser
+
+    cache2 = ParserPicklingCls()
+    cache2.version = 2
+    cached2 = load_stored_item(cache2, path, item)
+    assert cached2 is None
+
+
+@pytest.mark.skipif('True', message='Currently the star import cache is not enabled.')
+def test_star_import_cache_duration():
+    new = 0.01
+    old, jedi.settings.star_import_cache_validity = \
+        jedi.settings.star_import_cache_validity, new
+
+    dct = cache._time_caches['star_import_cache_validity']
+    old_dct = dict(dct)
+    dct.clear()  # first empty...
+    # path needs to be not-None (otherwise caching effects are not visible)
+    jedi.Script('', 1, 0, '').completions()
+    time.sleep(2 * new)
+    jedi.Script('', 1, 0, '').completions()
+
+    # reset values
+    jedi.settings.star_import_cache_validity = old
+    assert len(dct) == 1
+    dct = old_dct
+    cache._star_import_cache = {}
+
+
+def test_cache_call_signatures():
+    """
+    See github issue #390.
+    """
+    def check(column, call_name, path=None):
+        assert jedi.Script(s, 1, column, path).call_signatures()[0].name == call_name
+
+    s = 'str(int())'
+
+    for i in range(3):
+        check(8, 'int')
+        check(4, 'str')
+        # Can keep doing these calls and always get the right result.
+
+    # Now lets specify a source_path of boo and alternate these calls, it
+    # should still work.
+    for i in range(3):
+        check(8, 'int', 'boo')
+        check(4, 'str', 'boo')
+
+
+def test_cache_line_split_issues():
+    """Should still work even if there's a newline."""
+    assert jedi.Script('int(\n').call_signatures()[0].name == 'int'
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_debug.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_debug.py
new file mode 100644
index 0000000..0033107
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_debug.py
@@ -0,0 +1,9 @@
+import jedi
+from jedi import debug
+
+def test_simple():
+    jedi.set_debug_function()
+    debug.speed('foo')
+    debug.dbg('bar')
+    debug.warning('baz')
+    jedi.set_debug_function(None, False, False, False)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/absolute_import/local_module.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/absolute_import/local_module.py
new file mode 100644
index 0000000..aa4bf00
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/absolute_import/local_module.py
@@ -0,0 +1,14 @@
+"""
+This is a module that imports the *standard library* unittest,
+despite there being a local "unittest" module. It specifies that it
+wants the stdlib one with the ``absolute_import`` __future__ import.
+
+The twisted equivalent of this module is ``twisted.trial._synctest``.
+"""
+from __future__ import absolute_import
+
+import unittest
+
+
+class Assertions(unittest.TestCase):
+    pass
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/absolute_import/unittest.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/absolute_import/unittest.py
new file mode 100644
index 0000000..eee1e93
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/absolute_import/unittest.py
@@ -0,0 +1,14 @@
+"""
+This is a module that shadows a builtin (intentionally).
+
+It imports a local module, which in turn imports stdlib unittest (the
+name shadowed by this module). If that is properly resolved, there's
+no problem. However, if jedi doesn't understand absolute_imports, it
+will get this module again, causing infinite recursion.
+"""
+from local_module import Assertions
+
+
+class TestCase(Assertions):
+    def test(self):
+        self.assertT
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/buildout_project/bin/app b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/buildout_project/bin/app
new file mode 100644
index 0000000..7394d2d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/buildout_project/bin/app
@@ -0,0 +1,12 @@
+#!/usr/bin/python
+
+import sys
+sys.path[0:0] = [
+  '/usr/lib/python3.4/site-packages',
+  '/tmp/.buildout/eggs/important_package.egg'
+]
+
+import important_package
+
+if __name__ == '__main__':
+    sys.exit(important_package.main())
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/buildout_project/bin/binary_file b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/buildout_project/bin/binary_file
new file mode 100644
index 0000000..f1ad755
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/buildout_project/bin/binary_file
@@ -0,0 +1 @@
+‰PNG
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/buildout_project/bin/empty_file b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/buildout_project/bin/empty_file
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/buildout_project/buildout.cfg b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/buildout_project/buildout.cfg
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/buildout_project/src/proj_name/module_name.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/buildout_project/src/proj_name/module_name.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flask/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flask/__init__.py
new file mode 100644
index 0000000..e876bc1
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flask/__init__.py
@@ -0,0 +1 @@
+                    
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flask/ext/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flask/ext/__init__.py
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flask/ext/__init__.py
@@ -0,0 +1 @@
+
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flask_baz/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flask_baz/__init__.py
new file mode 100644
index 0000000..e9b3fff
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flask_baz/__init__.py
@@ -0,0 +1 @@
+Baz = 1
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flask_foo.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flask_foo.py
new file mode 100644
index 0000000..0b910b8
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flask_foo.py
@@ -0,0 +1,2 @@
+class Foo(object):
+    pass
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flaskext/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flaskext/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flaskext/bar.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flaskext/bar.py
new file mode 100644
index 0000000..6629f9a
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flaskext/bar.py
@@ -0,0 +1,2 @@
+class Bar(object):
+    pass
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flaskext/moo/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flaskext/moo/__init__.py
new file mode 100644
index 0000000..266e809
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/flask-site-packages/flaskext/moo/__init__.py
@@ -0,0 +1 @@
+Moo = 1
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/init_extension_module/__init__.cpython-34m.so b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/init_extension_module/__init__.cpython-34m.so
new file mode 100755
index 0000000..abfadc3
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/init_extension_module/__init__.cpython-34m.so differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/init_extension_module/module.c b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/init_extension_module/module.c
new file mode 100644
index 0000000..bfa06f6
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/init_extension_module/module.c
@@ -0,0 +1,15 @@
+#include "Python.h"
+
+static struct PyModuleDef module = {
+   PyModuleDef_HEAD_INIT,
+   "init_extension_module",
+   NULL,
+   -1,
+   NULL
+};
+
+PyMODINIT_FUNC PyInit_init_extension_module(void){
+    PyObject *m = PyModule_Create(&module);
+    PyModule_AddObject(m, "foo", Py_None);
+    return m;
+}
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/init_extension_module/setup.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/init_extension_module/setup.py
new file mode 100644
index 0000000..5ce0517
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/init_extension_module/setup.py
@@ -0,0 +1,10 @@
+from distutils.core import setup, Extension
+
+setup(name='init_extension_module',
+      version='0.0',
+      description='',
+      ext_modules=[
+          Extension('init_extension_module.__init__',
+                    sources=['module.c'])
+      ]
+)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns1/pkg/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns1/pkg/__init__.py
new file mode 100644
index 0000000..bc10ee2
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns1/pkg/__init__.py
@@ -0,0 +1,9 @@
+foo = 'ns1!'
+
+# this is a namespace package
+try:
+    import pkg_resources
+    pkg_resources.declare_namespace(__name__)
+except ImportError:
+    import pkgutil
+    __path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns1/pkg/ns1_file.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns1/pkg/ns1_file.py
new file mode 100644
index 0000000..940279f
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns1/pkg/ns1_file.py
@@ -0,0 +1 @@
+foo = 'ns1_file!'
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns1/pkg/ns1_folder/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns1/pkg/ns1_folder/__init__.py
new file mode 100644
index 0000000..9eeeb29
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns1/pkg/ns1_folder/__init__.py
@@ -0,0 +1 @@
+foo = 'ns1_folder!'
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_file.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_file.py
new file mode 100644
index 0000000..e87d7d8
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_file.py
@@ -0,0 +1 @@
+foo = 'ns2_file!'
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/__init__.py
new file mode 100644
index 0000000..70b24ae
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/__init__.py
@@ -0,0 +1 @@
+foo = 'ns2_folder!'
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py
new file mode 100644
index 0000000..fbba1db
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py
@@ -0,0 +1 @@
+foo = 'nested!'
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/nested_namespaces/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/nested_namespaces/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/nested_namespaces/namespace/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/nested_namespaces/namespace/__init__.py
new file mode 100644
index 0000000..42e33a7
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/nested_namespaces/namespace/__init__.py
@@ -0,0 +1,4 @@
+try:
+    __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+    pass
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/nested_namespaces/namespace/pkg/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/nested_namespaces/namespace/pkg/__init__.py
new file mode 100644
index 0000000..3c37820
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/nested_namespaces/namespace/pkg/__init__.py
@@ -0,0 +1 @@
+CONST = 1
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/not_in_sys_path.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/not_in_sys_path.py
new file mode 100644
index 0000000..8943d8d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/not_in_sys_path.py
@@ -0,0 +1 @@
+value = 3
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/not_in_sys_path_package/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/not_in_sys_path_package/__init__.py
new file mode 100644
index 0000000..5ef1a74
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/not_in_sys_path_package/__init__.py
@@ -0,0 +1 @@
+value = 'package'
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/not_in_sys_path_package/module.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/not_in_sys_path_package/module.py
new file mode 100644
index 0000000..364dd03
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/not_in_sys_path_package/module.py
@@ -0,0 +1 @@
+value = 'package.module'
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/pkg/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/pkg/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/pkg/module.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/pkg/module.py
new file mode 100644
index 0000000..53c44ca
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/not_in_sys_path/pkg/module.py
@@ -0,0 +1,7 @@
+from not_in_sys_path import not_in_sys_path
+from not_in_sys_path import not_in_sys_path_package
+from not_in_sys_path.not_in_sys_path_package import module
+
+not_in_sys_path.value
+not_in_sys_path_package.value
+module.value
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/dir-from-foo-pth/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/dir-from-foo-pth/__init__.py
new file mode 100644
index 0000000..2a1d870
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/dir-from-foo-pth/__init__.py
@@ -0,0 +1,2 @@
+# This file is here to force git to create the directory, as *.pth files only
+# add existing directories.
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/egg_link.egg-link b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/egg_link.egg-link
new file mode 100644
index 0000000..dde9b7d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/egg_link.egg-link
@@ -0,0 +1 @@
+/path/from/egg-link
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/foo.pth b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/foo.pth
new file mode 100644
index 0000000..8850168
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/foo.pth
@@ -0,0 +1 @@
+./dir-from-foo-pth
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/import_smth.pth b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/import_smth.pth
new file mode 100644
index 0000000..72b006a
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/import_smth.pth
@@ -0,0 +1 @@
+import smth; smth.extend_path()
\ No newline at end of file
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/relative.egg-link b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/relative.egg-link
new file mode 100644
index 0000000..7a9a615
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/relative.egg-link
@@ -0,0 +1 @@
+./relative/egg-link/path
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/smth.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/smth.py
new file mode 100644
index 0000000..3e3008d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv27/lib/python2.7/site-packages/smth.py
@@ -0,0 +1,6 @@
+import sys
+sys.path.append('/path/from/smth.py')
+
+
+def extend_path():
+    sys.path.append('/path/from/smth.py:extend_path')
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/dir-from-foo-pth/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/dir-from-foo-pth/__init__.py
new file mode 100644
index 0000000..2a1d870
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/dir-from-foo-pth/__init__.py
@@ -0,0 +1,2 @@
+# This file is here to force git to create the directory, as *.pth files only
+# add existing directories.
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/egg_link.egg-link b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/egg_link.egg-link
new file mode 100644
index 0000000..dde9b7d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/egg_link.egg-link
@@ -0,0 +1 @@
+/path/from/egg-link
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/foo.pth b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/foo.pth
new file mode 100644
index 0000000..8850168
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/foo.pth
@@ -0,0 +1 @@
+./dir-from-foo-pth
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/import_smth.pth b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/import_smth.pth
new file mode 100644
index 0000000..72b006a
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/import_smth.pth
@@ -0,0 +1 @@
+import smth; smth.extend_path()
\ No newline at end of file
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/relative.egg-link b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/relative.egg-link
new file mode 100644
index 0000000..7a9a615
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/relative.egg-link
@@ -0,0 +1 @@
+./relative/egg-link/path
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/smth.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/smth.py
new file mode 100644
index 0000000..3e3008d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/sample_venvs/venv34/lib/python3.4/site-packages/smth.py
@@ -0,0 +1,6 @@
+import sys
+sys.path.append('/path/from/smth.py')
+
+
+def extend_path():
+    sys.path.append('/path/from/smth.py:extend_path')
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_absolute_import.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_absolute_import.py
new file mode 100644
index 0000000..a45bffa
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_absolute_import.py
@@ -0,0 +1,40 @@
+"""
+Tests ``from __future__ import absolute_import`` (only important for
+Python 2.X)
+"""
+import jedi
+from jedi._compatibility import u
+from jedi.parser import ParserWithRecovery, load_grammar
+from .. import helpers
+
+
+def test_explicit_absolute_imports():
+    """
+    Detect modules with ``from __future__ import absolute_import``.
+    """
+    parser = ParserWithRecovery(load_grammar(), u("from __future__ import absolute_import"), "test.py")
+    assert parser.module.has_explicit_absolute_import
+
+
+def test_no_explicit_absolute_imports():
+    """
+     Detect modules without ``from __future__ import absolute_import``.
+    """
+    parser = ParserWithRecovery(load_grammar(), u("1"), "test.py")
+    assert not parser.module.has_explicit_absolute_import
+
+
+def test_dont_break_imports_without_namespaces():
+    """
+    The code checking for ``from __future__ import absolute_import`` shouldn't
+    assume that all imports have non-``None`` namespaces.
+    """
+    src = u("from __future__ import absolute_import\nimport xyzzy")
+    parser = ParserWithRecovery(load_grammar(), src, "test.py")
+    assert parser.module.has_explicit_absolute_import
+
+
+@helpers.cwd_at("test/test_evaluate/absolute_import")
+def test_can_complete_when_shadowing():
+    script = jedi.Script(path="unittest.py")
+    assert script.completions()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_annotations.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_annotations.py
new file mode 100644
index 0000000..67fe84e
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_annotations.py
@@ -0,0 +1,60 @@
+from textwrap import dedent
+
+import jedi
+import pytest
+
+
+@pytest.mark.skipif('sys.version_info[0] < 3')
+def test_simple_annotations():
+    """
+    Annotations only exist in Python 3.
+    If annotations adhere to PEP-0484, we use them (they override inference),
+    else they are parsed but ignored
+    """
+
+    source = dedent("""\
+    def annot(a:3):
+        return a
+
+    annot('')""")
+
+    assert [d.name for d in jedi.Script(source, ).goto_definitions()] == ['str']
+
+    source = dedent("""\
+
+    def annot_ret(a:3) -> 3:
+        return a
+
+    annot_ret('')""")
+    assert [d.name for d in jedi.Script(source, ).goto_definitions()] == ['str']
+
+    source = dedent("""\
+    def annot(a:int):
+        return a
+
+    annot('')""")
+
+    assert [d.name for d in jedi.Script(source, ).goto_definitions()] == ['int']
+
+
+@pytest.mark.skipif('sys.version_info[0] < 3')
+@pytest.mark.parametrize('reference', [
+    'assert 1',
+    '1',
+    'def x(): pass',
+    '1, 2',
+    r'1\n'
+])
+def test_illegal_forward_references(reference):
+    source = 'def foo(bar: "%s"): bar' % reference
+
+    assert not jedi.Script(source).goto_definitions()
+
+
+@pytest.mark.skipif('sys.version_info[0] < 3')
+def test_lambda_forward_references():
+    source = 'def foo(bar: "lambda: 3"): bar'
+
+    # For now just receiving the 3 is ok. I'm doubting that this is what we
+    # want. We also execute functions. Should we only execute classes?
+    assert jedi.Script(source).goto_definitions()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_buildout_detection.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_buildout_detection.py
new file mode 100644
index 0000000..c5c6556
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_buildout_detection.py
@@ -0,0 +1,89 @@
+import os
+from textwrap import dedent
+
+from jedi._compatibility import u
+from jedi.evaluate.sys_path import (_get_parent_dir_with_file,
+                                    _get_buildout_scripts,
+                                    sys_path_with_modifications,
+                                    _check_module)
+from jedi.evaluate import Evaluator
+from jedi.parser import ParserWithRecovery, load_grammar
+
+from ..helpers import cwd_at
+
+
+@cwd_at('test/test_evaluate/buildout_project/src/proj_name')
+def test_parent_dir_with_file():
+    parent = _get_parent_dir_with_file(
+        os.path.abspath(os.curdir), 'buildout.cfg')
+    assert parent is not None
+    assert parent.endswith(os.path.join('test', 'test_evaluate', 'buildout_project'))
+
+
+@cwd_at('test/test_evaluate/buildout_project/src/proj_name')
+def test_buildout_detection():
+    scripts = _get_buildout_scripts(os.path.abspath('./module_name.py'))
+    assert len(scripts) == 1
+    curdir = os.path.abspath(os.curdir)
+    appdir_path = os.path.normpath(os.path.join(curdir, '../../bin/app'))
+    assert scripts[0] == appdir_path
+
+
+def test_append_on_non_sys_path():
+    SRC = dedent(u("""
+        class Dummy(object):
+            path = []
+
+        d = Dummy()
+        d.path.append('foo')"""))
+    grammar = load_grammar()
+    p = ParserWithRecovery(grammar, SRC)
+    paths = _check_module(Evaluator(grammar), p.module)
+    assert len(paths) > 0
+    assert 'foo' not in paths
+
+
+def test_path_from_invalid_sys_path_assignment():
+    SRC = dedent(u("""
+        import sys
+        sys.path = 'invalid'"""))
+    grammar = load_grammar()
+    p = ParserWithRecovery(grammar, SRC)
+    paths = _check_module(Evaluator(grammar), p.module)
+    assert len(paths) > 0
+    assert 'invalid' not in paths
+
+
+@cwd_at('test/test_evaluate/buildout_project/src/proj_name/')
+def test_sys_path_with_modifications():
+    SRC = dedent(u("""
+        import os
+    """))
+    grammar = load_grammar()
+    p = ParserWithRecovery(grammar, SRC)
+    p.module.path = os.path.abspath(os.path.join(os.curdir, 'module_name.py'))
+    paths = sys_path_with_modifications(Evaluator(grammar), p.module)
+    assert '/tmp/.buildout/eggs/important_package.egg' in paths
+
+
+def test_path_from_sys_path_assignment():
+    SRC = dedent(u("""
+        #!/usr/bin/python
+
+        import sys
+        sys.path[0:0] = [
+          '/usr/lib/python3.4/site-packages',
+          '/home/test/.buildout/eggs/important_package.egg'
+          ]
+
+        path[0:0] = [1]
+
+        import important_package
+
+        if __name__ == '__main__':
+            sys.exit(important_package.main())"""))
+    grammar = load_grammar()
+    p = ParserWithRecovery(grammar, SRC)
+    paths = _check_module(Evaluator(grammar), p.module)
+    assert 1 not in paths
+    assert '/home/test/.buildout/eggs/important_package.egg' in paths
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_compiled.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_compiled.py
new file mode 100644
index 0000000..762260e
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_compiled.py
@@ -0,0 +1,86 @@
+from textwrap import dedent
+
+from jedi._compatibility import builtins, is_py3
+from jedi.parser import load_grammar
+from jedi.parser.tree import Function
+from jedi.evaluate import compiled, representation
+from jedi.evaluate import Evaluator
+from jedi import Script
+
+
+def _evaluator():
+    return Evaluator(load_grammar())
+
+
+def test_simple():
+    e = _evaluator()
+    bltn = compiled.CompiledObject(e, builtins)
+    obj = compiled.CompiledObject(e, '_str_', bltn)
+    upper = e.find_types(obj, 'upper')
+    assert len(upper) == 1
+    objs = list(e.execute(list(upper)[0]))
+    assert len(objs) == 1
+    assert isinstance(objs[0], representation.Instance)
+
+
+def test_fake_loading():
+    e = _evaluator()
+    assert isinstance(compiled.create(e, next), Function)
+
+    builtin = compiled.get_special_object(e, 'BUILTINS')
+    string = builtin.get_subscope_by_name('str')
+    from_name = compiled._create_from_name(e, builtin, string, '__init__')
+    assert isinstance(from_name, Function)
+
+
+def test_fake_docstr():
+    assert compiled.create(_evaluator(), next).raw_doc == next.__doc__
+
+
+def test_parse_function_doc_illegal_docstr():
+    docstr = """
+    test_func(o
+
+    doesn't have a closing bracket.
+    """
+    assert ('', '') == compiled._parse_function_doc(docstr)
+
+
+def test_doc():
+    """
+    Even CompiledObject docs always return empty docstrings - not None, that's
+    just a Jedi API definition.
+    """
+    obj = compiled.CompiledObject(_evaluator(), ''.__getnewargs__)
+    assert obj.doc == ''
+
+
+def test_string_literals():
+    def typ(string):
+        d = Script("a = %s; a" % string).goto_definitions()[0]
+        return d.name
+
+    assert typ('""') == 'str'
+    assert typ('r""') == 'str'
+    if is_py3:
+        assert typ('br""') == 'bytes'
+        assert typ('b""') == 'bytes'
+        assert typ('u""') == 'str'
+    else:
+        assert typ('b""') == 'str'
+        assert typ('u""') == 'unicode'
+
+
+def test_method_completion():
+    code = dedent('''
+    class Foo:
+        def bar(self):
+            pass
+
+    foo = Foo()
+    foo.bar.__func__''')
+    if is_py3:
+        result = []
+    else:
+        result = ['__func__']
+    assert [c.name for c in Script(code).completions()] == result
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_docstring.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_docstring.py
new file mode 100644
index 0000000..6dbd1ca
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_docstring.py
@@ -0,0 +1,152 @@
+"""
+Testing of docstring related issues and especially ``jedi.docstrings``.
+"""
+
+from textwrap import dedent
+import jedi
+from ..helpers import unittest
+
+try:
+    import numpydoc
+except ImportError:
+    numpydoc_unavailable = True
+else:
+    numpydoc_unavailable = False
+
+
+class TestDocstring(unittest.TestCase):
+    def test_function_doc(self):
+        defs = jedi.Script("""
+        def func():
+            '''Docstring of `func`.'''
+        func""").goto_definitions()
+        self.assertEqual(defs[0].raw_doc, 'Docstring of `func`.')
+
+    @unittest.skip('need evaluator class for that')
+    def test_attribute_docstring(self):
+        defs = jedi.Script("""
+        x = None
+        '''Docstring of `x`.'''
+        x""").goto_definitions()
+        self.assertEqual(defs[0].raw_doc, 'Docstring of `x`.')
+
+    @unittest.skip('need evaluator class for that')
+    def test_multiple_docstrings(self):
+        defs = jedi.Script("""
+        def func():
+            '''Original docstring.'''
+        x = func
+        '''Docstring of `x`.'''
+        x""").goto_definitions()
+        docs = [d.raw_doc for d in defs]
+        self.assertEqual(docs, ['Original docstring.', 'Docstring of `x`.'])
+
+    def test_completion(self):
+        assert jedi.Script('''
+        class DocstringCompletion():
+            #? []
+            """ asdfas """''').completions()
+
+    def test_docstrings_type_dotted_import(self):
+        s = """
+                def func(arg):
+                    '''
+                    :type arg: random.Random
+                    '''
+                    arg."""
+        names = [c.name for c in jedi.Script(s).completions()]
+        assert 'seed' in names
+
+    def test_docstrings_param_type(self):
+        s = """
+                def func(arg):
+                    '''
+                    :param str arg: some description
+                    '''
+                    arg."""
+        names = [c.name for c in jedi.Script(s).completions()]
+        assert 'join' in names
+
+    def test_docstrings_type_str(self):
+        s = """
+                def func(arg):
+                    '''
+                    :type arg: str
+                    '''
+                    arg."""
+
+        names = [c.name for c in jedi.Script(s).completions()]
+        assert 'join' in names
+
+    def test_docstring_instance(self):
+        # The types hint that it's a certain kind
+        s = dedent("""
+            class A:
+                def __init__(self,a):
+                    '''
+                    :type a: threading.Thread
+                    '''
+
+                    if a is not None:
+                        a.start()
+
+                    self.a = a
+
+
+            def method_b(c):
+                '''
+                :type c: A
+                '''
+
+                c.""")
+
+        names = [c.name for c in jedi.Script(s).completions()]
+        assert 'a' in names
+        assert '__init__' in names
+        assert 'mro' not in names  # Exists only for types.
+
+    @unittest.skipIf(numpydoc_unavailable, 'numpydoc module is unavailable')
+    def test_numpydoc_docstring(self):
+        s = dedent('''
+        def foobar(x, y):
+            """
+            Parameters
+            ----------
+            x : int
+            y : str
+            """
+            y.''')
+        names = [c.name for c in jedi.Script(s).completions()]
+        assert 'isupper' in names
+        assert 'capitalize' in names
+
+    @unittest.skipIf(numpydoc_unavailable, 'numpydoc module is unavailable')
+    def test_numpydoc_docstring_set_of_values(self):
+        s = dedent('''
+        def foobar(x, y):
+            """
+            Parameters
+            ----------
+            x : {'foo', 'bar', 100500}, optional
+            """
+            x.''')
+        names = [c.name for c in jedi.Script(s).completions()]
+        assert 'isupper' in names
+        assert 'capitalize' in names
+        assert 'numerator' in names
+
+    @unittest.skipIf(numpydoc_unavailable, 'numpydoc module is unavailable')
+    def test_numpydoc_alternative_types(self):
+        s = dedent('''
+        def foobar(x, y):
+            """
+            Parameters
+            ----------
+            x : int or str or list
+            """
+            x.''')
+        names = [c.name for c in jedi.Script(s).completions()]
+        assert 'isupper' in names
+        assert 'capitalize' in names
+        assert 'numerator' in names
+        assert 'append' in names
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_extension.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_extension.py
new file mode 100644
index 0000000..83efc20
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_extension.py
@@ -0,0 +1,57 @@
+"""
+Test compiled module
+"""
+import os
+
+import jedi
+from ..helpers import cwd_at
+import pytest
+
+
+def test_completions():
+    s = jedi.Script('import _ctypes; _ctypes.')
+    assert len(s.completions()) >= 15
+
+
+def test_call_signatures_extension():
+    if os.name == 'nt':
+        func = 'LoadLibrary'
+        params = 1
+    else:
+        func = 'dlopen'
+        params = 2
+    s = jedi.Script('import _ctypes; _ctypes.%s(' % (func,))
+    sigs = s.call_signatures()
+    assert len(sigs) == 1
+    assert len(sigs[0].params) == params
+
+
+def test_call_signatures_stdlib():
+    s = jedi.Script('import math; math.cos(')
+    sigs = s.call_signatures()
+    assert len(sigs) == 1
+    assert len(sigs[0].params) == 1
+
+
+# Check only on linux 64 bit platform and Python3.4.
+@pytest.mark.skipif('sys.platform != "linux" or sys.maxsize <= 2**32 or sys.version_info[:2] != (3, 4)')
+@cwd_at('test/test_evaluate')
+def test_init_extension_module():
+    """
+    ``__init__`` extension modules are also packages and Jedi should understand
+    that.
+
+    Originally coming from #472.
+
+    This test was built by the module.c and setup.py combination you can find
+    in the init_extension_module folder. You can easily build the
+    `__init__.cpython-34m.so` by compiling it (create a virtualenv and run
+    `setup.py install`.
+
+    This is also why this test only runs on certain systems (and Python 3.4).
+    """
+    s = jedi.Script('import init_extension_module as i\ni.', path='not_existing.py')
+    assert 'foo' in [c.name for c in s.completions()]
+
+    s = jedi.Script('from init_extension_module import foo\nfoo', path='not_existing.py')
+    assert ['foo'] == [c.name for c in s.completions()]
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_helpers.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_helpers.py
new file mode 100644
index 0000000..02e6d36
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_helpers.py
@@ -0,0 +1,16 @@
+from textwrap import dedent
+
+from jedi import names
+from jedi.evaluate import helpers
+
+
+def test_call_of_leaf_in_brackets():
+    s = dedent("""
+    x = 1
+    type(x)
+    """)
+    last_x = names(s, references=True, definitions=False)[-1]
+    name = last_x._name
+
+    call = helpers.call_of_leaf(name)
+    assert call == name
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_imports.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_imports.py
new file mode 100644
index 0000000..8eb2387
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_imports.py
@@ -0,0 +1,129 @@
+import os
+import sys
+
+import pytest
+
+import jedi
+from jedi._compatibility import find_module_py33, find_module
+from ..helpers import cwd_at
+
+
+@pytest.mark.skipif('sys.version_info < (3,3)')
+def test_find_module_py33():
+    """Needs to work like the old find_module."""
+    assert find_module_py33('_io') == (None, '_io', False)
+
+
+def test_find_module_package():
+    file, path, is_package = find_module('json')
+    assert file is None
+    assert path.endswith('json')
+    assert is_package is True
+
+
+def test_find_module_not_package():
+    file, path, is_package = find_module('io')
+    assert file is not None
+    assert path.endswith('io.py')
+    assert is_package is False
+
+
+def test_find_module_package_zipped():
+    if 'zipped_imports/pkg.zip' not in sys.path:
+      sys.path.append(os.path.join(os.path.dirname(__file__),
+                      'zipped_imports/pkg.zip'))
+    file, path, is_package = find_module('pkg')
+    assert file is not None
+    assert path.endswith('pkg.zip')
+    assert is_package is True
+    assert len(jedi.Script('import pkg; pkg.mod', 1, 19).completions()) == 1
+
+
+@pytest.mark.skipif('sys.version_info < (2,7)')
+def test_find_module_not_package_zipped():
+    if 'zipped_imports/not_pkg.zip' not in sys.path:
+      sys.path.append(os.path.join(os.path.dirname(__file__),
+                      'zipped_imports/not_pkg.zip'))
+    file, path, is_package = find_module('not_pkg')
+    assert file is not None
+    assert path.endswith('not_pkg.zip')
+    assert is_package is False
+    assert len(
+      jedi.Script('import not_pkg; not_pkg.val', 1, 27).completions()) == 1
+
+
+@cwd_at('test/test_evaluate/not_in_sys_path/pkg')
+def test_import_not_in_sys_path():
+    """
+    non-direct imports (not in sys.path)
+    """
+    a = jedi.Script(path='module.py', line=5).goto_definitions()
+    assert a[0].name == 'int'
+
+    a = jedi.Script(path='module.py', line=6).goto_definitions()
+    assert a[0].name == 'str'
+    a = jedi.Script(path='module.py', line=7).goto_definitions()
+    assert a[0].name == 'str'
+
+
+@pytest.mark.parametrize("script,name", [
+    ("from flask.ext import foo; foo.", "Foo"),  # flask_foo.py
+    ("from flask.ext import bar; bar.", "Bar"),  # flaskext/bar.py
+    ("from flask.ext import baz; baz.", "Baz"),  # flask_baz/__init__.py
+    ("from flask.ext import moo; moo.", "Moo"),  # flaskext/moo/__init__.py
+    ("from flask.ext.", "foo"),
+    ("from flask.ext.", "bar"),
+    ("from flask.ext.", "baz"),
+    ("from flask.ext.", "moo"),
+    pytest.mark.xfail(("import flask.ext.foo; flask.ext.foo.", "Foo")),
+    pytest.mark.xfail(("import flask.ext.bar; flask.ext.bar.", "Foo")),
+    pytest.mark.xfail(("import flask.ext.baz; flask.ext.baz.", "Foo")),
+    pytest.mark.xfail(("import flask.ext.moo; flask.ext.moo.", "Foo")),
+])
+def test_flask_ext(script, name):
+    """flask.ext.foo is really imported from flaskext.foo or flask_foo.
+    """
+    path = os.path.join(os.path.dirname(__file__), 'flask-site-packages')
+    completions = jedi.Script(script, sys_path=[path]).completions()
+    assert name in [c.name for c in completions]
+
+
+@cwd_at('test/test_evaluate/')
+def test_not_importable_file():
+    src = 'import not_importable_file as x; x.'
+    assert not jedi.Script(src, path='example.py').completions()
+
+
+def test_import_unique():
+    src = "import os; os.path"
+    defs = jedi.Script(src, path='example.py').goto_definitions()
+    defs = [d._definition for d in defs]
+    assert len(defs) == len(set(defs))
+
+
+def test_cache_works_with_sys_path_param(tmpdir):
+    foo_path = tmpdir.join('foo')
+    bar_path = tmpdir.join('bar')
+    foo_path.join('module.py').write('foo = 123', ensure=True)
+    bar_path.join('module.py').write('bar = 123', ensure=True)
+    foo_completions = jedi.Script('import module; module.',
+                                  sys_path=[foo_path.strpath]).completions()
+    bar_completions = jedi.Script('import module; module.',
+                                  sys_path=[bar_path.strpath]).completions()
+    assert 'foo' in [c.name for c in foo_completions]
+    assert 'bar' not in [c.name for c in foo_completions]
+
+    assert 'bar' in [c.name for c in bar_completions]
+    assert 'foo' not in [c.name for c in bar_completions]
+
+
+def test_import_completion_docstring():
+    import abc
+    s = jedi.Script('"""test"""\nimport ab')
+    completions = s.completions()
+    assert len(completions) == 1
+    assert completions[0].docstring(fast=False) == abc.__doc__
+
+    # However for performance reasons not all modules are loaded and the
+    # docstring is empty in this case.
+    assert completions[0].docstring() == ''
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_namespace_package.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_namespace_package.py
new file mode 100644
index 0000000..3beed65
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_namespace_package.py
@@ -0,0 +1,65 @@
+import jedi
+from os.path import dirname, join
+
+
+def test_namespace_package():
+    sys_path = [join(dirname(__file__), d)
+                for d in ['namespace_package/ns1', 'namespace_package/ns2']]
+
+    def script_with_path(*args, **kwargs):
+        return jedi.Script(sys_path=sys_path, *args, **kwargs)
+
+    # goto definition
+    assert script_with_path('from pkg import ns1_file').goto_definitions()
+    assert script_with_path('from pkg import ns2_file').goto_definitions()
+    assert not script_with_path('from pkg import ns3_file').goto_definitions()
+
+    # goto assignment
+    tests = {
+        'from pkg.ns2_folder.nested import foo': 'nested!',
+        'from pkg.ns2_folder import foo': 'ns2_folder!',
+        'from pkg.ns2_file import foo': 'ns2_file!',
+        'from pkg.ns1_folder import foo': 'ns1_folder!',
+        'from pkg.ns1_file import foo': 'ns1_file!',
+        'from pkg import foo': 'ns1!',
+    }
+    for source, solution in tests.items():
+        ass = script_with_path(source).goto_assignments()
+        assert len(ass) == 1
+        assert ass[0].description == "foo = '%s'" % solution
+
+    # completion
+    completions = script_with_path('from pkg import ').completions()
+    names = [str(c.name) for c in completions]  # str because of unicode
+    compare = ['foo', 'ns1_file', 'ns1_folder', 'ns2_folder', 'ns2_file',
+               'pkg_resources', 'pkgutil', '__name__', '__path__',
+               '__package__', '__file__', '__doc__']
+    # must at least contain these items, other items are not important
+    assert set(compare) == set(names)
+
+    tests = {
+        'from pkg import ns2_folder as x': 'ns2_folder!',
+        'from pkg import ns2_file as x': 'ns2_file!',
+        'from pkg.ns2_folder import nested as x': 'nested!',
+        'from pkg import ns1_folder as x': 'ns1_folder!',
+        'from pkg import ns1_file as x': 'ns1_file!',
+        'import pkg as x': 'ns1!',
+    }
+    for source, solution in tests.items():
+        for c in script_with_path(source + '; x.').completions():
+            if c.name == 'foo':
+                completion = c
+        solution = "statement: foo = '%s'" % solution
+        assert completion.description == solution
+
+
+def test_nested_namespace_package():
+    CODE = 'from nested_namespaces.namespace.pkg import CONST'
+
+    sys_path = [dirname(__file__)]
+
+    script = jedi.Script(sys_path=sys_path, source=CODE, line=1, column=45)
+
+    result = script.goto_definitions()
+
+    assert len(result) == 1
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_precedence.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_precedence.py
new file mode 100644
index 0000000..462b7d4
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_precedence.py
@@ -0,0 +1,20 @@
+from jedi.parser import load_grammar, Parser
+from jedi.evaluate import Evaluator
+from jedi.evaluate.compiled import CompiledObject
+
+import pytest
+
+
+@pytest.mark.skipif('sys.version_info[0] < 3')  # Ellipsis does not exists in 2
+@pytest.mark.parametrize('source', [
+    '1 == 1',
+    '1.0 == 1',
+    '... == ...'
+])
+def test_equals(source):
+    evaluator = Evaluator(load_grammar())
+    node = Parser(load_grammar(), source, 'eval_input').get_parsed_node()
+    results = evaluator.eval_element(node)
+    assert len(results) == 1
+    first = results.pop()
+    assert isinstance(first, CompiledObject) and first.obj is True
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_pyc.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_pyc.py
new file mode 100644
index 0000000..c101da1
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_pyc.py
@@ -0,0 +1,64 @@
+"""
+Test completions from *.pyc files:
+
+ - generate a dummy python module
+ - compile the dummy module to generate a *.pyc
+ - delete the pure python dummy module
+ - try jedi on the generated *.pyc
+"""
+import os
+import shutil
+import sys
+
+import pytest
+
+import jedi
+from ..helpers import cwd_at
+
+
+SRC = """class Foo:
+    pass
+
+class Bar:
+    pass
+"""
+
+
+def generate_pyc():
+    os.mkdir("dummy_package")
+    with open("dummy_package/__init__.py", 'w'):
+        pass
+    with open("dummy_package/dummy.py", 'w') as f:
+        f.write(SRC)
+    import compileall
+    compileall.compile_file("dummy_package/dummy.py")
+    os.remove("dummy_package/dummy.py")
+
+    if sys.version_info[0] == 3:
+        # Python3 specific:
+        # To import pyc modules, we must move them out of the __pycache__
+        # directory and rename them to remove ".cpython-%s%d"
+        # see: http://stackoverflow.com/questions/11648440/python-does-not-detect-pyc-files
+        for f in os.listdir("dummy_package/__pycache__"):
+            dst = f.replace('.cpython-%s%s' % sys.version_info[:2], "")
+            dst = os.path.join("dummy_package", dst)
+            shutil.copy(os.path.join("dummy_package/__pycache__", f), dst)
+
+
+# Python 2.6 does not necessarily come with `compileall.compile_file`.
+@pytest.mark.skipif("sys.version_info > (2,6)")
+@cwd_at('test/test_evaluate')
+def test_pyc():
+    """
+    The list of completion must be greater than 2.
+    """
+    try:
+        generate_pyc()
+        s = jedi.Script("from dummy_package import dummy; dummy.", path='blub.py')
+        assert len(s.completions()) >= 2
+    finally:
+        shutil.rmtree("dummy_package")
+
+
+if __name__ == "__main__":
+    test_pyc()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_representation.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_representation.py
new file mode 100644
index 0000000..1d3d562
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_representation.py
@@ -0,0 +1,36 @@
+from textwrap import dedent
+
+from jedi import Script
+
+
+def get_definition_and_evaluator(source):
+    d = Script(dedent(source)).goto_definitions()[0]
+    return d._name.parent, d._evaluator
+
+
+def test_function_execution():
+    """
+    We've been having an issue of a mutable list that was changed inside the
+    function execution. Test if an execution always returns the same result.
+    """
+
+    s = """
+    def x():
+        return str()
+    x"""
+    func, evaluator = get_definition_and_evaluator(s)
+    # Now just use the internals of the result (easiest way to get a fully
+    # usable function).
+    # Should return the same result both times.
+    assert len(evaluator.execute(func)) == 1
+    assert len(evaluator.execute(func)) == 1
+
+
+def test_class_mro():
+    s = """
+    class X(object):
+        pass
+    X"""
+    cls, evaluator = get_definition_and_evaluator(s)
+    mro = cls.py__mro__()
+    assert [str(c.name) for c in mro] == ['X', 'object']
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_sys_path.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_sys_path.py
new file mode 100644
index 0000000..9635eec
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/test_sys_path.py
@@ -0,0 +1,59 @@
+import os
+from glob import glob
+import sys
+
+import pytest
+
+from jedi._compatibility import unicode
+from jedi.parser import ParserWithRecovery, load_grammar
+from jedi.evaluate import sys_path, Evaluator
+
+
+def test_paths_from_assignment():
+    def paths(src):
+        grammar = load_grammar()
+        stmt = ParserWithRecovery(grammar, unicode(src)).module.statements[0]
+        return set(sys_path._paths_from_assignment(Evaluator(grammar), stmt))
+
+    assert paths('sys.path[0:0] = ["a"]') == set(['a'])
+    assert paths('sys.path = ["b", 1, x + 3, y, "c"]') == set(['b', 'c'])
+    assert paths('sys.path = a = ["a"]') == set(['a'])
+
+    # Fail for complicated examples.
+    assert paths('sys.path, other = ["a"], 2') == set()
+
+
+# Currently venv site-packages resolution only seeks pythonX.Y/site-packages
+# that belong to the same version as the interpreter to avoid issues with
+# cross-version imports.  "venvs/" dir contains "venv27" and "venv34" that
+# mimic venvs created for py2.7 and py3.4 respectively.  If test runner is
+# invoked with one of those versions, the test below will be run for the
+# matching directory.
+CUR_DIR = os.path.dirname(__file__)
+VENVS = list(glob(
+    os.path.join(CUR_DIR, 'sample_venvs/venv%d%d' % sys.version_info[:2])))
+
+
+@pytest.mark.parametrize('venv', VENVS)
+def test_get_venv_path(venv):
+    pjoin = os.path.join
+    venv_path = sys_path.get_venv_path(venv)
+
+    site_pkgs = (glob(pjoin(venv, 'lib', 'python*', 'site-packages')) +
+                 glob(pjoin(venv, 'lib', 'site-packages')))[0]
+    ETALON = [
+        pjoin('/path', 'from', 'egg-link'),
+        pjoin(site_pkgs, '.', 'relative', 'egg-link', 'path'),
+        site_pkgs,
+        pjoin(site_pkgs, 'dir-from-foo-pth'),
+    ]
+
+    # Ensure that pth and egg-link paths were added.
+    assert venv_path[:len(ETALON)] == ETALON
+
+    # Ensure that none of venv dirs leaked to the interpreter.
+    assert not set(sys.path).intersection(ETALON)
+
+    # Ensure that "import ..." lines were ignored.
+    assert pjoin('/path', 'from', 'smth.py') not in venv_path
+    assert pjoin('/path', 'from', 'smth.py:extend_path') not in venv_path
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/zipped_imports/not_pkg.zip b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/zipped_imports/not_pkg.zip
new file mode 100644
index 0000000..f1516a6
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/zipped_imports/not_pkg.zip differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/zipped_imports/pkg.zip b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/zipped_imports/pkg.zip
new file mode 100644
index 0000000..ec8eac4
Binary files /dev/null and b/vim-plugins/bundle/jedi-vim/jedi/test/test_evaluate/zipped_imports/pkg.zip differ
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_integration.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_integration.py
new file mode 100644
index 0000000..edca711
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_integration.py
@@ -0,0 +1,60 @@
+import os
+
+import pytest
+
+from . import helpers
+
+
+def assert_case_equal(case, actual, desired):
+    """
+    Assert ``actual == desired`` with formatted message.
+
+    This is not needed for typical py.test use case, but as we need
+    ``--assert=plain`` (see ../pytest.ini) to workaround some issue
+    due to py.test magic, let's format the message by hand.
+    """
+    assert actual == desired, """
+Test %r failed.
+actual  = %s
+desired = %s
+""" % (case, actual, desired)
+
+
+def assert_static_analysis(case, actual, desired):
+    """A nicer formatting for static analysis tests."""
+    a = set(actual)
+    d = set(desired)
+    assert actual == desired, """
+Test %r failed.
+not raised  = %s
+unspecified = %s
+""" % (case, sorted(d - a), sorted(a - d))
+
+
+def test_completion(case, monkeypatch):
+    if case.skip is not None:
+        pytest.skip(case.skip)
+    repo_root = helpers.root_dir
+    monkeypatch.chdir(os.path.join(repo_root, 'jedi'))
+    case.run(assert_case_equal)
+
+
+def test_static_analysis(static_analysis_case):
+    if static_analysis_case.skip is not None:
+        pytest.skip(static_analysis_case.skip)
+    else:
+        static_analysis_case.run(assert_static_analysis)
+
+
+def test_refactor(refactor_case):
+    """
+    Run refactoring test case.
+
+    :type refactor_case: :class:`.refactor.RefactoringCase`
+    """
+    if 0:
+        # TODO Refactoring is not relevant at the moment, it will be changed
+        # significantly in the future, but maybe we can use these tests:
+        refactor_case.run()
+        assert_case_equal(refactor_case,
+                          refactor_case.result, refactor_case.desired)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_integration_analysis.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_integration_analysis.py
new file mode 100644
index 0000000..cfcd405
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_integration_analysis.py
@@ -0,0 +1,12 @@
+"""
+Test of keywords and ``jedi.keywords``
+"""
+from jedi import Script
+
+
+def test_issue436():
+    code = "bar = 0\nbar += 'foo' + 4"
+    errors = set(repr(e) for e in Script(code)._analysis())
+    assert len(errors) == 2
+    assert '<Error type-error-operation: None@2,4>' in errors
+    assert '<Error type-error-operation: None@2,13>' in errors
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_integration_import.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_integration_import.py
new file mode 100644
index 0000000..d961666
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_integration_import.py
@@ -0,0 +1,83 @@
+"""
+Tests of various import related things that could not be tested with "Black Box
+Tests".
+"""
+from jedi import Script
+from .helpers import cwd_at
+from jedi._compatibility import is_py26
+
+import pytest
+
+
+def test_goto_definition_on_import():
+    assert Script("import sys_blabla", 1, 8).goto_definitions() == []
+    assert len(Script("import sys", 1, 8).goto_definitions()) == 1
+
+
+@cwd_at('jedi')
+def test_complete_on_empty_import():
+    assert Script("from datetime import").completions()[0].name == 'import'
+    # should just list the files in the directory
+    assert 10 < len(Script("from .", path='whatever.py').completions()) < 30
+
+    # Global import
+    assert len(Script("from . import", 1, 5, 'whatever.py').completions()) > 30
+    # relative import
+    assert 10 < len(Script("from . import", 1, 6, 'whatever.py').completions()) < 30
+
+    # Global import
+    assert len(Script("from . import classes", 1, 5, 'whatever.py').completions()) > 30
+    # relative import
+    assert 10 < len(Script("from . import classes", 1, 6, 'whatever.py').completions()) < 30
+
+    wanted = set(['ImportError', 'import', 'ImportWarning'])
+    assert set([c.name for c in Script("import").completions()]) == wanted
+    if not is_py26:  # python 2.6 doesn't always come with a library `import*`.
+        assert len(Script("import import", path='').completions()) > 0
+
+    # 111
+    assert Script("from datetime import").completions()[0].name == 'import'
+    assert Script("from datetime import ").completions()
+
+
+def test_imports_on_global_namespace_without_path():
+    """If the path is None, there shouldn't be any import problem"""
+    completions = Script("import operator").completions()
+    assert [c.name for c in completions] == ['operator']
+    completions = Script("import operator", path='example.py').completions()
+    assert [c.name for c in completions] == ['operator']
+
+    # the first one has a path the second doesn't
+    completions = Script("import keyword", path='example.py').completions()
+    assert [c.name for c in completions] == ['keyword']
+    completions = Script("import keyword").completions()
+    assert [c.name for c in completions] == ['keyword']
+
+
+def test_named_import():
+    """named import - jedi-vim issue #8"""
+    s = "import time as dt"
+    assert len(Script(s, 1, 15, '/').goto_definitions()) == 1
+    assert len(Script(s, 1, 10, '/').goto_definitions()) == 1
+
+
+@pytest.mark.skipif('True', reason='The nested import stuff is still very messy.')
+def test_goto_following_on_imports():
+    s = "import multiprocessing.dummy; multiprocessing.dummy"
+    g = Script(s).goto_assignments()
+    assert len(g) == 1
+    assert (g[0].line, g[0].column) != (0, 0)
+
+
+def test_after_from():
+    def check(source, result, column=None):
+        completions = Script(source, column=column).completions()
+        assert [c.name for c in completions] == result
+
+    check('\nfrom os. ', ['path'])
+    check('\nfrom os ', ['import'])
+    check('from os ', ['import'])
+    check('\nfrom os import whatever', ['import'], len('from os im'))
+
+    check('from os\\\n', ['import'])
+    check('from os \\\n', ['import'])
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_integration_keyword.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_integration_keyword.py
new file mode 100644
index 0000000..ad4a2ae
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_integration_keyword.py
@@ -0,0 +1,29 @@
+"""
+Test of keywords and ``jedi.keywords``
+"""
+from jedi._compatibility import is_py3
+from jedi import Script
+
+
+def test_goto_assignments_keyword():
+    """
+    Bug: goto assignments on ``in`` used to raise AttributeError::
+
+      'unicode' object has no attribute 'generate_call_path'
+    """
+    Script('in').goto_assignments()
+
+
+def test_keyword():
+    """ github jedi-vim issue #44 """
+    defs = Script("print").goto_definitions()
+    if is_py3:
+        assert [d.doc for d in defs]
+    else:
+        assert defs == []
+
+    assert Script("import").goto_assignments() == []
+
+    completions = Script("import", 1, 1).completions()
+    assert len(completions) > 10 and 'if' in [c.name for c in completions]
+    assert Script("assert").goto_definitions() == []
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_integration_stdlib.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_integration_stdlib.py
new file mode 100644
index 0000000..3cbe658
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_integration_stdlib.py
@@ -0,0 +1,45 @@
+"""
+Tests of various stdlib related things that could not be tested
+with "Black Box Tests".
+"""
+from textwrap import dedent
+
+import pytest
+from jedi import Script
+from jedi._compatibility import is_py26
+
+# The namedtuple is different for different Python2.7 versions. Some versions
+# are missing the attribute `_class_template`.
+pytestmark = pytest.mark.skipif('sys.version_info[0] < 3')
+
+
+@pytest.mark.parametrize(['letter', 'expected'], [
+    ('n', ['name']),
+    ('s', ['smart']),
+])
+def test_namedtuple_str(letter, expected):
+    source = dedent("""\
+        import collections
+        Person = collections.namedtuple('Person', 'name smart')
+        dave = Person('Dave', False)
+        dave.%s""") % letter
+    result = Script(source).completions()
+    completions = set(r.name for r in result)
+    if is_py26:
+        assert completions == set()
+    else:
+        assert completions == set(expected)
+
+
+def test_namedtuple_list():
+    source = dedent("""\
+        import collections
+        Cat = collections.namedtuple('Person', ['legs', u'length', 'large'])
+        garfield = Cat(4, '85cm', True)
+        garfield.l""")
+    result = Script(source).completions()
+    completions = set(r.name for r in result)
+    if is_py26:
+        assert completions == set()
+    else:
+        assert completions == set(['legs', 'length', 'large'])
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_jedi_system.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_jedi_system.py
new file mode 100644
index 0000000..ea0d1e9
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_jedi_system.py
@@ -0,0 +1,61 @@
+"""
+Test the Jedi "System" which means for example to test if imports are
+correctly used.
+"""
+
+import os
+import inspect
+
+import jedi
+
+
+def test_settings_module():
+    """
+    jedi.settings and jedi.cache.settings must be the same module.
+    """
+    from jedi import cache
+    from jedi import settings
+    assert cache.settings is settings
+
+
+def test_no_duplicate_modules():
+    """
+    Make sure that import hack works as expected.
+
+    Jedi does an import hack (see: jedi/__init__.py) to have submodules
+    with circular dependencies.  The modules in this circular dependency
+    "loop" must be imported by ``import <module>`` rather than normal
+    ``from jedi import <module>`` (or ``from . jedi ...``).  This test
+    make sure that this is satisfied.
+
+    See also:
+
+    - `#160 <https://github.com/davidhalter/jedi/issues/160>`_
+    - `#161 <https://github.com/davidhalter/jedi/issues/161>`_
+    """
+    import sys
+    jedipath = os.path.dirname(os.path.abspath(jedi.__file__))
+
+    def is_submodule(m):
+        try:
+            filepath = m.__file__
+        except AttributeError:
+            return False
+        return os.path.abspath(filepath).startswith(jedipath)
+
+    modules = list(filter(is_submodule, sys.modules.values()))
+    top_modules = [m for m in modules if not m.__name__.startswith('jedi.')]
+    for m in modules:
+        if m is jedi:
+            # py.test automatically improts `jedi.*` when --doctest-modules
+            # is given.  So this test cannot succeeds.
+            continue
+        for tm in top_modules:
+            try:
+                imported = getattr(m, tm.__name__)
+            except AttributeError:
+                continue
+            if inspect.ismodule(imported):
+                # module could have a function with the same name, e.g.
+                # `keywords.keywords`.
+                assert imported is tm
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_new_parser.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_new_parser.py
new file mode 100644
index 0000000..e66591d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_new_parser.py
@@ -0,0 +1,13 @@
+from jedi._compatibility import u
+from jedi.parser import ParserWithRecovery, load_grammar
+
+
+def test_basic_parsing():
+    def compare(string):
+        """Generates the AST object and then regenerates the code."""
+        assert ParserWithRecovery(load_grammar(), string).module.get_code() == string
+
+    compare(u('\na #pass\n'))
+    compare(u('wblabla* 1\t\n'))
+    compare(u('def x(a, b:3): pass\n'))
+    compare(u('assert foo\n'))
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/__init__.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_fast_parser.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_fast_parser.py
new file mode 100644
index 0000000..46cdf5c
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_fast_parser.py
@@ -0,0 +1,496 @@
+from textwrap import dedent
+
+import pytest
+
+import jedi
+from jedi._compatibility import u
+from jedi import cache
+from jedi.parser import load_grammar
+from jedi.parser.fast import FastParser
+from jedi.parser.utils import save_parser
+
+
+def test_add_to_end():
+    """
+    fast_parser doesn't parse everything again. It just updates with the
+    help of caches, this is an example that didn't work.
+    """
+
+    a = dedent("""
+    class Abc():
+        def abc(self):
+            self.x = 3
+
+    class Two(Abc):
+        def h(self):
+            self
+    """)      # ^ here is the first completion
+
+    b = "    def g(self):\n" \
+        "        self."
+    assert jedi.Script(a, 8, 12, 'example.py').completions()
+    assert jedi.Script(a + b, path='example.py').completions()
+
+    a = a[:-1] + '.\n'
+    assert jedi.Script(a, 8, 13, 'example.py').completions()
+    assert jedi.Script(a + b, path='example.py').completions()
+
+
+def test_class_in_docstr():
+    """
+    Regression test for a problem with classes in docstrings.
+    """
+    a = '"\nclasses\n"'
+    jedi.Script(a, 1, 0)._get_module()
+
+    b = a + '\nimport os'
+    assert jedi.Script(b, 4, 8).goto_assignments()
+
+
+def test_carriage_return_splitting():
+    source = u(dedent('''
+
+
+
+        "string"
+
+        class Foo():
+            pass
+        '''))
+    source = source.replace('\n', '\r\n')
+    p = FastParser(load_grammar(), source)
+    assert [n.value for lst in p.module.names_dict.values() for n in lst] == ['Foo']
+
+
+def test_split_parts():
+    cache.parser_cache.pop(None, None)
+
+    def splits(source):
+        class Mock(FastParser):
+            def __init__(self, *args):
+                self.number_of_splits = 0
+
+        return tuple(FastParser._split_parts(Mock(None, None), source))
+
+    def test(*parts):
+        assert splits(''.join(parts)) == parts
+
+    test('a\n\n', 'def b(): pass\n', 'c\n')
+    test('a\n', 'def b():\n pass\n', 'c\n')
+
+    test('from x\\\n')
+    test('a\n\\\n')
+
+
+def check_fp(src, number_parsers_used, number_of_splits=None, number_of_misses=0):
+    if number_of_splits is None:
+        number_of_splits = number_parsers_used
+
+    p = FastParser(load_grammar(), u(src))
+    save_parser(None, p, pickling=False)
+
+    assert src == p.module.get_code()
+    assert p.number_of_splits == number_of_splits
+    assert p.number_parsers_used == number_parsers_used
+    assert p.number_of_misses == number_of_misses
+    return p.module
+
+
+def test_change_and_undo():
+    # Empty the parser cache for the path None.
+    cache.parser_cache.pop(None, None)
+    func_before = 'def func():\n    pass\n'
+    # Parse the function and a.
+    check_fp(func_before + 'a', 2)
+    # Parse just b.
+    check_fp(func_before + 'b', 1, 2)
+    # b has changed to a again, so parse that.
+    check_fp(func_before + 'a', 1, 2)
+    # Same as before no parsers should be used.
+    check_fp(func_before + 'a', 0, 2)
+
+    # Getting rid of an old parser: Still no parsers used.
+    check_fp('a', 0, 1)
+    # Now the file has completely change and we need to parse.
+    check_fp('b', 1, 1)
+    # And again.
+    check_fp('a', 1, 1)
+
+
+def test_positions():
+    # Empty the parser cache for the path None.
+    cache.parser_cache.pop(None, None)
+
+    func_before = 'class A:\n pass\n'
+    m = check_fp(func_before + 'a', 2)
+    assert m.start_pos == (1, 0)
+    assert m.end_pos == (3, 1)
+
+    m = check_fp('a', 0, 1)
+    assert m.start_pos == (1, 0)
+    assert m.end_pos == (1, 1)
+
+
+def test_if():
+    src = dedent('''\
+    def func():
+        x = 3
+        if x:
+            def y():
+                return x
+        return y()
+
+    func()
+    ''')
+
+    # Two parsers needed, one for pass and one for the function.
+    check_fp(src, 2)
+    assert [d.name for d in jedi.Script(src, 8, 6).goto_definitions()] == ['int']
+
+
+def test_if_simple():
+    src = dedent('''\
+    if 1:
+        a = 3
+    ''')
+    check_fp(src + 'a', 1)
+    check_fp(src + "else:\n    a = ''\na", 1)
+
+
+def test_for():
+    src = dedent("""\
+    for a in [1,2]:
+        a
+
+    for a1 in 1,"":
+        a1
+    """)
+    check_fp(src, 1)
+
+
+def test_class_with_class_var():
+    src = dedent("""\
+    class SuperClass:
+        class_super = 3
+        def __init__(self):
+            self.foo = 4
+    pass
+    """)
+    check_fp(src, 3)
+
+
+def test_func_with_if():
+    src = dedent("""\
+    def recursion(a):
+        if foo:
+            return recursion(a)
+        else:
+            if bar:
+                return inexistent
+            else:
+                return a
+    """)
+    check_fp(src, 1)
+
+
+def test_decorator():
+    src = dedent("""\
+    class Decorator():
+        @memoize
+        def dec(self, a):
+            return a
+    """)
+    check_fp(src, 2)
+
+
+def test_nested_funcs():
+    src = dedent("""\
+    def memoize(func):
+        def wrapper(*args, **kwargs):
+            return func(*args, **kwargs)
+        return wrapper
+    """)
+    check_fp(src, 3)
+
+
+def test_class_and_if():
+    src = dedent("""\
+    class V:
+        def __init__(self):
+            pass
+
+        if 1:
+            c = 3
+
+    def a_func():
+        return 1
+
+    # COMMENT
+    a_func()""")
+    check_fp(src, 5, 5)
+    assert [d.name for d in jedi.Script(src).goto_definitions()] == ['int']
+
+
+def test_func_with_for_and_comment():
+    # The first newline is important, leave it. It should not trigger another
+    # parser split.
+    src = dedent("""\
+
+    def func():
+        pass
+
+
+    for a in [1]:
+        # COMMENT
+        a""")
+    check_fp(src, 2)
+    # We don't need to parse the for loop, but we need to parse the other two,
+    # because the split is in a different place.
+    check_fp('a\n' + src, 2, 3)
+
+
+def test_multi_line_params():
+    src = dedent("""\
+    def x(a,
+          b):
+        pass
+
+    foo = 1
+    """)
+    check_fp(src, 2)
+
+
+def test_one_statement_func():
+    src = dedent("""\
+    first
+    def func(): a
+    """)
+    check_fp(src + 'second', 3)
+    # Empty the parser cache, because we're not interested in modifications
+    # here.
+    cache.parser_cache.pop(None, None)
+    check_fp(src + 'def second():\n a', 3)
+
+
+def test_class_func_if():
+    src = dedent("""\
+    class Class:
+        def func(self):
+            if 1:
+                a
+            else:
+                b
+
+    pass
+    """)
+    check_fp(src, 3)
+
+
+def test_for_on_one_line():
+    src = dedent("""\
+    foo = 1
+    for x in foo: pass
+
+    def hi():
+        pass
+    """)
+    check_fp(src, 2)
+
+    src = dedent("""\
+    def hi():
+        for x in foo: pass
+        pass
+
+    pass
+    """)
+    check_fp(src, 2)
+
+    src = dedent("""\
+    def hi():
+        for x in foo: pass
+
+        def nested():
+            pass
+    """)
+    check_fp(src, 2)
+
+
+def test_multi_line_for():
+    src = dedent("""\
+    for x in [1,
+              2]:
+        pass
+
+    pass
+    """)
+    check_fp(src, 1)
+
+
+def test_wrong_indentation():
+    src = dedent("""\
+    def func():
+        a
+         b
+        a
+    """)
+    #check_fp(src, 1)
+
+    src = dedent("""\
+    def complex():
+        def nested():
+            a
+             b
+            a
+
+        def other():
+            pass
+    """)
+    check_fp(src, 3)
+
+
+def test_open_parentheses():
+    func = 'def func():\n a'
+    code = u('isinstance(\n\n' + func)
+    p = FastParser(load_grammar(), code)
+    # As you can see, the part that was failing is still there in the get_code
+    # call. It is not relevant for evaluation, but still available as an
+    # ErrorNode.
+    assert p.module.get_code() == code
+    assert p.number_of_splits == 2
+    assert p.number_parsers_used == 2
+    save_parser(None, p, pickling=False)
+
+    # Now with a correct parser it should work perfectly well.
+    check_fp('isinstance()\n' + func, 1, 2)
+
+
+def test_strange_parentheses():
+    src = dedent("""
+    class X():
+        a = (1
+    if 1 else 2)
+        def x():
+            pass
+    """)
+    check_fp(src, 2)
+
+
+def test_backslash():
+    src = dedent(r"""
+    a = 1\
+        if 1 else 2
+    def x():
+        pass
+    """)
+    check_fp(src, 2)
+
+    src = dedent(r"""
+    def x():
+        a = 1\
+    if 1 else 2
+        def y():
+            pass
+    """)
+    # The dangling if leads to not splitting where we theoretically could
+    # split.
+    check_fp(src, 2)
+
+    src = dedent(r"""
+    def first():
+        if foo \
+                and bar \
+                or baz:
+            pass
+    def second():
+        pass
+    """)
+    check_fp(src, 2)
+
+
+
+def test_fake_parentheses():
+    """
+    The fast parser splitting counts parentheses, but not as correct tokens.
+    Therefore parentheses in string tokens are included as well. This needs to
+    be accounted for.
+    """
+    src = dedent(r"""
+    def x():
+        a = (')'
+    if 1 else 2)
+        def y():
+            pass
+        def z():
+            pass
+    """)
+    check_fp(src, 3, 2, 1)
+
+
+def test_additional_indent():
+    source = dedent('''\
+    int(
+      def x():
+          pass
+    ''')
+
+    check_fp(source, 2)
+
+
+def test_incomplete_function():
+    source = '''return ImportErr'''
+
+    script = jedi.Script(dedent(source), 1, 3)
+    assert script.completions()
+
+
+def test_string_literals():
+    """Simplified case of jedi-vim#377."""
+    source = dedent("""
+    x = ur''' 
+
+    def foo():
+        pass
+    """)
+
+    script = jedi.Script(dedent(source))
+    script._get_module().end_pos == (6, 0)
+    assert script.completions()
+
+
+def test_decorator_string_issue():
+    """
+    Test case from #589
+    """
+    source = dedent('''\
+    """
+      @"""
+    def bla():
+      pass
+
+    bla.''')
+
+    s = jedi.Script(source)
+    assert s.completions()
+    assert s._get_module().get_code() == source
+
+
+def test_round_trip():
+    source = dedent('''
+    def x():
+        """hahaha"""
+    func''')
+
+    f = FastParser(load_grammar(), u(source))
+    assert f.get_parsed_node().get_code() == source
+
+
+@pytest.mark.xfail()
+def test_parentheses_in_string():
+    code = dedent('''
+    def x():
+        '('
+
+    import abc
+
+    abc.''')
+    check_fp(code, 2, 1, 1)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_get_code.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_get_code.py
new file mode 100644
index 0000000..43202fb
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_get_code.py
@@ -0,0 +1,107 @@
+import difflib
+
+import pytest
+
+from jedi._compatibility import u
+from jedi.parser import ParserWithRecovery, load_grammar
+
+code_basic_features = u('''
+"""A mod docstring"""
+
+def a_function(a_argument, a_default = "default"):
+    """A func docstring"""
+
+    a_result = 3 * a_argument
+    print(a_result)  # a comment
+    b = """
+from
+to""" + "huhu"
+
+
+    if a_default == "default":
+        return str(a_result)
+    else
+        return None
+''')
+
+
+def diff_code_assert(a, b, n=4):
+    if a != b:
+        diff = "\n".join(difflib.unified_diff(
+            a.splitlines(),
+            b.splitlines(),
+            n=n,
+            lineterm=""
+        ))
+        assert False, "Code does not match:\n%s\n\ncreated code:\n%s" % (
+            diff,
+            b
+        )
+    pass
+
+
+@pytest.mark.skipif('True', reason='Refactor a few parser things first.')
+def test_basic_parsing():
+    """Validate the parsing features"""
+
+    prs = ParserWithRecovery(load_grammar(), code_basic_features)
+    diff_code_assert(
+        code_basic_features,
+        prs.module.get_code()
+    )
+
+
+def test_operators():
+    src = u('5  * 3')
+    prs = ParserWithRecovery(load_grammar(), src)
+    diff_code_assert(src, prs.module.get_code())
+
+
+def test_get_code():
+    """Use the same code that the parser also generates, to compare"""
+    s = u('''"""a docstring"""
+class SomeClass(object, mixin):
+    def __init__(self):
+        self.xy = 3.0
+        """statement docstr"""
+    def some_method(self):
+        return 1
+    def yield_method(self):
+        while hasattr(self, 'xy'):
+            yield True
+        for x in [1, 2]:
+            yield x
+    def empty(self):
+        pass
+class Empty:
+    pass
+class WithDocstring:
+    """class docstr"""
+    pass
+def method_with_docstring():
+    """class docstr"""
+    pass
+''')
+    assert ParserWithRecovery(load_grammar(), s).module.get_code() == s
+
+
+def test_end_newlines():
+    """
+    The Python grammar explicitly needs a newline at the end. Jedi though still
+    wants to be able, to return the exact same code without the additional new
+    line the parser needs.
+    """
+    def test(source, end_pos):
+        module = ParserWithRecovery(load_grammar(), u(source)).module
+        assert module.get_code() == source
+        assert module.end_pos == end_pos
+
+    test('a', (1, 1))
+    test('a\n', (2, 0))
+    test('a\nb', (2, 1))
+    test('a\n#comment\n', (3, 0))
+    test('a\n#comment', (2, 8))
+    test('a#comment', (1, 9))
+    test('def a():\n pass', (2, 5))
+
+    test('def a(', (1, 6))
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_param_splitting.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_param_splitting.py
new file mode 100644
index 0000000..f97c3dc
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_param_splitting.py
@@ -0,0 +1,34 @@
+'''
+To make the life of any analysis easier, we are generating Param objects
+instead of simple parser objects.
+'''
+
+from textwrap import dedent
+
+from jedi.parser import Parser, load_grammar
+
+
+def assert_params(param_string, **wanted_dct):
+    source = dedent('''
+    def x(%s):
+        pass
+    ''') % param_string
+
+    parser = Parser(load_grammar(), dedent(source))
+    funcdef = parser.get_parsed_node().subscopes[0]
+    dct = dict((p.name.value, p.default and p.default.get_code())
+               for p in funcdef.params)
+    assert dct == wanted_dct
+    assert parser.get_parsed_node().get_code() == source
+
+
+def test_split_params_with_separation_star():
+    assert_params(u'x, y=1, *, z=3', x=None, y='1', z='3')
+    assert_params(u'*, x', x=None)
+    assert_params(u'*')
+
+
+def test_split_params_with_stars():
+    assert_params(u'x, *args', x=None, args=None)
+    assert_params(u'**kwargs', kwargs=None)
+    assert_params(u'*args, **kwargs', args=None, kwargs=None)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_parser.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_parser.py
new file mode 100644
index 0000000..0ec75d0
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_parser.py
@@ -0,0 +1,238 @@
+# -*- coding: utf-8 -*-
+import sys
+from textwrap import dedent
+
+import jedi
+from jedi._compatibility import u, is_py3
+from jedi.parser import ParserWithRecovery, load_grammar
+from jedi.parser import tree as pt
+
+
+def test_user_statement_on_import():
+    """github #285"""
+    s = u("from datetime import (\n"
+          "    time)")
+
+    for pos in [(2, 1), (2, 4)]:
+        p = ParserWithRecovery(load_grammar(), s)
+        stmt = p.module.get_statement_for_position(pos)
+        assert isinstance(stmt, pt.Import)
+        assert [str(n) for n in stmt.get_defined_names()] == ['time']
+
+
+class TestCallAndName():
+    def get_call(self, source):
+        # Get the simple_stmt and then the first one.
+        simple_stmt = ParserWithRecovery(load_grammar(), u(source)).module.children[0]
+        return simple_stmt.children[0]
+
+    def test_name_and_call_positions(self):
+        name = self.get_call('name\nsomething_else')
+        assert str(name) == 'name'
+        assert name.start_pos == (1, 0)
+        assert name.end_pos == (1, 4)
+
+        leaf = self.get_call('1.0\n')
+        assert leaf.value == '1.0'
+        assert leaf.eval() == 1.0
+        assert leaf.start_pos == (1, 0)
+        assert leaf.end_pos == (1, 3)
+
+    def test_call_type(self):
+        call = self.get_call('hello')
+        assert isinstance(call, pt.Name)
+
+    def test_literal_type(self):
+        literal = self.get_call('1.0')
+        assert isinstance(literal, pt.Literal)
+        assert type(literal.eval()) == float
+
+        literal = self.get_call('1')
+        assert isinstance(literal, pt.Literal)
+        assert type(literal.eval()) == int
+
+        literal = self.get_call('"hello"')
+        assert isinstance(literal, pt.Literal)
+        assert literal.eval() == 'hello'
+
+
+class TestSubscopes():
+    def get_sub(self, source):
+        return ParserWithRecovery(load_grammar(), u(source)).module.subscopes[0]
+
+    def test_subscope_names(self):
+        name = self.get_sub('class Foo: pass').name
+        assert name.start_pos == (1, len('class '))
+        assert name.end_pos == (1, len('class Foo'))
+        assert str(name) == 'Foo'
+
+        name = self.get_sub('def foo(): pass').name
+        assert name.start_pos == (1, len('def '))
+        assert name.end_pos == (1, len('def foo'))
+        assert str(name) == 'foo'
+
+
+class TestImports():
+    def get_import(self, source):
+        return ParserWithRecovery(load_grammar(), source).module.imports[0]
+
+    def test_import_names(self):
+        imp = self.get_import(u('import math\n'))
+        names = imp.get_defined_names()
+        assert len(names) == 1
+        assert str(names[0]) == 'math'
+        assert names[0].start_pos == (1, len('import '))
+        assert names[0].end_pos == (1, len('import math'))
+
+        assert imp.start_pos == (1, 0)
+        assert imp.end_pos == (1, len('import math'))
+
+
+def test_module():
+    module = ParserWithRecovery(load_grammar(), u('asdf'), 'example.py').module
+    name = module.name
+    assert str(name) == 'example'
+    assert name.start_pos == (1, 0)
+    assert name.end_pos == (1, 7)
+
+    module = ParserWithRecovery(load_grammar(), u('asdf')).module
+    name = module.name
+    assert str(name) == ''
+    assert name.start_pos == (1, 0)
+    assert name.end_pos == (1, 0)
+
+
+def test_end_pos():
+    s = u(dedent('''
+                 x = ['a', 'b', 'c']
+                 def func():
+                     y = None
+                 '''))
+    parser = ParserWithRecovery(load_grammar(), s)
+    scope = parser.module.subscopes[0]
+    assert scope.start_pos == (3, 0)
+    assert scope.end_pos == (5, 0)
+
+
+def test_carriage_return_statements():
+    source = u(dedent('''
+        foo = 'ns1!'
+
+        # this is a namespace package
+    '''))
+    source = source.replace('\n', '\r\n')
+    stmt = ParserWithRecovery(load_grammar(), source).module.statements[0]
+    assert '#' not in stmt.get_code()
+
+
+def test_incomplete_list_comprehension():
+    """ Shouldn't raise an error, same bug as #418. """
+    # With the old parser this actually returned a statement. With the new
+    # parser only valid statements generate one.
+    assert ParserWithRecovery(load_grammar(), u('(1 for def')).module.statements == []
+
+
+def test_hex_values_in_docstring():
+    source = r'''
+        def foo(object):
+            """
+             \xff
+            """
+            return 1
+        '''
+
+    doc = ParserWithRecovery(load_grammar(), dedent(u(source))).module.subscopes[0].raw_doc
+    if is_py3:
+        assert doc == '\xff'
+    else:
+        assert doc == u('�')
+
+
+def test_error_correction_with():
+    source = """
+    with open() as f:
+        try:
+            f."""
+    comps = jedi.Script(source).completions()
+    assert len(comps) > 30
+    # `open` completions have a closed attribute.
+    assert [1 for c in comps if c.name == 'closed']
+
+
+def test_newline_positions():
+    endmarker = ParserWithRecovery(load_grammar(), u('a\n')).module.children[-1]
+    assert endmarker.end_pos == (2, 0)
+    new_line = endmarker.get_previous_leaf()
+    assert new_line.start_pos == (1, 1)
+    assert new_line.end_pos == (2, 0)
+
+
+def test_end_pos_error_correction():
+    """
+    Source code without ending newline are given one, because the Python
+    grammar needs it. However, they are removed again. We still want the right
+    end_pos, even if something breaks in the parser (error correction).
+    """
+    s = u('def x():\n .')
+    m = ParserWithRecovery(load_grammar(), s).module
+    func = m.children[0]
+    assert func.type == 'funcdef'
+    # This is not exactly correct, but ok, because it doesn't make a difference
+    # at all. We just want to make sure that the module end_pos is correct!
+    assert func.end_pos == (3, 0)
+    assert m.end_pos == (2, 2)
+
+
+def test_param_splitting():
+    """
+    Jedi splits parameters into params, this is not what the grammar does,
+    but Jedi does this to simplify argument parsing.
+    """
+    def check(src, result):
+        # Python 2 tuple params should be ignored for now.
+        grammar = load_grammar('%s.%s' % sys.version_info[:2])
+        m = ParserWithRecovery(grammar, u(src)).module
+        if is_py3:
+            assert not m.subscopes
+        else:
+            # We don't want b and c to be a part of the param enumeration. Just
+            # ignore them, because it's not what we want to support in the
+            # future.
+            assert [str(param.name) for param in m.subscopes[0].params] == result
+
+    check('def x(a, (b, c)):\n pass', ['a'])
+    check('def x((b, c)):\n pass', [])
+
+
+def test_unicode_string():
+    s = pt.String(None, u('bö'), (0, 0))
+    assert repr(s)  # Should not raise an Error!
+
+
+def test_backslash_dos_style():
+    grammar = load_grammar()
+    m = ParserWithRecovery(grammar, u('\\\r\n')).module
+    assert m
+
+
+def test_started_lambda_stmt():
+    p = ParserWithRecovery(load_grammar(), u'lambda a, b: a i')
+    assert p.get_parsed_node().children[0].type == 'error_node'
+
+
+def test_python2_octal():
+    parser = ParserWithRecovery(load_grammar(), u'0660')
+    first = parser.get_parsed_node().children[0]
+    if is_py3:
+        assert first.type == 'error_node'
+    else:
+        assert first.children[0].type == 'number'
+
+
+def test_python3_octal():
+    parser = ParserWithRecovery(load_grammar(), u'0o660')
+    module = parser.get_parsed_node()
+    if is_py3:
+        assert module.children[0].children[0].type == 'number'
+    else:
+        assert module.children[0].type == 'error_node'
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_parser_tree.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_parser_tree.py
new file mode 100644
index 0000000..57ea825
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_parser_tree.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8    # This file contains Unicode characters.
+
+from textwrap import dedent
+
+import pytest
+
+from jedi._compatibility import u, unicode
+from jedi.parser import ParserWithRecovery, load_grammar
+from jedi.parser import tree as pt
+
+
+class TestsFunctionAndLambdaParsing(object):
+
+    FIXTURES = [
+        ('def my_function(x, y, z) -> str:\n    return x + y * z\n', {
+            'name': 'my_function',
+            'call_sig': 'my_function(x, y, z)',
+            'params': ['x', 'y', 'z'],
+            'annotation': "str",
+        }),
+        ('lambda x, y, z: x + y * z\n', {
+            'name': '<lambda>',
+            'call_sig': '<lambda>(x, y, z)',
+            'params': ['x', 'y', 'z'],
+        }),
+    ]
+
+    @pytest.fixture(params=FIXTURES)
+    def node(self, request):
+        parsed = ParserWithRecovery(load_grammar(), dedent(u(request.param[0])))
+        request.keywords['expected'] = request.param[1]
+        return parsed.module.subscopes[0]
+
+    @pytest.fixture()
+    def expected(self, request, node):
+        return request.keywords['expected']
+    
+    def test_name(self, node, expected):
+        assert isinstance(node.name, pt.Name)
+        assert unicode(node.name) == u(expected['name'])
+    
+    def test_params(self, node, expected):
+        assert isinstance(node.params, list)
+        assert all(isinstance(x, pt.Param) for x in node.params)
+        assert [unicode(x.name) for x in node.params] == [u(x) for x in expected['params']]
+
+    def test_is_generator(self, node, expected):
+        assert node.is_generator() is expected.get('is_generator', False)
+
+    def test_yields(self, node, expected):
+        # TODO: There's a comment in the code noting that the current implementation is incorrect.  This returns an
+        # empty list at the moment (not e.g. False).
+        if expected.get('yields', False):
+            assert node.yields
+        else:
+            assert not node.yields
+
+    def test_annotation(self, node, expected):
+        expected_annotation = expected.get('annotation', None)
+        if expected_annotation is None:
+            assert node.annotation() is None
+        else:
+            assert node.annotation().value == expected_annotation
+
+    def test_get_call_signature(self, node, expected):
+        assert node.get_call_signature() == expected['call_sig']
+
+    def test_doc(self, node, expected):
+        assert node.doc == expected.get('doc') or (expected['call_sig'] + '\n\n')
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_pgen2.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_pgen2.py
new file mode 100644
index 0000000..46f4938
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_pgen2.py
@@ -0,0 +1,279 @@
+"""Test suite for 2to3's parser and grammar files.
+
+This is the place to add tests for changes to 2to3's grammar, such as those
+merging the grammars for Python 2 and 3. In addition to specific tests for
+parts of the grammar we've changed, we also make sure we can parse the
+test_grammar.py files from both Python 2 and Python 3.
+"""
+
+from textwrap import dedent
+
+
+from jedi._compatibility import unicode, is_py3
+from jedi.parser import Parser, load_grammar, ParseError
+import pytest
+
+from test.helpers import TestCase
+
+
+def parse(code, version='3.4'):
+    code = dedent(code) + "\n\n"
+    grammar = load_grammar(version=version)
+    return Parser(grammar, unicode(code), 'file_input').get_parsed_node()
+
+
+class TestDriver(TestCase):
+
+    def test_formfeed(self):
+        s = """print 1\n\x0Cprint 2\n"""
+        t = parse(s, '2.7')
+        self.assertEqual(t.children[0].children[0].type, 'print_stmt')
+        self.assertEqual(t.children[1].children[0].type, 'print_stmt')
+        s = """1\n\x0C\x0C2\n"""
+        t = parse(s, '2.7')
+
+
+class GrammarTest(TestCase):
+    def invalid_syntax(self, code, **kwargs):
+        try:
+            parse(code, **kwargs)
+        except ParseError:
+            pass
+        else:
+            raise AssertionError("Syntax shouldn't have been valid")
+
+
+class TestMatrixMultiplication(GrammarTest):
+    @pytest.mark.skipif('sys.version_info[:2] < (3, 5)')
+    def test_matrix_multiplication_operator(self):
+        parse("a @ b", "3.5")
+        parse("a @= b", "3.5")
+
+
+class TestYieldFrom(GrammarTest):
+    def test_yield_from(self):
+        parse("yield from x")
+        parse("(yield from x) + y")
+        self.invalid_syntax("yield from")
+
+
+class TestAsyncAwait(GrammarTest):
+    @pytest.mark.skipif('sys.version_info[:2] < (3, 5)')
+    def test_await_expr(self):
+        parse("""async def foo():
+                             await x
+                      """, "3.5")
+
+        parse("""async def foo():
+
+            def foo(): pass
+
+            def foo(): pass
+
+            await x
+        """, "3.5")
+
+        parse("""async def foo(): return await a""", "3.5")
+
+        parse("""def foo():
+            def foo(): pass
+            async def foo(): await x
+        """, "3.5")
+
+    @pytest.mark.skipif('sys.version_info[:2] < (3, 5)')
+    @pytest.mark.xfail(reason="acting like python 3.7")
+    def test_await_expr_invalid(self):
+        self.invalid_syntax("await x", version="3.5")
+        self.invalid_syntax("""def foo():
+                                   await x""", version="3.5")
+
+        self.invalid_syntax("""def foo():
+            def foo(): pass
+            async def foo(): pass
+            await x
+        """, version="3.5")
+
+    @pytest.mark.skipif('sys.version_info[:2] < (3, 5)')
+    @pytest.mark.xfail(reason="acting like python 3.7")
+    def test_async_var(self):
+        parse("""async = 1""", "3.5")
+        parse("""await = 1""", "3.5")
+        parse("""def async(): pass""", "3.5")
+
+    @pytest.mark.skipif('sys.version_info[:2] < (3, 5)')
+    def test_async_for(self):
+        parse("""async def foo():
+                             async for a in b: pass""", "3.5")
+
+    @pytest.mark.skipif('sys.version_info[:2] < (3, 5)')
+    @pytest.mark.xfail(reason="acting like python 3.7")
+    def test_async_for_invalid(self):
+        self.invalid_syntax("""def foo():
+                                   async for a in b: pass""", version="3.5")
+
+    @pytest.mark.skipif('sys.version_info[:2] < (3, 5)')
+    def test_async_with(self):
+        parse("""async def foo():
+                             async with a: pass""", "3.5")
+
+    @pytest.mark.skipif('sys.version_info[:2] < (3, 5)')
+    @pytest.mark.xfail(reason="acting like python 3.7")
+    def test_async_with_invalid(self):
+        self.invalid_syntax("""def foo():
+                                   async with a: pass""", version="3.5")
+
+
+class TestRaiseChanges(GrammarTest):
+    def test_2x_style_1(self):
+        parse("raise")
+
+    def test_2x_style_2(self):
+        parse("raise E, V", version='2.7')
+
+    def test_2x_style_3(self):
+        parse("raise E, V, T", version='2.7')
+
+    def test_2x_style_invalid_1(self):
+        self.invalid_syntax("raise E, V, T, Z", version='2.7')
+
+    def test_3x_style(self):
+        parse("raise E1 from E2")
+
+    def test_3x_style_invalid_1(self):
+        self.invalid_syntax("raise E, V from E1")
+
+    def test_3x_style_invalid_2(self):
+        self.invalid_syntax("raise E from E1, E2")
+
+    def test_3x_style_invalid_3(self):
+        self.invalid_syntax("raise from E1, E2")
+
+    def test_3x_style_invalid_4(self):
+        self.invalid_syntax("raise E from")
+
+
+# Adapted from Python 3's Lib/test/test_grammar.py:GrammarTests.testFuncdef
+class TestFunctionAnnotations(GrammarTest):
+    def test_1(self):
+        parse("""def f(x) -> list: pass""")
+
+    def test_2(self):
+        parse("""def f(x:int): pass""")
+
+    def test_3(self):
+        parse("""def f(*x:str): pass""")
+
+    def test_4(self):
+        parse("""def f(**x:float): pass""")
+
+    def test_5(self):
+        parse("""def f(x, y:1+2): pass""")
+
+    def test_6(self):
+        self.invalid_syntax("""def f(a, (b:1, c:2, d)): pass""")
+
+    def test_7(self):
+        self.invalid_syntax("""def f(a, (b:1, c:2, d), e:3=4, f=5, *g:6): pass""")
+
+    def test_8(self):
+        s = """def f(a, (b:1, c:2, d), e:3=4, f=5,
+                        *g:6, h:7, i=8, j:9=10, **k:11) -> 12: pass"""
+        self.invalid_syntax(s)
+
+
+class TestExcept(GrammarTest):
+    def test_new(self):
+        s = """
+            try:
+                x
+            except E as N:
+                y"""
+        parse(s)
+
+    def test_old(self):
+        s = """
+            try:
+                x
+            except E, N:
+                y"""
+        parse(s, version='2.7')
+
+
+# Adapted from Python 3's Lib/test/test_grammar.py:GrammarTests.testAtoms
+class TestSetLiteral(GrammarTest):
+    def test_1(self):
+        parse("""x = {'one'}""")
+
+    def test_2(self):
+        parse("""x = {'one', 1,}""")
+
+    def test_3(self):
+        parse("""x = {'one', 'two', 'three'}""")
+
+    def test_4(self):
+        parse("""x = {2, 3, 4,}""")
+
+
+class TestNumericLiterals(GrammarTest):
+    def test_new_octal_notation(self):
+        code = """0o7777777777777"""
+        if is_py3:
+            parse(code)
+        else:
+            self.invalid_syntax(code)
+        self.invalid_syntax("""0o7324528887""")
+
+    def test_new_binary_notation(self):
+        parse("""0b101010""")
+        self.invalid_syntax("""0b0101021""")
+
+
+class TestClassDef(GrammarTest):
+    def test_new_syntax(self):
+        parse("class B(t=7): pass")
+        parse("class B(t, *args): pass")
+        parse("class B(t, **kwargs): pass")
+        parse("class B(t, *args, **kwargs): pass")
+        parse("class B(t, y=9, *args, **kwargs): pass")
+
+
+class TestParserIdempotency(TestCase):
+    """A cut-down version of pytree_idempotency.py."""
+    def test_extended_unpacking(self):
+        parse("a, *b, c = x\n")
+        parse("[*a, b] = x\n")
+        parse("(z, *y, w) = m\n")
+        parse("for *z, m in d: pass\n")
+
+
+class TestLiterals(GrammarTest):
+    # It's not possible to get the same result when using \xaa in Python 2/3,
+    # because it's treated differently.
+    @pytest.mark.skipif('sys.version_info[0] < 3')
+    def test_multiline_bytes_literals(self):
+        s = """
+            md5test(b"\xaa" * 80,
+                    (b"Test Using Larger Than Block-Size Key "
+                     b"and Larger Than One Block-Size Data"),
+                    "6f630fad67cda0ee1fb1f562db3aa53e")
+            """
+        parse(s)
+
+    def test_multiline_bytes_tripquote_literals(self):
+        s = '''
+            b"""
+            <?xml version="1.0" encoding="UTF-8"?>
+            <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN">
+            """
+            '''
+        parse(s)
+
+    @pytest.mark.skipif('sys.version_info[0] < 3')
+    def test_multiline_str_literals(self):
+        s = """
+            md5test("\xaa" * 80,
+                    ("Test Using Larger Than Block-Size Key "
+                     "and Larger Than One Block-Size Data"),
+                    "6f630fad67cda0ee1fb1f562db3aa53e")
+            """
+        parse(s)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_tokenize.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_tokenize.py
new file mode 100644
index 0000000..e53f85a
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_tokenize.py
@@ -0,0 +1,152 @@
+# -*- coding: utf-8    # This file contains Unicode characters.
+
+from io import StringIO
+from textwrap import dedent
+
+import pytest
+
+from jedi._compatibility import u, is_py3
+from jedi.parser.token import NAME, OP, NEWLINE, STRING, INDENT
+from jedi.parser import ParserWithRecovery, load_grammar, tokenize
+
+
+from ..helpers import unittest
+
+
+class TokenTest(unittest.TestCase):
+    def test_end_pos_one_line(self):
+        parsed = ParserWithRecovery(load_grammar(), dedent(u('''
+        def testit():
+            a = "huhu"
+        ''')))
+        tok = parsed.module.subscopes[0].statements[0].children[2]
+        assert tok.end_pos == (3, 14)
+
+    def test_end_pos_multi_line(self):
+        parsed = ParserWithRecovery(load_grammar(), dedent(u('''
+        def testit():
+            a = """huhu
+        asdfasdf""" + "h"
+        ''')))
+        tok = parsed.module.subscopes[0].statements[0].children[2].children[0]
+        assert tok.end_pos == (4, 11)
+
+    def test_simple_no_whitespace(self):
+        # Test a simple one line string, no preceding whitespace
+        simple_docstring = u('"""simple one line docstring"""')
+        simple_docstring_io = StringIO(simple_docstring)
+        tokens = tokenize.generate_tokens(simple_docstring_io.readline)
+        token_list = list(tokens)
+        _, value, _, prefix = token_list[0]
+        assert prefix == ''
+        assert value == '"""simple one line docstring"""'
+
+    def test_simple_with_whitespace(self):
+        # Test a simple one line string with preceding whitespace and newline
+        simple_docstring = u('  """simple one line docstring""" \r\n')
+        simple_docstring_io = StringIO(simple_docstring)
+        tokens = tokenize.generate_tokens(simple_docstring_io.readline)
+        token_list = list(tokens)
+        assert token_list[0][0] == INDENT
+        typ, value, start_pos, prefix = token_list[1]
+        assert prefix == '  '
+        assert value == '"""simple one line docstring"""'
+        assert typ == STRING
+        typ, value, start_pos, prefix = token_list[2]
+        assert prefix == ' '
+        assert typ == NEWLINE
+
+    def test_function_whitespace(self):
+        # Test function definition whitespace identification
+        fundef = dedent(u('''
+        def test_whitespace(*args, **kwargs):
+            x = 1
+            if x > 0:
+                print(True)
+        '''))
+        fundef_io = StringIO(fundef)
+        tokens = tokenize.generate_tokens(fundef_io.readline)
+        token_list = list(tokens)
+        for _, value, _, prefix in token_list:
+            if value == 'test_whitespace':
+                assert prefix == ' '
+            if value == '(':
+                assert prefix == ''
+            if value == '*':
+                assert prefix == ''
+            if value == '**':
+                assert prefix == ' '
+            if value == 'print':
+                assert prefix == '        '
+            if value == 'if':
+                assert prefix == '    '
+
+    def test_identifier_contains_unicode(self):
+        fundef = dedent(u('''
+        def 我�φ():
+            pass
+        '''))
+        fundef_io = StringIO(fundef)
+        tokens = tokenize.generate_tokens(fundef_io.readline)
+        token_list = list(tokens)
+        unicode_token = token_list[1]
+        if is_py3:
+            assert unicode_token[0] == NAME
+        else:
+            # Unicode tokens in Python 2 seem to be identified as operators.
+            # They will be ignored in the parser, that's ok.
+            assert unicode_token[0] == OP
+
+    def test_quoted_strings(self):
+
+        string_tokens = [
+            'u"test"',
+            'u"""test"""',
+            'U"""test"""',
+            "u'''test'''",
+            "U'''test'''",
+        ]
+
+        for s in string_tokens:
+            parsed = ParserWithRecovery(load_grammar(), u('''a = %s\n''' % s))
+            simple_stmt = parsed.module.children[0]
+            expr_stmt = simple_stmt.children[0]
+            assert len(expr_stmt.children) == 3
+            string_tok = expr_stmt.children[2]
+            assert string_tok.type == 'string'
+            assert string_tok.value == s
+            assert string_tok.eval() == 'test'
+
+
+def test_tokenizer_with_string_literal_backslash():
+    import jedi
+    c = jedi.Script("statement = u'foo\\\n'; statement").goto_definitions()
+    assert c[0]._name.parent.obj == 'foo'
+
+
+def test_ur_literals():
+    """
+    Decided to parse `u''` literals regardless of Python version. This makes
+    probably sense:
+
+    - Python 3.2 doesn't support it and is still supported by Jedi, but might
+      not be. While this is incorrect, it's just incorrect for one "old" and in
+      the future not very important version.
+    - All the other Python versions work very well with it.
+    """
+    def check(literal):
+        io = StringIO(u(literal))
+        tokens = tokenize.generate_tokens(io.readline)
+        token_list = list(tokens)
+        typ, result_literal, _, _ = token_list[0]
+        assert typ == STRING
+        assert result_literal == literal
+
+    check('u""')
+    check('ur""')
+    check('Ur""')
+    check('UR""')
+    check('bR""')
+    # Must be in the right order.
+    with pytest.raises(AssertionError):
+        check('Rb""')
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_user_context.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_user_context.py
new file mode 100644
index 0000000..01aff79
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_parser/test_user_context.py
@@ -0,0 +1,6 @@
+import jedi
+
+
+def test_form_feed_characters():
+    s = "\f\nclass Test(object):\n    pass"
+    jedi.Script(s, line=2, column=18).call_signatures()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_regression.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_regression.py
new file mode 100644
index 0000000..abb1072
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_regression.py
@@ -0,0 +1,206 @@
+"""
+Unit tests to avoid errors of the past. These are also all tests that didn't
+found a good place in any other testing module.
+"""
+
+import os
+import sys
+import textwrap
+
+from .helpers import TestCase, cwd_at
+
+import pytest
+import jedi
+from jedi._compatibility import u
+from jedi import Script
+from jedi import api
+from jedi import common
+from jedi.evaluate import imports
+from jedi.parser import ParserWithRecovery, load_grammar
+
+#jedi.set_debug_function()
+
+
+class TestRegression(TestCase):
+    def test_goto_definition_cursor(self):
+
+        s = ("class A():\n"
+             "    def _something(self):\n"
+             "        return\n"
+             "    def different_line(self,\n"
+             "                   b):\n"
+             "        return\n"
+             "A._something\n"
+             "A.different_line"
+             )
+
+        in_name = 2, 9
+        under_score = 2, 8
+        cls = 2, 7
+        should1 = 7, 10
+        diff_line = 4, 10
+        should2 = 8, 10
+
+        def get_def(pos):
+            return [d.description for d in Script(s, *pos).goto_definitions()]
+
+        in_name = get_def(in_name)
+        under_score = get_def(under_score)
+        should1 = get_def(should1)
+        should2 = get_def(should2)
+
+        diff_line = get_def(diff_line)
+
+        assert should1 == in_name
+        assert should1 == under_score
+
+        assert should2 == diff_line
+
+        assert get_def(cls) == []
+
+    @pytest.mark.skipif('True', reason='Skip for now, test case is not really supported.')
+    @cwd_at('jedi')
+    def test_add_dynamic_mods(self):
+        fname = '__main__.py'
+        api.settings.additional_dynamic_modules = [fname]
+        # Fictional module that defines a function.
+        src1 = "def r(a): return a"
+        # Other fictional modules in another place in the fs.
+        src2 = 'from .. import setup; setup.r(1)'
+        script = Script(src1, path='../setup.py')
+        imports.load_module(script._evaluator, os.path.abspath(fname), src2)
+        result = script.goto_definitions()
+        assert len(result) == 1
+        assert result[0].description == 'class int'
+
+    def test_os_nowait(self):
+        """ github issue #45 """
+        s = Script("import os; os.P_").completions()
+        assert 'P_NOWAIT' in [i.name for i in s]
+
+    def test_points_in_completion(self):
+        """At some point, points were inserted into the completions, this
+        caused problems, sometimes.
+        """
+        c = Script("if IndentationErr").completions()
+        assert c[0].name == 'IndentationError'
+        self.assertEqual(c[0].complete, 'or')
+
+    def test_no_statement_parent(self):
+        source = textwrap.dedent("""
+        def f():
+            pass
+
+        class C:
+            pass
+
+        variable = f if random.choice([0, 1]) else C""")
+        defs = Script(source, column=3).goto_definitions()
+        defs = sorted(defs, key=lambda d: d.line)
+        self.assertEqual([d.description for d in defs],
+                         ['def f', 'class C'])
+
+    def test_end_pos_line(self):
+        # jedi issue #150
+        s = u("x()\nx( )\nx(  )\nx (  )")
+        parser = ParserWithRecovery(load_grammar(), s)
+        for i, s in enumerate(parser.module.statements):
+            assert s.end_pos == (i + 1, i + 3)
+
+    def check_definition_by_marker(self, source, after_cursor, names):
+        r"""
+        Find definitions specified by `after_cursor` and check what found
+
+        For example, for the following configuration, you can pass
+        ``after_cursor = 'y)'``.::
+
+            function(
+                x, y)
+                   \
+                    `- You want cursor to be here
+        """
+        source = textwrap.dedent(source)
+        for (i, line) in enumerate(source.splitlines()):
+            if after_cursor in line:
+                break
+        column = len(line) - len(after_cursor)
+        defs = Script(source, i + 1, column).goto_definitions()
+        print(defs)
+        assert [d.name for d in defs] == names
+
+    def test_backslash_continuation(self):
+        """
+        Test that ModuleWithCursor.get_path_until_cursor handles continuation
+        """
+        self.check_definition_by_marker(r"""
+        x = 0
+        a = \
+          [1, 2, 3, 4, 5, 6, 7, 8, 9, x]  # <-- here
+        """, ']  # <-- here', ['int'])
+
+        # completion in whitespace
+        s = 'asdfxyxxxxxxxx sds\\\n    hello'
+        assert Script(s, 2, 4).goto_assignments() == []
+
+    def test_backslash_continuation_and_bracket(self):
+        self.check_definition_by_marker(r"""
+        x = 0
+        a = \
+          [1, 2, 3, 4, 5, 6, 7, 8, 9, (x)]  # <-- here
+        """, '(x)]  # <-- here', ['int'])
+
+    def test_generator(self):
+        # Did have some problems with the usage of generator completions this
+        # way.
+        s = "def abc():\n" \
+            "    yield 1\n" \
+            "abc()."
+        assert Script(s).completions()
+
+    def test_fake_subnodes(self):
+        """
+        Test the number of subnodes of a fake object.
+
+        There was a bug where the number of child nodes would grow on every
+        call to :func:``jedi.evaluate.compiled.fake.get_faked``.
+
+        See Github PR#649 and isseu #591.
+        """
+        def get_str_completion(values):
+            for c in values:
+                if c.name == 'str':
+                    return c
+        limit = None
+        for i in range(2):
+            completions = Script('').completions()
+            c = get_str_completion(completions)
+            n = len(c._definition.subscopes[0].children[-1].children)
+            if i == 0:
+                limit = n
+            else:
+                assert n == limit
+
+    def test_source_to_unicode_unicode_text(self):
+        source = (
+            b"# vim: fileencoding=utf-8\n"
+            b"# \xe3\x81\x82\xe3\x81\x84\xe3\x81\x86\xe3\x81\x88\xe3\x81\x8a\n"
+        )
+        actual = common.source_to_unicode(source)
+        expected = source.decode('utf-8')
+        assert actual == expected
+
+
+def test_loading_unicode_files_with_bad_global_charset(monkeypatch, tmpdir):
+    dirname = str(tmpdir.mkdir('jedi-test'))
+    filename1 = os.path.join(dirname, 'test1.py')
+    filename2 = os.path.join(dirname, 'test2.py')
+    if sys.version_info < (3, 0):
+        data = "# coding: latin-1\nfoo = 'm\xf6p'\n"
+    else:
+        data = "# coding: latin-1\nfoo = 'm\xf6p'\n".encode("latin-1")
+
+    with open(filename1, "wb") as f:
+        f.write(data)
+    s = Script("from test1 import foo\nfoo.",
+               line=2, column=4, path=filename2)
+    s.completions()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_speed.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_speed.py
new file mode 100644
index 0000000..4ea1656
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_speed.py
@@ -0,0 +1,53 @@
+"""
+Speed tests of Jedi. To prove that certain things don't take longer than they
+should.
+"""
+
+import time
+import functools
+
+from .helpers import TestCase, cwd_at
+import jedi
+
+class TestSpeed(TestCase):
+    def _check_speed(time_per_run, number=4, run_warm=True):
+        """ Speed checks should typically be very tolerant. Some machines are
+        faster than others, but the tests should still pass. These tests are
+        here to assure that certain effects that kill jedi performance are not
+        reintroduced to Jedi."""
+        def decorated(func):
+            @functools.wraps(func)
+            def wrapper(self):
+                if run_warm:
+                    func(self)
+                first = time.time()
+                for i in range(number):
+                    func(self)
+                single_time = (time.time() - first) / number
+                print('\nspeed', func, single_time)
+                assert single_time < time_per_run
+            return wrapper
+        return decorated
+
+    @_check_speed(0.2)
+    def test_os_path_join(self):
+        s = "from posixpath import join; join('', '')."
+        assert len(jedi.Script(s).completions()) > 10  # is a str completion
+
+    @_check_speed(0.15)
+    def test_scipy_speed(self):
+        s = 'import scipy.weave; scipy.weave.inline('
+        script = jedi.Script(s, 1, len(s), '')
+        script.call_signatures()
+        #print(jedi.imports.imports_processed)
+
+    @_check_speed(0.8)
+    @cwd_at('test')
+    def test_precedence_slowdown(self):
+        """
+        Precedence calculation can slow down things significantly in edge
+        cases. Having strange recursion structures increases the problem.
+        """
+        with open('speed/precedence.py') as f:
+            line = len(f.read().splitlines())
+        assert jedi.Script(line=line, path='speed/precedence.py').goto_definitions()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_utils.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_utils.py
new file mode 100644
index 0000000..2eb6e8c
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_utils.py
@@ -0,0 +1,111 @@
+try:
+    import readline
+except ImportError:
+    readline = False
+
+from jedi import utils
+
+from .helpers import unittest, cwd_at
+
+
+@unittest.skipIf(not readline, "readline not found")
+class TestSetupReadline(unittest.TestCase):
+    class NameSpace(object):
+        pass
+
+    def __init__(self, *args, **kwargs):
+        super(type(self), self).__init__(*args, **kwargs)
+
+        self.namespace = self.NameSpace()
+        utils.setup_readline(self.namespace)
+
+    def completions(self, text):
+        completer = readline.get_completer()
+        i = 0
+        completions = []
+        while True:
+            completion = completer(text, i)
+            if completion is None:
+                break
+            completions.append(completion)
+            i += 1
+        return completions
+
+    def test_simple(self):
+        assert self.completions('list') == ['list']
+        assert self.completions('importerror') == ['ImportError']
+        s = "print(BaseE"
+        assert self.completions(s) == [s + 'xception']
+
+    def test_nested(self):
+        assert self.completions('list.Insert') == ['list.insert']
+        assert self.completions('list().Insert') == ['list().insert']
+
+    def test_magic_methods(self):
+        assert self.completions('list.__getitem__') == ['list.__getitem__']
+        assert self.completions('list().__getitem__') == ['list().__getitem__']
+
+    def test_modules(self):
+        import sys
+        import os
+        self.namespace.sys = sys
+        self.namespace.os = os
+
+        try:
+            assert self.completions('os.path.join') == ['os.path.join']
+            string = 'os.path.join("a").upper'
+            assert self.completions(string) == [string]
+
+            c = set(['os.' + d for d in dir(os) if d.startswith('ch')])
+            assert set(self.completions('os.ch')) == set(c)
+        finally:
+            del self.namespace.sys
+            del self.namespace.os
+
+    def test_calls(self):
+        s = 'str(bytes'
+        assert self.completions(s) == [s, 'str(BytesWarning']
+
+    def test_import(self):
+        s = 'from os.path import a'
+        assert set(self.completions(s)) == set([s + 'ltsep', s + 'bspath'])
+        assert self.completions('import keyword') == ['import keyword']
+
+        import os
+        s = 'from os import '
+        goal = set([s + el for el in dir(os)])
+        # There are minor differences, e.g. the dir doesn't include deleted
+        # items as well as items that are not only available on linux.
+        assert len(set(self.completions(s)).symmetric_difference(goal)) < 20
+
+    @cwd_at('test')
+    def test_local_import(self):
+        s = 'import test_utils'
+        assert self.completions(s) == [s]
+
+    def test_preexisting_values(self):
+        self.namespace.a = range(10)
+        assert set(self.completions('a.')) == set(['a.' + n for n in dir(range(1))])
+        del self.namespace.a
+
+    def test_colorama(self):
+        """
+        Only test it if colorama library is available.
+
+        This module is being tested because it uses ``setattr`` at some point,
+        which Jedi doesn't understand, but it should still work in the REPL.
+        """
+        try:
+            # if colorama is installed
+            import colorama
+        except ImportError:
+            pass
+        else:
+            self.namespace.colorama = colorama
+            assert self.completions('colorama')
+            assert self.completions('colorama.Fore.BLACK') == ['colorama.Fore.BLACK']
+            del self.namespace.colorama
+
+
+def test_version_info():
+    assert utils.version_info()[:2] > (0, 7)
diff --git a/vim-plugins/bundle/jedi-vim/jedi/test/test_windows.py b/vim-plugins/bundle/jedi-vim/jedi/test/test_windows.py
new file mode 100644
index 0000000..e5d8cd0
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/test/test_windows.py
@@ -0,0 +1,8 @@
+import jedi
+
+def test_path_issues():
+    """
+    See pull request #684 for details.
+    """
+    source = '''from datetime import '''
+    assert jedi.Script(source).completions()
diff --git a/vim-plugins/bundle/jedi-vim/jedi/tox.ini b/vim-plugins/bundle/jedi-vim/jedi/tox.ini
new file mode 100644
index 0000000..97b77a1
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi/tox.ini
@@ -0,0 +1,47 @@
+[tox]
+envlist = py26, py27, py33, py34, py35
+[testenv]
+deps =
+    pytest>=2.3.5
+    pytest-cache
+# docopt for sith doctests
+    docopt
+# coloroma for colored debug output
+    colorama
+setenv =
+# https://github.com/tomchristie/django-rest-framework/issues/1957
+# tox corrupts __pycache__, solution from here:
+    PYTHONDONTWRITEBYTECODE=1
+commands =
+    py.test {posargs:jedi test}
+[testenv:py26]
+deps =
+    unittest2
+    {[testenv]deps}
+[testenv:py27]
+deps =
+# for testing the typing module
+    typing
+    {[testenv]deps}
+[testenv:py33]
+deps =
+    typing
+    {[testenv]deps}
+[testenv:py34]
+deps =
+    typing
+    {[testenv]deps}
+[testenv:py35]
+deps =
+    {[testenv]deps}
+[testenv:cov]
+deps =
+    coverage
+    {[testenv]deps}
+commands =
+    coverage run --source jedi -m py.test
+    coverage report
+[testenv:sith]
+commands =
+    {envpython} -c "import os; a='{envtmpdir}'; os.path.exists(a) or os.makedirs(a)"
+    {envpython} sith.py --record {envtmpdir}/record.json random {posargs:jedi}
diff --git a/vim-plugins/bundle/jedi-vim/jedi_vim.py b/vim-plugins/bundle/jedi-vim/jedi_vim.py
new file mode 100644
index 0000000..5ddd80a
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/jedi_vim.py
@@ -0,0 +1,723 @@
+# -*- coding: utf-8 -*-
+"""
+The Python parts of the Jedi library for VIM. It is mostly about communicating
+with VIM.
+"""
+
+import traceback  # for exception output
+import re
+import os
+import sys
+from shlex import split as shsplit
+from contextlib import contextmanager
+try:
+    from itertools import zip_longest
+except ImportError:
+    from itertools import izip_longest as zip_longest  # Python 2
+
+import vim
+
+is_py3 = sys.version_info[0] >= 3
+if is_py3:
+    ELLIPSIS = "…"
+    unicode = str
+else:
+    ELLIPSIS = u"…"
+
+
+class PythonToVimStr(unicode):
+    """ Vim has a different string implementation of single quotes """
+    __slots__ = []
+
+    def __new__(cls, obj, encoding='UTF-8'):
+        if not (is_py3 or isinstance(obj, unicode)):
+            obj = unicode.__new__(cls, obj, encoding)
+
+        # Vim cannot deal with zero bytes:
+        obj = obj.replace('\0', '\\0')
+        return unicode.__new__(cls, obj)
+
+    def __repr__(self):
+        # this is totally stupid and makes no sense but vim/python unicode
+        # support is pretty bad. don't ask how I came up with this... It just
+        # works...
+        # It seems to be related to that bug: http://bugs.python.org/issue5876
+        if unicode is str:
+            s = self
+        else:
+            s = self.encode('UTF-8')
+        return '"%s"' % s.replace('\\', '\\\\').replace('"', r'\"')
+
+
+class VimError(Exception):
+    def __init__(self, message, throwpoint, executing):
+        super(type(self), self).__init__(message)
+        self.message = message
+        self.throwpoint = throwpoint
+        self.executing = executing
+
+    def __str__(self):
+        return self.message + '; created by: ' + repr(self.executing)
+
+
+def _catch_exception(string, is_eval):
+    """
+    Interface between vim and python calls back to it.
+    Necessary, because the exact error message is not given by `vim.error`.
+    """
+    result = vim.eval('jedi#_vim_exceptions({0}, {1})'.format(
+        repr(PythonToVimStr(string, 'UTF-8')), int(is_eval)))
+    if 'exception' in result:
+        raise VimError(result['exception'], result['throwpoint'], string)
+    return result['result']
+
+
+def vim_command(string):
+    _catch_exception(string, False)
+
+
+def vim_eval(string):
+    return _catch_exception(string, True)
+
+
+def no_jedi_warning(error=None):
+    vim.command('echohl WarningMsg')
+    vim.command('echom "Please install Jedi if you want to use jedi-vim."')
+    if error:
+        vim.command('echom "The error was: {0}"'.format(error))
+    vim.command('echohl None')
+
+
+def echo_highlight(msg):
+    vim_command('echohl WarningMsg | echom "jedi-vim: {0}" | echohl None'.format(
+        str(msg).replace('"', '\\"')))
+
+
+try:
+    import jedi
+except ImportError as e:
+    no_jedi_warning(str(e))
+    jedi = None
+    jedi_import_error = str(e)
+else:
+    try:
+        version = jedi.__version__
+    except Exception as e:  # e.g. AttributeError
+        echo_highlight(
+            "Error when loading the jedi python module ({0}). "
+            "Please ensure that Jedi is installed correctly (see Installation "
+            "in the README.".format(e))
+        jedi = None
+    else:
+        if isinstance(version, str):
+            # the normal use case, now.
+            from jedi import utils
+            version = utils.version_info()
+        if version < (0, 7):
+            echo_highlight('Please update your Jedi version, it is too old.')
+
+
+def catch_and_print_exceptions(func):
+    def wrapper(*args, **kwargs):
+        try:
+            return func(*args, **kwargs)
+        except (Exception, vim.error):
+            print(traceback.format_exc())
+            return None
+    return wrapper
+
+
+def _check_jedi_availability(show_error=False):
+    def func_receiver(func):
+        def wrapper(*args, **kwargs):
+            if jedi is None:
+                if show_error:
+                    no_jedi_warning()
+                return
+            else:
+                return func(*args, **kwargs)
+        return wrapper
+    return func_receiver
+
+
+@catch_and_print_exceptions
+def get_script(source=None, column=None):
+    jedi.settings.additional_dynamic_modules = \
+        [b.name for b in vim.buffers if b.name is not None and b.name.endswith('.py')]
+    if source is None:
+        source = '\n'.join(vim.current.buffer)
+    row = vim.current.window.cursor[0]
+    if column is None:
+        column = vim.current.window.cursor[1]
+    buf_path = vim.current.buffer.name
+    encoding = vim_eval('&encoding') or 'latin1'
+    return jedi.Script(source, row, column, buf_path, encoding)
+
+
+@_check_jedi_availability(show_error=False)
+@catch_and_print_exceptions
+def completions():
+    row, column = vim.current.window.cursor
+    # Clear call signatures in the buffer so they aren't seen by the completer.
+    # Call signatures in the command line can stay.
+    if int(vim_eval("g:jedi#show_call_signatures")) == 1:
+        clear_call_signatures()
+    if vim.eval('a:findstart') == '1':
+        count = 0
+        for char in reversed(vim.current.line[:column]):
+            if not re.match('[\w\d]', char):
+                break
+            count += 1
+        vim.command('return %i' % (column - count))
+    else:
+        base = vim.eval('a:base')
+        source = ''
+        for i, line in enumerate(vim.current.buffer):
+            # enter this path again, otherwise source would be incomplete
+            if i == row - 1:
+                source += line[:column] + base + line[column:]
+            else:
+                source += line
+            source += '\n'
+        # here again hacks, because jedi has a different interface than vim
+        column += len(base)
+        try:
+            script = get_script(source=source, column=column)
+            completions = script.completions()
+            signatures = script.call_signatures()
+
+            out = []
+            for c in completions:
+                d = dict(word=PythonToVimStr(c.name[:len(base)] + c.complete),
+                         abbr=PythonToVimStr(c.name_with_symbols),
+                         # stuff directly behind the completion
+                         menu=PythonToVimStr(c.description),
+                         info=PythonToVimStr(c.docstring()),  # docstr
+                         icase=1,  # case insensitive
+                         dup=1  # allow duplicates (maybe later remove this)
+                         )
+                out.append(d)
+
+            strout = str(out)
+        except Exception:
+            # print to stdout, will be in :messages
+            print(traceback.format_exc())
+            strout = ''
+            completions = []
+            signatures = []
+
+        show_call_signatures(signatures)
+        vim.command('return ' + strout)
+
+
+@contextmanager
+def tempfile(content):
+    # Using this instead of the tempfile module because Windows won't read
+    # from a file not yet written to disk
+    with open(vim_eval('tempname()'), 'w') as f:
+        f.write(content)
+    try:
+        yield f
+    finally:
+        os.unlink(f.name)
+
+@_check_jedi_availability(show_error=True)
+@catch_and_print_exceptions
+def goto(mode="goto", no_output=False):
+    """
+    :param str mode: "related_name", "definition", "assignment", "auto"
+    :return: list of definitions/assignments
+    :rtype: list
+    """
+    script = get_script()
+    try:
+        if mode == "goto":
+            definitions = [x for x in script.goto_definitions()
+                           if not x.in_builtin_module()]
+            if not definitions:
+                definitions = script.goto_assignments()
+        elif mode == "related_name":
+            definitions = script.usages()
+        elif mode == "definition":
+            definitions = script.goto_definitions()
+        elif mode == "assignment":
+            definitions = script.goto_assignments()
+    except jedi.NotFoundError:
+        echo_highlight("Cannot follow nothing. Put your cursor on a valid name.")
+        definitions = []
+    else:
+        if no_output:
+            return definitions
+        if not definitions:
+            echo_highlight("Couldn't find any definitions for this.")
+        elif len(definitions) == 1 and mode != "related_name":
+            d = list(definitions)[0]
+            if d.in_builtin_module():
+                if d.is_keyword:
+                    echo_highlight("Cannot get the definition of Python keywords.")
+                else:
+                    echo_highlight("Builtin modules cannot be displayed (%s)."
+                                   % d.desc_with_module)
+            else:
+                using_tagstack = int(vim_eval('g:jedi#use_tag_stack')) == 1
+                if d.module_path != vim.current.buffer.name:
+                    result = new_buffer(d.module_path,
+                                        using_tagstack=using_tagstack)
+                    if not result:
+                        return []
+                if d.module_path and using_tagstack:
+                    tagname = d.name
+                    with tempfile('{0}\t{1}\t{2}'.format(tagname, d.module_path,
+                            'call cursor({0}, {1})'.format(d.line, d.column + 1))) as f:
+                        old_tags = vim.eval('&tags')
+                        old_wildignore = vim.eval('&wildignore')
+                        try:
+                            # Clear wildignore to ensure tag file isn't ignored
+                            vim.command('set wildignore=')
+                            vim.command('let &tags = %s' %
+                                        repr(PythonToVimStr(f.name)))
+                            vim.command('tjump %s' % tagname)
+                        finally:
+                            vim.command('let &tags = %s' %
+                                        repr(PythonToVimStr(old_tags)))
+                            vim.command('let &wildignore = %s' %
+                                        repr(PythonToVimStr(old_wildignore)))
+                vim.current.window.cursor = d.line, d.column
+        else:
+            # multiple solutions
+            lst = []
+            for d in definitions:
+                if d.in_builtin_module():
+                    lst.append(dict(text=PythonToVimStr('Builtin ' + d.description)))
+                else:
+                    lst.append(dict(filename=PythonToVimStr(d.module_path),
+                                    lnum=d.line, col=d.column + 1,
+                                    text=PythonToVimStr(d.description)))
+            vim_eval('setqflist(%s)' % repr(lst))
+            vim_eval('jedi#add_goto_window(' + str(len(lst)) + ')')
+    return definitions
+
+
+@_check_jedi_availability(show_error=True)
+@catch_and_print_exceptions
+def show_documentation():
+    script = get_script()
+    try:
+        definitions = script.goto_definitions()
+    except jedi.NotFoundError:
+        definitions = []
+    except Exception:
+        # print to stdout, will be in :messages
+        definitions = []
+        print("Exception, this shouldn't happen.")
+        print(traceback.format_exc())
+
+    if not definitions:
+        echo_highlight('No documentation found for that.')
+        vim.command('return')
+    else:
+        docs = ['Docstring for %s\n%s\n%s' % (d.desc_with_module, '=' * 40, d.docstring())
+                if d.docstring() else '|No Docstring for %s|' % d for d in definitions]
+        text = ('\n' + '-' * 79 + '\n').join(docs)
+        vim.command('let l:doc = %s' % repr(PythonToVimStr(text)))
+        vim.command('let l:doc_lines = %s' % len(text.split('\n')))
+    return True
+
+
+@catch_and_print_exceptions
+def clear_call_signatures():
+    # Check if using command line call signatures
+    if int(vim_eval("g:jedi#show_call_signatures")) == 2:
+        vim_command('echo ""')
+        return
+    cursor = vim.current.window.cursor
+    e = vim_eval('g:jedi#call_signature_escape')
+    # We need two turns here to search and replace certain lines:
+    # 1. Search for a line with a call signature and save the appended
+    #    characters
+    # 2. Actually replace the line and redo the status quo.
+    py_regex = r'%sjedi=([0-9]+), (.*?)%s.*?%sjedi%s'.replace(
+        '%s', re.escape(e))
+    for i, line in enumerate(vim.current.buffer):
+        match = re.search(py_regex, line)
+        if match is not None:
+            # Some signs were added to minimize syntax changes due to call
+            # signatures. We have to remove them again. The number of them is
+            # specified in `match.group(1)`.
+            after = line[match.end() + int(match.group(1)):]
+            line = line[:match.start()] + match.group(2) + after
+            vim.current.buffer[i] = line
+    vim.current.window.cursor = cursor
+
+
+@_check_jedi_availability(show_error=False)
+@catch_and_print_exceptions
+def show_call_signatures(signatures=()):
+    if int(vim_eval("has('conceal') && g:jedi#show_call_signatures")) == 0:
+        return
+
+    if signatures == ():
+        signatures = get_script().call_signatures()
+    clear_call_signatures()
+
+    if not signatures:
+        return
+
+    if int(vim_eval("g:jedi#show_call_signatures")) == 2:
+        return cmdline_call_signatures(signatures)
+
+    for i, signature in enumerate(signatures):
+        line, column = signature.bracket_start
+        # signatures are listed above each other
+        line_to_replace = line - i - 1
+        # because there's a space before the bracket
+        insert_column = column - 1
+        if insert_column < 0 or line_to_replace <= 0:
+            # Edge cases, when the call signature has no space on the screen.
+            break
+
+        # TODO check if completion menu is above or below
+        line = vim_eval("getline(%s)" % line_to_replace)
+
+        params = [p.description.replace('\n', '') for p in signature.params]
+        try:
+            # *_*PLACEHOLDER*_* makes something fat. See after/syntax file.
+            params[signature.index] = '*_*%s*_*' % params[signature.index]
+        except (IndexError, TypeError):
+            pass
+
+        # This stuff is reaaaaally a hack! I cannot stress enough, that
+        # this is a stupid solution. But there is really no other yet.
+        # There is no possibility in VIM to draw on the screen, but there
+        # will be one (see :help todo Patch to access screen under Python.
+        # (Marko Mahni, 2010 Jul 18))
+        text = " (%s) " % ', '.join(params)
+        text = ' ' * (insert_column - len(line)) + text
+        end_column = insert_column + len(text) - 2  # -2 due to bold symbols
+
+        # Need to decode it with utf8, because vim returns always a python 2
+        # string even if it is unicode.
+        e = vim_eval('g:jedi#call_signature_escape')
+        if hasattr(e, 'decode'):
+            e = e.decode('UTF-8')
+        # replace line before with cursor
+        regex = "xjedi=%sx%sxjedix".replace('x', e)
+
+        prefix, replace = line[:insert_column], line[insert_column:end_column]
+
+        # Check the replace stuff for strings, to append them
+        # (don't want to break the syntax)
+        regex_quotes = r'''\\*["']+'''
+        # `add` are all the quotation marks.
+        # join them with a space to avoid producing '''
+        add = ' '.join(re.findall(regex_quotes, replace))
+        # search backwards
+        if add and replace[0] in ['"', "'"]:
+            a = re.search(regex_quotes + '$', prefix)
+            add = ('' if a is None else a.group(0)) + add
+
+        tup = '%s, %s' % (len(add), replace)
+        repl = prefix + (regex % (tup, text)) + add + line[end_column:]
+
+        vim_eval('setline(%s, %s)' % (line_to_replace, repr(PythonToVimStr(repl))))
+
+
+@catch_and_print_exceptions
+def cmdline_call_signatures(signatures):
+    def get_params(s):
+        return [p.description.replace('\n', '') for p in s.params]
+
+    def escape(string):
+        return string.replace('"', '\\"').replace(r'\n', r'\\n')
+
+    def join():
+        return ', '.join(filter(None, (left, center, right)))
+
+    def too_long():
+        return len(join()) > max_msg_len
+
+    if len(signatures) > 1:
+        params = zip_longest(*map(get_params, signatures), fillvalue='_')
+        params = ['(' + ', '.join(p) + ')' for p in params]
+    else:
+        params = get_params(signatures[0])
+
+    index = next(iter(s.index for s in signatures if s.index is not None), None)
+
+    # Allow 12 characters for showcmd plus 18 for ruler - setting
+    # noruler/noshowcmd here causes incorrect undo history
+    max_msg_len = int(vim_eval('&columns')) - 12
+    if int(vim_eval('&ruler')):
+        max_msg_len -= 18
+    max_msg_len -= len(signatures[0].call_name) + 2  # call name + parentheses
+
+    if max_msg_len < (1 if params else 0):
+        return
+    elif index is None:
+        text = escape(', '.join(params))
+        if params and len(text) > max_msg_len:
+            text = ELLIPSIS
+    elif max_msg_len < len(ELLIPSIS):
+        return
+    else:
+        left = escape(', '.join(params[:index]))
+        center = escape(params[index])
+        right = escape(', '.join(params[index + 1:]))
+        while too_long():
+            if left and left != ELLIPSIS:
+                left = ELLIPSIS
+                continue
+            if right and right != ELLIPSIS:
+                right = ELLIPSIS
+                continue
+            if (left or right) and center != ELLIPSIS:
+                left = right = None
+                center = ELLIPSIS
+                continue
+            if too_long():
+                # Should never reach here
+                return
+
+    max_num_spaces = max_msg_len
+    if index is not None:
+        max_num_spaces -= len(join())
+    _, column = signatures[0].bracket_start
+    spaces = min(int(vim_eval('g:jedi#first_col +'
+                              'wincol() - col(".")')) +
+                 column - len(signatures[0].call_name),
+                 max_num_spaces) * ' '
+
+    if index is not None:
+        vim_command('                      echon "%s" | '
+                    'echohl Function     | echon "%s" | '
+                    'echohl None         | echon "("  | '
+                    'echohl jediFunction | echon "%s" | '
+                    'echohl jediFat      | echon "%s" | '
+                    'echohl jediFunction | echon "%s" | '
+                    'echohl None         | echon ")"'
+                    % (spaces, signatures[0].call_name,
+                       left + ', ' if left else '',
+                       center, ', ' + right if right else ''))
+    else:
+        vim_command('                      echon "%s" | '
+                    'echohl Function     | echon "%s" | '
+                    'echohl None         | echon "(%s)"'
+                    % (spaces, signatures[0].call_name, text))
+
+
+@_check_jedi_availability(show_error=True)
+@catch_and_print_exceptions
+def rename():
+    if not int(vim.eval('a:0')):
+        # Need to save the cursor position before insert mode
+        cursor = vim.current.window.cursor
+        changenr = vim.eval('changenr()')  # track undo tree
+        vim_command('augroup jedi_rename')
+        vim_command('autocmd InsertLeave <buffer> call jedi#rename'
+                    '({}, {}, {})'.format(cursor[0], cursor[1], changenr))
+        vim_command('augroup END')
+
+        vim_command("let s:jedi_replace_orig = expand('<cword>')")
+        vim_command('normal! diw')
+        vim_command('startinsert')
+
+    else:
+        # Remove autocommand.
+        vim_command('autocmd! jedi_rename InsertLeave')
+
+        args = vim.eval('a:000')
+        cursor = tuple(int(x) for x in args[:2])
+        changenr = args[2]
+
+        # Get replacement, if there is something on the cursor.
+        # This won't be the case when the user ends insert mode right away,
+        # and `<cword>` would pick up the nearest word instead.
+        if vim_eval('getline(".")[getpos(".")[2]-1]') != ' ':
+            replace = vim_eval("expand('<cword>')")
+        else:
+            replace = None
+
+        vim_command('undo {}'.format(changenr))
+
+        vim.current.window.cursor = cursor
+
+        if replace:
+            return do_rename(replace)
+
+
+def rename_visual():
+    replace = vim.eval('input("Rename to: ")')
+    orig = vim.eval('getline(".")[(getpos("\'<")[2]-1):getpos("\'>")[2]]')
+    do_rename(replace, orig)
+
+
+def do_rename(replace, orig=None):
+    if not len(replace):
+        echo_highlight('No rename possible without name.')
+        return
+
+    if orig is None:
+        orig = vim_eval('s:jedi_replace_orig')
+
+    # Save original window / tab.
+    saved_tab = int(vim_eval('tabpagenr()'))
+    saved_win = int(vim_eval('winnr()'))
+
+    temp_rename = goto(mode="related_name", no_output=True)
+    # Sort the whole thing reverse (positions at the end of the line
+    # must be first, because they move the stuff before the position).
+    temp_rename = sorted(temp_rename, reverse=True,
+                         key=lambda x: (x.module_path, x.line, x.column))
+    buffers = set()
+    for r in temp_rename:
+        if r.in_builtin_module():
+            continue
+
+        if os.path.abspath(vim.current.buffer.name) != r.module_path:
+            result = new_buffer(r.module_path)
+            if not result:
+                echo_highlight("Jedi-vim: failed to create buffer window for {0}!".format(r.module_path))
+                continue
+
+        buffers.add(vim.current.buffer.name)
+
+        # Save view.
+        saved_view = vim_eval('string(winsaveview())')
+
+        # Replace original word.
+        vim.current.window.cursor = (r.line, r.column)
+        vim_command('normal! c{0:d}l{1}'.format(len(orig), replace))
+
+        # Restore view.
+        vim_command('call winrestview(%s)' % saved_view)
+
+    # Restore previous tab and window.
+    vim_command('tabnext {0:d}'.format(saved_tab))
+    vim_command('{0:d}wincmd w'.format(saved_win))
+
+    if len(buffers) > 1:
+        echo_highlight('Jedi did {0:d} renames in {1:d} buffers!'.format(
+            len(temp_rename), len(buffers)))
+    else:
+        echo_highlight('Jedi did {0:d} renames!'.format(len(temp_rename)))
+
+
+@_check_jedi_availability(show_error=True)
+@catch_and_print_exceptions
+def py_import():
+    # args are the same as for the :edit command
+    args = shsplit(vim.eval('a:args'))
+    import_path = args.pop()
+    text = 'import %s' % import_path
+    scr = jedi.Script(text, 1, len(text), '')
+    try:
+        completion = scr.goto_assignments()[0]
+    except IndexError:
+        echo_highlight('Cannot find %s in sys.path!' % import_path)
+    else:
+        if completion.in_builtin_module():
+            echo_highlight('%s is a builtin module.' % import_path)
+        else:
+            cmd_args = ' '.join([a.replace(' ', '\\ ') for a in args])
+            new_buffer(completion.module_path, cmd_args)
+
+
+@catch_and_print_exceptions
+def py_import_completions():
+    argl = vim.eval('a:argl')
+    try:
+        import jedi
+    except ImportError:
+        print('Pyimport completion requires jedi module: https://github.com/davidhalter/jedi')
+        comps = []
+    else:
+        text = 'import %s' % argl
+        script = jedi.Script(text, 1, len(text), '')
+        comps = ['%s%s' % (argl, c.complete) for c in script.completions()]
+    vim.command("return '%s'" % '\n'.join(comps))
+
+
+@catch_and_print_exceptions
+def new_buffer(path, options='', using_tagstack=False):
+    # options are what you can to edit the edit options
+    if int(vim_eval('g:jedi#use_tabs_not_buffers')) == 1:
+        _tabnew(path, options)
+    elif not vim_eval('g:jedi#use_splits_not_buffers') in [1, '1']:
+        user_split_option = vim_eval('g:jedi#use_splits_not_buffers')
+        split_options = {
+            'top': 'topleft split',
+            'left': 'topleft vsplit',
+            'right': 'botright vsplit',
+            'bottom': 'botright split',
+            'winwidth': 'vs'
+        }
+        if (user_split_option == 'winwidth' and
+                vim.current.window.width <= 2 * int(vim_eval(
+                    "&textwidth ? &textwidth : 80"))):
+            split_options['winwidth'] = 'sp'
+        if user_split_option not in split_options:
+            print('Unsupported value for g:jedi#use_splits_not_buffers: {0}. '
+                  'Valid options are: {1}.'.format(
+                      user_split_option, ', '.join(split_options.keys())))
+        else:
+            vim_command(split_options[user_split_option] + " %s" % escape_file_path(path))
+    else:
+        if int(vim_eval("!&hidden && &modified")) == 1:
+            if vim_eval("bufname('%')") is None:
+                echo_highlight('Cannot open a new buffer, use `:set hidden` or save your buffer')
+                return False
+            else:
+                vim_command('w')
+        if using_tagstack:
+            return True
+        vim_command('edit %s %s' % (options, escape_file_path(path)))
+    # sometimes syntax is being disabled and the filetype not set.
+    if int(vim_eval('!exists("g:syntax_on")')) == 1:
+        vim_command('syntax enable')
+    if int(vim_eval("&filetype != 'python'")) == 1:
+        vim_command('set filetype=python')
+    return True
+
+
+@catch_and_print_exceptions
+def _tabnew(path, options=''):
+    """
+    Open a file in a new tab or switch to an existing one.
+
+    :param options: `:tabnew` options, read vim help.
+    """
+    path = os.path.abspath(path)
+    if int(vim_eval('has("gui")')) == 1:
+        vim_command('tab drop %s %s' % (options, escape_file_path(path)))
+        return
+
+    for tab_nr in range(int(vim_eval("tabpagenr('$')"))):
+        for buf_nr in vim_eval("tabpagebuflist(%i + 1)" % tab_nr):
+            buf_nr = int(buf_nr) - 1
+            try:
+                buf_path = vim.buffers[buf_nr].name
+            except (LookupError, ValueError):
+                # Just do good old asking for forgiveness.
+                # don't know why this happens :-)
+                pass
+            else:
+                if buf_path == path:
+                    # tab exists, just switch to that tab
+                    vim_command('tabfirst | tabnext %i' % (tab_nr + 1))
+                    # Goto the buffer's window.
+                    vim_command('exec bufwinnr(%i) . " wincmd w"' % (buf_nr + 1))
+                    break
+        else:
+            continue
+        break
+    else:
+        # tab doesn't exist, add a new one.
+        vim_command('tabnew %s' % escape_file_path(path))
+
+
+def escape_file_path(path):
+    return path.replace(' ', r'\ ')
+
+
+def print_to_stdout(level, str_out):
+    print(str_out)
diff --git a/vim-plugins/bundle/jedi-vim/plugin/jedi.vim b/vim-plugins/bundle/jedi-vim/plugin/jedi.vim
new file mode 100644
index 0000000..e224014
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/plugin/jedi.vim
@@ -0,0 +1,38 @@
+"jedi-vim - Omni Completion for python in vim
+" Maintainer: David Halter <davidhalter88@gmail.com>
+"
+" This part of the software is just the vim interface. The really big deal is
+" the Jedi Python library.
+
+if get(g:, 'jedi#auto_vim_configuration', 1)
+    " jedi-vim doesn't work in compatible mode (vim script syntax problems)
+    if &compatible
+        " vint: -ProhibitSetNoCompatible
+        set nocompatible
+        " vint: +ProhibitSetNoCompatible
+    endif
+
+    " jedi-vim really needs, otherwise jedi-vim cannot start.
+    filetype plugin on
+
+    " Change completeopt, but only if it has Vim's default value.
+    let s:save_completeopt=&completeopt
+    set completeopt&
+    let s:default_completeopt=&completeopt
+    let &completeopt=s:save_completeopt
+    if s:default_completeopt == &completeopt
+        set completeopt=menuone,longest,preview
+    endif
+
+    if len(mapcheck('<C-c>', 'i')) == 0
+        inoremap <C-c> <ESC>
+    endif
+endif
+
+" Pyimport command
+command! -nargs=1 -complete=custom,jedi#py_import_completions Pyimport :call jedi#py_import(<q-args>)
+
+command! -nargs=0 -bar JediDebugInfo call jedi#debug_info()
+command! -nargs=0 -bang JediClearCache call jedi#clear_cache(<bang>0)
+
+" vim: set et ts=4:
diff --git a/vim-plugins/bundle/jedi-vim/pytest.ini b/vim-plugins/bundle/jedi-vim/pytest.ini
new file mode 100644
index 0000000..16700c3
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+# Ignore all files
+norecursedirs = *
diff --git a/vim-plugins/bundle/jedi-vim/test/completions.vim b/vim-plugins/bundle/jedi-vim/test/completions.vim
new file mode 100644
index 0000000..60cafbe
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/test/completions.vim
@@ -0,0 +1,63 @@
+let g:jedi#completions_command = 'X'
+source plugin/jedi.vim
+
+describe 'completions'
+    before
+        new
+        set filetype=python
+    end
+
+    after
+        bd!
+    end
+
+    it 'smart import'
+        exec "normal ifrom os "
+        Expect getline('.') == 'from os import '
+    end
+
+    it 'no smart import after space'
+        exec "normal! ifrom os "
+        exec "normal  a "
+        Expect getline('.') == 'from os  '
+    end
+
+    it 'import'
+        " X is the completion command
+        normal oimporX
+        Expect getline('.') == 'import'
+        normal a subproX
+        Expect getline('.') == 'import subprocess'
+    end
+
+    it 'exception'
+        normal oIndentationErrX
+        Expect getline('.') == 'IndentationError'
+        normal a().filenaX
+        Expect getline('.') == 'IndentationError().filename'
+    end
+
+    it 'dot_open'
+        normal oraisX ImpXErrX()
+        Expect getline('.') == 'raise ImportError()'
+    end
+
+    it 'cycling through entries'
+        " testing select_first doesn't seem to work in ex mode
+        execute "normal oraise impX\<C-n>\<C-n>\<C-n>"
+        Expect getline('.') == 'raise ImportWarning'
+        let g:jedi#popup_select_first = 0
+        execute "normal oraise impX\<C-n>\<C-n>\<C-n>"
+        Expect getline('.') == 'raise ImportWarning'
+        let g:jedi#popup_select_first = 1
+
+        " -longest completes the first one
+        set completeopt -=longest
+        execute "normal oraise baseX"
+        Expect getline('.') == 'raise BaseException'
+        set completeopt +=longest
+
+    end
+end
+
+" vim: et:ts=4:sw=4
diff --git a/vim-plugins/bundle/jedi-vim/test/completions_disabled.vim b/vim-plugins/bundle/jedi-vim/test/completions_disabled.vim
new file mode 100644
index 0000000..37b7346
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/test/completions_disabled.vim
@@ -0,0 +1,21 @@
+let g:jedi#completions_command = 'X'
+let g:jedi#completions_enabled = 0
+source plugin/jedi.vim
+
+describe 'completions_disabled'
+    before
+        new
+        set filetype=python
+    end
+
+    after
+        bd!
+    end
+
+    it 'typing'
+        normal oraise ImportErrX
+        Expect getline('.') == 'raise ImportErrX'
+    end
+end
+
+" vim: et:ts=4:sw=4
diff --git a/vim-plugins/bundle/jedi-vim/test/documentation.vim b/vim-plugins/bundle/jedi-vim/test/documentation.vim
new file mode 100644
index 0000000..119e360
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/test/documentation.vim
@@ -0,0 +1,31 @@
+source plugin/jedi.vim
+
+describe 'documentation docstrings'
+    before
+        set filetype=python
+    end
+
+    after
+        bd!
+        bd!
+    end
+
+    it 'simple'
+        put = 'ImportError'
+        normal GK
+        Expect bufname('%') == "'__doc__'"
+        Expect &filetype == 'rst'
+        let content = join(getline(1,'$'), "\n")
+        Expect stridx(content, "Import can't find module") > 0
+        normal K
+        Expect bufname('%') == ''
+    end
+
+    it 'no documentation'
+        put = 'x = 2'
+        normal o<ESC>GK
+        Expect bufname('%') == ''
+    end
+end
+
+" vim: et:ts=4:sw=4
diff --git a/vim-plugins/bundle/jedi-vim/test/goto.vim b/vim-plugins/bundle/jedi-vim/test/goto.vim
new file mode 100644
index 0000000..b65a1c7
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/test/goto.vim
@@ -0,0 +1,217 @@
+let mapleader = '\'
+source plugin/jedi.vim
+source test/utils.vim
+
+describe 'goto_simple'
+    before
+        new  " open a new split
+        set filetype=python
+        put =[
+        \   'def a(): pass',
+        \   'b = a',
+        \   'c = b',
+        \ ]
+        normal! ggdd
+        normal! G$
+        Expect line('.') == 3
+    end
+
+    after
+        bd!
+    end
+
+    it 'goto_definitions'
+        silent normal \d
+        Expect line('.') == 1
+        "Expect col('.') == 5  " not working yet.
+    end
+
+    it 'goto_assignments'
+        silent normal \g
+        Expect line('.') == 2
+        Expect col('.') == 1
+
+        " cursor before `=` means that it stays there.
+        silent normal \g
+        Expect line('.') == 2
+        Expect col('.') == 1
+
+        " going to the last line changes it.
+        normal! $
+        silent normal \g
+        Expect line('.') == 1
+        Expect col('.') == 5
+    end
+end
+
+
+describe 'goto_with_tabs'
+    before
+        set filetype=python
+        let g:jedi#use_tabs_not_buffers = 1
+    end
+
+    after
+        bd!
+        bd!
+    end
+
+    it 'follow_import'
+        put = ['import subprocess', 'subprocess']
+        silent normal G\g
+        Expect getline('.') == 'import subprocess'
+        Expect line('.') == 2
+        Expect col('.') == 8
+
+        silent normal G\d
+        Expect CurrentBufferIsModule('subprocess') == 1
+        Expect line('.') == 1
+        Expect col('.') == 1
+        Expect tabpagenr('$') == 2
+        Expect winnr('$') == 1
+        tabprevious
+        Expect bufname('%') == ''
+    end
+
+    it 'multi_definitions'
+        " This used to behave differently. Now we don't have any real multi
+        " definitions.
+
+        " put = ['import tokenize']
+        " silent normal G$\d
+        " Expect CurrentBufferIsModule('tokenize') == 1
+        " Expect CurrentBufferIsModule('token') == 0
+        " execute "normal \<CR>"
+        " Expect tabpagenr('$') == 2
+        " Expect winnr('$') == 1
+        " Expect CurrentBufferIsModule('token') == 1
+
+        " bd
+        " silent normal G$\d
+        " execute "normal j\<CR>"
+        " Expect tabpagenr('$') == 2
+        " Expect winnr('$') == 1
+        " Expect CurrentBufferIsModule('tokenize') == 1
+    end
+end
+
+
+describe 'goto_with_buffers'
+    before
+        set filetype=python
+        let g:jedi#use_tabs_not_buffers = 0
+    end
+
+    after
+        bd!
+        bd!
+        set nohidden
+    end
+
+    it 'no_new_tabs'
+        put = ['import os']
+        normal G$
+        call jedi#goto_assignments()
+        python jedi_vim.goto()
+        Expect CurrentBufferIsModule('os') == 0
+        " Without hidden, it's not possible to open a new buffer, when the old
+        " one is not saved.
+        set hidden
+        call jedi#goto_assignments()
+        Expect CurrentBufferIsModule('os') == 1
+        Expect winnr('$') == 1
+        Expect tabpagenr('$') == 1
+        Expect line('.') == 1
+        Expect col('.') == 1
+    end
+
+    it 'multi_definitions'
+        " set hidden
+        " put = ['import tokenize']
+        " silent normal G$\d
+        " Expect CurrentBufferIsModule('tokenize') == 0
+        " Expect CurrentBufferIsModule('token') == 0
+        " execute "normal \<CR>"
+        " Expect tabpagenr('$') == 1
+        " Expect winnr('$') == 1
+        " Expect CurrentBufferIsModule('token') == 1
+
+        " bd
+        " silent normal G$\d
+        " execute "normal j\<CR>"
+        " Expect tabpagenr('$') == 1
+        " Expect winnr('$') == 1
+        " Expect CurrentBufferIsModule('tokenize') == 1
+    end
+end
+
+
+
+describe 'goto_with_splits'
+    before
+        set filetype=python
+        let g:jedi#use_splits_not_buffers = 'left'
+    end
+
+    after
+        bd!
+        bd!
+    end
+
+    it 'follow_import'
+        put = ['import subprocess', 'subprocess']
+        silent normal G\g
+        Expect getline('.') == 'import subprocess'
+        Expect line('.') == 2
+        Expect col('.') == 8
+
+        silent normal G\d
+        Expect CurrentBufferIsModule('subprocess') == 1
+        Expect line('.') == 1
+        Expect col('.') == 1
+        Expect winnr('$') == 2
+        wincmd l
+        Expect bufname('%') == ''
+    end
+
+end
+
+
+describe 'goto_wildignore'
+    before
+        set filetype=python
+        set wildignore=*,with\ spaces,*.pyc
+        set hidden
+        let g:jedi#use_tag_stack = 1
+        let g:jedi#use_tabs_not_buffers = 0
+        " Need to use splits for code coverage in new_buffer()
+        let g:jedi#use_splits_not_buffers = 1
+
+        put = ['from subprocess import Popen', 'Popen']
+        Expect CurrentBufferIsModule('subprocess') == 0
+        silent normal G
+    end
+
+    after
+        bd!
+        bd!
+        set wildignore&vim
+    end
+
+    it 'restores_wildignore'
+        let before = &wildignore
+        call jedi#goto()
+        Expect getline('.') =~ 'Popen'
+        Expect &wildignore == before
+    end
+
+    it 'not_using_tagstack'
+        let g:jedi#use_tag_stack = 0
+        call jedi#goto()
+        Expect CurrentBufferIsModule('subprocess') == 1
+        Expect getline('.') =~ 'Popen'
+    end
+end
+
+
+" vim: et:ts=4:sw=4
diff --git a/vim-plugins/bundle/jedi-vim/test/pyimport.vim b/vim-plugins/bundle/jedi-vim/test/pyimport.vim
new file mode 100644
index 0000000..098113c
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/test/pyimport.vim
@@ -0,0 +1,32 @@
+source plugin/jedi.vim
+source test/utils.vim
+
+describe 'pyimport'
+    before
+        let g:jedi#use_tabs_not_buffers = 1
+    end
+
+    after
+        bd!
+        bd!
+    end
+
+    it 'open_tab'
+        Pyimport os 
+        Expect CurrentBufferIsModule('os') == 1
+        Pyimport subprocess 
+        Expect CurrentBufferIsModule('subprocess') == 1
+        " the empty tab is sometimes also a tab
+        Expect tabpagenr('$') >= 2
+    end
+
+    it 'completion'
+        " don't know how to test this directly
+        "execute "Pyimport subproc\<Tab>"
+        "Expect CurrentBufferIsModule('subprocess') == 1
+
+        Expect jedi#py_import_completions('subproc', 0, 0) == 'subprocess'
+        Expect jedi#py_import_completions('subprocess', 0, 0) == 'subprocess'
+        Expect jedi#py_import_completions('zip', 0, 0) == "zipfile\nzipimport"
+    end
+end
diff --git a/vim-plugins/bundle/jedi-vim/test/signatures.vim b/vim-plugins/bundle/jedi-vim/test/signatures.vim
new file mode 100644
index 0000000..c1525f6
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/test/signatures.vim
@@ -0,0 +1,130 @@
+source plugin/jedi.vim
+
+describe 'signatures'
+    before
+        set filetype=python
+    end
+
+    after
+        bd!
+        bd!
+    end
+
+    it 'simple'
+        normal oabs( 
+        " equals doautocmd CursorMovedI
+        Python jedi_vim.show_call_signatures()
+
+        Expect getline(1) == '=`=jedi=0, =`=   (*_*number*_*) =`=jedi=`='
+
+        doautocmd InsertLeave
+        Expect getline(1) == ''
+    end
+
+    it 'multiple buffers'
+        set hidden
+        new
+        setfiletype python
+        redir => autocmds
+        autocmd jedi_call_signatures * <buffer>
+        redir END
+        Expect autocmds =~# 'jedi_call_signatures'
+        buffer #
+        redir => autocmds
+        autocmd jedi_call_signatures * <buffer>
+        redir END
+        Expect autocmds =~# 'jedi_call_signatures'
+        bd!
+    end
+
+    it 'simple after CursorHoldI with only parenthesis'
+        noautocmd normal o
+        doautocmd CursorHoldI
+        noautocmd normal iabs( 
+        doautocmd CursorHoldI
+        Expect getline(1) == '=`=jedi=0, =`=   (*_*number*_*) =`=jedi=`='
+    end
+
+    it 'no signature'
+        normal ostr 
+        Python jedi_vim.show_call_signatures()
+        Expect getline(1, '$') == ['', 'str ']
+    end
+
+    it 'signatures disabled'
+        let g:jedi#show_call_signatures = 0
+
+        normal ostr( 
+        Python jedi_vim.show_call_signatures()
+        Expect getline(1, '$') == ['', 'str( ']
+
+        let g:jedi#show_call_signatures = 1
+    end
+
+    it 'command line simple'
+        let g:jedi#show_call_signatures = 2
+        call jedi#configure_call_signatures()
+
+        normal oabs( 
+        redir => msg
+        Python jedi_vim.show_call_signatures()
+        redir END
+        Expect msg == "\nabs(number)"
+
+        redir => msg
+        doautocmd InsertLeave 
+        redir END
+        Expect msg == "\n"
+
+        normal Sdef foo(a, b): pass
+        normal ofoo(a, b, c, 
+        redir => msg
+        Python jedi_vim.show_call_signatures()
+        redir END
+        Expect msg == "\nfoo(a, b)"
+    end
+
+    it 'command line truncation'
+        let g:jedi#show_call_signatures = 2
+        call jedi#configure_call_signatures()
+
+        function! Signature()
+            redir => msg
+            Python jedi_vim.show_call_signatures()
+            redir END
+            return msg
+        endfunction
+
+        let funcname = repeat('a', &columns - 30)
+        put = 'def '.funcname.'(arg1, arg2, arg3, a, b, c):'
+        put = '    pass'
+        execute "normal o".funcname."( "
+        Expect Signature() == "\n".funcname."(arg1, …)"
+
+        normal sarg1, 
+        Expect Signature() == "\n".funcname."(…, arg2, …)"
+
+        normal sarg2, arg3, 
+        Expect Signature() == "\n".funcname."(…, a, b, c)"
+
+        normal sa, b, 
+        Expect Signature() == "\n".funcname."(…, c)"
+
+        g/^/d
+        put = 'def '.funcname.'('.repeat('b', 20).', arg2):'
+        put = '    pass'
+        execute "normal o".funcname."( "
+        Expect Signature() == "\n".funcname."(…)"
+    end
+
+    it 'command line no signature'
+        let g:jedi#show_call_signatures = 2
+        call jedi#configure_call_signatures()
+
+        normal ostr 
+        redir => msg
+        Python jedi_vim.show_call_signatures()
+        redir END
+        Expect msg == "\n"
+    end
+end
diff --git a/vim-plugins/bundle/jedi-vim/test/utils.vim b/vim-plugins/bundle/jedi-vim/test/utils.vim
new file mode 100644
index 0000000..5ad2a1d
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/test/utils.vim
@@ -0,0 +1,11 @@
+function! CurrentBufferIsModule(module_name)
+    return EndsWith(bufname('%'), a:module_name.'.py')
+endfunction
+
+
+function EndsWith(string, end)
+    let l:should = len(a:string) - strlen(a:end)
+    return l:should == stridx(a:string, a:end, should)
+endfunction
+
+" vim: et:ts=4:sw=4
diff --git a/vim-plugins/bundle/jedi-vim/test_integration.py b/vim-plugins/bundle/jedi-vim/test_integration.py
new file mode 100644
index 0000000..d47e06b
--- /dev/null
+++ b/vim-plugins/bundle/jedi-vim/test_integration.py
@@ -0,0 +1,2 @@
+def test_integration(case, monkeypatch, pytestconfig):
+    case.run()
diff --git a/vim-plugins/bundle/nerdtree-git-plugin/README.md b/vim-plugins/bundle/nerdtree-git-plugin/README.md
new file mode 100644
index 0000000..fafff83
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree-git-plugin/README.md
@@ -0,0 +1,75 @@
+nerdtree-git-plugin
+===================
+
+A plugin of NERDTree showing git status flags. Works with the **LATEST** version of NERDTree.
+
+The original project [git-nerdtree](https://github.com/Xuyuanp/git-nerdtree) will not be maintained any longer.
+
+
+![Imgur](http://i.imgur.com/jSCwGjU.gif?1)
+
+## Installation
+
+For Pathogen
+
+`git clone https://github.com/Xuyuanp/nerdtree-git-plugin.git ~/.vim/bundle/nerdtree-git-plugin`
+
+Now reload the `vim`
+
+For Vundle
+
+`Plugin 'scrooloose/nerdtree'`
+
+`Plugin 'Xuyuanp/nerdtree-git-plugin'`
+
+For NeoBundle
+
+`NeoBundle 'scrooloose/nerdtree'`
+
+`NeoBundle 'Xuyuanp/nerdtree-git-plugin'`
+
+For Plug
+
+`Plug 'scrooloose/nerdtree'`
+
+`Plug 'Xuyuanp/nerdtree-git-plugin'`
+
+## FAQ
+
+> Got error message like `Error detected while processing function
+177[2]..178[22]..181[7]..144[9]..142[36]..238[4]..NERDTreeGitStatusRefreshListener[2]..NERDTreeGitStatusRefresh:
+line 6:
+E484: Can't open file /tmp/vZEZ6gM/1` while nerdtree opening in fish, how to resolve this problem?
+
+This was because that vim couldn't execute `system` function in `fish`. Add `set shell=sh` in your vimrc.
+
+This issue has been fixed.
+
+> How to config custom symbols?
+
+Use this variable to change symbols.
+
+	```vimscript
+	let g:NERDTreeIndicatorMapCustom = {
+	    \ "Modified"  : "✹",
+	    \ "Staged"    : "✚",
+	    \ "Untracked" : "✭",
+	    \ "Renamed"   : "➜",
+	    \ "Unmerged"  : "�",
+	    \ "Deleted"   : "✖",
+	    \ "Dirty"     : "✗",
+	    \ "Clean"     : "✔︎",
+        \ 'Ignored'   : '☒',
+	    \ "Unknown"   : "?"
+	    \ }
+	 ```
+
+> How to show `ignored` status?
+
+`let g:NERDTreeShowIgnoredStatus = 1` (a heavy feature may cost much more time)
+
+## Credits
+
+*  [scrooloose](https://github.com/scrooloose): Open API for me.
+*  [git_nerd](https://github.com/swerner/git_nerd): Where my idea comes from.
+*  [PickRelated](https://github.com/PickRelated): Add custom indicators & Review code.
diff --git a/vim-plugins/bundle/nerdtree-git-plugin/nerdtree_plugin/git_status.vim b/vim-plugins/bundle/nerdtree-git-plugin/nerdtree_plugin/git_status.vim
new file mode 100644
index 0000000..f0d0981
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree-git-plugin/nerdtree_plugin/git_status.vim
@@ -0,0 +1,359 @@
+" ============================================================================
+" File:        git_status.vim
+" Description: plugin for NERD Tree that provides git status support
+" Maintainer:  Xuyuan Pang <xuyuanp at gmail dot com>
+" Last Change: 4 Apr 2014
+" License:     This program is free software. It comes without any warranty,
+"              to the extent permitted by applicable law. You can redistribute
+"              it and/or modify it under the terms of the Do What The Fuck You
+"              Want To Public License, Version 2, as published by Sam Hocevar.
+"              See http://sam.zoy.org/wtfpl/COPYING for more details.
+" ============================================================================
+if exists('g:loaded_nerdtree_git_status')
+    finish
+endif
+let g:loaded_nerdtree_git_status = 1
+
+if !exists('g:NERDTreeShowGitStatus')
+    let g:NERDTreeShowGitStatus = 1
+endif
+
+if g:NERDTreeShowGitStatus == 0
+    finish
+endif
+
+if !exists('g:NERDTreeMapNextHunk')
+    let g:NERDTreeMapNextHunk = ']c'
+endif
+
+if !exists('g:NERDTreeMapPrevHunk')
+    let g:NERDTreeMapPrevHunk = '[c'
+endif
+
+if !exists('g:NERDTreeUpdateOnWrite')
+    let g:NERDTreeUpdateOnWrite = 1
+endif
+
+if !exists('g:NERDTreeUpdateOnCursorHold')
+    let g:NERDTreeUpdateOnCursorHold = 1
+endif
+
+if !exists('g:NERDTreeShowIgnoredStatus')
+    let g:NERDTreeShowIgnoredStatus = 0
+endif
+
+if !exists('s:NERDTreeIndicatorMap')
+    let s:NERDTreeIndicatorMap = {
+                \ 'Modified'  : '✹',
+                \ 'Staged'    : '✚',
+                \ 'Untracked' : '✭',
+                \ 'Renamed'   : '➜',
+                \ 'Unmerged'  : '�',
+                \ 'Deleted'   : '✖',
+                \ 'Dirty'     : '✗',
+                \ 'Clean'     : '✔︎',
+                \ 'Ignored'   : '☒',
+                \ 'Unknown'   : '?'
+                \ }
+endif
+
+
+function! NERDTreeGitStatusRefreshListener(event)
+    if !exists('b:NOT_A_GIT_REPOSITORY')
+        call g:NERDTreeGitStatusRefresh()
+    endif
+    let l:path = a:event.subject
+    let l:flag = g:NERDTreeGetGitStatusPrefix(l:path)
+    call l:path.flagSet.clearFlags('git')
+    if l:flag !=# ''
+        call l:path.flagSet.addFlag('git', l:flag)
+    endif
+endfunction
+
+" FUNCTION: g:NERDTreeGitStatusRefresh() {{{2
+" refresh cached git status
+function! g:NERDTreeGitStatusRefresh()
+    let b:NERDTreeCachedGitFileStatus = {}
+    let b:NERDTreeCachedGitDirtyDir   = {}
+    let b:NOT_A_GIT_REPOSITORY        = 1
+
+    let l:root = b:NERDTree.root.path.str()
+    let l:gitcmd = 'git -c color.status=false status -s'
+    if g:NERDTreeShowIgnoredStatus
+        let l:gitcmd = l:gitcmd . ' --ignored'
+    endif
+    if exists('g:NERDTreeGitStatusIgnoreSubmodules')
+        let l:gitcmd = l:gitcmd . ' --ignore-submodules'
+        if g:NERDTreeGitStatusIgnoreSubmodules ==# 'all' || g:NERDTreeGitStatusIgnoreSubmodules ==# 'dirty' || g:NERDTreeGitStatusIgnoreSubmodules ==# 'untracked'
+            let l:gitcmd = l:gitcmd . '=' . g:NERDTreeGitStatusIgnoreSubmodules
+        endif
+    endif
+    let l:statusesStr = system(l:gitcmd . ' ' . l:root)
+    let l:statusesSplit = split(l:statusesStr, '\n')
+    if l:statusesSplit != [] && l:statusesSplit[0] =~# 'fatal:.*'
+        let l:statusesSplit = []
+        return
+    endif
+    let b:NOT_A_GIT_REPOSITORY = 0
+
+    for l:statusLine in l:statusesSplit
+        " cache git status of files
+        let l:pathStr = substitute(l:statusLine, '...', '', '')
+        let l:pathSplit = split(l:pathStr, ' -> ')
+        if len(l:pathSplit) == 2
+            call s:NERDTreeCacheDirtyDir(l:pathSplit[0])
+            let l:pathStr = l:pathSplit[1]
+        else
+            let l:pathStr = l:pathSplit[0]
+        endif
+        let l:pathStr = s:NERDTreeTrimDoubleQuotes(l:pathStr)
+        if l:pathStr =~# '\.\./.*'
+            continue
+        endif
+        let l:statusKey = s:NERDTreeGetFileGitStatusKey(l:statusLine[0], l:statusLine[1])
+        let b:NERDTreeCachedGitFileStatus[fnameescape(l:pathStr)] = l:statusKey
+
+        if l:statusKey == 'Ignored'
+            if isdirectory(l:pathStr)
+                let b:NERDTreeCachedGitDirtyDir[fnameescape(l:pathStr)] = l:statusKey
+            endif
+        else
+            call s:NERDTreeCacheDirtyDir(l:pathStr)
+        endif
+    endfor
+endfunction
+
+function! s:NERDTreeCacheDirtyDir(pathStr)
+    " cache dirty dir
+    let l:dirtyPath = s:NERDTreeTrimDoubleQuotes(a:pathStr)
+    if l:dirtyPath =~# '\.\./.*'
+        return
+    endif
+    let l:dirtyPath = substitute(l:dirtyPath, '/[^/]*$', '/', '')
+    while l:dirtyPath =~# '.\+/.*' && has_key(b:NERDTreeCachedGitDirtyDir, fnameescape(l:dirtyPath)) == 0
+        let b:NERDTreeCachedGitDirtyDir[fnameescape(l:dirtyPath)] = 'Dirty'
+        let l:dirtyPath = substitute(l:dirtyPath, '/[^/]*/$', '/', '')
+    endwhile
+endfunction
+
+function! s:NERDTreeTrimDoubleQuotes(pathStr)
+    let l:toReturn = substitute(a:pathStr, '^"', '', '')
+    let l:toReturn = substitute(l:toReturn, '"$', '', '')
+    return l:toReturn
+endfunction
+
+" FUNCTION: g:NERDTreeGetGitStatusPrefix(path) {{{2
+" return the indicator of the path
+" Args: path
+let s:GitStatusCacheTimeExpiry = 2
+let s:GitStatusCacheTime = 0
+function! g:NERDTreeGetGitStatusPrefix(path)
+    if localtime() - s:GitStatusCacheTime > s:GitStatusCacheTimeExpiry
+        let s:GitStatusCacheTime = localtime()
+        call g:NERDTreeGitStatusRefresh()
+    endif
+    let l:pathStr = a:path.str()
+    let l:cwd = b:NERDTree.root.path.str() . a:path.Slash()
+    if nerdtree#runningWindows()
+        let l:pathStr = a:path.WinToUnixPath(l:pathStr)
+        let l:cwd = a:path.WinToUnixPath(l:cwd)
+    endif
+    let l:pathStr = substitute(l:pathStr, fnameescape(l:cwd), '', '')
+    let l:statusKey = ''
+    if a:path.isDirectory
+        let l:statusKey = get(b:NERDTreeCachedGitDirtyDir, fnameescape(l:pathStr . '/'), '')
+    else
+        let l:statusKey = get(b:NERDTreeCachedGitFileStatus, fnameescape(l:pathStr), '')
+    endif
+    return s:NERDTreeGetIndicator(l:statusKey)
+endfunction
+
+" FUNCTION: s:NERDTreeGetCWDGitStatus() {{{2
+" return the indicator of cwd
+function! g:NERDTreeGetCWDGitStatus()
+    if b:NOT_A_GIT_REPOSITORY
+        return ''
+    elseif b:NERDTreeCachedGitDirtyDir == {} && b:NERDTreeCachedGitFileStatus == {}
+        return s:NERDTreeGetIndicator('Clean')
+    endif
+    return s:NERDTreeGetIndicator('Dirty')
+endfunction
+
+function! s:NERDTreeGetIndicator(statusKey)
+    if exists('g:NERDTreeIndicatorMapCustom')
+        let l:indicator = get(g:NERDTreeIndicatorMapCustom, a:statusKey, '')
+        if l:indicator !=# ''
+            return l:indicator
+        endif
+    endif
+    let l:indicator = get(s:NERDTreeIndicatorMap, a:statusKey, '')
+    if l:indicator !=# ''
+        return l:indicator
+    endif
+    return ''
+endfunction
+
+function! s:NERDTreeGetFileGitStatusKey(us, them)
+    if a:us ==# '?' && a:them ==# '?'
+        return 'Untracked'
+    elseif a:us ==# ' ' && a:them ==# 'M'
+        return 'Modified'
+    elseif a:us =~# '[MAC]'
+        return 'Staged'
+    elseif a:us ==# 'R'
+        return 'Renamed'
+    elseif a:us ==# 'U' || a:them ==# 'U' || a:us ==# 'A' && a:them ==# 'A' || a:us ==# 'D' && a:them ==# 'D'
+        return 'Unmerged'
+    elseif a:them ==# 'D'
+        return 'Deleted'
+    elseif a:us ==# '!'
+        return 'Ignored'
+    else
+        return 'Unknown'
+    endif
+endfunction
+
+" FUNCTION: s:jumpToNextHunk(node) {{{2
+function! s:jumpToNextHunk(node)
+    let l:position = search('\[[^{RO}].*\]', '')
+    if l:position
+        call nerdtree#echo('Jump to next hunk ')
+    endif
+endfunction
+
+" FUNCTION: s:jumpToPrevHunk(node) {{{2
+function! s:jumpToPrevHunk(node)
+    let l:position = search('\[[^{RO}].*\]', 'b')
+    if l:position
+        call nerdtree#echo('Jump to prev hunk ')
+    endif
+endfunction
+
+" Function: s:SID()   {{{2
+function s:SID()
+    if !exists('s:sid')
+        let s:sid = matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$')
+    endif
+    return s:sid
+endfun
+
+" FUNCTION: s:NERDTreeGitStatusKeyMapping {{{2
+function! s:NERDTreeGitStatusKeyMapping()
+    let l:s = '<SNR>' . s:SID() . '_'
+
+    call NERDTreeAddKeyMap({
+        \ 'key': g:NERDTreeMapNextHunk,
+        \ 'scope': 'Node',
+        \ 'callback': l:s.'jumpToNextHunk',
+        \ 'quickhelpText': 'Jump to next git hunk' })
+
+    call NERDTreeAddKeyMap({
+        \ 'key': g:NERDTreeMapPrevHunk,
+        \ 'scope': 'Node',
+        \ 'callback': l:s.'jumpToPrevHunk',
+        \ 'quickhelpText': 'Jump to prev git hunk' })
+
+endfunction
+
+augroup nerdtreegitplugin
+    autocmd CursorHold * silent! call s:CursorHoldUpdate()
+augroup END
+" FUNCTION: s:CursorHoldUpdate() {{{2
+function! s:CursorHoldUpdate()
+    if g:NERDTreeUpdateOnCursorHold != 1
+        return
+    endif
+
+    if !g:NERDTree.IsOpen()
+        return
+    endif
+
+    " Do not update when a special buffer is selected
+    if !empty(&l:buftype)
+        return
+    endif
+
+    let l:winnr = winnr()
+    let l:altwinnr = winnr('#')
+
+    call g:NERDTree.CursorToTreeWin()
+    call b:NERDTree.root.refreshFlags()
+    call NERDTreeRender()
+
+    exec l:altwinnr . 'wincmd w'
+    exec l:winnr . 'wincmd w'
+endfunction
+
+augroup nerdtreegitplugin
+    autocmd BufWritePost * call s:FileUpdate(expand('%:p'))
+augroup END
+" FUNCTION: s:FileUpdate(fname) {{{2
+function! s:FileUpdate(fname)
+    if g:NERDTreeUpdateOnWrite != 1
+        return
+    endif
+
+    if !g:NERDTree.IsOpen()
+        return
+    endif
+
+    let l:winnr = winnr()
+    let l:altwinnr = winnr('#')
+
+    call g:NERDTree.CursorToTreeWin()
+    let l:node = b:NERDTree.root.findNode(g:NERDTreePath.New(a:fname))
+    if l:node == {}
+        return
+    endif
+    call l:node.refreshFlags()
+    let l:node = l:node.parent
+    while !empty(l:node)
+        call l:node.refreshDirFlags()
+        let l:node = l:node.parent
+    endwhile
+
+    call NERDTreeRender()
+
+    exec l:altwinnr . 'wincmd w'
+    exec l:winnr . 'wincmd w'
+endfunction
+
+augroup AddHighlighting
+    autocmd FileType nerdtree call s:AddHighlighting()
+augroup END
+function! s:AddHighlighting()
+    let l:synmap = {
+                \ 'NERDTreeGitStatusModified'    : s:NERDTreeGetIndicator('Modified'),
+                \ 'NERDTreeGitStatusStaged'      : s:NERDTreeGetIndicator('Staged'),
+                \ 'NERDTreeGitStatusUntracked'   : s:NERDTreeGetIndicator('Untracked'),
+                \ 'NERDTreeGitStatusRenamed'     : s:NERDTreeGetIndicator('Renamed'),
+                \ 'NERDTreeGitStatusIgnored'     : s:NERDTreeGetIndicator('Ignored'),
+                \ 'NERDTreeGitStatusDirDirty'    : s:NERDTreeGetIndicator('Dirty'),
+                \ 'NERDTreeGitStatusDirClean'    : s:NERDTreeGetIndicator('Clean')
+                \ }
+
+    for l:name in keys(l:synmap)
+        exec 'syn match ' . l:name . ' #' . escape(l:synmap[l:name], '~') . '# containedin=NERDTreeFlags'
+    endfor
+
+    hi def link NERDTreeGitStatusModified Special
+    hi def link NERDTreeGitStatusStaged Function
+    hi def link NERDTreeGitStatusRenamed Title
+    hi def link NERDTreeGitStatusUnmerged Label
+    hi def link NERDTreeGitStatusUntracked Comment
+    hi def link NERDTreeGitStatusDirDirty Tag
+    hi def link NERDTreeGitStatusDirClean DiffAdd
+    " TODO: use diff color
+    hi def link NERDTreeGitStatusIgnored DiffAdd
+endfunction
+
+function! s:SetupListeners()
+    call g:NERDTreePathNotifier.AddListener('init', 'NERDTreeGitStatusRefreshListener')
+    call g:NERDTreePathNotifier.AddListener('refresh', 'NERDTreeGitStatusRefreshListener')
+    call g:NERDTreePathNotifier.AddListener('refreshFlags', 'NERDTreeGitStatusRefreshListener')
+endfunction
+
+if g:NERDTreeShowGitStatus && executable('git')
+    call s:NERDTreeGitStatusKeyMapping()
+    call s:SetupListeners()
+endif
diff --git a/vim-plugins/bundle/nerdtree/CHANGELOG b/vim-plugins/bundle/nerdtree/CHANGELOG
new file mode 100644
index 0000000..3d377ab
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/CHANGELOG
@@ -0,0 +1,178 @@
+Next
+    - Update doc with already existing mapping variables (asnr) #699
+    - Fix the broken g:NERDTreeBookmarksSort setting (lifecrisis) #696
+    - Correct NERDTreeIgnore pattern in doc (cntoplolicon) #648
+    - Remove empty segments when splitting path (sooth-sayer) #574
+    - Suppress autocmds less agressively (wincent) #578 #691
+    - Add an Issues template to ask for more info initially.
+    - Fix markdown headers in readme (josephfrazier) #676
+    - Don't touch @o and @h registers when rendering
+    - Fix bug with files and directories with dollar signs (alegen) #649
+    - Reuse/reopen existing window trees where possible #244
+    - Remove NERDTree.previousBuf()
+    - Change color of arrow (Leeiio) #630
+    - Improved a tip in README.markdown (ggicci) #628
+    - Shorten delete confimration of empty directory to 'y' (mikeperri) #530
+    - Fix API call to open directory tree in window (devm33) #533
+    - Change default arrows on non-Windows platforms (gwilk) #546
+    - Update to README - combine cd and git clone (zwhitchcox) #584
+    - Update to README - Tip: start NERDTree when vim starts (therealplato) #593 
+    - Escape filename when moving an open buffer (zacharyvoase) #595
+    - Fixed incorrect :helptags command in README (curran) #619
+    - Fixed incomplete escaping of folder arrows (adityanatraj) #548
+    - Added NERDTreeCascadeSingleChildDir option (juanibiapina) #558
+    - Replace strchars() with backward compatible workaround.
+    - Add support for copy command in Windows (SkylerLipthay) #231
+    - Fixed typo in README.markdown - :Helptags -> :helptags
+    - Rename "primary" and "secondary" trees to "tab" and "window" trees.
+    - Move a bunch of buffer level variables into the NERDTree and UI classes.
+    - Display cascading dirs on one line to save vertical/horizontal space (@matt-gardner: brainstorming/testing)
+    - Remove the old style UI - Remove 'NERDTreeDirArrows' option.
+    - On windows default to + and ~ for expand/collapse directory symbols.
+    - Lots more refactoring. Move a bunch of b: level vars into b:NERDTree and friends.
+
+5.0.0
+    - Refactor the code significantly:
+        * Break the classes out into their own files.
+        * Make the majority of the code OO - previously large parts were
+          effectively a tangle of "global" methods.
+    - Add an API to assign flags to nodes. This allows VCS plugins like
+      https://github.com/Xuyuanp/nerdtree-git-plugin to exist. Thanks to
+      Xuyuanp for helping design/test/build said API.
+    - add 'scope' argument to the key map API see :help NERDTreeAddKeyMap()
+    - add magic [[dir]] and [[file]] flags to NERDTreeIgnore
+    - add support for custom path filters. See :help NERDTreeAddPathFilter()
+    - add path listener API. See :help NERDTreePathListenerAPI.
+    - expand the fs menu functionality to list file properties (PhilRunninger,
+      apbarrero, JESii)
+    - make bookmarks work with `~` home shortcuts (hiberabyss)
+    - show OSX specific fsmenu options in regular vim on mac (evindor)
+    - make dir arrow icons configurable (PickRelated)
+    - optimise node sorting performance when opening large dirs (vtsang)
+    - make the root note render prettier by truncating it at a path slash (gcmt)
+    - remove NERDChristmasTree option - its always christmas now
+    - add "cascade" open and closing for dirs containing only another single
+      dir. See :help NERDTreeCascadeOpenSingleChildDir (pendulm)
+
+    Many other fixes, doc updates and contributions from:
+    actionshrimp
+    SchDen
+    egalpin
+    cperl82 - many small fixes
+    toiffel
+    WoLpH
+    handcraftedbits
+    devmanhinton
+    xiaodili
+    zhangoose
+    gastropoda
+    mixvin
+    alvan
+    lucascaton
+    kelaban
+    shanesmith
+    staeff
+    pendulm
+    stephenprater
+    franksort
+    agrussellknives
+    AndrewRadev
+    Twinside
+
+4.2.0
+    - Add NERDTreeDirArrows option to make the UI use pretty arrow chars
+      instead of the old +~| chars to define the tree structure (sickill)
+    - shift the syntax highlighting out into its own syntax file (gnap)
+    - add some mac specific options to the filesystem menu - for macvim
+      only (andersonfreitas)
+    - Add NERDTreeMinimalUI option to remove some non functional parts of the
+      nerdtree ui (camthompson)
+    - tweak the behaviour of :NERDTreeFind - see :help :NERDTreeFind for the
+      new behaviour (benjamingeiger)
+    - if no name is given to :Bookmark, make it default to the name of the
+      target file/dir (minyoung)
+    - use 'file' completion when doing copying, create, and move
+      operations (EvanDotPro)
+    - lots of misc bug fixes (paddyoloughlin, sdewald, camthompson, Vitaly
+      Bogdanov, AndrewRadev, mathias, scottstvnsn, kml, wycats, me RAWR!)
+
+4.1.0
+    features:
+    - NERDTreeFind to reveal the node for the current buffer in the tree,
+      see |NERDTreeFind|. This effectively merges the FindInNERDTree plugin (by
+      Doug McInnes) into the script.
+    - make NERDTreeQuitOnOpen apply to the t/T keymaps too. Thanks to Stefan
+      Ritter and Rémi Prévost.
+    - truncate the root node if wider than the tree window. Thanks to Victor
+      Gonzalez.
+
+    bugfixes:
+    - really fix window state restoring
+    - fix some win32 path escaping issues. Thanks to Stephan Baumeister, Ricky,
+      jfilip1024, and Chris Chambers
+
+4.0.0
+    - add a new programmable menu system (see :help NERDTreeMenu).
+    - add new APIs to add menus/menu-items to the menu system as well as
+      custom key mappings to the NERD tree buffer (see :help NERDTreeAPI).
+    - removed the old API functions
+    - added a mapping to maximize/restore the size of nerd tree window, thanks
+      to Guillaume Duranceau for the patch. See :help NERDTree-A for details.
+
+    - fix a bug where secondary nerd trees (netrw hijacked trees) and
+      NERDTreeQuitOnOpen didnt play nicely, thanks to Curtis Harvey.
+    - fix a bug where the script ignored directories whose name ended in a dot,
+      thanks to Aggelos Orfanakos for the patch.
+    - fix a bug when using the x mapping on the tree root, thanks to Bryan
+      Venteicher for the patch.
+    - fix a bug where the cursor position/window size of the nerd tree buffer
+      wasnt being stored on closing the window, thanks to Richard Hart.
+    - fix a bug where NERDTreeMirror would mirror the wrong tree
+
+3.1.1
+    - fix a bug where a non-listed no-name buffer was getting created every
+      time the tree windows was created, thanks to Derek Wyatt and owen1
+    - make <CR> behave the same as the 'o' mapping
+    - some helptag fixes in the doc, thanks strull
+    - fix a bug when using :set nohidden and opening a file where the previous
+      buf was modified. Thanks iElectric
+    - other minor fixes
+
+3.1.0
+    New features:
+    - add mappings to open files in a vsplit, see :help NERDTree-s and :help
+      NERDTree-gs
+    - make the statusline for the nerd tree window default to something
+      hopefully more useful. See :help 'NERDTreeStatusline'
+    Bugfixes:
+    - make the hijack netrw functionality work when vim is started with "vim
+      <some dir>" (thanks to Alf Mikula for the patch).
+    - fix a bug where the CWD wasnt being changed for some operations even when
+      NERDTreeChDirMode==2 (thanks to Lucas S. Buchala)
+    - add -bar to all the nerd tree :commands so they can chain with other
+      :commands (thanks to tpope)
+    - fix bugs when ignorecase was set (thanks to nach)
+    - fix a bug with the relative path code (thanks to nach)
+    - fix a bug where doing a :cd would cause :NERDTreeToggle to fail (thanks nach)
+
+
+3.0.1
+    Bugfixes:
+    - fix bugs with :NERDTreeToggle and :NERDTreeMirror when 'hidden
+      was not set
+    - fix a bug where :NERDTree <path> would fail if <path> was relative and
+      didnt start with a ./ or ../  Thanks to James Kanze.
+    - make the q mapping work with secondary (:e <dir>  style) trees,
+      thanks to jamessan
+    - fix a bunch of small bugs with secondary trees
+
+    More insane refactoring.
+
+3.0.0
+    - hijack netrw so that doing an :edit <directory>  will put a NERD tree in
+      the window rather than a netrw browser. See :help 'NERDTreeHijackNetrw'
+    - allow sharing of trees across tabs, see :help :NERDTreeMirror
+    - remove "top" and "bottom" as valid settings for NERDTreeWinPos
+    - change the '<tab>' mapping to 'i'
+    - change the 'H' mapping to 'I'
+    - lots of refactoring
diff --git a/vim-plugins/bundle/nerdtree/LICENCE b/vim-plugins/bundle/nerdtree/LICENCE
new file mode 100644
index 0000000..8b1a9d8
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/LICENCE
@@ -0,0 +1,13 @@
+           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                   Version 2, December 2004
+
+Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+Everyone is permitted to copy and distribute verbatim or modified
+copies of this license document, and changing it is allowed as long
+as the name is changed.
+
+           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. You just DO WHAT THE FUCK YOU WANT TO.
diff --git a/vim-plugins/bundle/nerdtree/README.markdown b/vim-plugins/bundle/nerdtree/README.markdown
new file mode 100644
index 0000000..19b841b
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/README.markdown
@@ -0,0 +1,136 @@
+The NERD Tree
+=============
+
+Intro
+-----
+
+The NERD tree allows you to explore your filesystem and to open files and
+directories. It presents the filesystem to you in the form of a tree which you
+manipulate with the keyboard and/or mouse. It also allows you to perform
+simple filesystem operations.
+
+The following features and functionality are provided by the NERD tree:
+
+  * Files and directories are displayed in a hierarchical tree structure
+  * Different highlighting is provided for the following types of nodes:
+    * files
+    * directories
+    * sym-links
+    * windows .lnk files
+    * read-only files
+    * executable files
+  * Many (customisable) mappings are provided to manipulate the tree:
+    * Mappings to open/close/explore directory nodes
+    * Mappings to open files in new/existing windows/tabs
+    * Mappings to change the current root of the tree
+    * Mappings to navigate around the tree
+    * ...
+  * Directories and files can be bookmarked.
+  * Most NERD tree navigation can also be done with the mouse
+  * Filtering of tree content (can be toggled at runtime)
+    * custom file filters to prevent e.g. vim backup files being displayed
+    * optional displaying of hidden files (. files)
+    * files can be "turned off" so that only directories are displayed
+  * The position and size of the NERD tree window can be customised
+  * The order in which the nodes in the tree are listed can be customised.
+  * A model of your filesystem is created/maintained as you explore it. This
+    has several advantages:
+    * All filesystem information is cached and is only re-read on demand
+    * If you revisit a part of the tree that you left earlier in your
+      session, the directory nodes will be opened/closed as you left them
+  * The script remembers the cursor position and window position in the NERD
+    tree so you can toggle it off (or just close the tree window) and then
+    reopen it (with NERDTreeToggle) the NERD tree window will appear exactly
+    as you left it
+  * You can have a separate NERD tree for each tab, share trees across tabs,
+    or a mix of both.
+  * By default the script overrides the default file browser (netrw), so if
+    you :edit a directory a (slightly modified) NERD tree will appear in the
+    current window
+  * A programmable menu system is provided (simulates right clicking on a node)
+    * one default menu plugin is provided to perform basic filesystem
+      operations (create/delete/move/copy files/directories)
+  * There's an API for adding your own keymappings
+
+Installation
+------------
+
+#### [pathogen.vim](https://github.com/tpope/vim-pathogen)
+
+    git clone https://github.com/scrooloose/nerdtree.git ~/.vim/bundle/nerdtree
+
+Then reload vim, run `:helptags ~/.vim/bundle/nerdtree/doc/`, and check out `:help NERD_tree.txt`.
+
+
+#### [apt-vim](https://github.com/egalpin/apt-vim)
+
+    apt-vim install -y https://github.com/scrooloose/nerdtree.git
+
+
+
+Faq
+---
+
+> Is there any support for `git` flags?
+
+Yes, install [nerdtree-git-plugin](https://github.com/Xuyuanp/nerdtree-git-plugin).
+
+---
+
+> Can I have the nerdtree on every tab automatically?
+
+Nope. If this is something you want then chances are you aren't using tabs and
+buffers as they were intended to be used. Read this
+http://stackoverflow.com/questions/102384/using-vims-tabs-like-buffers
+
+If you are interested in this behaviour then consider [vim-nerdtree-tabs](https://github.com/jistr/vim-nerdtree-tabs)
+
+---
+> How can I open a NERDTree automatically when vim starts up?
+
+Stick this in your vimrc: `autocmd vimenter * NERDTree`
+
+---
+> How can I open a NERDTree automatically when vim starts up if no files were specified?
+
+Stick this in your vimrc:
+
+    autocmd StdinReadPre * let s:std_in=1
+    autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
+
+Note: Now start vim with plain `vim`, not `vim .`
+
+---
+> How can I open NERDTree automatically when vim starts up on opening a directory?
+
+    autocmd StdinReadPre * let s:std_in=1
+    autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | endif
+
+This window is tab-specific, meaning it's used by all windows in the tab. This trick also prevents NERDTree from hiding when first selecting a file.
+
+---
+> How can I map a specific key or shortcut to open NERDTree?
+
+Stick this in your vimrc to open NERDTree with `Ctrl+n` (you can set whatever key you want):
+
+    map <C-n> :NERDTreeToggle<CR>
+
+---
+> How can I close vim if the only window left open is a NERDTree?
+
+Stick this in your vimrc:
+
+    autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
+
+---
+> Can I have different highlighting for different file extensions?
+
+See here: https://github.com/scrooloose/nerdtree/issues/433#issuecomment-92590696
+
+---
+> How can I change default arrows?
+
+Use these variables in your vimrc. Note that below are default arrow symbols
+
+    let g:NERDTreeDirArrowExpandable = 'â–¸'
+    let g:NERDTreeDirArrowCollapsible = 'â–¾'
diff --git a/vim-plugins/bundle/nerdtree/autoload/nerdtree.vim b/vim-plugins/bundle/nerdtree/autoload/nerdtree.vim
new file mode 100644
index 0000000..7c5db89
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/autoload/nerdtree.vim
@@ -0,0 +1,172 @@
+if exists("g:loaded_nerdtree_autoload")
+    finish
+endif
+let g:loaded_nerdtree_autoload = 1
+
+function! nerdtree#version()
+    return '5.0.0'
+endfunction
+
+" SECTION: General Functions {{{1
+"============================================================
+
+"FUNCTION: nerdtree#checkForBrowse(dir) {{{2
+"inits a window tree in the current buffer if appropriate
+function! nerdtree#checkForBrowse(dir)
+    if !isdirectory(a:dir)
+        return
+    endif
+
+    if s:reuseWin(a:dir)
+        return
+    endif
+
+    call g:NERDTreeCreator.CreateWindowTree(a:dir)
+endfunction
+
+"FUNCTION: s:reuseWin(dir) {{{2
+"finds a NERDTree buffer with root of dir, and opens it.
+function! s:reuseWin(dir) abort
+    let path = g:NERDTreePath.New(fnamemodify(a:dir, ":p"))
+
+    for i in range(1, bufnr("$"))
+        unlet! nt
+        let nt = getbufvar(i, "NERDTree")
+        if empty(nt)
+            continue
+        endif
+
+        if nt.isWinTree() && nt.root.path.equals(path)
+            call nt.setPreviousBuf(bufnr("#"))
+            exec "buffer " . i
+            return 1
+        endif
+    endfor
+
+    return 0
+endfunction
+
+" FUNCTION: nerdtree#completeBookmarks(A,L,P) {{{2
+" completion function for the bookmark commands
+function! nerdtree#completeBookmarks(A,L,P)
+    return filter(g:NERDTreeBookmark.BookmarkNames(), 'v:val =~# "^' . a:A . '"')
+endfunction
+
+"FUNCTION: nerdtree#compareNodes(dir) {{{2
+function! nerdtree#compareNodes(n1, n2)
+    return a:n1.path.compareTo(a:n2.path)
+endfunction
+
+"FUNCTION: nerdtree#compareNodesBySortKey(n1, n2) {{{2
+function! nerdtree#compareNodesBySortKey(n1, n2)
+    if a:n1.path.getSortKey() <# a:n2.path.getSortKey()
+        return -1
+    elseif a:n1.path.getSortKey() ># a:n2.path.getSortKey()
+        return 1
+    else
+        return 0
+    endif
+endfunction
+
+" FUNCTION: nerdtree#deprecated(func, [msg]) {{{2
+" Issue a deprecation warning for a:func. If a second arg is given, use this
+" as the deprecation message
+function! nerdtree#deprecated(func, ...)
+    let msg = a:0 ? a:func . ' ' . a:1 : a:func . ' is deprecated'
+
+    if !exists('s:deprecationWarnings')
+        let s:deprecationWarnings = {}
+    endif
+    if !has_key(s:deprecationWarnings, a:func)
+        let s:deprecationWarnings[a:func] = 1
+        echomsg msg
+    endif
+endfunction
+
+" FUNCTION: nerdtree#exec(cmd) {{{2
+" Same as :exec cmd but with eventignore set for the duration
+" to disable the autocommands used by NERDTree (BufEnter,
+" BufLeave and VimEnter)
+function! nerdtree#exec(cmd)
+    let old_ei = &ei
+    set ei=BufEnter,BufLeave,VimEnter
+    exec a:cmd
+    let &ei = old_ei
+endfunction
+
+" FUNCTION: nerdtree#has_opt(options, name) {{{2
+function! nerdtree#has_opt(options, name)
+    return has_key(a:options, a:name) && a:options[a:name] == 1
+endfunction
+
+" FUNCTION: nerdtree#loadClassFiles() {{{2
+function! nerdtree#loadClassFiles()
+    runtime lib/nerdtree/path.vim
+    runtime lib/nerdtree/menu_controller.vim
+    runtime lib/nerdtree/menu_item.vim
+    runtime lib/nerdtree/key_map.vim
+    runtime lib/nerdtree/bookmark.vim
+    runtime lib/nerdtree/tree_file_node.vim
+    runtime lib/nerdtree/tree_dir_node.vim
+    runtime lib/nerdtree/opener.vim
+    runtime lib/nerdtree/creator.vim
+    runtime lib/nerdtree/flag_set.vim
+    runtime lib/nerdtree/nerdtree.vim
+    runtime lib/nerdtree/ui.vim
+    runtime lib/nerdtree/event.vim
+    runtime lib/nerdtree/notifier.vim
+endfunction
+
+" FUNCTION: nerdtree#postSourceActions() {{{2
+function! nerdtree#postSourceActions()
+    call g:NERDTreeBookmark.CacheBookmarks(1)
+    call nerdtree#ui_glue#createDefaultBindings()
+
+    "load all nerdtree plugins
+    runtime! nerdtree_plugin/**/*.vim
+endfunction
+
+"FUNCTION: nerdtree#runningWindows(dir) {{{2
+function! nerdtree#runningWindows()
+    return has("win16") || has("win32") || has("win64")
+endfunction
+
+" SECTION: View Functions {{{1
+"============================================================
+
+"FUNCTION: nerdtree#echo  {{{2
+"A wrapper for :echo. Appends 'NERDTree:' on the front of all messages
+"
+"Args:
+"msg: the message to echo
+function! nerdtree#echo(msg)
+    redraw
+    echomsg "NERDTree: " . a:msg
+endfunction
+
+"FUNCTION: nerdtree#echoError {{{2
+"Wrapper for nerdtree#echo, sets the message type to errormsg for this message
+"Args:
+"msg: the message to echo
+function! nerdtree#echoError(msg)
+    echohl errormsg
+    call nerdtree#echo(a:msg)
+    echohl normal
+endfunction
+
+"FUNCTION: nerdtree#echoWarning {{{2
+"Wrapper for nerdtree#echo, sets the message type to warningmsg for this message
+"Args:
+"msg: the message to echo
+function! nerdtree#echoWarning(msg)
+    echohl warningmsg
+    call nerdtree#echo(a:msg)
+    echohl normal
+endfunction
+
+"FUNCTION: nerdtree#renderView {{{2
+function! nerdtree#renderView()
+    call b:NERDTree.render()
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/nerdtree/autoload/nerdtree/ui_glue.vim b/vim-plugins/bundle/nerdtree/autoload/nerdtree/ui_glue.vim
new file mode 100644
index 0000000..2478fd3
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/autoload/nerdtree/ui_glue.vim
@@ -0,0 +1,644 @@
+if exists("g:loaded_nerdtree_ui_glue_autoload")
+    finish
+endif
+let g:loaded_nerdtree_ui_glue_autoload = 1
+
+" FUNCTION: nerdtree#ui_glue#createDefaultBindings() {{{1
+function! nerdtree#ui_glue#createDefaultBindings()
+    let s = '<SNR>' . s:SID() . '_'
+
+    call NERDTreeAddKeyMap({ 'key': '<MiddleRelease>', 'scope': "all", 'callback': s."handleMiddleMouse" })
+    call NERDTreeAddKeyMap({ 'key': '<LeftRelease>', 'scope': "all", 'callback': s."handleLeftClick" })
+    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "DirNode", 'callback': s."activateDirNode" })
+    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "FileNode", 'callback': s."activateFileNode" })
+    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "Bookmark", 'callback': s."activateBookmark" })
+    call NERDTreeAddKeyMap({ 'key': '<2-LeftMouse>', 'scope': "all", 'callback': s."activateAll" })
+
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "DirNode", 'callback': s."activateDirNode" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "FileNode", 'callback': s."activateFileNode" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "Bookmark", 'callback': s."activateBookmark" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapActivateNode, 'scope': "all", 'callback': s."activateAll" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenSplit, 'scope': "Node", 'callback': s."openHSplit" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenVSplit, 'scope': "Node", 'callback': s."openVSplit" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenSplit, 'scope': "Bookmark", 'callback': s."openHSplit" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenVSplit, 'scope': "Bookmark", 'callback': s."openVSplit" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': "Node", 'callback': s."previewNodeCurrent" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewVSplit, 'scope': "Node", 'callback': s."previewNodeVSplit" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewSplit, 'scope': "Node", 'callback': s."previewNodeHSplit" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreview, 'scope': "Bookmark", 'callback': s."previewNodeCurrent" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewVSplit, 'scope': "Bookmark", 'callback': s."previewNodeVSplit" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapPreviewSplit, 'scope': "Bookmark", 'callback': s."previewNodeHSplit" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenRecursively, 'scope': "DirNode", 'callback': s."openNodeRecursively" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapUpdir, 'scope': "all", 'callback': s."upDirCurrentRootClosed" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapUpdirKeepOpen, 'scope': "all", 'callback': s."upDirCurrentRootOpen" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapChangeRoot, 'scope': "Node", 'callback': s."chRoot" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapChdir, 'scope': "Node", 'callback': s."chCwd" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapQuit, 'scope': "all", 'callback': s."closeTreeWindow" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCWD, 'scope': "all", 'callback': "nerdtree#ui_glue#chRootCwd" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefreshRoot, 'scope': "all", 'callback': s."refreshRoot" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapRefresh, 'scope': "Node", 'callback': s."refreshCurrent" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapHelp, 'scope': "all", 'callback': s."displayHelp" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleZoom, 'scope': "all", 'callback': s."toggleZoom" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleHidden, 'scope': "all", 'callback': s."toggleShowHidden" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFilters, 'scope': "all", 'callback': s."toggleIgnoreFilter" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleFiles, 'scope': "all", 'callback': s."toggleShowFiles" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapToggleBookmarks, 'scope': "all", 'callback': s."toggleShowBookmarks" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseDir, 'scope': "Node", 'callback': s."closeCurrentDir" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapCloseChildren, 'scope': "DirNode", 'callback': s."closeChildren" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapMenu, 'scope': "Node", 'callback': s."showMenu" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpParent, 'scope': "Node", 'callback': s."jumpToParent" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpFirstChild, 'scope': "Node", 'callback': s."jumpToFirstChild" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpLastChild, 'scope': "Node", 'callback': s."jumpToLastChild" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpRoot, 'scope': "all", 'callback': s."jumpToRoot" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpNextSibling, 'scope': "Node", 'callback': s."jumpToNextSibling" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapJumpPrevSibling, 'scope': "Node", 'callback': s."jumpToPrevSibling" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': "Node", 'callback': s."openInNewTab" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': "Node", 'callback': s."openInNewTabSilent" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTab, 'scope': "Bookmark", 'callback': s."openInNewTab" })
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenInTabSilent, 'scope': "Bookmark", 'callback': s."openInNewTabSilent" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapOpenExpl, 'scope': "DirNode", 'callback': s."openExplorer" })
+
+    call NERDTreeAddKeyMap({ 'key': g:NERDTreeMapDeleteBookmark, 'scope': "Bookmark", 'callback': s."deleteBookmark" })
+endfunction
+
+
+"SECTION: Interface bindings {{{1
+"============================================================
+
+"FUNCTION: s:activateAll() {{{1
+"handle the user activating the updir line
+function! s:activateAll()
+    if getline(".") ==# g:NERDTreeUI.UpDirLine()
+        return nerdtree#ui_glue#upDir(0)
+    endif
+endfunction
+
+"FUNCTION: s:activateDirNode() {{{1
+"handle the user activating a tree node
+function! s:activateDirNode(node)
+    call a:node.activate()
+endfunction
+
+"FUNCTION: s:activateFileNode() {{{1
+"handle the user activating a tree node
+function! s:activateFileNode(node)
+    call a:node.activate({'reuse': 'all', 'where': 'p'})
+endfunction
+
+"FUNCTION: s:activateBookmark() {{{1
+"handle the user activating a bookmark
+function! s:activateBookmark(bm)
+    call a:bm.activate(b:NERDTree, !a:bm.path.isDirectory ? {'where': 'p'} : {})
+endfunction
+
+" FUNCTION: nerdtree#ui_glue#bookmarkNode(name) {{{1
+" Associate the current node with the given name
+function! nerdtree#ui_glue#bookmarkNode(...)
+    let currentNode = g:NERDTreeFileNode.GetSelected()
+    if currentNode != {}
+        let name = a:1
+        if empty(name)
+            let name = currentNode.path.getLastPathComponent(0)
+        endif
+        try
+            call currentNode.bookmark(name)
+            call b:NERDTree.render()
+        catch /^NERDTree.IllegalBookmarkNameError/
+            call nerdtree#echo("bookmark names must not contain spaces")
+        endtry
+    else
+        call nerdtree#echo("select a node first")
+    endif
+endfunction
+
+" FUNCTION: s:chCwd(node) {{{1
+function! s:chCwd(node)
+    try
+        call a:node.path.changeToDir()
+    catch /^NERDTree.PathChangeError/
+        call nerdtree#echoWarning("could not change cwd")
+    endtry
+endfunction
+
+" FUNCTION: s:chRoot(node) {{{1
+" changes the current root to the selected one
+function! s:chRoot(node)
+    call b:NERDTree.changeRoot(a:node)
+endfunction
+
+" FUNCTION: s:nerdtree#ui_glue#chRootCwd() {{{1
+" changes the current root to CWD
+function! nerdtree#ui_glue#chRootCwd()
+    try
+        let cwd = g:NERDTreePath.New(getcwd())
+    catch /^NERDTree.InvalidArgumentsError/
+        call nerdtree#echo("current directory does not exist.")
+        return
+    endtry
+    if cwd.str() == g:NERDTreeFileNode.GetRootForTab().path.str()
+       return
+    endif
+    call s:chRoot(g:NERDTreeDirNode.New(cwd, b:NERDTree))
+endfunction
+
+" FUNCTION: nnerdtree#ui_glue#clearBookmarks(bookmarks) {{{1
+function! nerdtree#ui_glue#clearBookmarks(bookmarks)
+    if a:bookmarks ==# ''
+        let currentNode = g:NERDTreeFileNode.GetSelected()
+        if currentNode != {}
+            call currentNode.clearBookmarks()
+        endif
+    else
+        for name in split(a:bookmarks, ' ')
+            let bookmark = g:NERDTreeBookmark.BookmarkFor(name)
+            call bookmark.delete()
+        endfor
+    endif
+    call b:NERDTree.root.refresh()
+    call b:NERDTree.render()
+endfunction
+
+" FUNCTION: s:closeChildren(node) {{{1
+" closes all childnodes of the current node
+function! s:closeChildren(node)
+    call a:node.closeChildren()
+    call b:NERDTree.render()
+    call a:node.putCursorHere(0, 0)
+endfunction
+
+" FUNCTION: s:closeCurrentDir(node) {{{1
+" closes the parent dir of the current node
+function! s:closeCurrentDir(node)
+    let parent = a:node.parent
+    while g:NERDTreeCascadeOpenSingleChildDir && !parent.isRoot()
+        let childNodes = parent.getVisibleChildren()
+        if len(childNodes) == 1 && childNodes[0].path.isDirectory
+            let parent = parent.parent
+        else
+            break
+        endif
+    endwhile
+    if parent ==# {} || parent.isRoot()
+        call nerdtree#echo("cannot close tree root")
+    else
+        call parent.close()
+        call b:NERDTree.render()
+        call parent.putCursorHere(0, 0)
+    endif
+endfunction
+
+" FUNCTION: s:closeTreeWindow() {{{1
+" close the tree window
+function! s:closeTreeWindow()
+    if b:NERDTree.isWinTree() && b:NERDTree.previousBuf() != -1
+        exec "buffer " . b:NERDTree.previousBuf()
+    else
+        if winnr("$") > 1
+            call g:NERDTree.Close()
+        else
+            call nerdtree#echo("Cannot close last window")
+        endif
+    endif
+endfunction
+
+" FUNCTION: s:deleteBookmark(bm) {{{1
+" if the cursor is on a bookmark, prompt to delete
+function! s:deleteBookmark(bm)
+    echo  "Are you sure you wish to delete the bookmark:\n\"" . a:bm.name . "\" (yN):"
+
+    if  nr2char(getchar()) ==# 'y'
+        try
+            call a:bm.delete()
+            call b:NERDTree.root.refresh()
+            call b:NERDTree.render()
+            redraw
+        catch /^NERDTree/
+            call nerdtree#echoWarning("Could not remove bookmark")
+        endtry
+    else
+        call nerdtree#echo("delete aborted" )
+    endif
+
+endfunction
+
+" FUNCTION: s:displayHelp() {{{1
+" toggles the help display
+function! s:displayHelp()
+    call b:NERDTree.ui.toggleHelp()
+    call b:NERDTree.render()
+    call b:NERDTree.ui.centerView()
+endfunction
+
+" FUNCTION: s:findAndRevealPath() {{{1
+function! s:findAndRevealPath()
+    try
+        let p = g:NERDTreePath.New(expand("%:p"))
+    catch /^NERDTree.InvalidArgumentsError/
+        call nerdtree#echo("no file for the current buffer")
+        return
+    endtry
+
+    if p.isUnixHiddenPath()
+        let showhidden=g:NERDTreeShowHidden
+        let g:NERDTreeShowHidden = 1
+    endif
+
+    if !g:NERDTree.ExistsForTab()
+        try
+            let cwd = g:NERDTreePath.New(getcwd())
+        catch /^NERDTree.InvalidArgumentsError/
+            call nerdtree#echo("current directory does not exist.")
+            let cwd = p.getParent()
+        endtry
+
+        if p.isUnder(cwd)
+            call g:NERDTreeCreator.CreateTabTree(cwd.str())
+        else
+            call g:NERDTreeCreator.CreateTabTree(p.getParent().str())
+        endif
+    else
+        if !p.isUnder(g:NERDTreeFileNode.GetRootForTab().path)
+            if !g:NERDTree.IsOpen()
+                call g:NERDTreeCreator.ToggleTabTree('')
+            else
+                call g:NERDTree.CursorToTreeWin()
+            endif
+            call b:NERDTree.ui.setShowHidden(g:NERDTreeShowHidden)
+            call s:chRoot(g:NERDTreeDirNode.New(p.getParent(), b:NERDTree))
+        else
+            if !g:NERDTree.IsOpen()
+                call g:NERDTreeCreator.ToggleTabTree("")
+            endif
+        endif
+    endif
+    call g:NERDTree.CursorToTreeWin()
+    let node = b:NERDTree.root.reveal(p)
+    call b:NERDTree.render()
+    call node.putCursorHere(1,0)
+
+    if p.isUnixHiddenFile()
+        let g:NERDTreeShowHidden = showhidden
+    endif
+endfunction
+
+"FUNCTION: s:handleLeftClick() {{{1
+"Checks if the click should open the current node
+function! s:handleLeftClick()
+    let currentNode = g:NERDTreeFileNode.GetSelected()
+    if currentNode != {}
+
+        "the dir arrows are multibyte chars, and vim's string functions only
+        "deal with single bytes - so split the line up with the hack below and
+        "take the line substring manually
+        let line = split(getline(line(".")), '\zs')
+        let startToCur = ""
+        for i in range(0,len(line)-1)
+            let startToCur .= line[i]
+        endfor
+
+        if currentNode.path.isDirectory
+            if startToCur =~# g:NERDTreeUI.MarkupReg() && startToCur =~# '[+~'.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.'] \?$'
+                call currentNode.activate()
+                return
+            endif
+        endif
+
+        if (g:NERDTreeMouseMode ==# 2 && currentNode.path.isDirectory) || g:NERDTreeMouseMode ==# 3
+            let char = strpart(startToCur, strlen(startToCur)-1, 1)
+            if char !~# g:NERDTreeUI.MarkupReg()
+                if currentNode.path.isDirectory
+                    call currentNode.activate()
+                else
+                    call currentNode.activate({'reuse': 'all', 'where': 'p'})
+                endif
+                return
+            endif
+        endif
+    endif
+endfunction
+
+" FUNCTION: s:handleMiddleMouse() {{{1
+function! s:handleMiddleMouse()
+    let curNode = g:NERDTreeFileNode.GetSelected()
+    if curNode ==# {}
+        call nerdtree#echo("Put the cursor on a node first" )
+        return
+    endif
+
+    if curNode.path.isDirectory
+        call nerdtree#openExplorer(curNode)
+    else
+        call curNode.open({'where': 'h'})
+    endif
+endfunction
+
+" FUNCTION: s:jumpToChild(direction) {{{2
+" Args:
+" direction: 0 if going to first child, 1 if going to last
+function! s:jumpToChild(currentNode, direction)
+    if a:currentNode.isRoot()
+        return nerdtree#echo("cannot jump to " . (a:direction ? "last" : "first") .  " child")
+    end
+    let dirNode = a:currentNode.parent
+    let childNodes = dirNode.getVisibleChildren()
+
+    let targetNode = childNodes[0]
+    if a:direction
+        let targetNode = childNodes[len(childNodes) - 1]
+    endif
+
+    if targetNode.equals(a:currentNode)
+        let siblingDir = a:currentNode.parent.findOpenDirSiblingWithVisibleChildren(a:direction)
+        if siblingDir != {}
+            let indx = a:direction ? siblingDir.getVisibleChildCount()-1 : 0
+            let targetNode = siblingDir.getChildByIndex(indx, 1)
+        endif
+    endif
+
+    call targetNode.putCursorHere(1, 0)
+
+    call b:NERDTree.ui.centerView()
+endfunction
+
+
+" FUNCTION: nerdtree#ui_glue#invokeKeyMap(key) {{{1
+"this is needed since I cant figure out how to invoke dict functions from a
+"key map
+function! nerdtree#ui_glue#invokeKeyMap(key)
+    call g:NERDTreeKeyMap.Invoke(a:key)
+endfunction
+
+" FUNCTION: s:jumpToFirstChild() {{{1
+" wrapper for the jump to child method
+function! s:jumpToFirstChild(node)
+    call s:jumpToChild(a:node, 0)
+endfunction
+
+" FUNCTION: s:jumpToLastChild() {{{1
+" wrapper for the jump to child method
+function! s:jumpToLastChild(node)
+    call s:jumpToChild(a:node, 1)
+endfunction
+
+" FUNCTION: s:jumpToParent(node) {{{1
+" moves the cursor to the parent of the current node
+function! s:jumpToParent(node)
+    if !empty(a:node.parent)
+        call a:node.parent.putCursorHere(1, 0)
+        call b:NERDTree.ui.centerView()
+    else
+        call nerdtree#echo("cannot jump to parent")
+    endif
+endfunction
+
+" FUNCTION: s:jumpToRoot() {{{1
+" moves the cursor to the root node
+function! s:jumpToRoot()
+    call b:NERDTree.root.putCursorHere(1, 0)
+    call b:NERDTree.ui.centerView()
+endfunction
+
+" FUNCTION: s:jumpToNextSibling(node) {{{1
+function! s:jumpToNextSibling(node)
+    call s:jumpToSibling(a:node, 1)
+endfunction
+
+" FUNCTION: s:jumpToPrevSibling(node) {{{1
+function! s:jumpToPrevSibling(node)
+    call s:jumpToSibling(a:node, 0)
+endfunction
+
+" FUNCTION: s:jumpToSibling(currentNode, forward) {{{2
+" moves the cursor to the sibling of the current node in the given direction
+"
+" Args:
+" forward: 1 if the cursor should move to the next sibling, 0 if it should
+" move back to the previous sibling
+function! s:jumpToSibling(currentNode, forward)
+    let sibling = a:currentNode.findSibling(a:forward)
+
+    if !empty(sibling)
+        call sibling.putCursorHere(1, 0)
+        call b:NERDTree.ui.centerView()
+    endif
+endfunction
+
+" FUNCTION: nerdtree#ui_glue#openBookmark(name) {{{1
+" Open the Bookmark that has the specified name. This function provides the
+" implementation for the ":OpenBookmark" command.
+function! nerdtree#ui_glue#openBookmark(name)
+    try
+        let l:bookmark = g:NERDTreeBookmark.BookmarkFor(a:name)
+    catch /^NERDTree.BookmarkNotFoundError/
+        call nerdtree#echoError('bookmark "' . a:name . '" not found')
+        return
+    endtry
+    if l:bookmark.path.isDirectory
+        call l:bookmark.open(b:NERDTree)
+    else
+        call l:bookmark.open(b:NERDTree, {'where': 'p'})
+    endif
+endfunction
+
+" FUNCTION: s:openHSplit(target) {{{1
+function! s:openHSplit(target)
+    call a:target.activate({'where': 'h'})
+endfunction
+
+" FUNCTION: s:openVSplit(target) {{{1
+function! s:openVSplit(target)
+    call a:target.activate({'where': 'v'})
+endfunction
+
+" FUNCTION: s:openExplorer(node) {{{1
+function! s:openExplorer(node)
+    call a:node.openExplorer()
+endfunction
+
+" FUNCTION: s:openInNewTab(target) {{{1
+function! s:openInNewTab(target)
+    call a:target.activate({'where': 't'})
+endfunction
+
+" FUNCTION: s:openInNewTabSilent(target) {{{1
+function! s:openInNewTabSilent(target)
+    call a:target.activate({'where': 't', 'stay': 1})
+endfunction
+
+" FUNCTION: s:openNodeRecursively(node) {{{1
+function! s:openNodeRecursively(node)
+    call nerdtree#echo("Recursively opening node. Please wait...")
+    call a:node.openRecursively()
+    call b:NERDTree.render()
+    redraw
+    call nerdtree#echo("Recursively opening node. Please wait... DONE")
+endfunction
+
+"FUNCTION: s:previewNodeCurrent(node) {{{1
+function! s:previewNodeCurrent(node)
+    call a:node.open({'stay': 1, 'where': 'p', 'keepopen': 1})
+endfunction
+
+"FUNCTION: s:previewNodeHSplit(node) {{{1
+function! s:previewNodeHSplit(node)
+    call a:node.open({'stay': 1, 'where': 'h', 'keepopen': 1})
+endfunction
+
+"FUNCTION: s:previewNodeVSplit(node) {{{1
+function! s:previewNodeVSplit(node)
+    call a:node.open({'stay': 1, 'where': 'v', 'keepopen': 1})
+endfunction
+
+" FUNCTION: nerdtree#ui_glue#revealBookmark(name) {{{1
+" put the cursor on the node associate with the given name
+function! nerdtree#ui_glue#revealBookmark(name)
+    try
+        let targetNode = g:NERDTreeBookmark.GetNodeForName(a:name, 0, b:NERDTree)
+        call targetNode.putCursorHere(0, 1)
+    catch /^NERDTree.BookmarkNotFoundError/
+        call nerdtree#echo("Bookmark isnt cached under the current root")
+    endtry
+endfunction
+
+" FUNCTION: s:refreshRoot() {{{1
+" Reloads the current root. All nodes below this will be lost and the root dir
+" will be reloaded.
+function! s:refreshRoot()
+    call nerdtree#echo("Refreshing the root node. This could take a while...")
+    call b:NERDTree.root.refresh()
+    call b:NERDTree.render()
+    redraw
+    call nerdtree#echo("Refreshing the root node. This could take a while... DONE")
+endfunction
+
+" FUNCTION: s:refreshCurrent(node) {{{1
+" refreshes the root for the current node
+function! s:refreshCurrent(node)
+    let node = a:node
+    if !node.path.isDirectory
+        let node = node.parent
+    endif
+
+    call nerdtree#echo("Refreshing node. This could take a while...")
+    call node.refresh()
+    call b:NERDTree.render()
+    redraw
+    call nerdtree#echo("Refreshing node. This could take a while... DONE")
+endfunction
+
+" FUNCTION: nerdtree#ui_glue#setupCommands() {{{1
+function! nerdtree#ui_glue#setupCommands()
+    command! -n=? -complete=dir -bar NERDTree :call g:NERDTreeCreator.CreateTabTree('<args>')
+    command! -n=? -complete=dir -bar NERDTreeToggle :call g:NERDTreeCreator.ToggleTabTree('<args>')
+    command! -n=0 -bar NERDTreeClose :call g:NERDTree.Close()
+    command! -n=1 -complete=customlist,nerdtree#completeBookmarks -bar NERDTreeFromBookmark call g:NERDTreeCreator.CreateTabTree('<args>')
+    command! -n=0 -bar NERDTreeMirror call g:NERDTreeCreator.CreateMirror()
+    command! -n=0 -bar NERDTreeFind call s:findAndRevealPath()
+    command! -n=0 -bar NERDTreeFocus call NERDTreeFocus()
+    command! -n=0 -bar NERDTreeCWD call NERDTreeCWD()
+endfunction
+
+" Function: s:SID()   {{{1
+function s:SID()
+    if !exists("s:sid")
+        let s:sid = matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$')
+    endif
+    return s:sid
+endfun
+
+" FUNCTION: s:showMenu(node) {{{1
+function! s:showMenu(node)
+    let mc = g:NERDTreeMenuController.New(g:NERDTreeMenuItem.AllEnabled())
+    call mc.showMenu()
+endfunction
+
+" FUNCTION: s:toggleIgnoreFilter() {{{1
+function! s:toggleIgnoreFilter()
+    call b:NERDTree.ui.toggleIgnoreFilter()
+endfunction
+
+" FUNCTION: s:toggleShowBookmarks() {{{1
+function! s:toggleShowBookmarks()
+    call b:NERDTree.ui.toggleShowBookmarks()
+endfunction
+
+" FUNCTION: s:toggleShowFiles() {{{1
+function! s:toggleShowFiles()
+    call b:NERDTree.ui.toggleShowFiles()
+endfunction
+
+" FUNCTION: s:toggleShowHidden() {{{1
+" toggles the display of hidden files
+function! s:toggleShowHidden()
+    call b:NERDTree.ui.toggleShowHidden()
+endfunction
+
+" FUNCTION: s:toggleZoom() {{{1
+function! s:toggleZoom()
+    call b:NERDTree.ui.toggleZoom()
+endfunction
+
+"FUNCTION: nerdtree#ui_glue#upDir(keepState) {{{1
+"moves the tree up a level
+"
+"Args:
+"keepState: 1 if the current root should be left open when the tree is
+"re-rendered
+function! nerdtree#ui_glue#upDir(keepState)
+    let cwd = b:NERDTree.root.path.str({'format': 'UI'})
+    if cwd ==# "/" || cwd =~# '^[^/]..$'
+        call nerdtree#echo("already at top dir")
+    else
+        if !a:keepState
+            call b:NERDTree.root.close()
+        endif
+
+        let oldRoot = b:NERDTree.root
+
+        if empty(b:NERDTree.root.parent)
+            let path = b:NERDTree.root.path.getParent()
+            let newRoot = g:NERDTreeDirNode.New(path, b:NERDTree)
+            call newRoot.open()
+            call newRoot.transplantChild(b:NERDTree.root)
+            let b:NERDTree.root = newRoot
+        else
+            let b:NERDTree.root = b:NERDTree.root.parent
+        endif
+
+        if g:NERDTreeChDirMode ==# 2
+            call b:NERDTree.root.path.changeToDir()
+        endif
+
+        call b:NERDTree.render()
+        call oldRoot.putCursorHere(0, 0)
+    endif
+endfunction
+
+" FUNCTION: s:upDirCurrentRootOpen() {{{1
+function! s:upDirCurrentRootOpen()
+    call nerdtree#ui_glue#upDir(1)
+endfunction
+
+" FUNCTION: s:upDirCurrentRootClosed() {{{1
+function! s:upDirCurrentRootClosed()
+    call nerdtree#ui_glue#upDir(0)
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/nerdtree/doc/NERD_tree.txt b/vim-plugins/bundle/nerdtree/doc/NERD_tree.txt
new file mode 100644
index 0000000..ed4adc3
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/doc/NERD_tree.txt
@@ -0,0 +1,1271 @@
+*NERD_tree.txt*   A tree explorer plugin that owns your momma!
+
+
+
+    omg its ... ~
+
+    ________  ________   _   ____________  ____     __________  ____________~
+   /_  __/ / / / ____/  / | / / ____/ __ \/ __ \   /_  __/ __ \/ ____/ ____/~
+    / / / /_/ / __/    /  |/ / __/ / /_/ / / / /    / / / /_/ / __/ / __/   ~
+   / / / __  / /___   / /|  / /___/ _, _/ /_/ /    / / / _, _/ /___/ /___   ~
+  /_/ /_/ /_/_____/  /_/ |_/_____/_/ |_/_____/    /_/ /_/ |_/_____/_____/   ~
+
+
+                              Reference Manual~
+
+
+
+
+==============================================================================
+CONTENTS                                                   *NERDTree-contents*
+
+    1.Intro...................................|NERDTree|
+    2.Functionality provided..................|NERDTreeFunctionality|
+        2.1.Global commands...................|NERDTreeGlobalCommands|
+        2.2.Bookmarks.........................|NERDTreeBookmarks|
+            2.2.1.The bookmark table..........|NERDTreeBookmarkTable|
+            2.2.2.Bookmark commands...........|NERDTreeBookmarkCommands|
+            2.2.3.Invalid bookmarks...........|NERDTreeInvalidBookmarks|
+        2.3.NERD tree mappings................|NERDTreeMappings|
+        2.4.The NERD tree menu................|NERDTreeMenu|
+    3.Options.................................|NERDTreeOptions|
+        3.1.Option summary....................|NERDTreeOptionSummary|
+        3.2.Option details....................|NERDTreeOptionDetails|
+    4.The NERD tree API.......................|NERDTreeAPI|
+        4.1.Key map API.......................|NERDTreeKeymapAPI|
+        4.2.Menu API..........................|NERDTreeMenuAPI|
+        4.3.Menu API..........................|NERDTreeAddPathFilter()|
+        4.4.Path Listener API.................|NERDTreePathListenerAPI|
+    5.About...................................|NERDTreeAbout|
+    6.License.................................|NERDTreeLicense|
+
+==============================================================================
+1. Intro                                                            *NERDTree*
+
+What is this "NERD tree"??
+
+The NERD tree allows you to explore your filesystem and to open files and
+directories. It presents the filesystem to you in the form of a tree which you
+manipulate with the keyboard and/or mouse. It also allows you to perform
+simple filesystem operations.
+
+The following features and functionality are provided by the NERD tree:
+    * Files and directories are displayed in a hierarchical tree structure
+    * Different highlighting is provided for the following types of nodes:
+        * files
+        * directories
+        * sym-links
+        * windows .lnk files
+        * read-only files
+        * executable files
+    * Many (customisable) mappings are provided to manipulate the tree:
+        * Mappings to open/close/explore directory nodes
+        * Mappings to open files in new/existing windows/tabs
+        * Mappings to change the current root of the tree
+        * Mappings to navigate around the tree
+        * ...
+    * Directories and files can be bookmarked.
+    * Most NERD tree navigation can also be done with the mouse
+    * Filtering of tree content (can be toggled at runtime)
+        * custom file filters to prevent e.g. vim backup files being displayed
+        * optional displaying of hidden files (. files)
+        * files can be "turned off" so that only directories are displayed
+    * The position and size of the NERD tree window can be customised
+    * The order in which the nodes in the tree are listed can be customised.
+    * A model of your filesystem is created/maintained as you explore it. This
+      has several advantages:
+        * All filesystem information is cached and is only re-read on demand
+        * If you revisit a part of the tree that you left earlier in your
+          session, the directory nodes will be opened/closed as you left them
+    * The script remembers the cursor position and window position in the NERD
+      tree so you can toggle it off (or just close the tree window) and then
+      reopen it (with NERDTreeToggle) the NERD tree window will appear exactly
+      as you left it
+    * You can have a separate NERD tree for each tab, share trees across tabs,
+      or a mix of both.
+    * By default the script overrides the default file browser (netrw), so if
+      you :edit a directory a (slightly modified) NERD tree will appear in the
+      current window
+    * A programmable menu system is provided (simulates right clicking on a
+      node)
+        * one default menu plugin is provided to perform basic filesystem
+          operations (create/delete/move/copy files/directories)
+    * There's an API for adding your own keymappings
+
+
+==============================================================================
+2. Functionality provided                              *NERDTreeFunctionality*
+
+------------------------------------------------------------------------------
+2.1. Global Commands                                  *NERDTreeGlobalCommands*
+
+:NERDTree [<start-directory> | <bookmark>]                         *:NERDTree*
+    Opens a fresh NERD tree. The root of the tree depends on the argument
+    given. There are 3 cases: If no argument is given, the current directory
+    will be used.  If a directory is given, that will be used. If a bookmark
+    name is given, the corresponding directory will be used.  For example: >
+        :NERDTree /home/marty/vim7/src
+        :NERDTree foo   (foo is the name of a bookmark)
+<
+:NERDTreeFromBookmark <bookmark>                       *:NERDTreeFromBookmark*
+    Opens a fresh NERD tree with the root initialized to the dir for
+    <bookmark>.  The only reason to use this command over :NERDTree is for
+    the completion (which is for bookmarks rather than directories).
+
+:NERDTreeToggle [<start-directory> | <bookmark>]             *:NERDTreeToggle*
+    If a NERD tree already exists for this tab, it is reopened and rendered
+    again.  If no NERD tree exists for this tab then this command acts the
+    same as the |:NERDTree| command.
+
+:NERDTreeFocus                                                *:NERDTreeFocus*
+    Opens (or reopens) the NERD Tree if it is not currently visible;
+    otherwise, the cursor is moved to the already-open NERD Tree.
+
+:NERDTreeMirror                                              *:NERDTreeMirror*
+    Shares an existing NERD tree, from another tab, in the current tab.
+    Changes made to one tree are reflected in both as they are actually the
+    same buffer.
+
+    If only one other NERD tree exists, that tree is automatically mirrored. If
+    more than one exists, the script will ask which tree to mirror.
+
+:NERDTreeClose                                                *:NERDTreeClose*
+    Close the NERD tree in this tab.
+
+:NERDTreeFind                                                  *:NERDTreeFind*
+    Find the current file in the tree.
+
+    If no tree exists and the current file is under vim's CWD, then init a
+    tree at the CWD and reveal the file. Otherwise init a tree in the current
+    file's directory.
+
+    In any case, the current file is revealed and the cursor is placed on it.
+
+:NERDTreeCWD                                                    *:NERDTreeCWD*
+    Change tree root to current directory. If no NERD tree exists for this
+    tab, a new tree will be opened.
+
+------------------------------------------------------------------------------
+2.2. Bookmarks                                             *NERDTreeBookmarks*
+
+Bookmarks in the NERD tree are a way to tag files or directories of interest.
+For example, you could use bookmarks to tag all of your project directories.
+
+------------------------------------------------------------------------------
+2.2.1. The Bookmark Table                              *NERDTreeBookmarkTable*
+
+If the bookmark table is active (see |NERDTree-B| and
+|'NERDTreeShowBookmarks'|), it will be rendered above the tree. You can double
+click bookmarks or use the |NERDTree-o| mapping to activate them. See also,
+|NERDTree-t| and |NERDTree-T|
+
+------------------------------------------------------------------------------
+2.2.2. Bookmark commands                            *NERDTreeBookmarkCommands*
+
+Note: The following commands are only available within the NERDTree buffer.
+
+:Bookmark [<name>]
+    Bookmark the current node as <name>. If there is already a <name>
+    bookmark, it is overwritten. <name> must not contain spaces.
+    If <name> is not provided, it defaults to the file or directory name.
+    For directories, a trailing slash is present.
+
+:BookmarkToRoot <bookmark>
+    Make the directory corresponding to <bookmark> the new root. If a treenode
+    corresponding to <bookmark> is already cached somewhere in the tree then
+    the current tree will be used, otherwise a fresh tree will be opened.
+    Note that if <bookmark> points to a file then its parent will be used
+    instead.
+
+:RevealBookmark <bookmark>
+    If the node is cached under the current root then it will be revealed
+    (i.e. directory nodes above it will be opened) and the cursor will be
+    placed on it.
+
+:OpenBookmark <name>
+    The Bookmark named <name> is opened as if |NERDTree-o| was applied to
+    its entry in the Bookmark table. If the Bookmark points to a directory,
+    it is made the new root of the current NERDTree. If the Bookmark points
+    to a file, that file is opened for editing in another window.
+
+:ClearBookmarks [<bookmarks>]
+    Remove all the given bookmarks. If no bookmarks are given then remove all
+    bookmarks on the current node.
+
+:ClearAllBookmarks
+    Remove all bookmarks.
+
+:ReadBookmarks
+    Re-read the bookmarks in the |'NERDTreeBookmarksFile'|.
+
+See also |:NERDTree| and |:NERDTreeFromBookmark|.
+
+------------------------------------------------------------------------------
+2.2.3. Invalid Bookmarks                            *NERDTreeInvalidBookmarks*
+
+If invalid bookmarks are detected, the script will issue an error message and
+the invalid bookmarks will become unavailable for use.
+
+These bookmarks will still be stored in the bookmarks file (see
+|'NERDTreeBookmarksFile'|), down the bottom. There will always be a blank line
+after the valid bookmarks but before the invalid ones.
+
+Each line in the bookmarks file represents one bookmark. The proper format is:
+<bookmark name><space><full path to the bookmark location>
+
+After you have corrected any invalid bookmarks, either restart vim, or go
+:ReadBookmarks from the NERD tree window.
+
+------------------------------------------------------------------------------
+2.3. NERD tree Mappings                                     *NERDTreeMappings*
+
+Default  Description~                                             help-tag~
+Key~
+
+o.......Open files, directories and bookmarks....................|NERDTree-o|
+go......Open selected file, but leave cursor in the NERDTree.....|NERDTree-go|
+t.......Open selected node/bookmark in a new tab.................|NERDTree-t|
+T.......Same as 't' but keep the focus on the current tab........|NERDTree-T|
+i.......Open selected file in a split window.....................|NERDTree-i|
+gi......Same as i, but leave the cursor on the NERDTree..........|NERDTree-gi|
+s.......Open selected file in a new vsplit.......................|NERDTree-s|
+gs......Same as s, but leave the cursor on the NERDTree..........|NERDTree-gs|
+O.......Recursively open the selected directory..................|NERDTree-O|
+x.......Close the current nodes parent...........................|NERDTree-x|
+X.......Recursively close all children of the current node.......|NERDTree-X|
+e.......Edit the current dir.....................................|NERDTree-e|
+
+<CR>...............same as |NERDTree-o|.
+double-click.......same as the |NERDTree-o| map.
+middle-click.......same as |NERDTree-i| for files, same as
+                   |NERDTree-e| for dirs.
+
+D.......Delete the current bookmark .............................|NERDTree-D|
+
+P.......Jump to the root node....................................|NERDTree-P|
+p.......Jump to current nodes parent.............................|NERDTree-p|
+K.......Jump up inside directories at the current tree depth.....|NERDTree-K|
+J.......Jump down inside directories at the current tree depth...|NERDTree-J|
+<C-J>...Jump down to the next sibling of the current directory...|NERDTree-C-J|
+<C-K>...Jump up to the previous sibling of the current directory.|NERDTree-C-K|
+
+C.......Change the tree root to the selected dir.................|NERDTree-C|
+u.......Move the tree root up one directory......................|NERDTree-u|
+U.......Same as 'u' except the old root node is left open........|NERDTree-U|
+r.......Recursively refresh the current directory................|NERDTree-r|
+R.......Recursively refresh the current root.....................|NERDTree-R|
+m.......Display the NERD tree menu...............................|NERDTree-m|
+cd......Change the CWD to the dir of the selected node...........|NERDTree-cd|
+CD......Change tree root to the CWD..............................|NERDTree-CD|
+
+I.......Toggle whether hidden files displayed....................|NERDTree-I|
+f.......Toggle whether the file filters are used.................|NERDTree-f|
+F.......Toggle whether files are displayed.......................|NERDTree-F|
+B.......Toggle whether the bookmark table is displayed...........|NERDTree-B|
+
+q.......Close the NERDTree window................................|NERDTree-q|
+A.......Zoom (maximize/minimize) the NERDTree window.............|NERDTree-A|
+?.......Toggle the display of the quick help.....................|NERDTree-?|
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-o*
+Default key: o
+Map option: NERDTreeMapActivateNode
+Applies to: files and directories.
+
+If a file node is selected, it is opened in the previous window.
+
+If a directory is selected it is opened or closed depending on its current
+state.
+
+If a bookmark that links to a directory is selected then that directory
+becomes the new root.
+
+If a bookmark that links to a file is selected then that file is opened in the
+previous window.
+
+------------------------------------------------------------------------------
+                                                                 *NERDTree-go*
+Default key: go
+Map option: NERDTreeMapPreview
+Applies to: files.
+
+If a file node is selected, it is opened in the previous window, but the
+cursor does not move.
+
+The default key combo for this mapping is "g" + NERDTreeMapActivateNode (see
+|NERDTree-o|).
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-t*
+Default key: t
+Map option: NERDTreeMapOpenInTab
+Applies to: files and directories.
+
+Opens the selected file in a new tab. If a directory is selected, a fresh
+NERD Tree for that directory is opened in a new tab.
+
+If a bookmark which points to a directory is selected, open a NERD tree for
+that directory in a new tab. If the bookmark points to a file, open that file
+in a new tab.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-T*
+Default key: T
+Map option: NERDTreeMapOpenInTabSilent
+Applies to: files and directories.
+
+The same as |NERDTree-t| except that the focus is kept in the current tab.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-i*
+Default key: i
+Map option: NERDTreeMapOpenSplit
+Applies to: files.
+
+Opens the selected file in a new split window and puts the cursor in the new
+window.
+
+------------------------------------------------------------------------------
+                                                                 *NERDTree-gi*
+Default key: gi
+Map option: NERDTreeMapPreviewSplit
+Applies to: files.
+
+The same as |NERDTree-i| except that the cursor is not moved.
+
+The default key combo for this mapping is "g" + NERDTreeMapOpenSplit (see
+|NERDTree-i|).
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-s*
+Default key: s
+Map option: NERDTreeMapOpenVSplit
+Applies to: files.
+
+Opens the selected file in a new vertically split window and puts the cursor in
+the new window.
+
+------------------------------------------------------------------------------
+                                                                 *NERDTree-gs*
+Default key: gs
+Map option: NERDTreeMapPreviewVSplit
+Applies to: files.
+
+The same as |NERDTree-s| except that the cursor is not moved.
+
+The default key combo for this mapping is "g" + NERDTreeMapOpenVSplit (see
+|NERDTree-s|).
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-O*
+Default key: O
+Map option: NERDTreeMapOpenRecursively
+Applies to: directories.
+
+Recursively opens the selected directory.
+
+All files and directories are cached, but if a directory would not be
+displayed due to file filters (see |'NERDTreeIgnore'| |NERDTree-f|) or the
+hidden file filter (see |'NERDTreeShowHidden'|) then its contents are not
+cached. This is handy, especially if you have .svn directories.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-x*
+Default key: x
+Map option: NERDTreeMapCloseDir
+Applies to: files and directories.
+
+Closes the parent of the selected node.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-X*
+Default key: X
+Map option: NERDTreeMapCloseChildren
+Applies to: directories.
+
+Recursively closes all children of the selected directory.
+
+Tip: To quickly "reset" the tree, use |NERDTree-P| with this mapping.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-e*
+Default key: e
+Map option: NERDTreeMapOpenExpl
+Applies to: files and directories.
+
+|:edit|s the selected directory, or the selected file's directory. This could
+result in a NERD tree or a netrw being opened, depending on
+|'NERDTreeHijackNetrw'|.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-D*
+Default key: D
+Map option: NERDTreeMapDeleteBookmark
+Applies to: lines in the bookmarks table
+
+Deletes the currently selected bookmark.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-P*
+Default key: P
+Map option: NERDTreeMapJumpRoot
+Applies to: no restrictions.
+
+Jump to the tree root.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-p*
+Default key: p
+Map option: NERDTreeMapJumpParent
+Applies to: files and directories.
+
+Jump to the parent node of the selected node.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-K*
+Default key: K
+Map option: NERDTreeMapJumpFirstChild
+Applies to: files and directories.
+
+Jump to the first child of the current nodes parent.
+
+If the cursor is already on the first node then do the following:
+    * loop back thru the siblings of the current nodes parent until we find an
+      open dir with children
+    * go to the first child of that node
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-J*
+Default key: J
+Map option: NERDTreeMapJumpLastChild
+Applies to: files and directories.
+
+Jump to the last child of the current nodes parent.
+
+If the cursor is already on the last node then do the following:
+    * loop forward thru the siblings of the current nodes parent until we find
+      an open dir with children
+    * go to the last child of that node
+
+------------------------------------------------------------------------------
+                                                                *NERDTree-C-J*
+Default key: <C-J>
+Map option: NERDTreeMapJumpNextSibling
+Applies to: files and directories.
+
+Jump to the next sibling of the selected node.
+
+------------------------------------------------------------------------------
+                                                                *NERDTree-C-K*
+Default key: <C-K>
+Map option: NERDTreeMapJumpPrevSibling
+Applies to: files and directories.
+
+Jump to the previous sibling of the selected node.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-C*
+Default key: C
+Map option: NERDTreeMapChangeRoot
+Applies to: files and directories.
+
+Make the selected directory node the new tree root. If a file is selected, its
+parent is used.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-u*
+Default key: u
+Map option: NERDTreeMapUpdir
+Applies to: no restrictions.
+
+Move the tree root up a dir (like doing a "cd ..").
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-U*
+Default key: U
+Map option: NERDTreeMapUpdirKeepOpen
+Applies to: no restrictions.
+
+Like |NERDTree-u| except that the old tree root is kept open.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-r*
+Default key: r
+Map option: NERDTreeMapRefresh
+Applies to: files and directories.
+
+If a dir is selected, recursively refresh that dir, i.e. scan the filesystem
+for changes and represent them in the tree.
+
+If a file node is selected then the above is done on it's parent.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-R*
+Default key: R
+Map option: NERDTreeMapRefreshRoot
+Applies to: no restrictions.
+
+Recursively refresh the tree root.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-m*
+Default key: m
+Map option: NERDTreeMapMenu
+Applies to: files and directories.
+
+Display the NERD tree menu. See |NERDTreeMenu| for details.
+
+------------------------------------------------------------------------------
+                                                                 *NERDTree-cd*
+Default key: cd
+Map option: NERDTreeMapChdir
+Applies to: files and directories.
+
+Change vims current working directory to that of the selected node.
+
+------------------------------------------------------------------------------
+                                                                 *NERDTree-CD*
+Default key: CD
+Map option: NERDTreeMapCWD
+Applies to: no restrictions.
+
+Change tree root to vims current working directory.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-I*
+Default key: I
+Map option: NERDTreeMapToggleHidden
+Applies to: no restrictions.
+
+Toggles whether hidden files (i.e. "dot files") are displayed.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-f*
+Default key: f
+Map option: NERDTreeMapToggleFilters
+Applies to: no restrictions.
+
+Toggles whether file filters are used. See |'NERDTreeIgnore'| for details.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-F*
+Default key: F
+Map option: NERDTreeMapToggleFiles
+Applies to: no restrictions.
+
+Toggles whether file nodes are displayed.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-B*
+Default key: B
+Map option: NERDTreeMapToggleBookmarks
+Applies to: no restrictions.
+
+Toggles whether the bookmarks table is displayed.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-q*
+Default key: q
+Map option: NERDTreeMapQuit
+Applies to: no restrictions.
+
+Closes the NERDtree window.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-A*
+Default key: A
+Map option: NERDTreeMapToggleZoom
+Applies to: no restrictions.
+
+Maximize (zoom) and minimize the NERDtree window.
+
+------------------------------------------------------------------------------
+                                                                  *NERDTree-?*
+Default key: ?
+Map option: NERDTreeMapHelp
+Applies to: no restrictions.
+
+Toggles whether the quickhelp is displayed.
+
+------------------------------------------------------------------------------
+2.3. The NERD tree menu                                         *NERDTreeMenu*
+
+The NERD tree has a menu that can be programmed via the an API (see
+|NERDTreeMenuAPI|). The idea is to simulate the "right click" menus that most
+file explorers have.
+
+The script comes with two default menu plugins: exec_menuitem.vim and
+fs_menu.vim. fs_menu.vim adds some basic filesystem operations to the menu for
+creating/deleting/moving/copying files and dirs. exec_menuitem.vim provides a
+menu item to execute executable files.
+
+Related tags: |NERDTree-m| |NERDTreeApi|
+
+==============================================================================
+3. Customisation                                             *NERDTreeOptions*
+
+
+------------------------------------------------------------------------------
+3.1. Customisation summary                             *NERDTreeOptionSummary*
+
+The script provides the following options that can customise the behaviour the
+NERD tree. These options should be set in your vimrc.
+
+|'loaded_nerd_tree'|            Turns off the script.
+
+|'NERDTreeAutoCenter'|          Controls whether the NERD tree window centers
+                                when the cursor moves within a specified
+                                distance to the top/bottom of the window.
+
+|'NERDTreeAutoCenterThreshold'| Controls the sensitivity of autocentering.
+
+|'NERDTreeCaseSensitiveSort'|   Tells the NERD tree whether to be case
+                                sensitive or not when sorting nodes.
+
+|'NERDTreeSortHiddenFirst'|     Tells the NERD tree whether to take the dot
+                                at the beginning of the hidden file names
+                                into account when sorting nodes.
+
+|'NERDTreeChDirMode'|           Tells the NERD tree if/when it should change
+                                vim's current working directory.
+
+|'NERDTreeHighlightCursorline'| Tell the NERD tree whether to highlight the
+                                current cursor line.
+
+|'NERDTreeHijackNetrw'|         Tell the NERD tree whether to replace the netrw
+                                autocommands for exploring local directories.
+
+|'NERDTreeIgnore'|              Tells the NERD tree which files to ignore.
+
+|'NERDTreeRespectWildIgnore'|   Tells the NERD tree to respect |'wildignore'|.
+
+|'NERDTreeBookmarksFile'|       Where the bookmarks are stored.
+
+|'NERDTreeBookmarksSort'|       Control how the Bookmark table is sorted.
+
+|'NERDTreeMarkBookmarks'|       Render bookmarked nodes with markers.
+
+|'NERDTreeMouseMode'|           Manage the interpretation of mouse clicks.
+
+|'NERDTreeQuitOnOpen'|          Closes the tree window after opening a file.
+
+|'NERDTreeShowBookmarks'|       Tells the NERD tree whether to display the
+                                bookmarks table on startup.
+
+|'NERDTreeShowFiles'|           Tells the NERD tree whether to display files
+                                in the tree on startup.
+
+|'NERDTreeShowHidden'|          Tells the NERD tree whether to display hidden
+                                files on startup.
+
+|'NERDTreeShowLineNumbers'|     Tells the NERD tree whether to display line
+                                numbers in the tree window.
+
+|'NERDTreeSortOrder'|           Tell the NERD tree how to sort the nodes in
+                                the tree.
+
+|'NERDTreeStatusline'|          Set a statusline for NERD tree windows.
+
+|'NERDTreeWinPos'|              Tells the script where to put the NERD tree
+                                window.
+
+|'NERDTreeWinSize'|             Sets the window size when the NERD tree is
+                                opened.
+
+|'NERDTreeMinimalUI'|           Disables display of the 'Bookmarks' label and
+                                'Press ? for help' text.
+
+|'NERDTreeCascadeSingleChildDir'|
+                                Collapses on the same line directories that
+                                have only one child directory.
+
+|'NERDTreeCascadeOpenSingleChildDir'|
+                                Cascade open while selected directory has only
+                                one child that also is a directory.
+
+|'NERDTreeAutoDeleteBuffer'|    Tells the NERD tree to automatically remove
+                                a buffer when a file is being deleted or renamed
+                                via a context menu command.
+
+|'NERDTreeCreatePrefix'|        Specify a prefix to be used when creating the
+                                NERDTree window.
+
+------------------------------------------------------------------------------
+3.2. Customisation details                             *NERDTreeOptionDetails*
+
+To enable any of the below options you should put the given line in your
+~/.vimrc
+
+                                                          *'loaded_nerd_tree'*
+If this plugin is making you feel homicidal, it may be a good idea to turn it
+off with this line in your vimrc: >
+    let loaded_nerd_tree=1
+<
+
+------------------------------------------------------------------------------
+                                                        *'NERDTreeAutoCenter'*
+Values: 0 or 1.
+Default: 1
+
+If set to 1, the NERD tree window will center around the cursor if it moves to
+within |'NERDTreeAutoCenterThreshold'| lines of the top/bottom of the window.
+
+This is ONLY done in response to tree navigation mappings,
+i.e. |NERDTree-J| |NERDTree-K| |NERDTree-C-J| |NERDTree-C-K| |NERDTree-p|
+|NERDTree-P|
+
+The centering is done with a |zz| operation.
+
+------------------------------------------------------------------------------
+                                               *'NERDTreeAutoCenterThreshold'*
+Values: Any natural number.
+Default: 3
+
+This option controls the "sensitivity" of the NERD tree auto centering. See
+|'NERDTreeAutoCenter'| for details.
+
+------------------------------------------------------------------------------
+                                                 *'NERDTreeCaseSensitiveSort'*
+Values: 0 or 1.
+Default: 0.
+
+By default the NERD tree does not sort nodes case sensitively, i.e. nodes
+could appear like this: >
+    bar.c
+    Baz.c
+    blarg.c
+    boner.c
+    Foo.c
+<
+But, if you set this option to 1 then the case of the nodes will be taken into
+account. The above nodes would then be sorted like this: >
+    Baz.c
+    Foo.c
+    bar.c
+    blarg.c
+    boner.c
+<
+------------------------------------------------------------------------------
+                                                         *'NERDTreeChDirMode'*
+
+Values: 0, 1 or 2.
+Default: 0.
+
+Use this option to tell the script when (if at all) to change the current
+working directory (CWD) for vim.
+
+If it is set to 0 then the CWD is never changed by the NERD tree.
+
+If set to 1 then the CWD is changed when the NERD tree is first loaded to the
+directory it is initialized in. For example, if you start the NERD tree with >
+    :NERDTree /home/marty/foobar
+<
+then the CWD will be changed to /home/marty/foobar and will not be changed
+again unless you init another NERD tree with a similar command.
+
+If the option is set to 2 then it behaves the same as if set to 1 except that
+the CWD is changed whenever the tree root is changed. For example, if the CWD
+is /home/marty/foobar and you make the node for /home/marty/foobar/baz the new
+root then the CWD will become /home/marty/foobar/baz.
+
+------------------------------------------------------------------------------
+                                               *'NERDTreeHighlightCursorline'*
+Values: 0 or 1.
+Default: 1.
+
+If set to 1, the current cursor line in the NERD tree buffer will be
+highlighted. This is done using the |'cursorline'| option.
+
+------------------------------------------------------------------------------
+                                                       *'NERDTreeHijackNetrw'*
+Values: 0 or 1.
+Default: 1.
+
+If set to 1, doing a >
+    :edit <some directory>
+<
+will open up a window level NERD tree instead of a netrw in the target window.
+
+Window level trees behaves slightly different from a regular trees in the
+following respects:
+    1. 'o' will open the selected file in the same window as the tree,
+       replacing it.
+    2. you can have one tree per window - instead of per tab.
+
+------------------------------------------------------------------------------
+                                                            *'NERDTreeIgnore'*
+Values: a list of regular expressions.
+Default: ['\~$'].
+
+This option is used to specify which files the NERD tree should ignore.  It
+must be a list of regular expressions. When the NERD tree is rendered, any
+files/dirs that match any of the regex's in 'NERDTreeIgnore' wont be
+displayed.
+
+For example if you put the following line in your vimrc: >
+    let NERDTreeIgnore=['\.vim$', '\~$']
+<
+then all files ending in .vim or ~ will be ignored.
+
+There are 2 magic flags that can be appended to the end of each regular
+expression to specify that the regex should match only files or only dirs.
+These flags are "[[dir]]" and "[[file]]". Example: >
+    let NERDTreeIgnore=['\.d$[[dir]]', '\.o$[[file]]']
+<
+This will cause all dirs ending in ".d" to be ignored and all files ending in
+".o" to be ignored.
+
+Note: to tell the NERD tree not to ignore any files you must use the following
+line: >
+    let NERDTreeIgnore=[]
+<
+
+The file filters can be turned on and off dynamically with the |NERDTree-f|
+mapping.
+
+------------------------------------------------------------------------------
+                                                *'NERDTreeRespectWildIgnore'*
+Values: 0 or 1.
+Default: 0.
+
+If set to 1, the |'wildignore'| setting is respected.
+
+------------------------------------------------------------------------------
+                                                     *'NERDTreeBookmarksFile'*
+Values: a path
+Default: $HOME/.NERDTreeBookmarks
+
+This is where bookmarks are saved. See |NERDTreeBookmarkCommands|.
+
+------------------------------------------------------------------------------
+                                                     *'NERDTreeBookmarksSort'*
+Values: 0, 1, or 2
+Default: 1
+
+This option controls the method by which the list of user bookmarks is
+sorted. When sorted, bookmarks will render in alphabetical order by name.
+
+If set to 0, the bookmarks list is not sorted.
+If set to 1, the bookmarks list is sorted in a case-insensitive manner.
+If set to 2, the bookmarks list is sorted in a case-sensitive manner.
+
+------------------------------------------------------------------------------
+                                                     *'NERDTreeMarkBookmarks'*
+Values: 0 or 1
+Default: 1
+
+If set to 1, Bookmarks will be specially marked whenever the NERDTree is
+rendered. Users of the |'NERDTreeMinimalUI'| setting may prefer to disable
+this setting for even less visual clutter.
+
+------------------------------------------------------------------------------
+                                                       *'NERDTreeMouseMode'*
+Values: 1, 2 or 3.
+Default: 1.
+
+If set to 1 then a double click on a node is required to open it.
+If set to 2 then a single click will open directory nodes, while a double
+click will still be required for file nodes.
+If set to 3 then a single click will open any node.
+
+Note: a double click anywhere on a line that a tree node is on will
+activate it, but all single-click activations must be done on name of the node
+itself. For example, if you have the following node: >
+    | | |-application.rb
+<
+then (to single click activate it) you must click somewhere in
+'application.rb'.
+
+------------------------------------------------------------------------------
+                                                        *'NERDTreeQuitOnOpen'*
+
+Values: 0 or 1.
+Default: 0
+
+If set to 1, the NERD tree window will close after opening a file with the
+|NERDTree-o|, |NERDTree-i|, |NERDTree-t| and |NERDTree-T| mappings.
+
+------------------------------------------------------------------------------
+                                                     *'NERDTreeShowBookmarks'*
+Values: 0 or 1.
+Default: 0.
+
+If this option is set to 1 then the bookmarks table will be displayed.
+
+This option can be toggled dynamically, per tree, with the |NERDTree-B|
+mapping.
+
+------------------------------------------------------------------------------
+                                                         *'NERDTreeShowFiles'*
+Values: 0 or 1.
+Default: 1.
+
+If this option is set to 1 then files are displayed in the NERD tree. If it is
+set to 0 then only directories are displayed.
+
+This option can be toggled dynamically, per tree, with the |NERDTree-F|
+mapping and is useful for drastically shrinking the tree when you are
+navigating to a different part of the tree.
+
+------------------------------------------------------------------------------
+                                                        *'NERDTreeShowHidden'*
+Values: 0 or 1.
+Default: 0.
+
+This option tells vim whether to display hidden files by default. This option
+can be dynamically toggled, per tree, with the |NERDTree-I| mapping.  Use one
+of the follow lines to set this option: >
+    let NERDTreeShowHidden=0
+    let NERDTreeShowHidden=1
+<
+
+------------------------------------------------------------------------------
+                                                   *'NERDTreeShowLineNumbers'*
+Values: 0 or 1.
+Default: 0.
+
+This option tells vim whether to display line numbers for the NERD tree
+window.  Use one of the follow lines to set this option: >
+    let NERDTreeShowLineNumbers=0
+    let NERDTreeShowLineNumbers=1
+<
+
+------------------------------------------------------------------------------
+                                                         *'NERDTreeSortOrder'*
+Values: a list of regular expressions.
+Default: ['\/$', '*', '\.swp$',  '\.bak$', '\~$']
+
+This option is set to a list of regular expressions which are used to
+specify the order of nodes under their parent.
+
+For example, if the option is set to: >
+    ['\.vim$', '\.c$', '\.h$', '*', 'foobar']
+<
+then all .vim files will be placed at the top, followed by all .c files then
+all .h files. All files containing the string 'foobar' will be placed at the
+end.  The star is a special flag: it tells the script that every node that
+doesnt match any of the other regexps should be placed here.
+
+If no star is present in 'NERDTreeSortOrder' then one is automatically
+appended to the array.
+
+The regex '\/$' should be used to match directory nodes.
+
+After this sorting is done, the files in each group are sorted alphabetically.
+
+Other examples: >
+    (1) ['*', '\/$']
+    (2) []
+    (3) ['\/$', '\.rb$', '\.php$', '*', '\.swp$',  '\.bak$', '\~$']
+<
+1. Directories will appear last, everything else will appear above.
+2. Everything will simply appear in alphabetical order.
+3. Dirs will appear first, then ruby and php. Swap files, bak files and vim
+   backup files will appear last with everything else preceding them.
+
+------------------------------------------------------------------------------
+                                                        *'NERDTreeStatusline'*
+Values: Any valid statusline setting.
+Default: %{b:NERDTree.root.path.strForOS(0)}
+
+Tells the script what to use as the |'statusline'| setting for NERD tree
+windows.
+
+Note that the statusline is set using |:let-&| not |:set| so escaping spaces
+isn't necessary.
+
+Setting this option to -1 will will deactivate it so that your global
+statusline setting is used instead.
+
+------------------------------------------------------------------------------
+                                                            *'NERDTreeWinPos'*
+Values: "left" or "right"
+Default: "left".
+
+This option is used to determine where NERD tree window is placed on the
+screen.
+
+This option makes it possible to use two different explorer plugins
+simultaneously. For example, you could have the taglist plugin on the left of
+the window and the NERD tree on the right.
+
+------------------------------------------------------------------------------
+                                                           *'NERDTreeWinSize'*
+Values: a positive integer.
+Default: 31.
+
+This option is used to change the size of the NERD tree when it is loaded.
+
+------------------------------------------------------------------------------
+                                                         *'NERDTreeMinimalUI'*
+Values: 0 or 1
+Default: 0
+
+This options disables the 'Bookmarks' label 'Press ? for help' text. Use one
+of the following lines to set this option: >
+    let NERDTreeMinimalUI=0
+    let NERDTreeMinimalUI=1
+<
+
+------------------------------------------------------------------------------
+                                             *'NERDTreeCascadeSingleChildDir'*
+Values: 0 or 1
+Default: 1.
+
+When displaying dir nodes, this option tells NERDTree to collapse dirs that
+have only one child. Use one of the follow lines to set this option: >
+    let NERDTreeCascadeSingleChildDir=0
+    let NERDTreeCascadeSingleChildDir=1
+<
+
+------------------------------------------------------------------------------
+                                         *'NERDTreeCascadeOpenSingleChildDir'*
+Values: 0 or 1
+Default: 1.
+
+When opening dir nodes, this option tells NERDTree to recursively open dirs
+that have only one child which is also a dir. NERDTree will stop when it finds
+a dir that contains anything but another single dir. This option also causes
+the |NERDTree-x| mapping to close dirs in the same manner. This option may be
+useful for Java projects. Use one of the follow lines to set this option: >
+    let NERDTreeCascadeOpenSingleChildDir=0
+    let NERDTreeCascadeOpenSingleChildDir=1
+<
+
+------------------------------------------------------------------------------
+                                                  *'NERDTreeAutoDeleteBuffer'*
+Values: 0 or 1
+Default: 0.
+
+When using a context menu to delete or rename a file you may also want to delete
+the buffer which is no more valid. If the option is not set you will see a
+confirmation if you really want to delete an old buffer. If you always press 'y'
+then it worths to set this option to 1. Use one of the follow lines to set this
+option: >
+    let NERDTreeAutoDeleteBuffer=0
+    let NERDTreeAutoDeleteBuffer=1
+<
+------------------------------------------------------------------------------
+                                          *'NERDTreeCreatePrefix'*
+Values: Any valid command prefix.
+Default: "silent".
+
+Internally, NERDTree uses the |:edit| command to create a buffer in which to
+display its tree view. You can augment this behavior by specifying a prefix
+string such as "keepalt" or similar. For example, to have NERDTree create its
+tree window using `silent keepalt keepjumps edit`:
+    let NERDTreeCreatePrefix='silent keepalt keepjumps'
+<
+
+==============================================================================
+4. The NERD tree API                                             *NERDTreeAPI*
+
+The NERD tree script allows you to add custom key mappings and menu items via
+a set of API calls. Any scripts that use this API should be placed in
+~/.vim/nerdtree_plugin/ (*nix) or ~/vimfiles/nerdtree_plugin (windows).
+
+The script exposes some prototype objects that can be used to manipulate the
+tree and/or get information from it: >
+    g:NERDTreePath
+    g:NERDTreeDirNode
+    g:NERDTreeFileNode
+    g:NERDTreeBookmark
+<
+See the code/comments in NERD_tree.vim to find how to use these objects. The
+following code conventions are used:
+    * class members start with a capital letter
+    * instance members start with a lower case letter
+    * private members start with an underscore
+
+See this blog post for more details:
+ http://got-ravings.blogspot.com/2008/09/vim-pr0n-prototype-based-objects.html
+
+------------------------------------------------------------------------------
+4.1. Key map API                                           *NERDTreeKeymapAPI*
+
+NERDTreeAddKeyMap({options})                             *NERDTreeAddKeyMap()*
+    Adds a new keymapping for all NERD tree buffers.
+    {options} must be a dictionary, and must contain the following keys:
+    "key" - the trigger key for the new mapping
+    "callback" - the function the new mapping will be bound to
+    "quickhelpText" - the text that will appear in the quickhelp (see
+    |NERDTree-?|)
+    "override" - if 1 then this new mapping will override whatever previous
+    mapping was defined for the key/scope combo. Useful for overriding the
+    default mappings.
+
+    Additionally, a "scope" argument may be supplied. This constrains the
+    mapping so that it is only activated if the cursor is on a certain object.
+    That object is then passed into the handling method. Possible values are:
+        "FileNode" - a file node
+        "DirNode" - a directory node
+        "Node" - a file or directory node
+        "Bookmark" - A bookmark
+        "all" - the keymap is not constrained to any scope (default). When
+        thei is used, the handling function is not passed any arguments.
+
+
+    Example: >
+        call NERDTreeAddKeyMap({
+               \ 'key': 'foo',
+               \ 'callback': 'NERDTreeCDHandler',
+               \ 'quickhelpText': 'echo full path of current node',
+               \ 'scope': 'DirNode' })
+
+        function! NERDTreeCDHandler(dirnode)
+            call a:dirnode.changeToDir()
+        endfunction
+<
+    This code should sit in a file like ~/.vim/nerdtree_plugin/mymapping.vim.
+    It adds a (redundant) mapping on 'foo' which changes vim's CWD to that of
+    the current dir node. Note this mapping will only fire when the cursor is
+    on a directory node.
+
+------------------------------------------------------------------------------
+4.2. Menu API                                                *NERDTreeMenuAPI*
+
+NERDTreeAddSubmenu({options})                           *NERDTreeAddSubmenu()*
+    Creates and returns a new submenu.
+
+    {options} must be a dictionary and must contain the following keys:
+    "text" - the text of the submenu that the user will see
+    "shortcut" - a shortcut key for the submenu (need not be unique)
+
+    The following keys are optional:
+    "isActiveCallback" - a function that will be called to determine whether
+    this submenu item will be displayed or not. The callback function must return
+    0 or 1.
+    "parent" - the parent submenu of the new submenu (returned from a previous
+    invocation of NERDTreeAddSubmenu()). If this key is left out then the new
+    submenu will sit under the top level menu.
+
+    See below for an example.
+
+NERDTreeAddMenuItem({options})                         *NERDTreeAddMenuItem()*
+    Adds a new menu item to the NERD tree menu (see |NERDTreeMenu|).
+
+    {options} must be a dictionary and must contain the
+    following keys:
+    "text" - the text of the menu item which the user will see
+    "shortcut" - a shortcut key for the menu item (need not be unique)
+    "callback" - the function that will be called when the user activates the
+    menu item.
+
+    The following keys are optional:
+    "isActiveCallback" - a function that will be called to determine whether
+    this menu item will be displayed or not. The callback function must return
+    0 or 1.
+    "parent" - if the menu item belongs under a submenu then this key must be
+    specified. This value for this key will be the object that
+    was returned when the submenu was created with |NERDTreeAddSubmenu()|.
+
+    See below for an example.
+
+NERDTreeAddMenuSeparator([{options}])             *NERDTreeAddMenuSeparator()*
+    Adds a menu separator (a row of dashes).
+
+    {options} is an optional dictionary that may contain the following keys:
+    "isActiveCallback" - see description in |NERDTreeAddMenuItem()|.
+
+Below is an example of the menu API in action. >
+    call NERDTreeAddMenuSeparator()
+
+    call NERDTreeAddMenuItem({
+                \ 'text': 'a (t)op level menu item',
+                \ 'shortcut': 't',
+                \ 'callback': 'SomeFunction' })
+
+    let submenu = NERDTreeAddSubmenu({
+                \ 'text': 'a (s)ub menu',
+                \ 'shortcut': 's' })
+
+    call NERDTreeAddMenuItem({
+                \ 'text': '(n)ested item 1',
+                \ 'shortcut': 'n',
+                \ 'callback': 'SomeFunction',
+                \ 'parent': submenu })
+
+    call NERDTreeAddMenuItem({
+                \ 'text': '(n)ested item 2',
+                \ 'shortcut': 'n',
+                \ 'callback': 'SomeFunction',
+                \ 'parent': submenu })
+<
+This will create the following menu: >
+  --------------------
+  a (t)op level menu item
+  a (s)ub menu
+<
+Where selecting "a (s)ub menu" will lead to a second menu: >
+  (n)ested item 1
+  (n)ested item 2
+<
+When any of the 3 concrete menu items are selected the function "SomeFunction"
+will be called.
+
+------------------------------------------------------------------------------
+4.3 NERDTreeAddPathFilter(callback)                   *NERDTreeAddPathFilter()*
+
+Path filters are essentially a more powerful version of  |NERDTreeIgnore|.
+If the simple regex matching in |NERDTreeIgnore| is not enough then use
+|NERDTreeAddPathFilter()| to add a callback function that paths will be
+checked against when the decision to ignore them is made. Example >
+
+    call NERDTreeAddPathFilter('MyFilter')
+
+    function! MyFilter(params)
+        "params is a dict containing keys: 'nerdtree' and 'path' which are
+        "g:NERDTree and g:NERDTreePath objects
+
+        "return 1 to ignore params['path'] or 0 otherwise
+    endfunction
+<
+------------------------------------------------------------------------------
+4.4 Path Listener API                              *NERDTreePathListenerAPI*
+
+Use this API if you want to run a callback for events on Path objects. E.G >
+
+    call g:NERDTreePathNotifier.AddListener("init", "MyListener")
+
+    "....
+
+    function! MyListener(event)
+        "This function will be called whenever a Path object is created.
+
+        "a:event is an object that contains a bunch of relevant info -
+        "including the path in question. See lib/nerdtree/event.vim for details.
+    endfunction
+<
+Current events supported:
+  init ~
+  refresh ~
+  refreshFlags ~
+
+------------------------------------------------------------------------------
+NERDTreeRender()                                            *NERDTreeRender()*
+    Re-renders the NERD tree buffer. Useful if you change the state of the
+    tree and you want to it to be reflected in the UI.
+
+==============================================================================
+5. About                                                       *NERDTreeAbout*
+
+The author of the NERD tree is a terrible terrible monster called Martyzilla
+who gobbles up small children with milk and sugar for breakfast.
+
+He can be reached at martin.grenfell at gmail dot com. He would love to hear
+from you, so feel free to send him suggestions and/or comments about this
+plugin.  Don't be shy --- the worst he can do is slaughter you and stuff you in
+the fridge for later ;)
+
+The latest stable versions can be found at
+    http://www.vim.org/scripts/script.php?script_id=1658
+
+The latest dev versions are on github
+    http://github.com/scrooloose/nerdtree
+
+==============================================================================
+6. License                                                   *NERDTreeLicense*
+
+The NERD tree is released under the wtfpl.
+See http://sam.zoy.org/wtfpl/COPYING.
diff --git a/vim-plugins/bundle/nerdtree/doc/tags b/vim-plugins/bundle/nerdtree/doc/tags
new file mode 100644
index 0000000..7b33f32
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/doc/tags
@@ -0,0 +1,93 @@
+'NERDTreeAutoCenter'	NERD_tree.txt	/*'NERDTreeAutoCenter'*
+'NERDTreeAutoCenterThreshold'	NERD_tree.txt	/*'NERDTreeAutoCenterThreshold'*
+'NERDTreeAutoDeleteBuffer'	NERD_tree.txt	/*'NERDTreeAutoDeleteBuffer'*
+'NERDTreeBookmarksFile'	NERD_tree.txt	/*'NERDTreeBookmarksFile'*
+'NERDTreeBookmarksSort'	NERD_tree.txt	/*'NERDTreeBookmarksSort'*
+'NERDTreeCascadeOpenSingleChildDir'	NERD_tree.txt	/*'NERDTreeCascadeOpenSingleChildDir'*
+'NERDTreeCascadeSingleChildDir'	NERD_tree.txt	/*'NERDTreeCascadeSingleChildDir'*
+'NERDTreeCaseSensitiveSort'	NERD_tree.txt	/*'NERDTreeCaseSensitiveSort'*
+'NERDTreeChDirMode'	NERD_tree.txt	/*'NERDTreeChDirMode'*
+'NERDTreeCreatePrefix'	NERD_tree.txt	/*'NERDTreeCreatePrefix'*
+'NERDTreeHighlightCursorline'	NERD_tree.txt	/*'NERDTreeHighlightCursorline'*
+'NERDTreeHijackNetrw'	NERD_tree.txt	/*'NERDTreeHijackNetrw'*
+'NERDTreeIgnore'	NERD_tree.txt	/*'NERDTreeIgnore'*
+'NERDTreeMinimalUI'	NERD_tree.txt	/*'NERDTreeMinimalUI'*
+'NERDTreeMouseMode'	NERD_tree.txt	/*'NERDTreeMouseMode'*
+'NERDTreeQuitOnOpen'	NERD_tree.txt	/*'NERDTreeQuitOnOpen'*
+'NERDTreeRespectWildIgnore'	NERD_tree.txt	/*'NERDTreeRespectWildIgnore'*
+'NERDTreeShowBookmarks'	NERD_tree.txt	/*'NERDTreeShowBookmarks'*
+'NERDTreeShowFiles'	NERD_tree.txt	/*'NERDTreeShowFiles'*
+'NERDTreeShowHidden'	NERD_tree.txt	/*'NERDTreeShowHidden'*
+'NERDTreeShowLineNumbers'	NERD_tree.txt	/*'NERDTreeShowLineNumbers'*
+'NERDTreeSortOrder'	NERD_tree.txt	/*'NERDTreeSortOrder'*
+'NERDTreeStatusline'	NERD_tree.txt	/*'NERDTreeStatusline'*
+'NERDTreeWinPos'	NERD_tree.txt	/*'NERDTreeWinPos'*
+'NERDTreeWinSize'	NERD_tree.txt	/*'NERDTreeWinSize'*
+'loaded_nerd_tree'	NERD_tree.txt	/*'loaded_nerd_tree'*
+:NERDTree	NERD_tree.txt	/*:NERDTree*
+:NERDTreeCWD	NERD_tree.txt	/*:NERDTreeCWD*
+:NERDTreeClose	NERD_tree.txt	/*:NERDTreeClose*
+:NERDTreeFind	NERD_tree.txt	/*:NERDTreeFind*
+:NERDTreeFromBookmark	NERD_tree.txt	/*:NERDTreeFromBookmark*
+:NERDTreeMirror	NERD_tree.txt	/*:NERDTreeMirror*
+:NERDTreeToggle	NERD_tree.txt	/*:NERDTreeToggle*
+NERDTree	NERD_tree.txt	/*NERDTree*
+NERDTree-?	NERD_tree.txt	/*NERDTree-?*
+NERDTree-A	NERD_tree.txt	/*NERDTree-A*
+NERDTree-B	NERD_tree.txt	/*NERDTree-B*
+NERDTree-C	NERD_tree.txt	/*NERDTree-C*
+NERDTree-C-J	NERD_tree.txt	/*NERDTree-C-J*
+NERDTree-C-K	NERD_tree.txt	/*NERDTree-C-K*
+NERDTree-CD	NERD_tree.txt	/*NERDTree-CD*
+NERDTree-D	NERD_tree.txt	/*NERDTree-D*
+NERDTree-F	NERD_tree.txt	/*NERDTree-F*
+NERDTree-I	NERD_tree.txt	/*NERDTree-I*
+NERDTree-J	NERD_tree.txt	/*NERDTree-J*
+NERDTree-K	NERD_tree.txt	/*NERDTree-K*
+NERDTree-O	NERD_tree.txt	/*NERDTree-O*
+NERDTree-P	NERD_tree.txt	/*NERDTree-P*
+NERDTree-R	NERD_tree.txt	/*NERDTree-R*
+NERDTree-T	NERD_tree.txt	/*NERDTree-T*
+NERDTree-U	NERD_tree.txt	/*NERDTree-U*
+NERDTree-X	NERD_tree.txt	/*NERDTree-X*
+NERDTree-cd	NERD_tree.txt	/*NERDTree-cd*
+NERDTree-contents	NERD_tree.txt	/*NERDTree-contents*
+NERDTree-e	NERD_tree.txt	/*NERDTree-e*
+NERDTree-f	NERD_tree.txt	/*NERDTree-f*
+NERDTree-gi	NERD_tree.txt	/*NERDTree-gi*
+NERDTree-go	NERD_tree.txt	/*NERDTree-go*
+NERDTree-gs	NERD_tree.txt	/*NERDTree-gs*
+NERDTree-i	NERD_tree.txt	/*NERDTree-i*
+NERDTree-m	NERD_tree.txt	/*NERDTree-m*
+NERDTree-o	NERD_tree.txt	/*NERDTree-o*
+NERDTree-p	NERD_tree.txt	/*NERDTree-p*
+NERDTree-q	NERD_tree.txt	/*NERDTree-q*
+NERDTree-r	NERD_tree.txt	/*NERDTree-r*
+NERDTree-s	NERD_tree.txt	/*NERDTree-s*
+NERDTree-t	NERD_tree.txt	/*NERDTree-t*
+NERDTree-u	NERD_tree.txt	/*NERDTree-u*
+NERDTree-x	NERD_tree.txt	/*NERDTree-x*
+NERDTreeAPI	NERD_tree.txt	/*NERDTreeAPI*
+NERDTreeAbout	NERD_tree.txt	/*NERDTreeAbout*
+NERDTreeAddKeyMap()	NERD_tree.txt	/*NERDTreeAddKeyMap()*
+NERDTreeAddMenuItem()	NERD_tree.txt	/*NERDTreeAddMenuItem()*
+NERDTreeAddMenuSeparator()	NERD_tree.txt	/*NERDTreeAddMenuSeparator()*
+NERDTreeAddPathFilter()	NERD_tree.txt	/*NERDTreeAddPathFilter()*
+NERDTreeAddSubmenu()	NERD_tree.txt	/*NERDTreeAddSubmenu()*
+NERDTreeBookmarkCommands	NERD_tree.txt	/*NERDTreeBookmarkCommands*
+NERDTreeBookmarkTable	NERD_tree.txt	/*NERDTreeBookmarkTable*
+NERDTreeBookmarks	NERD_tree.txt	/*NERDTreeBookmarks*
+NERDTreeFunctionality	NERD_tree.txt	/*NERDTreeFunctionality*
+NERDTreeGlobalCommands	NERD_tree.txt	/*NERDTreeGlobalCommands*
+NERDTreeInvalidBookmarks	NERD_tree.txt	/*NERDTreeInvalidBookmarks*
+NERDTreeKeymapAPI	NERD_tree.txt	/*NERDTreeKeymapAPI*
+NERDTreeLicense	NERD_tree.txt	/*NERDTreeLicense*
+NERDTreeMappings	NERD_tree.txt	/*NERDTreeMappings*
+NERDTreeMenu	NERD_tree.txt	/*NERDTreeMenu*
+NERDTreeMenuAPI	NERD_tree.txt	/*NERDTreeMenuAPI*
+NERDTreeOptionDetails	NERD_tree.txt	/*NERDTreeOptionDetails*
+NERDTreeOptionSummary	NERD_tree.txt	/*NERDTreeOptionSummary*
+NERDTreeOptions	NERD_tree.txt	/*NERDTreeOptions*
+NERDTreePathListenerAPI	NERD_tree.txt	/*NERDTreePathListenerAPI*
+NERDTreeRender()	NERD_tree.txt	/*NERDTreeRender()*
+NERD_tree.txt	NERD_tree.txt	/*NERD_tree.txt*
diff --git a/vim-plugins/bundle/nerdtree/lib/nerdtree/bookmark.vim b/vim-plugins/bundle/nerdtree/lib/nerdtree/bookmark.vim
new file mode 100644
index 0000000..268664b
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/lib/nerdtree/bookmark.vim
@@ -0,0 +1,343 @@
+" ============================================================================
+" CLASS: Bookmark
+"
+" The Bookmark class serves two purposes:
+"   (1) It is the top-level prototype for new, concrete Bookmark objects.
+"   (2) It provides an interface for client code to query and manipulate the
+"       global list of Bookmark objects within the current Vim session.
+" ============================================================================
+
+
+let s:Bookmark = {}
+let g:NERDTreeBookmark = s:Bookmark
+
+" FUNCTION: Bookmark.activate(nerdtree) {{{1
+function! s:Bookmark.activate(nerdtree, ...)
+    call self.open(a:nerdtree, a:0 ? a:1 : {})
+endfunction
+
+" FUNCTION: Bookmark.AddBookmark(name, path) {{{1
+" Class method to add a new bookmark to the list, if a previous bookmark exists
+" with the same name, just update the path for that bookmark
+function! s:Bookmark.AddBookmark(name, path)
+    for i in s:Bookmark.Bookmarks()
+        if i.name ==# a:name
+            let i.path = a:path
+            return
+        endif
+    endfor
+    call add(s:Bookmark.Bookmarks(), s:Bookmark.New(a:name, a:path))
+endfunction
+
+" FUNCTION: Bookmark.Bookmarks() {{{1
+" Class method to get all bookmarks. Lazily initializes the bookmarks global
+" variable
+function! s:Bookmark.Bookmarks()
+    if !exists("g:NERDTreeBookmarks")
+        let g:NERDTreeBookmarks = []
+    endif
+    return g:NERDTreeBookmarks
+endfunction
+
+" FUNCTION: Bookmark.BookmarkExistsFor(name) {{{1
+" class method that returns 1 if a bookmark with the given name is found, 0
+" otherwise
+function! s:Bookmark.BookmarkExistsFor(name)
+    try
+        call s:Bookmark.BookmarkFor(a:name)
+        return 1
+    catch /^NERDTree.BookmarkNotFoundError/
+        return 0
+    endtry
+endfunction
+
+" FUNCTION: Bookmark.BookmarkFor(name) {{{1
+" Class method that returns the Bookmark object having the specified name.
+" Throws "NERDTree.BookmarkNotFoundError" if no Bookmark is found.
+function! s:Bookmark.BookmarkFor(name)
+    let l:result = {}
+    for l:bookmark in s:Bookmark.Bookmarks()
+        if l:bookmark.name ==# a:name
+            let l:result = l:bookmark
+            break
+        endif
+    endfor
+    if empty(l:result)
+        throw 'NERDTree.BookmarkNotFoundError: "' . a:name  . '" not found'
+    endif
+    return l:result
+endfunction
+
+" FUNCTION: Bookmark.BookmarkNames() {{{1
+" Class method to return an array of all bookmark names
+function! s:Bookmark.BookmarkNames()
+    let names = []
+    for i in s:Bookmark.Bookmarks()
+        call add(names, i.name)
+    endfor
+    return names
+endfunction
+
+" FUNCTION: Bookmark.CacheBookmarks(silent) {{{1
+" Class method to read all bookmarks from the bookmarks file initialize
+" bookmark objects for each one.
+"
+" Args:
+" silent - dont echo an error msg if invalid bookmarks are found
+function! s:Bookmark.CacheBookmarks(silent)
+    if filereadable(g:NERDTreeBookmarksFile)
+        let g:NERDTreeBookmarks = []
+        let g:NERDTreeInvalidBookmarks = []
+        let bookmarkStrings = readfile(g:NERDTreeBookmarksFile)
+        let invalidBookmarksFound = 0
+        for i in bookmarkStrings
+
+            "ignore blank lines
+            if i != ''
+
+                let name = substitute(i, '^\(.\{-}\) .*$', '\1', '')
+                let path = substitute(i, '^.\{-} \(.*\)$', '\1', '')
+                let path = fnamemodify(path, ':p')
+
+                try
+                    let bookmark = s:Bookmark.New(name, g:NERDTreePath.New(path))
+                    call add(g:NERDTreeBookmarks, bookmark)
+                catch /^NERDTree.InvalidArgumentsError/
+                    call add(g:NERDTreeInvalidBookmarks, i)
+                    let invalidBookmarksFound += 1
+                endtry
+            endif
+        endfor
+        if invalidBookmarksFound
+            call s:Bookmark.Write()
+            if !a:silent
+                call nerdtree#echo(invalidBookmarksFound . " invalid bookmarks were read. See :help NERDTreeInvalidBookmarks for info.")
+            endif
+        endif
+    endif
+endfunction
+
+" FUNCTION: Bookmark.CompareBookmarksByName(firstBookmark, secondBookmark) {{{1
+" Class method that indicates the relative position of two bookmarks when
+" placed in alphabetical order by name. Case-sensitivity is determined by an
+" option. Supports the "s:Bookmark.SortBookmarksList()" method.
+function! s:Bookmark.CompareBookmarksByName(firstBookmark, secondBookmark)
+    let l:result = 0
+    if g:NERDTreeBookmarksSort == 1
+        if a:firstBookmark.name <? a:secondBookmark.name
+            let l:result = -1
+        elseif a:firstBookmark.name >? a:secondBookmark.name
+            let l:result = 1
+        endif
+    elseif g:NERDTreeBookmarksSort == 2
+        if a:firstBookmark.name <# a:secondBookmark.name
+            let l:result = -1
+        elseif a:firstBookmark.name ># a:secondBookmark.name
+            let l:result = 1
+        endif
+    endif
+    return l:result
+endfunction
+
+" FUNCTION: Bookmark.ClearAll() {{{1
+" Class method to delete all bookmarks.
+function! s:Bookmark.ClearAll()
+    for i in s:Bookmark.Bookmarks()
+        call i.delete()
+    endfor
+    call s:Bookmark.Write()
+endfunction
+
+" FUNCTION: Bookmark.delete() {{{1
+" Delete this bookmark. If the node for this bookmark is under the current
+" root, then recache bookmarks for its Path object
+function! s:Bookmark.delete()
+    call remove(s:Bookmark.Bookmarks(), index(s:Bookmark.Bookmarks(), self))
+    call s:Bookmark.Write()
+endfunction
+
+" FUNCTION: Bookmark.getNode(nerdtree, searchFromAbsoluteRoot) {{{1
+" Returns the tree node object associated with this Bookmark.
+" Throws "NERDTree.BookmarkedNodeNotFoundError" if the node is not found.
+"
+" Args:
+" searchFromAbsoluteRoot: boolean flag, search from the highest cached node
+"   if true and from the current tree root if false
+function! s:Bookmark.getNode(nerdtree, searchFromAbsoluteRoot)
+    if a:searchFromAbsoluteRoot
+        let l:searchRoot = a:nerdtree.root.AbsoluteTreeRoot()
+    else
+        let l:searchRoot = a:nerdtree.root
+    endif
+    let l:targetNode = l:searchRoot.findNode(self.path)
+    if empty(l:targetNode)
+        throw 'NERDTree.BookmarkedNodeNotFoundError: node for bookmark "' . self.name . '" not found'
+    endif
+    return l:targetNode
+endfunction
+
+" FUNCTION: Bookmark.GetNodeForName(name, searchFromAbsoluteRoot, nerdtree) {{{1
+" Class method that returns the tree node object for the Bookmark with the
+" given name. Throws "NERDTree.BookmarkNotFoundError" if a Bookmark with the
+" name does not exist. Throws "NERDTree.BookmarkedNodeNotFoundError" if a
+" tree node for the named Bookmark could not be found.
+function! s:Bookmark.GetNodeForName(name, searchFromAbsoluteRoot, nerdtree)
+    let l:bookmark = s:Bookmark.BookmarkFor(a:name)
+    return l:bookmark.getNode(a:nerdtree, a:searchFromAbsoluteRoot)
+endfunction
+
+" FUNCTION: Bookmark.GetSelected() {{{1
+" returns the Bookmark the cursor is over, or {}
+function! s:Bookmark.GetSelected()
+    let line = getline(".")
+    let name = substitute(line, '^>\(.\{-}\) .\+$', '\1', '')
+    if name != line
+        try
+            return s:Bookmark.BookmarkFor(name)
+        catch /^NERDTree.BookmarkNotFoundError/
+            return {}
+        endtry
+    endif
+    return {}
+endfunction
+
+" FUNCTION: Bookmark.InvalidBookmarks() {{{1
+" Class method to get all invalid bookmark strings read from the bookmarks
+" file
+function! s:Bookmark.InvalidBookmarks()
+    if !exists("g:NERDTreeInvalidBookmarks")
+        let g:NERDTreeInvalidBookmarks = []
+    endif
+    return g:NERDTreeInvalidBookmarks
+endfunction
+
+" FUNCTION: Bookmark.mustExist() {{{1
+function! s:Bookmark.mustExist()
+    if !self.path.exists()
+        call s:Bookmark.CacheBookmarks(1)
+        throw "NERDTree.BookmarkPointsToInvalidLocationError: the bookmark \"".
+            \ self.name ."\" points to a non existing location: \"". self.path.str()
+    endif
+endfunction
+
+" FUNCTION: Bookmark.New(name, path) {{{1
+" Create a new bookmark object with the given name and path object
+function! s:Bookmark.New(name, path)
+    if a:name =~# ' '
+        throw "NERDTree.IllegalBookmarkNameError: illegal name:" . a:name
+    endif
+
+    let newBookmark = copy(self)
+    let newBookmark.name = a:name
+    let newBookmark.path = a:path
+    return newBookmark
+endfunction
+
+" FUNCTION: Bookmark.open(nerdtree, [options]) {{{1
+"Args:
+"
+"nerdtree: the tree to load open the bookmark in
+"
+"A dictionary containing the following keys (all optional):
+"  'where': Specifies whether the node should be opened in new split/tab or in
+"           the previous window. Can be either 'v' (vertical split), 'h'
+"           (horizontal split), 't' (new tab) or 'p' (previous window).
+"  'reuse': if a window is displaying the file then jump the cursor there
+"  'keepopen': dont close the tree window
+"  'stay': open the file, but keep the cursor in the tree win
+"
+function! s:Bookmark.open(nerdtree, ...)
+    let opts = a:0 ? a:1 : {}
+
+    if self.path.isDirectory && !has_key(opts, 'where')
+        call self.toRoot(a:nerdtree)
+    else
+        let opener = g:NERDTreeOpener.New(self.path, opts)
+        call opener.open(self)
+    endif
+endfunction
+
+" FUNCTION: Bookmark.openInNewTab(options) {{{1
+" Create a new bookmark object with the given name and path object
+function! s:Bookmark.openInNewTab(options)
+    call nerdtree#deprecated('Bookmark.openInNewTab', 'is deprecated, use open() instead')
+    call self.open(a:options)
+endfunction
+
+" FUNCTION: Bookmark.setPath(path) {{{1
+" makes this bookmark point to the given path
+function! s:Bookmark.setPath(path)
+    let self.path = a:path
+endfunction
+
+" FUNCTION: Bookmark.SortBookmarksList() {{{1
+" Class method that sorts the global list of bookmarks alphabetically by name.
+" Note that case-sensitivity is determined by a user option.
+function! s:Bookmark.SortBookmarksList()
+    call sort(s:Bookmark.Bookmarks(), s:Bookmark.CompareBookmarksByName)
+endfunction
+
+" FUNCTION: Bookmark.str() {{{1
+" Get the string that should be rendered in the view for this bookmark
+function! s:Bookmark.str()
+    let pathStrMaxLen = winwidth(g:NERDTree.GetWinNum()) - 4 - len(self.name)
+    if &nu
+        let pathStrMaxLen = pathStrMaxLen - &numberwidth
+    endif
+
+    let pathStr = self.path.str({'format': 'UI'})
+    if len(pathStr) > pathStrMaxLen
+        let pathStr = '<' . strpart(pathStr, len(pathStr) - pathStrMaxLen)
+    endif
+    return '>' . self.name . ' ' . pathStr
+endfunction
+
+" FUNCTION: Bookmark.toRoot(nerdtree) {{{1
+" Make the node for this bookmark the new tree root
+function! s:Bookmark.toRoot(nerdtree)
+    if self.validate()
+        try
+            let targetNode = self.getNode(a:nerdtree, 1)
+        catch /^NERDTree.BookmarkedNodeNotFoundError/
+            let targetNode = g:NERDTreeFileNode.New(s:Bookmark.BookmarkFor(self.name).path, a:nerdtree)
+        endtry
+        call a:nerdtree.changeRoot(targetNode)
+    endif
+endfunction
+
+" FUNCTION: Bookmark.ToRoot(name, nerdtree) {{{1
+" Make the node for this bookmark the new tree root
+function! s:Bookmark.ToRoot(name, nerdtree)
+    let bookmark = s:Bookmark.BookmarkFor(a:name)
+    call bookmark.toRoot(a:nerdtree)
+endfunction
+
+" FUNCTION: Bookmark.validate() {{{1
+function! s:Bookmark.validate()
+    if self.path.exists()
+        return 1
+    else
+        call s:Bookmark.CacheBookmarks(1)
+        call nerdtree#echo(self.name . "now points to an invalid location. See :help NERDTreeInvalidBookmarks for info.")
+        return 0
+    endif
+endfunction
+
+" FUNCTION: Bookmark.Write() {{{1
+" Class method to write all bookmarks to the bookmarks file
+function! s:Bookmark.Write()
+    let bookmarkStrings = []
+    for i in s:Bookmark.Bookmarks()
+        call add(bookmarkStrings, i.name . ' ' . fnamemodify(i.path.str(), ':~'))
+    endfor
+
+    "add a blank line before the invalid ones
+    call add(bookmarkStrings, "")
+
+    for j in s:Bookmark.InvalidBookmarks()
+        call add(bookmarkStrings, j)
+    endfor
+    call writefile(bookmarkStrings, g:NERDTreeBookmarksFile)
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/nerdtree/lib/nerdtree/creator.vim b/vim-plugins/bundle/nerdtree/lib/nerdtree/creator.vim
new file mode 100644
index 0000000..92e1abe
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/lib/nerdtree/creator.vim
@@ -0,0 +1,379 @@
+"CLASS: Creator
+"Creates tab/window/mirror nerdtree windows. Sets up all the window and
+"buffer options and key mappings etc.
+"============================================================
+let s:Creator = {}
+let g:NERDTreeCreator = s:Creator
+
+"FUNCTION: s:Creator._bindMappings() {{{1
+function! s:Creator._bindMappings()
+    "make <cr> do the same as the activate node mapping
+    nnoremap <silent> <buffer> <cr> :call nerdtree#ui_glue#invokeKeyMap(g:NERDTreeMapActivateNode)<cr>
+
+    call g:NERDTreeKeyMap.BindAll()
+
+    command! -buffer -nargs=? Bookmark :call nerdtree#ui_glue#bookmarkNode('<args>')
+    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 RevealBookmark :call nerdtree#ui_glue#revealBookmark('<args>')
+    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 OpenBookmark call nerdtree#ui_glue#openBookmark('<args>')
+    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=* ClearBookmarks call nerdtree#ui_glue#clearBookmarks('<args>')
+    command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=+ BookmarkToRoot call g:NERDTreeBookmark.ToRoot('<args>', b:NERDTree)
+    command! -buffer -nargs=0 ClearAllBookmarks call g:NERDTreeBookmark.ClearAll() <bar> call b:NERDTree.render()
+    command! -buffer -nargs=0 ReadBookmarks call g:NERDTreeBookmark.CacheBookmarks(0) <bar> call b:NERDTree.render()
+    command! -buffer -nargs=0 WriteBookmarks call g:NERDTreeBookmark.Write()
+endfunction
+
+"FUNCTION: s:Creator._broadcastInitEvent() {{{1
+function! s:Creator._broadcastInitEvent()
+    silent doautocmd User NERDTreeInit
+endfunction
+
+" FUNCTION: s:Creator.BufNamePrefix() {{{2
+function! s:Creator.BufNamePrefix()
+    return 'NERD_tree_'
+endfunction
+
+"FUNCTION: s:Creator.CreateTabTree(a:name) {{{1
+function! s:Creator.CreateTabTree(name)
+    let creator = s:Creator.New()
+    call creator.createTabTree(a:name)
+endfunction
+
+"FUNCTION: s:Creator.createTabTree(a:name) {{{1
+"name: the name of a bookmark or a directory
+function! s:Creator.createTabTree(name)
+    let path = self._pathForString(a:name)
+
+    "abort if exception was thrown (bookmark/dir doesn't exist)
+    if empty(path)
+        return
+    endif
+
+    if path == {}
+        return
+    endif
+
+    "if instructed to, then change the vim CWD to the dir the NERDTree is
+    "inited in
+    if g:NERDTreeChDirMode != 0
+        call path.changeToDir()
+    endif
+
+    if g:NERDTree.ExistsForTab()
+        if g:NERDTree.IsOpen()
+            call g:NERDTree.Close()
+        endif
+
+        call self._removeTreeBufForTab()
+    endif
+
+    call self._createTreeWin()
+    call self._createNERDTree(path, "tab")
+    call b:NERDTree.render()
+    call b:NERDTree.root.putCursorHere(0, 0)
+
+    call self._broadcastInitEvent()
+endfunction
+
+"FUNCTION: s:Creator.CreateWindowTree(dir) {{{1
+function! s:Creator.CreateWindowTree(dir)
+    let creator = s:Creator.New()
+    call creator.createWindowTree(a:dir)
+endfunction
+
+"FUNCTION: s:Creator.createWindowTree(dir) {{{1
+function! s:Creator.createWindowTree(dir)
+    try
+        let path = g:NERDTreePath.New(a:dir)
+    catch /^NERDTree.InvalidArgumentsError/
+        call nerdtree#echo("Invalid directory name:" . a:name)
+        return
+    endtry
+
+    "we want the directory buffer to disappear when we do the :edit below
+    setlocal bufhidden=wipe
+
+    let previousBuf = expand("#")
+
+    "we need a unique name for each window tree buffer to ensure they are
+    "all independent
+    exec g:NERDTreeCreatePrefix . " edit " . self._nextBufferName()
+
+    call self._createNERDTree(path, "window")
+    let b:NERDTree._previousBuf = bufnr(previousBuf)
+    call self._setCommonBufOptions()
+
+    call b:NERDTree.render()
+
+    call self._broadcastInitEvent()
+endfunction
+
+" FUNCTION: s:Creator._createNERDTree(path) {{{1
+function! s:Creator._createNERDTree(path, type)
+    let b:NERDTree = g:NERDTree.New(a:path, a:type)
+    "TODO: This is kept for compatability only since many things use
+    "b:NERDTreeRoot instead of the new NERDTree.root
+    "Remove this one day
+    let b:NERDTreeRoot = b:NERDTree.root
+
+    call b:NERDTree.root.open()
+endfunction
+
+" FUNCTION: s:Creator.CreateMirror() {{{1
+function! s:Creator.CreateMirror()
+    let creator = s:Creator.New()
+    call creator.createMirror()
+endfunction
+
+" FUNCTION: s:Creator.createMirror() {{{1
+function! s:Creator.createMirror()
+    "get the names off all the nerd tree buffers
+    let treeBufNames = []
+    for i in range(1, tabpagenr("$"))
+        let nextName = self._tabpagevar(i, 'NERDTreeBufName')
+        if nextName != -1 && (!exists("t:NERDTreeBufName") || nextName != t:NERDTreeBufName)
+            call add(treeBufNames, nextName)
+        endif
+    endfor
+    let treeBufNames = self._uniq(treeBufNames)
+
+    "map the option names (that the user will be prompted with) to the nerd
+    "tree buffer names
+    let options = {}
+    let i = 0
+    while i < len(treeBufNames)
+        let bufName = treeBufNames[i]
+        let treeRoot = getbufvar(bufName, "NERDTree").root
+        let options[i+1 . '. ' . treeRoot.path.str() . '  (buf name: ' . bufName . ')'] = bufName
+        let i = i + 1
+    endwhile
+
+    "work out which tree to mirror, if there is more than 1 then ask the user
+    let bufferName = ''
+    if len(keys(options)) > 1
+        let choices = ["Choose a tree to mirror"]
+        let choices = extend(choices, sort(keys(options)))
+        let choice = inputlist(choices)
+        if choice < 1 || choice > len(options) || choice ==# ''
+            return
+        endif
+
+        let bufferName = options[sort(keys(options))[choice-1]]
+    elseif len(keys(options)) ==# 1
+        let bufferName = values(options)[0]
+    else
+        call nerdtree#echo("No trees to mirror")
+        return
+    endif
+
+    if g:NERDTree.ExistsForTab() && g:NERDTree.IsOpen()
+        call g:NERDTree.Close()
+    endif
+
+    let t:NERDTreeBufName = bufferName
+    call self._createTreeWin()
+    exec 'buffer ' .  bufferName
+    if !&hidden
+        call b:NERDTree.render()
+    endif
+endfunction
+
+"FUNCTION: s:Creator._createTreeWin() {{{1
+"Inits the NERD tree window. ie. opens it, sizes it, sets all the local
+"options etc
+function! s:Creator._createTreeWin()
+    "create the nerd tree window
+    let splitLocation = g:NERDTreeWinPos ==# "left" ? "topleft " : "botright "
+    let splitSize = g:NERDTreeWinSize
+
+    if !exists('t:NERDTreeBufName')
+        let t:NERDTreeBufName = self._nextBufferName()
+        silent! exec splitLocation . 'vertical ' . splitSize . ' new'
+        silent! exec "edit " . t:NERDTreeBufName
+    else
+        silent! exec splitLocation . 'vertical ' . splitSize . ' split'
+        silent! exec "buffer " . t:NERDTreeBufName
+    endif
+
+    setlocal winfixwidth
+    call self._setCommonBufOptions()
+endfunction
+
+"FUNCTION: s:Creator._isBufHidden(nr) {{{1
+function! s:Creator._isBufHidden(nr)
+    redir => bufs
+    silent ls!
+    redir END
+
+    return bufs =~ a:nr . '..h'
+endfunction
+
+"FUNCTION: s:Creator.New() {{{1
+function! s:Creator.New()
+    let newCreator = copy(self)
+    return newCreator
+endfunction
+
+" FUNCTION: s:Creator._nextBufferName() {{{2
+" returns the buffer name for the next nerd tree
+function! s:Creator._nextBufferName()
+    let name = s:Creator.BufNamePrefix() . self._nextBufferNumber()
+    return name
+endfunction
+
+" FUNCTION: s:Creator._nextBufferNumber() {{{2
+" the number to add to the nerd tree buffer name to make the buf name unique
+function! s:Creator._nextBufferNumber()
+    if !exists("s:Creator._NextBufNum")
+        let s:Creator._NextBufNum = 1
+    else
+        let s:Creator._NextBufNum += 1
+    endif
+
+    return s:Creator._NextBufNum
+endfunction
+
+"FUNCTION: s:Creator._pathForString(str) {{{1
+"find a bookmark or adirectory for the given string
+function! s:Creator._pathForString(str)
+    let path = {}
+    if g:NERDTreeBookmark.BookmarkExistsFor(a:str)
+        let path = g:NERDTreeBookmark.BookmarkFor(a:str).path
+    else
+        let dir = a:str ==# '' ? getcwd() : a:str
+
+        "hack to get an absolute path if a relative path is given
+        if dir =~# '^\.'
+            let dir = getcwd() . g:NERDTreePath.Slash() . dir
+        endif
+        let dir = g:NERDTreePath.Resolve(dir)
+
+        try
+            let path = g:NERDTreePath.New(dir)
+        catch /^NERDTree.InvalidArgumentsError/
+            call nerdtree#echo("No bookmark or directory found for: " . a:str)
+            return {}
+        endtry
+    endif
+    if !path.isDirectory
+        let path = path.getParent()
+    endif
+
+    return path
+endfunction
+
+" Function: s:Creator._removeTreeBufForTab()   {{{1
+function! s:Creator._removeTreeBufForTab()
+    let buf = bufnr(t:NERDTreeBufName)
+
+    "if &hidden is not set then it will already be gone
+    if buf != -1
+
+        "nerdtree buf may be mirrored/displayed elsewhere
+        if self._isBufHidden(buf)
+            exec "bwipeout " . buf
+        endif
+
+    endif
+
+    unlet t:NERDTreeBufName
+endfunction
+
+"FUNCTION: s:Creator._setCommonBufOptions() {{{1
+function! s:Creator._setCommonBufOptions()
+    "throwaway buffer options
+    setlocal noswapfile
+    setlocal buftype=nofile
+    setlocal bufhidden=hide
+    setlocal nowrap
+    setlocal foldcolumn=0
+    setlocal foldmethod=manual
+    setlocal nofoldenable
+    setlocal nobuflisted
+    setlocal nospell
+    if g:NERDTreeShowLineNumbers
+        setlocal nu
+    else
+        setlocal nonu
+        if v:version >= 703
+            setlocal nornu
+        endif
+    endif
+
+    iabc <buffer>
+
+    if g:NERDTreeHighlightCursorline
+        setlocal cursorline
+    endif
+
+    call self._setupStatusline()
+    call self._bindMappings()
+    setlocal filetype=nerdtree
+endfunction
+
+"FUNCTION: s:Creator._setupStatusline() {{{1
+function! s:Creator._setupStatusline()
+    if g:NERDTreeStatusline != -1
+        let &l:statusline = g:NERDTreeStatusline
+    endif
+endfunction
+
+" FUNCTION: s:Creator._tabpagevar(tabnr, var) {{{1
+function! s:Creator._tabpagevar(tabnr, var)
+    let currentTab = tabpagenr()
+    let old_ei = &ei
+    set ei=all
+
+    exec "tabnext " . a:tabnr
+    let v = -1
+    if exists('t:' . a:var)
+        exec 'let v = t:' . a:var
+    endif
+    exec "tabnext " . currentTab
+
+    let &ei = old_ei
+
+    return v
+endfunction
+
+"FUNCTION: s:Creator.ToggleTabTree(dir) {{{1
+function! s:Creator.ToggleTabTree(dir)
+    let creator = s:Creator.New()
+    call creator.toggleTabTree(a:dir)
+endfunction
+
+"FUNCTION: s:Creator.toggleTabTree(dir) {{{1
+"Toggles the NERD tree. I.e the NERD tree is open, it is closed, if it is
+"closed it is restored or initialized (if it doesnt exist)
+"
+"Args:
+"dir: the full path for the root node (is only used if the NERD tree is being
+"initialized.
+function! s:Creator.toggleTabTree(dir)
+    if g:NERDTree.ExistsForTab()
+        if !g:NERDTree.IsOpen()
+            call self._createTreeWin()
+            if !&hidden
+                call b:NERDTree.render()
+            endif
+            call b:NERDTree.ui.restoreScreenState()
+        else
+            call g:NERDTree.Close()
+        endif
+    else
+        call self.createTabTree(a:dir)
+    endif
+endfunction
+
+" Function: s:Creator._uniq(list)   {{{1
+" returns a:list without duplicates
+function! s:Creator._uniq(list)
+  let uniqlist = []
+  for elem in a:list
+    if index(uniqlist, elem) ==# -1
+      let uniqlist += [elem]
+    endif
+  endfor
+  return uniqlist
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/nerdtree/lib/nerdtree/event.vim b/vim-plugins/bundle/nerdtree/lib/nerdtree/event.vim
new file mode 100644
index 0000000..964e8ff
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/lib/nerdtree/event.vim
@@ -0,0 +1,13 @@
+"CLASS: Event
+"============================================================
+let s:Event = {}
+let g:NERDTreeEvent = s:Event
+
+function! s:Event.New(nerdtree, subject, action, params) abort
+    let newObj = copy(self)
+    let newObj.nerdtree = a:nerdtree
+    let newObj.subject = a:subject
+    let newObj.action = a:action
+    let newObj.params = a:params
+    return newObj
+endfunction
diff --git a/vim-plugins/bundle/nerdtree/lib/nerdtree/flag_set.vim b/vim-plugins/bundle/nerdtree/lib/nerdtree/flag_set.vim
new file mode 100644
index 0000000..9d8d335
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/lib/nerdtree/flag_set.vim
@@ -0,0 +1,56 @@
+"CLASS: FlagSet
+"============================================================
+let s:FlagSet = {}
+let g:NERDTreeFlagSet = s:FlagSet
+
+"FUNCTION: FlagSet.addFlag(scope, flag) {{{1
+function! s:FlagSet.addFlag(scope, flag)
+    let flags = self._flagsForScope(a:scope)
+    if index(flags, a:flag) == -1
+        call add(flags, a:flag)
+    end
+endfunction
+
+"FUNCTION: FlagSet.clearFlags(scope) {{{1
+function! s:FlagSet.clearFlags(scope)
+    let self._flags[a:scope] = []
+endfunction
+
+"FUNCTION: FlagSet._flagsForScope(scope) {{{1
+function! s:FlagSet._flagsForScope(scope)
+    if !has_key(self._flags, a:scope)
+        let self._flags[a:scope] = []
+    endif
+    return self._flags[a:scope]
+endfunction
+
+"FUNCTION: FlagSet.New() {{{1
+function! s:FlagSet.New()
+    let newObj = copy(self)
+    let newObj._flags = {}
+    return newObj
+endfunction
+
+"FUNCTION: FlagSet.removeFlag(scope, flag) {{{1
+function! s:FlagSet.removeFlag(scope, flag)
+    let flags = self._flagsForScope(a:scope)
+
+    let i = index(flags, a:flag)
+    if i >= 0
+        call remove(flags, i)
+    endif
+endfunction
+
+"FUNCTION: FlagSet.renderToString() {{{1
+function! s:FlagSet.renderToString()
+    let flagstring = ""
+    for i in values(self._flags)
+        let flagstring .= join(i)
+    endfor
+
+    if len(flagstring) == 0
+        return ""
+    endif
+
+    return '[' . flagstring . ']'
+endfunction
diff --git a/vim-plugins/bundle/nerdtree/lib/nerdtree/key_map.vim b/vim-plugins/bundle/nerdtree/lib/nerdtree/key_map.vim
new file mode 100644
index 0000000..2411406
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/lib/nerdtree/key_map.vim
@@ -0,0 +1,159 @@
+"CLASS: KeyMap
+"============================================================
+let s:KeyMap = {}
+let g:NERDTreeKeyMap = s:KeyMap
+
+"FUNCTION: KeyMap.All() {{{1
+function! s:KeyMap.All()
+    if !exists("s:keyMaps")
+        let s:keyMaps = []
+    endif
+    return s:keyMaps
+endfunction
+
+"FUNCTION: KeyMap.FindFor(key, scope) {{{1
+function! s:KeyMap.FindFor(key, scope)
+    for i in s:KeyMap.All()
+         if i.key ==# a:key && i.scope ==# a:scope
+            return i
+        endif
+    endfor
+    return {}
+endfunction
+
+"FUNCTION: KeyMap.BindAll() {{{1
+function! s:KeyMap.BindAll()
+    for i in s:KeyMap.All()
+        call i.bind()
+    endfor
+endfunction
+
+"FUNCTION: KeyMap.bind() {{{1
+function! s:KeyMap.bind()
+    " If the key sequence we're trying to map contains any '<>' notation, we
+    " must replace each of the '<' characters with '<lt>' to ensure the string
+    " is not translated into its corresponding keycode during the later part
+    " of the map command below
+    " :he <>
+    let specialNotationRegex = '\m<\([[:alnum:]_-]\+>\)'
+    if self.key =~# specialNotationRegex
+        let keymapInvokeString = substitute(self.key, specialNotationRegex, '<lt>\1', 'g')
+    else
+        let keymapInvokeString = self.key
+    endif
+
+    let premap = self.key == "<LeftRelease>" ? " <LeftRelease>" : " "
+
+    exec 'nnoremap <buffer> <silent> '. self.key . premap . ':call nerdtree#ui_glue#invokeKeyMap("'. keymapInvokeString .'")<cr>'
+endfunction
+
+"FUNCTION: KeyMap.Remove(key, scope) {{{1
+function! s:KeyMap.Remove(key, scope)
+    let maps = s:KeyMap.All()
+    for i in range(len(maps))
+         if maps[i].key ==# a:key && maps[i].scope ==# a:scope
+            return remove(maps, i)
+        endif
+    endfor
+endfunction
+
+"FUNCTION: KeyMap.invoke() {{{1
+"Call the KeyMaps callback function
+function! s:KeyMap.invoke(...)
+    let Callback = function(self.callback)
+    if a:0
+        call Callback(a:1)
+    else
+        call Callback()
+    endif
+endfunction
+
+"FUNCTION: KeyMap.Invoke() {{{1
+"Find a keymapping for a:key and the current scope invoke it.
+"
+"Scope is determined as follows:
+"   * if the cursor is on a dir node then "DirNode"
+"   * if the cursor is on a file node then "FileNode"
+"   * if the cursor is on a bookmark then "Bookmark"
+"
+"If a keymap has the scope of "all" then it will be called if no other keymap
+"is found for a:key and the scope.
+function! s:KeyMap.Invoke(key)
+
+    "required because clicking the command window below another window still
+    "invokes the <LeftRelease> mapping - but changes the window cursor
+    "is in first
+    "
+    "TODO: remove this check when the vim bug is fixed
+    if !g:NERDTree.ExistsForBuf()
+        return {}
+    endif
+
+    let node = g:NERDTreeFileNode.GetSelected()
+    if !empty(node)
+
+        "try file node
+        if !node.path.isDirectory
+            let km = s:KeyMap.FindFor(a:key, "FileNode")
+            if !empty(km)
+                return km.invoke(node)
+            endif
+        endif
+
+        "try dir node
+        if node.path.isDirectory
+            let km = s:KeyMap.FindFor(a:key, "DirNode")
+            if !empty(km)
+                return km.invoke(node)
+            endif
+        endif
+
+        "try generic node
+        let km = s:KeyMap.FindFor(a:key, "Node")
+        if !empty(km)
+            return km.invoke(node)
+        endif
+
+    endif
+
+    "try bookmark
+    let bm = g:NERDTreeBookmark.GetSelected()
+    if !empty(bm)
+        let km = s:KeyMap.FindFor(a:key, "Bookmark")
+        if !empty(km)
+            return km.invoke(bm)
+        endif
+    endif
+
+    "try all
+    let km = s:KeyMap.FindFor(a:key, "all")
+    if !empty(km)
+        return km.invoke()
+    endif
+endfunction
+
+"FUNCTION: KeyMap.Create(options) {{{1
+function! s:KeyMap.Create(options)
+    let opts = extend({'scope': 'all', 'quickhelpText': ''}, copy(a:options))
+
+    "dont override other mappings unless the 'override' option is given
+    if get(opts, 'override', 0) == 0 && !empty(s:KeyMap.FindFor(opts['key'], opts['scope']))
+        return
+    end
+
+    let newKeyMap = copy(self)
+    let newKeyMap.key = opts['key']
+    let newKeyMap.quickhelpText = opts['quickhelpText']
+    let newKeyMap.callback = opts['callback']
+    let newKeyMap.scope = opts['scope']
+
+    call s:KeyMap.Add(newKeyMap)
+endfunction
+
+"FUNCTION: KeyMap.Add(keymap) {{{1
+function! s:KeyMap.Add(keymap)
+    call s:KeyMap.Remove(a:keymap.key, a:keymap.scope)
+    call add(s:KeyMap.All(), a:keymap)
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/nerdtree/lib/nerdtree/menu_controller.vim b/vim-plugins/bundle/nerdtree/lib/nerdtree/menu_controller.vim
new file mode 100644
index 0000000..ae0ee84
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/lib/nerdtree/menu_controller.vim
@@ -0,0 +1,180 @@
+"CLASS: MenuController
+"============================================================
+let s:MenuController = {}
+let g:NERDTreeMenuController = s:MenuController
+
+"FUNCTION: MenuController.New(menuItems) {{{1
+"create a new menu controller that operates on the given menu items
+function! s:MenuController.New(menuItems)
+    let newMenuController =  copy(self)
+    if a:menuItems[0].isSeparator()
+        let newMenuController.menuItems = a:menuItems[1:-1]
+    else
+        let newMenuController.menuItems = a:menuItems
+    endif
+    return newMenuController
+endfunction
+
+"FUNCTION: MenuController.showMenu() {{{1
+"start the main loop of the menu and get the user to choose/execute a menu
+"item
+function! s:MenuController.showMenu()
+    call self._saveOptions()
+
+    try
+        let self.selection = 0
+
+        let done = 0
+        while !done
+            redraw!
+            call self._echoPrompt()
+            let key = nr2char(getchar())
+            let done = self._handleKeypress(key)
+        endwhile
+    finally
+        call self._restoreOptions()
+    endtry
+
+    if self.selection != -1
+        let m = self._current()
+        call m.execute()
+    endif
+endfunction
+
+"FUNCTION: MenuController._echoPrompt() {{{1
+function! s:MenuController._echoPrompt()
+    echo "NERDTree Menu. Use j/k/enter and the shortcuts indicated"
+    echo "=========================================================="
+
+    for i in range(0, len(self.menuItems)-1)
+        if self.selection == i
+            echo "> " . self.menuItems[i].text
+        else
+            echo "  " . self.menuItems[i].text
+        endif
+    endfor
+endfunction
+
+"FUNCTION: MenuController._current(key) {{{1
+"get the MenuItem that is currently selected
+function! s:MenuController._current()
+    return self.menuItems[self.selection]
+endfunction
+
+"FUNCTION: MenuController._handleKeypress(key) {{{1
+"change the selection (if appropriate) and return 1 if the user has made
+"their choice, 0 otherwise
+function! s:MenuController._handleKeypress(key)
+    if a:key == 'j'
+        call self._cursorDown()
+    elseif a:key == 'k'
+        call self._cursorUp()
+    elseif a:key == nr2char(27) "escape
+        let self.selection = -1
+        return 1
+    elseif a:key == "\r" || a:key == "\n" "enter and ctrl-j
+        return 1
+    else
+        let index = self._nextIndexFor(a:key)
+        if index != -1
+            let self.selection = index
+            if len(self._allIndexesFor(a:key)) == 1
+                return 1
+            endif
+        endif
+    endif
+
+    return 0
+endfunction
+
+"FUNCTION: MenuController._allIndexesFor(shortcut) {{{1
+"get indexes to all menu items with the given shortcut
+function! s:MenuController._allIndexesFor(shortcut)
+    let toReturn = []
+
+    for i in range(0, len(self.menuItems)-1)
+        if self.menuItems[i].shortcut == a:shortcut
+            call add(toReturn, i)
+        endif
+    endfor
+
+    return toReturn
+endfunction
+
+"FUNCTION: MenuController._nextIndexFor(shortcut) {{{1
+"get the index to the next menu item with the given shortcut, starts from the
+"current cursor location and wraps around to the top again if need be
+function! s:MenuController._nextIndexFor(shortcut)
+    for i in range(self.selection+1, len(self.menuItems)-1)
+        if self.menuItems[i].shortcut == a:shortcut
+            return i
+        endif
+    endfor
+
+    for i in range(0, self.selection)
+        if self.menuItems[i].shortcut == a:shortcut
+            return i
+        endif
+    endfor
+
+    return -1
+endfunction
+
+"FUNCTION: MenuController._setCmdheight() {{{1
+"sets &cmdheight to whatever is needed to display the menu
+function! s:MenuController._setCmdheight()
+    let &cmdheight = len(self.menuItems) + 3
+endfunction
+
+"FUNCTION: MenuController._saveOptions() {{{1
+"set any vim options that are required to make the menu work (saving their old
+"values)
+function! s:MenuController._saveOptions()
+    let self._oldLazyredraw = &lazyredraw
+    let self._oldCmdheight = &cmdheight
+    set nolazyredraw
+    call self._setCmdheight()
+endfunction
+
+"FUNCTION: MenuController._restoreOptions() {{{1
+"restore the options we saved in _saveOptions()
+function! s:MenuController._restoreOptions()
+    let &cmdheight = self._oldCmdheight
+    let &lazyredraw = self._oldLazyredraw
+endfunction
+
+"FUNCTION: MenuController._cursorDown() {{{1
+"move the cursor to the next menu item, skipping separators
+function! s:MenuController._cursorDown()
+    let done = 0
+    while !done
+        if self.selection < len(self.menuItems)-1
+            let self.selection += 1
+        else
+            let self.selection = 0
+        endif
+
+        if !self._current().isSeparator()
+            let done = 1
+        endif
+    endwhile
+endfunction
+
+"FUNCTION: MenuController._cursorUp() {{{1
+"move the cursor to the previous menu item, skipping separators
+function! s:MenuController._cursorUp()
+    let done = 0
+    while !done
+        if self.selection > 0
+            let self.selection -= 1
+        else
+            let self.selection = len(self.menuItems)-1
+        endif
+
+        if !self._current().isSeparator()
+            let done = 1
+        endif
+    endwhile
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/nerdtree/lib/nerdtree/menu_item.vim b/vim-plugins/bundle/nerdtree/lib/nerdtree/menu_item.vim
new file mode 100644
index 0000000..92c1bbb
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/lib/nerdtree/menu_item.vim
@@ -0,0 +1,114 @@
+"CLASS: MenuItem
+"============================================================
+let s:MenuItem = {}
+let g:NERDTreeMenuItem = s:MenuItem
+
+"FUNCTION: MenuItem.All() {{{1
+"get all top level menu items
+function! s:MenuItem.All()
+    if !exists("s:menuItems")
+        let s:menuItems = []
+    endif
+    return s:menuItems
+endfunction
+
+"FUNCTION: MenuItem.AllEnabled() {{{1
+"get all top level menu items that are currently enabled
+function! s:MenuItem.AllEnabled()
+    let toReturn = []
+    for i in s:MenuItem.All()
+        if i.enabled()
+            call add(toReturn, i)
+        endif
+    endfor
+    return toReturn
+endfunction
+
+"FUNCTION: MenuItem.Create(options) {{{1
+"make a new menu item and add it to the global list
+function! s:MenuItem.Create(options)
+    let newMenuItem = copy(self)
+
+    let newMenuItem.text = a:options['text']
+    let newMenuItem.shortcut = a:options['shortcut']
+    let newMenuItem.children = []
+
+    let newMenuItem.isActiveCallback = -1
+    if has_key(a:options, 'isActiveCallback')
+        let newMenuItem.isActiveCallback = a:options['isActiveCallback']
+    endif
+
+    let newMenuItem.callback = -1
+    if has_key(a:options, 'callback')
+        let newMenuItem.callback = a:options['callback']
+    endif
+
+    if has_key(a:options, 'parent')
+        call add(a:options['parent'].children, newMenuItem)
+    else
+        call add(s:MenuItem.All(), newMenuItem)
+    endif
+
+    return newMenuItem
+endfunction
+
+"FUNCTION: MenuItem.CreateSeparator(options) {{{1
+"make a new separator menu item and add it to the global list
+function! s:MenuItem.CreateSeparator(options)
+    let standard_options = { 'text': '--------------------',
+                \ 'shortcut': -1,
+                \ 'callback': -1 }
+    let options = extend(a:options, standard_options, "force")
+
+    return s:MenuItem.Create(options)
+endfunction
+
+"FUNCTION: MenuItem.CreateSubmenu(options) {{{1
+"make a new submenu and add it to global list
+function! s:MenuItem.CreateSubmenu(options)
+    let standard_options = { 'callback': -1 }
+    let options = extend(a:options, standard_options, "force")
+
+    return s:MenuItem.Create(options)
+endfunction
+
+"FUNCTION: MenuItem.enabled() {{{1
+"return 1 if this menu item should be displayed
+"
+"delegates off to the isActiveCallback, and defaults to 1 if no callback was
+"specified
+function! s:MenuItem.enabled()
+    if self.isActiveCallback != -1
+        return {self.isActiveCallback}()
+    endif
+    return 1
+endfunction
+
+"FUNCTION: MenuItem.execute() {{{1
+"perform the action behind this menu item, if this menuitem has children then
+"display a new menu for them, otherwise deletegate off to the menuitem's
+"callback
+function! s:MenuItem.execute()
+    if len(self.children)
+        let mc = g:NERDTreeMenuController.New(self.children)
+        call mc.showMenu()
+    else
+        if self.callback != -1
+            call {self.callback}()
+        endif
+    endif
+endfunction
+
+"FUNCTION: MenuItem.isSeparator() {{{1
+"return 1 if this menuitem is a separator
+function! s:MenuItem.isSeparator()
+    return self.callback == -1 && self.children == []
+endfunction
+
+"FUNCTION: MenuItem.isSubmenu() {{{1
+"return 1 if this menuitem is a submenu
+function! s:MenuItem.isSubmenu()
+    return self.callback == -1 && !empty(self.children)
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/nerdtree/lib/nerdtree/nerdtree.vim b/vim-plugins/bundle/nerdtree/lib/nerdtree/nerdtree.vim
new file mode 100644
index 0000000..1404cee
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/lib/nerdtree/nerdtree.vim
@@ -0,0 +1,197 @@
+"CLASS: NERDTree
+"============================================================
+let s:NERDTree = {}
+let g:NERDTree = s:NERDTree
+
+"FUNCTION: s:NERDTree.AddPathFilter() {{{1
+function! s:NERDTree.AddPathFilter(callback)
+    call add(s:NERDTree.PathFilters(), a:callback)
+endfunction
+
+"FUNCTION: s:NERDTree.changeRoot(node) {{{1
+function! s:NERDTree.changeRoot(node)
+    if a:node.path.isDirectory
+        let self.root = a:node
+    else
+        call a:node.cacheParent()
+        let self.root = a:node.parent
+    endif
+
+    call self.root.open()
+
+    "change dir to the dir of the new root if instructed to
+    if g:NERDTreeChDirMode ==# 2
+        exec "cd " . self.root.path.str({'format': 'Edit'})
+    endif
+
+    call self.render()
+    call self.root.putCursorHere(0, 0)
+
+    silent doautocmd User NERDTreeNewRoot
+endfunction
+
+"FUNCTION: s:NERDTree.Close() {{{1
+"Closes the tab tree window for this tab
+function! s:NERDTree.Close()
+    if !s:NERDTree.IsOpen()
+        return
+    endif
+
+    if winnr("$") != 1
+        if winnr() == s:NERDTree.GetWinNum()
+            call nerdtree#exec("wincmd p")
+            let bufnr = bufnr("")
+            call nerdtree#exec("wincmd p")
+        else
+            let bufnr = bufnr("")
+        endif
+
+        call nerdtree#exec(s:NERDTree.GetWinNum() . " wincmd w")
+        close
+        call nerdtree#exec(bufwinnr(bufnr) . " wincmd w")
+    else
+        close
+    endif
+endfunction
+
+"FUNCTION: s:NERDTree.CloseIfQuitOnOpen() {{{1
+"Closes the NERD tree window if the close on open option is set
+function! s:NERDTree.CloseIfQuitOnOpen()
+    if g:NERDTreeQuitOnOpen && s:NERDTree.IsOpen()
+        call s:NERDTree.Close()
+    endif
+endfunction
+
+"FUNCTION: s:NERDTree.CursorToBookmarkTable(){{{1
+"Places the cursor at the top of the bookmarks table
+function! s:NERDTree.CursorToBookmarkTable()
+    if !b:NERDTree.ui.getShowBookmarks()
+        throw "NERDTree.IllegalOperationError: cant find bookmark table, bookmarks arent active"
+    endif
+
+    if g:NERDTreeMinimalUI
+        return cursor(1, 2)
+    endif
+
+    let rootNodeLine = b:NERDTree.ui.getRootLineNum()
+
+    let line = 1
+    while getline(line) !~# '^>-\+Bookmarks-\+$'
+        let line = line + 1
+        if line >= rootNodeLine
+            throw "NERDTree.BookmarkTableNotFoundError: didnt find the bookmarks table"
+        endif
+    endwhile
+    call cursor(line, 2)
+endfunction
+
+"FUNCTION: s:NERDTree.CursorToTreeWin(){{{1
+"Places the cursor in the nerd tree window
+function! s:NERDTree.CursorToTreeWin()
+    call g:NERDTree.MustBeOpen()
+    call nerdtree#exec(g:NERDTree.GetWinNum() . "wincmd w")
+endfunction
+
+" Function: s:NERDTree.ExistsForBuffer()   {{{1
+" Returns 1 if a nerd tree root exists in the current buffer
+function! s:NERDTree.ExistsForBuf()
+    return exists("b:NERDTree")
+endfunction
+
+" Function: s:NERDTree.ExistsForTab()   {{{1
+" Returns 1 if a nerd tree root exists in the current tab
+function! s:NERDTree.ExistsForTab()
+    if !exists("t:NERDTreeBufName")
+        return
+    end
+
+    "check b:NERDTree is still there and hasn't been e.g. :bdeleted
+    return !empty(getbufvar(bufnr(t:NERDTreeBufName), 'NERDTree'))
+endfunction
+
+function! s:NERDTree.ForCurrentBuf()
+    if s:NERDTree.ExistsForBuf()
+        return b:NERDTree
+    else
+        return {}
+    endif
+endfunction
+
+"FUNCTION: s:NERDTree.ForCurrentTab() {{{1
+function! s:NERDTree.ForCurrentTab()
+    if !s:NERDTree.ExistsForTab()
+        return
+    endif
+
+    let bufnr = bufnr(t:NERDTreeBufName)
+    return getbufvar(bufnr, "NERDTree")
+endfunction
+
+"FUNCTION: s:NERDTree.getRoot() {{{1
+function! s:NERDTree.getRoot()
+    return self.root
+endfunction
+
+"FUNCTION: s:NERDTree.GetWinNum() {{{1
+"gets the nerd tree window number for this tab
+function! s:NERDTree.GetWinNum()
+    if exists("t:NERDTreeBufName")
+        return bufwinnr(t:NERDTreeBufName)
+    endif
+
+    return -1
+endfunction
+
+"FUNCTION: s:NERDTree.IsOpen() {{{1
+function! s:NERDTree.IsOpen()
+    return s:NERDTree.GetWinNum() != -1
+endfunction
+
+"FUNCTION: s:NERDTree.isTabTree() {{{1
+function! s:NERDTree.isTabTree()
+    return self._type == "tab"
+endfunction
+
+"FUNCTION: s:NERDTree.isWinTree() {{{1
+function! s:NERDTree.isWinTree()
+    return self._type == "window"
+endfunction
+
+"FUNCTION: s:NERDTree.MustBeOpen() {{{1
+function! s:NERDTree.MustBeOpen()
+    if !s:NERDTree.IsOpen()
+        throw "NERDTree.TreeNotOpen"
+    endif
+endfunction
+
+"FUNCTION: s:NERDTree.New() {{{1
+function! s:NERDTree.New(path, type)
+    let newObj = copy(self)
+    let newObj.ui = g:NERDTreeUI.New(newObj)
+    let newObj.root = g:NERDTreeDirNode.New(a:path, newObj)
+    let newObj._type = a:type
+    return newObj
+endfunction
+
+"FUNCTION: s:NERDTree.PathFilters() {{{1
+function! s:NERDTree.PathFilters()
+    if !exists('s:NERDTree._PathFilters')
+        let s:NERDTree._PathFilters = []
+    endif
+    return s:NERDTree._PathFilters
+endfunction
+
+"FUNCTION: s:NERDTree.previousBuf() {{{1
+function! s:NERDTree.previousBuf()
+    return self._previousBuf
+endfunction
+
+function! s:NERDTree.setPreviousBuf(bnum)
+    let self._previousBuf = a:bnum
+endfunction
+
+"FUNCTION: s:NERDTree.render() {{{1
+"A convenience function - since this is called often
+function! s:NERDTree.render()
+    call self.ui.render()
+endfunction
diff --git a/vim-plugins/bundle/nerdtree/lib/nerdtree/notifier.vim b/vim-plugins/bundle/nerdtree/lib/nerdtree/notifier.vim
new file mode 100644
index 0000000..00041b8
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/lib/nerdtree/notifier.vim
@@ -0,0 +1,35 @@
+"CLASS: Notifier
+"============================================================
+let s:Notifier = {}
+
+function! s:Notifier.AddListener(event, funcname)
+    let listeners = s:Notifier.GetListenersForEvent(a:event)
+    if listeners == []
+        let listenersMap = s:Notifier.GetListenersMap()
+        let listenersMap[a:event] = listeners
+    endif
+    call add(listeners, a:funcname)
+endfunction
+
+function! s:Notifier.NotifyListeners(event, path, nerdtree, params)
+    let event = g:NERDTreeEvent.New(a:nerdtree, a:path, a:event, a:params)
+
+    for listener in s:Notifier.GetListenersForEvent(a:event)
+        call {listener}(event)
+    endfor
+endfunction
+
+function! s:Notifier.GetListenersMap()
+    if !exists("s:refreshListenersMap")
+        let s:refreshListenersMap = {}
+    endif
+    return s:refreshListenersMap
+endfunction
+
+function! s:Notifier.GetListenersForEvent(name)
+    let listenersMap = s:Notifier.GetListenersMap()
+    return get(listenersMap, a:name, [])
+endfunction
+
+let g:NERDTreePathNotifier = deepcopy(s:Notifier)
+
diff --git a/vim-plugins/bundle/nerdtree/lib/nerdtree/opener.vim b/vim-plugins/bundle/nerdtree/lib/nerdtree/opener.vim
new file mode 100644
index 0000000..ac0f92e
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/lib/nerdtree/opener.vim
@@ -0,0 +1,343 @@
+"CLASS: Opener
+"============================================================
+let s:Opener = {}
+let g:NERDTreeOpener = s:Opener
+
+"FUNCTION: s:Opener._bufInWindows(bnum){{{1
+"[[STOLEN FROM VTREEEXPLORER.VIM]]
+"Determine the number of windows open to this buffer number.
+"Care of Yegappan Lakshman.  Thanks!
+"
+"Args:
+"bnum: the subject buffers buffer number
+function! s:Opener._bufInWindows(bnum)
+    let cnt = 0
+    let winnum = 1
+    while 1
+        let bufnum = winbufnr(winnum)
+        if bufnum < 0
+            break
+        endif
+        if bufnum ==# a:bnum
+            let cnt = cnt + 1
+        endif
+        let winnum = winnum + 1
+    endwhile
+
+    return cnt
+endfunction
+"FUNCTION: Opener._checkToCloseTree(newtab) {{{1
+"Check the class options and global options (i.e. NERDTreeQuitOnOpen) to see
+"if the tree should be closed now.
+"
+"Args:
+"a:newtab - boolean. If set, only close the tree now if we are opening the
+"target in a new tab. This is needed because we have to close tree before we
+"leave the tab
+function! s:Opener._checkToCloseTree(newtab)
+    if self._keepopen
+        return
+    endif
+
+    if (a:newtab && self._where == 't') || !a:newtab
+        call g:NERDTree.CloseIfQuitOnOpen()
+    endif
+endfunction
+
+
+"FUNCTION: s:Opener._firstUsableWindow(){{{1
+"find the window number of the first normal window
+function! s:Opener._firstUsableWindow()
+    let i = 1
+    while i <= winnr("$")
+        let bnum = winbufnr(i)
+        if bnum != -1 && getbufvar(bnum, '&buftype') ==# ''
+                    \ && !getwinvar(i, '&previewwindow')
+                    \ && (!getbufvar(bnum, '&modified') || &hidden)
+            return i
+        endif
+
+        let i += 1
+    endwhile
+    return -1
+endfunction
+
+"FUNCTION: Opener._gotoTargetWin() {{{1
+function! s:Opener._gotoTargetWin()
+    if b:NERDTree.isWinTree()
+        if self._where == 'v'
+            vsplit
+        elseif self._where == 'h'
+            split
+        elseif self._where == 't'
+            tabnew
+        endif
+    else
+        call self._checkToCloseTree(1)
+
+        if self._where == 'v'
+            call self._newVSplit()
+        elseif self._where == 'h'
+            call self._newSplit()
+        elseif self._where == 't'
+            tabnew
+        elseif self._where == 'p'
+            call self._previousWindow()
+        endif
+
+        call self._checkToCloseTree(0)
+    endif
+endfunction
+
+"FUNCTION: s:Opener._isWindowUsable(winnumber) {{{1
+"Returns 0 if opening a file from the tree in the given window requires it to
+"be split, 1 otherwise
+"
+"Args:
+"winnumber: the number of the window in question
+function! s:Opener._isWindowUsable(winnumber)
+    "gotta split if theres only one window (i.e. the NERD tree)
+    if winnr("$") ==# 1
+        return 0
+    endif
+
+    let oldwinnr = winnr()
+    call nerdtree#exec(a:winnumber . "wincmd p")
+    let specialWindow = getbufvar("%", '&buftype') != '' || getwinvar('%', '&previewwindow')
+    let modified = &modified
+    call nerdtree#exec(oldwinnr . "wincmd p")
+
+    "if its a special window e.g. quickfix or another explorer plugin then we
+    "have to split
+    if specialWindow
+        return 0
+    endif
+
+    if &hidden
+        return 1
+    endif
+
+    return !modified || self._bufInWindows(winbufnr(a:winnumber)) >= 2
+endfunction
+
+"FUNCTION: Opener.New(path, opts) {{{1
+"Args:
+"
+"a:path: The path object that is to be opened.
+"
+"a:opts:
+"
+"A dictionary containing the following keys (all optional):
+"  'where': Specifies whether the node should be opened in new split/tab or in
+"           the previous window. Can be either 'v' or 'h' or 't' (for open in
+"           new tab)
+"  'reuse': if a window is displaying the file then jump the cursor there. Can
+"           'all', 'currenttab' or empty to not reuse.
+"  'keepopen': dont close the tree window
+"  'stay': open the file, but keep the cursor in the tree win
+function! s:Opener.New(path, opts)
+    let newObj = copy(self)
+
+    let newObj._path = a:path
+    let newObj._stay = nerdtree#has_opt(a:opts, 'stay')
+
+    if has_key(a:opts, 'reuse')
+        let newObj._reuse = a:opts['reuse']
+    else
+        let newObj._reuse = ''
+    endif
+
+    let newObj._keepopen = nerdtree#has_opt(a:opts, 'keepopen')
+    let newObj._where = has_key(a:opts, 'where') ? a:opts['where'] : ''
+    let newObj._nerdtree = b:NERDTree
+    call newObj._saveCursorPos()
+
+    return newObj
+endfunction
+
+"FUNCTION: Opener._newSplit() {{{1
+function! s:Opener._newSplit()
+    " Save the user's settings for splitbelow and splitright
+    let savesplitbelow=&splitbelow
+    let savesplitright=&splitright
+
+    " 'there' will be set to a command to move from the split window
+    " back to the explorer window
+    "
+    " 'back' will be set to a command to move from the explorer window
+    " back to the newly split window
+    "
+    " 'right' and 'below' will be set to the settings needed for
+    " splitbelow and splitright IF the explorer is the only window.
+    "
+    let there= g:NERDTreeWinPos ==# "left" ? "wincmd h" : "wincmd l"
+    let back = g:NERDTreeWinPos ==# "left" ? "wincmd l" : "wincmd h"
+    let right= g:NERDTreeWinPos ==# "left"
+    let below=0
+
+    " Attempt to go to adjacent window
+    call nerdtree#exec(back)
+
+    let onlyOneWin = (winnr("$") ==# 1)
+
+    " If no adjacent window, set splitright and splitbelow appropriately
+    if onlyOneWin
+        let &splitright=right
+        let &splitbelow=below
+    else
+        " found adjacent window - invert split direction
+        let &splitright=!right
+        let &splitbelow=!below
+    endif
+
+    let splitMode = onlyOneWin ? "vertical" : ""
+
+    " Open the new window
+    try
+        exec(splitMode." sp ")
+    catch /^Vim\%((\a\+)\)\=:E37/
+        call g:NERDTree.CursorToTreeWin()
+        throw "NERDTree.FileAlreadyOpenAndModifiedError: ". self._path.str() ." is already open and modified."
+    catch /^Vim\%((\a\+)\)\=:/
+        "do nothing
+    endtry
+
+    "resize the tree window if no other window was open before
+    if onlyOneWin
+        let size = exists("b:NERDTreeOldWindowSize") ? b:NERDTreeOldWindowSize : g:NERDTreeWinSize
+        call nerdtree#exec(there)
+        exec("silent ". splitMode ." resize ". size)
+        call nerdtree#exec('wincmd p')
+    endif
+
+    " Restore splitmode settings
+    let &splitbelow=savesplitbelow
+    let &splitright=savesplitright
+endfunction
+
+"FUNCTION: Opener._newVSplit() {{{1
+function! s:Opener._newVSplit()
+    let winwidth = winwidth(".")
+    if winnr("$")==#1
+        let winwidth = g:NERDTreeWinSize
+    endif
+
+    call nerdtree#exec("wincmd p")
+    vnew
+
+    "resize the nerd tree back to the original size
+    call g:NERDTree.CursorToTreeWin()
+    exec("silent vertical resize ". winwidth)
+    call nerdtree#exec('wincmd p')
+endfunction
+
+"FUNCTION: Opener.open(target) {{{1
+function! s:Opener.open(target)
+    if self._path.isDirectory
+        call self._openDirectory(a:target)
+    else
+        call self._openFile()
+    endif
+endfunction
+
+"FUNCTION: Opener._openFile() {{{1
+function! s:Opener._openFile()
+    if self._reuseWindow()
+        return
+    endif
+
+    call self._gotoTargetWin()
+    call self._path.edit()
+    if self._stay
+        call self._restoreCursorPos()
+    endif
+endfunction
+
+"FUNCTION: Opener._openDirectory(node) {{{1
+function! s:Opener._openDirectory(node)
+    if self._nerdtree.isWinTree()
+        call self._gotoTargetWin()
+        call g:NERDTreeCreator.CreateWindowTree(a:node.path.str())
+    else
+        call self._gotoTargetWin()
+        if empty(self._where)
+            call b:NERDTree.changeRoot(a:node)
+        elseif self._where == 't'
+            call g:NERDTreeCreator.CreateTabTree(a:node.path.str())
+        else
+            call g:NERDTreeCreator.CreateWindowTree(a:node.path.str())
+        endif
+    endif
+
+    if self._stay
+        call self._restoreCursorPos()
+    endif
+endfunction
+
+"FUNCTION: Opener._previousWindow() {{{1
+function! s:Opener._previousWindow()
+    if !self._isWindowUsable(winnr("#")) && self._firstUsableWindow() ==# -1
+        call self._newSplit()
+    else
+        try
+            if !self._isWindowUsable(winnr("#"))
+                call nerdtree#exec(self._firstUsableWindow() . "wincmd w")
+            else
+                call nerdtree#exec('wincmd p')
+            endif
+        catch /^Vim\%((\a\+)\)\=:E37/
+            call g:NERDTree.CursorToTreeWin()
+            throw "NERDTree.FileAlreadyOpenAndModifiedError: ". self._path.str() ." is already open and modified."
+        catch /^Vim\%((\a\+)\)\=:/
+            echo v:exception
+        endtry
+    endif
+endfunction
+
+"FUNCTION: Opener._restoreCursorPos(){{{1
+function! s:Opener._restoreCursorPos()
+    call nerdtree#exec('normal ' . self._tabnr . 'gt')
+    call nerdtree#exec(bufwinnr(self._bufnr) . 'wincmd w')
+endfunction
+
+"FUNCTION: Opener._reuseWindow(){{{1
+"put the cursor in the first window we find for this file
+"
+"return 1 if we were successful
+function! s:Opener._reuseWindow()
+    if empty(self._reuse)
+        return 0
+    endif
+
+    "check the current tab for the window
+    let winnr = bufwinnr('^' . self._path.str() . '$')
+    if winnr != -1
+        call nerdtree#exec(winnr . "wincmd w")
+        call self._checkToCloseTree(0)
+        return 1
+    endif
+
+    if self._reuse == 'currenttab'
+        return 0
+    endif
+
+    "check other tabs
+    let tabnr = self._path.tabnr()
+    if tabnr
+        call self._checkToCloseTree(1)
+        call nerdtree#exec('normal! ' . tabnr . 'gt')
+        let winnr = bufwinnr('^' . self._path.str() . '$')
+        call nerdtree#exec(winnr . "wincmd w")
+        return 1
+    endif
+
+    return 0
+endfunction
+
+"FUNCTION: Opener._saveCursorPos(){{{1
+function! s:Opener._saveCursorPos()
+    let self._bufnr = bufnr("")
+    let self._tabnr = tabpagenr()
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/nerdtree/lib/nerdtree/path.vim b/vim-plugins/bundle/nerdtree/lib/nerdtree/path.vim
new file mode 100644
index 0000000..805e4a6
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/lib/nerdtree/path.vim
@@ -0,0 +1,798 @@
+"we need to use this number many times for sorting... so we calculate it only
+"once here
+let s:NERDTreeSortStarIndex = index(g:NERDTreeSortOrder, '*')
+" used in formating sortKey, e.g. '%04d'
+if exists("log10")
+    let s:sortKeyFormat = "%0" . float2nr(ceil(log10(len(g:NERDTreeSortOrder)))) . "d"
+else
+    let s:sortKeyFormat = "%04d"
+endif
+
+"CLASS: Path
+"============================================================
+let s:Path = {}
+let g:NERDTreePath = s:Path
+
+"FUNCTION: Path.AbsolutePathFor(str) {{{1
+function! s:Path.AbsolutePathFor(str)
+    let prependCWD = 0
+    if nerdtree#runningWindows()
+        let prependCWD = a:str !~# '^.:\(\\\|\/\)' && a:str !~# '^\(\\\\\|\/\/\)'
+    else
+        let prependCWD = a:str !~# '^/'
+    endif
+
+    let toReturn = a:str
+    if prependCWD
+        let toReturn = getcwd() . s:Path.Slash() . a:str
+    endif
+
+    return toReturn
+endfunction
+
+"FUNCTION: Path.bookmarkNames() {{{1
+function! s:Path.bookmarkNames()
+    if !exists("self._bookmarkNames")
+        call self.cacheDisplayString()
+    endif
+    return self._bookmarkNames
+endfunction
+
+"FUNCTION: Path.cacheDisplayString() {{{1
+function! s:Path.cacheDisplayString() abort
+    let self.cachedDisplayString = self.getLastPathComponent(1)
+
+    if self.isExecutable
+        let self.cachedDisplayString = self.cachedDisplayString . '*'
+    endif
+
+    let self._bookmarkNames = []
+    for i in g:NERDTreeBookmark.Bookmarks()
+        if i.path.equals(self)
+            call add(self._bookmarkNames, i.name)
+        endif
+    endfor
+    if !empty(self._bookmarkNames) && g:NERDTreeMarkBookmarks == 1
+        let self.cachedDisplayString .= ' {' . join(self._bookmarkNames) . '}'
+    endif
+
+    if self.isSymLink
+        let self.cachedDisplayString .=  ' -> ' . self.symLinkDest
+    endif
+
+    if self.isReadOnly
+        let self.cachedDisplayString .=  ' ['.g:NERDTreeGlyphReadOnly.']'
+    endif
+endfunction
+
+"FUNCTION: Path.changeToDir() {{{1
+function! s:Path.changeToDir()
+    let dir = self.str({'format': 'Cd'})
+    if self.isDirectory ==# 0
+        let dir = self.getParent().str({'format': 'Cd'})
+    endif
+
+    try
+        execute "cd " . dir
+        call nerdtree#echo("CWD is now: " . getcwd())
+    catch
+        throw "NERDTree.PathChangeError: cannot change CWD to " . dir
+    endtry
+endfunction
+
+"FUNCTION: Path.compareTo() {{{1
+"
+"Compares this Path to the given path and returns 0 if they are equal, -1 if
+"this Path is "less than" the given path, or 1 if it is "greater".
+"
+"Args:
+"path: the path object to compare this to
+"
+"Return:
+"1, -1 or 0
+function! s:Path.compareTo(path)
+    let thisPath = self.getLastPathComponent(1)
+    let thatPath = a:path.getLastPathComponent(1)
+
+    "if the paths are the same then clearly we return 0
+    if thisPath ==# thatPath
+        return 0
+    endif
+
+    let thisSS = self.getSortOrderIndex()
+    let thatSS = a:path.getSortOrderIndex()
+
+    "compare the sort sequences, if they are different then the return
+    "value is easy
+    if thisSS < thatSS
+        return -1
+    elseif thisSS > thatSS
+        return 1
+    else
+        if !g:NERDTreeSortHiddenFirst
+            let thisPath = substitute(thisPath, '^[._]', '', '')
+            let thatPath = substitute(thatPath, '^[._]', '', '')
+        endif
+        "if the sort sequences are the same then compare the paths
+        "alphabetically
+        let pathCompare = g:NERDTreeCaseSensitiveSort ? thisPath <# thatPath : thisPath <? thatPath
+        if pathCompare
+            return -1
+        else
+            return 1
+        endif
+    endif
+endfunction
+
+"FUNCTION: Path.Create(fullpath) {{{1
+"
+"Factory method.
+"
+"Creates a path object with the given path. The path is also created on the
+"filesystem. If the path already exists, a NERDTree.Path.Exists exception is
+"thrown. If any other errors occur, a NERDTree.Path exception is thrown.
+"
+"Args:
+"fullpath: the full filesystem path to the file/dir to create
+function! s:Path.Create(fullpath)
+    "bail if the a:fullpath already exists
+    if isdirectory(a:fullpath) || filereadable(a:fullpath)
+        throw "NERDTree.CreatePathError: Directory Exists: '" . a:fullpath . "'"
+    endif
+
+    try
+
+        "if it ends with a slash, assume its a dir create it
+        if a:fullpath =~# '\(\\\|\/\)$'
+            "whack the trailing slash off the end if it exists
+            let fullpath = substitute(a:fullpath, '\(\\\|\/\)$', '', '')
+
+            call mkdir(fullpath, 'p')
+
+        "assume its a file and create
+        else
+            call s:Path.createParentDirectories(a:fullpath)
+            call writefile([], a:fullpath)
+        endif
+    catch
+        throw "NERDTree.CreatePathError: Could not create path: '" . a:fullpath . "'"
+    endtry
+
+    return s:Path.New(a:fullpath)
+endfunction
+
+"FUNCTION: Path.copy(dest) {{{1
+"
+"Copies the file/dir represented by this Path to the given location
+"
+"Args:
+"dest: the location to copy this dir/file to
+function! s:Path.copy(dest)
+    if !s:Path.CopyingSupported()
+        throw "NERDTree.CopyingNotSupportedError: Copying is not supported on this OS"
+    endif
+
+    call s:Path.createParentDirectories(a:dest)
+
+    if exists('g:NERDTreeCopyCmd')
+        let cmd_prefix = g:NERDTreeCopyCmd
+    else
+        let cmd_prefix = (self.isDirectory ? g:NERDTreeCopyDirCmd : g:NERDTreeCopyFileCmd)
+    endif
+
+    let cmd = cmd_prefix . " " . escape(self.str(), self._escChars()) . " " . escape(a:dest, self._escChars())
+    let success = system(cmd)
+    if v:shell_error != 0
+        throw "NERDTree.CopyError: Could not copy ''". self.str() ."'' to: '" . a:dest . "'"
+    endif
+endfunction
+
+"FUNCTION: Path.CopyingSupported() {{{1
+"
+"returns 1 if copying is supported for this OS
+function! s:Path.CopyingSupported()
+    return exists('g:NERDTreeCopyCmd') || (exists('g:NERDTreeCopyDirCmd') && exists('g:NERDTreeCopyFileCmd'))
+endfunction
+
+"FUNCTION: Path.copyingWillOverwrite(dest) {{{1
+"
+"returns 1 if copy this path to the given location will cause files to
+"overwritten
+"
+"Args:
+"dest: the location this path will be copied to
+function! s:Path.copyingWillOverwrite(dest)
+    if filereadable(a:dest)
+        return 1
+    endif
+
+    if isdirectory(a:dest)
+        let path = s:Path.JoinPathStrings(a:dest, self.getLastPathComponent(0))
+        if filereadable(path)
+            return 1
+        endif
+    endif
+endfunction
+
+"FUNCTION: Path.createParentDirectories(path) {{{1
+"
+"create parent directories for this path if needed
+"without throwing any errors if those directories already exist
+"
+"Args:
+"path: full path of the node whose parent directories may need to be created
+function! s:Path.createParentDirectories(path)
+    let dir_path = fnamemodify(a:path, ':h')
+    if !isdirectory(dir_path)
+        call mkdir(dir_path, 'p')
+    endif
+endfunction
+
+"FUNCTION: Path.delete() {{{1
+"
+"Deletes the file or directory represented by this path.
+"
+"Throws NERDTree.Path.Deletion exceptions
+function! s:Path.delete()
+    if self.isDirectory
+
+        let cmd = g:NERDTreeRemoveDirCmd . self.str({'escape': 1})
+        let success = system(cmd)
+
+        if v:shell_error != 0
+            throw "NERDTree.PathDeletionError: Could not delete directory: '" . self.str() . "'"
+        endif
+    else
+        let success = delete(self.str())
+        if success != 0
+            throw "NERDTree.PathDeletionError: Could not delete file: '" . self.str() . "'"
+        endif
+    endif
+
+    "delete all bookmarks for this path
+    for i in self.bookmarkNames()
+        let bookmark = g:NERDTreeBookmark.BookmarkFor(i)
+        call bookmark.delete()
+    endfor
+endfunction
+
+"FUNCTION: Path.displayString() {{{1
+"
+"Returns a string that specifies how the path should be represented as a
+"string
+function! s:Path.displayString()
+    if self.cachedDisplayString ==# ""
+        call self.cacheDisplayString()
+    endif
+
+    return self.cachedDisplayString
+endfunction
+
+"FUNCTION: Path.edit() {{{1
+function! s:Path.edit()
+    exec "edit " . self.str({'format': 'Edit'})
+endfunction
+
+"FUNCTION: Path.extractDriveLetter(fullpath) {{{1
+"
+"If running windows, cache the drive letter for this path
+function! s:Path.extractDriveLetter(fullpath)
+    if nerdtree#runningWindows()
+        if a:fullpath =~ '^\(\\\\\|\/\/\)'
+            "For network shares, the 'drive' consists of the first two parts of the path, i.e. \\boxname\share
+            let self.drive = substitute(a:fullpath, '^\(\(\\\\\|\/\/\)[^\\\/]*\(\\\|\/\)[^\\\/]*\).*', '\1', '')
+            let self.drive = substitute(self.drive, '/', '\', "g")
+        else
+            let self.drive = substitute(a:fullpath, '\(^[a-zA-Z]:\).*', '\1', '')
+        endif
+    else
+        let self.drive = ''
+    endif
+
+endfunction
+
+"FUNCTION: Path.exists() {{{1
+"return 1 if this path points to a location that is readable or is a directory
+function! s:Path.exists()
+    let p = self.str()
+    return filereadable(p) || isdirectory(p)
+endfunction
+
+"FUNCTION: Path._escChars() {{{1
+function! s:Path._escChars()
+    if nerdtree#runningWindows()
+        return " `\|\"#%&,?()\*^<>$"
+    endif
+
+    return " \\`\|\"#%&,?()\*^<>[]$"
+endfunction
+
+"FUNCTION: Path.getDir() {{{1
+"
+"Returns this path if it is a directory, else this paths parent.
+"
+"Return:
+"a Path object
+function! s:Path.getDir()
+    if self.isDirectory
+        return self
+    else
+        return self.getParent()
+    endif
+endfunction
+
+"FUNCTION: Path.getParent() {{{1
+"
+"Returns a new path object for this paths parent
+"
+"Return:
+"a new Path object
+function! s:Path.getParent()
+    if nerdtree#runningWindows()
+        let path = self.drive . '\' . join(self.pathSegments[0:-2], '\')
+    else
+        let path = '/'. join(self.pathSegments[0:-2], '/')
+    endif
+
+    return s:Path.New(path)
+endfunction
+
+"FUNCTION: Path.getLastPathComponent(dirSlash) {{{1
+"
+"Gets the last part of this path.
+"
+"Args:
+"dirSlash: if 1 then a trailing slash will be added to the returned value for
+"directory nodes.
+function! s:Path.getLastPathComponent(dirSlash)
+    if empty(self.pathSegments)
+        return ''
+    endif
+    let toReturn = self.pathSegments[-1]
+    if a:dirSlash && self.isDirectory
+        let toReturn = toReturn . '/'
+    endif
+    return toReturn
+endfunction
+
+"FUNCTION: Path.getSortOrderIndex() {{{1
+"returns the index of the pattern in g:NERDTreeSortOrder that this path matches
+function! s:Path.getSortOrderIndex()
+    let i = 0
+    while i < len(g:NERDTreeSortOrder)
+        if  self.getLastPathComponent(1) =~# g:NERDTreeSortOrder[i]
+            return i
+        endif
+        let i = i + 1
+    endwhile
+    return s:NERDTreeSortStarIndex
+endfunction
+
+"FUNCTION: Path.getSortKey() {{{1
+"returns a string used in compare function for sorting
+function! s:Path.getSortKey()
+    if !exists("self._sortKey")
+        let path = self.getLastPathComponent(1)
+        if !g:NERDTreeSortHiddenFirst
+            let path = substitute(path, '^[._]', '', '')
+        endif
+        if !g:NERDTreeCaseSensitiveSort
+            let path = tolower(path)
+        endif
+        let self._sortKey = printf(s:sortKeyFormat, self.getSortOrderIndex()) . path
+    endif
+
+    return self._sortKey
+endfunction
+
+
+"FUNCTION: Path.isUnixHiddenFile() {{{1
+"check for unix hidden files
+function! s:Path.isUnixHiddenFile()
+    return self.getLastPathComponent(0) =~# '^\.'
+endfunction
+
+"FUNCTION: Path.isUnixHiddenPath() {{{1
+"check for unix path with hidden components
+function! s:Path.isUnixHiddenPath()
+    if self.getLastPathComponent(0) =~# '^\.'
+        return 1
+    else
+        for segment in self.pathSegments
+            if segment =~# '^\.'
+                return 1
+            endif
+        endfor
+        return 0
+    endif
+endfunction
+
+"FUNCTION: Path.ignore(nerdtree) {{{1
+"returns true if this path should be ignored
+function! s:Path.ignore(nerdtree)
+    "filter out the user specified paths to ignore
+    if a:nerdtree.ui.isIgnoreFilterEnabled()
+        for i in g:NERDTreeIgnore
+            if self._ignorePatternMatches(i)
+                return 1
+            endif
+        endfor
+
+        for callback in g:NERDTree.PathFilters()
+            if {callback}({'path': self, 'nerdtree': a:nerdtree})
+                return 1
+            endif
+        endfor
+    endif
+
+    "dont show hidden files unless instructed to
+    if !a:nerdtree.ui.getShowHidden() && self.isUnixHiddenFile()
+        return 1
+    endif
+
+    if a:nerdtree.ui.getShowFiles() ==# 0 && self.isDirectory ==# 0
+        return 1
+    endif
+
+    return 0
+endfunction
+
+"FUNCTION: Path._ignorePatternMatches(pattern) {{{1
+"returns true if this path matches the given ignore pattern
+function! s:Path._ignorePatternMatches(pattern)
+    let pat = a:pattern
+    if strpart(pat,len(pat)-7) == '[[dir]]'
+        if !self.isDirectory
+            return 0
+        endif
+        let pat = strpart(pat,0, len(pat)-7)
+    elseif strpart(pat,len(pat)-8) == '[[file]]'
+        if self.isDirectory
+            return 0
+        endif
+        let pat = strpart(pat,0, len(pat)-8)
+    endif
+
+    return self.getLastPathComponent(0) =~# pat
+endfunction
+
+"FUNCTION: Path.isAncestor(path) {{{1
+"return 1 if this path is somewhere above the given path in the filesystem.
+"
+"a:path should be a dir
+function! s:Path.isAncestor(path)
+    if !self.isDirectory
+        return 0
+    endif
+
+    let this = self.str()
+    let that = a:path.str()
+    return stridx(that, this) == 0
+endfunction
+
+"FUNCTION: Path.isUnder(path) {{{1
+"return 1 if this path is somewhere under the given path in the filesystem.
+function! s:Path.isUnder(path)
+    if a:path.isDirectory == 0
+        return 0
+    endif
+
+    let this = self.str()
+    let that = a:path.str()
+    return stridx(this, that . s:Path.Slash()) == 0
+endfunction
+
+"FUNCTION: Path.JoinPathStrings(...) {{{1
+function! s:Path.JoinPathStrings(...)
+    let components = []
+    for i in a:000
+        let components = extend(components, split(i, '/'))
+    endfor
+    return '/' . join(components, '/')
+endfunction
+
+"FUNCTION: Path.equals() {{{1
+"
+"Determines whether 2 path objects are "equal".
+"They are equal if the paths they represent are the same
+"
+"Args:
+"path: the other path obj to compare this with
+function! s:Path.equals(path)
+    return self.str() ==# a:path.str()
+endfunction
+
+"FUNCTION: Path.New() {{{1
+"The Constructor for the Path object
+function! s:Path.New(path)
+    let newPath = copy(self)
+
+    call newPath.readInfoFromDisk(s:Path.AbsolutePathFor(a:path))
+
+    let newPath.cachedDisplayString = ""
+    let newPath.flagSet = g:NERDTreeFlagSet.New()
+
+    return newPath
+endfunction
+
+"FUNCTION: Path.Slash() {{{1
+"return the slash to use for the current OS
+function! s:Path.Slash()
+    return nerdtree#runningWindows() ? '\' : '/'
+endfunction
+
+"FUNCTION: Path.Resolve() {{{1
+"Invoke the vim resolve() function and return the result
+"This is necessary because in some versions of vim resolve() removes trailing
+"slashes while in other versions it doesn't.  This always removes the trailing
+"slash
+function! s:Path.Resolve(path)
+    let tmp = resolve(a:path)
+    return tmp =~# '.\+/$' ? substitute(tmp, '/$', '', '') : tmp
+endfunction
+
+"FUNCTION: Path.readInfoFromDisk(fullpath) {{{1
+"
+"
+"Throws NERDTree.Path.InvalidArguments exception.
+function! s:Path.readInfoFromDisk(fullpath)
+    call self.extractDriveLetter(a:fullpath)
+
+    let fullpath = s:Path.WinToUnixPath(a:fullpath)
+
+    if getftype(fullpath) ==# "fifo"
+        throw "NERDTree.InvalidFiletypeError: Cant handle FIFO files: " . a:fullpath
+    endif
+
+    let self.pathSegments = filter(split(fullpath, '/'), '!empty(v:val)')
+
+    let self.isReadOnly = 0
+    if isdirectory(a:fullpath)
+        let self.isDirectory = 1
+    elseif filereadable(a:fullpath)
+        let self.isDirectory = 0
+        let self.isReadOnly = filewritable(a:fullpath) ==# 0
+    else
+        throw "NERDTree.InvalidArgumentsError: Invalid path = " . a:fullpath
+    endif
+
+    let self.isExecutable = 0
+    if !self.isDirectory
+        let self.isExecutable = getfperm(a:fullpath) =~# 'x'
+    endif
+
+    "grab the last part of the path (minus the trailing slash)
+    let lastPathComponent = self.getLastPathComponent(0)
+
+    "get the path to the new node with the parent dir fully resolved
+    let hardPath = s:Path.Resolve(self.strTrunk()) . '/' . lastPathComponent
+
+    "if  the last part of the path is a symlink then flag it as such
+    let self.isSymLink = (s:Path.Resolve(hardPath) != hardPath)
+    if self.isSymLink
+        let self.symLinkDest = s:Path.Resolve(fullpath)
+
+        "if the link is a dir then slap a / on the end of its dest
+        if isdirectory(self.symLinkDest)
+
+            "we always wanna treat MS windows shortcuts as files for
+            "simplicity
+            if hardPath !~# '\.lnk$'
+
+                let self.symLinkDest = self.symLinkDest . '/'
+            endif
+        endif
+    endif
+endfunction
+
+"FUNCTION: Path.refresh(nerdtree) {{{1
+function! s:Path.refresh(nerdtree)
+    call self.readInfoFromDisk(self.str())
+    call g:NERDTreePathNotifier.NotifyListeners('refresh', self, a:nerdtree, {})
+    call self.cacheDisplayString()
+endfunction
+
+"FUNCTION: Path.refreshFlags(nerdtree) {{{1
+function! s:Path.refreshFlags(nerdtree)
+    call g:NERDTreePathNotifier.NotifyListeners('refreshFlags', self, a:nerdtree, {})
+    call self.cacheDisplayString()
+endfunction
+
+"FUNCTION: Path.rename() {{{1
+"
+"Renames this node on the filesystem
+function! s:Path.rename(newPath)
+    if a:newPath ==# ''
+        throw "NERDTree.InvalidArgumentsError: Invalid newPath for renaming = ". a:newPath
+    endif
+
+    let success =  rename(self.str(), a:newPath)
+    if success != 0
+        throw "NERDTree.PathRenameError: Could not rename: '" . self.str() . "'" . 'to:' . a:newPath
+    endif
+    call self.readInfoFromDisk(a:newPath)
+
+    for i in self.bookmarkNames()
+        let b = g:NERDTreeBookmark.BookmarkFor(i)
+        call b.setPath(copy(self))
+    endfor
+    call g:NERDTreeBookmark.Write()
+endfunction
+
+"FUNCTION: Path.str() {{{1
+"
+"Returns a string representation of this Path
+"
+"Takes an optional dictionary param to specify how the output should be
+"formatted.
+"
+"The dict may have the following keys:
+"  'format'
+"  'escape'
+"  'truncateTo'
+"
+"The 'format' key may have a value of:
+"  'Cd' - a string to be used with the :cd command
+"  'Edit' - a string to be used with :e :sp :new :tabedit etc
+"  'UI' - a string used in the NERD tree UI
+"
+"The 'escape' key, if specified will cause the output to be escaped with
+"shellescape()
+"
+"The 'truncateTo' key causes the resulting string to be truncated to the value
+"'truncateTo' maps to. A '<' char will be prepended.
+function! s:Path.str(...)
+    let options = a:0 ? a:1 : {}
+    let toReturn = ""
+
+    if has_key(options, 'format')
+        let format = options['format']
+        if has_key(self, '_strFor' . format)
+            exec 'let toReturn = self._strFor' . format . '()'
+        else
+            throw 'NERDTree.UnknownFormatError: unknown format "'. format .'"'
+        endif
+    else
+        let toReturn = self._str()
+    endif
+
+    if nerdtree#has_opt(options, 'escape')
+        let toReturn = shellescape(toReturn)
+    endif
+
+    if has_key(options, 'truncateTo')
+        let limit = options['truncateTo']
+        if len(toReturn) > limit-1
+            let toReturn = toReturn[(len(toReturn)-limit+1):]
+            if len(split(toReturn, '/')) > 1
+                let toReturn = '</' . join(split(toReturn, '/')[1:], '/') . '/'
+            else
+                let toReturn = '<' . toReturn
+            endif
+        endif
+    endif
+
+    return toReturn
+endfunction
+
+"FUNCTION: Path._strForUI() {{{1
+function! s:Path._strForUI()
+    let toReturn = '/' . join(self.pathSegments, '/')
+    if self.isDirectory && toReturn != '/'
+        let toReturn  = toReturn . '/'
+    endif
+    return toReturn
+endfunction
+
+"FUNCTION: Path._strForCd() {{{1
+"
+" returns a string that can be used with :cd
+function! s:Path._strForCd()
+    return escape(self.str(), self._escChars())
+endfunction
+
+"FUNCTION: Path._strForEdit() {{{1
+"
+"Return: the string for this path that is suitable to be used with the :edit
+"command
+function! s:Path._strForEdit()
+    let p = escape(self.str(), self._escChars())
+
+    "make it relative
+    let p = fnamemodify(p, ':.')
+
+    "handle the edge case where the file begins with a + (vim interprets
+    "the +foo in `:e +foo` as an option to :edit)
+    if p[0] == "+"
+        let p = '\' . p
+    endif
+
+    if p ==# ''
+        let p = '.'
+    endif
+
+    return p
+endfunction
+
+"FUNCTION: Path._strForGlob() {{{1
+function! s:Path._strForGlob()
+    let lead = s:Path.Slash()
+
+    "if we are running windows then slap a drive letter on the front
+    if nerdtree#runningWindows()
+        let lead = self.drive . '\'
+    endif
+
+    let toReturn = lead . join(self.pathSegments, s:Path.Slash())
+
+    if !nerdtree#runningWindows()
+        let toReturn = escape(toReturn, self._escChars())
+    endif
+    return toReturn
+endfunction
+
+"FUNCTION: Path._str() {{{1
+"
+"Gets the string path for this path object that is appropriate for the OS.
+"EG, in windows c:\foo\bar
+"    in *nix  /foo/bar
+function! s:Path._str()
+    let lead = s:Path.Slash()
+
+    "if we are running windows then slap a drive letter on the front
+    if nerdtree#runningWindows()
+        let lead = self.drive . '\'
+    endif
+
+    return lead . join(self.pathSegments, s:Path.Slash())
+endfunction
+
+"FUNCTION: Path.strTrunk() {{{1
+"Gets the path without the last segment on the end.
+function! s:Path.strTrunk()
+    return self.drive . '/' . join(self.pathSegments[0:-2], '/')
+endfunction
+
+" FUNCTION: Path.tabnr() {{{1
+" return the number of the first tab that is displaying this file
+"
+" return 0 if no tab was found
+function! s:Path.tabnr()
+    let str = self.str()
+    for t in range(tabpagenr('$'))
+        for b in tabpagebuflist(t+1)
+            if str == expand('#' . b . ':p')
+                return t+1
+            endif
+        endfor
+    endfor
+    return 0
+endfunction
+
+"FUNCTION: Path.WinToUnixPath(pathstr){{{1
+"Takes in a windows path and returns the unix equiv
+"
+"A class level method
+"
+"Args:
+"pathstr: the windows path to convert
+function! s:Path.WinToUnixPath(pathstr)
+    if !nerdtree#runningWindows()
+        return a:pathstr
+    endif
+
+    let toReturn = a:pathstr
+
+    "remove the x:\ of the front
+    let toReturn = substitute(toReturn, '^.*:\(\\\|/\)\?', '/', "")
+
+    "remove the \\ network share from the front
+    let toReturn = substitute(toReturn, '^\(\\\\\|\/\/\)[^\\\/]*\(\\\|\/\)[^\\\/]*\(\\\|\/\)\?', '/', "")
+
+    "convert all \ chars to /
+    let toReturn = substitute(toReturn, '\', '/', "g")
+
+    return toReturn
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/nerdtree/lib/nerdtree/tree_dir_node.vim b/vim-plugins/bundle/nerdtree/lib/nerdtree/tree_dir_node.vim
new file mode 100644
index 0000000..8e30a03
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/lib/nerdtree/tree_dir_node.vim
@@ -0,0 +1,600 @@
+"CLASS: TreeDirNode
+"A subclass of NERDTreeFileNode.
+"
+"The 'composite' part of the file/dir composite.
+"============================================================
+let s:TreeDirNode = copy(g:NERDTreeFileNode)
+let g:NERDTreeDirNode = s:TreeDirNode
+
+"FUNCTION: TreeDirNode.AbsoluteTreeRoot(){{{1
+"class method that returns the highest cached ancestor of the current root
+function! s:TreeDirNode.AbsoluteTreeRoot()
+    let currentNode = b:NERDTree.root
+    while currentNode.parent != {}
+        let currentNode = currentNode.parent
+    endwhile
+    return currentNode
+endfunction
+
+"FUNCTION: TreeDirNode.activate([options]) {{{1
+unlet s:TreeDirNode.activate
+function! s:TreeDirNode.activate(...)
+    let opts = a:0 ? a:1 : {}
+    call self.toggleOpen(opts)
+    call self.getNerdtree().render()
+    call self.putCursorHere(0, 0)
+endfunction
+
+"FUNCTION: TreeDirNode.addChild(treenode, inOrder) {{{1
+"Adds the given treenode to the list of children for this node
+"
+"Args:
+"-treenode: the node to add
+"-inOrder: 1 if the new node should be inserted in sorted order
+function! s:TreeDirNode.addChild(treenode, inOrder)
+    call add(self.children, a:treenode)
+    let a:treenode.parent = self
+
+    if a:inOrder
+        call self.sortChildren()
+    endif
+endfunction
+
+"FUNCTION: TreeDirNode.close() {{{1
+"Closes this directory
+function! s:TreeDirNode.close()
+    let self.isOpen = 0
+endfunction
+
+"FUNCTION: TreeDirNode.closeChildren() {{{1
+"Closes all the child dir nodes of this node
+function! s:TreeDirNode.closeChildren()
+    for i in self.children
+        if i.path.isDirectory
+            call i.close()
+            call i.closeChildren()
+        endif
+    endfor
+endfunction
+
+"FUNCTION: TreeDirNode.createChild(path, inOrder) {{{1
+"Instantiates a new child node for this node with the given path. The new
+"nodes parent is set to this node.
+"
+"Args:
+"path: a Path object that this node will represent/contain
+"inOrder: 1 if the new node should be inserted in sorted order
+"
+"Returns:
+"the newly created node
+function! s:TreeDirNode.createChild(path, inOrder)
+    let newTreeNode = g:NERDTreeFileNode.New(a:path, self.getNerdtree())
+    call self.addChild(newTreeNode, a:inOrder)
+    return newTreeNode
+endfunction
+
+"FUNCTION: TreeDirNode.displayString() {{{1
+unlet s:TreeDirNode.displayString
+function! s:TreeDirNode.displayString()
+    let cascade = self.getCascade()
+    let rv = ""
+    for node in cascade
+        let rv = rv . node.path.displayString()
+    endfor
+
+    let sym = cascade[-1].isOpen ? g:NERDTreeDirArrowCollapsible : g:NERDTreeDirArrowExpandable
+
+    let flags = cascade[-1].path.flagSet.renderToString()
+
+    return sym . ' ' . flags . rv
+endfunction
+
+"FUNCTION: TreeDirNode.findNode(path) {{{1
+"Will find one of the children (recursively) that has the given path
+"
+"Args:
+"path: a path object
+unlet s:TreeDirNode.findNode
+function! s:TreeDirNode.findNode(path)
+    if a:path.equals(self.path)
+        return self
+    endif
+    if stridx(a:path.str(), self.path.str(), 0) ==# -1
+        return {}
+    endif
+
+    if self.path.isDirectory
+        for i in self.children
+            let retVal = i.findNode(a:path)
+            if retVal != {}
+                return retVal
+            endif
+        endfor
+    endif
+    return {}
+endfunction
+
+"FUNCTION: TreeDirNode.getCascade() {{{1
+"Return an array of dir nodes (starting from self) that can be cascade opened.
+function! s:TreeDirNode.getCascade()
+    if !self.isCascadable()
+        return [self]
+    endif
+
+    let vc = self.getVisibleChildren()
+    let visChild = vc[0]
+
+    return [self] + visChild.getCascade()
+endfunction
+
+"FUNCTION: TreeDirNode.getChildCount() {{{1
+"Returns the number of children this node has
+function! s:TreeDirNode.getChildCount()
+    return len(self.children)
+endfunction
+
+"FUNCTION: TreeDirNode.getChild(path) {{{1
+"Returns child node of this node that has the given path or {} if no such node
+"exists.
+"
+"This function doesnt not recurse into child dir nodes
+"
+"Args:
+"path: a path object
+function! s:TreeDirNode.getChild(path)
+    if stridx(a:path.str(), self.path.str(), 0) ==# -1
+        return {}
+    endif
+
+    let index = self.getChildIndex(a:path)
+    if index ==# -1
+        return {}
+    else
+        return self.children[index]
+    endif
+
+endfunction
+
+"FUNCTION: TreeDirNode.getChildByIndex(indx, visible) {{{1
+"returns the child at the given index
+"Args:
+"indx: the index to get the child from
+"visible: 1 if only the visible children array should be used, 0 if all the
+"children should be searched.
+function! s:TreeDirNode.getChildByIndex(indx, visible)
+    let array_to_search = a:visible? self.getVisibleChildren() : self.children
+    if a:indx > len(array_to_search)
+        throw "NERDTree.InvalidArgumentsError: Index is out of bounds."
+    endif
+    return array_to_search[a:indx]
+endfunction
+
+"FUNCTION: TreeDirNode.getChildIndex(path) {{{1
+"Returns the index of the child node of this node that has the given path or
+"-1 if no such node exists.
+"
+"This function doesnt not recurse into child dir nodes
+"
+"Args:
+"path: a path object
+function! s:TreeDirNode.getChildIndex(path)
+    if stridx(a:path.str(), self.path.str(), 0) ==# -1
+        return -1
+    endif
+
+    "do a binary search for the child
+    let a = 0
+    let z = self.getChildCount()
+    while a < z
+        let mid = (a+z)/2
+        let diff = a:path.compareTo(self.children[mid].path)
+
+        if diff ==# -1
+            let z = mid
+        elseif diff ==# 1
+            let a = mid+1
+        else
+            return mid
+        endif
+    endwhile
+    return -1
+endfunction
+
+"FUNCTION: TreeDirNode.getDirChildren() {{{1
+"Get all children that are directories
+function! s:TreeDirNode.getDirChildren()
+    return filter(self.children, 'v:val.path.isDirectory == 1')
+endfunction
+
+"FUNCTION: TreeDirNode.GetSelected() {{{1
+"Returns the current node if it is a dir node, or else returns the current
+"nodes parent
+unlet s:TreeDirNode.GetSelected
+function! s:TreeDirNode.GetSelected()
+    let currentDir = g:NERDTreeFileNode.GetSelected()
+    if currentDir != {} && !currentDir.isRoot()
+        if currentDir.path.isDirectory ==# 0
+            let currentDir = currentDir.parent
+        endif
+    endif
+    return currentDir
+endfunction
+
+"FUNCTION: TreeDirNode.getVisibleChildCount() {{{1
+"Returns the number of visible children this node has
+function! s:TreeDirNode.getVisibleChildCount()
+    return len(self.getVisibleChildren())
+endfunction
+
+"FUNCTION: TreeDirNode.getVisibleChildren() {{{1
+"Returns a list of children to display for this node, in the correct order
+"
+"Return:
+"an array of treenodes
+function! s:TreeDirNode.getVisibleChildren()
+    let toReturn = []
+    for i in self.children
+        if i.path.ignore(self.getNerdtree()) ==# 0
+            call add(toReturn, i)
+        endif
+    endfor
+    return toReturn
+endfunction
+
+"FUNCTION: TreeDirNode.hasVisibleChildren() {{{1
+"returns 1 if this node has any childre, 0 otherwise..
+function! s:TreeDirNode.hasVisibleChildren()
+    return self.getVisibleChildCount() != 0
+endfunction
+
+"FUNCTION: TreeDirNode.isCascadable() {{{1
+"true if this dir has only one visible child - which is also a dir
+function! s:TreeDirNode.isCascadable()
+    if g:NERDTreeCascadeSingleChildDir == 0
+        return 0
+    endif
+
+    let c = self.getVisibleChildren()
+    return len(c) == 1 && c[0].path.isDirectory
+endfunction
+
+"FUNCTION: TreeDirNode._initChildren() {{{1
+"Removes all childen from this node and re-reads them
+"
+"Args:
+"silent: 1 if the function should not echo any "please wait" messages for
+"large directories
+"
+"Return: the number of child nodes read
+function! s:TreeDirNode._initChildren(silent)
+    "remove all the current child nodes
+    let self.children = []
+
+    "get an array of all the files in the nodes dir
+    let dir = self.path
+
+    "use a relative globDir so that relative wildignore rules will be obeyed
+    let globDir = fnamemodify(dir.str({'format': 'Glob'}), ':.')
+
+    if version >= 703
+        let filesStr = globpath(globDir, '*', !g:NERDTreeRespectWildIgnore) . "\n" . globpath(globDir, '.*', !g:NERDTreeRespectWildIgnore)
+    else
+        let filesStr = globpath(globDir, '*') . "\n" . globpath(globDir, '.*')
+    endif
+
+    let files = split(filesStr, "\n")
+
+    if !a:silent && len(files) > g:NERDTreeNotificationThreshold
+        call nerdtree#echo("Please wait, caching a large dir ...")
+    endif
+
+    let invalidFilesFound = 0
+    for i in files
+
+        "filter out the .. and . directories
+        "Note: we must match .. AND ../ since sometimes the globpath returns
+        "../ for path with strange chars (eg $)
+        if i[len(i)-3:2] != ".." && i[len(i)-2:2] != ".." &&
+         \ i[len(i)-2:1] != "." && i[len(i)-1] != "."
+            "put the next file in a new node and attach it
+            try
+                let path = g:NERDTreePath.New(i)
+                call self.createChild(path, 0)
+                call g:NERDTreePathNotifier.NotifyListeners('init', path, self.getNerdtree(), {})
+            catch /^NERDTree.\(InvalidArguments\|InvalidFiletype\)Error/
+                let invalidFilesFound += 1
+            endtry
+        endif
+    endfor
+
+    call self.sortChildren()
+
+    if !a:silent && len(files) > g:NERDTreeNotificationThreshold
+        call nerdtree#echo("Please wait, caching a large dir ... DONE (". self.getChildCount() ." nodes cached).")
+    endif
+
+    if invalidFilesFound
+        call nerdtree#echoWarning(invalidFilesFound . " file(s) could not be loaded into the NERD tree")
+    endif
+    return self.getChildCount()
+endfunction
+
+"FUNCTION: TreeDirNode.New(path, nerdtree) {{{1
+"Returns a new TreeNode object with the given path and parent
+"
+"Args:
+"path: dir that the node represents
+"nerdtree: the tree the node belongs to
+function! s:TreeDirNode.New(path, nerdtree)
+    if a:path.isDirectory != 1
+        throw "NERDTree.InvalidArgumentsError: A TreeDirNode object must be instantiated with a directory Path object."
+    endif
+
+    let newTreeNode = copy(self)
+    let newTreeNode.path = a:path
+
+    let newTreeNode.isOpen = 0
+    let newTreeNode.children = []
+
+    let newTreeNode.parent = {}
+    let newTreeNode._nerdtree = a:nerdtree
+
+    return newTreeNode
+endfunction
+
+"FUNCTION: TreeDirNode.open([opts]) {{{1
+"Open the dir in the current tree or in a new tree elsewhere.
+"
+"If opening in the current tree, return the number of cached nodes.
+unlet s:TreeDirNode.open
+function! s:TreeDirNode.open(...)
+    let opts = a:0 ? a:1 : {}
+
+    if has_key(opts, 'where') && !empty(opts['where'])
+        let opener = g:NERDTreeOpener.New(self.path, opts)
+        call opener.open(self)
+    else
+        let self.isOpen = 1
+        if self.children ==# []
+            return self._initChildren(0)
+        else
+            return 0
+        endif
+    endif
+endfunction
+
+"FUNCTION: TreeDirNode.openAlong([opts]) {{{1
+"recursive open the dir if it has only one directory child.
+"
+"return the level of opened directories.
+function! s:TreeDirNode.openAlong(...)
+    let opts = a:0 ? a:1 : {}
+    let level = 0
+
+    let node = self
+    while node.path.isDirectory
+        call node.open(opts)
+        let level += 1
+        if node.getVisibleChildCount() == 1
+            let node = node.getChildByIndex(0, 1)
+        else
+            break
+        endif
+    endwhile
+    return level
+endfunction
+
+" FUNCTION: TreeDirNode.openExplorer() {{{1
+" opens an explorer window for this node in the previous window (could be a
+" nerd tree or a netrw)
+function! s:TreeDirNode.openExplorer()
+    call self.open({'where': 'p'})
+endfunction
+
+"FUNCTION: TreeDirNode.openInNewTab(options) {{{1
+unlet s:TreeDirNode.openInNewTab
+function! s:TreeDirNode.openInNewTab(options)
+    call nerdtree#deprecated('TreeDirNode.openInNewTab', 'is deprecated, use open() instead')
+    call self.open({'where': 't'})
+endfunction
+
+"FUNCTION: TreeDirNode._openInNewTab() {{{1
+function! s:TreeDirNode._openInNewTab()
+    tabnew
+    call g:NERDTreeCreator.CreateTabTree(self.path.str())
+endfunction
+
+"FUNCTION: TreeDirNode.openRecursively() {{{1
+"Opens this treenode and all of its children whose paths arent 'ignored'
+"because of the file filters.
+"
+"This method is actually a wrapper for the OpenRecursively2 method which does
+"the work.
+function! s:TreeDirNode.openRecursively()
+    call self._openRecursively2(1)
+endfunction
+
+"FUNCTION: TreeDirNode._openRecursively2() {{{1
+"Opens this all children of this treenode recursively if either:
+"   *they arent filtered by file filters
+"   *a:forceOpen is 1
+"
+"Args:
+"forceOpen: 1 if this node should be opened regardless of file filters
+function! s:TreeDirNode._openRecursively2(forceOpen)
+    if self.path.ignore(self.getNerdtree()) ==# 0 || a:forceOpen
+        let self.isOpen = 1
+        if self.children ==# []
+            call self._initChildren(1)
+        endif
+
+        for i in self.children
+            if i.path.isDirectory ==# 1
+                call i._openRecursively2(0)
+            endif
+        endfor
+    endif
+endfunction
+
+"FUNCTION: TreeDirNode.refresh() {{{1
+unlet s:TreeDirNode.refresh
+function! s:TreeDirNode.refresh()
+    call self.path.refresh(self.getNerdtree())
+
+    "if this node was ever opened, refresh its children
+    if self.isOpen || !empty(self.children)
+        "go thru all the files/dirs under this node
+        let newChildNodes = []
+        let invalidFilesFound = 0
+        let dir = self.path
+        let globDir = fnamemodify(dir.str({'format': 'Glob'}), ':.')
+        let filesStr = globpath(globDir, '*') . "\n" . globpath(globDir, '.*')
+        let files = split(filesStr, "\n")
+        for i in files
+            "filter out the .. and . directories
+            "Note: we must match .. AND ../ cos sometimes the globpath returns
+            "../ for path with strange chars (eg $)
+            "if i !~# '\/\.\.\/\?$' && i !~# '\/\.\/\?$'
+
+            " Regular expression is too expensive. Use simply string comparison
+            " instead
+            if i[len(i)-3:2] != ".." && i[len(i)-2:2] != ".." &&
+             \ i[len(i)-2:1] != "." && i[len(i)-1] != "."
+                try
+                    "create a new path and see if it exists in this nodes children
+                    let path = g:NERDTreePath.New(i)
+                    let newNode = self.getChild(path)
+                    if newNode != {}
+                        call newNode.refresh()
+                        call add(newChildNodes, newNode)
+
+                    "the node doesnt exist so create it
+                    else
+                        let newNode = g:NERDTreeFileNode.New(path, self.getNerdtree())
+                        let newNode.parent = self
+                        call add(newChildNodes, newNode)
+                    endif
+
+
+                catch /^NERDTree.\(InvalidArguments\|InvalidFiletype\)Error/
+                    let invalidFilesFound = 1
+                endtry
+            endif
+        endfor
+
+        "swap this nodes children out for the children we just read/refreshed
+        let self.children = newChildNodes
+        call self.sortChildren()
+
+        if invalidFilesFound
+            call nerdtree#echoWarning("some files could not be loaded into the NERD tree")
+        endif
+    endif
+endfunction
+
+"FUNCTION: TreeDirNode.refreshFlags() {{{1
+unlet s:TreeDirNode.refreshFlags
+function! s:TreeDirNode.refreshFlags()
+    call self.path.refreshFlags(self.getNerdtree())
+    for i in self.children
+        call i.refreshFlags()
+    endfor
+endfunction
+
+"FUNCTION: TreeDirNode.refreshDirFlags() {{{1
+function! s:TreeDirNode.refreshDirFlags()
+    call self.path.refreshFlags(self.getNerdtree())
+endfunction
+
+"FUNCTION: TreeDirNode.reveal(path) {{{1
+"reveal the given path, i.e. cache and open all treenodes needed to display it
+"in the UI
+"Returns the revealed node
+function! s:TreeDirNode.reveal(path, ...)
+    let opts = a:0 ? a:1 : {}
+
+    if !a:path.isUnder(self.path)
+        throw "NERDTree.InvalidArgumentsError: " . a:path.str() . " should be under " . self.path.str()
+    endif
+
+    call self.open()
+
+    if self.path.equals(a:path.getParent())
+        let n = self.findNode(a:path)
+        if has_key(opts, "open")
+            call n.open()
+        endif
+        return n
+    endif
+
+    let p = a:path
+    while !p.getParent().equals(self.path)
+        let p = p.getParent()
+    endwhile
+
+    let n = self.findNode(p)
+    return n.reveal(a:path, opts)
+endfunction
+
+"FUNCTION: TreeDirNode.removeChild(treenode) {{{1
+"
+"Removes the given treenode from this nodes set of children
+"
+"Args:
+"treenode: the node to remove
+"
+"Throws a NERDTree.ChildNotFoundError if the given treenode is not found
+function! s:TreeDirNode.removeChild(treenode)
+    for i in range(0, self.getChildCount()-1)
+        if self.children[i].equals(a:treenode)
+            call remove(self.children, i)
+            return
+        endif
+    endfor
+
+    throw "NERDTree.ChildNotFoundError: child node was not found"
+endfunction
+
+"FUNCTION: TreeDirNode.sortChildren() {{{1
+"
+"Sorts the children of this node according to alphabetical order and the
+"directory priority.
+"
+function! s:TreeDirNode.sortChildren()
+    let CompareFunc = function("nerdtree#compareNodesBySortKey")
+    call sort(self.children, CompareFunc)
+endfunction
+
+"FUNCTION: TreeDirNode.toggleOpen([options]) {{{1
+"Opens this directory if it is closed and vice versa
+function! s:TreeDirNode.toggleOpen(...)
+    let opts = a:0 ? a:1 : {}
+    if self.isOpen ==# 1
+        call self.close()
+    else
+        if g:NERDTreeCascadeOpenSingleChildDir == 0
+            call self.open(opts)
+        else
+            call self.openAlong(opts)
+        endif
+    endif
+endfunction
+
+"FUNCTION: TreeDirNode.transplantChild(newNode) {{{1
+"Replaces the child of this with the given node (where the child node's full
+"path matches a:newNode's fullpath). The search for the matching node is
+"non-recursive
+"
+"Arg:
+"newNode: the node to graft into the tree
+function! s:TreeDirNode.transplantChild(newNode)
+    for i in range(0, self.getChildCount()-1)
+        if self.children[i].equals(a:newNode)
+            let self.children[i] = a:newNode
+            let a:newNode.parent = self
+            break
+        endif
+    endfor
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/nerdtree/lib/nerdtree/tree_file_node.vim b/vim-plugins/bundle/nerdtree/lib/nerdtree/tree_file_node.vim
new file mode 100644
index 0000000..adb0e96
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/lib/nerdtree/tree_file_node.vim
@@ -0,0 +1,368 @@
+"CLASS: TreeFileNode
+"This class is the parent of the TreeDirNode class and is the
+"'Component' part of the composite design pattern between the treenode
+"classes.
+"============================================================
+let s:TreeFileNode = {}
+let g:NERDTreeFileNode = s:TreeFileNode
+
+"FUNCTION: TreeFileNode.activate(...) {{{1
+function! s:TreeFileNode.activate(...)
+    call self.open(a:0 ? a:1 : {})
+endfunction
+
+"FUNCTION: TreeFileNode.bookmark(name) {{{1
+"bookmark this node with a:name
+function! s:TreeFileNode.bookmark(name)
+
+    "if a bookmark exists with the same name and the node is cached then save
+    "it so we can update its display string
+    let oldMarkedNode = {}
+    try
+        let oldMarkedNode = g:NERDTreeBookmark.GetNodeForName(a:name, 1, self.getNerdtree())
+    catch /^NERDTree.BookmarkNotFoundError/
+    catch /^NERDTree.BookmarkedNodeNotFoundError/
+    endtry
+
+    call g:NERDTreeBookmark.AddBookmark(a:name, self.path)
+    call self.path.cacheDisplayString()
+    call g:NERDTreeBookmark.Write()
+
+    if !empty(oldMarkedNode)
+        call oldMarkedNode.path.cacheDisplayString()
+    endif
+endfunction
+
+"FUNCTION: TreeFileNode.cacheParent() {{{1
+"initializes self.parent if it isnt already
+function! s:TreeFileNode.cacheParent()
+    if empty(self.parent)
+        let parentPath = self.path.getParent()
+        if parentPath.equals(self.path)
+            throw "NERDTree.CannotCacheParentError: already at root"
+        endif
+        let self.parent = s:TreeFileNode.New(parentPath, self.getNerdtree())
+    endif
+endfunction
+
+"FUNCTION: TreeFileNode.clearBookmarks() {{{1
+function! s:TreeFileNode.clearBookmarks()
+    for i in g:NERDTreeBookmark.Bookmarks()
+        if i.path.equals(self.path)
+            call i.delete()
+        end
+    endfor
+    call self.path.cacheDisplayString()
+endfunction
+
+"FUNCTION: TreeFileNode.copy(dest) {{{1
+function! s:TreeFileNode.copy(dest)
+    call self.path.copy(a:dest)
+    let newPath = g:NERDTreePath.New(a:dest)
+    let parent = self.getNerdtree().root.findNode(newPath.getParent())
+    if !empty(parent)
+        call parent.refresh()
+        return parent.findNode(newPath)
+    else
+        return {}
+    endif
+endfunction
+
+"FUNCTION: TreeFileNode.delete {{{1
+"Removes this node from the tree and calls the Delete method for its path obj
+function! s:TreeFileNode.delete()
+    call self.path.delete()
+    call self.parent.removeChild(self)
+endfunction
+
+"FUNCTION: TreeFileNode.displayString() {{{1
+"
+"Returns a string that specifies how the node should be represented as a
+"string
+"
+"Return:
+"a string that can be used in the view to represent this node
+function! s:TreeFileNode.displayString()
+    return self.path.flagSet.renderToString() . self.path.displayString()
+endfunction
+
+"FUNCTION: TreeFileNode.equals(treenode) {{{1
+"
+"Compares this treenode to the input treenode and returns 1 if they are the
+"same node.
+"
+"Use this method instead of ==  because sometimes when the treenodes contain
+"many children, vim seg faults when doing ==
+"
+"Args:
+"treenode: the other treenode to compare to
+function! s:TreeFileNode.equals(treenode)
+    return self.path.str() ==# a:treenode.path.str()
+endfunction
+
+"FUNCTION: TreeFileNode.findNode(path) {{{1
+"Returns self if this node.path.Equals the given path.
+"Returns {} if not equal.
+"
+"Args:
+"path: the path object to compare against
+function! s:TreeFileNode.findNode(path)
+    if a:path.equals(self.path)
+        return self
+    endif
+    return {}
+endfunction
+
+"FUNCTION: TreeFileNode.findOpenDirSiblingWithVisibleChildren(direction) {{{1
+"
+"Finds the next sibling for this node in the indicated direction. This sibling
+"must be a directory and may/may not have children as specified.
+"
+"Args:
+"direction: 0 if you want to find the previous sibling, 1 for the next sibling
+"
+"Return:
+"a treenode object or {} if no appropriate sibling could be found
+function! s:TreeFileNode.findOpenDirSiblingWithVisibleChildren(direction)
+    "if we have no parent then we can have no siblings
+    if self.parent != {}
+        let nextSibling = self.findSibling(a:direction)
+
+        while nextSibling != {}
+            if nextSibling.path.isDirectory && nextSibling.hasVisibleChildren() && nextSibling.isOpen
+                return nextSibling
+            endif
+            let nextSibling = nextSibling.findSibling(a:direction)
+        endwhile
+    endif
+
+    return {}
+endfunction
+
+"FUNCTION: TreeFileNode.findSibling(direction) {{{1
+"
+"Finds the next sibling for this node in the indicated direction
+"
+"Args:
+"direction: 0 if you want to find the previous sibling, 1 for the next sibling
+"
+"Return:
+"a treenode object or {} if no sibling could be found
+function! s:TreeFileNode.findSibling(direction)
+    "if we have no parent then we can have no siblings
+    if self.parent != {}
+
+        "get the index of this node in its parents children
+        let siblingIndx = self.parent.getChildIndex(self.path)
+
+        if siblingIndx != -1
+            "move a long to the next potential sibling node
+            let siblingIndx = a:direction ==# 1 ? siblingIndx+1 : siblingIndx-1
+
+            "keep moving along to the next sibling till we find one that is valid
+            let numSiblings = self.parent.getChildCount()
+            while siblingIndx >= 0 && siblingIndx < numSiblings
+
+                "if the next node is not an ignored node (i.e. wont show up in the
+                "view) then return it
+                if self.parent.children[siblingIndx].path.ignore(self.getNerdtree()) ==# 0
+                    return self.parent.children[siblingIndx]
+                endif
+
+                "go to next node
+                let siblingIndx = a:direction ==# 1 ? siblingIndx+1 : siblingIndx-1
+            endwhile
+        endif
+    endif
+
+    return {}
+endfunction
+
+"FUNCTION: TreeFileNode.getNerdtree(){{{1
+function! s:TreeFileNode.getNerdtree()
+    return self._nerdtree
+endfunction
+
+"FUNCTION: TreeFileNode.GetRootForTab(){{{1
+"get the root node for this tab
+function! s:TreeFileNode.GetRootForTab()
+    if g:NERDTree.ExistsForTab()
+        return getbufvar(t:NERDTreeBufName, 'NERDTree').root
+    end
+    return {}
+endfunction
+
+"FUNCTION: TreeFileNode.GetSelected() {{{1
+"gets the treenode that the cursor is currently over
+function! s:TreeFileNode.GetSelected()
+    try
+        let path = b:NERDTree.ui.getPath(line("."))
+        if path ==# {}
+            return {}
+        endif
+        return b:NERDTree.root.findNode(path)
+    catch /^NERDTree/
+        return {}
+    endtry
+endfunction
+
+"FUNCTION: TreeFileNode.isVisible() {{{1
+"returns 1 if this node should be visible according to the tree filters and
+"hidden file filters (and their on/off status)
+function! s:TreeFileNode.isVisible()
+    return !self.path.ignore(self.getNerdtree())
+endfunction
+
+"FUNCTION: TreeFileNode.isRoot() {{{1
+function! s:TreeFileNode.isRoot()
+    if !g:NERDTree.ExistsForBuf()
+        throw "NERDTree.NoTreeError: No tree exists for the current buffer"
+    endif
+
+    return self.equals(self.getNerdtree().root)
+endfunction
+
+"FUNCTION: TreeFileNode.New(path, nerdtree) {{{1
+"Returns a new TreeNode object with the given path and parent
+"
+"Args:
+"path: file/dir that the node represents
+"nerdtree: the tree the node belongs to
+function! s:TreeFileNode.New(path, nerdtree)
+    if a:path.isDirectory
+        return g:NERDTreeDirNode.New(a:path, a:nerdtree)
+    else
+        let newTreeNode = copy(self)
+        let newTreeNode.path = a:path
+        let newTreeNode.parent = {}
+        let newTreeNode._nerdtree = a:nerdtree
+        return newTreeNode
+    endif
+endfunction
+
+"FUNCTION: TreeFileNode.open() {{{1
+function! s:TreeFileNode.open(...)
+    let opts = a:0 ? a:1 : {}
+    let opener = g:NERDTreeOpener.New(self.path, opts)
+    call opener.open(self)
+endfunction
+
+"FUNCTION: TreeFileNode.openSplit() {{{1
+"Open this node in a new window
+function! s:TreeFileNode.openSplit()
+    call nerdtree#deprecated('TreeFileNode.openSplit', 'is deprecated, use .open() instead.')
+    call self.open({'where': 'h'})
+endfunction
+
+"FUNCTION: TreeFileNode.openVSplit() {{{1
+"Open this node in a new vertical window
+function! s:TreeFileNode.openVSplit()
+    call nerdtree#deprecated('TreeFileNode.openVSplit', 'is deprecated, use .open() instead.')
+    call self.open({'where': 'v'})
+endfunction
+
+"FUNCTION: TreeFileNode.openInNewTab(options) {{{1
+function! s:TreeFileNode.openInNewTab(options)
+    echomsg 'TreeFileNode.openInNewTab is deprecated'
+    call self.open(extend({'where': 't'}, a:options))
+endfunction
+
+"FUNCTION: TreeFileNode.putCursorHere(isJump, recurseUpward){{{1
+"Places the cursor on the line number this node is rendered on
+"
+"Args:
+"isJump: 1 if this cursor movement should be counted as a jump by vim
+"recurseUpward: try to put the cursor on the parent if the this node isnt
+"visible
+function! s:TreeFileNode.putCursorHere(isJump, recurseUpward)
+    let ln = self.getNerdtree().ui.getLineNum(self)
+    if ln != -1
+        if a:isJump
+            mark '
+        endif
+        call cursor(ln, col("."))
+    else
+        if a:recurseUpward
+            let node = self
+            while node != {} && self.getNerdtree().ui.getLineNum(node) ==# -1
+                let node = node.parent
+                call node.open()
+            endwhile
+            call self._nerdtree.render()
+            call node.putCursorHere(a:isJump, 0)
+        endif
+    endif
+endfunction
+
+"FUNCTION: TreeFileNode.refresh() {{{1
+function! s:TreeFileNode.refresh()
+    call self.path.refresh(self.getNerdtree())
+endfunction
+
+"FUNCTION: TreeFileNode.refreshFlags() {{{1
+function! s:TreeFileNode.refreshFlags()
+    call self.path.refreshFlags(self.getNerdtree())
+endfunction
+
+"FUNCTION: TreeFileNode.rename() {{{1
+"Calls the rename method for this nodes path obj
+function! s:TreeFileNode.rename(newName)
+    let newName = substitute(a:newName, '\(\\\|\/\)$', '', '')
+    call self.path.rename(newName)
+    call self.parent.removeChild(self)
+
+    let parentPath = self.path.getParent()
+    let newParent = self.getNerdtree().root.findNode(parentPath)
+
+    if newParent != {}
+        call newParent.createChild(self.path, 1)
+        call newParent.refresh()
+    endif
+endfunction
+
+"FUNCTION: TreeFileNode.renderToString {{{1
+"returns a string representation for this tree to be rendered in the view
+function! s:TreeFileNode.renderToString()
+    return self._renderToString(0, 0)
+endfunction
+
+"Args:
+"depth: the current depth in the tree for this call
+"drawText: 1 if we should actually draw the line for this node (if 0 then the
+"child nodes are rendered only)
+"for each depth in the tree
+function! s:TreeFileNode._renderToString(depth, drawText)
+    let output = ""
+    if a:drawText ==# 1
+
+        let treeParts = repeat('  ', a:depth - 1)
+
+        if !self.path.isDirectory
+            let treeParts = treeParts . '  '
+        endif
+
+        let line = treeParts . self.displayString()
+
+        let output = output . line . "\n"
+    endif
+
+    "if the node is an open dir, draw its children
+    if self.path.isDirectory ==# 1 && self.isOpen ==# 1
+
+        let childNodesToDraw = self.getVisibleChildren()
+
+        if self.isCascadable() && a:depth > 0
+
+            let output = output . childNodesToDraw[0]._renderToString(a:depth, 0)
+
+        elseif len(childNodesToDraw) > 0
+            for i in childNodesToDraw
+                let output = output . i._renderToString(a:depth + 1, 1)
+            endfor
+        endif
+    endif
+
+    return output
+endfunction
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/nerdtree/lib/nerdtree/ui.vim b/vim-plugins/bundle/nerdtree/lib/nerdtree/ui.vim
new file mode 100644
index 0000000..e169dbb
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/lib/nerdtree/ui.vim
@@ -0,0 +1,538 @@
+"CLASS: UI
+"============================================================
+let s:UI = {}
+let g:NERDTreeUI = s:UI
+
+"FUNCTION: s:UI.centerView() {{{2
+"centers the nerd tree window around the cursor (provided the nerd tree
+"options permit)
+function! s:UI.centerView()
+    if g:NERDTreeAutoCenter
+        let current_line = winline()
+        let lines_to_top = current_line
+        let lines_to_bottom = winheight(g:NERDTree.GetWinNum()) - current_line
+        if lines_to_top < g:NERDTreeAutoCenterThreshold || lines_to_bottom < g:NERDTreeAutoCenterThreshold
+            normal! zz
+        endif
+    endif
+endfunction
+
+"FUNCTION: s:UI._dumpHelp  {{{1
+"prints out the quick help
+function! s:UI._dumpHelp()
+    if self.getShowHelp()
+        let help  = "\" NERD tree (" . nerdtree#version() . ") quickhelp~\n"
+        let help .= "\" ============================\n"
+        let help .= "\" File node mappings~\n"
+        let help .= "\" ". (g:NERDTreeMouseMode ==# 3 ? "single" : "double") ."-click,\n"
+        let help .= "\" <CR>,\n"
+        if self.nerdtree.isTabTree()
+            let help .= "\" ". g:NERDTreeMapActivateNode .": open in prev window\n"
+        else
+            let help .= "\" ". g:NERDTreeMapActivateNode .": open in current window\n"
+        endif
+        if self.nerdtree.isTabTree()
+            let help .= "\" ". g:NERDTreeMapPreview .": preview\n"
+        endif
+        let help .= "\" ". g:NERDTreeMapOpenInTab.": open in new tab\n"
+        let help .= "\" ". g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n"
+        let help .= "\" middle-click,\n"
+        let help .= "\" ". g:NERDTreeMapOpenSplit .": open split\n"
+        let help .= "\" ". g:NERDTreeMapPreviewSplit .": preview split\n"
+        let help .= "\" ". g:NERDTreeMapOpenVSplit .": open vsplit\n"
+        let help .= "\" ". g:NERDTreeMapPreviewVSplit .": preview vsplit\n"
+
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Directory node mappings~\n"
+        let help .= "\" ". (g:NERDTreeMouseMode ==# 1 ? "double" : "single") ."-click,\n"
+        let help .= "\" ". g:NERDTreeMapActivateNode .": open & close node\n"
+        let help .= "\" ". g:NERDTreeMapOpenRecursively .": recursively open node\n"
+        let help .= "\" ". g:NERDTreeMapCloseDir .": close parent of node\n"
+        let help .= "\" ". g:NERDTreeMapCloseChildren .": close all child nodes of\n"
+        let help .= "\"    current node recursively\n"
+        let help .= "\" middle-click,\n"
+        let help .= "\" ". g:NERDTreeMapOpenExpl.": explore selected dir\n"
+
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Bookmark table mappings~\n"
+        let help .= "\" double-click,\n"
+        let help .= "\" ". g:NERDTreeMapActivateNode .": open bookmark\n"
+        let help .= "\" ". g:NERDTreeMapOpenInTab.": open in new tab\n"
+        let help .= "\" ". g:NERDTreeMapOpenInTabSilent .": open in new tab silently\n"
+        let help .= "\" ". g:NERDTreeMapDeleteBookmark .": delete bookmark\n"
+
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Tree navigation mappings~\n"
+        let help .= "\" ". g:NERDTreeMapJumpRoot .": go to root\n"
+        let help .= "\" ". g:NERDTreeMapJumpParent .": go to parent\n"
+        let help .= "\" ". g:NERDTreeMapJumpFirstChild  .": go to first child\n"
+        let help .= "\" ". g:NERDTreeMapJumpLastChild   .": go to last child\n"
+        let help .= "\" ". g:NERDTreeMapJumpNextSibling .": go to next sibling\n"
+        let help .= "\" ". g:NERDTreeMapJumpPrevSibling .": go to prev sibling\n"
+
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Filesystem mappings~\n"
+        let help .= "\" ". g:NERDTreeMapChangeRoot .": change tree root to the\n"
+        let help .= "\"    selected dir\n"
+        let help .= "\" ". g:NERDTreeMapUpdir .": move tree root up a dir\n"
+        let help .= "\" ". g:NERDTreeMapUpdirKeepOpen .": move tree root up a dir\n"
+        let help .= "\"    but leave old root open\n"
+        let help .= "\" ". g:NERDTreeMapRefresh .": refresh cursor dir\n"
+        let help .= "\" ". g:NERDTreeMapRefreshRoot .": refresh current root\n"
+        let help .= "\" ". g:NERDTreeMapMenu .": Show menu\n"
+        let help .= "\" ". g:NERDTreeMapChdir .":change the CWD to the\n"
+        let help .= "\"    selected dir\n"
+        let help .= "\" ". g:NERDTreeMapCWD .":change tree root to CWD\n"
+
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Tree filtering mappings~\n"
+        let help .= "\" ". g:NERDTreeMapToggleHidden .": hidden files (" . (self.getShowHidden() ? "on" : "off") . ")\n"
+        let help .= "\" ". g:NERDTreeMapToggleFilters .": file filters (" . (self.isIgnoreFilterEnabled() ? "on" : "off") . ")\n"
+        let help .= "\" ". g:NERDTreeMapToggleFiles .": files (" . (self.getShowFiles() ? "on" : "off") . ")\n"
+        let help .= "\" ". g:NERDTreeMapToggleBookmarks .": bookmarks (" . (self.getShowBookmarks() ? "on" : "off") . ")\n"
+
+        "add quickhelp entries for each custom key map
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Custom mappings~\n"
+        for i in g:NERDTreeKeyMap.All()
+            if !empty(i.quickhelpText)
+                let help .= "\" ". i.key .": ". i.quickhelpText ."\n"
+            endif
+        endfor
+
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Other mappings~\n"
+        let help .= "\" ". g:NERDTreeMapQuit .": Close the NERDTree window\n"
+        let help .= "\" ". g:NERDTreeMapToggleZoom .": Zoom (maximize-minimize)\n"
+        let help .= "\"    the NERDTree window\n"
+        let help .= "\" ". g:NERDTreeMapHelp .": toggle help\n"
+        let help .= "\"\n\" ----------------------------\n"
+        let help .= "\" Bookmark commands~\n"
+        let help .= "\" :Bookmark [<name>]\n"
+        let help .= "\" :BookmarkToRoot <name>\n"
+        let help .= "\" :RevealBookmark <name>\n"
+        let help .= "\" :OpenBookmark <name>\n"
+        let help .= "\" :ClearBookmarks [<names>]\n"
+        let help .= "\" :ClearAllBookmarks\n"
+        silent! put =help
+    elseif !self.isMinimal()
+        let help ="\" Press ". g:NERDTreeMapHelp ." for help\n"
+        silent! put =help
+    endif
+endfunction
+
+
+"FUNCTION: s:UI.new(nerdtree) {{{1
+function! s:UI.New(nerdtree)
+    let newObj = copy(self)
+    let newObj.nerdtree = a:nerdtree
+    let newObj._showHelp = 0
+    let newObj._ignoreEnabled = 1
+    let newObj._showFiles = g:NERDTreeShowFiles
+    let newObj._showHidden = g:NERDTreeShowHidden
+    let newObj._showBookmarks = g:NERDTreeShowBookmarks
+
+    return newObj
+endfunction
+
+"FUNCTION: s:UI.getPath(ln) {{{1
+"Gets the full path to the node that is rendered on the given line number
+"
+"Args:
+"ln: the line number to get the path for
+"
+"Return:
+"A path if a node was selected, {} if nothing is selected.
+"If the 'up a dir' line was selected then the path to the parent of the
+"current root is returned
+function! s:UI.getPath(ln)
+    let line = getline(a:ln)
+
+    let rootLine = self.getRootLineNum()
+
+    "check to see if we have the root node
+    if a:ln == rootLine
+        return self.nerdtree.root.path
+    endif
+
+    if line ==# s:UI.UpDirLine()
+        return self.nerdtree.root.path.getParent()
+    endif
+
+    let indent = self._indentLevelFor(line)
+
+    "remove the tree parts and the leading space
+    let curFile = self._stripMarkup(line, 0)
+
+    let wasdir = 0
+    if curFile =~# '/$'
+        let wasdir = 1
+        let curFile = substitute(curFile, '/\?$', '/', "")
+    endif
+
+    let dir = ""
+    let lnum = a:ln
+    while lnum > 0
+        let lnum = lnum - 1
+        let curLine = getline(lnum)
+        let curLineStripped = self._stripMarkup(curLine, 1)
+
+        "have we reached the top of the tree?
+        if lnum == rootLine
+            let dir = self.nerdtree.root.path.str({'format': 'UI'}) . dir
+            break
+        endif
+        if curLineStripped =~# '/$'
+            let lpindent = self._indentLevelFor(curLine)
+            if lpindent < indent
+                let indent = indent - 1
+
+                let dir = substitute (curLineStripped,'^\\', "", "") . dir
+                continue
+            endif
+        endif
+    endwhile
+    let curFile = self.nerdtree.root.path.drive . dir . curFile
+    let toReturn = g:NERDTreePath.New(curFile)
+    return toReturn
+endfunction
+
+"FUNCTION: s:UI.getLineNum(file_node){{{1
+"returns the line number this node is rendered on, or -1 if it isnt rendered
+function! s:UI.getLineNum(file_node)
+    "if the node is the root then return the root line no.
+    if a:file_node.isRoot()
+        return self.getRootLineNum()
+    endif
+
+    let totalLines = line("$")
+
+    "the path components we have matched so far
+    let pathcomponents = [substitute(self.nerdtree.root.path.str({'format': 'UI'}), '/ *$', '', '')]
+    "the index of the component we are searching for
+    let curPathComponent = 1
+
+    let fullpath = a:file_node.path.str({'format': 'UI'})
+
+    let lnum = self.getRootLineNum()
+    while lnum > 0
+        let lnum = lnum + 1
+        "have we reached the bottom of the tree?
+        if lnum ==# totalLines+1
+            return -1
+        endif
+
+        let curLine = getline(lnum)
+
+        let indent = self._indentLevelFor(curLine)
+        if indent ==# curPathComponent
+            let curLine = self._stripMarkup(curLine, 1)
+
+            let curPath =  join(pathcomponents, '/') . '/' . curLine
+            if stridx(fullpath, curPath, 0) ==# 0
+                if fullpath ==# curPath || strpart(fullpath, len(curPath)-1,1) ==# '/'
+                    let curLine = substitute(curLine, '/ *$', '', '')
+                    call add(pathcomponents, curLine)
+                    let curPathComponent = curPathComponent + 1
+
+                    if fullpath ==# curPath
+                        return lnum
+                    endif
+                endif
+            endif
+        endif
+    endwhile
+    return -1
+endfunction
+
+"FUNCTION: s:UI.getRootLineNum(){{{1
+"gets the line number of the root node
+function! s:UI.getRootLineNum()
+    let rootLine = 1
+    while getline(rootLine) !~# '^\(/\|<\)'
+        let rootLine = rootLine + 1
+    endwhile
+    return rootLine
+endfunction
+
+"FUNCTION: s:UI.getShowBookmarks() {{{1
+function! s:UI.getShowBookmarks()
+    return self._showBookmarks
+endfunction
+
+"FUNCTION: s:UI.getShowFiles() {{{1
+function! s:UI.getShowFiles()
+    return self._showFiles
+endfunction
+
+"FUNCTION: s:UI.getShowHelp() {{{1
+function! s:UI.getShowHelp()
+    return self._showHelp
+endfunction
+
+"FUNCTION: s:UI.getShowHidden() {{{1
+function! s:UI.getShowHidden()
+    return self._showHidden
+endfunction
+
+"FUNCTION: s:UI._indentLevelFor(line) {{{1
+function! s:UI._indentLevelFor(line)
+    "have to do this work around because match() returns bytes, not chars
+    let numLeadBytes = match(a:line, '\M\[^ '.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.']')
+    " The next line is a backward-compatible workaround for strchars(a:line(0:numLeadBytes-1]). strchars() is in 7.3+
+    let leadChars = len(split(a:line[0:numLeadBytes-1], '\zs'))
+
+    return leadChars / s:UI.IndentWid()
+endfunction
+
+"FUNCTION: s:UI.IndentWid() {{{1
+function! s:UI.IndentWid()
+    return 2
+endfunction
+
+"FUNCTION: s:UI.isIgnoreFilterEnabled() {{{1
+function! s:UI.isIgnoreFilterEnabled()
+    return self._ignoreEnabled == 1
+endfunction
+
+"FUNCTION: s:UI.isMinimal() {{{1
+function! s:UI.isMinimal()
+    return g:NERDTreeMinimalUI
+endfunction
+
+"FUNCTION: s:UI.MarkupReg() {{{1
+function! s:UI.MarkupReg()
+    return '^\(['.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.'] \| \+['.g:NERDTreeDirArrowExpandable.g:NERDTreeDirArrowCollapsible.'] \| \+\)'
+endfunction
+
+"FUNCTION: s:UI._renderBookmarks {{{1
+function! s:UI._renderBookmarks()
+
+    if !self.isMinimal()
+        call setline(line(".")+1, ">----------Bookmarks----------")
+        call cursor(line(".")+1, col("."))
+    endif
+
+    if g:NERDTreeBookmarksSort == 1 || g:NERDTreeBookmarksSort == 2
+        call g:NERDTreeBookmark.SortBookmarksList()
+    endif
+
+    for i in g:NERDTreeBookmark.Bookmarks()
+        call setline(line(".")+1, i.str())
+        call cursor(line(".")+1, col("."))
+    endfor
+
+    call setline(line(".")+1, '')
+    call cursor(line(".")+1, col("."))
+endfunction
+
+"FUNCTION: s:UI.restoreScreenState() {{{1
+"
+"Sets the screen state back to what it was when nerdtree#saveScreenState was last
+"called.
+"
+"Assumes the cursor is in the NERDTree window
+function! s:UI.restoreScreenState()
+    if !has_key(self, '_screenState')
+        return
+    endif
+    exec("silent vertical resize " . self._screenState['oldWindowSize'])
+
+    let old_scrolloff=&scrolloff
+    let &scrolloff=0
+    call cursor(self._screenState['oldTopLine'], 0)
+    normal! zt
+    call setpos(".", self._screenState['oldPos'])
+    let &scrolloff=old_scrolloff
+endfunction
+
+"FUNCTION: s:UI.saveScreenState() {{{1
+"Saves the current cursor position in the current buffer and the window
+"scroll position
+function! s:UI.saveScreenState()
+    let win = winnr()
+    call g:NERDTree.CursorToTreeWin()
+    let self._screenState = {}
+    let self._screenState['oldPos'] = getpos(".")
+    let self._screenState['oldTopLine'] = line("w0")
+    let self._screenState['oldWindowSize']= winwidth("")
+    call nerdtree#exec(win . "wincmd w")
+endfunction
+
+"FUNCTION: s:UI.setShowHidden(val) {{{1
+function! s:UI.setShowHidden(val)
+    let self._showHidden = a:val
+endfunction
+
+"FUNCTION: s:UI._stripMarkup(line, removeLeadingSpaces){{{1
+"returns the given line with all the tree parts stripped off
+"
+"Args:
+"line: the subject line
+"removeLeadingSpaces: 1 if leading spaces are to be removed (leading spaces =
+"any spaces before the actual text of the node)
+function! s:UI._stripMarkup(line, removeLeadingSpaces)
+    let line = a:line
+    "remove the tree parts and the leading space
+    let line = substitute (line, g:NERDTreeUI.MarkupReg(),"","")
+
+    "strip off any read only flag
+    let line = substitute (line, ' \['.g:NERDTreeGlyphReadOnly.'\]', "","")
+
+    "strip off any bookmark flags
+    let line = substitute (line, ' {[^}]*}', "","")
+
+    "strip off any executable flags
+    let line = substitute (line, '*\ze\($\| \)', "","")
+
+    "strip off any generic flags
+    let line = substitute (line, '\[[^]]*\]', "","")
+
+    let wasdir = 0
+    if line =~# '/$'
+        let wasdir = 1
+    endif
+    let line = substitute (line,' -> .*',"","") " remove link to
+    if wasdir ==# 1
+        let line = substitute (line, '/\?$', '/', "")
+    endif
+
+    if a:removeLeadingSpaces
+        let line = substitute (line, '^ *', '', '')
+    endif
+
+    return line
+endfunction
+
+"FUNCTION: s:UI.render() {{{1
+function! s:UI.render()
+    setlocal modifiable
+
+    "remember the top line of the buffer and the current line so we can
+    "restore the view exactly how it was
+    let curLine = line(".")
+    let curCol = col(".")
+    let topLine = line("w0")
+
+    "delete all lines in the buffer (being careful not to clobber a register)
+    silent 1,$delete _
+
+    call self._dumpHelp()
+
+    "delete the blank line before the help and add one after it
+    if !self.isMinimal()
+        call setline(line(".")+1, "")
+        call cursor(line(".")+1, col("."))
+    endif
+
+    if self.getShowBookmarks()
+        call self._renderBookmarks()
+    endif
+
+    "add the 'up a dir' line
+    if !self.isMinimal()
+        call setline(line(".")+1, s:UI.UpDirLine())
+        call cursor(line(".")+1, col("."))
+    endif
+
+    "draw the header line
+    let header = self.nerdtree.root.path.str({'format': 'UI', 'truncateTo': winwidth(0)})
+    call setline(line(".")+1, header)
+    call cursor(line(".")+1, col("."))
+
+    "draw the tree
+    silent put =self.nerdtree.root.renderToString()
+
+    "delete the blank line at the top of the buffer
+    silent 1,1delete _
+
+    "restore the view
+    let old_scrolloff=&scrolloff
+    let &scrolloff=0
+    call cursor(topLine, 1)
+    normal! zt
+    call cursor(curLine, curCol)
+    let &scrolloff = old_scrolloff
+
+    setlocal nomodifiable
+endfunction
+
+
+"FUNCTION: UI.renderViewSavingPosition {{{1
+"Renders the tree and ensures the cursor stays on the current node or the
+"current nodes parent if it is no longer available upon re-rendering
+function! s:UI.renderViewSavingPosition()
+    let currentNode = g:NERDTreeFileNode.GetSelected()
+
+    "go up the tree till we find a node that will be visible or till we run
+    "out of nodes
+    while currentNode != {} && !currentNode.isVisible() && !currentNode.isRoot()
+        let currentNode = currentNode.parent
+    endwhile
+
+    call self.render()
+
+    if currentNode != {}
+        call currentNode.putCursorHere(0, 0)
+    endif
+endfunction
+
+"FUNCTION: s:UI.toggleHelp() {{{1
+function! s:UI.toggleHelp()
+    let self._showHelp = !self._showHelp
+endfunction
+
+" FUNCTION: s:UI.toggleIgnoreFilter() {{{1
+" toggles the use of the NERDTreeIgnore option
+function! s:UI.toggleIgnoreFilter()
+    let self._ignoreEnabled = !self._ignoreEnabled
+    call self.renderViewSavingPosition()
+    call self.centerView()
+endfunction
+
+" FUNCTION: s:UI.toggleShowBookmarks() {{{1
+" toggles the display of bookmarks
+function! s:UI.toggleShowBookmarks()
+    let self._showBookmarks = !self._showBookmarks
+    if self.getShowBookmarks()
+        call self.nerdtree.render()
+        call g:NERDTree.CursorToBookmarkTable()
+    else
+        call self.renderViewSavingPosition()
+    endif
+    call self.centerView()
+endfunction
+
+" FUNCTION: s:UI.toggleShowFiles() {{{1
+" toggles the display of hidden files
+function! s:UI.toggleShowFiles()
+    let self._showFiles = !self._showFiles
+    call self.renderViewSavingPosition()
+    call self.centerView()
+endfunction
+
+" FUNCTION: s:UI.toggleShowHidden() {{{1
+" toggles the display of hidden files
+function! s:UI.toggleShowHidden()
+    let self._showHidden = !self._showHidden
+    call self.renderViewSavingPosition()
+    call self.centerView()
+endfunction
+
+" FUNCTION: s:UI.toggleZoom() {{{1
+" zoom (maximize/minimize) the NERDTree window
+function! s:UI.toggleZoom()
+    if exists("b:NERDTreeZoomed") && b:NERDTreeZoomed
+        let size = exists("b:NERDTreeOldWindowSize") ? b:NERDTreeOldWindowSize : g:NERDTreeWinSize
+        exec "silent vertical resize ". size
+        let b:NERDTreeZoomed = 0
+    else
+        exec "vertical resize"
+        let b:NERDTreeZoomed = 1
+    endif
+endfunction
+
+"FUNCTION: s:UI.UpDirLine() {{{1
+function! s:UI.UpDirLine()
+    return '.. (up a dir)'
+endfunction
diff --git a/vim-plugins/bundle/nerdtree/nerdtree_plugin/exec_menuitem.vim b/vim-plugins/bundle/nerdtree/nerdtree_plugin/exec_menuitem.vim
new file mode 100644
index 0000000..c53650a
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/nerdtree_plugin/exec_menuitem.vim
@@ -0,0 +1,40 @@
+" ============================================================================
+" File:        exec_menuitem.vim
+" Description: plugin for NERD Tree that provides an execute file menu item
+" Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+" License:     This program is free software. It comes without any warranty,
+"              to the extent permitted by applicable law. You can redistribute
+"              it and/or modify it under the terms of the Do What The Fuck You
+"              Want To Public License, Version 2, as published by Sam Hocevar.
+"              See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+" ============================================================================
+if exists("g:loaded_nerdtree_exec_menuitem")
+    finish
+endif
+let g:loaded_nerdtree_exec_menuitem = 1
+
+call NERDTreeAddMenuItem({
+            \ 'text': '(!)Execute file',
+            \ 'shortcut': '!',
+            \ 'callback': 'NERDTreeExecFile',
+            \ 'isActiveCallback': 'NERDTreeExecFileActive' })
+
+function! NERDTreeExecFileActive()
+    let node = g:NERDTreeFileNode.GetSelected()
+    return !node.path.isDirectory && node.path.isExecutable
+endfunction
+
+function! NERDTreeExecFile()
+    let treenode = g:NERDTreeFileNode.GetSelected()
+    echo "==========================================================\n"
+    echo "Complete the command to execute (add arguments etc):\n"
+    let cmd = treenode.path.str({'escape': 1})
+    let cmd = input(':!', cmd . ' ')
+
+    if cmd != ''
+        exec ':!' . cmd
+    else
+        echo "Aborted"
+    endif
+endfunction
diff --git a/vim-plugins/bundle/nerdtree/nerdtree_plugin/fs_menu.vim b/vim-plugins/bundle/nerdtree/nerdtree_plugin/fs_menu.vim
new file mode 100644
index 0000000..e563a94
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/nerdtree_plugin/fs_menu.vim
@@ -0,0 +1,287 @@
+" ============================================================================
+" File:        fs_menu.vim
+" Description: plugin for the NERD Tree that provides a file system menu
+" Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+" License:     This program is free software. It comes without any warranty,
+"              to the extent permitted by applicable law. You can redistribute
+"              it and/or modify it under the terms of the Do What The Fuck You
+"              Want To Public License, Version 2, as published by Sam Hocevar.
+"              See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+" ============================================================================
+if exists("g:loaded_nerdtree_fs_menu")
+    finish
+endif
+let g:loaded_nerdtree_fs_menu = 1
+
+"Automatically delete the buffer after deleting or renaming a file
+if !exists("g:NERDTreeAutoDeleteBuffer")
+    let g:NERDTreeAutoDeleteBuffer = 0
+endif
+
+call NERDTreeAddMenuItem({'text': '(a)dd a childnode', 'shortcut': 'a', 'callback': 'NERDTreeAddNode'})
+call NERDTreeAddMenuItem({'text': '(m)ove the current node', 'shortcut': 'm', 'callback': 'NERDTreeMoveNode'})
+call NERDTreeAddMenuItem({'text': '(d)elete the current node', 'shortcut': 'd', 'callback': 'NERDTreeDeleteNode'})
+
+if has("gui_mac") || has("gui_macvim") || has("mac")
+    call NERDTreeAddMenuItem({'text': '(r)eveal in Finder the current node', 'shortcut': 'r', 'callback': 'NERDTreeRevealInFinder'})
+    call NERDTreeAddMenuItem({'text': '(o)pen the current node with system editor', 'shortcut': 'o', 'callback': 'NERDTreeExecuteFile'})
+    call NERDTreeAddMenuItem({'text': '(q)uicklook the current node', 'shortcut': 'q', 'callback': 'NERDTreeQuickLook'})
+endif
+
+if g:NERDTreePath.CopyingSupported()
+    call NERDTreeAddMenuItem({'text': '(c)opy the current node', 'shortcut': 'c', 'callback': 'NERDTreeCopyNode'})
+endif
+
+if has("unix") || has("osx")
+    call NERDTreeAddMenuItem({'text': '(l)ist the current node', 'shortcut': 'l', 'callback': 'NERDTreeListNode'})
+else
+    call NERDTreeAddMenuItem({'text': '(l)ist the current node', 'shortcut': 'l', 'callback': 'NERDTreeListNodeWin32'})
+endif
+
+"FUNCTION: s:promptToDelBuffer(bufnum, msg){{{1
+"prints out the given msg and, if the user responds by pushing 'y' then the
+"buffer with the given bufnum is deleted
+"
+"Args:
+"bufnum: the buffer that may be deleted
+"msg: a message that will be echoed to the user asking them if they wish to
+"     del the buffer
+function! s:promptToDelBuffer(bufnum, msg)
+    echo a:msg
+    if g:NERDTreeAutoDeleteBuffer || nr2char(getchar()) ==# 'y'
+        " 1. ensure that all windows which display the just deleted filename
+        " now display an empty buffer (so a layout is preserved).
+        " Is not it better to close single tabs with this file only ?
+        let s:originalTabNumber = tabpagenr()
+        let s:originalWindowNumber = winnr()
+        exec "tabdo windo if winbufnr(0) == " . a:bufnum . " | exec ':enew! ' | endif"
+        exec "tabnext " . s:originalTabNumber
+        exec s:originalWindowNumber . "wincmd w"
+        " 3. We don't need a previous buffer anymore
+        exec "bwipeout! " . a:bufnum
+    endif
+endfunction
+
+"FUNCTION: s:promptToRenameBuffer(bufnum, msg){{{1
+"prints out the given msg and, if the user responds by pushing 'y' then the
+"buffer with the given bufnum is replaced with a new one
+"
+"Args:
+"bufnum: the buffer that may be deleted
+"msg: a message that will be echoed to the user asking them if they wish to
+"     del the buffer
+function! s:promptToRenameBuffer(bufnum, msg, newFileName)
+    echo a:msg
+    if g:NERDTreeAutoDeleteBuffer || nr2char(getchar()) ==# 'y'
+        let quotedFileName = fnameescape(a:newFileName)
+        " 1. ensure that a new buffer is loaded
+        exec "badd " . quotedFileName
+        " 2. ensure that all windows which display the just deleted filename
+        " display a buffer for a new filename.
+        let s:originalTabNumber = tabpagenr()
+        let s:originalWindowNumber = winnr()
+        let editStr = g:NERDTreePath.New(a:newFileName).str({'format': 'Edit'})
+        exec "tabdo windo if winbufnr(0) == " . a:bufnum . " | exec ':e! " . editStr . "' | endif"
+        exec "tabnext " . s:originalTabNumber
+        exec s:originalWindowNumber . "wincmd w"
+        " 3. We don't need a previous buffer anymore
+        exec "bwipeout! " . a:bufnum
+    endif
+endfunction
+"FUNCTION: NERDTreeAddNode(){{{1
+function! NERDTreeAddNode()
+    let curDirNode = g:NERDTreeDirNode.GetSelected()
+
+    let newNodeName = input("Add a childnode\n".
+                          \ "==========================================================\n".
+                          \ "Enter the dir/file name to be created. Dirs end with a '/'\n" .
+                          \ "", curDirNode.path.str() . g:NERDTreePath.Slash(), "file")
+
+    if newNodeName ==# ''
+        call nerdtree#echo("Node Creation Aborted.")
+        return
+    endif
+
+    try
+        let newPath = g:NERDTreePath.Create(newNodeName)
+        let parentNode = b:NERDTree.root.findNode(newPath.getParent())
+
+        let newTreeNode = g:NERDTreeFileNode.New(newPath, b:NERDTree)
+        if empty(parentNode)
+            call b:NERDTree.root.refresh()
+            call b:NERDTree.render()
+        elseif parentNode.isOpen || !empty(parentNode.children)
+            call parentNode.addChild(newTreeNode, 1)
+            call NERDTreeRender()
+            call newTreeNode.putCursorHere(1, 0)
+        endif
+    catch /^NERDTree/
+        call nerdtree#echoWarning("Node Not Created.")
+    endtry
+endfunction
+
+"FUNCTION: NERDTreeMoveNode(){{{1
+function! NERDTreeMoveNode()
+    let curNode = g:NERDTreeFileNode.GetSelected()
+    let newNodePath = input("Rename the current node\n" .
+                          \ "==========================================================\n" .
+                          \ "Enter the new path for the node:                          \n" .
+                          \ "", curNode.path.str(), "file")
+
+    if newNodePath ==# ''
+        call nerdtree#echo("Node Renaming Aborted.")
+        return
+    endif
+
+    try
+        let bufnum = bufnr("^".curNode.path.str()."$")
+
+        call curNode.rename(newNodePath)
+        call NERDTreeRender()
+
+        "if the node is open in a buffer, ask the user if they want to
+        "close that buffer
+        if bufnum != -1
+            let prompt = "\nNode renamed.\n\nThe old file is open in buffer ". bufnum . (bufwinnr(bufnum) ==# -1 ? " (hidden)" : "") .". Replace this buffer with a new file? (yN)"
+            call s:promptToRenameBuffer(bufnum,  prompt, newNodePath)
+        endif
+
+        call curNode.putCursorHere(1, 0)
+
+        redraw
+    catch /^NERDTree/
+        call nerdtree#echoWarning("Node Not Renamed.")
+    endtry
+endfunction
+
+" FUNCTION: NERDTreeDeleteNode() {{{1
+function! NERDTreeDeleteNode()
+    let currentNode = g:NERDTreeFileNode.GetSelected()
+    let confirmed = 0
+
+    if currentNode.path.isDirectory && currentNode.getChildCount() > 0
+        let choice =input("Delete the current node\n" .
+                         \ "==========================================================\n" .
+                         \ "STOP! Directory is not empty! To delete, type 'yes'\n" .
+                         \ "" . currentNode.path.str() . ": ")
+        let confirmed = choice ==# 'yes'
+    else
+        echo "Delete the current node\n" .
+           \ "==========================================================\n".
+           \ "Are you sure you wish to delete the node:\n" .
+           \ "" . currentNode.path.str() . " (yN):"
+        let choice = nr2char(getchar())
+        let confirmed = choice ==# 'y'
+    endif
+
+
+    if confirmed
+        try
+            call currentNode.delete()
+            call NERDTreeRender()
+
+            "if the node is open in a buffer, ask the user if they want to
+            "close that buffer
+            let bufnum = bufnr("^".currentNode.path.str()."$")
+            if buflisted(bufnum)
+                let prompt = "\nNode deleted.\n\nThe file is open in buffer ". bufnum . (bufwinnr(bufnum) ==# -1 ? " (hidden)" : "") .". Delete this buffer? (yN)"
+                call s:promptToDelBuffer(bufnum, prompt)
+            endif
+
+            redraw
+        catch /^NERDTree/
+            call nerdtree#echoWarning("Could not remove node")
+        endtry
+    else
+        call nerdtree#echo("delete aborted")
+    endif
+
+endfunction
+
+" FUNCTION: NERDTreeListNode() {{{1
+function! NERDTreeListNode()
+    let treenode = g:NERDTreeFileNode.GetSelected()
+    if treenode != {}
+        let metadata = split(system('ls -ld ' . shellescape(treenode.path.str())), '\n')
+        call nerdtree#echo(metadata[0])
+    else
+        call nerdtree#echo("No information avaialable")
+    endif
+endfunction
+
+" FUNCTION: NERDTreeListNodeWin32() {{{1
+function! NERDTreeListNodeWin32()
+    let treenode = g:NERDTreeFileNode.GetSelected()
+    if treenode != {}
+        let metadata = split(system('DIR /Q ' . shellescape(treenode.path.str()) . ' | FINDSTR "^[012][0-9]/[0-3][0-9]/[12][0-9][0-9][0-9]"'), '\n')
+        call nerdtree#echo(metadata[0])
+    else
+        call nerdtree#echo("No information avaialable")
+    endif
+
+endfunction
+
+" FUNCTION: NERDTreeCopyNode() {{{1
+function! NERDTreeCopyNode()
+    let currentNode = g:NERDTreeFileNode.GetSelected()
+    let newNodePath = input("Copy the current node\n" .
+                          \ "==========================================================\n" .
+                          \ "Enter the new path to copy the node to:                   \n" .
+                          \ "", currentNode.path.str(), "file")
+
+    if newNodePath != ""
+        "strip trailing slash
+        let newNodePath = substitute(newNodePath, '\/$', '', '')
+
+        let confirmed = 1
+        if currentNode.path.copyingWillOverwrite(newNodePath)
+            call nerdtree#echo("Warning: copying may overwrite files! Continue? (yN)")
+            let choice = nr2char(getchar())
+            let confirmed = choice ==# 'y'
+        endif
+
+        if confirmed
+            try
+                let newNode = currentNode.copy(newNodePath)
+                if empty(newNode)
+                    call b:NERDTree.root.refresh()
+                    call b:NERDTree.render()
+                else
+                    call NERDTreeRender()
+                    call newNode.putCursorHere(0, 0)
+                endif
+            catch /^NERDTree/
+                call nerdtree#echoWarning("Could not copy node")
+            endtry
+        endif
+    else
+        call nerdtree#echo("Copy aborted.")
+    endif
+    redraw
+endfunction
+
+" FUNCTION: NERDTreeQuickLook() {{{1
+function! NERDTreeQuickLook()
+    let treenode = g:NERDTreeFileNode.GetSelected()
+    if treenode != {}
+        call system("qlmanage -p 2>/dev/null '" . treenode.path.str() . "'")
+    endif
+endfunction
+
+" FUNCTION: NERDTreeRevealInFinder() {{{1
+function! NERDTreeRevealInFinder()
+    let treenode = g:NERDTreeFileNode.GetSelected()
+    if treenode != {}
+        call system("open -R '" . treenode.path.str() . "'")
+    endif
+endfunction
+
+" FUNCTION: NERDTreeExecuteFile() {{{1
+function! NERDTreeExecuteFile()
+    let treenode = g:NERDTreeFileNode.GetSelected()
+    if treenode != {}
+        call system("open '" . treenode.path.str() . "'")
+    endif
+endfunction
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/nerdtree/plugin/NERD_tree.vim b/vim-plugins/bundle/nerdtree/plugin/NERD_tree.vim
new file mode 100644
index 0000000..5960d0b
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/plugin/NERD_tree.vim
@@ -0,0 +1,222 @@
+" ============================================================================
+" File:        NERD_tree.vim
+" Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+" License:     This program is free software. It comes without any warranty,
+"              to the extent permitted by applicable law. You can redistribute
+"              it and/or modify it under the terms of the Do What The Fuck You
+"              Want To Public License, Version 2, as published by Sam Hocevar.
+"              See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+" ============================================================================
+"
+" SECTION: Script init stuff {{{1
+"============================================================
+if exists("loaded_nerd_tree")
+    finish
+endif
+if v:version < 700
+    echoerr "NERDTree: this plugin requires vim >= 7. DOWNLOAD IT! You'll thank me later!"
+    finish
+endif
+let loaded_nerd_tree = 1
+
+"for line continuation - i.e dont want C in &cpo
+let s:old_cpo = &cpo
+set cpo&vim
+
+"Function: s:initVariable() function {{{2
+"This function is used to initialise a given variable to a given value. The
+"variable is only initialised if it does not exist prior
+"
+"Args:
+"var: the name of the var to be initialised
+"value: the value to initialise var to
+"
+"Returns:
+"1 if the var is set, 0 otherwise
+function! s:initVariable(var, value)
+    if !exists(a:var)
+        exec 'let ' . a:var . ' = ' . "'" . substitute(a:value, "'", "''", "g") . "'"
+        return 1
+    endif
+    return 0
+endfunction
+
+"SECTION: Init variable calls and other random constants {{{2
+call s:initVariable("g:NERDTreeAutoCenter", 1)
+call s:initVariable("g:NERDTreeAutoCenterThreshold", 3)
+call s:initVariable("g:NERDTreeCaseSensitiveSort", 0)
+call s:initVariable("g:NERDTreeSortHiddenFirst", 1)
+call s:initVariable("g:NERDTreeChDirMode", 0)
+call s:initVariable("g:NERDTreeCreatePrefix", "silent")
+call s:initVariable("g:NERDTreeMinimalUI", 0)
+if !exists("g:NERDTreeIgnore")
+    let g:NERDTreeIgnore = ['\~$']
+endif
+call s:initVariable("g:NERDTreeBookmarksFile", expand('$HOME') . '/.NERDTreeBookmarks')
+call s:initVariable("g:NERDTreeBookmarksSort", 1)
+call s:initVariable("g:NERDTreeHighlightCursorline", 1)
+call s:initVariable("g:NERDTreeHijackNetrw", 1)
+call s:initVariable('g:NERDTreeMarkBookmarks', 1)
+call s:initVariable("g:NERDTreeMouseMode", 1)
+call s:initVariable("g:NERDTreeNotificationThreshold", 100)
+call s:initVariable("g:NERDTreeQuitOnOpen", 0)
+call s:initVariable("g:NERDTreeRespectWildIgnore", 0)
+call s:initVariable("g:NERDTreeShowBookmarks", 0)
+call s:initVariable("g:NERDTreeShowFiles", 1)
+call s:initVariable("g:NERDTreeShowHidden", 0)
+call s:initVariable("g:NERDTreeShowLineNumbers", 0)
+call s:initVariable("g:NERDTreeSortDirs", 1)
+
+if !nerdtree#runningWindows()
+    call s:initVariable("g:NERDTreeDirArrowExpandable", "â–¸")
+    call s:initVariable("g:NERDTreeDirArrowCollapsible", "â–¾")
+else
+    call s:initVariable("g:NERDTreeDirArrowExpandable", "+")
+    call s:initVariable("g:NERDTreeDirArrowCollapsible", "~")
+endif
+call s:initVariable("g:NERDTreeCascadeOpenSingleChildDir", 1)
+call s:initVariable("g:NERDTreeCascadeSingleChildDir", 1)
+
+if !exists("g:NERDTreeSortOrder")
+    let g:NERDTreeSortOrder = ['\/$', '*', '\.swp$',  '\.bak$', '\~$']
+else
+    "if there isnt a * in the sort sequence then add one
+    if count(g:NERDTreeSortOrder, '*') < 1
+        call add(g:NERDTreeSortOrder, '*')
+    endif
+endif
+
+call s:initVariable("g:NERDTreeGlyphReadOnly", "RO")
+
+if !exists('g:NERDTreeStatusline')
+
+    "the exists() crap here is a hack to stop vim spazzing out when
+    "loading a session that was created with an open nerd tree. It spazzes
+    "because it doesnt store b:NERDTree(its a b: var, and its a hash)
+    let g:NERDTreeStatusline = "%{exists('b:NERDTree')?b:NERDTree.root.path.str():''}"
+
+endif
+call s:initVariable("g:NERDTreeWinPos", "left")
+call s:initVariable("g:NERDTreeWinSize", 31)
+
+"init the shell commands that will be used to copy nodes, and remove dir trees
+"
+"Note: the space after the command is important
+if nerdtree#runningWindows()
+    call s:initVariable("g:NERDTreeRemoveDirCmd", 'rmdir /s /q ')
+    call s:initVariable("g:NERDTreeCopyDirCmd", 'xcopy /s /e /i /y /q ')
+    call s:initVariable("g:NERDTreeCopyFileCmd", 'copy /y ')
+else
+    call s:initVariable("g:NERDTreeRemoveDirCmd", 'rm -rf ')
+    call s:initVariable("g:NERDTreeCopyCmd", 'cp -r ')
+endif
+
+
+"SECTION: Init variable calls for key mappings {{{2
+call s:initVariable("g:NERDTreeMapActivateNode", "o")
+call s:initVariable("g:NERDTreeMapChangeRoot", "C")
+call s:initVariable("g:NERDTreeMapChdir", "cd")
+call s:initVariable("g:NERDTreeMapCloseChildren", "X")
+call s:initVariable("g:NERDTreeMapCloseDir", "x")
+call s:initVariable("g:NERDTreeMapDeleteBookmark", "D")
+call s:initVariable("g:NERDTreeMapMenu", "m")
+call s:initVariable("g:NERDTreeMapHelp", "?")
+call s:initVariable("g:NERDTreeMapJumpFirstChild", "K")
+call s:initVariable("g:NERDTreeMapJumpLastChild", "J")
+call s:initVariable("g:NERDTreeMapJumpNextSibling", "<C-j>")
+call s:initVariable("g:NERDTreeMapJumpParent", "p")
+call s:initVariable("g:NERDTreeMapJumpPrevSibling", "<C-k>")
+call s:initVariable("g:NERDTreeMapJumpRoot", "P")
+call s:initVariable("g:NERDTreeMapOpenExpl", "e")
+call s:initVariable("g:NERDTreeMapOpenInTab", "t")
+call s:initVariable("g:NERDTreeMapOpenInTabSilent", "T")
+call s:initVariable("g:NERDTreeMapOpenRecursively", "O")
+call s:initVariable("g:NERDTreeMapOpenSplit", "i")
+call s:initVariable("g:NERDTreeMapOpenVSplit", "s")
+call s:initVariable("g:NERDTreeMapPreview", "g" . NERDTreeMapActivateNode)
+call s:initVariable("g:NERDTreeMapPreviewSplit", "g" . NERDTreeMapOpenSplit)
+call s:initVariable("g:NERDTreeMapPreviewVSplit", "g" . NERDTreeMapOpenVSplit)
+call s:initVariable("g:NERDTreeMapQuit", "q")
+call s:initVariable("g:NERDTreeMapRefresh", "r")
+call s:initVariable("g:NERDTreeMapRefreshRoot", "R")
+call s:initVariable("g:NERDTreeMapToggleBookmarks", "B")
+call s:initVariable("g:NERDTreeMapToggleFiles", "F")
+call s:initVariable("g:NERDTreeMapToggleFilters", "f")
+call s:initVariable("g:NERDTreeMapToggleHidden", "I")
+call s:initVariable("g:NERDTreeMapToggleZoom", "A")
+call s:initVariable("g:NERDTreeMapUpdir", "u")
+call s:initVariable("g:NERDTreeMapUpdirKeepOpen", "U")
+call s:initVariable("g:NERDTreeMapCWD", "CD")
+
+"SECTION: Load class files{{{2
+call nerdtree#loadClassFiles()
+
+" SECTION: Commands {{{1
+"============================================================
+call nerdtree#ui_glue#setupCommands()
+
+" SECTION: Auto commands {{{1
+"============================================================
+augroup NERDTree
+    "Save the cursor position whenever we close the nerd tree
+    exec "autocmd BufLeave ". g:NERDTreeCreator.BufNamePrefix() ."* if g:NERDTree.IsOpen() | call b:NERDTree.ui.saveScreenState() | endif"
+
+    "disallow insert mode in the NERDTree
+    exec "autocmd BufEnter ". g:NERDTreeCreator.BufNamePrefix() ."* stopinsert"
+augroup END
+
+if g:NERDTreeHijackNetrw
+    augroup NERDTreeHijackNetrw
+        autocmd VimEnter * silent! autocmd! FileExplorer
+        au BufEnter,VimEnter * call nerdtree#checkForBrowse(expand("<amatch>"))
+    augroup END
+endif
+
+" SECTION: Public API {{{1
+"============================================================
+function! NERDTreeAddMenuItem(options)
+    call g:NERDTreeMenuItem.Create(a:options)
+endfunction
+
+function! NERDTreeAddMenuSeparator(...)
+    let opts = a:0 ? a:1 : {}
+    call g:NERDTreeMenuItem.CreateSeparator(opts)
+endfunction
+
+function! NERDTreeAddSubmenu(options)
+    return g:NERDTreeMenuItem.Create(a:options)
+endfunction
+
+function! NERDTreeAddKeyMap(options)
+    call g:NERDTreeKeyMap.Create(a:options)
+endfunction
+
+function! NERDTreeRender()
+    call nerdtree#renderView()
+endfunction
+
+function! NERDTreeFocus()
+    if g:NERDTree.IsOpen()
+        call g:NERDTree.CursorToTreeWin()
+    else
+        call g:NERDTreeCreator.ToggleTabTree("")
+    endif
+endfunction
+
+function! NERDTreeCWD()
+    call NERDTreeFocus()
+    call nerdtree#ui_glue#chRootCwd()
+endfunction
+
+function! NERDTreeAddPathFilter(callback)
+    call g:NERDTree.AddPathFilter(a:callback)
+endfunction
+
+" SECTION: Post Source Actions {{{1
+call nerdtree#postSourceActions()
+
+"reset &cpo back to users setting
+let &cpo = s:old_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/nerdtree/syntax/nerdtree.vim b/vim-plugins/bundle/nerdtree/syntax/nerdtree.vim
new file mode 100644
index 0000000..e93ca1d
--- /dev/null
+++ b/vim-plugins/bundle/nerdtree/syntax/nerdtree.vim
@@ -0,0 +1,82 @@
+let s:tree_up_dir_line = '.. (up a dir)'
+syn match NERDTreeIgnore #\~#
+exec 'syn match NERDTreeIgnore #\['.g:NERDTreeGlyphReadOnly.'\]#'
+
+"highlighting for the .. (up dir) line at the top of the tree
+execute "syn match NERDTreeUp #\\V". s:tree_up_dir_line ."#"
+
+"quickhelp syntax elements
+syn match NERDTreeHelpKey #" \{1,2\}[^ ]*:#ms=s+2,me=e-1
+syn match NERDTreeHelpKey #" \{1,2\}[^ ]*,#ms=s+2,me=e-1
+syn match NERDTreeHelpTitle #" .*\~#ms=s+2,me=e-1
+syn match NERDTreeToggleOn #(on)#ms=s+1,he=e-1
+syn match NERDTreeToggleOff #(off)#ms=e-3,me=e-1
+syn match NERDTreeHelpCommand #" :.\{-}\>#hs=s+3
+syn match NERDTreeHelp  #^".*# contains=NERDTreeHelpKey,NERDTreeHelpTitle,NERDTreeIgnore,NERDTreeToggleOff,NERDTreeToggleOn,NERDTreeHelpCommand
+
+"highlighting for sym links
+syn match NERDTreeLinkTarget #->.*# containedin=NERDTreeDir,NERDTreeFile
+syn match NERDTreeLinkFile #.* ->#me=e-3 containedin=NERDTreeFile
+syn match NERDTreeLinkDir #.*/ ->#me=e-3 containedin=NERDTreeDir
+
+"highlighing for directory nodes and file nodes
+syn match NERDTreeDirSlash #/# containedin=NERDTreeDir
+
+exec 'syn match NERDTreeClosable #'.escape(g:NERDTreeDirArrowCollapsible, '~').'# containedin=NERDTreeDir,NERDTreeFile'
+exec 'syn match NERDTreeOpenable #'.escape(g:NERDTreeDirArrowExpandable, '~').'# containedin=NERDTreeDir,NERDTreeFile'
+
+let s:dirArrows = escape(g:NERDTreeDirArrowCollapsible, '~]\-').escape(g:NERDTreeDirArrowExpandable, '~]\-')
+exec 'syn match NERDTreeDir #[^'.s:dirArrows.' ].*/#'
+syn match NERDTreeExecFile  #^ .*\*\($\| \)# contains=NERDTreeRO,NERDTreeBookmark
+exec 'syn match NERDTreeFile  #^[^"\.'.s:dirArrows.'] *[^'.s:dirArrows.']*# contains=NERDTreeLink,NERDTreeRO,NERDTreeBookmark,NERDTreeExecFile'
+
+"highlighting for readonly files
+exec 'syn match NERDTreeRO # *\zs.*\ze \['.g:NERDTreeGlyphReadOnly.'\]# contains=NERDTreeIgnore,NERDTreeBookmark,NERDTreeFile'
+
+syn match NERDTreeFlags #^ *\zs\[.\]# containedin=NERDTreeFile,NERDTreeExecFile
+syn match NERDTreeFlags #\[.\]# containedin=NERDTreeDir
+
+syn match NERDTreeCWD #^[</].*$#
+
+"highlighting for bookmarks
+syn match NERDTreeBookmark # {.*}#hs=s+1
+
+"highlighting for the bookmarks table
+syn match NERDTreeBookmarksLeader #^>#
+syn match NERDTreeBookmarksHeader #^>-\+Bookmarks-\+$# contains=NERDTreeBookmarksLeader
+syn match NERDTreeBookmarkName #^>.\{-} #he=e-1 contains=NERDTreeBookmarksLeader
+syn match NERDTreeBookmark #^>.*$# contains=NERDTreeBookmarksLeader,NERDTreeBookmarkName,NERDTreeBookmarksHeader
+
+hi def link NERDTreePart Special
+hi def link NERDTreePartFile Type
+hi def link NERDTreeExecFile Title
+hi def link NERDTreeDirSlash Identifier
+
+hi def link NERDTreeBookmarksHeader statement
+hi def link NERDTreeBookmarksLeader ignore
+hi def link NERDTreeBookmarkName Identifier
+hi def link NERDTreeBookmark normal
+
+hi def link NERDTreeHelp String
+hi def link NERDTreeHelpKey Identifier
+hi def link NERDTreeHelpCommand Identifier
+hi def link NERDTreeHelpTitle Macro
+hi def link NERDTreeToggleOn Question
+hi def link NERDTreeToggleOff WarningMsg
+
+hi def link NERDTreeLinkTarget Type
+hi def link NERDTreeLinkFile Macro
+hi def link NERDTreeLinkDir Macro
+
+hi def link NERDTreeDir Directory
+hi def link NERDTreeUp Directory
+hi def link NERDTreeFile Normal
+hi def link NERDTreeCWD Statement
+hi def link NERDTreeOpenable Directory
+hi def link NERDTreeClosable Directory
+hi def link NERDTreeIgnore ignore
+hi def link NERDTreeRO WarningMsg
+hi def link NERDTreeBookmark Statement
+hi def link NERDTreeFlags Number
+
+hi def link NERDTreeCurrentNode Search
diff --git a/vim-plugins/bundle/python-mode/.bumpversion.cfg b/vim-plugins/bundle/python-mode/.bumpversion.cfg
new file mode 100644
index 0000000..260501b
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/.bumpversion.cfg
@@ -0,0 +1,11 @@
+[bumpversion]
+commit = True
+current_version = 0.9.0
+files = plugin/pymode.vim
+tag = True
+tag_name = {new_version}
+
+[bumpversion:file:doc/pymode.txt]
+search = Version: {current_version}
+replace = Version: {new_version}
+
diff --git a/vim-plugins/bundle/python-mode/.ruby-gemset b/vim-plugins/bundle/python-mode/.ruby-gemset
new file mode 100644
index 0000000..5ded393
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/.ruby-gemset
@@ -0,0 +1 @@
+vim-flavor
diff --git a/vim-plugins/bundle/python-mode/.ruby-version b/vim-plugins/bundle/python-mode/.ruby-version
new file mode 100644
index 0000000..67b8bc0
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/.ruby-version
@@ -0,0 +1 @@
+ruby-1.9.3
diff --git a/vim-plugins/bundle/python-mode/.travis.yml b/vim-plugins/bundle/python-mode/.travis.yml
new file mode 100644
index 0000000..e10ed9f
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/.travis.yml
@@ -0,0 +1,6 @@
+language: ruby
+python: "2.7"
+rvm:
+  - 1.9.3
+script:
+  - make travis
diff --git a/vim-plugins/bundle/python-mode/AUTHORS b/vim-plugins/bundle/python-mode/AUTHORS
new file mode 100644
index 0000000..cc3de27
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/AUTHORS
@@ -0,0 +1,64 @@
+Maintainers:
+
+* Kirill Klenov <horneds@gmail.com>
+* Bryce Guinta (https://github.com/brycepg)
+
+
+Contributors:
+
+* Alvin Francis (http://github.com/alvinfrancis);
+* Andriy Kohut (https://github.com/andriykohut)
+* Anler Hp (http://github.com/ikame);
+* Anton Parkhomenko (http://github.com/chuwy);
+* Ashley Hewson (http://github.com/ashleyh);
+* Benjamin Ruston (http://github.com/bruston);
+* Boris Filippov (http://github.com/frenzykryger);
+* Brad Mease (http://github.com/bmease)
+* Brendan Maguire (https://github.com/brendanmaguire)
+* Daniel Hahler (http://github.com/blueyed)
+* David Vogt (http://github.com/winged);
+* Denis Kasak (http://github.com/dkasak);
+* Dimitrios Semitsoglou-Tsiapos (https://github.com/dset0x);
+* Dirk Wallenstein (http://github.com/dirkwallenstein);
+* Florent Xicluna (http://github.com/florentx);
+* Fredrik Henrysson (http://github.com/fhenrysson);
+* Igor Guerrero (http://github.com/igorgue);
+* Jacob Niehus (https://github.com/wilywampa)
+* Jason Harvey (http://github.com/alienth)
+* Jay Rainey (https://github.com/jawrainey)
+* Jonathan McCall (http://github.com/Jonnymcc);
+* Kevin Deldycke (http://github.com/kdeldycke);
+* Kurtis Rader (https://github.com/krader1961);
+* Lawrence Akka (https://github.com/lawrenceakka);
+* Lowe Thiderman (http://github.com/thiderman);
+* Martin Brochhaus (http://github.com/mbrochh);
+* Matt Dodge (https://github.com/mattdodge);
+* Matthew Moses (http://github.com/mlmoses);
+* Maxim (https://github.com/mpyatishev);
+* Mel Boyce (http://github.com/syngin);
+* Mohammed (http://github.com/mbadran);
+* Naoya Inada (http://github.com/naoina);
+* Nate Zhang (https://github.com/natezhang93);
+* Paweł Korzeniewski (https://github.com/korzeniewskipl);
+* Pedro Algarvio (http://github.com/s0undt3ch);
+* Phillip Cloud (http://github.com/cpcloud);
+* Piet Delport (http://github.com/pjdelport);
+* Robert David Grant (http://github.com/bgrant);
+* Robin Schneider (https://github.com/ypid);
+* Ronald Andreu Kaiser (http://github.com/cathoderay);;
+* Samir Benmendil (https://github.com/Ram-Z);
+* Sorin Ionescu (sorin-ionescu);
+* Steve Losh (http://github.com/sjl);
+* Tommy Allen (https://github.com/tweekmonster);
+* Tony Narlock (https://github.com/tony);
+* Tyler Fenby (https://github.com/TFenby);
+* Vincent Driessen (https://github.com/nvie);
+* Wang Feng (https://github.com/mapler);
+* Wayne Ye (https://github.com/WayneYe);
+* Wes Turner (https://github.com/westurner);
+* bendavis78 (https://github.com/bendavis78);
+* fwuzju (https://github.com/fwuzju);
+* lee (https://github.com/loyalpartner);
+* nixon (https://github.com/nixon);
+* sphaugh (https://github.com/sphaugh);
+* tramchamploo (https://github.com/tramchamploo);
diff --git a/vim-plugins/bundle/python-mode/COPYING b/vim-plugins/bundle/python-mode/COPYING
new file mode 100644
index 0000000..65c5ca8
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/COPYING
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/vim-plugins/bundle/python-mode/Changelog.rst b/vim-plugins/bundle/python-mode/Changelog.rst
new file mode 100644
index 0000000..e396eb6
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/Changelog.rst
@@ -0,0 +1,356 @@
+Changelog
+=========
+
+* Pylama updated to version 5.0.5
+* Rope libs updated
+* Add wdb to debugger list in breakpoint cmd
+* Add 'pymode_options_max_line_length' option
+* Add ability to set related checker options `:help pymode-lint-options`
+  Options added: 'pymode_lint_options_pep8', 'pymode_lint_options_pep257',
+  'pymode_lint_options_mccabe', 'pymode_lint_options_pyflakes',
+  'pymode_lint_options_pylint'
+* Highlight comments inside class/function arg lists
+* Don't fold single line def
+* Don't skip a line when the first docstring contains text
+* Add Python documentation vertical display option
+* Rope: correct refactoring function calls
+
+
+## 2014-06-11 0.8.1
+-------------------
+* Pylama updated to version 3.3.2
+* Get fold's expression symbol from &fillchars;
+* Fixed error when setting g:pymode_breakpoint_cmd (expobrain);
+* Fixed code running;
+* Ability to override rope project root and .ropeproject folder
+* Added path argument to `PymodeRopeNewProject` which skips prompt
+* Disable `pymode_rope_lookup_project` by default
+* Options added:
+    'pymode_rope_project_root', 'pymode_rope_ropefolder'
+
+
+## 2013-12-04 0.7.8b
+--------------------
+    * Update indentation support;
+    * Python3 support;
+    * Removed pymode modeline support;
+    * Disabled async code checking support;
+    * Options changes:
+        'pymode_doc_key' -> 'pymode_doc_bind'
+        'pymode_run_key' -> 'pymode_run_bind'
+        'pymode_breakpoint_key' -> 'pymode_breakpoint_bind'
+        'pymode_breakpoint_template' -> 'pymode_breakpoint_cmd'
+        'pymode_lint_write' -> 'pymode_lint_on_write'
+        'pymode_lint_onfly' -> 'pymode_lint_on_fly'
+        'pymode_lint_checker' -> 'pymode_lint_checkers'
+        'pymode_lint_minheight' -> 'pymode_quickfix_minheight'
+        'pymode_lint_maxheight' -> 'pymode_quickfix_maxheight'
+        'pymode_rope_autocomplete_map' -> 'pymode_rope_completion_bind'
+        'pymode_rope_enable_autoimport' -> 'pymode_rope_autoimport'
+
+    * Options removed:
+
+        'pymode_lint_hold', 'pymode_lint_config', 'pymode_lint_jump',
+        'pymode_lint_signs_always_visible', 'pymode_rope_extended_complete',
+        'pymode_rope_auto_project', 'pymode_rope_autoimport_generate',
+        'pymode_rope_autoimport_underlines', 'pymode_rope_codeassist_maxfixes',
+        'pymode_rope_sorted_completions', 'pymode_rope_extended_complete',
+        'pymode_rope_confirm_saving', 'pymode_rope_global_prefix',
+        'pymode_rope_local_prefix', 'pymode_rope_vim_completion',
+        'pymode_rope_guess_project', 'pymode_rope_goto_def_newwin',
+        'pymode_rope_always_show_complete_menu'
+
+    * Options added:
+        'pymode_rope_regenerate_on_write', 'pymode_rope_completion',
+        'pymode_rope_complete_on_dot', 'pymode_lint_sort',
+        'pymode_rope_lookup_project', 'pymode_lint_unmodified'
+
+    * Commands added:
+        'PymodeVirtualenv'
+
+    * Commands changed:
+        'PyDoc' -> 'PymodeDoc'
+        'Pyrun' -> 'PymodeRun'
+        'PyLintToggle' -> 'PymodeLintToggle'
+        'PyLint' -> 'PymodeLint'
+        'PyLintAuto' -> 'PymodeLintAuto'
+        'RopeOpenProject' -> 'PymodeRopeNewProject'
+        'RopeUndo' -> 'PymodeRopeUndo'
+        'RopeRedo' -> 'PymodeRopeRedo'
+        'RopeRenameCurrentModule' -> 'PymodeRopeRenameModule'
+        'RopeModuleToPackage' -> 'PymodeRopeModuleToPackage'
+        'RopeGenerateAutoimportCache' -> 'PymodeRopeRegenerate'
+        'RopeOrgamizeImports' -> 'PymodeRopeAutoImport'
+
+    * Commands removed:
+        'PyLintCheckerToggle', 'RopeCloseProject', 'RopeProjectConfig',
+        'RopeRename', 'RopeCreate<...>', 'RopeWriteProject', 'RopeRename',
+        'RopeExtractVariable', 'RopeExtractMethod', 'RopeInline', 'RopeMove',
+        'RopeRestructure', 'RopeUseFunction', 'RopeIntroduceFactory',
+        'RopeChangeSignature', 'RopeMoveCurrentModule',
+        'RopeGenerate<...>', 'RopeAnalizeModule', 'RopeAutoImport',
+
+
+## 2013-10-29 0.6.19
+--------------------
+* Added `g:pymode_rope_autocomplete_map` option;
+* Removed `g:pymode_rope_map_space` option;
+* Added PEP257 checker;
+* Support 'pudb' in breakpoints;
+* Pyrun can now operate on a range of lines, and does not need to save (c) lawrenceakka
+* Update pylama to version 1.5.0
+* Add a set of `g:pymode_lint_*_symbol` options (c) kdeldycke;
+* Support virtualenv for python3 (c) mlmoses;
+
+## 2013-05-15 0.6.18
+--------------------
+* Fixed autopep8 (`PyLintAuto`) command;
+* Fix error on non-ascii characters in docstrings;
+* Update python syntax;
+
+## 2013-05-03 0.6.17
+--------------------
+* Update `Pylint` to version 0.28.0;
+* Update `pyflakes` to version 0.7.3;
+* Fixed `lint_ignore` options bug;
+* Fixed encoding problems when code running;
+
+## 2013-04-26 0.6.16
+--------------------
+* Improvement folding (thanks @alvinfrancis);
+
+## 2013-04-01 0.6.15
+--------------------
+* Bugfix release
+
+## 2013-03-16 0.6.14
+--------------------
+* Update `PEP8` to version 1.4.5;
+* Update `Pylint` to version 0.27.0;
+* Update `pyflakes` to version 0.6.1;
+* Update `autopep8` to version 0.8.7;
+* Fix breakpoint definition;
+* Update python syntax;
+* Fixed run-time error when output non-ascii in multibyte locale;
+* Move initialization into ftplugin as it is python specific;
+* Pyrex (Cython) files support;
+* Support `raw_input` in run python code;
+
+## 2012-09-07 0.6.10
+--------------------
+* Dont raise an exception when Logger has no message handler (c) nixon
+* Improve performance of white space removal (c) Dave Smith
+* Improve ropemode support (c) s0undt3ch 
+* Add `g:pymode_updatetime` option
+* Update autopep8 to version 0.8.1
+
+## 2012-09-07 0.6.9
+-------------------
+* Update autopep8
+* Improve pymode#troubleshooting#Test()
+
+## 2012-09-06 0.6.8
+-------------------
+* Add PEP8 indentation ":help 'pymode_indent'" 
+
+## 2012-08-15 0.6.7
+-------------------
+* Fix documentation. Thanks (c) bgrant;
+* Fix pymode "async queue" support.
+
+## 2012-08-02 0.6.6
+-------------------
+* Updated Pep8 to version 1.3.3
+* Updated Pylint to version 0.25.2
+* Fixed virtualenv support for windows users
+* Added pymode modeline ':help PythonModeModeline'
+* Added diagnostic tool ':call pymode#troubleshooting#Test()'
+* Added `PyLintAuto` command ':help PyLintAuto' 
+* Code checking is async operation now
+* More, more fast the pymode folding
+* Repaired execution of python code
+
+## 2012-05-24 0.6.4
+-------------------
+* Add 'pymode_paths' option
+* Rope updated to version 0.9.4
+
+## 2012-04-18 0.6.3
+-------------------
+* Fix pydocs integration
+
+## 2012-04-10 0.6.2
+-------------------
+* Fix pymode_run for "unnamed" clipboard
+* Add 'pymode_lint_mccabe_complexity' option
+* Update Pep8 to version 1.0.1
+* Warning! Change 'pymode_rope_goto_def_newwin' option
+  for open "goto definition" in new window, set it to 'new' or 'vnew'
+  for horizontally or vertically split
+  If you use default behaviour (in the same buffer), not changes needed.
+
+## 2012-03-13 0.6.0
+-------------------
+* Add 'pymode_lint_hold' option 
+* Improve pymode loading speed
+* Add pep8, mccabe lint checkers
+* Now g:pymode_lint_checker can have many values
+  Ex. "pep8,pyflakes,mccabe"
+* Add 'pymode_lint_ignore' and 'pymode_lint_select' options 
+* Fix rope keys
+* Fix python motion in visual mode
+* Add folding 'pymode_folding'
+* Warning: 'pymode_lint_checker' now set to 'pyflakes,pep8,mccabe' by default
+
+## 2012-02-12 0.5.8
+-------------------
+* Fix pylint for Windows users
+* Python documentation search running from Vim (delete g:pydoc option)
+* Python code execution running from Vim (delete g:python option)
+
+## 2012-02-11 0.5.7
+-------------------
+* Fix 'g:pymode_lint_message' mode error
+* Fix breakpoints
+* Fix python paths and virtualenv detection
+
+## 2012-02-06 0.5.6
+-------------------
+* Fix 'g:pymode_syntax' option
+* Show error message in bottom part of screen
+  see 'g:pymode_lint_message'
+* Fix pylint for windows users
+* Fix breakpoint command (Use pdb when idpb not installed)
+
+## 2012-01-17 0.5.5
+-------------------
+* Add a sign for info messages from pylint.
+  (c) Fredrik Henrysson
+* Change motion keys: vic - viC, dam - daM and etc
+* Add 'g:pymode_lint_onfly' option
+
+## 2012-01-09 0.5.3
+-------------------
+* Prevent the configuration from breaking python-mode
+  (c) Dirk Wallenstein
+
+## 2012-01-08 0.5.2
+-------------------
+* Fix ropeomnicompletion
+* Add preview documentation
+
+## 2012-01-06 0.5.1
+-------------------
+* Happy new year!
+* Objects and motion  fixes
+
+## 2011-11-30 0.5.0
+-------------------
+* Add python objects and motions (beta)
+  :h pymode_motion
+
+## 2011-11-27 0.4.8
+-------------------
+* Add `PyLintWindowToggle` command
+* Fix some bugs
+
+## 2011-11-23 0.4.6
+-------------------
+* Enable all syntax highlighting
+  For old settings set in your vimrc:
+    let g:pymode_syntax_builtin_objs = 0
+    let g:pymode_syntax_builtin_funcs = 0
+
+* Change namespace of syntax variables
+  See README
+
+## 2011-11-18 0.4.5
+-------------------
+* Add 'g:pymode_syntax' option
+* Highlight 'self' keyword
+
+## 2011-11-16 0.4.4
+-------------------
+* Minor fixes
+
+## 2011-11-11 0.4.3
+-------------------
+* Fix pyflakes
+
+## 2011-11-09 0.4.2
+-------------------
+* Add FAQ
+* Some refactoring and fixes
+
+## 2011-11-08 0.4.0
+-------------------
+* Add alternative code checker "pyflakes"
+  See :h 'pymode_lint_checker'
+* Update install docs
+
+## 2011-10-30 0.3.3
+-------------------
+* Fix RopeShowDoc
+
+## 2011-10-28 0.3.2
+-------------------
+* Add 'g:pymode_options_*' stuff, for ability
+  to disable default pymode options for python buffers
+
+## 2011-10-27 0.3.1
+-------------------
+* Add 'g:pymode_rope_always_show_complete_menu' option
+* Some pylint fixes
+
+## 2011-10-25 0.3.0
+-------------------
+* Add g:pymode_lint_minheight and g:pymode_lint_maxheight
+  options
+* Fix PyLintToggle
+* Fix Rope and PyLint libs loading
+
+## 2011-10-21 0.2.12
+--------------------
+* Auto open cwindow with results
+  on rope find operations
+
+## 2011-10-20 0.2.11
+--------------------
+* Add 'pymode_lint_jump' option
+
+## 2011-10-19 0.2.10
+--------------------
+* Minor fixes (virtualenv loading, buffer commands)
+
+## 2011-10-18 0.2.6
+-------------------
+* Add <C-space> shortcut for macvim users.
+* Add VIRTUALENV support
+
+## 2011-10-17 0.2.4
+-------------------
+* Add current work path to sys.path
+* Add 'g:pymode' option (disable/enable pylint and rope)
+* Fix pylint copyright
+* Hotfix rope autocomplete
+
+## 2011-10-15 0.2.1
+-------------------
+* Change rope variables (ropevim_<name> -> pymode_rope_<name>)
+* Add "pymode_rope_auto_project" option (default: 1)
+* Update and fix docs
+* 'pymode_rope_extended_complete' set by default
+* Auto generate rope project and cache
+* "<C-c>r a" for RopeAutoImport
+
+## 2011-10-12 0.1.4
+-------------------
+* Add default pylint configuration
+
+## 2011-10-12 0.1.3
+-------------------
+* Fix pylint and update docs
+
+## 2011-10-11 0.1.2
+-------------------
+* First public release
diff --git a/vim-plugins/bundle/python-mode/Gemfile b/vim-plugins/bundle/python-mode/Gemfile
new file mode 100644
index 0000000..a87f4e1
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'vim-flavor', '~> 1.1'
diff --git a/vim-plugins/bundle/python-mode/Makefile b/vim-plugins/bundle/python-mode/Makefile
new file mode 100644
index 0000000..7706091
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/Makefile
@@ -0,0 +1,90 @@
+PYMODE = $(CURDIR)/pymode
+LIBS = $(PYMODE)/libs
+PYLAMA = $(LIBS)/pylama
+
+.PHONY: clean
+clean:
+	find $(CURDIR) -name "*.pyc" -delete
+	rm -rf $(CURDIR)/build
+	rm -rf *.deb
+
+VERSION?=minor
+# target: release - Bump version
+release:
+	git fetch origin
+	git checkout master
+	git rebase
+	git merge develop
+	bumpversion $(VERSION)
+	git checkout develop
+	git rebase
+	git merge master
+	git push origin develop master
+	git push --tags
+
+.PHONY: minor
+minor: release
+
+.PHONY: patch
+patch:
+	make release VERSION=patch
+
+.PHONY: major
+major:
+	make release VERSION=major
+
+# Temporary disable rope tests on Travis
+.PHONY: travis
+travis:
+	rake test
+
+.PHONY: test t
+test:
+	bundle install
+	rm -rf $(CURDIR)/.ropeproject
+	rake test
+t: test
+
+.PHONY: pylama
+pylama:
+	rm -rf $(PYLAMA)
+	make $(PYLAMA)
+	make $(PYLAMA)/lint/pylama_pylint
+
+.PHONY: rope
+rope:
+	@git clone https://github.com/python-rope/rope.git $(CURDIR)/_/rope
+	@rm -rf $(CURDIR)/pymode/libs/rope
+	@cp -r $(CURDIR)/_/rope/rope $(CURDIR)/pymode/libs/.
+
+$(PYLAMA):
+	cp -r $$PRJDIR/pylama/pylama $(PYLAMA)
+
+$(PYLAMA)/lint/pylama_pylint:
+	cp -r $$PRJDIR/pylama/plugins/pylama_pylint/pylama_pylint/ $(PYLAMA)/lint/pylama_pylint
+
+$(CURDIR)/build:
+	mkdir -p $(CURDIR)/build/usr/share/vim/addons
+	mkdir -p $(CURDIR)/build/usr/share/vim/registry
+	cp -r after autoload doc ftplugin plugin pymode syntax $(CURDIR)/build/usr/share/vim/addons/.
+	cp -r python-mode.yaml $(CURDIR)/build/usr/share/vim/registry/.
+
+PACKAGE_VERSION?=$(shell git describe --tags `git rev-list master --tags --max-count=1`) 
+PACKAGE_NAME="vim-python-mode"
+PACKAGE_MAINTAINER="Kirill Klenov <horneds@gmail.com>"
+PACKAGE_URL=http://github.com/klen/python-mode
+deb: clean $(CURDIR)/build
+	@fpm -s dir -t deb -a all \
+	    -n $(PACKAGE_NAME) \
+	    -v $(PACKAGE_VERSION) \
+	    -m $(PACKAGE_MAINTAINER) \
+	    --url $(PACKAGE_URL) \
+	    --license "GNU lesser general public license" \
+	    --description "Vim-Swissknife for python" \
+	    --deb-user root \
+	    --deb-group root \
+	    -C $(CURDIR)/build \
+	    -d "python2.7" \
+	    -d "vim-addon-manager" \
+	    usr
+	@mv *.deb ~/Dropbox/projects/deb/load
diff --git a/vim-plugins/bundle/python-mode/README.rst b/vim-plugins/bundle/python-mode/README.rst
new file mode 100644
index 0000000..867029d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/README.rst
@@ -0,0 +1,367 @@
+|logo| Python-mode, Python in VIM
+#################################
+
+.. image:: https://travis-ci.org/klen/python-mode.png?branch=develop
+    :target: https://travis-ci.org/klen/python-mode
+
+-----
+
+*The project needs contributors*
+
+** Python-mode Slack Channel is here: https://python-mode.herokuapp.com/ **
+
+-----
+
+|
+| Src:  https://github.com/klen/python-mode
+| Homepage: https://klen.github.io/python-mode/
+| Docs: https://github.com/klen/python-mode/blob/develop/doc/pymode.txt
+|
+
+Python-mode is a vim plugin that helps you to create python code very quickly
+by utilizing libraries including
+`pylint`_, `rope`_, pydoc_, `pyflakes`_, `pep8`_, `autopep8`_,
+`pep257`_ and `mccabe`_
+for features like static analysis, refactoring, folding, completion,
+documentation, and more.
+
+The plugin contains all you need to develop python applications in Vim.
+
+There is no need to install `pylint`_, `rope`_
+or any other `Python Libraries`_ on your system.
+
+- Support Python version 2.6+ and 3.2+
+- Syntax highlighting
+- Virtualenv support
+- Run python code (``<leader>r``)
+- Add/remove breakpoints (``<leader>b``)
+- Improved Python indentation
+- Python folding
+- Python motions and operators (``]]``, ``3[[``, ``]]M``, ``vaC``, ``viM``,
+  ``daC``, ``ciM``, ...)
+- Code checking  (pylint_, pyflakes_, pylama_, ...) that can be run
+  simultaneously (``:PymodeLint``)
+- Autofix PEP8 errors (``:PymodeLintAuto``)
+- Search in python documentation (``K``)
+- Code refactoring <rope refactoring library> (rope_)
+- Strong code completion (rope_)
+- Go to definition (``<C-c>g`` for `:RopeGotoDefinition`)
+- And more, more ...
+
+See (very old) screencast here: http://www.youtube.com/watch?v=67OZNp9Z0CQ
+(sorry for quality, this is my first screencast) Another old presentation here:
+http://www.youtube.com/watch?v=YhqsjUUHj6g
+
+**To read python-mode documentation in Vim, see** ``:help pymode``
+
+
+.. contents::
+
+
+Requirements
+============
+
+- VIM >= 7.3 (mostly features needed `+python` or `+python3` support)
+  (also ``--with-features=big`` if you want ``g:pymode_lint_signs``)
+
+
+How to install
+==============
+
+Using pathogen (recommended)
+----------------------------
+::
+
+    % cd ~/.vim
+    % mkdir -p bundle && cd bundle
+    % git clone https://github.com/klen/python-mode.git
+
+- Enable `pathogen <https://github.com/tpope/vim-pathogen>`_
+  in your ``~/.vimrc``: ::
+
+    " Pathogen load
+    filetype off
+
+    call pathogen#infect()
+    call pathogen#helptags()
+
+    filetype plugin indent on
+    syntax on
+
+
+Manually
+--------
+::
+
+    % git clone https://github.com/klen/python-mode.git
+    % cd python-mode
+    % cp -R * ~/.vim
+
+Then rebuild **helptags** in vim::
+
+    :helptags ~/.vim/doc/
+
+
+.. note:: **filetype-plugin**  (``:help filetype-plugin-on``) and
+   **filetype-indent** (``:help filetype-indent-on``)
+   must be enabled to use python-mode.
+
+
+Debian packages
+---------------
+|Repository URL: https://klen.github.io/python-mode/deb/
+
+Install with commands:
+
+::
+
+     add-apt-repository https://klen.github.io/python-mode/deb main
+     apt-get update
+     apt-get install vim-python-mode
+
+If you are getting the message: "The following signatures couldn't be verified because the public key is not available": ::
+
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B5DF65307000E266
+
+`vim-python-mode` using `vim-addons`, so after installation just enable
+`python-mode` with command: ::
+
+    vim-addons install python-mode
+
+
+Troubleshooting
+===============
+
+If your python-mode doesn't work:
+
+1. Load Vim with only python-mode enabled (use `debug.vim` from pymode): ::
+
+    vim -u <path_to_pymode>/debug.vim
+
+And try to repeat your case. If no error occurs, seems like problem isn't in the
+plugin.
+
+2. Type `:PymodeTroubleshooting`
+
+And fix any warnings or copy the output and send it to me. (For example, by
+creating a `new github issue <https://github.com/klen/python-mode/issues/new>`_
+if one does not already exist for the problem).
+
+
+Customization
+=============
+
+You can override the default key bindings by redefining them in your `.vimrc`, for example: ::
+
+    " Override go-to.definition key shortcut to Ctrl-]
+    let g:pymode_rope_goto_definition_bind = "<C-]>"
+
+    " Override run current python file key shortcut to Ctrl-Shift-e
+    let g:pymode_run_bind = "<C-S-e>"
+
+    " Override view python doc key shortcut to Ctrl-Shift-d
+    let g:pymode_doc_bind = "<C-S-d>"
+
+
+Frequent Problems
+=================
+
+Read this section before opening an issue on the tracker.
+
+Python 3 Syntax
+---------------
+
+By default python-mode uses python 2 syntax checking. To enable python 3
+syntax checking (e.g. for async) add::
+
+    let g:pymode_python = 'python3'
+
+To your vimrc or exrc file
+
+
+Documentation
+=============
+
+Documentation is available in your vim ``:help pymode``
+
+
+Bugtracker
+===========
+
+If you have any suggestions, bug reports or
+annoyances please report them to the issue tracker
+at https://github.com/klen/python-mode/issues
+
+
+Contributing
+============
+
+* Kirill Klenov (horneds@gmail.com)
+* Bryce Guinta (https://github.com/brycepg)
+
+Also see the `AUTHORS` file.
+
+Development of python-mode happens at github:
+https://github.com/klen/python-mode
+
+Please make a pull request to `development` branch and add yourself to
+`AUTHORS`.
+
+Source Links
+===================
+- `doc/pymode.txt
+  <https://github.com/klen/python-mode/blob/develop/doc/pymode.txt>`__
+  -- ``:help pymode``
+- `plugin/pymode.vim
+  <https://github.com/klen/python-mode/blob/develop/plugin/pymode.vim>`__
+  -- python-mode VIM plugin
+- `syntax/python.vim
+  <https://github.com/klen/python-mode/blob/develop/syntax/python.vim>`__
+  -- python-mode ``python.vim`` VIM syntax
+- `syntax/pyrex.vim
+  <https://github.com/klen/python-mode/blob/develop/syntax/pyrex.vim>`__
+  -- ``pyrex.vim`` VIM syntax (pyrex, Cython)
+- `t/
+  <https://github.com/klen/python-mode/tree/develop/t>`__
+  -- ``*.vim`` more python-mode VIM configuration
+- `pymode/
+  <https://github.com/klen/python-mode/tree/develop/pymode>`__
+  -- ``*.py`` -- python-mode Python module
+- `pymode/libs/
+  <https://github.com/klen/python-mode/tree/develop/pymode/libs>`__
+  -- ``*.py`` -- `Python Libraries <#python-libraries>`__
+
+
+Python Libraries
+------------------
+Vendored Python modules are located
+mostly in
+`pymode/libs/ <https://github.com/klen/python-mode/tree/develop/pymode/libs>`__.
+
+
+======
+rope
+======
+| PyPI: https://pypi.python.org/pypi/rope
+| Src: https://github.com/python-rope/rope
+| Docs: https://github.com/python-rope/rope/blob/master/docs/overview.rst
+| Docs: https://github.com/python-rope/rope/blob/master/docs/library.rst
+
+========================
+ropemode
+========================
+| PyPI: https://pypi.python.org/pypi/ropemode
+| Src: https://github.com/python-rope/ropemode
+
+=========
+ropevim
+=========
+| PyPI: https://pypi.python.org/pypi/ropevim
+| Src: https://github.com/python-rope/ropevim
+| Docs: https://github.com/python-rope/ropevim/blob/master/doc/ropevim.txt
+
+=======
+pylama
+=======
+| PyPI: https://pypi.python.org/pypi/pylama
+| Src: https://github.com/klen/pylama
+
+========
+pylint
+========
+| PyPI: https://pypi.python.org/pypi/pylint
+| Src: https://bitbucket.org/logilab/pylint
+| Homepage: http://www.pylint.org/
+| Docs: http://docs.pylint.org/
+| Docs: http://docs.pylint.org/message-control.html
+| Docs: http://docs.pylint.org/faq.html#message-control
+| ErrCodes: http://pylint-messages.wikidot.com/all-codes
+| ErrCodes: http://pylint-messages.wikidot.com/all-messages
+
+==========
+pyflakes
+==========
+| PyPI: https://pypi.python.org/pypi/pyflakes
+| Src: https://github.com/pyflakes/pyflakes
+| ErrCodes: https://flake8.readthedocs.org/en/latest/warnings.html
+
+======
+pep8
+======
+| PyPI: https://pypi.python.org/pypi/pep8
+| Src: http://github.com/jcrocholl/pep8
+| PEP 8: http://www.python.org/dev/peps/pep-0008/
+| PEP 8: http://legacy.python.org/dev/peps/pep-0008/
+| Docs: https://pep8.readthedocs.org/en/latest/
+| Docs: https://pep8.readthedocs.org/en/latest/intro.html#configuration
+| ErrCodes: https://pep8.readthedocs.org/en/latest/intro.html#error-codes
+
+=========
+autopep8
+=========
+| PyPI: https://pypi.python.org/pypi/autopep8
+| Src: https://github.com/hhatto/autopep8
+
+=======
+pep257
+=======
+| PyPI: https://pypi.python.org/pypi/pep257
+| Src: http://github.com/GreenSteam/pep257
+| Docs: https://pep257.readthedocs.org/en/latest/
+| PEP 257: http://www.python.org/dev/peps/pep-0257/
+| ErrCodes: https://pep257.readthedocs.org/en/latest/error_codes.html
+
+=======
+mccabe
+=======
+| PyPI: https://pypi.python.org/pypi/mccabe
+| Src: https://github.com/flintwork/mccabe
+| Docs: https://en.wikipedia.org/wiki/Cyclomatic_complexity
+
+
+Vim Libraries
+---------------
+Vendored Vim modules are located mostly in ``t/``.
+
+======================
+Python syntax for vim
+======================
+| Src: http://www.hlabs.spb.ru/vim/python.vim
+
+
+=====================
+PEP8 VIM indentation
+=====================
+| Src: http://github.com/hynek/vim-python-pep8-indent
+
+
+
+Copyright
+=========
+
+Copyright © 2013-2015 Kirill Klenov (klen_)
+
+License
+=======
+
+Licensed under a `GNU lesser general public license`_.
+
+If you like this plugin, I would very appreciated if you kindly send me a postcard :)
+My address is here: "Russia, 143500, MO, Istra, pos. Severny 8-3" to "Kirill Klenov".
+**Thanks for support!**
+
+.. _GNU lesser general public license: http://www.gnu.org/copyleft/lesser.html
+.. _klen: https://klen.github.com/
+.. _pydoc: http://docs.python.org/library/pydoc.html
+.. _pathogen: https://github.com/tpope/vim-pathogen
+.. _rope_: https://pypi.python.org/pypi/rope
+.. _pylama_: https://github.com/klen/pylama
+.. _pylint_: https://bitbucket.org/logilab/pylint
+.. _pyflakes_: https://pypi.python.org/pypi/pyflakes
+.. _autopep8_: https://github.com/hhatto/autopep8
+.. _pep257_: http://github.com/GreenSteam/pep257
+.. _mccabe_: https://github.com/flintwork/mccabe
+.. _pythonvim: http://www.hlabs.spb.ru/vim/python.vim
+.. _pep8_: http://github.com/jcrocholl/pep8
+.. _pep8indent: http://github.com/hynek/vim-python-pep8-indent
+.. |logo| image:: https://raw.github.com/klen/python-mode/develop/logo.png
diff --git a/vim-plugins/bundle/python-mode/Rakefile b/vim-plugins/bundle/python-mode/Rakefile
new file mode 100644
index 0000000..63a3a36
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/Rakefile
@@ -0,0 +1,11 @@
+#!/usr/bin/env rake
+
+task :ci => [:dump, :test]
+
+task :dump do
+  sh 'vim --version'
+end
+
+task :test do
+  sh 'bundle exec vim-flavor test'
+end
diff --git a/vim-plugins/bundle/python-mode/after/ftplugin/pyrex.vim b/vim-plugins/bundle/python-mode/after/ftplugin/pyrex.vim
new file mode 100644
index 0000000..61d4363
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/after/ftplugin/pyrex.vim
@@ -0,0 +1 @@
+runtime after/ftplugin/python.vim
diff --git a/vim-plugins/bundle/python-mode/after/ftplugin/python.vim b/vim-plugins/bundle/python-mode/after/ftplugin/python.vim
new file mode 100644
index 0000000..0dec754
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/after/ftplugin/python.vim
@@ -0,0 +1,58 @@
+if !g:pymode
+    finish
+endif
+
+if g:pymode_motion
+
+    if !&magic
+        if g:pymode_warning
+            call pymode#error("Pymode motion requires `&magic` option. Enable them or disable g:pymode_motion")
+        endif
+        finish
+    endif
+
+    nnoremap <buffer> ]]  :<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', '')<CR>
+    nnoremap <buffer> [[  :<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', 'b')<CR>
+    nnoremap <buffer> ]C  :<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', '')<CR>
+    nnoremap <buffer> [C  :<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', 'b')<CR>
+    nnoremap <buffer> ]M  :<C-U>call pymode#motion#move('^<Bslash>s*def<Bslash>s', '')<CR>
+    nnoremap <buffer> [M  :<C-U>call pymode#motion#move('^<Bslash>s*def<Bslash>s', 'b')<CR>
+
+    onoremap <buffer> ]]  :<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', '')<CR>
+    onoremap <buffer> [[  :<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', 'b')<CR>
+    onoremap <buffer> ]C  :<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', '')<CR>
+    onoremap <buffer> [C  :<C-U>call pymode#motion#move('<Bslash>v^(class<bar>def)<Bslash>s', 'b')<CR>
+    onoremap <buffer> ]M  :<C-U>call pymode#motion#move('^<Bslash>s*def<Bslash>s', '')<CR>
+    onoremap <buffer> [M  :<C-U>call pymode#motion#move('^<Bslash>s*def<Bslash>s', 'b')<CR>
+
+    vnoremap <buffer> ]]  :call pymode#motion#vmove('<Bslash>v^(class<bar>def)<Bslash>s', '')<CR>
+    vnoremap <buffer> [[  :call pymode#motion#vmove('<Bslash>v^(class<bar>def)<Bslash>s', 'b')<CR>
+    vnoremap <buffer> ]M  :call pymode#motion#vmove('^<Bslash>s*def<Bslash>s', '')<CR>
+    vnoremap <buffer> [M  :call pymode#motion#vmove('^<Bslash>s*def<Bslash>s', 'b')<CR>
+
+    onoremap <buffer> C  :<C-U>call pymode#motion#select('^<Bslash>s*class<Bslash>s', 0)<CR>
+    onoremap <buffer> aC :<C-U>call pymode#motion#select('^<Bslash>s*class<Bslash>s', 0)<CR>
+    onoremap <buffer> iC :<C-U>call pymode#motion#select('^<Bslash>s*class<Bslash>s', 1)<CR>
+    vnoremap <buffer> aC :<C-U>call pymode#motion#select('^<Bslash>s*class<Bslash>s', 0)<CR>
+    vnoremap <buffer> iC :<C-U>call pymode#motion#select('^<Bslash>s*class<Bslash>s', 1)<CR>
+
+    onoremap <buffer> M  :<C-U>call pymode#motion#select('^<Bslash>s*def<Bslash>s', 0)<CR>
+    onoremap <buffer> aM :<C-U>call pymode#motion#select('^<Bslash>s*def<Bslash>s', 0)<CR>
+    onoremap <buffer> iM :<C-U>call pymode#motion#select('^<Bslash>s*def<Bslash>s', 1)<CR>
+    vnoremap <buffer> aM :<C-U>call pymode#motion#select('^<Bslash>s*def<Bslash>s', 0)<CR>
+    vnoremap <buffer> iM :<C-U>call pymode#motion#select('^<Bslash>s*def<Bslash>s', 1)<CR>
+
+endif
+
+if g:pymode_rope && g:pymode_rope_completion
+
+    setlocal omnifunc=pymode#rope#completions
+
+    if g:pymode_rope_completion_bind != ""
+        exe "inoremap <silent> <buffer> " . g:pymode_rope_completion_bind . " <C-R>=pymode#rope#complete(0)<CR>"
+        if tolower(g:pymode_rope_completion_bind) == '<c-space>'
+            exe "inoremap <silent> <buffer> <Nul> <C-R>=pymode#rope#complete(0)<CR>"
+        endif
+    end
+
+end
diff --git a/vim-plugins/bundle/python-mode/after/indent/pyrex.vim b/vim-plugins/bundle/python-mode/after/indent/pyrex.vim
new file mode 100644
index 0000000..ab2e54d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/after/indent/pyrex.vim
@@ -0,0 +1 @@
+runtime after/indent/python.vim
diff --git a/vim-plugins/bundle/python-mode/after/indent/python.vim b/vim-plugins/bundle/python-mode/after/indent/python.vim
new file mode 100644
index 0000000..98399b4
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/after/indent/python.vim
@@ -0,0 +1,13 @@
+if !g:pymode || !g:pymode_indent
+    finish
+endif
+
+setlocal nolisp
+setlocal tabstop=4
+setlocal softtabstop=4
+setlocal shiftwidth=4
+setlocal shiftround
+setlocal expandtab
+setlocal autoindent
+setlocal indentexpr=pymode#indent#get_indent(v:lnum)
+setlocal indentkeys=!^F,o,O,<:>,0),0],0},=elif,=except
diff --git a/vim-plugins/bundle/python-mode/autoload/pymode.vim b/vim-plugins/bundle/python-mode/autoload/pymode.vim
new file mode 100644
index 0000000..723af9b
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/autoload/pymode.vim
@@ -0,0 +1,133 @@
+" Pymode core functions
+
+" DESC: Check variable and set default value if it not exists
+fun! pymode#default(name, default) "{{{
+    if !exists(a:name)
+        let {a:name} = a:default
+        return 0
+    endif
+    return 1
+endfunction "}}}
+
+" DESC: Import python libs
+fun! pymode#init(plugin_root, paths) "{{{
+
+    PymodePython import sys, vim
+    PymodePython sys.path.insert(0, vim.eval('a:plugin_root'))
+    PymodePython sys.path = vim.eval('a:paths') + sys.path
+
+endfunction "}}}
+
+" DESC: Show wide message
+fun! pymode#wide_message(msg) "{{{
+    let x=&ruler | let y=&showcmd
+    set noruler noshowcmd
+    redraw
+    echohl Debug | echo strpart("[Pymode] " . a:msg, 0, &columns-1) | echohl none
+    let &ruler=x | let &showcmd=y
+endfunction "}}}
+
+" DESC: Show error
+fun! pymode#error(msg) "{{{
+    execute "normal \<Esc>"
+    echohl ErrorMsg
+    echomsg "[Pymode]: error: " . a:msg
+    echohl None
+endfunction "}}}
+
+" DESC: Open quickfix window
+fun! pymode#quickfix_open(onlyRecognized, maxHeight, minHeight, jumpError) "{{{
+    let numErrors = len(filter(getqflist(), 'v:val.valid'))
+    let numOthers = len(getqflist()) - numErrors
+    if numErrors > 0 || (!a:onlyRecognized && numOthers > 0)
+        let num = winnr()
+        botright copen
+        exe max([min([line("$"), a:maxHeight]), a:minHeight]) . "wincmd _"
+        if a:jumpError
+            cc
+        elseif num != winnr()
+            wincmd p
+        endif
+    else
+        cclose
+    endif
+    redraw
+    if numOthers > 0
+        call pymode#wide_message(printf('Quickfix: %d(+%d)', numErrors, numOthers))
+    elseif numErrors > 0
+        call pymode#wide_message(printf('Quickfix: %d', numErrors))
+    endif
+endfunction "}}}
+
+" DESC: Open temp buffer.
+fun! pymode#tempbuffer_open(name) "{{{
+    pclose
+    exe "botright 8new " . a:name
+    setlocal buftype=nofile bufhidden=delete noswapfile nowrap previewwindow
+    redraw
+endfunction "}}}
+
+" DESC: Remove unused whitespaces
+fun! pymode#trim_whitespaces() "{{{
+    if g:pymode_trim_whitespaces
+        let cursor_pos = getpos('.')
+        silent! %s/\s\+$//
+        call setpos('.', cursor_pos)
+    endif
+endfunction "}}}
+
+
+fun! pymode#save() "{{{
+    if &modifiable && &modified
+        try
+            noautocmd write
+        catch /E212/
+            call pymode#error("File modified and I can't save it. Please save it manually.")
+            return 0
+        endtry
+    endif
+    return expand('%') != ''
+endfunction "}}}
+
+fun! pymode#reload_buf_by_nr(nr) "{{{
+    let cur = bufnr("")
+    try
+        exe "buffer " . a:nr
+    catch /E86/
+        return
+    endtry
+    exe "e!"
+    exe "buffer " . cur
+endfunction "}}}
+
+fun! pymode#buffer_pre_write() "{{{
+    let b:pymode_modified = &modified
+endfunction "}}}
+
+fun! pymode#buffer_post_write() "{{{
+    if g:pymode_rope
+        if g:pymode_rope_regenerate_on_write && b:pymode_modified
+            call pymode#debug('regenerate')
+            call pymode#rope#regenerate()
+        endif
+    endif
+    if g:pymode_lint
+        if g:pymode_lint_unmodified || (g:pymode_lint_on_write && b:pymode_modified)
+            call pymode#debug('check code')
+            call pymode#lint#check()
+        endif
+    endif
+endfunction "}}}
+
+fun! pymode#debug(msg) "{{{
+    if g:pymode_debug
+        let g:pymode_debug += 1
+        echom string(g:pymode_debug) . ': ' . string(a:msg)
+    endif
+endfunction "}}}
+
+fun! pymode#quit() "{{{
+    augroup pymode
+        au! * <buffer>
+    augroup END
+endfunction "}}}
diff --git a/vim-plugins/bundle/python-mode/autoload/pymode/breakpoint.vim b/vim-plugins/bundle/python-mode/autoload/pymode/breakpoint.vim
new file mode 100644
index 0000000..c3189aa
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/autoload/pymode/breakpoint.vim
@@ -0,0 +1,51 @@
+fun! pymode#breakpoint#init() "{{{
+
+    if !g:pymode_breakpoint
+        return
+    endif
+
+    if g:pymode_breakpoint_cmd == ''
+        let g:pymode_breakpoint_cmd = 'import pdb; pdb.set_trace()  # XXX BREAKPOINT'
+
+        if g:pymode_python == 'disable'
+            return
+        endif
+
+    endif
+
+        PymodePython << EOF
+
+from imp import find_module
+
+for module in ('wdb', 'pudb', 'ipdb'):
+    try:
+        find_module(module)
+        vim.command('let g:pymode_breakpoint_cmd = "import %s; %s.set_trace()  # XXX BREAKPOINT"' % (module, module))
+        break
+    except ImportError:
+        continue
+
+EOF
+
+endfunction "}}}
+
+fun! pymode#breakpoint#operate(lnum) "{{{
+    let line = getline(a:lnum)
+    if strridx(line, g:pymode_breakpoint_cmd) != -1
+        normal dd
+    else
+        let plnum = prevnonblank(a:lnum)
+        if &expandtab
+            let indents = repeat(' ', indent(plnum))
+        else
+            let indents = repeat("\t", plnum / &shiftwidth)
+        endif
+
+        call append(line('.')-1, indents.g:pymode_breakpoint_cmd)
+        normal k
+    endif
+
+    " Save file without any events
+    call pymode#save()
+
+endfunction "}}}
diff --git a/vim-plugins/bundle/python-mode/autoload/pymode/doc.vim b/vim-plugins/bundle/python-mode/autoload/pymode/doc.vim
new file mode 100644
index 0000000..b89eb0e
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/autoload/pymode/doc.vim
@@ -0,0 +1,37 @@
+" Python-mode search by documentation
+"
+PymodePython import pymode
+
+fun! pymode#doc#find() "{{{
+    " Extract the 'word' at the cursor, expanding leftwards across identifiers
+    " and the . operator, and rightwards across the identifier only.
+    "
+    " For example:
+    "   import xml.dom.minidom
+    "           ^   !
+    "
+    " With the cursor at ^ this returns 'xml'; at ! it returns 'xml.dom'.
+    let l:line = getline(".")
+    let l:pre = l:line[:col(".") - 1]
+    let l:suf = l:line[col("."):]
+    let word = matchstr(pre, "[A-Za-z0-9_.]*$") . matchstr(suf, "^[A-Za-z0-9_]*")
+    call pymode#doc#show(word)
+endfunction "}}}
+
+fun! pymode#doc#show(word) "{{{
+    if a:word == ''
+        call pymode#error("No name/symbol under cursor!")
+        return 0
+    endif
+
+    call pymode#tempbuffer_open('__doc__')
+    PymodePython pymode.get_documentation()
+    setlocal nomodifiable
+    setlocal nomodified
+    setlocal filetype=rst
+    if g:pymode_doc_vertical
+        wincmd L
+    endif
+    wincmd p
+
+endfunction "}}}
diff --git a/vim-plugins/bundle/python-mode/autoload/pymode/folding.vim b/vim-plugins/bundle/python-mode/autoload/pymode/folding.vim
new file mode 100644
index 0000000..399748e
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/autoload/pymode/folding.vim
@@ -0,0 +1,274 @@
+" Python-mode folding functions
+
+" Notice that folding is based on single line so complex regular expressions
+" that take previous line into consideration are not fit for the job.
+
+" Regex definitions for correct folding
+let s:def_regex = g:pymode_folding_regex
+let s:blank_regex = '^\s*$'
+" Spyder, a very popular IDE for python has a template which includes
+" '@author:' ; thus the regex below.
+let s:decorator_regex = '^\s*@\(author:\)\@!' 
+let s:doc_begin_regex = '^\s*[uU]\=\%("""\|''''''\)'
+let s:doc_end_regex = '\%("""\|''''''\)\s*$'
+" This one is needed for the while loop to count for opening and closing
+" docstrings.
+let s:doc_general_regex = '\%("""\|''''''\)'
+let s:doc_line_regex = '^\s*[uU]\=\("""\|''''''\).\+\1\s*$'
+let s:symbol = matchstr(&fillchars, 'fold:\zs.')  " handles multibyte characters
+if s:symbol == ''
+    let s:symbol = ' '
+endif
+" ''''''''
+
+
+fun! pymode#folding#text() " {{{
+    let fs = v:foldstart
+    while getline(fs) !~ s:def_regex && getline(fs) !~ s:doc_begin_regex
+        let fs = nextnonblank(fs + 1)
+    endwhile
+    if getline(fs) =~ s:doc_end_regex && getline(fs) =~ s:doc_begin_regex
+        let fs = nextnonblank(fs + 1)
+    endif
+    let line = getline(fs)
+
+    let has_numbers = &number || &relativenumber
+    let nucolwidth = &fdc + has_numbers * &numberwidth
+    let windowwidth = winwidth(0) - nucolwidth - 6
+    let foldedlinecount = v:foldend - v:foldstart
+
+    " expand tabs into spaces
+    let onetab = strpart('          ', 0, &tabstop)
+    let line = substitute(line, '\t', onetab, 'g')
+
+    let line = strpart(line, 0, windowwidth - 2 -len(foldedlinecount))
+    let line = substitute(line, '[uU]\=\%("""\|''''''\)', '', '')
+    let fillcharcount = windowwidth - len(line) - len(foldedlinecount) + 1
+    return line . ' ' . repeat(s:symbol, fillcharcount) . ' ' . foldedlinecount
+endfunction "}}}
+
+fun! pymode#folding#expr(lnum) "{{{
+
+    let line = getline(a:lnum)
+    let indent = indent(a:lnum)
+    let prev_line = getline(a:lnum - 1)
+    let next_line = getline(a:lnum + 1)
+
+    " Decorators {{{
+    if line =~ s:decorator_regex
+        return ">".(indent / &shiftwidth + 1)
+    endif "}}}
+
+    " Definition {{{
+    if line =~ s:def_regex
+        " If indent of this line is greater or equal than line below
+        " and previous non blank line does not end with : (that is, is not a
+        " definition)
+        " Keep the same indentation
+        if indent(a:lnum) >= indent(a:lnum+1) && getline(prevnonblank(a:lnum)) !~ ':\s*$'
+            return '='
+        endif
+        " Check if last decorator is before the last def
+        let decorated = 0
+        let lnum = a:lnum - 1
+        while lnum > 0
+            if getline(lnum) =~ s:def_regex
+                break
+            elseif getline(lnum) =~ s:decorator_regex
+                let decorated = 1
+                break
+            endif
+            let lnum -= 1
+        endwhile
+        if decorated
+            return '='
+        else
+            return ">".(indent / &shiftwidth + 1)
+        endif
+    endif "}}}
+
+    " Docstrings {{{
+
+    " TODO: A while loop now counts the number of open and closed folding in
+    " order to determine if it is a closing or opening folding.
+    " It is working but looks like it is an overkill.
+
+    " Notice that an effect of this is that other docstring matches will not
+    " be one liners.
+    if line =~ s:doc_line_regex
+        return "="
+    endif
+
+    if line =~ s:doc_begin_regex
+            " echom 'just entering'
+        if s:Is_opening_folding(a:lnum)
+            " echom 'entering at line ' . a:lnum
+            return ">".(indent / &shiftwidth + 1)
+        endif
+    endif
+    if line =~ s:doc_end_regex
+        if !s:Is_opening_folding(a:lnum)
+            " echom 'leaving at line ' . a:lnum
+            return "<".(indent / &shiftwidth + 1)
+        endif
+    endif "}}}
+
+    " Nested Definitions {{{
+    " Handle nested defs but only for files shorter than
+    " g:pymode_folding_nest_limit lines due to performance concerns
+    if line('$') < g:pymode_folding_nest_limit && indent(prevnonblank(a:lnum))
+        let curpos = getpos('.')
+        try
+            let last_block = s:BlockStart(a:lnum)
+            let last_block_indent = indent(last_block)
+
+            " Check if last class/def is not indented and therefore can't be
+            " nested.
+            if last_block_indent
+                call cursor(a:lnum, 0)
+                let next_def = searchpos(s:def_regex, 'nW')[0]
+                let next_def_indent = next_def ? indent(next_def) : -1
+                let last_block_end = s:BlockEnd(last_block)
+
+                " If the next def has greater indent than the previous def, it
+                " is nested one level deeper and will have its own fold. If
+                " the class/def containing the current line is on the first
+                " line it can't be nested, and if this block ends on the last
+                " line, it contains no trailing code that should not be
+                " folded. Finally, if the next non-blank line after the end of
+                " the previous def is less indented than the previous def, it
+                " is not part of the same fold as that def. Otherwise, we know
+                " the current line is at the end of a nested def.
+                if next_def_indent <= last_block_indent && last_block > 1 && last_block_end < line('$')
+                    \ && indent(nextnonblank(last_block_end)) >= last_block_indent
+
+                    " Include up to one blank line in the fold
+                    if getline(last_block_end) =~ s:blank_regex
+                        let fold_end = min([prevnonblank(last_block_end - 1), last_block_end]) + 1
+                    else
+                        let fold_end = last_block_end
+                    endif
+                    if a:lnum == fold_end
+                        return 's1'
+                    else
+                        return '='
+                    endif
+                endif
+            endif
+        finally
+            call setpos('.', curpos)
+        endtry
+    endif " }}}
+
+    " Blank Line {{{
+    if line =~ s:blank_regex
+        if prev_line =~ s:blank_regex
+            if indent(a:lnum + 1) == 0 && next_line !~ s:blank_regex && next_line !~ s:doc_general_regex
+                if s:Is_opening_folding(a:lnum)
+                    " echom a:lnum
+                    return "="
+                else
+                    " echom "not " . a:lnum
+                    return 0
+                endif
+            endif
+            return -1
+        else
+            return '='
+        endif
+    endif " }}}
+
+    return '='
+
+endfunction "}}}
+
+fun! s:BlockStart(lnum) "{{{
+    " Note: Make sure to reset cursor position after using this function.
+    call cursor(a:lnum, 0)
+
+    " In case the end of the block is indented to a higher level than the def
+    " statement plus one shiftwidth, we need to find the indent level at the
+    " bottom of that if/for/try/while/etc. block.
+    let last_def = searchpos(s:def_regex, 'bcnW')[0]
+    if last_def
+        let last_def_indent = indent(last_def)
+        call cursor(last_def, 0)
+        let next_stmt_at_def_indent = searchpos('\v^\s{'.last_def_indent.'}[^[:space:]#]', 'nW')[0]
+    else
+        let next_stmt_at_def_indent = -1
+    endif
+
+    " Now find the class/def one shiftwidth lower than the start of the
+    " aforementioned indent block.
+    if next_stmt_at_def_indent && next_stmt_at_def_indent < a:lnum
+        let max_indent = max([indent(next_stmt_at_def_indent) - &shiftwidth, 0])
+    else
+        let max_indent = max([indent(prevnonblank(a:lnum)) - &shiftwidth, 0])
+    endif
+    return searchpos('\v^\s{,'.max_indent.'}(def |class )\w', 'bcnW')[0]
+endfunction "}}}
+
+fun! s:BlockEnd(lnum) "{{{
+    " Note: Make sure to reset cursor position after using this function.
+    call cursor(a:lnum, 0)
+    return searchpos('\v^\s{,'.indent('.').'}\S', 'nW')[0] - 1
+endfunction "}}}
+
+function! s:Is_opening_folding(lnum) "{{{
+    " Helper function to see if docstring is opening or closing
+
+    " Cache the result so the loop runs only once per change
+    if get(b:, 'fold_changenr', -1) == changenr()
+        return b:fold_cache[a:lnum]  "If odd then it is an opening
+    else
+        let b:fold_changenr = changenr()
+        let b:fold_cache = []
+    endif
+
+    let number_of_folding = 0  " To be analized if odd/even to inform if it is opening or closing.
+    let has_open_docstring = 0  " To inform is already has an open docstring.
+    let extra_docstrings = 0  " To help skipping ''' and """ which are not docstrings
+
+    " The idea of this part of the function is to identify real docstrings and
+    " not just triple quotes (that could be a regular string).
+    "
+    " Iterater over all lines from the start until current line (inclusive)
+    for i in range(1, line('$'))
+        call add(b:fold_cache, number_of_folding % 2)
+
+        let i_line = getline(i)
+
+        if i_line =~ s:doc_line_regex 
+            " echom "case 00 on line " . i
+            continue
+        endif
+
+        if i_line =~ s:doc_begin_regex && ! has_open_docstring
+            " echom "case 01 on line " . i
+            " This causes the loop to continue if there is a triple quote which
+            " is not a docstring.
+            if extra_docstrings > 0
+                let extra_docstrings = extra_docstrings - 1
+                continue
+            else
+                let has_open_docstring = 1
+                let number_of_folding = number_of_folding + 1
+            endif
+        " If it is an end doc and has an open docstring.
+        elseif i_line =~ s:doc_end_regex && has_open_docstring
+            " echom "case 02 on line " . i
+            let has_open_docstring = 0
+            let number_of_folding = number_of_folding + 1
+
+        elseif i_line =~ s:doc_general_regex
+            " echom "extra docstrings on line " . i
+            let extra_docstrings = extra_docstrings + 1
+        endif 
+    endfor
+
+    call add(b:fold_cache, number_of_folding % 2)
+
+    return b:fold_cache[a:lnum]
+endfunction "}}}
+
+" vim: fdm=marker:fdl=0
diff --git a/vim-plugins/bundle/python-mode/autoload/pymode/indent.vim b/vim-plugins/bundle/python-mode/autoload/pymode/indent.vim
new file mode 100644
index 0000000..efd41f2
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/autoload/pymode/indent.vim
@@ -0,0 +1,186 @@
+" PEP8 compatible Python indent file
+" Language:         Python
+" Maintainer:       Hynek Schlawack <hs@ox.cx>
+" Prev Maintainer:  Eric Mc Sween <em@tomcom.de> (address invalid)
+" Original Author:  David Bustos <bustos@caltech.edu> (address invalid)
+" Last Change:      2012-06-21
+" License:          Public Domain
+
+
+function! pymode#indent#get_indent(lnum)
+
+    " First line has indent 0
+    if a:lnum == 1
+        return 0
+    endif
+
+    " If we can find an open parenthesis/bracket/brace, line up with it.
+    call cursor(a:lnum, 1)
+    let parlnum = s:SearchParensPair()
+    if parlnum > 0
+        let parcol = col('.')
+        let closing_paren = match(getline(a:lnum), '^\s*[])}]') != -1
+        if match(getline(parlnum), '[([{]\s*$', parcol - 1) != -1
+            if closing_paren
+                return indent(parlnum)
+            else
+                return indent(parlnum) + &shiftwidth
+            endif
+        else
+            return parcol
+        endif
+    endif
+
+    " Examine this line
+    let thisline = getline(a:lnum)
+    let thisindent = indent(a:lnum)
+
+    " If the line starts with 'elif' or 'else', line up with 'if' or 'elif'
+    if thisline =~ '^\s*\(elif\|else\)\>'
+        let bslnum = s:BlockStarter(a:lnum, '^\s*\(if\|elif\)\>')
+        if bslnum > 0
+            return indent(bslnum)
+        else
+            return -1
+        endif
+    endif
+
+    " If the line starts with 'except' or 'finally', line up with 'try'
+    " or 'except'
+    if thisline =~ '^\s*\(except\|finally\)\>'
+        let bslnum = s:BlockStarter(a:lnum, '^\s*\(try\|except\)\>')
+        if bslnum > 0
+            return indent(bslnum)
+        else
+            return -1
+        endif
+    endif
+
+    " Examine previous line
+    let plnum = a:lnum - 1
+    let pline = getline(plnum)
+    let sslnum = s:StatementStart(plnum)
+
+    " If the previous line is blank, keep the same indentation
+    if pline =~ '^\s*$'
+        return -1
+    endif
+
+    " If this line is explicitly joined, find the first indentation that is a
+    " multiple of four and will distinguish itself from next logical line.
+    if pline =~ '\\$'
+        let maybe_indent = indent(sslnum) + &sw
+        let control_structure = '^\s*\(if\|while\|for\s.*\sin\|except\)\s*'
+        if match(getline(sslnum), control_structure) != -1
+            " add extra indent to avoid E125
+            return maybe_indent + &sw
+        else
+            " control structure not found
+            return maybe_indent
+        endif
+    endif
+
+    " If the previous line ended with a colon and is not a comment, indent
+    " relative to statement start.
+    if pline =~ '^[^#]*:\s*\(#.*\)\?$'
+        return indent(sslnum) + &sw
+    endif
+
+    " If the previous line was a stop-execution statement or a pass
+    if getline(sslnum) =~ '^\s*\(break\|continue\|raise\|return\|pass\)\>'
+        " See if the user has already dedented
+        if indent(a:lnum) > indent(sslnum) - &sw
+            " If not, recommend one dedent
+            return indent(sslnum) - &sw
+        endif
+        " Otherwise, trust the user
+        return -1
+    endif
+
+    " In all other cases, line up with the start of the previous statement.
+    return indent(sslnum)
+endfunction
+
+
+" Find backwards the closest open parenthesis/bracket/brace.
+function! s:SearchParensPair() " {{{
+    let line = line('.')
+    let col = col('.')
+
+    " Skip strings and comments and don't look too far
+    let skip = "line('.') < " . (line - 50) . " ? dummy :" .
+                \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? ' .
+                \ '"string\\|comment\\|doctest"'
+
+    " Search for parentheses
+    call cursor(line, col)
+    let parlnum = searchpair('(', '', ')', 'bW', skip)
+    let parcol = col('.')
+
+    " Search for brackets
+    call cursor(line, col)
+    let par2lnum = searchpair('\[', '', '\]', 'bW', skip)
+    let par2col = col('.')
+
+    " Search for braces
+    call cursor(line, col)
+    let par3lnum = searchpair('{', '', '}', 'bW', skip)
+    let par3col = col('.')
+
+    " Get the closest match
+    if par2lnum > parlnum || (par2lnum == parlnum && par2col > parcol)
+        let parlnum = par2lnum
+        let parcol = par2col
+    endif
+    if par3lnum > parlnum || (par3lnum == parlnum && par3col > parcol)
+        let parlnum = par3lnum
+        let parcol = par3col
+    endif
+
+    " Put the cursor on the match
+    if parlnum > 0
+        call cursor(parlnum, parcol)
+    endif
+    return parlnum
+endfunction " }}}
+
+
+" Find the start of a multi-line statement
+function! s:StatementStart(lnum) " {{{
+    let lnum = a:lnum
+    while 1
+        if getline(lnum - 1) =~ '\\$'
+            let lnum = lnum - 1
+        else
+            call cursor(lnum, 1)
+            let maybe_lnum = s:SearchParensPair()
+            if maybe_lnum < 1
+                return lnum
+            else
+                let lnum = maybe_lnum
+            endif
+        endif
+    endwhile
+endfunction " }}}
+
+
+" Find the block starter that matches the current line
+function! s:BlockStarter(lnum, block_start_re) " {{{
+    let lnum = a:lnum
+    let maxindent = 10000       " whatever
+    while lnum > 1
+        let lnum = prevnonblank(lnum - 1)
+        if indent(lnum) < maxindent
+            if getline(lnum) =~ a:block_start_re
+                return lnum
+            else
+                let maxindent = indent(lnum)
+                " It's not worth going further if we reached the top level
+                if maxindent == 0
+                    return -1
+                endif
+            endif
+        endif
+    endwhile
+    return -1
+endfunction " }}}
diff --git a/vim-plugins/bundle/python-mode/autoload/pymode/lint.vim b/vim-plugins/bundle/python-mode/autoload/pymode/lint.vim
new file mode 100644
index 0000000..e7dba8b
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/autoload/pymode/lint.vim
@@ -0,0 +1,101 @@
+PymodePython from pymode.lint import code_check
+
+call pymode#tools#signs#init()
+call pymode#tools#loclist#init()
+
+
+fun! pymode#lint#auto() "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython from pymode import auto
+    PymodePython auto()
+    cclose
+    call g:PymodeSigns.clear()
+    edit
+    call pymode#wide_message("AutoPep8 done.")
+endfunction "}}}
+
+
+fun! pymode#lint#show_errormessage() "{{{
+    let loclist = g:PymodeLocList.current()
+    if loclist.is_empty()
+        return
+    endif
+
+    let l = line('.')
+    if l == b:pymode_error_line
+        return
+    endif
+    let b:pymode_error_line = l
+    if has_key(loclist._messages, l)
+        call pymode#wide_message(loclist._messages[l])
+    else
+        echo
+    endif
+endfunction "}}}
+
+
+fun! pymode#lint#toggle() "{{{
+    let g:pymode_lint = g:pymode_lint ? 0 : 1
+    if g:pymode_lint
+        call pymode#wide_message("Code checking is enabled.")
+    else
+        call pymode#wide_message("Code checking is disabled.")
+    end
+endfunction "}}}
+
+
+fun! pymode#lint#check() "{{{
+    " DESC: Run checkers on current file.
+    "
+    let loclist = g:PymodeLocList.current()
+
+    let b:pymode_error_line = -1
+
+    call loclist.clear()
+
+    call pymode#wide_message('Code checking is running ...')
+
+    PymodePython code_check()
+
+    if loclist.is_empty()
+        call pymode#wide_message('Code checking is completed. No errors found.')
+    endif
+
+    call g:PymodeSigns.refresh(loclist)
+
+    call loclist.show()
+
+    call pymode#lint#show_errormessage()
+    call pymode#wide_message('Found errors and warnings: ' . len(loclist._loclist))
+
+endfunction " }}}
+
+
+fun! pymode#lint#tick_queue() "{{{
+
+    python import time
+    python print time.time()
+
+    if mode() == 'i'
+        if col('.') == 1
+            call feedkeys("\<Right>\<Left>", "n")
+        else
+            call feedkeys("\<Left>\<Right>", "n")
+        endif
+    else
+        call feedkeys("f\e", "n")
+    endif
+endfunction "}}}
+
+
+fun! pymode#lint#stop() "{{{
+    au! pymode CursorHold <buffer>
+endfunction "}}}
+
+
+fun! pymode#lint#start() "{{{
+    au! pymode CursorHold <buffer> call pymode#lint#tick_queue()
+    call pymode#lint#tick_queue()
+endfunction "}}}
diff --git a/vim-plugins/bundle/python-mode/autoload/pymode/motion.vim b/vim-plugins/bundle/python-mode/autoload/pymode/motion.vim
new file mode 100644
index 0000000..67e99e6
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/autoload/pymode/motion.vim
@@ -0,0 +1,97 @@
+" Python-mode motion functions
+
+
+fun! pymode#motion#move(pattern, flags, ...) "{{{
+    let cnt = v:count1 - 1
+    let [line, column] = searchpos(a:pattern, a:flags . 'sW')
+    let indent = indent(line)
+    while cnt && line
+        let [line, column] = searchpos(a:pattern, a:flags . 'W')
+        if indent(line) == indent
+            let cnt = cnt - 1
+        endif
+    endwhile
+    return [line, column]
+endfunction "}}}
+
+
+fun! pymode#motion#vmove(pattern, flags) range "{{{
+    call cursor(a:lastline, 0)
+    let end = pymode#motion#move(a:pattern, a:flags)
+    call cursor(a:firstline, 0)
+    normal! v
+    call cursor(end)
+endfunction "}}} 
+
+
+fun! pymode#motion#pos_le(pos1, pos2) "{{{
+    return ((a:pos1[0] < a:pos2[0]) || (a:pos1[0] == a:pos2[0] && a:pos1[1] <= a:pos2[1]))
+endfunction "}}}
+
+
+fun! pymode#motion#select(pattern, inner) "{{{
+    let cnt = v:count1 - 1
+    let orig = getpos('.')[1:2]
+    let snum = s:BlockStart(orig[0], a:pattern)
+    if getline(snum) !~ a:pattern
+        return 0
+    endif
+    let enum = s:BlockEnd(snum, indent(snum))
+    while cnt
+        let lnum = search(a:pattern, 'nW')
+        if lnum
+            let enum = s:BlockEnd(lnum, indent(lnum))
+            call cursor(enum, 1)
+        endif
+        let cnt = cnt - 1
+    endwhile
+    if pymode#motion#pos_le([snum, 0], orig) && pymode#motion#pos_le(orig, [enum, 1])
+        if a:inner
+            let snum = snum + 1
+            let enum = prevnonblank(enum)
+        endif
+
+        call cursor(snum, 1)
+        normal! v
+        call cursor(enum, len(getline(enum)))
+    endif
+endfunction "}}}
+
+
+fun! s:BlockStart(lnum, ...) "{{{
+    let pattern = a:0 ? a:1 : '^\s*\(@\|class\s.*:\|def\s\)'
+    let lnum = a:lnum + 1
+    let indent = 100
+    while lnum
+        let lnum = prevnonblank(lnum - 1)
+        let test = indent(lnum)
+        let line = getline(lnum)
+        if line =~ '^\s*#' " Skip comments
+            continue
+        elseif !test " Zero-level regular line
+            return lnum
+        elseif test >= indent " Skip deeper or equal lines
+            continue
+        " Indent is strictly less at this point: check for def/class
+        elseif line =~ pattern && line !~ '^\s*@'
+            return lnum
+        endif
+        let indent = indent(lnum)
+    endwhile
+    return 0
+endfunction "}}}
+
+
+fun! s:BlockEnd(lnum, ...) "{{{
+    let indent = a:0 ? a:1 : indent(a:lnum)
+    let lnum = a:lnum
+    while lnum
+        let lnum = nextnonblank(lnum + 1)
+        if getline(lnum) =~ '^\s*#' | continue
+        elseif lnum && indent(lnum) <= indent
+            return lnum - 1
+        endif
+    endwhile
+    return line('$')
+endfunction "}}}
+" vim: fdm=marker:fdl=0
diff --git a/vim-plugins/bundle/python-mode/autoload/pymode/rope.vim b/vim-plugins/bundle/python-mode/autoload/pymode/rope.vim
new file mode 100644
index 0000000..a82a46d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/autoload/pymode/rope.vim
@@ -0,0 +1,185 @@
+" Python-mode Rope support
+"
+PymodePython from pymode import rope
+
+call pymode#tools#loclist#init()
+
+
+fun! pymode#rope#completions(findstart, base)
+    PymodePython rope.completions()
+endfunction
+
+fun! pymode#rope#complete(dot)
+    if pumvisible()
+        return "\<C-n>"
+    end
+    if a:dot
+        PymodePython rope.complete(True)
+    else
+        PymodePython rope.complete()
+    end
+    return pumvisible() ? "\<C-p>\<Down>" : ""
+endfunction
+
+fun! pymode#rope#complete_on_dot() "{{{
+    if !exists("*synstack")
+        return ""
+    end
+    for group in map(synstack(line('.'), col('.') - 1), 'synIDattr(v:val, "name")')
+        for name in ['pythonString', 'pythonComment', 'pythonNumber', 'pythonDocstring']
+            if group == name
+                return "" 
+            endif
+        endfor
+    endfor
+    if g:pymode_rope_autoimport_import_after_complete
+        PymodePython rope.complete_check()
+    endif
+    return pymode#rope#complete(1)
+endfunction "}}}
+
+fun! pymode#rope#goto_definition()
+    PymodePython rope.goto()
+endfunction
+
+
+fun! pymode#rope#organize_imports()
+    if !pymode#save()
+        return 0
+    endif
+    call pymode#wide_message('Organize imports ... ')
+    PymodePython rope.organize_imports()
+endfunction
+
+
+fun! pymode#rope#find_it()
+    let loclist = g:PymodeLocList.current()
+    let loclist._title = "Occurrences"
+    call pymode#wide_message('Finding Occurrences ...')
+    PymodePython rope.find_it()
+    call loclist.show()
+endfunction
+
+
+fun! pymode#rope#show_doc()
+    let l:output = []
+
+    PymodePython rope.show_doc()
+
+    if !empty(l:output)
+        call pymode#tempbuffer_open('__doc____rope__')
+        call append(0, l:output)
+        setlocal nomodifiable
+        setlocal nomodified
+        setlocal filetype=rst
+        wincmd p
+    end
+endfunction
+
+
+fun! pymode#rope#regenerate() "{{{
+    call pymode#wide_message('Regenerate Rope cache ... ')
+    PymodePython rope.regenerate()
+endfunction "}}}
+
+
+fun! pymode#rope#new(...) "{{{
+    PymodePython rope.new()
+endfunction "}}}
+
+
+fun! pymode#rope#rename() "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython rope.RenameRefactoring().run()
+endfunction "}}}
+
+fun! pymode#rope#rename_module() "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython rope.RenameRefactoring(True).run()
+endfunction "}}}
+
+fun! pymode#rope#extract_method() range "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython rope.ExtractMethodRefactoring().run()
+endfunction "}}}
+
+fun! pymode#rope#extract_variable() range "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython rope.ExtractVariableRefactoring().run()
+endfunction "}}}
+
+fun! pymode#rope#undo() "{{{
+    PymodePython rope.undo()
+endfunction "}}}
+
+fun! pymode#rope#redo() "{{{
+    PymodePython rope.redo()
+endfunction "}}}
+
+fun! pymode#rope#inline() "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython rope.InlineRefactoring().run()
+endfunction "}}}
+
+fun! pymode#rope#move() "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython rope.MoveRefactoring().run()
+endfunction "}}}
+
+fun! pymode#rope#signature() "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython rope.ChangeSignatureRefactoring().run()
+endfunction "}}}
+
+fun! pymode#rope#use_function() "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython rope.UseFunctionRefactoring().run()
+endfunction "}}}
+
+fun! pymode#rope#module_to_package() "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython rope.ModuleToPackageRefactoring().run()
+endfunction "}}}
+
+fun! pymode#rope#autoimport(word) "{{{
+    PymodePython rope.autoimport()
+endfunction "}}}
+
+fun! pymode#rope#generate_function() "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython rope.GenerateElementRefactoring('function').run()
+endfunction "}}}
+
+fun! pymode#rope#generate_class() "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython rope.GenerateElementRefactoring('class').run()
+endfunction "}}}
+
+fun! pymode#rope#generate_package() "{{{
+    if !pymode#save()
+        return 0
+    endif
+    PymodePython rope.GenerateElementRefactoring('package').run()
+endfunction "}}}
diff --git a/vim-plugins/bundle/python-mode/autoload/pymode/run.vim b/vim-plugins/bundle/python-mode/autoload/pymode/run.vim
new file mode 100644
index 0000000..24c8729
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/autoload/pymode/run.vim
@@ -0,0 +1,99 @@
+" The following lines set Vim's errorformat variable, to allow the
+" quickfix window to show Python tracebacks properly. It is much
+" easier to use let than set, because set requires many more
+" characters to be escaped. This is much easier to read and
+" maintain. % escapes are still needed however before any regex meta
+" characters. Hence \S (non-whitespace) becomes %\S etc.  Note that
+" * becomes %#, so .* (match any character) becomes %.%#  Commas must
+" also be escaped, with a backslash (\,). See the Vim help on
+" quickfix for details.
+"
+" Python errors are multi-lined. They often start with 'Traceback', so
+" we want to capture that (with +G) and show it in the quickfix window
+" because it explains the order of error messages.
+let s:efm  = '%+GTraceback%.%#,'
+
+" The error message itself starts with a line with 'File' in it. There
+" are a couple of variations, and we need to process a line beginning
+" with whitespace followed by File, the filename in "", a line number,
+" and optional further text. %E here indicates the start of a multi-line
+" error message. The %\C at the end means that a case-sensitive search is
+" required.
+let s:efm .= '%E  File "%f"\, line %l\,%m%\C,'
+let s:efm .= '%E  File "%f"\, line %l%\C,'
+
+" The possible continutation lines are idenitifed to Vim by %C. We deal
+" with these in order of most to least specific to ensure a proper
+" match. A pointer (^) identifies the column in which the error occurs
+" (but will not be entirely accurate due to indention of Python code).
+let s:efm .= '%C%p^,'
+
+" Any text, indented by more than two spaces contain useful information.
+" We want this to appear in the quickfix window, hence %+.
+let s:efm .= '%+C    %.%#,'
+let s:efm .= '%+C  %.%#,'
+
+" The last line (%Z) does not begin with any whitespace. We use a zero
+" width lookahead (\&) to check this. The line contains the error
+" message itself (%m)
+let s:efm .= '%Z%\S%\&%m,'
+
+" We can ignore any other lines (%-G)
+let s:efm .= '%-G%.%#'
+
+PymodePython from pymode.run import run_code
+
+
+" DESC: Run python code
+fun! pymode#run#code_run(line1, line2) "{{{
+
+    let l:output = []
+    let l:traceback = []
+    call setqflist([])
+
+    call pymode#wide_message("Code running ...")
+
+    try
+
+        PymodePython run_code()
+
+        if len(l:output)
+            call pymode#tempbuffer_open('__run__')
+            call append(line('$'), l:output)
+            normal dd
+            wincmd p
+        else
+            call pymode#wide_message("No output.")
+        endif
+
+        cexpr ""
+
+        let l:_efm = &efm
+
+        let &efm = s:efm
+
+        cgetexpr(l:traceback)
+
+        " If a range is run (starting other than at line 1), fix the reported error line numbers for
+        " the current buffer
+        if a:line1 > 1
+            let qflist = getqflist()
+            for i in qflist
+                if i.bufnr == bufnr("")
+                    let i.lnum = i.lnum - 1 + a:line1
+                endif
+            endfor
+            call setqflist(qflist)
+        endif
+
+        call pymode#quickfix_open(0, g:pymode_quickfix_maxheight, g:pymode_quickfix_maxheight, 0)
+
+        let &efm = l:_efm
+
+    catch /E234/
+
+        echohl Error | echo "Run-time error." | echohl none
+
+    endtry
+
+endfunction "}}}
diff --git a/vim-plugins/bundle/python-mode/autoload/pymode/tools/loclist.vim b/vim-plugins/bundle/python-mode/autoload/pymode/tools/loclist.vim
new file mode 100644
index 0000000..18b6d29
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/autoload/pymode/tools/loclist.vim
@@ -0,0 +1,81 @@
+let g:PymodeLocList= {}
+
+
+fun! pymode#tools#loclist#init() "{{{
+    return
+endfunction "}}}
+
+
+fun! g:PymodeLocList.init(raw_list) "{{{
+    let obj = copy(self)
+    let loc_list = filter(copy(a:raw_list), 'v:val["valid"] == 1')
+    call obj.clear()
+    let obj._title = 'CodeCheck'
+    return obj
+endfunction "}}}
+
+
+fun! g:PymodeLocList.current() "{{{
+    if !exists("b:pymode_loclist")
+        let b:pymode_loclist = g:PymodeLocList.init([])
+    endif
+    return b:pymode_loclist
+endfunction "}}}
+
+
+fun! g:PymodeLocList.is_empty() "{{{
+    return empty(self._loclist)
+endfunction "}}}
+
+
+fun! g:PymodeLocList.clear() "{{{
+    let self._loclist = []
+    let self._messages = {}
+    let self._name = expand('%:t')
+endfunction "}}}
+
+
+fun! g:PymodeLocList.extend(raw_list) "{{{
+    call extend(self._loclist, a:raw_list)
+    for issue in a:raw_list
+        let self._messages[issue.lnum] = issue.text
+    endfor
+    return self
+endfunction "}}}
+
+
+fun! g:PymodeLocList.filter(filters) "{{{
+    let loclist = []
+    for error in self._loclist
+        let passes_filters = 1
+        for key in keys(a:filters)
+            if get(error, key, '') !=? a:filters[key]
+                let passes_filters = 0
+                break
+            endif
+        endfor
+
+        if passes_filters
+            call add(loclist, error)
+        endif
+
+    endfor
+    return loclist
+endfunction "}}}
+
+
+fun! g:PymodeLocList.show() "{{{
+    call setloclist(0, self._loclist)
+    if self.is_empty()
+        lclose
+    elseif g:pymode_lint_cwindow
+        let num = winnr()
+        lopen
+        setl nowrap
+        execute max([min([line("$"), g:pymode_quickfix_maxheight]), g:pymode_quickfix_minheight]) . "wincmd _"
+        if num != winnr()
+            call setwinvar(winnr(), 'quickfix_title', self._title . ' <' . self._name . '>')
+            exe num . "wincmd w"
+        endif
+    end
+endfunction "}}}
diff --git a/vim-plugins/bundle/python-mode/autoload/pymode/tools/signs.vim b/vim-plugins/bundle/python-mode/autoload/pymode/tools/signs.vim
new file mode 100644
index 0000000..3487cf8
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/autoload/pymode/tools/signs.vim
@@ -0,0 +1,57 @@
+let g:PymodeSigns = {}
+
+
+fun! pymode#tools#signs#init() "{{{
+    call g:PymodeSigns.setup()
+endfunction "}}}
+
+
+fun! g:PymodeSigns.enabled() "{{{
+    return (g:pymode_lint_signs && has('signs'))
+endfunction "}}}
+
+
+fun! g:PymodeSigns.setup() "{{{
+    if self.enabled()
+        execute 'sign define PymodeW text=' . g:pymode_lint_todo_symbol     . " texthl=Todo"
+        execute 'sign define PymodeD text=' . g:pymode_lint_docs_symbol     . " texthl=String"
+        execute 'sign define PymodeC text=' . g:pymode_lint_comment_symbol  . " texthl=Comment"
+        execute 'sign define PymodeR text=' . g:pymode_lint_visual_symbol   . " texthl=Visual"
+        execute 'sign define PymodeE text=' . g:pymode_lint_error_symbol    . " texthl=Error"
+        execute 'sign define PymodeI text=' . g:pymode_lint_info_symbol     . " texthl=Info"
+        execute 'sign define PymodeF text=' . g:pymode_lint_pyflakes_symbol . " texthl=Info"
+    endif
+    let self._sign_ids = []
+    let self._next_id = 10000
+    let self._messages = {}
+endfunction "}}}
+
+
+fun! g:PymodeSigns.refresh(loclist) "{{{
+    if self.enabled()
+        call self.clear()
+        call self.place(a:loclist)
+    endif
+endfunction "}}}
+
+
+fun! g:PymodeSigns.clear() "{{{
+    let ids = copy(self._sign_ids)
+    for i in ids
+        execute "sign unplace " . i
+        call remove(self._sign_ids, index(self._sign_ids, i))
+    endfor
+endfunction "}}}
+
+
+fun! g:PymodeSigns.place(loclist) "{{{
+    let seen = {}
+    for issue in a:loclist._loclist
+        if !has_key(seen, issue.lnum)
+            let seen[issue.lnum] = 1
+            call add(self._sign_ids, self._next_id)
+            execute printf('sign place %d line=%d name=%s buffer=%d', self._next_id, issue.lnum, "Pymode".issue.type[0], issue.bufnr)
+            let self._next_id += 1
+        endif
+    endfor
+endfunction "}}}
diff --git a/vim-plugins/bundle/python-mode/autoload/pymode/troubleshooting.vim b/vim-plugins/bundle/python-mode/autoload/pymode/troubleshooting.vim
new file mode 100644
index 0000000..915a5c5
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/autoload/pymode/troubleshooting.vim
@@ -0,0 +1,89 @@
+" DESC: Get debug information about pymode problem
+fun! pymode#troubleshooting#test() "{{{
+    new
+    setlocal buftype=nofile bufhidden=delete noswapfile nowrap
+
+    let os = "Unknown"
+    if has('win16') || has('win32') || has('win64')
+        let os = "Windows"
+    else
+        let os = substitute(system('uname'), "\n", "", "")
+    endif
+
+    if !pymode#default('g:pymode_init', 1)
+        call pymode#init(expand('<sfile>:p:h'), g:pymode_paths)
+        call pymode#virtualenv#init()
+        call pymode#breakpoint#init()
+    endif
+
+    call append('0', ['Pymode diagnostic',
+                  \ '===================',
+                  \ 'VIM:' . v:version . ', OS: ' . os .', multi_byte:' .  has('multi_byte') . ', pymode: ' . g:pymode_version . ', pymode-python: ' . g:pymode_python, 
+                  \ ''])
+
+    if !exists('#filetypeplugin')
+        call append('$', ['WARNING: ', 'Python-mode required :filetype plugin indent on', ''])
+    endif
+
+    call append('$', ['+python: ' . has('python')])
+    call append('$', ['+python3: ' . has('python3'), ''])
+
+    if g:pymode_python == 'disable'
+
+        if !has('python') && !has('python3')
+
+            call append('$', ['WARNING: Python-mode required vim compiled with +python or +python3.',
+                            \ '"lint, rope, run, doc, virtualenv" features disabled.', ''])
+
+        else
+
+            call append('$', ['WARNING: Python is disabled by `pymode_python` option.',
+                            \ '"lint, rope, run, doc, virtualenv" features disabled.', ''])
+
+        endif
+
+    else
+
+        call append('$', 'VIM python paths:')
+        call append('$', '-----------------')
+    PymodePython << EOF
+import vim
+vim.command('let l:output = %s' % repr(sys.path))
+EOF
+        call append('$', output)
+        call append('$', '')
+
+    endif
+
+    call append('$', 'Pymode variables:')
+    call append('$', '-------------------')
+    call append('$', 'let pymode = ' . string(g:pymode))
+    call append('$', 'let pymode_breakpoint = ' . string(g:pymode_breakpoint))
+    call append('$', 'let pymode_breakpoint_bind = ' . string(g:pymode_breakpoint_bind))
+    call append('$', 'let pymode_doc = ' . string(g:pymode_doc))
+    call append('$', 'let pymode_doc_bind = ' . string(g:pymode_doc_bind))
+    call append('$', 'let pymode_folding = ' . string(g:pymode_folding))
+    call append('$', 'let pymode_indent = ' . string(g:pymode_indent))
+    call append('$', 'let pymode_lint = ' . string(g:pymode_lint))
+    call append('$', 'let pymode_lint_checkers = ' . string(g:pymode_lint_checkers))
+    call append('$', 'let pymode_lint_cwindow = ' . string(g:pymode_lint_cwindow))
+    call append('$', 'let pymode_lint_ignore = ' . string(g:pymode_lint_ignore))
+    call append('$', 'let pymode_lint_message = ' . string(g:pymode_lint_message))
+    call append('$', 'let pymode_lint_on_fly = ' . string(g:pymode_lint_on_fly))
+    call append('$', 'let pymode_lint_on_write = ' . string(g:pymode_lint_on_write))
+    call append('$', 'let pymode_lint_select = ' . string(g:pymode_lint_select))
+    call append('$', 'let pymode_lint_signs = ' . string(g:pymode_lint_signs))
+    call append('$', 'let pymode_motion = ' . string(g:pymode_motion))
+    call append('$', 'let pymode_options = ' . string(g:pymode_options))
+    call append('$', 'let pymode_paths = ' . string(g:pymode_paths))
+    call append('$', 'let pymode_quickfix_maxheight = ' . string(g:pymode_quickfix_maxheight))
+    call append('$', 'let pymode_quickfix_minheight = ' . string(g:pymode_quickfix_minheight))
+    call append('$', 'let pymode_rope = ' . string(g:pymode_rope))
+    call append('$', 'let pymode_run = ' . string(g:pymode_run))
+    call append('$', 'let pymode_run_bind = ' . string(g:pymode_run_bind))
+    call append('$', 'let pymode_trim_whitespaces = ' . string(g:pymode_trim_whitespaces))
+    call append('$', 'let pymode_virtualenv = ' . string(g:pymode_virtualenv))
+    call append('$', 'let pymode_virtualenv_enabled = ' . string(g:pymode_virtualenv_enabled))
+    call append('$', 'let pymode_virtualenv_path = ' . string(g:pymode_virtualenv_path))
+    
+endfunction "}}}
diff --git a/vim-plugins/bundle/python-mode/autoload/pymode/virtualenv.vim b/vim-plugins/bundle/python-mode/autoload/pymode/virtualenv.vim
new file mode 100644
index 0000000..7401e94
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/autoload/pymode/virtualenv.vim
@@ -0,0 +1,17 @@
+" Support virtualenv
+"
+PymodePython from pymode.virtualenv import enable_virtualenv
+
+fun! pymode#virtualenv#init() "{{{
+    if !g:pymode_virtualenv || g:pymode_virtualenv_path == ""
+        return
+    endif
+
+    PymodePython enable_virtualenv()
+
+endfunction "}}}
+
+fun! pymode#virtualenv#activate(path) "{{{
+    let g:pymode_virtualenv_path = a:path
+    call pymode#virtualenv#init()
+endfunction "}}}
diff --git a/vim-plugins/bundle/python-mode/debug.vim b/vim-plugins/bundle/python-mode/debug.vim
new file mode 100644
index 0000000..c7d3266
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/debug.vim
@@ -0,0 +1,13 @@
+" Use this settings for testing the plugin.
+" Run vim with command
+"
+" $ vim -u debug.py
+"
+" Only python-mode will be loaded.
+
+
+execute('set rtp+='. expand('<sfile>:p:h'))
+set rtp -=$HOME/.vim
+set rtp -=$HOME/.vim/after
+set nocp
+syntax enable
diff --git a/vim-plugins/bundle/python-mode/doc/pymode.txt b/vim-plugins/bundle/python-mode/doc/pymode.txt
new file mode 100644
index 0000000..1d7bb24
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/doc/pymode.txt
@@ -0,0 +1,796 @@
+*pymode.txt*  *python-mode.txt*  *pymode* *python-mode*
+
+     ____  _  _  ____  _   _  _____  _  _     __  __  _____  ____  ____      ~
+    (  _ \( \/ )(_  _)( )_( )(  _  )( \( )___(  \/  )(  _  )(  _ \( ___)     ~
+     )___/ \  /   )(   ) _ (  )(_)(  )  ((___))    (  )(_)(  )(_) ))__)      ~
+    (__)   (__)  (__) (_) (_)(_____)(_)\_)   (_/\/\_)(_____)(____/(____)     ~
+
+
+                          Version: 0.9.0
+
+==============================================================================
+CONTENTS                                                       *pymode-contents*
+
+    1.Intro.......................................................|pymode-intro|
+    2.Common functionality.......................................|pymode-common|
+        2.1 Python version...............................|pymode-python-version|
+        2.2 Python indentation...................................|pymode-indent|
+        2.3 Python folding......................................|pymode-folding|
+        2.4 Vim motion...........................................|pymode-motion|
+        2.5 Show documentation............................|pymode-documentation|
+        2.6 Support virtualenv...............................|pymode-virtualenv|
+        2.7 Run code................................................|pymode-run|
+        2.8 Breakpoints.....................................|pymode-breakpoints|
+    3. Code checking...............................................|pymode-lint|
+        3.1 Code checkers options..........................|pymode-lint-options|
+    4. Rope support................................................|pymode-rope|
+        4.1 Code completion..................................|pymode-completion|
+        4.2 Find definition.................................|pymode-rope-findit|
+        4.3 Refactoring................................|pymode-rope-refactoring|
+        4.4 Undo/Redo changes.................................|pymode-rope-undo|
+    5. Syntax....................................................|pymode-syntax|
+    6.FAQ...........................................................|pymode-faq|
+    7.Credits...................................................|pymode-credits|
+    8.License...................................................|pymode-license|
+
+==============================================================================
+1. Intro ~
+                                                                  *pymode-intro*
+
+Python-mode is a vim plugin that allows you to use the pylint, rope, and pydoc
+libraries in vim to provide features like python code bug checking,
+refactoring, and some other useful things.
+
+This plugin allows you to create python code in vim very easily. There is no
+need to install the pylint or rope libraries on your system.
+
+Python-mode contains all you need to develop python applications in Vim.
+
+Features:                                                      *pymode-features*
+
+- Support Python version 2.6+ and 3.2+
+- Syntax highlighting
+- Virtualenv support
+- Run python code (``<leader>r``)
+- Add/remove breakpoints (``<leader>b``)
+- Improved Python indentation
+- Python folding
+- Python motions and operators (``]]``, ``3[[``, ``]]M``, ``vaC``, ``viM``,
+  ``daC``, ``ciM``, ...)
+- Code checking  (pylint_, pyflakes_, pylama_, ...) that can be run
+  simultaneously (``:PymodeLint``)
+- Autofix PEP8 errors (``:PymodeLintAuto``)
+- Search in python documentation (``K``)
+- Code refactoring <rope refactoring library> (rope_)
+- Strong code completion (rope_)
+- Go to definition (``<C-c>g`` for `:RopeGotoDefinition`)
+- And more, more ...
+
+
+==============================================================================
+2. Common functionality ~
+                                                                 *pymode-common*
+
+This script provides the following options that can customizes the behavior of
+PythonMode. These options should be set in your |vimrc|.
+
+        Below shows the default values.
+
+
+Turn on the whole plugin                                            *'g:pymode'*
+>
+    let g:pymode = 1
+
+Turn off plugin's warnings                                 *'g:pymode_warnings'*
+>
+    let g:pymode_warnings = 1
+
+Add paths to `sys.path`                                         *'g:pymode_paths'*
+Value is list of path's strings. 
+>
+    let g:pymode_paths = []
+
+Trim unused white spaces on save                   *'g:pymode_trim_whitespaces'*
+>
+    let g:pymode_trim_whitespaces = 1
+
+Setup default python options                                *'g:pymode_options'*
+>
+    let g:pymode_options = 1
+
+If this option is set to 1, pymode will enable the following options for
+python buffers: >
+
+    setlocal complete+=t
+    setlocal formatoptions-=t
+    if v:version > 702 && !&relativenumber
+        setlocal number
+    endif
+    setlocal nowrap
+    setlocal textwidth=79
+    setlocal commentstring=#%s
+    setlocal define=^\s*\\(def\\\\|class\\)
+
+Setup max line length                       *'g:pymode_options_max_line_length'*
+>
+    let g:pymode_options_max_line_length = 79
+
+Enable colorcolumn display at max_line_length   *'g:pymode_options_colorcolumn'*
+>
+    let g:pymode_options_colorcolumn = 1
+
+Setup pymode |quickfix| window
+
+                    *'g:pymode_quickfix_maxheight'* *'g:pymode_quickfix_minheight'*
+>
+    let g:pymode_quickfix_minheight = 3
+    let g:pymode_quickfix_maxheight = 6
+
+------------------------------------------------------------------------------
+2.1. Python version ~
+                                                         *pymode-python-version*
+
+By default pymode looks for current python version supported in your Vim. 
+You could choose prefer version, but value will be tested on loading.
+
+                                                             *'g:pymode_python'* 
+>
+    let g:pymode_python = 'python'
+
+Values are `python`, `python3`, `disable`. If value set to `disable` most
+python-features of **pymode** will be disabled.
+
+Set value to `python3` if you are working with python3 projects. You could use
+|exrc|
+
+------------------------------------------------------------------------------
+2.2 Python indentation ~
+                                                                 *pymode-indent*
+
+Pymode supports PEP8-compatible python indent.
+Enable pymode indentation                                  *'g:pymode_indent'*
+>
+    let g:pymode_indent = 1
+
+------------------------------------------------------------------------------
+2.3 Python folding ~
+                                                                *pymode-folding*
+
+Fast and usual python folding in Vim.
+Enable pymode folding                                       *'g:pymode_folding'*
+>
+    let g:pymode_folding = 1
+
+------------------------------------------------------------------------------
+2.4 Vim motion ~
+                                                                *pymode-motion*
+
+Support Vim motion (See |operator|) for python objects (such as functions,
+class and methods).
+
+`C` — means class
+`M` — means method or function
+                                                            *pymode-motion-keys*
+
+================  ============================
+Key               Command
+================  ============================
+[[                Jump to previous class or function (normal, visual, operator modes)
+]]                Jump to next class or function  (normal, visual, operator modes)
+[M                Jump to previous class or method (normal, visual, operator modes)
+]M                Jump to next class or method (normal, visual, operator modes)
+aC                Select a class. Ex: vaC, daC, yaC, caC (normal, operator modes)
+iC                Select inner class. Ex: viC, diC, yiC, ciC (normal, operator modes)
+aM                Select a function or method. Ex: vaM, daM, yaM, caM (normal, operator modes)
+iM                Select inner function or method. Ex: viM, diM, yiM, ciM (normal, operator modes)
+================  ============================
+
+Enable pymode-motion                                         *'g:pymode_motion'*
+>
+    let g:pymode_motion = 1
+
+------------------------------------------------------------------------------
+2.5 Show documentation ~
+                                                          *pymode-documentation*
+
+Pymode could show documentation for current word by `pydoc`.
+
+Commands:
+*:PymodeDoc* <args> — show documentation 
+
+Turns on the documentation script                               *'g:pymode_doc'*
+>
+    let g:pymode_doc = 1
+
+Bind keys to show documentation for current word (selection)
+                                                           *'g:pymode_doc_bind'*
+>
+    let g:pymode_doc_bind = 'K'
+
+------------------------------------------------------------------------------
+2.6 Support virtualenv ~
+                                                             *pymode-virtualenv*
+
+Commands:
+*:PymodeVirtualenv* <path> -- Activate virtualenv (path can be absolute or
+relative to current working directory)
+
+Enable automatic virtualenv detection                     *'g:pymode_virtualenv'*
+>
+    let g:pymode_virtualenv = 1
+
+Set path to virtualenv manually                  *'g:pymode_virtualenv_path'*
+>
+    let g:pymode_virtualenv_path = $VIRTUAL_ENV
+
+------------------------------------------------------------------------------
+2.7 Run code ~
+                                                                    *pymode-run*
+
+Commands:
+*:PymodeRun* -- Run current buffer or selection
+
+Turn on the run code script                                     *'g:pymode_run'*
+>
+    let g:pymode_run = 1
+
+Binds keys to run python code                              *'g:pymode_run_bind'*
+>
+    let g:pymode_run_bind = '<leader>r'
+
+------------------------------------------------------------------------------
+2.8 Breakpoints ~
+                                                            *pymode-breakpoints*
+
+Pymode automatically detects available debugger (like pdb, ipdb, pudb) and user
+can set/unset breakpoint with one key and without code checking and etc.
+
+Enable functionality                                     *'g:pymode_breakpoint'*
+>
+    let g:pymode_breakpoint = 1
+
+Bind keys
+>
+    let g:pymode_breakpoint_bind = '<leader>b'
+
+Manually set breakpoint command (leave empty for automatic detection)
+>
+    let g:pymode_breakpoint_cmd = ''
+
+
+==============================================================================
+3. Code checking ~
+                                                                   *pymode-lint*
+
+Pymode supports `pylint`, `pep257`, `pep8`, `pyflakes`, `mccabe` code
+checkers. You could run several similar checkers.
+
+        Pymode uses Pylama library for code checking. Many options like skip
+        files, errors and etc could be defined in `pylama.ini` file or modelines.
+        Check Pylama documentation for details.
+
+        Pylint options (ex. disable messages) may be defined in `$HOME/pylint.rc`
+        See pylint documentation.
+
+Commands:
+*:PymodeLint* -- Check code in current buffer
+*:PymodeLintToggle* -- Toggle code checking
+*:PymodeLintAuto* -- Fix PEP8 errors in current buffer automatically
+
+Turn on code checking                                          *'g:pymode_lint'*
+>
+    let g:pymode_lint = 1
+
+Check code on every save (if file has been modified)  *'g:pymode_lint_on_write'*
+>
+    let g:pymode_lint_on_write = 1
+
+Check code on every save (every)                    *'g:pymode_lint_unmodified'*
+>
+    let g:pymode_lint_unmodified = 0
+
+Check code when editing (on the fly)                        *'g:pymode_lint_on_fly'*
+>
+    let g:pymode_lint_on_fly = 0
+
+Show error message if cursor placed at the error line  *'g:pymode_lint_message'*
+>
+    let g:pymode_lint_message = 1
+
+Default code checkers (you could set several)         *'g:pymode_lint_checkers'*
+>
+    let g:pymode_lint_checkers = ['pyflakes', 'pep8', 'mccabe']
+
+Values may be chosen from: `pylint`, `pep8`, `mccabe`, `pep257`, `pyflakes`.
+
+Skip errors and warnings                                *'g:pymode_lint_ignore'*
+E.g. "E501,W002", "E2,W" (Skip all Warnings and Errors that starts with E2) and etc
+>
+    let g:pymode_lint_ignore = "E501,W"
+
+Select some error or warnings.                          *'g:pymode_lint_select'*
+By example you disable all warnings starting from 'W', but want to see warning
+'W0011' and warning 'W430'
+>
+    let g:pymode_lint_select = "E501,W0011,W430"
+
+Sort errors by relevance                                  *'g:pymode_lint_sort'*
+If not empty, errors will be sort by defined relevance
+E.g. let g:pymode_lint_sort = ['E', 'C', 'I']  " Errors first 'E',
+after them 'C' and ...
+>
+    let g:pymode_lint_sort = []
+
+Auto open cwindow (quickfix) if any errors have been found
+                                                       *'g:pymode_lint_cwindow'*
+>
+    let g:pymode_lint_cwindow = 1
+
+Place error |signs|                                             *'g:pymode_signs'*
+>
+    let g:pymode_lint_signs = 1
+
+Definitions for |signs|
+>
+    let g:pymode_lint_todo_symbol = 'WW'
+    let g:pymode_lint_comment_symbol = 'CC'
+    let g:pymode_lint_visual_symbol = 'RR'
+    let g:pymode_lint_error_symbol = 'EE'
+    let g:pymode_lint_info_symbol = 'II'
+    let g:pymode_lint_pyflakes_symbol = 'FF'
+
+------------------------------------------------------------------------------
+3.1 Set code checkers options ~
+                                                           *pymode-lint-options*
+
+Pymode has the ability to set code checkers options from pymode variables:
+
+Set PEP8 options                                  *'g:pymode_lint_options_pep8'*
+>
+    let g:pymode_lint_options_pep8 =
+        \ {'max_line_length': g:pymode_options_max_line_length})
+
+See https://pep8.readthedocs.org/en/1.4.6/intro.html#configuration for more
+info.
+
+Set Pyflakes options                          *'g:pymode_lint_options_pyflakes'*
+>
+    let g:pymode_lint_options_pyflakes = { 'builtins': '_' }
+
+Set mccabe options                              *'g:pymode_lint_options_mccabe'*
+>
+    let g:pymode_lint_options_mccabe = { 'complexity': 12 }
+
+Set pep257 options                              *'g:pymode_lint_options_pep257'*
+>
+    let g:pymode_lint_options_pep257 = {}
+
+Set pylint options                              *'g:pymode_lint_options_pylint'*
+>
+    let g:pymode_lint_options_pylint =
+        \ {'max-line-length': g:pymode_options_max_line_length})
+
+See http://docs.pylint.org/features.html#options for more info.
+
+
+
+==============================================================================
+3. Rope support ~
+                                                                   *pymode-rope*
+
+Pymode supports Rope refactoring operations, code completion and code assists.
+
+Commands:
+|:PymodeRopeAutoImport| -- Resolve import for element under cursor
+|:PymodeRopeModuleToPackage| -- Convert current module to package
+|:PymodeRopeNewProject| -- Open new Rope project in current working directory
+|:PymodeRopeRedo| -- Redo changes from last refactoring
+|:PymodeRopeRegenerate| -- Regenerate the project cache
+|:PymodeRopeRenameModule| -- Rename current module
+|:PymodeRopeUndo| -- Undo changes from last refactoring
+
+
+Turn on the rope script                                        *'g:pymode_rope'*
+>
+    let g:pymode_rope = 1
+
+.ropeproject Folder ~
+                                                                  *.ropeproject*
+
+*:PymodeRopeNewProject* [<path>] -- Open new Rope project in the given path
+*:PymodeRopeRegenerate* -- Regenerate the project cache
+
+Rope uses a folder inside projects for holding project configuration and data.
+Its default name is `.ropeproject`. It is recommended that you do not add the
+.ropeproject folder to version control system.
+
+Currently it is used for things such as:
+
+* The config.py file in this folder contains project configuration. Have
+    a look at the default config.py file (which is created when it
+    does not exist) for more information.
+* It can be used for saving project history, so that the next time you open the
+    project you can undo past changes.
+* It can be used to save information about object inferences.
+* It can be used to save a global name cache, which is used for auto-import.
+
+By default, if `.ropeproject` is not found in the current directory, rope will
+look recursively for it in parent folders.
+
+Warning: If rope finds `.ropeproject` in a parent dir, it will use it with
+all its child directories, which may slow scanning down (because of many,
+possibly unrelated, files)
+
+Enable searching for |.ropeproject| in parent directories
+                                                  *'g:pymode_rope_lookup_project'*
+>
+    let g:pymode_rope_lookup_project = 0
+
+You can also manually set the rope project directory. If not specified rope will
+use the current directory.
+                                                  *'g:pymode_rope_project_root'*
+>
+    let g:pymode_rope_project_root = ""
+
+
+The location of the `.ropeproject` folder may also be overridden if you wish to
+keep it outside of your project root. The rope library treats this folder as a
+project resource, so the path will always be relative to your project root (a
+leading '/' will be ignored). You may use `'..'` path segments to place the
+folder outside of your project root.
+                                                 *'g:pymode_rope_ropefolder'*
+>
+    let g:pymode_rope_ropefolder='.ropeproject'
+
+
+
+Show documentation for element under cursor ~
+
+Show documentation for object under cursor.      *'g:pymode_rope_show_doc_bind'*
+Leave empty to disable the key binding.
+>
+    let g:pymode_rope_show_doc_bind = '<C-c>d'
+
+Regenerate project cache on every save (if file has been modified)
+>
+    let g:pymode_rope_regenerate_on_write = 1
+
+------------------------------------------------------------------------------
+4.1 Completion ~
+                                                             *pymode-completion*
+
+By default you can use <Ctrl-Space> for autocompletion. The first entry will
+be automatically selected and you can press <Return> to insert the entry in
+your code. <C-X><C-O> and <C-P>/<C-N> works too.
+
+Autocompletion is also called by typing a period in |Insert| mode by default.
+
+
+Turn on code completion support in the plugin       *'g:pymode_rope_completion'*
+>
+    let g:pymode_rope_completion = 1
+
+Turn on autocompletion when typing a period
+                                               *'g:pymode_rope_complete_on_dot'*
+>
+    let g:pymode_rope_complete_on_dot = 1
+
+Keymap for autocomplete                        *'g:pymode_rope_completion_bind'*
+>
+    let g:pymode_rope_completion_bind = '<C-Space>'
+
+Extended autocompletion (rope could complete objects which have not been
+imported) from project                              *'g:pymode_rope_autoimport'*
+>
+    let g:pymode_rope_autoimport = 0
+
+Load modules to autoimport by default       *'g:pymode_rope_autoimport_modules'*
+>
+    let g:pymode_rope_autoimport_modules = ['os', 'shutil', 'datetime']
+
+Offer to unresolved import object after completion.
+>
+    let g:pymode_rope_autoimport_import_after_complete = 0
+
+
+------------------------------------------------------------------------------
+4.2 Find definition ~
+                                                            *pymode-rope-findit*
+
+By default when you press *<C-C>g* on any object in your code you will be moved
+to definition. 
+Leave empty for disable key binding.      *'g:pymode_rope_goto_definition_bind'*
+>
+    let g:pymode_rope_goto_definition_bind = '<C-c>g'
+
+Command for open window when definition has been found
+Values are (`e`, `new`, `vnew`)                  *'g:pymode_rope_goto_definition_cmd'*
+>
+    let g:pymode_rope_goto_definition_cmd = 'new'
+
+------------------------------------------------------------------------------
+4.3 Refactoring ~
+                                                       *pymode-rope-refactoring*
+
+Rename method/function/class/variable in the project ~
+
+Pymode can rename everything: classes, functions, modules, packages, methods,
+variables and keyword arguments.
+
+Keymap for rename method/function/class/variables under cursor
+                                                   *'g:pymode_rope_rename_bind'*
+>
+    let g:pymode_rope_rename_bind = '<C-c>rr'
+
+
+Rename a current module/package ~
+
+*:PymodeRopeRenameModule* -- Rename current module
+
+Keymap for rename current module            *'g:pymode_rope_rename_module_bind'*
+>
+    let g:pymode_rope_rename_module_bind = '<C-c>r1r'
+
+
+Imports ~
+
+*:PymodeRopeAutoImport* -- Resolve import for element under cursor
+
+Organize imports sorts imports, too. It does that according to PEP8. Unused
+imports will be dropped.
+Keymap                                   *'g:pymode_rope_organize_imports_bind'*
+>
+    let g:pymode_rope_organize_imports_bind = '<C-c>ro'
+
+Insert import for current word under cursor    *'g:pymode_rope_autoimport_bind'*
+Should be enabled |'g:pymode_rope_autoimport'|
+>
+    let g:pymode_rope_autoimport_bind = '<C-c>ra'
+
+
+Convert module to package ~
+                                        *'g:pymode_rope_module_to_package_bind'*
+
+*:PymodeRopeModuleToPackage* -- convert current module to package
+
+Keybinding:
+>
+    let g:pymode_rope_module_to_package_bind = '<C-c>r1p'
+
+
+Extract method/variable ~
+                                                           *pymode-rope-extract*
+
+Extract method/variable from selected lines.
+
+                                           *'g:pymode_rope_extract_method_bind'*
+                                         *'g:pymode_rope_extract_variable_bind'*
+>
+    let g:pymode_rope_extract_method_bind = '<C-c>rm'
+    let g:pymode_rope_extract_variable_bind = '<C-c>rl'
+
+
+Use function ~
+                                                               *pymode-rope-use*
+
+It tries to find the places in which a function can be used and changes the
+code to call it instead.
+>
+    let g:pymode_rope_use_function_bind = '<C-c>ru'
+
+
+Move method/fields ~
+                                                              *pymode-rope-move*
+
+It happens when you perform move refactoring on a method of a class. In this
+refactoring, a method of a class is moved to the class of one of its
+attributes. The old method will call the new method. If you want to change all
+of the occurrences of the old method to use the new method you can inline it
+afterwards.
+>
+    let g:pymode_rope_move_bind = '<C-c>rv'
+
+Change function signature ~
+>
+    let g:pymode_rope_change_signature_bind = '<C-c>rs'
+
+
+------------------------------------------------------------------------------
+4.4 Undo/Redo changes ~
+                                                              *pymode-rope-undo* 
+                                                              *pymode-rope-redo*
+
+Commands:
+
+*:PymodeRopeUndo* -- Undo last changes in the project
+*:PymodeRopeRedo* -- Redo last changes in the project
+
+
+==============================================================================
+5. Syntax ~
+                                                                 *pymode-syntax*
+
+Turn on pymode syntax                                        *'g:pymode_syntax'*
+>
+    let g:pymode_syntax = 1
+
+Slower syntax synchronization that is better at handling code blocks in
+docstrings. Consider disabling this on slower hardware.
+                                                   *'g:pymode_syntax_slow_sync'*
+>
+    let g:pymode_syntax_slow_sync = 1
+
+Enable all python highlights                          *'g:pymode_syntax_all'*
+>
+    let g:pymode_syntax_all = 1
+
+Highlight "print" as a function            *'g:pymode_syntax_print_as_function'*
+>
+    let g:pymode_syntax_print_as_function = 0
+
+Highlight "async/await" keywords       *'g:pymode_syntax_highlight_async_await'*
+>
+    let g:pymode_syntax_highlight_async_await = g:pymode_syntax_all
+
+Highlight '=' operator              *'g:pymode_syntax_highlight_equal_operator'*
+>
+    let g:pymode_syntax_highlight_equal_operator = g:pymode_syntax_all
+
+Highlight '*' operator              *'g:pymode_syntax_highlight_stars_operator'*
+>
+    let g:pymode_syntax_highlight_stars_operator = g:pymode_syntax_all
+
+Highlight 'self' keyword                      *'g:pymode_syntax_highlight_self'*
+>
+    let g:pymode_syntax_highlight_self = g:pymode_syntax_all
+
+Highlight indent's errors                      *'g:pymode_syntax_indent_errors'*
+>
+    let g:pymode_syntax_indent_errors = g:pymode_syntax_all
+
+Highlight space's errors                        *'g:pymode_syntax_space_errors'*
+>
+    let g:pymode_syntax_space_errors = g:pymode_syntax_all
+
+Highlight string formatting                 *'g:pymode_syntax_string_formatting'*
+                                               *'g:pymode_syntax_string_format'*
+                                            *'g:pymode_syntax_string_templates'*
+                                                    *'g:pymode_syntax_doctests'*
+>
+    let g:pymode_syntax_string_formatting = g:pymode_syntax_all
+    let g:pymode_syntax_string_format = g:pymode_syntax_all
+    let g:pymode_syntax_string_templates = g:pymode_syntax_all
+    let g:pymode_syntax_doctests = g:pymode_syntax_all
+
+Highlight builtin objects (True, False, ...)    *'g:pymode_syntax_builtin_objs'*
+>
+    let g:pymode_syntax_builtin_objs = g:pymode_syntax_all
+
+Highlight builtin types (str, list, ...)       *'g:pymode_syntax_builtin_types'*
+>
+    let g:pymode_syntax_builtin_types = g:pymode_syntax_all
+
+Highlight exceptions (TypeError, ValueError, ...) 
+                                        *'g:pymode_syntax_highlight_exceptions'*
+>
+    let g:pymode_syntax_highlight_exceptions = g:pymode_syntax_all
+
+Highlight docstrings as pythonDocstring (otherwise as pythonString)
+                                                  *'g:pymode_syntax_docstrings'*
+>
+    let g:pymode_syntax_docstrings = g:pymode_syntax_all
+
+
+==============================================================================
+6. FAQ ~
+                                                                    *pymode-faq*
+
+Python-mode doesn't work
+------------------------
+
+Open any python file and run ":call pymode#troubleshooting#test()",
+fix the warning or send me the output.
+
+
+Rope completion is very slow                                   *pymode-rope-slow*
+----------------------------
+
+Rope creates a project-level service directory in |.ropeproject|
+
+If ``.ropeproject`` is not found in the current directory, rope will walk
+upwards looking for a ``.ropeproject`` in every dir of the parent path. If
+rope finds ``.ropeproject`` in a parent dir, it sets the project for all child
+dirs and the scan may be slow for so many dirs and files.
+
+Solutions:
+
+- Delete `.ropeproject` from the parent dir to make rope create `.ropeproject`
+  in the current dir.
+- Run ``:PymodeRopeNewProject`` to make rope create ``.ropeproject`` in the
+  current dir.
+- Set |'g:pymode_rope_lookup_project'| to 0 for prevent searching in parent
+  dirs.
+
+You may also set |'g:pymode_rope_project_root'| to manually specify the project
+root path.
+
+
+
+Pylint check is very slow
+-------------------------
+
+In some projects pylint may check slowly, because it also scans imported
+modules if possible. Try using another code checker: see
+|'g:pymode_lint_checkers'|.
+
+You may set |exrc| and |secure| in your |vimrc| to auto-set custom settings
+from `.vimrc` from your projects directories.
+
+
+OSX cannot import urandom
+-------------------------
+
+See: https://groups.google.com/forum/?fromgroups=#!topic/vim_dev/2NXKF6kDONo
+
+The sequence of commands that fixed this:
+>
+    brew unlink python
+    brew unlink macvim
+    brew remove macvim
+    brew install -v --force macvim
+    brew link macvim
+    brew link python
+<
+
+==============================================================================
+7. Credits ~
+                                                                *pymode-credits*
+    Kirill Klenov
+        http://klen.github.com/
+        http://github.com/klen/
+
+    Rope
+        Copyright (C) 2006-2010 Ali Gholami Rudi
+        Copyright (C) 2009-2010 Anton Gritsay
+
+    Pylint
+        Copyright (C) 2003-2011 LOGILAB S.A. (Paris, FRANCE).
+        http://www.logilab.fr/
+
+    Pyflakes:
+        Copyright (c) 2005 Divmod, Inc.
+        http://www.divmod.com/
+
+    PEP8:
+        Copyright (c) 2006 Johann C. Rocholl <johann@rocholl.net>
+        http://github.com/jcrocholl/pep8
+
+    autopep8:
+        Copyright (c) 2012 hhatto <hhatto.jp@gmail.com>
+        https://github.com/hhatto/autopep8
+
+    Python syntax for vim:
+        Copyright (c) 2010 Dmitry Vasiliev
+        http://www.hlabs.spb.ru/vim/python.vim
+
+    PEP8 VIM indentation
+        Copyright (c) 2012 Hynek Schlawack <hs@ox.cx>
+        http://github.com/hynek/vim-python-pep8-indent
+
+
+==============================================================================
+8. License ~
+                                                                *pymode-license*
+
+Python-mode is released under the GNU lesser general public license.
+See: http://www.gnu.org/copyleft/lesser.html
+
+If you like this plugin, I would very appreciated if you kindly send me a postcard :)
+
+My address is: "Russia, 143500, MO, Istra, pos. Severny 8-3" to "Kirill Klenov".
+Thanks for your support!
+
+
+------------------------------------------------------------------------------
+
+ vim:tw=78:ts=8:ft=help:norl:
diff --git a/vim-plugins/bundle/python-mode/ftplugin/pyrex.vim b/vim-plugins/bundle/python-mode/ftplugin/pyrex.vim
new file mode 100644
index 0000000..93e0556
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/ftplugin/pyrex.vim
@@ -0,0 +1 @@
+runtime ftplugin/python/pymode.vim
diff --git a/vim-plugins/bundle/python-mode/ftplugin/python/pymode.vim b/vim-plugins/bundle/python-mode/ftplugin/python/pymode.vim
new file mode 100644
index 0000000..97daecc
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/ftplugin/python/pymode.vim
@@ -0,0 +1,212 @@
+if !g:pymode || pymode#default('b:pymode', 1)
+    finish
+endif
+
+if g:pymode_python == 'disable'
+
+    if g:pymode_warning
+        call pymode#error("Pymode requires vim compiled with +python. Most of features will be disabled.")
+    endif
+
+    finish
+
+else
+
+
+let b:pymode_modified = &modified
+
+" Init paths
+if !pymode#default('g:pymode_init', 1)
+
+        call pymode#init(expand('<sfile>:p:h:h:h'), g:pymode_paths)
+        call pymode#virtualenv#init()
+        call pymode#breakpoint#init()
+
+        PymodePython from pymode.utils import patch_paths
+        PymodePython patch_paths()
+
+    endif
+
+endif
+
+command! -buffer -nargs=1 PymodeVirtualenv call pymode#virtualenv#activate(<args>)
+
+" Setup events for pymode
+au! pymode BufWritePre <buffer> call pymode#buffer_pre_write()
+au! pymode BufWritePost <buffer> call pymode#buffer_post_write()
+
+" Run python code
+if g:pymode_run
+
+    command! -buffer -nargs=0 -range=% PymodeRun call pymode#run#code_run(<f-line1>, <f-line2>)
+
+    exe "nnoremap <silent> <buffer> " g:pymode_run_bind ":PymodeRun<CR>"
+    exe "vnoremap <silent> <buffer> " g:pymode_run_bind ":PymodeRun<CR>"
+
+endif
+
+" Add/remove breakpoints
+if g:pymode_breakpoint
+
+    exe "nnoremap <silent> <buffer> " g:pymode_breakpoint_bind ":call pymode#breakpoint#operate(line('.'))<CR>"
+
+endif
+
+" Python folding
+if g:pymode_folding
+
+    setlocal foldmethod=expr
+    setlocal foldexpr=pymode#folding#expr(v:lnum)
+    setlocal foldtext=pymode#folding#text()
+
+endif
+
+" Remove unused whitespaces
+if g:pymode_trim_whitespaces
+    au BufWritePre <buffer> call pymode#trim_whitespaces()
+endif
+
+" Custom options
+if g:pymode_options
+    setlocal complete+=t
+    setlocal formatoptions-=t
+    if v:version > 702 && !&relativenumber
+        setlocal number
+    endif
+    setlocal nowrap
+    exe "setlocal textwidth=" . g:pymode_options_max_line_length
+    if g:pymode_options_colorcolumn && exists('+colorcolumn')
+        setlocal colorcolumn=+1
+    endif
+    setlocal commentstring=#%s
+    setlocal define=^\s*\\(def\\\\|class\\)
+endif
+
+if g:pymode_lint
+
+    command! -buffer -nargs=0 PymodeLintAuto :call pymode#lint#auto()
+    command! -buffer -nargs=0 PymodeLintToggle :call pymode#lint#toggle()
+    command! -buffer -nargs=0 PymodeLint :call pymode#lint#check()
+
+    if v:version > 703 || (v:version == 703 && has('patch544'))
+        au! QuitPre <buffer> call pymode#quit()
+    else
+        au! pymode BufWinLeave * silent! lclose
+    endif
+
+    let b:pymode_error_line = -1
+
+    if g:pymode_lint_on_fly
+        au! pymode InsertLeave <buffer> PymodeLint
+    endif
+
+    if g:pymode_lint_message
+        au! pymode CursorMoved <buffer>
+        au! pymode CursorMoved <buffer> call pymode#lint#show_errormessage()
+    endif
+
+    " Disabled for current release
+    if g:pymode_lint_async
+        " let &l:updatetime = g:pymode_lint_async_updatetime
+        " au! BufEnter <buffer> call pymode#lint#start()
+        " au! BufLeave <buffer> call pymode#lint#stop()
+    end
+
+endif
+
+" Show python documentation
+if g:pymode_doc
+
+    " Set commands
+    command! -buffer -nargs=1 PymodeDoc call pymode#doc#show("<args>")
+
+    " Set keys
+    exe "nnoremap <silent> <buffer> " g:pymode_doc_bind ":call pymode#doc#find()<CR>"
+    exe "vnoremap <silent> <buffer> " g:pymode_doc_bind ":<C-U>call pymode#doc#show(@*)<CR>"
+
+end
+
+" Rope support
+if g:pymode_rope
+
+    if g:pymode_rope_goto_definition_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_goto_definition_bind . " :call pymode#rope#goto_definition()<CR>"
+    endif
+    if g:pymode_rope_show_doc_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_show_doc_bind . " :call pymode#rope#show_doc()<CR>"
+    end
+    if g:pymode_rope_find_it_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_find_it_bind . " :call pymode#rope#find_it()<CR>"
+    end
+    if g:pymode_rope_organize_imports_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_organize_imports_bind . " :call pymode#rope#organize_imports()<CR>"
+    end
+
+    if g:pymode_rope_rename_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_rename_bind . " :call pymode#rope#rename()<CR>"
+    end
+
+    if g:pymode_rope_rename_module_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_rename_module_bind . " :call pymode#rope#rename_module()<CR>"
+    end
+
+    if g:pymode_rope_extract_method_bind != ""
+        exe "vnoremap <silent> <buffer> " . g:pymode_rope_extract_method_bind . " :call pymode#rope#extract_method()<CR>"
+    end
+
+    if g:pymode_rope_extract_variable_bind != ""
+        exe "vnoremap <silent> <buffer> " . g:pymode_rope_extract_variable_bind . " :call pymode#rope#extract_variable()<CR>"
+    end
+
+    if g:pymode_rope_inline_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_inline_bind . " :call pymode#rope#inline()<CR>"
+    end
+
+    if g:pymode_rope_move_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_move_bind . " :call pymode#rope#move()<CR>"
+    end
+
+    if g:pymode_rope_change_signature_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_change_signature_bind . " :call pymode#rope#signature()<CR>"
+    end
+
+    if g:pymode_rope_use_function_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_use_function_bind . " :call pymode#rope#use_function()<CR>"
+    end
+
+    if g:pymode_rope_generate_function_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_generate_function_bind . " :call pymode#rope#generate_function()<CR>"
+    end
+
+    if g:pymode_rope_generate_package_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_generate_package_bind . " :call pymode#rope#generate_package()<CR>"
+    end
+
+    if g:pymode_rope_generate_class_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_generate_class_bind . " :call pymode#rope#generate_class()<CR>"
+    end
+
+    if g:pymode_rope_module_to_package_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_module_to_package_bind . " :call pymode#rope#module_to_package()<CR>"
+    end
+
+    if g:pymode_rope_autoimport_bind != ""
+        exe "noremap <silent> <buffer> " . g:pymode_rope_autoimport_bind . " :PymodeRopeAutoImport<CR>"
+    end
+
+    if g:pymode_rope_completion && g:pymode_rope_complete_on_dot
+        inoremap <silent> <buffer> . .<C-R>=pymode#rope#complete_on_dot()<CR>
+    end
+
+    command! -buffer -nargs=? PymodeRopeNewProject call pymode#rope#new(<f-args>)
+    command! -buffer PymodeRopeUndo call pymode#rope#undo()
+    command! -buffer PymodeRopeRedo call pymode#rope#redo()
+    command! -buffer PymodeRopeRenameModule call pymode#rope#rename_module()
+    command! -buffer PymodeRopeModuleToPackage call pymode#rope#module_to_package()
+    command! -buffer PymodeRopeRegenerate call pymode#rope#regenerate()
+
+    if g:pymode_rope_autoimport
+        command! -buffer PymodeRopeAutoImport call pymode#rope#autoimport(expand('<cword>'))
+    end
+
+end
diff --git a/vim-plugins/bundle/python-mode/logo.png b/vim-plugins/bundle/python-mode/logo.png
new file mode 100644
index 0000000..b873f5c
Binary files /dev/null and b/vim-plugins/bundle/python-mode/logo.png differ
diff --git a/vim-plugins/bundle/python-mode/plugin/pymode.vim b/vim-plugins/bundle/python-mode/plugin/pymode.vim
new file mode 100644
index 0000000..5b6c51e
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/plugin/pymode.vim
@@ -0,0 +1,316 @@
+" vi: fdl=1
+let g:pymode_version = "0.9.0"
+
+com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
+com! PymodeTroubleshooting call pymode#troubleshooting#test()
+
+" Enable pymode by default :)
+call pymode#default('g:pymode', 1)
+call pymode#default('g:pymode_debug', 0)
+
+" DESC: Disable script loading
+if !g:pymode || &cp
+    finish
+endif
+
+" Pymode needs
+filetype plugin on
+
+" OPTIONS: {{{
+
+" Vim Python interpreter. Set to 'disable' for remove python features.
+call pymode#default('g:pymode_python', '')
+
+" Disable pymode warnings
+call pymode#default('g:pymode_warning', 1)
+
+" Additional python paths
+call pymode#default('g:pymode_paths', [])
+
+" Python documentation support
+call pymode#default('g:pymode_doc', 1)
+call pymode#default('g:pymode_doc_bind', 'K')
+
+" Enable/Disable pymode PEP8 indentation
+call pymode#default("g:pymode_indent", 1)
+
+" Enable/disable pymode folding for pyfiles.
+call pymode#default("g:pymode_folding", 1)
+" Maximum file length to check for nested class/def statements
+call pymode#default("g:pymode_folding_nest_limit", 1000)
+" Change for folding customization (by example enable fold for 'if', 'for')
+call pymode#default("g:pymode_folding_regex", '^\s*\%(class\|def\|async\s\+def\) .\+\(:\s\+\w\)\@!')
+
+" Enable/disable python motion operators
+call pymode#default("g:pymode_motion", 1)
+
+" Auto remove unused whitespaces on save
+call pymode#default("g:pymode_trim_whitespaces", 1)
+
+" Set recomended python options
+call pymode#default("g:pymode_options", 1)
+call pymode#default("g:pymode_options_max_line_length", 80)
+call pymode#default("g:pymode_options_colorcolumn", 1)
+
+" Enable/disable vertical display of python documentation
+call pymode#default("g:pymode_doc_vertical", 0)
+
+" Minimal height of pymode quickfix window
+call pymode#default('g:pymode_quickfix_maxheight', 6)
+
+" Maximal height of pymode quickfix window
+call pymode#default('g:pymode_quickfix_minheight', 3)
+
+" LOAD VIRTUALENV {{{
+"
+" Enable virtualenv support
+call pymode#default('g:pymode_virtualenv', 1)
+
+" Get path to virtualenv (by default take from shell)
+call pymode#default('g:pymode_virtualenv_path', $VIRTUAL_ENV)
+
+" Service variable (don't set it manually)
+call pymode#default('g:pymode_virtualenv_enabled', '')
+
+" }}}
+
+" RUN PYTHON {{{
+"
+" Enable code running support
+call pymode#default('g:pymode_run', 1)
+
+" Key's map for run python code
+call pymode#default('g:pymode_run_bind', '<leader>r')
+
+" }}}
+
+" CHECK CODE {{{
+"
+" Code checking
+call pymode#default('g:pymode_lint', 1)
+
+" Check code asynchronously
+call pymode#default('g:pymode_lint_async', 1)
+call pymode#default('g:pymode_lint_async_updatetime', 1000)
+
+" Check code every save if file has been modified
+call pymode#default("g:pymode_lint_on_write", 1)
+
+" Check code every save (every)
+call pymode#default("g:pymode_lint_unmodified", 0)
+
+" Check code on fly
+call pymode#default("g:pymode_lint_on_fly", 0)
+
+" Show message about error in command line
+call pymode#default("g:pymode_lint_message", 1)
+
+" Choices are: pylint, pyflakes, pep8, mccabe
+call pymode#default("g:pymode_lint_checkers", ['pyflakes', 'pep8', 'mccabe'])
+
+" Skip errors and warnings (e.g. E4,W)
+call pymode#default("g:pymode_lint_ignore", "")
+
+" Select errors and warnings (e.g. E4,W)
+call pymode#default("g:pymode_lint_select", "")
+
+" Auto open cwindow if any errors has been finded
+call pymode#default("g:pymode_lint_cwindow", 1)
+
+" If not emply, errors will be sort by defined relevance
+" E.g. let g:pymode_lint_sort = ['E', 'C', 'I']  " Errors first 'E',
+" after them 'C' and ...
+call pymode#default("g:pymode_lint_sort", [])
+
+" Place error signs
+call pymode#default("g:pymode_lint_signs", 1)
+
+" Symbol's definitions
+call pymode#default("g:pymode_lint_todo_symbol", "WW")
+call pymode#default("g:pymode_lint_docs_symbol", "DD")
+call pymode#default("g:pymode_lint_comment_symbol", "CC")
+call pymode#default("g:pymode_lint_visual_symbol", "RR")
+call pymode#default("g:pymode_lint_error_symbol", "EE")
+call pymode#default("g:pymode_lint_info_symbol", "II")
+call pymode#default("g:pymode_lint_pyflakes_symbol", "FF")
+
+" Code checkers options
+call pymode#default("g:pymode_lint_options_pep8",
+    \ {'max_line_length': g:pymode_options_max_line_length})
+
+call pymode#default("g:pymode_lint_options_pylint",
+    \ {'max-line-length': g:pymode_options_max_line_length})
+
+call pymode#default("g:pymode_lint_options_mccabe",
+    \ {'complexity': 12})
+
+call pymode#default("g:pymode_lint_options_pep257", {})
+call pymode#default("g:pymode_lint_options_pyflakes", { 'builtins': '_' })
+
+
+" }}}
+
+" SET/UNSET BREAKPOINTS {{{
+"
+
+" Create/remove breakpoints
+call pymode#default('g:pymode_breakpoint', 1)
+
+" Key's map for add/remove breakpoint
+call pymode#default('g:pymode_breakpoint_bind', '<leader>b')
+
+" Default pattern for making breakpoints. Leave this empty for auto search available debuggers (pdb, ipdb, ...)
+call pymode#default('g:pymode_breakpoint_cmd', '')
+
+" }}}
+
+" ROPE (refactoring, codeassist) {{{
+"
+" Rope support
+call pymode#default('g:pymode_rope', 1)
+
+" System plugin variable
+call pymode#default('g:pymode_rope_current', '')
+
+" Configurable rope project root
+call pymode#default('g:pymode_rope_project_root', '')
+
+" Configurable rope project folder (always relative to project root)
+call pymode#default('g:pymode_rope_ropefolder', '.ropeproject')
+
+" If project hasnt been finded in current working directory, look at parents directory
+call pymode#default('g:pymode_rope_lookup_project', 0)
+
+" Enable Rope completion
+call pymode#default('g:pymode_rope_completion', 1)
+
+" Complete keywords from not imported modules (could make completion slower)
+" Enable autoimport used modules
+call pymode#default('g:pymode_rope_autoimport', 0)
+
+" Offer to import object after complete (if that not be imported before)
+call pymode#default('g:pymode_rope_autoimport_import_after_complete', 0)
+
+" Autoimported modules
+call pymode#default('g:pymode_rope_autoimport_modules', ['os', 'shutil', 'datetime'])
+
+" Bind keys to autoimport module for object under cursor
+call pymode#default('g:pymode_rope_autoimport_bind', '<C-c>ra')
+
+" Automatic completion on dot
+call pymode#default('g:pymode_rope_complete_on_dot', 1)
+
+" Bind keys for autocomplete (leave empty for disable)
+call pymode#default('g:pymode_rope_completion_bind', '<C-Space>')
+
+" Bind keys for goto definition (leave empty for disable)
+call pymode#default('g:pymode_rope_goto_definition_bind', '<C-c>g')
+
+" set command for open definition (e, new, vnew)
+call pymode#default('g:pymode_rope_goto_definition_cmd', 'new')
+
+" Bind keys for show documentation (leave empty for disable)
+call pymode#default('g:pymode_rope_show_doc_bind', '<C-c>d')
+
+" Bind keys for find occurencies (leave empty for disable)
+call pymode#default('g:pymode_rope_find_it_bind', '<C-c>f')
+
+" Bind keys for organize imports (leave empty for disable)
+call pymode#default('g:pymode_rope_organize_imports_bind', '<C-c>ro')
+
+" Bind keys for rename variable/method/class in the project (leave empty for disable)
+call pymode#default('g:pymode_rope_rename_bind', '<C-c>rr')
+
+" Bind keys for rename module
+call pymode#default('g:pymode_rope_rename_module_bind', '<C-c>r1r')
+
+" Bind keys for convert module to package
+call pymode#default('g:pymode_rope_module_to_package_bind', '<C-c>r1p')
+
+" Creates a new function or method (depending on the context) from the selected lines
+call pymode#default('g:pymode_rope_extract_method_bind', '<C-c>rm')
+
+" Creates a variable from the selected lines
+call pymode#default('g:pymode_rope_extract_variable_bind', '<C-c>rl')
+
+" Inline refactoring
+call pymode#default('g:pymode_rope_inline_bind', '<C-c>ri')
+
+" Move refactoring
+call pymode#default('g:pymode_rope_move_bind', '<C-c>rv')
+
+" Generate function
+call pymode#default('g:pymode_rope_generate_function_bind', '<C-c>rnf')
+
+" Generate class
+call pymode#default('g:pymode_rope_generate_class_bind', '<C-c>rnc')
+
+" Generate package
+call pymode#default('g:pymode_rope_generate_package_bind', '<C-c>rnp')
+
+" Change signature
+call pymode#default('g:pymode_rope_change_signature_bind', '<C-c>rs')
+
+" Tries to find the places in which a function can be used and changes the
+" code to call it instead
+call pymode#default('g:pymode_rope_use_function_bind', '<C-c>ru')
+
+" Regenerate project cache on every save
+call pymode#default('g:pymode_rope_regenerate_on_write', 1)
+
+" }}}
+
+" }}}
+
+" Prepare to plugin loading
+if &compatible
+    set nocompatible
+endif
+filetype plugin on
+
+" Disable python-related functionality
+" let g:pymode_python = 'disable'
+" let g:pymode_python = 'python3'
+
+" UltiSnips Fixes
+if !len(g:pymode_python)
+    if exists('g:_uspy') && g:_uspy == ':py'
+        let g:pymode_python = 'python'
+    elseif exists('g:_uspy') && g:_uspy == ':py3'
+        let g:pymode_python = 'python3'
+    elseif has("python")
+        let g:pymode_python = 'python'
+    elseif has("python3")
+        let g:pymode_python = 'python3'
+    else
+        let g:pymode_python = 'disable'
+    endif
+endif
+
+if g:pymode_python == 'python'
+
+    command! -nargs=1 PymodePython python <args>
+    let g:UltiSnipsUsePythonVersion = 2
+
+elseif g:pymode_python == 'python3'
+
+    command! -nargs=1 PymodePython python3 <args>
+    let g:UltiSnipsUsePythonVersion = 3
+
+else
+
+    let g:pymode_doc = 0
+    let g:pymode_lint = 0
+    let g:pymode_path = 0
+    let g:pymode_rope = 0
+    let g:pymode_run = 0
+    let g:pymode_virtualenv = 0
+
+    command! -nargs=1 PymodePython echo <args>
+
+endif
+
+
+command! PymodeVersion echomsg "Pymode version: " . g:pymode_version . " interpreter: " . g:pymode_python . " lint: " . g:pymode_lint . " rope: " . g:pymode_rope
+
+augroup pymode
diff --git a/vim-plugins/bundle/python-mode/pylama.ini b/vim-plugins/bundle/python-mode/pylama.ini
new file mode 100644
index 0000000..0394772
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pylama.ini
@@ -0,0 +1,8 @@
+[pylama]
+linters=pep8,pyflakes,pylint
+
+[pylama:pymode/libs*]
+skip=1
+
+[pylama:pylint]
+disable=E1120,E1130,E1103,W1401,F0001
diff --git a/vim-plugins/bundle/python-mode/pymode/__init__.py b/vim-plugins/bundle/python-mode/pymode/__init__.py
new file mode 100644
index 0000000..d5e63ba
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/__init__.py
@@ -0,0 +1,37 @@
+""" Pymode support functions. """
+
+from __future__ import absolute_import
+
+import sys
+import vim  # noqa
+
+
+def auto():
+    """ Fix PEP8 erorrs in current buffer. """
+    from .autopep8 import fix_file
+
+    class Options(object):
+        aggressive = 2
+        diff = False
+        experimental = True
+        ignore = vim.eval('g:pymode_lint_ignore')
+        in_place = True
+        indent_size = int(vim.eval('&tabstop'))
+        line_range = None
+        max_line_length = int(vim.eval('g:pymode_options_max_line_length'))
+        pep8_passes = 100
+        recursive = False
+        select = vim.eval('g:pymode_lint_select')
+        verbose = 0
+
+    fix_file(vim.current.buffer.name, Options)
+
+
+def get_documentation():
+    """ Search documentation and append to current buffer. """
+    from ._compat import StringIO
+
+    sys.stdout, _ = StringIO(), sys.stdout
+    help(vim.eval('a:word'))
+    sys.stdout, out = _, sys.stdout.getvalue()
+    vim.current.buffer.append(str(out).splitlines(), 0)
diff --git a/vim-plugins/bundle/python-mode/pymode/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..608a96b
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/__pycache__/_compat.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/_compat.cpython-35.pyc
new file mode 100644
index 0000000..746db29
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/__pycache__/_compat.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/__pycache__/autopep8.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/autopep8.cpython-35.pyc
new file mode 100644
index 0000000..cb1eded
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/__pycache__/autopep8.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/__pycache__/environment.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/environment.cpython-35.pyc
new file mode 100644
index 0000000..c13f200
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/__pycache__/environment.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/__pycache__/lint.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/lint.cpython-35.pyc
new file mode 100644
index 0000000..c75efec
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/__pycache__/lint.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/__pycache__/rope.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/rope.cpython-35.pyc
new file mode 100644
index 0000000..47d404c
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/__pycache__/rope.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/__pycache__/run.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/run.cpython-35.pyc
new file mode 100644
index 0000000..de94629
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/__pycache__/run.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/__pycache__/utils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/utils.cpython-35.pyc
new file mode 100644
index 0000000..af740db
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/__pycache__/utils.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/__pycache__/virtualenv.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/__pycache__/virtualenv.cpython-35.pyc
new file mode 100644
index 0000000..2098290
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/__pycache__/virtualenv.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/_compat.py b/vim-plugins/bundle/python-mode/pymode/_compat.py
new file mode 100644
index 0000000..d859f15
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/_compat.py
@@ -0,0 +1,98 @@
+""" Compatibility.
+
+    Some py2/py3 compatibility support based on a stripped down
+    version of six so we don't have to depend on a specific version
+    of it.
+
+    :copyright: (c) 2014 by Armin Ronacher.
+    :license: BSD
+"""
+import sys
+
+PY2 = sys.version_info[0] == 2
+_identity = lambda x: x
+
+
+if not PY2:
+    text_type = str
+    string_types = (str,)
+    integer_types = (int, )
+
+    iterkeys = lambda d: iter(d.keys())
+    itervalues = lambda d: iter(d.values())
+    iteritems = lambda d: iter(d.items())
+
+    from io import StringIO
+    from queue import Queue # noqa
+
+    def reraise(tp, value, tb=None):
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
+
+    implements_to_string = _identity
+
+else:
+    text_type = unicode
+    string_types = (str, unicode)
+    integer_types = (int, long)
+
+    iterkeys = lambda d: d.iterkeys()
+    itervalues = lambda d: d.itervalues()
+    iteritems = lambda d: d.iteritems()
+
+    from cStringIO import StringIO
+    from Queue import Queue
+
+    exec('def reraise(tp, value, tb=None):\n raise tp, value, tb')
+
+    def implements_to_string(cls):
+        cls.__unicode__ = cls.__str__
+        cls.__str__ = lambda x: x.__unicode__().encode('utf-8')
+        return cls
+
+
+def with_metaclass(meta, *bases):
+    # This requires a bit of explanation: the basic idea is to make a
+    # dummy metaclass for one level of class instantiation that replaces
+    # itself with the actual metaclass.  Because of internal type checks
+    # we also need to make sure that we downgrade the custom metaclass
+    # for one level to something closer to type (that's why __call__ and
+    # __init__ comes back from type etc.).
+    #
+    # This has the advantage over six.with_metaclass in that it does not
+    # introduce dummy classes into the final MRO.
+    class metaclass(meta):
+        __call__ = type.__call__
+        __init__ = type.__init__
+        def __new__(cls, name, this_bases, d):
+            if this_bases is None:
+                return type.__new__(cls, name, (), d)
+            return meta(name, bases, d)
+    return metaclass('temporary_class', None, {})
+
+
+# Certain versions of pypy have a bug where clearing the exception stack
+# breaks the __exit__ function in a very peculiar way.  This is currently
+# true for pypy 2.2.1 for instance.  The second level of exception blocks
+# is necessary because pypy seems to forget to check if an exception
+# happend until the next bytecode instruction?
+BROKEN_PYPY_CTXMGR_EXIT = False
+if hasattr(sys, 'pypy_version_info'):
+    class _Mgr(object):
+        def __enter__(self):
+            return self
+        def __exit__(self, *args):
+            sys.exc_clear()
+    try:
+        try:
+            with _Mgr():
+                raise AssertionError()
+        except:
+            raise
+    except TypeError:
+        BROKEN_PYPY_CTXMGR_EXIT = True
+    except AssertionError:
+        pass
+
+# pylama:skip=1
diff --git a/vim-plugins/bundle/python-mode/pymode/async.py b/vim-plugins/bundle/python-mode/pymode/async.py
new file mode 100644
index 0000000..dd314d7
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/async.py
@@ -0,0 +1,6 @@
+""" Python-mode async support. """
+
+from ._compat import Queue
+
+
+RESULTS = Queue()
diff --git a/vim-plugins/bundle/python-mode/pymode/autopep8.py b/vim-plugins/bundle/python-mode/pymode/autopep8.py
new file mode 100644
index 0000000..1330875
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/autopep8.py
@@ -0,0 +1,3654 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2010-2011 Hideo Hattori
+# Copyright (C) 2011-2013 Hideo Hattori, Steven Myint
+# Copyright (C) 2013-2015 Hideo Hattori, Steven Myint, Bill Wendling
+#
+# 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.
+
+"""Automatically formats Python code to conform to the PEP 8 style guide.
+
+Fixes that only need be done once can be added by adding a function of the form
+"fix_<code>(source)" to this module. They should return the fixed source code.
+These fixes are picked up by apply_global_fixes().
+
+Fixes that depend on pep8 should be added as methods to FixPEP8. See the class
+documentation for more information.
+
+"""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import codecs
+import collections
+import copy
+import difflib
+import fnmatch
+import inspect
+import io
+import keyword
+import locale
+import os
+import re
+import signal
+import sys
+import textwrap
+import token
+import tokenize
+
+import pep8
+
+
+try:
+    unicode
+except NameError:
+    unicode = str
+
+
+__version__ = '1.2.1a0'
+
+
+CR = '\r'
+LF = '\n'
+CRLF = '\r\n'
+
+
+PYTHON_SHEBANG_REGEX = re.compile(r'^#!.*\bpython[23]?\b\s*$')
+
+
+# For generating line shortening candidates.
+SHORTEN_OPERATOR_GROUPS = frozenset([
+    frozenset([',']),
+    frozenset(['%']),
+    frozenset([',', '(', '[', '{']),
+    frozenset(['%', '(', '[', '{']),
+    frozenset([',', '(', '[', '{', '%', '+', '-', '*', '/', '//']),
+    frozenset(['%', '+', '-', '*', '/', '//']),
+])
+
+
+DEFAULT_IGNORE = 'E24'
+DEFAULT_INDENT_SIZE = 4
+
+
+# W602 is handled separately due to the need to avoid "with_traceback".
+CODE_TO_2TO3 = {
+    'E231': ['ws_comma'],
+    'E721': ['idioms'],
+    'W601': ['has_key'],
+    'W603': ['ne'],
+    'W604': ['repr'],
+    'W690': ['apply',
+             'except',
+             'exitfunc',
+             'numliterals',
+             'operator',
+             'paren',
+             'reduce',
+             'renames',
+             'standarderror',
+             'sys_exc',
+             'throw',
+             'tuple_params',
+             'xreadlines']}
+
+
+if sys.platform == 'win32':  # pragma: no cover
+    DEFAULT_CONFIG = os.path.expanduser(r'~\.pep8')
+else:
+    DEFAULT_CONFIG = os.path.join(os.getenv('XDG_CONFIG_HOME') or
+                                  os.path.expanduser('~/.config'), 'pep8')
+PROJECT_CONFIG = ('setup.cfg', 'tox.ini', '.pep8')
+
+
+def open_with_encoding(filename, encoding=None, mode='r'):
+    """Return opened file with a specific encoding."""
+    if not encoding:
+        encoding = detect_encoding(filename)
+
+    return io.open(filename, mode=mode, encoding=encoding,
+                   newline='')  # Preserve line endings
+
+
+def detect_encoding(filename):
+    """Return file encoding."""
+    try:
+        with open(filename, 'rb') as input_file:
+            from lib2to3.pgen2 import tokenize as lib2to3_tokenize
+            encoding = lib2to3_tokenize.detect_encoding(input_file.readline)[0]
+
+        # Check for correctness of encoding
+        with open_with_encoding(filename, encoding) as test_file:
+            test_file.read()
+
+        return encoding
+    except (LookupError, SyntaxError, UnicodeDecodeError):
+        return 'latin-1'
+
+
+def readlines_from_file(filename):
+    """Return contents of file."""
+    with open_with_encoding(filename) as input_file:
+        return input_file.readlines()
+
+
+def extended_blank_lines(logical_line,
+                         blank_lines,
+                         blank_before,
+                         indent_level,
+                         previous_logical):
+    """Check for missing blank lines after class declaration."""
+    if previous_logical.startswith('class '):
+        if logical_line.startswith(('def ', 'class ', '@')):
+            if indent_level and not blank_lines and not blank_before:
+                yield (0, 'E309 expected 1 blank line after class declaration')
+    elif previous_logical.startswith('def '):
+        if blank_lines and pep8.DOCSTRING_REGEX.match(logical_line):
+            yield (0, 'E303 too many blank lines ({0})'.format(blank_lines))
+    elif pep8.DOCSTRING_REGEX.match(previous_logical):
+        # Missing blank line between class docstring and method declaration.
+        if (
+            indent_level and
+            not blank_lines and
+            not blank_before and
+            logical_line.startswith(('def ')) and
+            '(self' in logical_line
+        ):
+            yield (0, 'E301 expected 1 blank line, found 0')
+pep8.register_check(extended_blank_lines)
+
+
+def continued_indentation(logical_line, tokens, indent_level, indent_char,
+                          noqa):
+    """Override pep8's function to provide indentation information."""
+    first_row = tokens[0][2][0]
+    nrows = 1 + tokens[-1][2][0] - first_row
+    if noqa or nrows == 1:
+        return
+
+    # indent_next tells us whether the next block is indented. Assuming
+    # that it is indented by 4 spaces, then we should not allow 4-space
+    # indents on the final continuation line. In turn, some other
+    # indents are allowed to have an extra 4 spaces.
+    indent_next = logical_line.endswith(':')
+
+    row = depth = 0
+    valid_hangs = (
+        (DEFAULT_INDENT_SIZE,)
+        if indent_char != '\t' else (DEFAULT_INDENT_SIZE,
+                                     2 * DEFAULT_INDENT_SIZE)
+    )
+
+    # Remember how many brackets were opened on each line.
+    parens = [0] * nrows
+
+    # Relative indents of physical lines.
+    rel_indent = [0] * nrows
+
+    # For each depth, collect a list of opening rows.
+    open_rows = [[0]]
+    # For each depth, memorize the hanging indentation.
+    hangs = [None]
+
+    # Visual indents.
+    indent_chances = {}
+    last_indent = tokens[0][2]
+    indent = [last_indent[1]]
+
+    last_token_multiline = None
+    line = None
+    last_line = ''
+    last_line_begins_with_multiline = False
+    for token_type, text, start, end, line in tokens:
+
+        newline = row < start[0] - first_row
+        if newline:
+            row = start[0] - first_row
+            newline = (not last_token_multiline and
+                       token_type not in (tokenize.NL, tokenize.NEWLINE))
+            last_line_begins_with_multiline = last_token_multiline
+
+        if newline:
+            # This is the beginning of a continuation line.
+            last_indent = start
+
+            # Record the initial indent.
+            rel_indent[row] = pep8.expand_indent(line) - indent_level
+
+            # Identify closing bracket.
+            close_bracket = (token_type == tokenize.OP and text in ']})')
+
+            # Is the indent relative to an opening bracket line?
+            for open_row in reversed(open_rows[depth]):
+                hang = rel_indent[row] - rel_indent[open_row]
+                hanging_indent = hang in valid_hangs
+                if hanging_indent:
+                    break
+            if hangs[depth]:
+                hanging_indent = (hang == hangs[depth])
+
+            visual_indent = (not close_bracket and hang > 0 and
+                             indent_chances.get(start[1]))
+
+            if close_bracket and indent[depth]:
+                # Closing bracket for visual indent.
+                if start[1] != indent[depth]:
+                    yield (start, 'E124 {0}'.format(indent[depth]))
+            elif close_bracket and not hang:
+                pass
+            elif indent[depth] and start[1] < indent[depth]:
+                # Visual indent is broken.
+                yield (start, 'E128 {0}'.format(indent[depth]))
+            elif (hanging_indent or
+                  (indent_next and
+                   rel_indent[row] == 2 * DEFAULT_INDENT_SIZE)):
+                # Hanging indent is verified.
+                if close_bracket:
+                    yield (start, 'E123 {0}'.format(indent_level +
+                                                    rel_indent[open_row]))
+                hangs[depth] = hang
+            elif visual_indent is True:
+                # Visual indent is verified.
+                indent[depth] = start[1]
+            elif visual_indent in (text, unicode):
+                # Ignore token lined up with matching one from a previous line.
+                pass
+            else:
+                one_indented = (indent_level + rel_indent[open_row] +
+                                DEFAULT_INDENT_SIZE)
+                # Indent is broken.
+                if hang <= 0:
+                    error = ('E122', one_indented)
+                elif indent[depth]:
+                    error = ('E127', indent[depth])
+                elif hang > DEFAULT_INDENT_SIZE:
+                    error = ('E126', one_indented)
+                else:
+                    hangs[depth] = hang
+                    error = ('E121', one_indented)
+
+                yield (start, '{0} {1}'.format(*error))
+
+        # Look for visual indenting.
+        if (
+            parens[row] and
+            token_type not in (tokenize.NL, tokenize.COMMENT) and
+            not indent[depth]
+        ):
+            indent[depth] = start[1]
+            indent_chances[start[1]] = True
+        # Deal with implicit string concatenation.
+        elif (token_type in (tokenize.STRING, tokenize.COMMENT) or
+              text in ('u', 'ur', 'b', 'br')):
+            indent_chances[start[1]] = unicode
+        # Special case for the "if" statement because len("if (") is equal to
+        # 4.
+        elif not indent_chances and not row and not depth and text == 'if':
+            indent_chances[end[1] + 1] = True
+        elif text == ':' and line[end[1]:].isspace():
+            open_rows[depth].append(row)
+
+        # Keep track of bracket depth.
+        if token_type == tokenize.OP:
+            if text in '([{':
+                depth += 1
+                indent.append(0)
+                hangs.append(None)
+                if len(open_rows) == depth:
+                    open_rows.append([])
+                open_rows[depth].append(row)
+                parens[row] += 1
+            elif text in ')]}' and depth > 0:
+                # Parent indents should not be more than this one.
+                prev_indent = indent.pop() or last_indent[1]
+                hangs.pop()
+                for d in range(depth):
+                    if indent[d] > prev_indent:
+                        indent[d] = 0
+                for ind in list(indent_chances):
+                    if ind >= prev_indent:
+                        del indent_chances[ind]
+                del open_rows[depth + 1:]
+                depth -= 1
+                if depth:
+                    indent_chances[indent[depth]] = True
+                for idx in range(row, -1, -1):
+                    if parens[idx]:
+                        parens[idx] -= 1
+                        break
+            assert len(indent) == depth + 1
+            if (
+                start[1] not in indent_chances and
+                # This is for purposes of speeding up E121 (GitHub #90).
+                not last_line.rstrip().endswith(',')
+            ):
+                # Allow to line up tokens.
+                indent_chances[start[1]] = text
+
+        last_token_multiline = (start[0] != end[0])
+        if last_token_multiline:
+            rel_indent[end[0] - first_row] = rel_indent[row]
+
+        last_line = line
+
+    if (
+        indent_next and
+        not last_line_begins_with_multiline and
+        pep8.expand_indent(line) == indent_level + DEFAULT_INDENT_SIZE
+    ):
+        pos = (start[0], indent[0] + 4)
+        yield (pos, 'E125 {0}'.format(indent_level +
+                                      2 * DEFAULT_INDENT_SIZE))
+del pep8._checks['logical_line'][pep8.continued_indentation]
+pep8.register_check(continued_indentation)
+
+
+class FixPEP8(object):
+
+    """Fix invalid code.
+
+    Fixer methods are prefixed "fix_". The _fix_source() method looks for these
+    automatically.
+
+    The fixer method can take either one or two arguments (in addition to
+    self). The first argument is "result", which is the error information from
+    pep8. The second argument, "logical", is required only for logical-line
+    fixes.
+
+    The fixer method can return the list of modified lines or None. An empty
+    list would mean that no changes were made. None would mean that only the
+    line reported in the pep8 error was modified. Note that the modified line
+    numbers that are returned are indexed at 1. This typically would correspond
+    with the line number reported in the pep8 error information.
+
+    [fixed method list]
+        - e121,e122,e123,e124,e125,e126,e127,e128,e129
+        - e201,e202,e203
+        - e211
+        - e221,e222,e223,e224,e225
+        - e231
+        - e251
+        - e261,e262
+        - e271,e272,e273,e274
+        - e301,e302,e303
+        - e401
+        - e502
+        - e701,e702
+        - e711
+        - w291
+
+    """
+
+    def __init__(self, filename,
+                 options,
+                 contents=None,
+                 long_line_ignore_cache=None):
+        self.filename = filename
+        if contents is None:
+            self.source = readlines_from_file(filename)
+        else:
+            sio = io.StringIO(contents)
+            self.source = sio.readlines()
+        self.options = options
+        self.indent_word = _get_indentword(''.join(self.source))
+
+        self.long_line_ignore_cache = (
+            set() if long_line_ignore_cache is None
+            else long_line_ignore_cache)
+
+        # Many fixers are the same even though pep8 categorizes them
+        # differently.
+        self.fix_e115 = self.fix_e112
+        self.fix_e116 = self.fix_e113
+        self.fix_e121 = self._fix_reindent
+        self.fix_e122 = self._fix_reindent
+        self.fix_e123 = self._fix_reindent
+        self.fix_e124 = self._fix_reindent
+        self.fix_e126 = self._fix_reindent
+        self.fix_e127 = self._fix_reindent
+        self.fix_e128 = self._fix_reindent
+        self.fix_e129 = self._fix_reindent
+        self.fix_e202 = self.fix_e201
+        self.fix_e203 = self.fix_e201
+        self.fix_e211 = self.fix_e201
+        self.fix_e221 = self.fix_e271
+        self.fix_e222 = self.fix_e271
+        self.fix_e223 = self.fix_e271
+        self.fix_e226 = self.fix_e225
+        self.fix_e227 = self.fix_e225
+        self.fix_e228 = self.fix_e225
+        self.fix_e241 = self.fix_e271
+        self.fix_e242 = self.fix_e224
+        self.fix_e261 = self.fix_e262
+        self.fix_e272 = self.fix_e271
+        self.fix_e273 = self.fix_e271
+        self.fix_e274 = self.fix_e271
+        self.fix_e309 = self.fix_e301
+        self.fix_e501 = (
+            self.fix_long_line_logically if
+            options and (options.aggressive >= 2 or options.experimental) else
+            self.fix_long_line_physically)
+        self.fix_e703 = self.fix_e702
+        self.fix_w293 = self.fix_w291
+
+    def _fix_source(self, results):
+        try:
+            (logical_start, logical_end) = _find_logical(self.source)
+            logical_support = True
+        except (SyntaxError, tokenize.TokenError):  # pragma: no cover
+            logical_support = False
+
+        completed_lines = set()
+        for result in sorted(results, key=_priority_key):
+            if result['line'] in completed_lines:
+                continue
+
+            fixed_methodname = 'fix_' + result['id'].lower()
+            if hasattr(self, fixed_methodname):
+                fix = getattr(self, fixed_methodname)
+
+                line_index = result['line'] - 1
+                original_line = self.source[line_index]
+
+                is_logical_fix = len(inspect.getargspec(fix).args) > 2
+                if is_logical_fix:
+                    logical = None
+                    if logical_support:
+                        logical = _get_logical(self.source,
+                                               result,
+                                               logical_start,
+                                               logical_end)
+                        if logical and set(range(
+                            logical[0][0] + 1,
+                            logical[1][0] + 1)).intersection(
+                                completed_lines):
+                            continue
+
+                    modified_lines = fix(result, logical)
+                else:
+                    modified_lines = fix(result)
+
+                if modified_lines is None:
+                    # Force logical fixes to report what they modified.
+                    assert not is_logical_fix
+
+                    if self.source[line_index] == original_line:
+                        modified_lines = []
+
+                if modified_lines:
+                    completed_lines.update(modified_lines)
+                elif modified_lines == []:  # Empty list means no fix
+                    if self.options.verbose >= 2:
+                        print(
+                            '--->  Not fixing {f} on line {l}'.format(
+                                f=result['id'], l=result['line']),
+                            file=sys.stderr)
+                else:  # We assume one-line fix when None.
+                    completed_lines.add(result['line'])
+            else:
+                if self.options.verbose >= 3:
+                    print(
+                        "--->  '{0}' is not defined.".format(fixed_methodname),
+                        file=sys.stderr)
+
+                    info = result['info'].strip()
+                    print('--->  {0}:{1}:{2}:{3}'.format(self.filename,
+                                                         result['line'],
+                                                         result['column'],
+                                                         info),
+                          file=sys.stderr)
+
+    def fix(self):
+        """Return a version of the source code with PEP 8 violations fixed."""
+        pep8_options = {
+            'ignore': self.options.ignore,
+            'select': self.options.select,
+            'max_line_length': self.options.max_line_length,
+        }
+        results = _execute_pep8(pep8_options, self.source)
+
+        if self.options.verbose:
+            progress = {}
+            for r in results:
+                if r['id'] not in progress:
+                    progress[r['id']] = set()
+                progress[r['id']].add(r['line'])
+            print('--->  {n} issue(s) to fix {progress}'.format(
+                n=len(results), progress=progress), file=sys.stderr)
+
+        if self.options.line_range:
+            start, end = self.options.line_range
+            results = [r for r in results
+                       if start <= r['line'] <= end]
+
+        self._fix_source(filter_results(source=''.join(self.source),
+                                        results=results,
+                                        aggressive=self.options.aggressive))
+
+        if self.options.line_range:
+            # If number of lines has changed then change line_range.
+            count = sum(sline.count('\n')
+                        for sline in self.source[start - 1:end])
+            self.options.line_range[1] = start + count - 1
+
+        return ''.join(self.source)
+
+    def _fix_reindent(self, result):
+        """Fix a badly indented line.
+
+        This is done by adding or removing from its initial indent only.
+
+        """
+        num_indent_spaces = int(result['info'].split()[1])
+        line_index = result['line'] - 1
+        target = self.source[line_index]
+
+        self.source[line_index] = ' ' * num_indent_spaces + target.lstrip()
+
+    def fix_e112(self, result):
+        """Fix under-indented comments."""
+        line_index = result['line'] - 1
+        target = self.source[line_index]
+
+        if not target.lstrip().startswith('#'):
+            # Don't screw with invalid syntax.
+            return []
+
+        self.source[line_index] = self.indent_word + target
+
+    def fix_e113(self, result):
+        """Fix over-indented comments."""
+        line_index = result['line'] - 1
+        target = self.source[line_index]
+
+        indent = _get_indentation(target)
+        stripped = target.lstrip()
+
+        if not stripped.startswith('#'):
+            # Don't screw with invalid syntax.
+            return []
+
+        self.source[line_index] = indent[1:] + stripped
+
+    def fix_e125(self, result):
+        """Fix indentation undistinguish from the next logical line."""
+        num_indent_spaces = int(result['info'].split()[1])
+        line_index = result['line'] - 1
+        target = self.source[line_index]
+
+        spaces_to_add = num_indent_spaces - len(_get_indentation(target))
+        indent = len(_get_indentation(target))
+        modified_lines = []
+
+        while len(_get_indentation(self.source[line_index])) >= indent:
+            self.source[line_index] = (' ' * spaces_to_add +
+                                       self.source[line_index])
+            modified_lines.append(1 + line_index)  # Line indexed at 1.
+            line_index -= 1
+
+        return modified_lines
+
+    def fix_e201(self, result):
+        """Remove extraneous whitespace."""
+        line_index = result['line'] - 1
+        target = self.source[line_index]
+        offset = result['column'] - 1
+
+        if is_probably_part_of_multiline(target):
+            return []
+
+        fixed = fix_whitespace(target,
+                               offset=offset,
+                               replacement='')
+
+        self.source[line_index] = fixed
+
+    def fix_e224(self, result):
+        """Remove extraneous whitespace around operator."""
+        target = self.source[result['line'] - 1]
+        offset = result['column'] - 1
+        fixed = target[:offset] + target[offset:].replace('\t', ' ')
+        self.source[result['line'] - 1] = fixed
+
+    def fix_e225(self, result):
+        """Fix missing whitespace around operator."""
+        target = self.source[result['line'] - 1]
+        offset = result['column'] - 1
+        fixed = target[:offset] + ' ' + target[offset:]
+
+        # Only proceed if non-whitespace characters match.
+        # And make sure we don't break the indentation.
+        if (
+            fixed.replace(' ', '') == target.replace(' ', '') and
+            _get_indentation(fixed) == _get_indentation(target)
+        ):
+            self.source[result['line'] - 1] = fixed
+        else:
+            return []
+
+    def fix_e231(self, result):
+        """Add missing whitespace."""
+        line_index = result['line'] - 1
+        target = self.source[line_index]
+        offset = result['column']
+        fixed = target[:offset] + ' ' + target[offset:]
+        self.source[line_index] = fixed
+
+    def fix_e251(self, result):
+        """Remove whitespace around parameter '=' sign."""
+        line_index = result['line'] - 1
+        target = self.source[line_index]
+
+        # This is necessary since pep8 sometimes reports columns that goes
+        # past the end of the physical line. This happens in cases like,
+        # foo(bar\n=None)
+        c = min(result['column'] - 1,
+                len(target) - 1)
+
+        if target[c].strip():
+            fixed = target
+        else:
+            fixed = target[:c].rstrip() + target[c:].lstrip()
+
+        # There could be an escaped newline
+        #
+        #     def foo(a=\
+        #             1)
+        if fixed.endswith(('=\\\n', '=\\\r\n', '=\\\r')):
+            self.source[line_index] = fixed.rstrip('\n\r \t\\')
+            self.source[line_index + 1] = self.source[line_index + 1].lstrip()
+            return [line_index + 1, line_index + 2]  # Line indexed at 1
+
+        self.source[result['line'] - 1] = fixed
+
+    def fix_e262(self, result):
+        """Fix spacing after comment hash."""
+        target = self.source[result['line'] - 1]
+        offset = result['column']
+
+        code = target[:offset].rstrip(' \t#')
+        comment = target[offset:].lstrip(' \t#')
+
+        fixed = code + ('  # ' + comment if comment.strip() else '\n')
+
+        self.source[result['line'] - 1] = fixed
+
+    def fix_e271(self, result):
+        """Fix extraneous whitespace around keywords."""
+        line_index = result['line'] - 1
+        target = self.source[line_index]
+        offset = result['column'] - 1
+
+        if is_probably_part_of_multiline(target):
+            return []
+
+        fixed = fix_whitespace(target,
+                               offset=offset,
+                               replacement=' ')
+
+        if fixed == target:
+            return []
+        else:
+            self.source[line_index] = fixed
+
+    def fix_e301(self, result):
+        """Add missing blank line."""
+        cr = '\n'
+        self.source[result['line'] - 1] = cr + self.source[result['line'] - 1]
+
+    def fix_e302(self, result):
+        """Add missing 2 blank lines."""
+        add_linenum = 2 - int(result['info'].split()[-1])
+        cr = '\n' * add_linenum
+        self.source[result['line'] - 1] = cr + self.source[result['line'] - 1]
+
+    def fix_e303(self, result):
+        """Remove extra blank lines."""
+        delete_linenum = int(result['info'].split('(')[1].split(')')[0]) - 2
+        delete_linenum = max(1, delete_linenum)
+
+        # We need to count because pep8 reports an offset line number if there
+        # are comments.
+        cnt = 0
+        line = result['line'] - 2
+        modified_lines = []
+        while cnt < delete_linenum and line >= 0:
+            if not self.source[line].strip():
+                self.source[line] = ''
+                modified_lines.append(1 + line)  # Line indexed at 1
+                cnt += 1
+            line -= 1
+
+        return modified_lines
+
+    def fix_e304(self, result):
+        """Remove blank line following function decorator."""
+        line = result['line'] - 2
+        if not self.source[line].strip():
+            self.source[line] = ''
+
+    def fix_e401(self, result):
+        """Put imports on separate lines."""
+        line_index = result['line'] - 1
+        target = self.source[line_index]
+        offset = result['column'] - 1
+
+        if not target.lstrip().startswith('import'):
+            return []
+
+        indentation = re.split(pattern=r'\bimport\b',
+                               string=target, maxsplit=1)[0]
+        fixed = (target[:offset].rstrip('\t ,') + '\n' +
+                 indentation + 'import ' + target[offset:].lstrip('\t ,'))
+        self.source[line_index] = fixed
+
+    def fix_long_line_logically(self, result, logical):
+        """Try to make lines fit within --max-line-length characters."""
+        if (
+            not logical or
+            len(logical[2]) == 1 or
+            self.source[result['line'] - 1].lstrip().startswith('#')
+        ):
+            return self.fix_long_line_physically(result)
+
+        start_line_index = logical[0][0]
+        end_line_index = logical[1][0]
+        logical_lines = logical[2]
+
+        previous_line = get_item(self.source, start_line_index - 1, default='')
+        next_line = get_item(self.source, end_line_index + 1, default='')
+
+        single_line = join_logical_line(''.join(logical_lines))
+
+        try:
+            fixed = self.fix_long_line(
+                target=single_line,
+                previous_line=previous_line,
+                next_line=next_line,
+                original=''.join(logical_lines))
+        except (SyntaxError, tokenize.TokenError):
+            return self.fix_long_line_physically(result)
+
+        if fixed:
+            for line_index in range(start_line_index, end_line_index + 1):
+                self.source[line_index] = ''
+            self.source[start_line_index] = fixed
+            return range(start_line_index + 1, end_line_index + 1)
+        else:
+            return []
+
+    def fix_long_line_physically(self, result):
+        """Try to make lines fit within --max-line-length characters."""
+        line_index = result['line'] - 1
+        target = self.source[line_index]
+
+        previous_line = get_item(self.source, line_index - 1, default='')
+        next_line = get_item(self.source, line_index + 1, default='')
+
+        try:
+            fixed = self.fix_long_line(
+                target=target,
+                previous_line=previous_line,
+                next_line=next_line,
+                original=target)
+        except (SyntaxError, tokenize.TokenError):
+            return []
+
+        if fixed:
+            self.source[line_index] = fixed
+            return [line_index + 1]
+        else:
+            return []
+
+    def fix_long_line(self, target, previous_line,
+                      next_line, original):
+        cache_entry = (target, previous_line, next_line)
+        if cache_entry in self.long_line_ignore_cache:
+            return []
+
+        if target.lstrip().startswith('#'):
+            # Wrap commented lines.
+            return shorten_comment(
+                line=target,
+                max_line_length=self.options.max_line_length,
+                last_comment=not next_line.lstrip().startswith('#'))
+
+        fixed = get_fixed_long_line(
+            target=target,
+            previous_line=previous_line,
+            original=original,
+            indent_word=self.indent_word,
+            max_line_length=self.options.max_line_length,
+            aggressive=self.options.aggressive,
+            experimental=self.options.experimental,
+            verbose=self.options.verbose)
+        if fixed and not code_almost_equal(original, fixed):
+            return fixed
+        else:
+            self.long_line_ignore_cache.add(cache_entry)
+            return None
+
+    def fix_e502(self, result):
+        """Remove extraneous escape of newline."""
+        (line_index, _, target) = get_index_offset_contents(result,
+                                                            self.source)
+        self.source[line_index] = target.rstrip('\n\r \t\\') + '\n'
+
+    def fix_e701(self, result):
+        """Put colon-separated compound statement on separate lines."""
+        line_index = result['line'] - 1
+        target = self.source[line_index]
+        c = result['column']
+
+        fixed_source = (target[:c] + '\n' +
+                        _get_indentation(target) + self.indent_word +
+                        target[c:].lstrip('\n\r \t\\'))
+        self.source[result['line'] - 1] = fixed_source
+        return [result['line'], result['line'] + 1]
+
+    def fix_e702(self, result, logical):
+        """Put semicolon-separated compound statement on separate lines."""
+        if not logical:
+            return []  # pragma: no cover
+        logical_lines = logical[2]
+
+        line_index = result['line'] - 1
+        target = self.source[line_index]
+
+        if target.rstrip().endswith('\\'):
+            # Normalize '1; \\\n2' into '1; 2'.
+            self.source[line_index] = target.rstrip('\n \r\t\\')
+            self.source[line_index + 1] = self.source[line_index + 1].lstrip()
+            return [line_index + 1, line_index + 2]
+
+        if target.rstrip().endswith(';'):
+            self.source[line_index] = target.rstrip('\n \r\t;') + '\n'
+            return [line_index + 1]
+
+        offset = result['column'] - 1
+        first = target[:offset].rstrip(';').rstrip()
+        second = (_get_indentation(logical_lines[0]) +
+                  target[offset:].lstrip(';').lstrip())
+
+        # find inline commnet
+        inline_comment = None
+        if '# ' == target[offset:].lstrip(';').lstrip()[:2]:
+            inline_comment = target[offset:].lstrip(';')
+
+        if inline_comment:
+            self.source[line_index] = first + inline_comment
+        else:
+            self.source[line_index] = first + '\n' + second
+        return [line_index + 1]
+
+    def fix_e711(self, result):
+        """Fix comparison with None."""
+        (line_index, offset, target) = get_index_offset_contents(result,
+                                                                 self.source)
+
+        right_offset = offset + 2
+        if right_offset >= len(target):
+            return []
+
+        left = target[:offset].rstrip()
+        center = target[offset:right_offset]
+        right = target[right_offset:].lstrip()
+
+        if not right.startswith('None'):
+            return []
+
+        if center.strip() == '==':
+            new_center = 'is'
+        elif center.strip() == '!=':
+            new_center = 'is not'
+        else:
+            return []
+
+        self.source[line_index] = ' '.join([left, new_center, right])
+
+    def fix_e712(self, result):
+        """Fix (trivial case of) comparison with boolean."""
+        (line_index, offset, target) = get_index_offset_contents(result,
+                                                                 self.source)
+
+        # Handle very easy "not" special cases.
+        if re.match(r'^\s*if [\w.]+ == False:$', target):
+            self.source[line_index] = re.sub(r'if ([\w.]+) == False:',
+                                             r'if not \1:', target, count=1)
+        elif re.match(r'^\s*if [\w.]+ != True:$', target):
+            self.source[line_index] = re.sub(r'if ([\w.]+) != True:',
+                                             r'if not \1:', target, count=1)
+        else:
+            right_offset = offset + 2
+            if right_offset >= len(target):
+                return []
+
+            left = target[:offset].rstrip()
+            center = target[offset:right_offset]
+            right = target[right_offset:].lstrip()
+
+            # Handle simple cases only.
+            new_right = None
+            if center.strip() == '==':
+                if re.match(r'\bTrue\b', right):
+                    new_right = re.sub(r'\bTrue\b *', '', right, count=1)
+            elif center.strip() == '!=':
+                if re.match(r'\bFalse\b', right):
+                    new_right = re.sub(r'\bFalse\b *', '', right, count=1)
+
+            if new_right is None:
+                return []
+
+            if new_right[0].isalnum():
+                new_right = ' ' + new_right
+
+            self.source[line_index] = left + new_right
+
+    def fix_e713(self, result):
+        """Fix (trivial case of) non-membership check."""
+        (line_index, _, target) = get_index_offset_contents(result,
+                                                            self.source)
+
+        # Handle very easy case only.
+        if re.match(r'^\s*if not [\w.]+ in [\w.]+:$', target):
+            self.source[line_index] = re.sub(r'if not ([\w.]+) in ([\w.]+):',
+                                             r'if \1 not in \2:',
+                                             target,
+                                             count=1)
+
+    def fix_w291(self, result):
+        """Remove trailing whitespace."""
+        fixed_line = self.source[result['line'] - 1].rstrip()
+        self.source[result['line'] - 1] = fixed_line + '\n'
+
+    def fix_w391(self, _):
+        """Remove trailing blank lines."""
+        blank_count = 0
+        for line in reversed(self.source):
+            line = line.rstrip()
+            if line:
+                break
+            else:
+                blank_count += 1
+
+        original_length = len(self.source)
+        self.source = self.source[:original_length - blank_count]
+        return range(1, 1 + original_length)
+
+
+def get_index_offset_contents(result, source):
+    """Return (line_index, column_offset, line_contents)."""
+    line_index = result['line'] - 1
+    return (line_index,
+            result['column'] - 1,
+            source[line_index])
+
+
+def get_fixed_long_line(target, previous_line, original,
+                        indent_word='    ', max_line_length=79,
+                        aggressive=False, experimental=False, verbose=False):
+    """Break up long line and return result.
+
+    Do this by generating multiple reformatted candidates and then
+    ranking the candidates to heuristically select the best option.
+
+    """
+    indent = _get_indentation(target)
+    source = target[len(indent):]
+    assert source.lstrip() == source
+
+    # Check for partial multiline.
+    tokens = list(generate_tokens(source))
+
+    candidates = shorten_line(
+        tokens, source, indent,
+        indent_word,
+        max_line_length,
+        aggressive=aggressive,
+        experimental=experimental,
+        previous_line=previous_line)
+
+    # Also sort alphabetically as a tie breaker (for determinism).
+    candidates = sorted(
+        sorted(set(candidates).union([target, original])),
+        key=lambda x: line_shortening_rank(
+            x,
+            indent_word,
+            max_line_length,
+            experimental=experimental))
+
+    if verbose >= 4:
+        print(('-' * 79 + '\n').join([''] + candidates + ['']),
+              file=wrap_output(sys.stderr, 'utf-8'))
+
+    if candidates:
+        best_candidate = candidates[0]
+        # Don't allow things to get longer.
+        if longest_line_length(best_candidate) > longest_line_length(original):
+            return None
+        else:
+            return best_candidate
+
+
+def longest_line_length(code):
+    """Return length of longest line."""
+    return max(len(line) for line in code.splitlines())
+
+
+def join_logical_line(logical_line):
+    """Return single line based on logical line input."""
+    indentation = _get_indentation(logical_line)
+
+    return indentation + untokenize_without_newlines(
+        generate_tokens(logical_line.lstrip())) + '\n'
+
+
+def untokenize_without_newlines(tokens):
+    """Return source code based on tokens."""
+    text = ''
+    last_row = 0
+    last_column = -1
+
+    for t in tokens:
+        token_string = t[1]
+        (start_row, start_column) = t[2]
+        (end_row, end_column) = t[3]
+
+        if start_row > last_row:
+            last_column = 0
+        if (
+            (start_column > last_column or token_string == '\n') and
+            not text.endswith(' ')
+        ):
+            text += ' '
+
+        if token_string != '\n':
+            text += token_string
+
+        last_row = end_row
+        last_column = end_column
+
+    return text.rstrip()
+
+
+def _find_logical(source_lines):
+    # Make a variable which is the index of all the starts of lines.
+    logical_start = []
+    logical_end = []
+    last_newline = True
+    parens = 0
+    for t in generate_tokens(''.join(source_lines)):
+        if t[0] in [tokenize.COMMENT, tokenize.DEDENT,
+                    tokenize.INDENT, tokenize.NL,
+                    tokenize.ENDMARKER]:
+            continue
+        if not parens and t[0] in [tokenize.NEWLINE, tokenize.SEMI]:
+            last_newline = True
+            logical_end.append((t[3][0] - 1, t[2][1]))
+            continue
+        if last_newline and not parens:
+            logical_start.append((t[2][0] - 1, t[2][1]))
+            last_newline = False
+        if t[0] == tokenize.OP:
+            if t[1] in '([{':
+                parens += 1
+            elif t[1] in '}])':
+                parens -= 1
+    return (logical_start, logical_end)
+
+
+def _get_logical(source_lines, result, logical_start, logical_end):
+    """Return the logical line corresponding to the result.
+
+    Assumes input is already E702-clean.
+
+    """
+    row = result['line'] - 1
+    col = result['column'] - 1
+    ls = None
+    le = None
+    for i in range(0, len(logical_start), 1):
+        assert logical_end
+        x = logical_end[i]
+        if x[0] > row or (x[0] == row and x[1] > col):
+            le = x
+            ls = logical_start[i]
+            break
+    if ls is None:
+        return None
+    original = source_lines[ls[0]:le[0] + 1]
+    return ls, le, original
+
+
+def get_item(items, index, default=None):
+    if 0 <= index < len(items):
+        return items[index]
+    else:
+        return default
+
+
+def reindent(source, indent_size):
+    """Reindent all lines."""
+    reindenter = Reindenter(source)
+    return reindenter.run(indent_size)
+
+
+def code_almost_equal(a, b):
+    """Return True if code is similar.
+
+    Ignore whitespace when comparing specific line.
+
+    """
+    split_a = split_and_strip_non_empty_lines(a)
+    split_b = split_and_strip_non_empty_lines(b)
+
+    if len(split_a) != len(split_b):
+        return False
+
+    for index in range(len(split_a)):
+        if ''.join(split_a[index].split()) != ''.join(split_b[index].split()):
+            return False
+
+    return True
+
+
+def split_and_strip_non_empty_lines(text):
+    """Return lines split by newline.
+
+    Ignore empty lines.
+
+    """
+    return [line.strip() for line in text.splitlines() if line.strip()]
+
+
+def fix_e265(source, aggressive=False):  # pylint: disable=unused-argument
+    """Format block comments."""
+    if '#' not in source:
+        # Optimization.
+        return source
+
+    ignored_line_numbers = multiline_string_lines(
+        source,
+        include_docstrings=True) | set(commented_out_code_lines(source))
+
+    fixed_lines = []
+    sio = io.StringIO(source)
+    for (line_number, line) in enumerate(sio.readlines(), start=1):
+        if (
+            line.lstrip().startswith('#') and
+            line_number not in ignored_line_numbers
+        ):
+            indentation = _get_indentation(line)
+            line = line.lstrip()
+
+            # Normalize beginning if not a shebang.
+            if len(line) > 1:
+                pos = next((index for index, c in enumerate(line)
+                            if c != '#'))
+                if (
+                    # Leave multiple spaces like '#    ' alone.
+                    (line[:pos].count('#') > 1 or line[1].isalnum()) and
+                    # Leave stylistic outlined blocks alone.
+                    not line.rstrip().endswith('#')
+                ):
+                    line = '# ' + line.lstrip('# \t')
+
+            fixed_lines.append(indentation + line)
+        else:
+            fixed_lines.append(line)
+
+    return ''.join(fixed_lines)
+
+
+def refactor(source, fixer_names, ignore=None, filename=''):
+    """Return refactored code using lib2to3.
+
+    Skip if ignore string is produced in the refactored code.
+
+    """
+    from lib2to3 import pgen2
+    try:
+        new_text = refactor_with_2to3(source,
+                                      fixer_names=fixer_names,
+                                      filename=filename)
+    except (pgen2.parse.ParseError,
+            SyntaxError,
+            UnicodeDecodeError,
+            UnicodeEncodeError):
+        return source
+
+    if ignore:
+        if ignore in new_text and ignore not in source:
+            return source
+
+    return new_text
+
+
+def code_to_2to3(select, ignore):
+    fixes = set()
+    for code, fix in CODE_TO_2TO3.items():
+        if code_match(code, select=select, ignore=ignore):
+            fixes |= set(fix)
+    return fixes
+
+
+def fix_2to3(source,
+             aggressive=True, select=None, ignore=None, filename=''):
+    """Fix various deprecated code (via lib2to3)."""
+    if not aggressive:
+        return source
+
+    select = select or []
+    ignore = ignore or []
+
+    return refactor(source,
+                    code_to_2to3(select=select,
+                                 ignore=ignore),
+                    filename=filename)
+
+
+def fix_w602(source, aggressive=True):
+    """Fix deprecated form of raising exception."""
+    if not aggressive:
+        return source
+
+    return refactor(source, ['raise'],
+                    ignore='with_traceback')
+
+
+def find_newline(source):
+    """Return type of newline used in source.
+
+    Input is a list of lines.
+
+    """
+    assert not isinstance(source, unicode)
+
+    counter = collections.defaultdict(int)
+    for line in source:
+        if line.endswith(CRLF):
+            counter[CRLF] += 1
+        elif line.endswith(CR):
+            counter[CR] += 1
+        elif line.endswith(LF):
+            counter[LF] += 1
+
+    return (sorted(counter, key=counter.get, reverse=True) or [LF])[0]
+
+
+def _get_indentword(source):
+    """Return indentation type."""
+    indent_word = '    '  # Default in case source has no indentation
+    try:
+        for t in generate_tokens(source):
+            if t[0] == token.INDENT:
+                indent_word = t[1]
+                break
+    except (SyntaxError, tokenize.TokenError):
+        pass
+    return indent_word
+
+
+def _get_indentation(line):
+    """Return leading whitespace."""
+    if line.strip():
+        non_whitespace_index = len(line) - len(line.lstrip())
+        return line[:non_whitespace_index]
+    else:
+        return ''
+
+
+def get_diff_text(old, new, filename):
+    """Return text of unified diff between old and new."""
+    newline = '\n'
+    diff = difflib.unified_diff(
+        old, new,
+        'original/' + filename,
+        'fixed/' + filename,
+        lineterm=newline)
+
+    text = ''
+    for line in diff:
+        text += line
+
+        # Work around missing newline (http://bugs.python.org/issue2142).
+        if text and not line.endswith(newline):
+            text += newline + r'\ No newline at end of file' + newline
+
+    return text
+
+
+def _priority_key(pep8_result):
+    """Key for sorting PEP8 results.
+
+    Global fixes should be done first. This is important for things like
+    indentation.
+
+    """
+    priority = [
+        # Fix multiline colon-based before semicolon based.
+        'e701',
+        # Break multiline statements early.
+        'e702',
+        # Things that make lines longer.
+        'e225', 'e231',
+        # Remove extraneous whitespace before breaking lines.
+        'e201',
+        # Shorten whitespace in comment before resorting to wrapping.
+        'e262'
+    ]
+    middle_index = 10000
+    lowest_priority = [
+        # We need to shorten lines last since the logical fixer can get in a
+        # loop, which causes us to exit early.
+        'e501'
+    ]
+    key = pep8_result['id'].lower()
+    try:
+        return priority.index(key)
+    except ValueError:
+        try:
+            return middle_index + lowest_priority.index(key) + 1
+        except ValueError:
+            return middle_index
+
+
+def shorten_line(tokens, source, indentation, indent_word, max_line_length,
+                 aggressive=False, experimental=False, previous_line=''):
+    """Separate line at OPERATOR.
+
+    Multiple candidates will be yielded.
+
+    """
+    for candidate in _shorten_line(tokens=tokens,
+                                   source=source,
+                                   indentation=indentation,
+                                   indent_word=indent_word,
+                                   aggressive=aggressive,
+                                   previous_line=previous_line):
+        yield candidate
+
+    if aggressive:
+        for key_token_strings in SHORTEN_OPERATOR_GROUPS:
+            shortened = _shorten_line_at_tokens(
+                tokens=tokens,
+                source=source,
+                indentation=indentation,
+                indent_word=indent_word,
+                key_token_strings=key_token_strings,
+                aggressive=aggressive)
+
+            if shortened is not None and shortened != source:
+                yield shortened
+
+    if experimental:
+        for shortened in _shorten_line_at_tokens_new(
+                tokens=tokens,
+                source=source,
+                indentation=indentation,
+                max_line_length=max_line_length):
+
+            yield shortened
+
+
+def _shorten_line(tokens, source, indentation, indent_word,
+                  aggressive=False, previous_line=''):
+    """Separate line at OPERATOR.
+
+    The input is expected to be free of newlines except for inside multiline
+    strings and at the end.
+
+    Multiple candidates will be yielded.
+
+    """
+    for (token_type,
+         token_string,
+         start_offset,
+         end_offset) in token_offsets(tokens):
+
+        if (
+            token_type == tokenize.COMMENT and
+            not is_probably_part_of_multiline(previous_line) and
+            not is_probably_part_of_multiline(source) and
+            not source[start_offset + 1:].strip().lower().startswith(
+                ('noqa', 'pragma:', 'pylint:'))
+        ):
+            # Move inline comments to previous line.
+            first = source[:start_offset]
+            second = source[start_offset:]
+            yield (indentation + second.strip() + '\n' +
+                   indentation + first.strip() + '\n')
+        elif token_type == token.OP and token_string != '=':
+            # Don't break on '=' after keyword as this violates PEP 8.
+
+            assert token_type != token.INDENT
+
+            first = source[:end_offset]
+
+            second_indent = indentation
+            if first.rstrip().endswith('('):
+                second_indent += indent_word
+            elif '(' in first:
+                second_indent += ' ' * (1 + first.find('('))
+            else:
+                second_indent += indent_word
+
+            second = (second_indent + source[end_offset:].lstrip())
+            if (
+                not second.strip() or
+                second.lstrip().startswith('#')
+            ):
+                continue
+
+            # Do not begin a line with a comma
+            if second.lstrip().startswith(','):
+                continue
+            # Do end a line with a dot
+            if first.rstrip().endswith('.'):
+                continue
+            if token_string in '+-*/':
+                fixed = first + ' \\' + '\n' + second
+            else:
+                fixed = first + '\n' + second
+
+            # Only fix if syntax is okay.
+            if check_syntax(normalize_multiline(fixed)
+                            if aggressive else fixed):
+                yield indentation + fixed
+
+
+# A convenient way to handle tokens.
+Token = collections.namedtuple('Token', ['token_type', 'token_string',
+                                         'spos', 'epos', 'line'])
+
+
+class ReformattedLines(object):
+
+    """The reflowed lines of atoms.
+
+    Each part of the line is represented as an "atom." They can be moved
+    around when need be to get the optimal formatting.
+
+    """
+
+    ###########################################################################
+    # Private Classes
+
+    class _Indent(object):
+
+        """Represent an indentation in the atom stream."""
+
+        def __init__(self, indent_amt):
+            self._indent_amt = indent_amt
+
+        def emit(self):
+            return ' ' * self._indent_amt
+
+        @property
+        def size(self):
+            return self._indent_amt
+
+    class _Space(object):
+
+        """Represent a space in the atom stream."""
+
+        def emit(self):
+            return ' '
+
+        @property
+        def size(self):
+            return 1
+
+    class _LineBreak(object):
+
+        """Represent a line break in the atom stream."""
+
+        def emit(self):
+            return '\n'
+
+        @property
+        def size(self):
+            return 0
+
+    def __init__(self, max_line_length):
+        self._max_line_length = max_line_length
+        self._lines = []
+        self._bracket_depth = 0
+        self._prev_item = None
+        self._prev_prev_item = None
+
+    def __repr__(self):
+        return self.emit()
+
+    ###########################################################################
+    # Public Methods
+
+    def add(self, obj, indent_amt, break_after_open_bracket):
+        if isinstance(obj, Atom):
+            self._add_item(obj, indent_amt)
+            return
+
+        self._add_container(obj, indent_amt, break_after_open_bracket)
+
+    def add_comment(self, item):
+        num_spaces = 2
+        if len(self._lines) > 1:
+            if isinstance(self._lines[-1], self._Space):
+                num_spaces -= 1
+            if len(self._lines) > 2:
+                if isinstance(self._lines[-2], self._Space):
+                    num_spaces -= 1
+
+        while num_spaces > 0:
+            self._lines.append(self._Space())
+            num_spaces -= 1
+        self._lines.append(item)
+
+    def add_indent(self, indent_amt):
+        self._lines.append(self._Indent(indent_amt))
+
+    def add_line_break(self, indent):
+        self._lines.append(self._LineBreak())
+        self.add_indent(len(indent))
+
+    def add_line_break_at(self, index, indent_amt):
+        self._lines.insert(index, self._LineBreak())
+        self._lines.insert(index + 1, self._Indent(indent_amt))
+
+    def add_space_if_needed(self, curr_text, equal=False):
+        if (
+            not self._lines or isinstance(
+                self._lines[-1], (self._LineBreak, self._Indent, self._Space))
+        ):
+            return
+
+        prev_text = unicode(self._prev_item)
+        prev_prev_text = (
+            unicode(self._prev_prev_item) if self._prev_prev_item else '')
+
+        if (
+            # The previous item was a keyword or identifier and the current
+            # item isn't an operator that doesn't require a space.
+            ((self._prev_item.is_keyword or self._prev_item.is_string or
+              self._prev_item.is_name or self._prev_item.is_number) and
+             (curr_text[0] not in '([{.,:}])' or
+              (curr_text[0] == '=' and equal))) or
+
+            # Don't place spaces around a '.', unless it's in an 'import'
+            # statement.
+            ((prev_prev_text != 'from' and prev_text[-1] != '.' and
+              curr_text != 'import') and
+
+             # Don't place a space before a colon.
+             curr_text[0] != ':' and
+
+             # Don't split up ending brackets by spaces.
+             ((prev_text[-1] in '}])' and curr_text[0] not in '.,}])') or
+
+              # Put a space after a colon or comma.
+              prev_text[-1] in ':,' or
+
+              # Put space around '=' if asked to.
+              (equal and prev_text == '=') or
+
+              # Put spaces around non-unary arithmetic operators.
+              ((self._prev_prev_item and
+                (prev_text not in '+-' and
+                 (self._prev_prev_item.is_name or
+                  self._prev_prev_item.is_number or
+                  self._prev_prev_item.is_string)) and
+                prev_text in ('+', '-', '%', '*', '/', '//', '**', 'in')))))
+        ):
+            self._lines.append(self._Space())
+
+    def previous_item(self):
+        """Return the previous non-whitespace item."""
+        return self._prev_item
+
+    def fits_on_current_line(self, item_extent):
+        return self.current_size() + item_extent <= self._max_line_length
+
+    def current_size(self):
+        """The size of the current line minus the indentation."""
+        size = 0
+        for item in reversed(self._lines):
+            size += item.size
+            if isinstance(item, self._LineBreak):
+                break
+
+        return size
+
+    def line_empty(self):
+        return (self._lines and
+                isinstance(self._lines[-1],
+                           (self._LineBreak, self._Indent)))
+
+    def emit(self):
+        string = ''
+        for item in self._lines:
+            if isinstance(item, self._LineBreak):
+                string = string.rstrip()
+            string += item.emit()
+
+        return string.rstrip() + '\n'
+
+    ###########################################################################
+    # Private Methods
+
+    def _add_item(self, item, indent_amt):
+        """Add an item to the line.
+
+        Reflow the line to get the best formatting after the item is
+        inserted. The bracket depth indicates if the item is being
+        inserted inside of a container or not.
+
+        """
+        if self._prev_item and self._prev_item.is_string and item.is_string:
+            # Place consecutive string literals on separate lines.
+            self._lines.append(self._LineBreak())
+            self._lines.append(self._Indent(indent_amt))
+
+        item_text = unicode(item)
+        if self._lines and self._bracket_depth:
+            # Adding the item into a container.
+            self._prevent_default_initializer_splitting(item, indent_amt)
+
+            if item_text in '.,)]}':
+                self._split_after_delimiter(item, indent_amt)
+
+        elif self._lines and not self.line_empty():
+            # Adding the item outside of a container.
+            if self.fits_on_current_line(len(item_text)):
+                self._enforce_space(item)
+
+            else:
+                # Line break for the new item.
+                self._lines.append(self._LineBreak())
+                self._lines.append(self._Indent(indent_amt))
+
+        self._lines.append(item)
+        self._prev_item, self._prev_prev_item = item, self._prev_item
+
+        if item_text in '([{':
+            self._bracket_depth += 1
+
+        elif item_text in '}])':
+            self._bracket_depth -= 1
+            assert self._bracket_depth >= 0
+
+    def _add_container(self, container, indent_amt, break_after_open_bracket):
+        actual_indent = indent_amt + 1
+
+        if (
+            unicode(self._prev_item) != '=' and
+            not self.line_empty() and
+            not self.fits_on_current_line(
+                container.size + self._bracket_depth + 2)
+        ):
+
+            if unicode(container)[0] == '(' and self._prev_item.is_name:
+                # Don't split before the opening bracket of a call.
+                break_after_open_bracket = True
+                actual_indent = indent_amt + 4
+            elif (
+                break_after_open_bracket or
+                unicode(self._prev_item) not in '([{'
+            ):
+                # If the container doesn't fit on the current line and the
+                # current line isn't empty, place the container on the next
+                # line.
+                self._lines.append(self._LineBreak())
+                self._lines.append(self._Indent(indent_amt))
+                break_after_open_bracket = False
+        else:
+            actual_indent = self.current_size() + 1
+            break_after_open_bracket = False
+
+        if isinstance(container, (ListComprehension, IfExpression)):
+            actual_indent = indent_amt
+
+        # Increase the continued indentation only if recursing on a
+        # container.
+        container.reflow(self, ' ' * actual_indent,
+                         break_after_open_bracket=break_after_open_bracket)
+
+    def _prevent_default_initializer_splitting(self, item, indent_amt):
+        """Prevent splitting between a default initializer.
+
+        When there is a default initializer, it's best to keep it all on
+        the same line. It's nicer and more readable, even if it goes
+        over the maximum allowable line length. This goes back along the
+        current line to determine if we have a default initializer, and,
+        if so, to remove extraneous whitespaces and add a line
+        break/indent before it if needed.
+
+        """
+        if unicode(item) == '=':
+            # This is the assignment in the initializer. Just remove spaces for
+            # now.
+            self._delete_whitespace()
+            return
+
+        if (not self._prev_item or not self._prev_prev_item or
+                unicode(self._prev_item) != '='):
+            return
+
+        self._delete_whitespace()
+        prev_prev_index = self._lines.index(self._prev_prev_item)
+
+        if (
+            isinstance(self._lines[prev_prev_index - 1], self._Indent) or
+            self.fits_on_current_line(item.size + 1)
+        ):
+            # The default initializer is already the only item on this line.
+            # Don't insert a newline here.
+            return
+
+        # Replace the space with a newline/indent combo.
+        if isinstance(self._lines[prev_prev_index - 1], self._Space):
+            del self._lines[prev_prev_index - 1]
+
+        self.add_line_break_at(self._lines.index(self._prev_prev_item),
+                               indent_amt)
+
+    def _split_after_delimiter(self, item, indent_amt):
+        """Split the line only after a delimiter."""
+        self._delete_whitespace()
+
+        if self.fits_on_current_line(item.size):
+            return
+
+        last_space = None
+        for item in reversed(self._lines):
+            if (
+                last_space and
+                (not isinstance(item, Atom) or not item.is_colon)
+            ):
+                break
+            else:
+                last_space = None
+            if isinstance(item, self._Space):
+                last_space = item
+            if isinstance(item, (self._LineBreak, self._Indent)):
+                return
+
+        if not last_space:
+            return
+
+        self.add_line_break_at(self._lines.index(last_space), indent_amt)
+
+    def _enforce_space(self, item):
+        """Enforce a space in certain situations.
+
+        There are cases where we will want a space where normally we
+        wouldn't put one. This just enforces the addition of a space.
+
+        """
+        if isinstance(self._lines[-1],
+                      (self._Space, self._LineBreak, self._Indent)):
+            return
+
+        if not self._prev_item:
+            return
+
+        item_text = unicode(item)
+        prev_text = unicode(self._prev_item)
+
+        # Prefer a space around a '.' in an import statement, and between the
+        # 'import' and '('.
+        if (
+            (item_text == '.' and prev_text == 'from') or
+            (item_text == 'import' and prev_text == '.') or
+            (item_text == '(' and prev_text == 'import')
+        ):
+            self._lines.append(self._Space())
+
+    def _delete_whitespace(self):
+        """Delete all whitespace from the end of the line."""
+        while isinstance(self._lines[-1], (self._Space, self._LineBreak,
+                                           self._Indent)):
+            del self._lines[-1]
+
+
+class Atom(object):
+
+    """The smallest unbreakable unit that can be reflowed."""
+
+    def __init__(self, atom):
+        self._atom = atom
+
+    def __repr__(self):
+        return self._atom.token_string
+
+    def __len__(self):
+        return self.size
+
+    def reflow(
+        self, reflowed_lines, continued_indent, extent,
+        break_after_open_bracket=False,
+        is_list_comp_or_if_expr=False,
+        next_is_dot=False
+    ):
+        if self._atom.token_type == tokenize.COMMENT:
+            reflowed_lines.add_comment(self)
+            return
+
+        total_size = extent if extent else self.size
+
+        if self._atom.token_string not in ',:([{}])':
+            # Some atoms will need an extra 1-sized space token after them.
+            total_size += 1
+
+        prev_item = reflowed_lines.previous_item()
+        if (
+            not is_list_comp_or_if_expr and
+            not reflowed_lines.fits_on_current_line(total_size) and
+            not (next_is_dot and
+                 reflowed_lines.fits_on_current_line(self.size + 1)) and
+            not reflowed_lines.line_empty() and
+            not self.is_colon and
+            not (prev_item and prev_item.is_name and
+                 unicode(self) == '(')
+        ):
+            # Start a new line if there is already something on the line and
+            # adding this atom would make it go over the max line length.
+            reflowed_lines.add_line_break(continued_indent)
+        else:
+            reflowed_lines.add_space_if_needed(unicode(self))
+
+        reflowed_lines.add(self, len(continued_indent),
+                           break_after_open_bracket)
+
+    def emit(self):
+        return self.__repr__()
+
+    @property
+    def is_keyword(self):
+        return keyword.iskeyword(self._atom.token_string)
+
+    @property
+    def is_string(self):
+        return self._atom.token_type == tokenize.STRING
+
+    @property
+    def is_name(self):
+        return self._atom.token_type == tokenize.NAME
+
+    @property
+    def is_number(self):
+        return self._atom.token_type == tokenize.NUMBER
+
+    @property
+    def is_comma(self):
+        return self._atom.token_string == ','
+
+    @property
+    def is_colon(self):
+        return self._atom.token_string == ':'
+
+    @property
+    def size(self):
+        return len(self._atom.token_string)
+
+
+class Container(object):
+
+    """Base class for all container types."""
+
+    def __init__(self, items):
+        self._items = items
+
+    def __repr__(self):
+        string = ''
+        last_was_keyword = False
+
+        for item in self._items:
+            if item.is_comma:
+                string += ', '
+            elif item.is_colon:
+                string += ': '
+            else:
+                item_string = unicode(item)
+                if (
+                    string and
+                    (last_was_keyword or
+                     (not string.endswith(tuple('([{,.:}]) ')) and
+                      not item_string.startswith(tuple('([{,.:}])'))))
+                ):
+                    string += ' '
+                string += item_string
+
+            last_was_keyword = item.is_keyword
+        return string
+
+    def __iter__(self):
+        for element in self._items:
+            yield element
+
+    def __getitem__(self, idx):
+        return self._items[idx]
+
+    def reflow(self, reflowed_lines, continued_indent,
+               break_after_open_bracket=False):
+        last_was_container = False
+        for (index, item) in enumerate(self._items):
+            next_item = get_item(self._items, index + 1)
+
+            if isinstance(item, Atom):
+                is_list_comp_or_if_expr = (
+                    isinstance(self, (ListComprehension, IfExpression)))
+                item.reflow(reflowed_lines, continued_indent,
+                            self._get_extent(index),
+                            is_list_comp_or_if_expr=is_list_comp_or_if_expr,
+                            next_is_dot=(next_item and
+                                         unicode(next_item) == '.'))
+                if last_was_container and item.is_comma:
+                    reflowed_lines.add_line_break(continued_indent)
+                last_was_container = False
+            else:  # isinstance(item, Container)
+                reflowed_lines.add(item, len(continued_indent),
+                                   break_after_open_bracket)
+                last_was_container = not isinstance(item, (ListComprehension,
+                                                           IfExpression))
+
+            if (
+                break_after_open_bracket and index == 0 and
+                # Prefer to keep empty containers together instead of
+                # separating them.
+                unicode(item) == self.open_bracket and
+                (not next_item or unicode(next_item) != self.close_bracket) and
+                (len(self._items) != 3 or not isinstance(next_item, Atom))
+            ):
+                reflowed_lines.add_line_break(continued_indent)
+                break_after_open_bracket = False
+            else:
+                next_next_item = get_item(self._items, index + 2)
+                if (
+                    unicode(item) not in ['.', '%', 'in'] and
+                    next_item and not isinstance(next_item, Container) and
+                    unicode(next_item) != ':' and
+                    next_next_item and (not isinstance(next_next_item, Atom) or
+                                        unicode(next_item) == 'not') and
+                    not reflowed_lines.line_empty() and
+                    not reflowed_lines.fits_on_current_line(
+                        self._get_extent(index + 1) + 2)
+                ):
+                    reflowed_lines.add_line_break(continued_indent)
+
+    def _get_extent(self, index):
+        """The extent of the full element.
+
+        E.g., the length of a function call or keyword.
+
+        """
+        extent = 0
+        prev_item = get_item(self._items, index - 1)
+        seen_dot = prev_item and unicode(prev_item) == '.'
+        while index < len(self._items):
+            item = get_item(self._items, index)
+            index += 1
+
+            if isinstance(item, (ListComprehension, IfExpression)):
+                break
+
+            if isinstance(item, Container):
+                if prev_item and prev_item.is_name:
+                    if seen_dot:
+                        extent += 1
+                    else:
+                        extent += item.size
+
+                    prev_item = item
+                    continue
+            elif (unicode(item) not in ['.', '=', ':', 'not'] and
+                  not item.is_name and not item.is_string):
+                break
+
+            if unicode(item) == '.':
+                seen_dot = True
+
+            extent += item.size
+            prev_item = item
+
+        return extent
+
+    @property
+    def is_string(self):
+        return False
+
+    @property
+    def size(self):
+        return len(self.__repr__())
+
+    @property
+    def is_keyword(self):
+        return False
+
+    @property
+    def is_name(self):
+        return False
+
+    @property
+    def is_comma(self):
+        return False
+
+    @property
+    def is_colon(self):
+        return False
+
+    @property
+    def open_bracket(self):
+        return None
+
+    @property
+    def close_bracket(self):
+        return None
+
+
+class Tuple(Container):
+
+    """A high-level representation of a tuple."""
+
+    @property
+    def open_bracket(self):
+        return '('
+
+    @property
+    def close_bracket(self):
+        return ')'
+
+
+class List(Container):
+
+    """A high-level representation of a list."""
+
+    @property
+    def open_bracket(self):
+        return '['
+
+    @property
+    def close_bracket(self):
+        return ']'
+
+
+class DictOrSet(Container):
+
+    """A high-level representation of a dictionary or set."""
+
+    @property
+    def open_bracket(self):
+        return '{'
+
+    @property
+    def close_bracket(self):
+        return '}'
+
+
+class ListComprehension(Container):
+
+    """A high-level representation of a list comprehension."""
+
+    @property
+    def size(self):
+        length = 0
+        for item in self._items:
+            if isinstance(item, IfExpression):
+                break
+            length += item.size
+        return length
+
+
+class IfExpression(Container):
+
+    """A high-level representation of an if-expression."""
+
+
+def _parse_container(tokens, index, for_or_if=None):
+    """Parse a high-level container, such as a list, tuple, etc."""
+
+    # Store the opening bracket.
+    items = [Atom(Token(*tokens[index]))]
+    index += 1
+
+    num_tokens = len(tokens)
+    while index < num_tokens:
+        tok = Token(*tokens[index])
+
+        if tok.token_string in ',)]}':
+            # First check if we're at the end of a list comprehension or
+            # if-expression. Don't add the ending token as part of the list
+            # comprehension or if-expression, because they aren't part of those
+            # constructs.
+            if for_or_if == 'for':
+                return (ListComprehension(items), index - 1)
+
+            elif for_or_if == 'if':
+                return (IfExpression(items), index - 1)
+
+            # We've reached the end of a container.
+            items.append(Atom(tok))
+
+            # If not, then we are at the end of a container.
+            if tok.token_string == ')':
+                # The end of a tuple.
+                return (Tuple(items), index)
+
+            elif tok.token_string == ']':
+                # The end of a list.
+                return (List(items), index)
+
+            elif tok.token_string == '}':
+                # The end of a dictionary or set.
+                return (DictOrSet(items), index)
+
+        elif tok.token_string in '([{':
+            # A sub-container is being defined.
+            (container, index) = _parse_container(tokens, index)
+            items.append(container)
+
+        elif tok.token_string == 'for':
+            (container, index) = _parse_container(tokens, index, 'for')
+            items.append(container)
+
+        elif tok.token_string == 'if':
+            (container, index) = _parse_container(tokens, index, 'if')
+            items.append(container)
+
+        else:
+            items.append(Atom(tok))
+
+        index += 1
+
+    return (None, None)
+
+
+def _parse_tokens(tokens):
+    """Parse the tokens.
+
+    This converts the tokens into a form where we can manipulate them
+    more easily.
+
+    """
+
+    index = 0
+    parsed_tokens = []
+
+    num_tokens = len(tokens)
+    while index < num_tokens:
+        tok = Token(*tokens[index])
+
+        assert tok.token_type != token.INDENT
+        if tok.token_type == tokenize.NEWLINE:
+            # There's only one newline and it's at the end.
+            break
+
+        if tok.token_string in '([{':
+            (container, index) = _parse_container(tokens, index)
+            if not container:
+                return None
+            parsed_tokens.append(container)
+        else:
+            parsed_tokens.append(Atom(tok))
+
+        index += 1
+
+    return parsed_tokens
+
+
+def _reflow_lines(parsed_tokens, indentation, max_line_length,
+                  start_on_prefix_line):
+    """Reflow the lines so that it looks nice."""
+
+    if unicode(parsed_tokens[0]) == 'def':
+        # A function definition gets indented a bit more.
+        continued_indent = indentation + ' ' * 2 * DEFAULT_INDENT_SIZE
+    else:
+        continued_indent = indentation + ' ' * DEFAULT_INDENT_SIZE
+
+    break_after_open_bracket = not start_on_prefix_line
+
+    lines = ReformattedLines(max_line_length)
+    lines.add_indent(len(indentation.lstrip('\r\n')))
+
+    if not start_on_prefix_line:
+        # If splitting after the opening bracket will cause the first element
+        # to be aligned weirdly, don't try it.
+        first_token = get_item(parsed_tokens, 0)
+        second_token = get_item(parsed_tokens, 1)
+
+        if (
+            first_token and second_token and
+            unicode(second_token)[0] == '(' and
+            len(indentation) + len(first_token) + 1 == len(continued_indent)
+        ):
+            return None
+
+    for item in parsed_tokens:
+        lines.add_space_if_needed(unicode(item), equal=True)
+
+        save_continued_indent = continued_indent
+        if start_on_prefix_line and isinstance(item, Container):
+            start_on_prefix_line = False
+            continued_indent = ' ' * (lines.current_size() + 1)
+
+        item.reflow(lines, continued_indent, break_after_open_bracket)
+        continued_indent = save_continued_indent
+
+    return lines.emit()
+
+
+def _shorten_line_at_tokens_new(tokens, source, indentation,
+                                max_line_length):
+    """Shorten the line taking its length into account.
+
+    The input is expected to be free of newlines except for inside
+    multiline strings and at the end.
+
+    """
+    # Yield the original source so to see if it's a better choice than the
+    # shortened candidate lines we generate here.
+    yield indentation + source
+
+    parsed_tokens = _parse_tokens(tokens)
+
+    if parsed_tokens:
+        # Perform two reflows. The first one starts on the same line as the
+        # prefix. The second starts on the line after the prefix.
+        fixed = _reflow_lines(parsed_tokens, indentation, max_line_length,
+                              start_on_prefix_line=True)
+        if fixed and check_syntax(normalize_multiline(fixed.lstrip())):
+            yield fixed
+
+        fixed = _reflow_lines(parsed_tokens, indentation, max_line_length,
+                              start_on_prefix_line=False)
+        if fixed and check_syntax(normalize_multiline(fixed.lstrip())):
+            yield fixed
+
+
+def _shorten_line_at_tokens(tokens, source, indentation, indent_word,
+                            key_token_strings, aggressive):
+    """Separate line by breaking at tokens in key_token_strings.
+
+    The input is expected to be free of newlines except for inside
+    multiline strings and at the end.
+
+    """
+    offsets = []
+    for (index, _t) in enumerate(token_offsets(tokens)):
+        (token_type,
+         token_string,
+         start_offset,
+         end_offset) = _t
+
+        assert token_type != token.INDENT
+
+        if token_string in key_token_strings:
+            # Do not break in containers with zero or one items.
+            unwanted_next_token = {
+                '(': ')',
+                '[': ']',
+                '{': '}'}.get(token_string)
+            if unwanted_next_token:
+                if (
+                    get_item(tokens,
+                             index + 1,
+                             default=[None, None])[1] == unwanted_next_token or
+                    get_item(tokens,
+                             index + 2,
+                             default=[None, None])[1] == unwanted_next_token
+                ):
+                    continue
+
+            if (
+                index > 2 and token_string == '(' and
+                tokens[index - 1][1] in ',(%['
+            ):
+                # Don't split after a tuple start, or before a tuple start if
+                # the tuple is in a list.
+                continue
+
+            if end_offset < len(source) - 1:
+                # Don't split right before newline.
+                offsets.append(end_offset)
+        else:
+            # Break at adjacent strings. These were probably meant to be on
+            # separate lines in the first place.
+            previous_token = get_item(tokens, index - 1)
+            if (
+                token_type == tokenize.STRING and
+                previous_token and previous_token[0] == tokenize.STRING
+            ):
+                offsets.append(start_offset)
+
+    current_indent = None
+    fixed = None
+    for line in split_at_offsets(source, offsets):
+        if fixed:
+            fixed += '\n' + current_indent + line
+
+            for symbol in '([{':
+                if line.endswith(symbol):
+                    current_indent += indent_word
+        else:
+            # First line.
+            fixed = line
+            assert not current_indent
+            current_indent = indent_word
+
+    assert fixed is not None
+
+    if check_syntax(normalize_multiline(fixed)
+                    if aggressive > 1 else fixed):
+        return indentation + fixed
+    else:
+        return None
+
+
+def token_offsets(tokens):
+    """Yield tokens and offsets."""
+    end_offset = 0
+    previous_end_row = 0
+    previous_end_column = 0
+    for t in tokens:
+        token_type = t[0]
+        token_string = t[1]
+        (start_row, start_column) = t[2]
+        (end_row, end_column) = t[3]
+
+        # Account for the whitespace between tokens.
+        end_offset += start_column
+        if previous_end_row == start_row:
+            end_offset -= previous_end_column
+
+        # Record the start offset of the token.
+        start_offset = end_offset
+
+        # Account for the length of the token itself.
+        end_offset += len(token_string)
+
+        yield (token_type,
+               token_string,
+               start_offset,
+               end_offset)
+
+        previous_end_row = end_row
+        previous_end_column = end_column
+
+
+def normalize_multiline(line):
+    """Normalize multiline-related code that will cause syntax error.
+
+    This is for purposes of checking syntax.
+
+    """
+    if line.startswith('def ') and line.rstrip().endswith(':'):
+        return line + ' pass'
+    elif line.startswith('return '):
+        return 'def _(): ' + line
+    elif line.startswith('@'):
+        return line + 'def _(): pass'
+    elif line.startswith('class '):
+        return line + ' pass'
+    elif line.startswith(('if ', 'elif ', 'for ', 'while ')):
+        return line + ' pass'
+    else:
+        return line
+
+
+def fix_whitespace(line, offset, replacement):
+    """Replace whitespace at offset and return fixed line."""
+    # Replace escaped newlines too
+    left = line[:offset].rstrip('\n\r \t\\')
+    right = line[offset:].lstrip('\n\r \t\\')
+    if right.startswith('#'):
+        return line
+    else:
+        return left + replacement + right
+
+
+def _execute_pep8(pep8_options, source):
+    """Execute pep8 via python method calls."""
+    class QuietReport(pep8.BaseReport):
+
+        """Version of checker that does not print."""
+
+        def __init__(self, options):
+            super(QuietReport, self).__init__(options)
+            self.__full_error_results = []
+
+        def error(self, line_number, offset, text, check):
+            """Collect errors."""
+            code = super(QuietReport, self).error(line_number,
+                                                  offset,
+                                                  text,
+                                                  check)
+            if code:
+                self.__full_error_results.append(
+                    {'id': code,
+                     'line': line_number,
+                     'column': offset + 1,
+                     'info': text})
+
+        def full_error_results(self):
+            """Return error results in detail.
+
+            Results are in the form of a list of dictionaries. Each
+            dictionary contains 'id', 'line', 'column', and 'info'.
+
+            """
+            return self.__full_error_results
+
+    checker = pep8.Checker('', lines=source,
+                           reporter=QuietReport, **pep8_options)
+    checker.check_all()
+    return checker.report.full_error_results()
+
+
+def _remove_leading_and_normalize(line):
+    return line.lstrip().rstrip(CR + LF) + '\n'
+
+
+class Reindenter(object):
+
+    """Reindents badly-indented code to uniformly use four-space indentation.
+
+    Released to the public domain, by Tim Peters, 03 October 2000.
+
+    """
+
+    def __init__(self, input_text):
+        sio = io.StringIO(input_text)
+        source_lines = sio.readlines()
+
+        self.string_content_line_numbers = multiline_string_lines(input_text)
+
+        # File lines, rstripped & tab-expanded. Dummy at start is so
+        # that we can use tokenize's 1-based line numbering easily.
+        # Note that a line is all-blank iff it is a newline.
+        self.lines = []
+        for line_number, line in enumerate(source_lines, start=1):
+            # Do not modify if inside a multiline string.
+            if line_number in self.string_content_line_numbers:
+                self.lines.append(line)
+            else:
+                # Only expand leading tabs.
+                self.lines.append(_get_indentation(line).expandtabs() +
+                                  _remove_leading_and_normalize(line))
+
+        self.lines.insert(0, None)
+        self.index = 1  # index into self.lines of next line
+        self.input_text = input_text
+
+    def run(self, indent_size=DEFAULT_INDENT_SIZE):
+        """Fix indentation and return modified line numbers.
+
+        Line numbers are indexed at 1.
+
+        """
+        if indent_size < 1:
+            return self.input_text
+
+        try:
+            stats = _reindent_stats(tokenize.generate_tokens(self.getline))
+        except (SyntaxError, tokenize.TokenError):
+            return self.input_text
+        # Remove trailing empty lines.
+        lines = self.lines
+        # Sentinel.
+        stats.append((len(lines), 0))
+        # Map count of leading spaces to # we want.
+        have2want = {}
+        # Program after transformation.
+        after = []
+        # Copy over initial empty lines -- there's nothing to do until
+        # we see a line with *something* on it.
+        i = stats[0][0]
+        after.extend(lines[1:i])
+        for i in range(len(stats) - 1):
+            thisstmt, thislevel = stats[i]
+            nextstmt = stats[i + 1][0]
+            have = _leading_space_count(lines[thisstmt])
+            want = thislevel * indent_size
+            if want < 0:
+                # A comment line.
+                if have:
+                    # An indented comment line. If we saw the same
+                    # indentation before, reuse what it most recently
+                    # mapped to.
+                    want = have2want.get(have, -1)
+                    if want < 0:
+                        # Then it probably belongs to the next real stmt.
+                        for j in range(i + 1, len(stats) - 1):
+                            jline, jlevel = stats[j]
+                            if jlevel >= 0:
+                                if have == _leading_space_count(lines[jline]):
+                                    want = jlevel * indent_size
+                                break
+                    if want < 0:            # Maybe it's a hanging
+                                            # comment like this one,
+                        # in which case we should shift it like its base
+                        # line got shifted.
+                        for j in range(i - 1, -1, -1):
+                            jline, jlevel = stats[j]
+                            if jlevel >= 0:
+                                want = (have + _leading_space_count(
+                                        after[jline - 1]) -
+                                        _leading_space_count(lines[jline]))
+                                break
+                    if want < 0:
+                        # Still no luck -- leave it alone.
+                        want = have
+                else:
+                    want = 0
+            assert want >= 0
+            have2want[have] = want
+            diff = want - have
+            if diff == 0 or have == 0:
+                after.extend(lines[thisstmt:nextstmt])
+            else:
+                for line_number, line in enumerate(lines[thisstmt:nextstmt],
+                                                   start=thisstmt):
+                    if line_number in self.string_content_line_numbers:
+                        after.append(line)
+                    elif diff > 0:
+                        if line == '\n':
+                            after.append(line)
+                        else:
+                            after.append(' ' * diff + line)
+                    else:
+                        remove = min(_leading_space_count(line), -diff)
+                        after.append(line[remove:])
+
+        return ''.join(after)
+
+    def getline(self):
+        """Line-getter for tokenize."""
+        if self.index >= len(self.lines):
+            line = ''
+        else:
+            line = self.lines[self.index]
+            self.index += 1
+        return line
+
+
+def _reindent_stats(tokens):
+    """Return list of (lineno, indentlevel) pairs.
+
+    One for each stmt and comment line. indentlevel is -1 for comment lines, as
+    a signal that tokenize doesn't know what to do about them; indeed, they're
+    our headache!
+
+    """
+    find_stmt = 1  # Next token begins a fresh stmt?
+    level = 0  # Current indent level.
+    stats = []
+
+    for t in tokens:
+        token_type = t[0]
+        sline = t[2][0]
+        line = t[4]
+
+        if token_type == tokenize.NEWLINE:
+            # A program statement, or ENDMARKER, will eventually follow,
+            # after some (possibly empty) run of tokens of the form
+            #     (NL | COMMENT)* (INDENT | DEDENT+)?
+            find_stmt = 1
+
+        elif token_type == tokenize.INDENT:
+            find_stmt = 1
+            level += 1
+
+        elif token_type == tokenize.DEDENT:
+            find_stmt = 1
+            level -= 1
+
+        elif token_type == tokenize.COMMENT:
+            if find_stmt:
+                stats.append((sline, -1))
+                # But we're still looking for a new stmt, so leave
+                # find_stmt alone.
+
+        elif token_type == tokenize.NL:
+            pass
+
+        elif find_stmt:
+            # This is the first "real token" following a NEWLINE, so it
+            # must be the first token of the next program statement, or an
+            # ENDMARKER.
+            find_stmt = 0
+            if line:   # Not endmarker.
+                stats.append((sline, level))
+
+    return stats
+
+
+def _leading_space_count(line):
+    """Return number of leading spaces in line."""
+    i = 0
+    while i < len(line) and line[i] == ' ':
+        i += 1
+    return i
+
+
+def refactor_with_2to3(source_text, fixer_names, filename=''):
+    """Use lib2to3 to refactor the source.
+
+    Return the refactored source code.
+
+    """
+    from lib2to3.refactor import RefactoringTool
+    fixers = ['lib2to3.fixes.fix_' + name for name in fixer_names]
+    tool = RefactoringTool(fixer_names=fixers, explicit=fixers)
+
+    from lib2to3.pgen2 import tokenize as lib2to3_tokenize
+    try:
+        # The name parameter is necessary particularly for the "import" fixer.
+        return unicode(tool.refactor_string(source_text, name=filename))
+    except lib2to3_tokenize.TokenError:
+        return source_text
+
+
+def check_syntax(code):
+    """Return True if syntax is okay."""
+    try:
+        return compile(code, '<string>', 'exec')
+    except (SyntaxError, TypeError, UnicodeDecodeError):
+        return False
+
+
+def filter_results(source, results, aggressive):
+    """Filter out spurious reports from pep8.
+
+    If aggressive is True, we allow possibly unsafe fixes (E711, E712).
+
+    """
+    non_docstring_string_line_numbers = multiline_string_lines(
+        source, include_docstrings=False)
+    all_string_line_numbers = multiline_string_lines(
+        source, include_docstrings=True)
+
+    commented_out_code_line_numbers = commented_out_code_lines(source)
+
+    has_e901 = any(result['id'].lower() == 'e901' for result in results)
+
+    for r in results:
+        issue_id = r['id'].lower()
+
+        if r['line'] in non_docstring_string_line_numbers:
+            if issue_id.startswith(('e1', 'e501', 'w191')):
+                continue
+
+        if r['line'] in all_string_line_numbers:
+            if issue_id in ['e501']:
+                continue
+
+        # We must offset by 1 for lines that contain the trailing contents of
+        # multiline strings.
+        if not aggressive and (r['line'] + 1) in all_string_line_numbers:
+            # Do not modify multiline strings in non-aggressive mode. Remove
+            # trailing whitespace could break doctests.
+            if issue_id.startswith(('w29', 'w39')):
+                continue
+
+        if aggressive <= 0:
+            if issue_id.startswith(('e711', 'w6')):
+                continue
+
+        if aggressive <= 1:
+            if issue_id.startswith(('e712', 'e713')):
+                continue
+
+        if r['line'] in commented_out_code_line_numbers:
+            if issue_id.startswith(('e26', 'e501')):
+                continue
+
+        # Do not touch indentation if there is a token error caused by
+        # incomplete multi-line statement. Otherwise, we risk screwing up the
+        # indentation.
+        if has_e901:
+            if issue_id.startswith(('e1', 'e7')):
+                continue
+
+        yield r
+
+
+def multiline_string_lines(source, include_docstrings=False):
+    """Return line numbers that are within multiline strings.
+
+    The line numbers are indexed at 1.
+
+    Docstrings are ignored.
+
+    """
+    line_numbers = set()
+    previous_token_type = ''
+    try:
+        for t in generate_tokens(source):
+            token_type = t[0]
+            start_row = t[2][0]
+            end_row = t[3][0]
+
+            if token_type == tokenize.STRING and start_row != end_row:
+                if (
+                    include_docstrings or
+                    previous_token_type != tokenize.INDENT
+                ):
+                    # We increment by one since we want the contents of the
+                    # string.
+                    line_numbers |= set(range(1 + start_row, 1 + end_row))
+
+            previous_token_type = token_type
+    except (SyntaxError, tokenize.TokenError):
+        pass
+
+    return line_numbers
+
+
+def commented_out_code_lines(source):
+    """Return line numbers of comments that are likely code.
+
+    Commented-out code is bad practice, but modifying it just adds even more
+    clutter.
+
+    """
+    line_numbers = []
+    try:
+        for t in generate_tokens(source):
+            token_type = t[0]
+            token_string = t[1]
+            start_row = t[2][0]
+            line = t[4]
+
+            # Ignore inline comments.
+            if not line.lstrip().startswith('#'):
+                continue
+
+            if token_type == tokenize.COMMENT:
+                stripped_line = token_string.lstrip('#').strip()
+                if (
+                    ' ' in stripped_line and
+                    '#' not in stripped_line and
+                    check_syntax(stripped_line)
+                ):
+                    line_numbers.append(start_row)
+    except (SyntaxError, tokenize.TokenError):
+        pass
+
+    return line_numbers
+
+
+def shorten_comment(line, max_line_length, last_comment=False):
+    """Return trimmed or split long comment line.
+
+    If there are no comments immediately following it, do a text wrap.
+    Doing this wrapping on all comments in general would lead to jagged
+    comment text.
+
+    """
+    assert len(line) > max_line_length
+    line = line.rstrip()
+
+    # PEP 8 recommends 72 characters for comment text.
+    indentation = _get_indentation(line) + '# '
+    max_line_length = min(max_line_length,
+                          len(indentation) + 72)
+
+    MIN_CHARACTER_REPEAT = 5
+    if (
+        len(line) - len(line.rstrip(line[-1])) >= MIN_CHARACTER_REPEAT and
+        not line[-1].isalnum()
+    ):
+        # Trim comments that end with things like ---------
+        return line[:max_line_length] + '\n'
+    elif last_comment and re.match(r'\s*#+\s*\w+', line):
+        split_lines = textwrap.wrap(line.lstrip(' \t#'),
+                                    initial_indent=indentation,
+                                    subsequent_indent=indentation,
+                                    width=max_line_length,
+                                    break_long_words=False,
+                                    break_on_hyphens=False)
+        return '\n'.join(split_lines) + '\n'
+    else:
+        return line + '\n'
+
+
+def normalize_line_endings(lines, newline):
+    """Return fixed line endings.
+
+    All lines will be modified to use the most common line ending.
+
+    """
+    return [line.rstrip('\n\r') + newline for line in lines]
+
+
+def mutual_startswith(a, b):
+    return b.startswith(a) or a.startswith(b)
+
+
+def code_match(code, select, ignore):
+    if ignore:
+        assert not isinstance(ignore, unicode)
+        for ignored_code in [c.strip() for c in ignore]:
+            if mutual_startswith(code.lower(), ignored_code.lower()):
+                return False
+
+    if select:
+        assert not isinstance(select, unicode)
+        for selected_code in [c.strip() for c in select]:
+            if mutual_startswith(code.lower(), selected_code.lower()):
+                return True
+        return False
+
+    return True
+
+
+def fix_code(source, options=None, encoding=None, apply_config=False):
+    """Return fixed source code.
+
+    "encoding" will be used to decode "source" if it is a byte string.
+
+    """
+    options = _get_options(options, apply_config)
+
+    if not isinstance(source, unicode):
+        source = source.decode(encoding or get_encoding())
+
+    sio = io.StringIO(source)
+    return fix_lines(sio.readlines(), options=options)
+
+
+def _get_options(raw_options, apply_config):
+    """Return parsed options."""
+    if not raw_options:
+        return parse_args([''], apply_config=apply_config)
+
+    if isinstance(raw_options, dict):
+        options = parse_args([''], apply_config=apply_config)
+        for name, value in raw_options.items():
+            if not hasattr(options, name):
+                raise ValueError("No such option '{}'".format(name))
+
+            # Check for very basic type errors.
+            expected_type = type(getattr(options, name))
+            if not isinstance(expected_type, (str, unicode)):
+                if isinstance(value, (str, unicode)):
+                    raise ValueError(
+                        "Option '{}' should not be a string".format(name))
+            setattr(options, name, value)
+    else:
+        options = raw_options
+
+    return options
+
+
+def fix_lines(source_lines, options, filename=''):
+    """Return fixed source code."""
+    # Transform everything to line feed. Then change them back to original
+    # before returning fixed source code.
+    original_newline = find_newline(source_lines)
+    tmp_source = ''.join(normalize_line_endings(source_lines, '\n'))
+
+    # Keep a history to break out of cycles.
+    previous_hashes = set()
+
+    if options.line_range:
+        # Disable "apply_local_fixes()" for now due to issue #175.
+        fixed_source = tmp_source
+    else:
+        # Apply global fixes only once (for efficiency).
+        fixed_source = apply_global_fixes(tmp_source,
+                                          options,
+                                          filename=filename)
+
+    passes = 0
+    long_line_ignore_cache = set()
+    while hash(fixed_source) not in previous_hashes:
+        if options.pep8_passes >= 0 and passes > options.pep8_passes:
+            break
+        passes += 1
+
+        previous_hashes.add(hash(fixed_source))
+
+        tmp_source = copy.copy(fixed_source)
+
+        fix = FixPEP8(
+            filename,
+            options,
+            contents=tmp_source,
+            long_line_ignore_cache=long_line_ignore_cache)
+
+        fixed_source = fix.fix()
+
+    sio = io.StringIO(fixed_source)
+    return ''.join(normalize_line_endings(sio.readlines(), original_newline))
+
+
+def fix_file(filename, options=None, output=None, apply_config=False):
+    if not options:
+        options = parse_args([filename], apply_config=apply_config)
+
+    original_source = readlines_from_file(filename)
+
+    fixed_source = original_source
+
+    if options.in_place or output:
+        encoding = detect_encoding(filename)
+
+    if output:
+        output = LineEndingWrapper(wrap_output(output, encoding=encoding))
+
+    fixed_source = fix_lines(fixed_source, options, filename=filename)
+
+    if options.diff:
+        new = io.StringIO(fixed_source)
+        new = new.readlines()
+        diff = get_diff_text(original_source, new, filename)
+        if output:
+            output.write(diff)
+            output.flush()
+        else:
+            return diff
+    elif options.in_place:
+        fp = open_with_encoding(filename, encoding=encoding,
+                                mode='w')
+        fp.write(fixed_source)
+        fp.close()
+    else:
+        if output:
+            output.write(fixed_source)
+            output.flush()
+        else:
+            return fixed_source
+
+
+def global_fixes():
+    """Yield multiple (code, function) tuples."""
+    for function in list(globals().values()):
+        if inspect.isfunction(function):
+            arguments = inspect.getargspec(function)[0]
+            if arguments[:1] != ['source']:
+                continue
+
+            code = extract_code_from_function(function)
+            if code:
+                yield (code, function)
+
+
+def apply_global_fixes(source, options, where='global', filename=''):
+    """Run global fixes on source code.
+
+    These are fixes that only need be done once (unlike those in
+    FixPEP8, which are dependent on pep8).
+
+    """
+    if any(code_match(code, select=options.select, ignore=options.ignore)
+           for code in ['E101', 'E111']):
+        source = reindent(source,
+                          indent_size=options.indent_size)
+
+    for (code, function) in global_fixes():
+        if code_match(code, select=options.select, ignore=options.ignore):
+            if options.verbose:
+                print('--->  Applying {0} fix for {1}'.format(where,
+                                                              code.upper()),
+                      file=sys.stderr)
+            source = function(source,
+                              aggressive=options.aggressive)
+
+    source = fix_2to3(source,
+                      aggressive=options.aggressive,
+                      select=options.select,
+                      ignore=options.ignore,
+                      filename=filename)
+
+    return source
+
+
+def extract_code_from_function(function):
+    """Return code handled by function."""
+    if not function.__name__.startswith('fix_'):
+        return None
+
+    code = re.sub('^fix_', '', function.__name__)
+    if not code:
+        return None
+
+    try:
+        int(code[1:])
+    except ValueError:
+        return None
+
+    return code
+
+
+def create_parser():
+    """Return command-line parser."""
+    # Do import locally to be friendly to those who use autopep8 as a library
+    # and are supporting Python 2.6.
+    import argparse
+
+    parser = argparse.ArgumentParser(description=docstring_summary(__doc__),
+                                     prog='autopep8')
+    parser.add_argument('--version', action='version',
+                        version='%(prog)s ' + __version__)
+    parser.add_argument('-v', '--verbose', action='count',
+                        default=0,
+                        help='print verbose messages; '
+                             'multiple -v result in more verbose messages')
+    parser.add_argument('-d', '--diff', action='store_true',
+                        help='print the diff for the fixed source')
+    parser.add_argument('-i', '--in-place', action='store_true',
+                        help='make changes to files in place')
+    parser.add_argument('--global-config', metavar='filename',
+                        default=DEFAULT_CONFIG,
+                        help='path to a global pep8 config file; if this file '
+                             'does not exist then this is ignored '
+                             '(default: {0})'.format(DEFAULT_CONFIG))
+    parser.add_argument('--ignore-local-config', action='store_true',
+                        help="don't look for and apply local config files; "
+                             'if not passed, defaults are updated with any '
+                             "config files in the project's root directory")
+    parser.add_argument('-r', '--recursive', action='store_true',
+                        help='run recursively over directories; '
+                             'must be used with --in-place or --diff')
+    parser.add_argument('-j', '--jobs', type=int, metavar='n', default=1,
+                        help='number of parallel jobs; '
+                             'match CPU count if value is less than 1')
+    parser.add_argument('-p', '--pep8-passes', metavar='n',
+                        default=-1, type=int,
+                        help='maximum number of additional pep8 passes '
+                             '(default: infinite)')
+    parser.add_argument('-a', '--aggressive', action='count', default=0,
+                        help='enable non-whitespace changes; '
+                             'multiple -a result in more aggressive changes')
+    parser.add_argument('--experimental', action='store_true',
+                        help='enable experimental fixes')
+    parser.add_argument('--exclude', metavar='globs',
+                        help='exclude file/directory names that match these '
+                             'comma-separated globs')
+    parser.add_argument('--list-fixes', action='store_true',
+                        help='list codes for fixes; '
+                        'used by --ignore and --select')
+    parser.add_argument('--ignore', metavar='errors', default='',
+                        help='do not fix these errors/warnings '
+                             '(default: {0})'.format(DEFAULT_IGNORE))
+    parser.add_argument('--select', metavar='errors', default='',
+                        help='fix only these errors/warnings (e.g. E4,W)')
+    parser.add_argument('--max-line-length', metavar='n', default=79, type=int,
+                        help='set maximum allowed line length '
+                             '(default: %(default)s)')
+    parser.add_argument('--line-range', '--range', metavar='line',
+                        default=None, type=int, nargs=2,
+                        help='only fix errors found within this inclusive '
+                             'range of line numbers (e.g. 1 99); '
+                             'line numbers are indexed at 1')
+    parser.add_argument('--indent-size', default=DEFAULT_INDENT_SIZE,
+                        type=int, metavar='n',
+                        help='number of spaces per indent level '
+                             '(default %(default)s)')
+    parser.add_argument('files', nargs='*',
+                        help="files to format or '-' for standard in")
+
+    return parser
+
+
+def parse_args(arguments, apply_config=False):
+    """Parse command-line options."""
+    parser = create_parser()
+    args = parser.parse_args(arguments)
+
+    if not args.files and not args.list_fixes:
+        parser.error('incorrect number of arguments')
+
+    args.files = [decode_filename(name) for name in args.files]
+
+    if apply_config:
+        parser = read_config(args, parser)
+        args = parser.parse_args(arguments)
+        args.files = [decode_filename(name) for name in args.files]
+
+    if '-' in args.files:
+        if len(args.files) > 1:
+            parser.error('cannot mix stdin and regular files')
+
+        if args.diff:
+            parser.error('--diff cannot be used with standard input')
+
+        if args.in_place:
+            parser.error('--in-place cannot be used with standard input')
+
+        if args.recursive:
+            parser.error('--recursive cannot be used with standard input')
+
+    if len(args.files) > 1 and not (args.in_place or args.diff):
+        parser.error('autopep8 only takes one filename as argument '
+                     'unless the "--in-place" or "--diff" args are '
+                     'used')
+
+    if args.recursive and not (args.in_place or args.diff):
+        parser.error('--recursive must be used with --in-place or --diff')
+
+    if args.in_place and args.diff:
+        parser.error('--in-place and --diff are mutually exclusive')
+
+    if args.max_line_length <= 0:
+        parser.error('--max-line-length must be greater than 0')
+
+    if args.select:
+        args.select = _split_comma_separated(args.select)
+
+    if args.ignore:
+        args.ignore = _split_comma_separated(args.ignore)
+    elif not args.select:
+        if args.aggressive:
+            # Enable everything by default if aggressive.
+            args.select = ['E', 'W']
+        else:
+            args.ignore = _split_comma_separated(DEFAULT_IGNORE)
+
+    if args.exclude:
+        args.exclude = _split_comma_separated(args.exclude)
+    else:
+        args.exclude = []
+
+    if args.jobs < 1:
+        # Do not import multiprocessing globally in case it is not supported
+        # on the platform.
+        import multiprocessing
+        args.jobs = multiprocessing.cpu_count()
+
+    if args.jobs > 1 and not args.in_place:
+        parser.error('parallel jobs requires --in-place')
+
+    if args.line_range:
+        if args.line_range[0] <= 0:
+            parser.error('--range must be positive numbers')
+        if args.line_range[0] > args.line_range[1]:
+            parser.error('First value of --range should be less than or equal '
+                         'to the second')
+
+    return args
+
+
+def read_config(args, parser):
+    """Read both user configuration and local configuration."""
+    try:
+        from configparser import ConfigParser as SafeConfigParser
+        from configparser import Error
+    except ImportError:
+        from ConfigParser import SafeConfigParser
+        from ConfigParser import Error
+
+    config = SafeConfigParser()
+
+    try:
+        config.read(args.global_config)
+
+        if not args.ignore_local_config:
+            parent = tail = args.files and os.path.abspath(
+                os.path.commonprefix(args.files))
+            while tail:
+                if config.read([os.path.join(parent, fn)
+                                for fn in PROJECT_CONFIG]):
+                    break
+                (parent, tail) = os.path.split(parent)
+
+        defaults = dict((k.lstrip('-').replace('-', '_'), v)
+                        for k, v in config.items('pep8'))
+        parser.set_defaults(**defaults)
+    except Error:
+        # Ignore for now.
+        pass
+
+    return parser
+
+
+def _split_comma_separated(string):
+    """Return a set of strings."""
+    return set(text.strip() for text in string.split(',') if text.strip())
+
+
+def decode_filename(filename):
+    """Return Unicode filename."""
+    if isinstance(filename, unicode):
+        return filename
+    else:
+        return filename.decode(sys.getfilesystemencoding())
+
+
+def supported_fixes():
+    """Yield pep8 error codes that autopep8 fixes.
+
+    Each item we yield is a tuple of the code followed by its
+    description.
+
+    """
+    yield ('E101', docstring_summary(reindent.__doc__))
+
+    instance = FixPEP8(filename=None, options=None, contents='')
+    for attribute in dir(instance):
+        code = re.match('fix_([ew][0-9][0-9][0-9])', attribute)
+        if code:
+            yield (
+                code.group(1).upper(),
+                re.sub(r'\s+', ' ',
+                       docstring_summary(getattr(instance, attribute).__doc__))
+            )
+
+    for (code, function) in sorted(global_fixes()):
+        yield (code.upper() + (4 - len(code)) * ' ',
+               re.sub(r'\s+', ' ', docstring_summary(function.__doc__)))
+
+    for code in sorted(CODE_TO_2TO3):
+        yield (code.upper() + (4 - len(code)) * ' ',
+               re.sub(r'\s+', ' ', docstring_summary(fix_2to3.__doc__)))
+
+
+def docstring_summary(docstring):
+    """Return summary of docstring."""
+    return docstring.split('\n')[0]
+
+
+def line_shortening_rank(candidate, indent_word, max_line_length,
+                         experimental=False):
+    """Return rank of candidate.
+
+    This is for sorting candidates.
+
+    """
+    if not candidate.strip():
+        return 0
+
+    rank = 0
+    lines = candidate.rstrip().split('\n')
+
+    offset = 0
+    if (
+        not lines[0].lstrip().startswith('#') and
+        lines[0].rstrip()[-1] not in '([{'
+    ):
+        for (opening, closing) in ('()', '[]', '{}'):
+            # Don't penalize empty containers that aren't split up. Things like
+            # this "foo(\n    )" aren't particularly good.
+            opening_loc = lines[0].find(opening)
+            closing_loc = lines[0].find(closing)
+            if opening_loc >= 0:
+                if closing_loc < 0 or closing_loc != opening_loc + 1:
+                    offset = max(offset, 1 + opening_loc)
+
+    current_longest = max(offset + len(x.strip()) for x in lines)
+
+    rank += 4 * max(0, current_longest - max_line_length)
+
+    rank += len(lines)
+
+    # Too much variation in line length is ugly.
+    rank += 2 * standard_deviation(len(line) for line in lines)
+
+    bad_staring_symbol = {
+        '(': ')',
+        '[': ']',
+        '{': '}'}.get(lines[0][-1])
+
+    if len(lines) > 1:
+        if (
+            bad_staring_symbol and
+            lines[1].lstrip().startswith(bad_staring_symbol)
+        ):
+            rank += 20
+
+    for lineno, current_line in enumerate(lines):
+        current_line = current_line.strip()
+
+        if current_line.startswith('#'):
+            continue
+
+        for bad_start in ['.', '%', '+', '-', '/']:
+            if current_line.startswith(bad_start):
+                rank += 100
+
+            # Do not tolerate operators on their own line.
+            if current_line == bad_start:
+                rank += 1000
+
+        if (
+            current_line.endswith(('.', '%', '+', '-', '/')) and
+            "': " in current_line
+        ):
+            rank += 1000
+
+        if current_line.endswith(('(', '[', '{', '.')):
+            # Avoid lonely opening. They result in longer lines.
+            if len(current_line) <= len(indent_word):
+                rank += 100
+
+            # Avoid the ugliness of ", (\n".
+            if (
+                current_line.endswith('(') and
+                current_line[:-1].rstrip().endswith(',')
+            ):
+                rank += 100
+
+            # Also avoid the ugliness of "foo.\nbar"
+            if current_line.endswith('.'):
+                rank += 100
+
+            if has_arithmetic_operator(current_line):
+                rank += 100
+
+        # Avoid breaking at unary operators.
+        if re.match(r'.*[(\[{]\s*[\-\+~]$', current_line.rstrip('\\ ')):
+            rank += 1000
+
+        if re.match(r'.*lambda\s*\*$', current_line.rstrip('\\ ')):
+            rank += 1000
+
+        if current_line.endswith(('%', '(', '[', '{')):
+            rank -= 20
+
+        # Try to break list comprehensions at the "for".
+        if current_line.startswith('for '):
+            rank -= 50
+
+        if current_line.endswith('\\'):
+            # If a line ends in \-newline, it may be part of a
+            # multiline string. In that case, we would like to know
+            # how long that line is without the \-newline. If it's
+            # longer than the maximum, or has comments, then we assume
+            # that the \-newline is an okay candidate and only
+            # penalize it a bit.
+            total_len = len(current_line)
+            lineno += 1
+            while lineno < len(lines):
+                total_len += len(lines[lineno])
+
+                if lines[lineno].lstrip().startswith('#'):
+                    total_len = max_line_length
+                    break
+
+                if not lines[lineno].endswith('\\'):
+                    break
+
+                lineno += 1
+
+            if total_len < max_line_length:
+                rank += 10
+            else:
+                rank += 100 if experimental else 1
+
+        # Prefer breaking at commas rather than colon.
+        if ',' in current_line and current_line.endswith(':'):
+            rank += 10
+
+        # Avoid splitting dictionaries between key and value.
+        if current_line.endswith(':'):
+            rank += 100
+
+        rank += 10 * count_unbalanced_brackets(current_line)
+
+    return max(0, rank)
+
+
+def standard_deviation(numbers):
+    """Return standard devation."""
+    numbers = list(numbers)
+    if not numbers:
+        return 0
+    mean = sum(numbers) / len(numbers)
+    return (sum((n - mean) ** 2 for n in numbers) /
+            len(numbers)) ** .5
+
+
+def has_arithmetic_operator(line):
+    """Return True if line contains any arithmetic operators."""
+    for operator in pep8.ARITHMETIC_OP:
+        if operator in line:
+            return True
+
+    return False
+
+
+def count_unbalanced_brackets(line):
+    """Return number of unmatched open/close brackets."""
+    count = 0
+    for opening, closing in ['()', '[]', '{}']:
+        count += abs(line.count(opening) - line.count(closing))
+
+    return count
+
+
+def split_at_offsets(line, offsets):
+    """Split line at offsets.
+
+    Return list of strings.
+
+    """
+    result = []
+
+    previous_offset = 0
+    current_offset = 0
+    for current_offset in sorted(offsets):
+        if current_offset < len(line) and previous_offset != current_offset:
+            result.append(line[previous_offset:current_offset].strip())
+        previous_offset = current_offset
+
+    result.append(line[current_offset:])
+
+    return result
+
+
+class LineEndingWrapper(object):
+
+    r"""Replace line endings to work with sys.stdout.
+
+    It seems that sys.stdout expects only '\n' as the line ending, no matter
+    the platform. Otherwise, we get repeated line endings.
+
+    """
+
+    def __init__(self, output):
+        self.__output = output
+
+    def write(self, s):
+        self.__output.write(s.replace('\r\n', '\n').replace('\r', '\n'))
+
+    def flush(self):
+        self.__output.flush()
+
+
+def match_file(filename, exclude):
+    """Return True if file is okay for modifying/recursing."""
+    base_name = os.path.basename(filename)
+
+    if base_name.startswith('.'):
+        return False
+
+    for pattern in exclude:
+        if fnmatch.fnmatch(base_name, pattern):
+            return False
+        if fnmatch.fnmatch(filename, pattern):
+            return False
+
+    if not os.path.isdir(filename) and not is_python_file(filename):
+        return False
+
+    return True
+
+
+def find_files(filenames, recursive, exclude):
+    """Yield filenames."""
+    while filenames:
+        name = filenames.pop(0)
+        if recursive and os.path.isdir(name):
+            for root, directories, children in os.walk(name):
+                filenames += [os.path.join(root, f) for f in children
+                              if match_file(os.path.join(root, f),
+                                            exclude)]
+                directories[:] = [d for d in directories
+                                  if match_file(os.path.join(root, d),
+                                                exclude)]
+        else:
+            yield name
+
+
+def _fix_file(parameters):
+    """Helper function for optionally running fix_file() in parallel."""
+    if parameters[1].verbose:
+        print('[file:{0}]'.format(parameters[0]), file=sys.stderr)
+    try:
+        fix_file(*parameters)
+    except IOError as error:
+        print(unicode(error), file=sys.stderr)
+
+
+def fix_multiple_files(filenames, options, output=None):
+    """Fix list of files.
+
+    Optionally fix files recursively.
+
+    """
+    filenames = find_files(filenames, options.recursive, options.exclude)
+    if options.jobs > 1:
+        import multiprocessing
+        pool = multiprocessing.Pool(options.jobs)
+        pool.map(_fix_file,
+                 [(name, options) for name in filenames])
+    else:
+        for name in filenames:
+            _fix_file((name, options, output))
+
+
+def is_python_file(filename):
+    """Return True if filename is Python file."""
+    if filename.endswith('.py'):
+        return True
+
+    try:
+        with open_with_encoding(filename) as f:
+            first_line = f.readlines(1)[0]
+    except (IOError, IndexError):
+        return False
+
+    if not PYTHON_SHEBANG_REGEX.match(first_line):
+        return False
+
+    return True
+
+
+def is_probably_part_of_multiline(line):
+    """Return True if line is likely part of a multiline string.
+
+    When multiline strings are involved, pep8 reports the error as being
+    at the start of the multiline string, which doesn't work for us.
+
+    """
+    return (
+        '"""' in line or
+        "'''" in line or
+        line.rstrip().endswith('\\')
+    )
+
+
+def wrap_output(output, encoding):
+    """Return output with specified encoding."""
+    return codecs.getwriter(encoding)(output.buffer
+                                      if hasattr(output, 'buffer')
+                                      else output)
+
+
+def get_encoding():
+    """Return preferred encoding."""
+    return locale.getpreferredencoding() or sys.getdefaultencoding()
+
+
+def main(argv=None, apply_config=True):
+    """Command-line entry."""
+    if argv is None:
+        argv = sys.argv
+
+    try:
+        # Exit on broken pipe.
+        signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+    except AttributeError:  # pragma: no cover
+        # SIGPIPE is not available on Windows.
+        pass
+
+    try:
+        args = parse_args(argv[1:], apply_config=apply_config)
+
+        if args.list_fixes:
+            for code, description in sorted(supported_fixes()):
+                print('{code} - {description}'.format(
+                    code=code, description=description))
+            return 0
+
+        if args.files == ['-']:
+            assert not args.in_place
+
+            encoding = sys.stdin.encoding or get_encoding()
+
+            # LineEndingWrapper is unnecessary here due to the symmetry between
+            # standard in and standard out.
+            wrap_output(sys.stdout, encoding=encoding).write(
+                fix_code(sys.stdin.read(), args, encoding=encoding))
+        else:
+            if args.in_place or args.diff:
+                args.files = list(set(args.files))
+            else:
+                assert len(args.files) == 1
+                assert not args.recursive
+
+            fix_multiple_files(args.files, args, sys.stdout)
+    except KeyboardInterrupt:
+        return 1  # pragma: no cover
+
+
+class CachedTokenizer(object):
+
+    """A one-element cache around tokenize.generate_tokens().
+
+    Original code written by Ned Batchelder, in coverage.py.
+
+    """
+
+    def __init__(self):
+        self.last_text = None
+        self.last_tokens = None
+
+    def generate_tokens(self, text):
+        """A stand-in for tokenize.generate_tokens()."""
+        if text != self.last_text:
+            string_io = io.StringIO(text)
+            self.last_tokens = list(
+                tokenize.generate_tokens(string_io.readline)
+            )
+            self.last_text = text
+        return self.last_tokens
+
+_cached_tokenizer = CachedTokenizer()
+generate_tokens = _cached_tokenizer.generate_tokens
+
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/vim-plugins/bundle/python-mode/pymode/environment.py b/vim-plugins/bundle/python-mode/pymode/environment.py
new file mode 100644
index 0000000..c146ea6
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/environment.py
@@ -0,0 +1,249 @@
+"""Define interfaces."""
+
+from __future__ import print_function
+
+import json
+import os.path
+import time
+import vim # noqa
+
+from ._compat import PY2
+
+
+class VimPymodeEnviroment(object):
+
+    """Vim User interface."""
+
+    prefix = '[Pymode]'
+
+    def __init__(self):
+        """Init VIM environment."""
+        self.current = vim.current
+        self.options = dict(encoding=vim.eval('&enc'))
+        self.options['debug'] = self.var('g:pymode_debug', True)
+
+    @property
+    def curdir(self):
+        """Return current working directory."""
+        return self.var('getcwd()')
+
+    @property
+    def curbuf(self):
+        """Return current buffer."""
+        return self.current.buffer
+
+    @property
+    def cursor(self):
+        """Return current window position.
+
+        :return tuple: (row, col)
+
+        """
+        return self.current.window.cursor
+
+    @property
+    def source(self):
+        """Return source of current buffer."""
+        return "\n".join(self.lines)
+
+    @property
+    def lines(self):
+        """Iterate by lines in current file.
+
+        :return list:
+
+        """
+        if not PY2:
+            return self.curbuf
+
+        return [l.decode(self.options.get('encoding')) for l in self.curbuf]
+
+    @staticmethod
+    def var(name, to_bool=False, silence=False):
+        """Get vim variable.
+
+        :return vimobj:
+
+        """
+        try:
+            value = vim.eval(name)
+        except vim.error:
+            if silence:
+                return None
+            raise
+
+        if to_bool:
+            try:
+                value = bool(int(value))
+            except ValueError:
+                value = value
+        return value
+
+    @staticmethod
+    def message(msg, history=False):
+        """Show message to user.
+
+        :return: :None
+
+        """
+        if history:
+            return vim.command('echom "%s"' % str(msg))
+
+        return vim.command('call pymode#wide_message("%s")' % str(msg))
+
+    def user_input(self, msg, default=''):
+        """Return user input or default.
+
+        :return str:
+
+        """
+        msg = '%s %s ' % (self.prefix, msg)
+
+        if default != '':
+            msg += '[%s] ' % default
+
+        try:
+            vim.command('echohl Debug')
+            input_str = vim.eval('input("%s> ")' % msg)
+            vim.command('echohl none')
+        except KeyboardInterrupt:
+            input_str = ''
+
+        return input_str or default
+
+    def user_confirm(self, msg, yes=False):
+        """Get user confirmation.
+
+        :return bool:
+
+        """
+        default = 'yes' if yes else 'no'
+        action = self.user_input(msg, default)
+        return action and 'yes'.startswith(action)
+
+    def user_input_choices(self, msg, *options):
+        """Get one of many options.
+
+        :return str: A choosen option
+
+        """
+        choices = ['%s %s' % (self.prefix, msg)]
+        choices += [
+            "%s. %s" % (num, opt) for num, opt in enumerate(options, 1)]
+        try:
+            input_str = int(
+                vim.eval('inputlist(%s)' % self.prepare_value(choices)))
+        except (KeyboardInterrupt, ValueError):
+            input_str = 0
+
+        if not input_str:
+            self.message('Cancelled!')
+            return False
+
+        try:
+            return options[input_str - 1]
+        except (IndexError, ValueError):
+            self.error('Invalid option: %s' % input_str)
+            return self.user_input_choices(msg, *options)
+
+    @staticmethod
+    def error(msg):
+        """Show error to user."""
+        vim.command('call pymode#error("%s")' % str(msg))
+
+    def debug(self, msg, *args):
+        """Print debug information."""
+        if self.options.get('debug'):
+            print("%s %s [%s]" % (
+                int(time.time()), msg, ', '.join([str(a) for a in args])))
+
+    def stop(self, value=None):
+        """Break Vim function."""
+        cmd = 'return'
+        if value is not None:
+            cmd += ' ' + self.prepare_value(value)
+        vim.command(cmd)
+
+    def catch_exceptions(self, func):
+        """Decorator. Make execution more silence.
+
+        :return func:
+
+        """
+        def _wrapper(*args, **kwargs):
+            try:
+                return func(*args, **kwargs)
+            except (Exception, vim.error) as e: # noqa
+                if self.options.get('debug'):
+                    raise
+                self.error(e)
+                return None
+        return _wrapper
+
+    def run(self, name, *args):
+        """Run vim function."""
+        vim.command('call %s(%s)' % (name, ", ".join([
+            self.prepare_value(a) for a in args
+        ])))
+
+    def let(self, name, value):
+        """Set variable."""
+        cmd = 'let %s = %s' % (name, self.prepare_value(value))
+        self.debug(cmd)
+        vim.command(cmd)
+
+    def prepare_value(self, value, dumps=True):
+        """Decode bstr to vim encoding.
+
+        :return unicode string:
+
+        """
+        if dumps:
+            value = json.dumps(value)
+
+        if PY2:
+            value = value.decode('utf-8').encode(self.options.get('encoding'))
+
+        return value
+
+    def get_offset_params(self, cursor=None, base=""):
+        """Calculate current offset.
+
+        :return tuple: (source, offset)
+
+        """
+        row, col = cursor or env.cursor
+        source = ""
+        offset = 0
+        for i, line in enumerate(self.lines, 1):
+            if i == row:
+                source += line[:col] + base
+                offset = len(source)
+                source += line[col:]
+            else:
+                source += line
+            source += '\n'
+        env.debug('Get offset', base or None, row, col, offset)
+        return source, offset
+
+    @staticmethod
+    def goto_line(line):
+        """Go to line."""
+        vim.command('normal %sggzz' % line)
+
+    def goto_file(self, path, cmd='e', force=False):
+        """Open file by path."""
+        if force or os.path.abspath(path) != self.curbuf.name:
+            self.debug('read', path)
+            if ' ' in path and os.name == 'posix':
+                path = path.replace(' ', '\\ ')
+            vim.command("%s %s" % (cmd, path))
+
+    @staticmethod
+    def goto_buffer(bufnr):
+        """Open buffer."""
+        if str(bufnr) != '-1':
+            vim.command('buffer %s' % bufnr)
+
+
+env = VimPymodeEnviroment()
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/mccabe.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/mccabe.cpython-35.pyc
new file mode 100644
index 0000000..de10dcf
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/mccabe.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/pep257.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/pep257.cpython-35.pyc
new file mode 100644
index 0000000..7364e0c
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/pep257.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/pep8.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/pep8.cpython-35.pyc
new file mode 100644
index 0000000..5c076ee
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/pep8.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/six.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/six.cpython-35.pyc
new file mode 100644
index 0000000..283adf2
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/__pycache__/six.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/_markerlib/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/_markerlib/__init__.py
new file mode 100644
index 0000000..e2b237b
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/_markerlib/__init__.py
@@ -0,0 +1,16 @@
+try:
+    import ast
+    from _markerlib.markers import default_environment, compile, interpret
+except ImportError:
+    if 'ast' in globals():
+        raise
+    def default_environment():
+        return {}
+    def compile(marker):
+        def marker_fn(environment=None, override=None):
+            # 'empty markers are True' heuristic won't install extra deps.
+            return not marker.strip()
+        marker_fn.__doc__ = marker
+        return marker_fn
+    def interpret(marker, environment=None, override=None):
+        return compile(marker)()
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/_markerlib/markers.py b/vim-plugins/bundle/python-mode/pymode/libs/_markerlib/markers.py
new file mode 100644
index 0000000..fa83706
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/_markerlib/markers.py
@@ -0,0 +1,119 @@
+# -*- coding: utf-8 -*-
+"""Interpret PEP 345 environment markers.
+
+EXPR [in|==|!=|not in] EXPR [or|and] ...
+
+where EXPR belongs to any of those:
+
+    python_version = '%s.%s' % (sys.version_info[0], sys.version_info[1])
+    python_full_version = sys.version.split()[0]
+    os.name = os.name
+    sys.platform = sys.platform
+    platform.version = platform.version()
+    platform.machine = platform.machine()
+    platform.python_implementation = platform.python_implementation()
+    a free string, like '2.6', or 'win32'
+"""
+
+__all__ = ['default_environment', 'compile', 'interpret']
+
+import ast
+import os
+import platform
+import sys
+import weakref
+
+_builtin_compile = compile
+
+try:
+    from platform import python_implementation
+except ImportError:
+    if os.name == "java":
+        # Jython 2.5 has ast module, but not platform.python_implementation() function.
+        def python_implementation():
+            return "Jython"
+    else:
+        raise
+
+
+# restricted set of variables
+_VARS = {'sys.platform': sys.platform,
+         'python_version': '%s.%s' % sys.version_info[:2],
+         # FIXME parsing sys.platform is not reliable, but there is no other
+         # way to get e.g. 2.7.2+, and the PEP is defined with sys.version
+         'python_full_version': sys.version.split(' ', 1)[0],
+         'os.name': os.name,
+         'platform.version': platform.version(),
+         'platform.machine': platform.machine(),
+         'platform.python_implementation': python_implementation(),
+         'extra': None # wheel extension
+        }
+
+for var in list(_VARS.keys()):
+    if '.' in var:
+        _VARS[var.replace('.', '_')] = _VARS[var]
+
+def default_environment():
+    """Return copy of default PEP 385 globals dictionary."""
+    return dict(_VARS)
+
+class ASTWhitelist(ast.NodeTransformer):
+    def __init__(self, statement):
+        self.statement = statement # for error messages
+
+    ALLOWED = (ast.Compare, ast.BoolOp, ast.Attribute, ast.Name, ast.Load, ast.Str)
+    # Bool operations
+    ALLOWED += (ast.And, ast.Or)
+    # Comparison operations
+    ALLOWED += (ast.Eq, ast.Gt, ast.GtE, ast.In, ast.Is, ast.IsNot, ast.Lt, ast.LtE, ast.NotEq, ast.NotIn)
+
+    def visit(self, node):
+        """Ensure statement only contains allowed nodes."""
+        if not isinstance(node, self.ALLOWED):
+            raise SyntaxError('Not allowed in environment markers.\n%s\n%s' %
+                               (self.statement,
+                               (' ' * node.col_offset) + '^'))
+        return ast.NodeTransformer.visit(self, node)
+
+    def visit_Attribute(self, node):
+        """Flatten one level of attribute access."""
+        new_node = ast.Name("%s.%s" % (node.value.id, node.attr), node.ctx)
+        return ast.copy_location(new_node, node)
+
+def parse_marker(marker):
+    tree = ast.parse(marker, mode='eval')
+    new_tree = ASTWhitelist(marker).generic_visit(tree)
+    return new_tree
+
+def compile_marker(parsed_marker):
+    return _builtin_compile(parsed_marker, '<environment marker>', 'eval',
+                   dont_inherit=True)
+
+_cache = weakref.WeakValueDictionary()
+
+def compile(marker):
+    """Return compiled marker as a function accepting an environment dict."""
+    try:
+        return _cache[marker]
+    except KeyError:
+        pass
+    if not marker.strip():
+        def marker_fn(environment=None, override=None):
+            """"""
+            return True
+    else:
+        compiled_marker = compile_marker(parse_marker(marker))
+        def marker_fn(environment=None, override=None):
+            """override updates environment"""
+            if override is None:
+                override = {}
+            if environment is None:
+                environment = default_environment()
+            environment.update(override)
+            return eval(compiled_marker, environment)
+    marker_fn.__doc__ = marker
+    _cache[marker] = marker_fn
+    return _cache[marker]
+
+def interpret(marker, environment=None):
+    return compile(marker)(environment)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__init__.py
new file mode 100644
index 0000000..d4fd12c
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__init__.py
@@ -0,0 +1,131 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""Python Abstract Syntax Tree New Generation
+
+The aim of this module is to provide a common base representation of
+python source code for projects such as pychecker, pyreverse,
+pylint... Well, actually the development of this library is essentially
+governed by pylint's needs.
+
+It extends class defined in the python's _ast module with some
+additional methods and attributes. Instance attributes are added by a
+builder object, which can either generate extended ast (let's call
+them astroid ;) by visiting an existent ast tree or by inspecting living
+object. Methods are added by monkey patching ast classes.
+
+Main modules are:
+
+* nodes and scoped_nodes for more information about methods and
+  attributes added to different node classes
+
+* the manager contains a high level object to get astroid trees from
+  source files and living objects. It maintains a cache of previously
+  constructed tree for quick access
+
+* builder contains the class responsible to build astroid trees
+"""
+__doctype__ = "restructuredtext en"
+
+import sys
+import re
+from operator import attrgetter
+
+# WARNING: internal imports order matters !
+
+# make all exception classes accessible from astroid package
+from astroid.exceptions import *
+
+# make all node classes accessible from astroid package
+from astroid.nodes import *
+
+# trigger extra monkey-patching
+from astroid import inference
+
+# more stuff available
+from astroid import raw_building
+from astroid.bases import YES, Instance, BoundMethod, UnboundMethod
+from astroid.node_classes import are_exclusive, unpack_infer
+from astroid.scoped_nodes import builtin_lookup
+
+# make a manager instance (borg) as well as Project and Package classes
+# accessible from astroid package
+from astroid.manager import AstroidManager, Project
+MANAGER = AstroidManager()
+del AstroidManager
+
+# transform utilities (filters and decorator)
+
+class AsStringRegexpPredicate(object):
+    """Class to be used as predicate that may be given to `register_transform`
+
+    First argument is a regular expression that will be searched against the `as_string`
+    representation of the node onto which it's applied.
+
+    If specified, the second argument is an `attrgetter` expression that will be
+    applied on the node first to get the actual node on which `as_string` should
+    be called.
+
+    WARNING: This can be fairly slow, as it has to convert every AST node back
+    to Python code; you should consider examining the AST directly instead.
+    """
+    def __init__(self, regexp, expression=None):
+        self.regexp = re.compile(regexp)
+        self.expression = expression
+
+    def __call__(self, node):
+        if self.expression is not None:
+            node = attrgetter(self.expression)(node)
+        return self.regexp.search(node.as_string())
+
+def inference_tip(infer_function):
+    """Given an instance specific inference function, return a function to be
+    given to MANAGER.register_transform to set this inference function.
+
+    Typical usage
+
+    .. sourcecode:: python
+
+       MANAGER.register_transform(CallFunc, inference_tip(infer_named_tuple),
+                                  predicate)
+    """
+    def transform(node, infer_function=infer_function):
+        node._explicit_inference = infer_function
+        return node
+    return transform
+
+
+def register_module_extender(manager, module_name, get_extension_mod):
+    def transform(node):
+        extension_module = get_extension_mod()
+        for name, obj in extension_module.locals.items():
+            node.locals[name] = obj
+
+    manager.register_transform(Module, transform, lambda n: n.name == module_name)
+
+
+# load brain plugins
+from os import listdir
+from os.path import join, dirname
+BRAIN_MODULES_DIR = join(dirname(__file__), 'brain')
+if BRAIN_MODULES_DIR not in sys.path:
+    # add it to the end of the list so user path take precedence
+    sys.path.append(BRAIN_MODULES_DIR)
+# load modules in this directory
+for module in listdir(BRAIN_MODULES_DIR):
+    if module.endswith('.py'):
+        __import__(module[:-3])
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pkginfo__.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pkginfo__.py
new file mode 100644
index 0000000..3fb45aa
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pkginfo__.py
@@ -0,0 +1,42 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""astroid packaging information"""
+distname = 'astroid'
+
+modname = 'astroid'
+
+numversion = (1, 3, 8)
+version = '.'.join([str(num) for num in numversion])
+
+install_requires = ['logilab-common>=0.63.0', 'six']
+
+license = 'LGPL'
+
+author = 'Logilab'
+author_email = 'pylint-dev@lists.logilab.org'
+mailinglist = "mailto://%s" % author_email
+web = 'http://bitbucket.org/logilab/astroid'
+
+description = "A abstract syntax tree for Python with inference support."
+
+classifiers = ["Topic :: Software Development :: Libraries :: Python Modules",
+               "Topic :: Software Development :: Quality Assurance",
+               "Programming Language :: Python",
+               "Programming Language :: Python :: 2",
+               "Programming Language :: Python :: 3",
+              ]
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..0a3ecc5
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/__pkginfo__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/__pkginfo__.cpython-35.pyc
new file mode 100644
index 0000000..d81f7ac
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/__pkginfo__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/as_string.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/as_string.cpython-35.pyc
new file mode 100644
index 0000000..9fdcc8b
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/as_string.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/astpeephole.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/astpeephole.cpython-35.pyc
new file mode 100644
index 0000000..7eb18d9
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/astpeephole.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/bases.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/bases.cpython-35.pyc
new file mode 100644
index 0000000..79a08e4
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/bases.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/builder.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/builder.cpython-35.pyc
new file mode 100644
index 0000000..7f038d6
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/builder.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/exceptions.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/exceptions.cpython-35.pyc
new file mode 100644
index 0000000..c4c6587
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/exceptions.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/inference.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/inference.cpython-35.pyc
new file mode 100644
index 0000000..cc8fe9c
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/inference.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/manager.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/manager.cpython-35.pyc
new file mode 100644
index 0000000..ad0a553
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/manager.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/mixins.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/mixins.cpython-35.pyc
new file mode 100644
index 0000000..8e06b9d
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/mixins.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/modutils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/modutils.cpython-35.pyc
new file mode 100644
index 0000000..402af3a
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/modutils.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/node_classes.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/node_classes.cpython-35.pyc
new file mode 100644
index 0000000..f6ee025
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/node_classes.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/nodes.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/nodes.cpython-35.pyc
new file mode 100644
index 0000000..fbc0054
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/nodes.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/protocols.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/protocols.cpython-35.pyc
new file mode 100644
index 0000000..2f26c09
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/protocols.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/raw_building.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/raw_building.cpython-35.pyc
new file mode 100644
index 0000000..d4b700b
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/raw_building.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/rebuilder.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/rebuilder.cpython-35.pyc
new file mode 100644
index 0000000..5a8c546
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/rebuilder.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/scoped_nodes.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/scoped_nodes.cpython-35.pyc
new file mode 100644
index 0000000..1ed5c42
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/__pycache__/scoped_nodes.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/as_string.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/as_string.py
new file mode 100644
index 0000000..f627f9e
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/as_string.py
@@ -0,0 +1,499 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""This module renders Astroid nodes as string:
+
+* :func:`to_code` function return equivalent (hopefuly valid) python string
+
+* :func:`dump` function return an internal representation of nodes found
+  in the tree, useful for debugging or understanding the tree structure
+"""
+
+import sys
+
+INDENT = '    ' # 4 spaces ; keep indentation variable
+
+
+def dump(node, ids=False):
+    """print a nice astroid tree representation.
+
+    :param ids: if true, we also print the ids (usefull for debugging)
+    """
+    result = []
+    _repr_tree(node, result, ids=ids)
+    return "\n".join(result)
+
+def _repr_tree(node, result, indent='', _done=None, ids=False):
+    """built a tree representation of a node as a list of lines"""
+    if _done is None:
+        _done = set()
+    if not hasattr(node, '_astroid_fields'): # not a astroid node
+        return
+    if node in _done:
+        result.append(indent + 'loop in tree: %s' % node)
+        return
+    _done.add(node)
+    node_str = str(node)
+    if ids:
+        node_str += '  . \t%x' % id(node)
+    result.append(indent + node_str)
+    indent += INDENT
+    for field in node._astroid_fields:
+        value = getattr(node, field)
+        if isinstance(value, (list, tuple)):
+            result.append(indent + field + " = [")
+            for child in value:
+                if isinstance(child, (list, tuple)):
+                    # special case for Dict # FIXME
+                    _repr_tree(child[0], result, indent, _done, ids)
+                    _repr_tree(child[1], result, indent, _done, ids)
+                    result.append(indent + ',')
+                else:
+                    _repr_tree(child, result, indent, _done, ids)
+            result.append(indent + "]")
+        else:
+            result.append(indent + field + " = ")
+            _repr_tree(value, result, indent, _done, ids)
+
+
+class AsStringVisitor(object):
+    """Visitor to render an Astroid node as a valid python code string"""
+
+    def __call__(self, node):
+        """Makes this visitor behave as a simple function"""
+        return node.accept(self)
+
+    def _stmt_list(self, stmts):
+        """return a list of nodes to string"""
+        stmts = '\n'.join([nstr for nstr in [n.accept(self) for n in stmts] if nstr])
+        return INDENT + stmts.replace('\n', '\n'+INDENT)
+
+
+    ## visit_<node> methods ###########################################
+
+    def visit_arguments(self, node):
+        """return an astroid.Function node as string"""
+        return node.format_args()
+
+    def visit_assattr(self, node):
+        """return an astroid.AssAttr node as string"""
+        return self.visit_getattr(node)
+
+    def visit_assert(self, node):
+        """return an astroid.Assert node as string"""
+        if node.fail:
+            return 'assert %s, %s' % (node.test.accept(self),
+                                      node.fail.accept(self))
+        return 'assert %s' % node.test.accept(self)
+
+    def visit_assname(self, node):
+        """return an astroid.AssName node as string"""
+        return node.name
+
+    def visit_assign(self, node):
+        """return an astroid.Assign node as string"""
+        lhs = ' = '.join([n.accept(self) for n in node.targets])
+        return '%s = %s' % (lhs, node.value.accept(self))
+
+    def visit_augassign(self, node):
+        """return an astroid.AugAssign node as string"""
+        return '%s %s %s' % (node.target.accept(self), node.op, node.value.accept(self))
+
+    def visit_backquote(self, node):
+        """return an astroid.Backquote node as string"""
+        return '`%s`' % node.value.accept(self)
+
+    def visit_binop(self, node):
+        """return an astroid.BinOp node as string"""
+        return '(%s) %s (%s)' % (node.left.accept(self), node.op, node.right.accept(self))
+
+    def visit_boolop(self, node):
+        """return an astroid.BoolOp node as string"""
+        return (' %s ' % node.op).join(['(%s)' % n.accept(self)
+                                        for n in node.values])
+
+    def visit_break(self, node):
+        """return an astroid.Break node as string"""
+        return 'break'
+
+    def visit_callfunc(self, node):
+        """return an astroid.CallFunc node as string"""
+        expr_str = node.func.accept(self)
+        args = [arg.accept(self) for arg in node.args]
+        if node.starargs:
+            args.append('*' + node.starargs.accept(self))
+        if node.kwargs:
+            args.append('**' + node.kwargs.accept(self))
+        return '%s(%s)' % (expr_str, ', '.join(args))
+
+    def visit_class(self, node):
+        """return an astroid.Class node as string"""
+        decorate = node.decorators and node.decorators.accept(self)  or ''
+        bases = ', '.join([n.accept(self) for n in node.bases])
+        if sys.version_info[0] == 2:
+            bases = bases and '(%s)' % bases or ''
+        else:
+            metaclass = node.metaclass()
+            if metaclass and not node.has_metaclass_hack():
+                if bases:
+                    bases = '(%s, metaclass=%s)' % (bases, metaclass.name)
+                else:
+                    bases = '(metaclass=%s)' % metaclass.name
+            else:
+                bases = bases and '(%s)' % bases or ''
+        docs = node.doc and '\n%s"""%s"""' % (INDENT, node.doc) or ''
+        return '\n\n%sclass %s%s:%s\n%s\n' % (decorate, node.name, bases, docs,
+                                              self._stmt_list(node.body))
+
+    def visit_compare(self, node):
+        """return an astroid.Compare node as string"""
+        rhs_str = ' '.join(['%s %s' % (op, expr.accept(self))
+                            for op, expr in node.ops])
+        return '%s %s' % (node.left.accept(self), rhs_str)
+
+    def visit_comprehension(self, node):
+        """return an astroid.Comprehension node as string"""
+        ifs = ''.join([' if %s' % n.accept(self) for n in node.ifs])
+        return 'for %s in %s%s' % (node.target.accept(self),
+                                   node.iter.accept(self), ifs)
+
+    def visit_const(self, node):
+        """return an astroid.Const node as string"""
+        return repr(node.value)
+
+    def visit_continue(self, node):
+        """return an astroid.Continue node as string"""
+        return 'continue'
+
+    def visit_delete(self, node): # XXX check if correct
+        """return an astroid.Delete node as string"""
+        return 'del %s' % ', '.join([child.accept(self)
+                                     for child in node.targets])
+
+    def visit_delattr(self, node):
+        """return an astroid.DelAttr node as string"""
+        return self.visit_getattr(node)
+
+    def visit_delname(self, node):
+        """return an astroid.DelName node as string"""
+        return node.name
+
+    def visit_decorators(self, node):
+        """return an astroid.Decorators node as string"""
+        return '@%s\n' % '\n@'.join([item.accept(self) for item in node.nodes])
+
+    def visit_dict(self, node):
+        """return an astroid.Dict node as string"""
+        return '{%s}' % ', '.join(['%s: %s' % (key.accept(self),
+                                               value.accept(self))
+                                   for key, value in node.items])
+
+    def visit_dictcomp(self, node):
+        """return an astroid.DictComp node as string"""
+        return '{%s: %s %s}' % (node.key.accept(self), node.value.accept(self),
+                                ' '.join([n.accept(self) for n in node.generators]))
+
+    def visit_discard(self, node):
+        """return an astroid.Discard node as string"""
+        return node.value.accept(self)
+
+    def visit_emptynode(self, node):
+        """dummy method for visiting an Empty node"""
+        return ''
+
+    def visit_excepthandler(self, node):
+        if node.type:
+            if node.name:
+                excs = 'except %s, %s' % (node.type.accept(self),
+                                          node.name.accept(self))
+            else:
+                excs = 'except %s' % node.type.accept(self)
+        else:
+            excs = 'except'
+        return '%s:\n%s' % (excs, self._stmt_list(node.body))
+
+    def visit_ellipsis(self, node):
+        """return an astroid.Ellipsis node as string"""
+        return '...'
+
+    def visit_empty(self, node):
+        """return an Empty node as string"""
+        return ''
+
+    def visit_exec(self, node):
+        """return an astroid.Exec node as string"""
+        if node.locals:
+            return 'exec %s in %s, %s' % (node.expr.accept(self),
+                                          node.locals.accept(self),
+                                          node.globals.accept(self))
+        if node.globals:
+            return 'exec %s in %s' % (node.expr.accept(self),
+                                      node.globals.accept(self))
+        return 'exec %s' % node.expr.accept(self)
+
+    def visit_extslice(self, node):
+        """return an astroid.ExtSlice node as string"""
+        return ','.join([dim.accept(self) for dim in node.dims])
+
+    def visit_for(self, node):
+        """return an astroid.For node as string"""
+        fors = 'for %s in %s:\n%s' % (node.target.accept(self),
+                                      node.iter.accept(self),
+                                      self._stmt_list(node.body))
+        if node.orelse:
+            fors = '%s\nelse:\n%s' % (fors, self._stmt_list(node.orelse))
+        return fors
+
+    def visit_from(self, node):
+        """return an astroid.From node as string"""
+        return 'from %s import %s' % ('.' * (node.level or 0) + node.modname,
+                                      _import_string(node.names))
+
+    def visit_function(self, node):
+        """return an astroid.Function node as string"""
+        decorate = node.decorators and node.decorators.accept(self)  or ''
+        docs = node.doc and '\n%s"""%s"""' % (INDENT, node.doc) or ''
+        return '\n%sdef %s(%s):%s\n%s' % (decorate, node.name, node.args.accept(self),
+                                          docs, self._stmt_list(node.body))
+
+    def visit_genexpr(self, node):
+        """return an astroid.GenExpr node as string"""
+        return '(%s %s)' % (node.elt.accept(self),
+                            ' '.join([n.accept(self) for n in node.generators]))
+
+    def visit_getattr(self, node):
+        """return an astroid.Getattr node as string"""
+        return '%s.%s' % (node.expr.accept(self), node.attrname)
+
+    def visit_global(self, node):
+        """return an astroid.Global node as string"""
+        return 'global %s' % ', '.join(node.names)
+
+    def visit_if(self, node):
+        """return an astroid.If node as string"""
+        ifs = ['if %s:\n%s' % (node.test.accept(self), self._stmt_list(node.body))]
+        if node.orelse:# XXX use elif ???
+            ifs.append('else:\n%s' % self._stmt_list(node.orelse))
+        return '\n'.join(ifs)
+
+    def visit_ifexp(self, node):
+        """return an astroid.IfExp node as string"""
+        return '%s if %s else %s' % (node.body.accept(self),
+                                     node.test.accept(self),
+                                     node.orelse.accept(self))
+
+    def visit_import(self, node):
+        """return an astroid.Import node as string"""
+        return 'import %s' % _import_string(node.names)
+
+    def visit_keyword(self, node):
+        """return an astroid.Keyword node as string"""
+        return '%s=%s' % (node.arg, node.value.accept(self))
+
+    def visit_lambda(self, node):
+        """return an astroid.Lambda node as string"""
+        return 'lambda %s: %s' % (node.args.accept(self),
+                                  node.body.accept(self))
+
+    def visit_list(self, node):
+        """return an astroid.List node as string"""
+        return '[%s]' % ', '.join([child.accept(self) for child in node.elts])
+
+    def visit_listcomp(self, node):
+        """return an astroid.ListComp node as string"""
+        return '[%s %s]' % (node.elt.accept(self),
+                            ' '.join([n.accept(self) for n in node.generators]))
+
+    def visit_module(self, node):
+        """return an astroid.Module node as string"""
+        docs = node.doc and '"""%s"""\n\n' % node.doc or ''
+        return docs + '\n'.join([n.accept(self) for n in node.body]) + '\n\n'
+
+    def visit_name(self, node):
+        """return an astroid.Name node as string"""
+        return node.name
+
+    def visit_pass(self, node):
+        """return an astroid.Pass node as string"""
+        return 'pass'
+
+    def visit_print(self, node):
+        """return an astroid.Print node as string"""
+        nodes = ', '.join([n.accept(self) for n in node.values])
+        if not node.nl:
+            nodes = '%s,' % nodes
+        if node.dest:
+            return 'print >> %s, %s' % (node.dest.accept(self), nodes)
+        return 'print %s' % nodes
+
+    def visit_raise(self, node):
+        """return an astroid.Raise node as string"""
+        if node.exc:
+            if node.inst:
+                if node.tback:
+                    return 'raise %s, %s, %s' % (node.exc.accept(self),
+                                                 node.inst.accept(self),
+                                                 node.tback.accept(self))
+                return 'raise %s, %s' % (node.exc.accept(self),
+                                         node.inst.accept(self))
+            return 'raise %s' % node.exc.accept(self)
+        return 'raise'
+
+    def visit_return(self, node):
+        """return an astroid.Return node as string"""
+        if node.value:
+            return 'return %s' % node.value.accept(self)
+        else:
+            return 'return'
+
+    def visit_index(self, node):
+        """return a astroid.Index node as string"""
+        return node.value.accept(self)
+
+    def visit_set(self, node):
+        """return an astroid.Set node as string"""
+        return '{%s}' % ', '.join([child.accept(self) for child in node.elts])
+
+    def visit_setcomp(self, node):
+        """return an astroid.SetComp node as string"""
+        return '{%s %s}' % (node.elt.accept(self),
+                            ' '.join([n.accept(self) for n in node.generators]))
+
+    def visit_slice(self, node):
+        """return a astroid.Slice node as string"""
+        lower = node.lower and node.lower.accept(self) or ''
+        upper = node.upper and node.upper.accept(self) or ''
+        step = node.step and node.step.accept(self) or ''
+        if step:
+            return '%s:%s:%s' % (lower, upper, step)
+        return  '%s:%s' % (lower, upper)
+
+    def visit_subscript(self, node):
+        """return an astroid.Subscript node as string"""
+        return '%s[%s]' % (node.value.accept(self), node.slice.accept(self))
+
+    def visit_tryexcept(self, node):
+        """return an astroid.TryExcept node as string"""
+        trys = ['try:\n%s' % self._stmt_list(node.body)]
+        for handler in node.handlers:
+            trys.append(handler.accept(self))
+        if node.orelse:
+            trys.append('else:\n%s' % self._stmt_list(node.orelse))
+        return '\n'.join(trys)
+
+    def visit_tryfinally(self, node):
+        """return an astroid.TryFinally node as string"""
+        return 'try:\n%s\nfinally:\n%s' % (self._stmt_list(node.body),
+                                           self._stmt_list(node.finalbody))
+
+    def visit_tuple(self, node):
+        """return an astroid.Tuple node as string"""
+        if len(node.elts) == 1:
+            return '(%s, )' % node.elts[0].accept(self)
+        return '(%s)' % ', '.join([child.accept(self) for child in node.elts])
+
+    def visit_unaryop(self, node):
+        """return an astroid.UnaryOp node as string"""
+        if node.op == 'not':
+            operator = 'not '
+        else:
+            operator = node.op
+        return '%s%s' % (operator, node.operand.accept(self))
+
+    def visit_while(self, node):
+        """return an astroid.While node as string"""
+        whiles = 'while %s:\n%s' % (node.test.accept(self),
+                                    self._stmt_list(node.body))
+        if node.orelse:
+            whiles = '%s\nelse:\n%s' % (whiles, self._stmt_list(node.orelse))
+        return whiles
+
+    def visit_with(self, node): # 'with' without 'as' is possible
+        """return an astroid.With node as string"""
+        items = ', '.join(('(%s)' % expr.accept(self)) +
+                          (vars and ' as (%s)' % (vars.accept(self)) or '')
+                          for expr, vars in node.items)
+        return 'with %s:\n%s' % (items, self._stmt_list(node.body))
+
+    def visit_yield(self, node):
+        """yield an ast.Yield node as string"""
+        yi_val = node.value and (" " + node.value.accept(self)) or ""
+        expr = 'yield' + yi_val
+        if node.parent.is_statement:
+            return expr
+        else:
+            return "(%s)" % (expr,)
+
+
+class AsStringVisitor3k(AsStringVisitor):
+    """AsStringVisitor3k overwrites some AsStringVisitor methods"""
+
+    def visit_excepthandler(self, node):
+        if node.type:
+            if node.name:
+                excs = 'except %s as %s' % (node.type.accept(self),
+                                            node.name.accept(self))
+            else:
+                excs = 'except %s' % node.type.accept(self)
+        else:
+            excs = 'except'
+        return '%s:\n%s' % (excs, self._stmt_list(node.body))
+
+    def visit_nonlocal(self, node):
+        """return an astroid.Nonlocal node as string"""
+        return 'nonlocal %s' % ', '.join(node.names)
+
+    def visit_raise(self, node):
+        """return an astroid.Raise node as string"""
+        if node.exc:
+            if node.cause:
+                return 'raise %s from %s' % (node.exc.accept(self),
+                                             node.cause.accept(self))
+            return 'raise %s' % node.exc.accept(self)
+        return 'raise'
+
+    def visit_starred(self, node):
+        """return Starred node as string"""
+        return "*" + node.value.accept(self)
+
+    def visit_yieldfrom(self, node):
+        """ Return an astroid.YieldFrom node as string. """
+        yi_val = node.value and (" " + node.value.accept(self)) or ""
+        expr = 'yield from' + yi_val
+        if node.parent.is_statement:
+            return expr
+        else:
+            return "(%s)" % (expr,)
+
+
+def _import_string(names):
+    """return a list of (name, asname) formatted as a string"""
+    _names = []
+    for name, asname in names:
+        if asname is not None:
+            _names.append('%s as %s' % (name, asname))
+        else:
+            _names.append(name)
+    return  ', '.join(_names)
+
+
+if sys.version_info >= (3, 0):
+    AsStringVisitor = AsStringVisitor3k
+
+# this visitor is stateless, thus it can be reused
+to_code = AsStringVisitor()
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/astpeephole.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/astpeephole.py
new file mode 100644
index 0000000..af03462
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/astpeephole.py
@@ -0,0 +1,86 @@
+# copyright 2003-2015 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""Small AST optimizations."""
+
+import _ast
+
+from astroid import nodes
+
+
+__all__ = ('ASTPeepholeOptimizer', )
+
+
+try:
+    _TYPES = (_ast.Str, _ast.Bytes)
+except AttributeError:
+    _TYPES = (_ast.Str, )
+
+
+class ASTPeepholeOptimizer(object):
+    """Class for applying small optimizations to generate new AST."""
+
+    def optimize_binop(self, node):
+        """Optimize BinOps with string Const nodes on the lhs.
+
+        This fixes an infinite recursion crash, where multiple
+        strings are joined using the addition operator. With a
+        sufficient number of such strings, astroid will fail
+        with a maximum recursion limit exceeded. The
+        function will return a Const node with all the strings
+        already joined.
+        Return ``None`` if no AST node can be obtained
+        through optimization.
+        """
+        ast_nodes = []
+        current = node
+        while isinstance(current, _ast.BinOp):
+            # lhs must be a BinOp with the addition operand.
+            if not isinstance(current.left, _ast.BinOp):
+                return
+            if (not isinstance(current.left.op, _ast.Add)
+                    or not isinstance(current.op, _ast.Add)):
+                return
+
+            # rhs must a str / bytes.
+            if not isinstance(current.right, _TYPES):
+                return
+
+            ast_nodes.append(current.right.s)
+            current = current.left
+
+            if (isinstance(current, _ast.BinOp)
+                    and isinstance(current.left, _TYPES)
+                    and isinstance(current.right, _TYPES)):
+                # Stop early if we are at the last BinOp in
+                # the operation
+                ast_nodes.append(current.right.s)
+                ast_nodes.append(current.left.s)
+                break
+
+        if not ast_nodes:
+            return
+
+        # If we have inconsistent types, bail out.
+        known = type(ast_nodes[0])
+        if any(type(element) is not known
+               for element in ast_nodes[1:]):
+            return
+
+        value = known().join(reversed(ast_nodes))
+        newnode = nodes.Const(value)
+        return newnode
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/bases.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/bases.py
new file mode 100644
index 0000000..ee8ee1c
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/bases.py
@@ -0,0 +1,652 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""This module contains base classes and functions for the nodes and some
+inference utils.
+"""
+
+__docformat__ = "restructuredtext en"
+
+import sys
+from contextlib import contextmanager
+
+from logilab.common.decorators import cachedproperty
+
+from astroid.exceptions import (InferenceError, AstroidError, NotFoundError,
+                                UnresolvableName, UseInferenceDefault)
+
+
+if sys.version_info >= (3, 0):
+    BUILTINS = 'builtins'
+else:
+    BUILTINS = '__builtin__'
+
+
+class Proxy(object):
+    """a simple proxy object"""
+
+    _proxied = None # proxied object may be set by class or by instance
+
+    def __init__(self, proxied=None):
+        if proxied is not None:
+            self._proxied = proxied
+
+    def __getattr__(self, name):
+        if name == '_proxied':
+            return getattr(self.__class__, '_proxied')
+        if name in self.__dict__:
+            return self.__dict__[name]
+        return getattr(self._proxied, name)
+
+    def infer(self, context=None):
+        yield self
+
+
+# Inference ##################################################################
+
+class InferenceContext(object):
+    __slots__ = ('path', 'lookupname', 'callcontext', 'boundnode', 'infered')
+
+    def __init__(self, path=None, infered=None):
+        self.path = path or set()
+        self.lookupname = None
+        self.callcontext = None
+        self.boundnode = None
+        self.infered = infered or {}
+
+    def push(self, node):
+        name = self.lookupname
+        if (node, name) in self.path:
+            raise StopIteration()
+        self.path.add((node, name))
+
+    def clone(self):
+        # XXX copy lookupname/callcontext ?
+        clone = InferenceContext(self.path, infered=self.infered)
+        clone.callcontext = self.callcontext
+        clone.boundnode = self.boundnode
+        return clone
+
+    def cache_generator(self, key, generator):
+        results = []
+        for result in generator:
+            results.append(result)
+            yield result
+
+        self.infered[key] = tuple(results)
+        return
+
+    @contextmanager
+    def restore_path(self):
+        path = set(self.path)
+        yield
+        self.path = path
+
+def copy_context(context):
+    if context is not None:
+        return context.clone()
+    else:
+        return InferenceContext()
+
+
+def _infer_stmts(stmts, context, frame=None):
+    """return an iterator on statements inferred by each statement in <stmts>
+    """
+    stmt = None
+    infered = False
+    if context is not None:
+        name = context.lookupname
+        context = context.clone()
+    else:
+        name = None
+        context = InferenceContext()
+    for stmt in stmts:
+        if stmt is YES:
+            yield stmt
+            infered = True
+            continue
+        context.lookupname = stmt._infer_name(frame, name)
+        try:
+            for infered in stmt.infer(context):
+                yield infered
+                infered = True
+        except UnresolvableName:
+            continue
+        except InferenceError:
+            yield YES
+            infered = True
+    if not infered:
+        raise InferenceError(str(stmt))
+
+
+# special inference objects (e.g. may be returned as nodes by .infer()) #######
+
+class _Yes(object):
+    """a yes object"""
+    def __repr__(self):
+        return 'YES'
+    def __getattribute__(self, name):
+        if name == 'next':
+            raise AttributeError('next method should not be called')
+        if name.startswith('__') and name.endswith('__'):
+            # to avoid inspection pb
+            return super(_Yes, self).__getattribute__(name)
+        return self
+    def __call__(self, *args, **kwargs):
+        return self
+
+
+YES = _Yes()
+
+
+class Instance(Proxy):
+    """a special node representing a class instance"""
+    def getattr(self, name, context=None, lookupclass=True):
+        try:
+            values = self._proxied.instance_attr(name, context)
+        except NotFoundError:
+            if name == '__class__':
+                return [self._proxied]
+            if lookupclass:
+                # class attributes not available through the instance
+                # unless they are explicitly defined
+                if name in ('__name__', '__bases__', '__mro__', '__subclasses__'):
+                    return self._proxied.local_attr(name)
+                return self._proxied.getattr(name, context)
+            raise NotFoundError(name)
+        # since we've no context information, return matching class members as
+        # well
+        if lookupclass:
+            try:
+                return values + self._proxied.getattr(name, context)
+            except NotFoundError:
+                pass
+        return values
+
+    def igetattr(self, name, context=None):
+        """inferred getattr"""
+        if not context:
+            context = InferenceContext()
+        try:
+            # avoid recursively inferring the same attr on the same class
+
+            context.push((self._proxied, name))
+            # XXX frame should be self._proxied, or not ?
+            get_attr = self.getattr(name, context, lookupclass=False)
+            return _infer_stmts(
+                self._wrap_attr(get_attr, context),
+                context,
+                frame=self,
+            )
+        except NotFoundError:
+            try:
+                # fallback to class'igetattr since it has some logic to handle
+                # descriptors
+                return self._wrap_attr(self._proxied.igetattr(name, context),
+                                       context)
+            except NotFoundError:
+                raise InferenceError(name)
+
+    def _wrap_attr(self, attrs, context=None):
+        """wrap bound methods of attrs in a InstanceMethod proxies"""
+        for attr in attrs:
+            if isinstance(attr, UnboundMethod):
+                if BUILTINS + '.property' in attr.decoratornames():
+                    for infered in attr.infer_call_result(self, context):
+                        yield infered
+                else:
+                    yield BoundMethod(attr, self)
+            else:
+                yield attr
+
+    def infer_call_result(self, caller, context=None):
+        """infer what a class instance is returning when called"""
+        infered = False
+        for node in self._proxied.igetattr('__call__', context):
+            if node is YES:
+                continue
+            for res in node.infer_call_result(caller, context):
+                infered = True
+                yield res
+        if not infered:
+            raise InferenceError()
+
+    def __repr__(self):
+        return '<Instance of %s.%s at 0x%s>' % (self._proxied.root().name,
+                                                self._proxied.name,
+                                                id(self))
+    def __str__(self):
+        return 'Instance of %s.%s' % (self._proxied.root().name,
+                                      self._proxied.name)
+
+    def callable(self):
+        try:
+            self._proxied.getattr('__call__')
+            return True
+        except NotFoundError:
+            return False
+
+    def pytype(self):
+        return self._proxied.qname()
+
+    def display_type(self):
+        return 'Instance of'
+
+
+class UnboundMethod(Proxy):
+    """a special node representing a method not bound to an instance"""
+    def __repr__(self):
+        frame = self._proxied.parent.frame()
+        return '<%s %s of %s at 0x%s' % (self.__class__.__name__,
+                                         self._proxied.name,
+                                         frame.qname(), id(self))
+
+    def is_bound(self):
+        return False
+
+    def getattr(self, name, context=None):
+        if name == 'im_func':
+            return [self._proxied]
+        return super(UnboundMethod, self).getattr(name, context)
+
+    def igetattr(self, name, context=None):
+        if name == 'im_func':
+            return iter((self._proxied,))
+        return super(UnboundMethod, self).igetattr(name, context)
+
+    def infer_call_result(self, caller, context):
+        # If we're unbound method __new__ of builtin object, the result is an
+        # instance of the class given as first argument.
+        if (self._proxied.name == '__new__' and
+                self._proxied.parent.frame().qname() == '%s.object' % BUILTINS):
+            infer = caller.args[0].infer() if caller.args else []
+            return ((x is YES and x or Instance(x)) for x in infer)
+        return self._proxied.infer_call_result(caller, context)
+
+
+class BoundMethod(UnboundMethod):
+    """a special node representing a method bound to an instance"""
+    def __init__(self, proxy, bound):
+        UnboundMethod.__init__(self, proxy)
+        self.bound = bound
+
+    def is_bound(self):
+        return True
+
+    def infer_call_result(self, caller, context):
+        context = context.clone()
+        context.boundnode = self.bound
+        return self._proxied.infer_call_result(caller, context)
+
+
+class Generator(Instance):
+    """a special node representing a generator.
+
+    Proxied class is set once for all in raw_building.
+    """
+    def callable(self):
+        return False
+
+    def pytype(self):
+        return '%s.generator' % BUILTINS
+
+    def display_type(self):
+        return 'Generator'
+
+    def __repr__(self):
+        return '<Generator(%s) l.%s at 0x%s>' % (self._proxied.name, self.lineno, id(self))
+
+    def __str__(self):
+        return 'Generator(%s)' % (self._proxied.name)
+
+
+# decorators ##################################################################
+
+def path_wrapper(func):
+    """return the given infer function wrapped to handle the path"""
+    def wrapped(node, context=None, _func=func, **kwargs):
+        """wrapper function handling context"""
+        if context is None:
+            context = InferenceContext()
+        context.push(node)
+        yielded = set()
+        for res in _func(node, context, **kwargs):
+            # unproxy only true instance, not const, tuple, dict...
+            if res.__class__ is Instance:
+                ares = res._proxied
+            else:
+                ares = res
+            if not ares in yielded:
+                yield res
+                yielded.add(ares)
+    return wrapped
+
+def yes_if_nothing_infered(func):
+    def wrapper(*args, **kwargs):
+        infered = False
+        for node in func(*args, **kwargs):
+            infered = True
+            yield node
+        if not infered:
+            yield YES
+    return wrapper
+
+def raise_if_nothing_infered(func):
+    def wrapper(*args, **kwargs):
+        infered = False
+        for node in func(*args, **kwargs):
+            infered = True
+            yield node
+        if not infered:
+            raise InferenceError()
+    return wrapper
+
+
+# Node  ######################################################################
+
+class NodeNG(object):
+    """Base Class for all Astroid node classes.
+
+    It represents a node of the new abstract syntax tree.
+    """
+    is_statement = False
+    optional_assign = False # True  for For (and for Comprehension if py <3.0)
+    is_function = False # True for Function nodes
+    # attributes below are set by the builder module or by raw factories
+    lineno = None
+    fromlineno = None
+    tolineno = None
+    col_offset = None
+    # parent node in the tree
+    parent = None
+    # attributes containing child node(s) redefined in most concrete classes:
+    _astroid_fields = ()
+    # instance specific inference function infer(node, context)
+    _explicit_inference = None
+
+    def infer(self, context=None, **kwargs):
+        """main interface to the interface system, return a generator on infered
+        values.
+
+        If the instance has some explicit inference function set, it will be
+        called instead of the default interface.
+        """
+        if self._explicit_inference is not None:
+            # explicit_inference is not bound, give it self explicitly
+            try:
+                return self._explicit_inference(self, context, **kwargs)
+            except UseInferenceDefault:
+                pass
+
+        if not context:
+            return self._infer(context, **kwargs)
+
+        key = (self, context.lookupname,
+               context.callcontext, context.boundnode)
+        if key in context.infered:
+            return iter(context.infered[key])
+
+        return context.cache_generator(key, self._infer(context, **kwargs))
+
+    def _repr_name(self):
+        """return self.name or self.attrname or '' for nice representation"""
+        return getattr(self, 'name', getattr(self, 'attrname', ''))
+
+    def __str__(self):
+        return '%s(%s)' % (self.__class__.__name__, self._repr_name())
+
+    def __repr__(self):
+        return '<%s(%s) l.%s [%s] at 0x%x>' % (self.__class__.__name__,
+                                               self._repr_name(),
+                                               self.fromlineno,
+                                               self.root().name,
+                                               id(self))
+
+
+    def accept(self, visitor):
+        func = getattr(visitor, "visit_" + self.__class__.__name__.lower())
+        return func(self)
+
+    def get_children(self):
+        for field in self._astroid_fields:
+            attr = getattr(self, field)
+            if attr is None:
+                continue
+            if isinstance(attr, (list, tuple)):
+                for elt in attr:
+                    yield elt
+            else:
+                yield attr
+
+    def last_child(self):
+        """an optimized version of list(get_children())[-1]"""
+        for field in self._astroid_fields[::-1]:
+            attr = getattr(self, field)
+            if not attr: # None or empty listy / tuple
+                continue
+            if attr.__class__ in (list, tuple):
+                return attr[-1]
+            else:
+                return attr
+        return None
+
+    def parent_of(self, node):
+        """return true if i'm a parent of the given node"""
+        parent = node.parent
+        while parent is not None:
+            if self is parent:
+                return True
+            parent = parent.parent
+        return False
+
+    def statement(self):
+        """return the first parent node marked as statement node"""
+        if self.is_statement:
+            return self
+        return self.parent.statement()
+
+    def frame(self):
+        """return the first parent frame node (i.e. Module, Function or Class)
+        """
+        return self.parent.frame()
+
+    def scope(self):
+        """return the first node defining a new scope (i.e. Module, Function,
+        Class, Lambda but also GenExpr)
+        """
+        return self.parent.scope()
+
+    def root(self):
+        """return the root node of the tree, (i.e. a Module)"""
+        if self.parent:
+            return self.parent.root()
+        return self
+
+    def child_sequence(self, child):
+        """search for the right sequence where the child lies in"""
+        for field in self._astroid_fields:
+            node_or_sequence = getattr(self, field)
+            if node_or_sequence is child:
+                return [node_or_sequence]
+            # /!\ compiler.ast Nodes have an __iter__ walking over child nodes
+            if isinstance(node_or_sequence, (tuple, list)) and child in node_or_sequence:
+                return node_or_sequence
+        else:
+            msg = 'Could not find %s in %s\'s children'
+            raise AstroidError(msg % (repr(child), repr(self)))
+
+    def locate_child(self, child):
+        """return a 2-uple (child attribute name, sequence or node)"""
+        for field in self._astroid_fields:
+            node_or_sequence = getattr(self, field)
+            # /!\ compiler.ast Nodes have an __iter__ walking over child nodes
+            if child is node_or_sequence:
+                return field, child
+            if isinstance(node_or_sequence, (tuple, list)) and child in node_or_sequence:
+                return field, node_or_sequence
+        msg = 'Could not find %s in %s\'s children'
+        raise AstroidError(msg % (repr(child), repr(self)))
+    # FIXME : should we merge child_sequence and locate_child ? locate_child
+    # is only used in are_exclusive, child_sequence one time in pylint.
+
+    def next_sibling(self):
+        """return the next sibling statement"""
+        return self.parent.next_sibling()
+
+    def previous_sibling(self):
+        """return the previous sibling statement"""
+        return self.parent.previous_sibling()
+
+    def nearest(self, nodes):
+        """return the node which is the nearest before this one in the
+        given list of nodes
+        """
+        myroot = self.root()
+        mylineno = self.fromlineno
+        nearest = None, 0
+        for node in nodes:
+            assert node.root() is myroot, \
+                   'nodes %s and %s are not from the same module' % (self, node)
+            lineno = node.fromlineno
+            if node.fromlineno > mylineno:
+                break
+            if lineno > nearest[1]:
+                nearest = node, lineno
+        # FIXME: raise an exception if nearest is None ?
+        return nearest[0]
+
+    # these are lazy because they're relatively expensive to compute for every
+    # single node, and they rarely get looked at
+
+    @cachedproperty
+    def fromlineno(self):
+        if self.lineno is None:
+            return self._fixed_source_line()
+        else:
+            return self.lineno
+
+    @cachedproperty
+    def tolineno(self):
+        if not self._astroid_fields:
+            # can't have children
+            lastchild = None
+        else:
+            lastchild = self.last_child()
+        if lastchild is None:
+            return self.fromlineno
+        else:
+            return lastchild.tolineno
+
+        # TODO / FIXME:
+        assert self.fromlineno is not None, self
+        assert self.tolineno is not None, self
+
+    def _fixed_source_line(self):
+        """return the line number where the given node appears
+
+        we need this method since not all nodes have the lineno attribute
+        correctly set...
+        """
+        line = self.lineno
+        _node = self
+        try:
+            while line is None:
+                _node = next(_node.get_children())
+                line = _node.lineno
+        except StopIteration:
+            _node = self.parent
+            while _node and line is None:
+                line = _node.lineno
+                _node = _node.parent
+        return line
+
+    def block_range(self, lineno):
+        """handle block line numbers range for non block opening statements
+        """
+        return lineno, self.tolineno
+
+    def set_local(self, name, stmt):
+        """delegate to a scoped parent handling a locals dictionary"""
+        self.parent.set_local(name, stmt)
+
+    def nodes_of_class(self, klass, skip_klass=None):
+        """return an iterator on nodes which are instance of the given class(es)
+
+        klass may be a class object or a tuple of class objects
+        """
+        if isinstance(self, klass):
+            yield self
+        for child_node in self.get_children():
+            if skip_klass is not None and isinstance(child_node, skip_klass):
+                continue
+            for matching in child_node.nodes_of_class(klass, skip_klass):
+                yield matching
+
+    def _infer_name(self, frame, name):
+        # overridden for From, Import, Global, TryExcept and Arguments
+        return None
+
+    def _infer(self, context=None):
+        """we don't know how to resolve a statement by default"""
+        # this method is overridden by most concrete classes
+        raise InferenceError(self.__class__.__name__)
+
+    def infered(self):
+        '''return list of infered values for a more simple inference usage'''
+        return list(self.infer())
+
+    def instanciate_class(self):
+        """instanciate a node if it is a Class node, else return self"""
+        return self
+
+    def has_base(self, node):
+        return False
+
+    def callable(self):
+        return False
+
+    def eq(self, value):
+        return False
+
+    def as_string(self):
+        from astroid.as_string import to_code
+        return to_code(self)
+
+    def repr_tree(self, ids=False):
+        from astroid.as_string import dump
+        return dump(self)
+
+
+class Statement(NodeNG):
+    """Statement node adding a few attributes"""
+    is_statement = True
+
+    def next_sibling(self):
+        """return the next sibling statement"""
+        stmts = self.parent.child_sequence(self)
+        index = stmts.index(self)
+        try:
+            return stmts[index +1]
+        except IndexError:
+            pass
+
+    def previous_sibling(self):
+        """return the previous sibling statement"""
+        stmts = self.parent.child_sequence(self)
+        index = stmts.index(self)
+        if index >= 1:
+            return stmts[index -1]
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/builtin_inference.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/builtin_inference.cpython-35.pyc
new file mode 100644
index 0000000..5f4a641
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/builtin_inference.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2gi.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2gi.cpython-35.pyc
new file mode 100644
index 0000000..03bb2d4
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2gi.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2mechanize.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2mechanize.cpython-35.pyc
new file mode 100644
index 0000000..f3bdeae
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2mechanize.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2pytest.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2pytest.cpython-35.pyc
new file mode 100644
index 0000000..7e3fcfd
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2pytest.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2qt4.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2qt4.cpython-35.pyc
new file mode 100644
index 0000000..c699a50
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2qt4.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2stdlib.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2stdlib.cpython-35.pyc
new file mode 100644
index 0000000..f11352a
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/py2stdlib.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/pynose.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/pynose.cpython-35.pyc
new file mode 100644
index 0000000..fa204f9
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/pynose.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/pysix_moves.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/pysix_moves.cpython-35.pyc
new file mode 100644
index 0000000..140242c
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/__pycache__/pysix_moves.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/builtin_inference.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/builtin_inference.py
new file mode 100644
index 0000000..f60e791
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/builtin_inference.py
@@ -0,0 +1,245 @@
+"""Astroid hooks for various builtins."""
+
+import sys
+from functools import partial
+from textwrap import dedent
+
+import six
+from astroid import (MANAGER, UseInferenceDefault,
+                     inference_tip, YES, InferenceError, UnresolvableName)
+from astroid import nodes
+from astroid.builder import AstroidBuilder
+
+
+def _extend_str(class_node, rvalue):
+    """function to extend builtin str/unicode class"""
+    # TODO(cpopa): this approach will make astroid to believe
+    # that some arguments can be passed by keyword, but
+    # unfortunately, strings and bytes don't accept keyword arguments.
+    code = dedent('''
+    class whatever(object):
+        def join(self, iterable):
+            return {rvalue}
+        def replace(self, old, new, count=None):
+            return {rvalue}
+        def format(self, *args, **kwargs):
+            return {rvalue}
+        def encode(self, encoding='ascii', errors=None):
+            return ''
+        def decode(self, encoding='ascii', errors=None):
+            return u''
+        def capitalize(self):
+            return {rvalue}
+        def title(self):
+            return {rvalue}
+        def lower(self):
+            return {rvalue}
+        def upper(self):
+            return {rvalue}
+        def swapcase(self):
+            return {rvalue}
+        def index(self, sub, start=None, end=None):
+            return 0
+        def find(self, sub, start=None, end=None):
+            return 0
+        def count(self, sub, start=None, end=None):
+            return 0
+        def strip(self, chars=None):
+            return {rvalue}
+        def lstrip(self, chars=None):
+            return {rvalue}
+        def rstrip(self, chars=None):
+            return {rvalue}
+        def rjust(self, width, fillchar=None):
+            return {rvalue} 
+        def center(self, width, fillchar=None):
+            return {rvalue}
+        def ljust(self, width, fillchar=None):
+            return {rvalue}
+    ''')
+    code = code.format(rvalue=rvalue)
+    fake = AstroidBuilder(MANAGER).string_build(code)['whatever']
+    for method in fake.mymethods():
+        class_node.locals[method.name] = [method]
+        method.parent = class_node
+
+def extend_builtins(class_transforms):
+    from astroid.bases import BUILTINS
+    builtin_ast = MANAGER.astroid_cache[BUILTINS]
+    for class_name, transform in class_transforms.items():
+        transform(builtin_ast[class_name])
+
+if sys.version_info > (3, 0):
+    extend_builtins({'bytes': partial(_extend_str, rvalue="b''"),
+                     'str': partial(_extend_str, rvalue="''")})
+else:
+    extend_builtins({'str': partial(_extend_str, rvalue="''"),
+                     'unicode': partial(_extend_str, rvalue="u''")})
+
+
+def register_builtin_transform(transform, builtin_name):
+    """Register a new transform function for the given *builtin_name*.
+
+    The transform function must accept two parameters, a node and
+    an optional context.
+    """
+    def _transform_wrapper(node, context=None):
+        result = transform(node, context=context)
+        if result:
+            result.parent = node
+            result.lineno = node.lineno
+            result.col_offset = node.col_offset
+        return iter([result])
+
+    MANAGER.register_transform(nodes.CallFunc,
+                               inference_tip(_transform_wrapper),
+                               lambda n: (isinstance(n.func, nodes.Name) and
+                                          n.func.name == builtin_name))
+
+
+def _generic_inference(node, context, node_type, transform):
+    args = node.args
+    if not args:
+        return node_type()
+    if len(node.args) > 1:
+        raise UseInferenceDefault()
+
+    arg, = args
+    transformed = transform(arg)
+    if not transformed:
+        try:
+            infered = next(arg.infer(context=context))
+        except (InferenceError, StopIteration):
+            raise UseInferenceDefault()
+        if infered is YES:
+            raise UseInferenceDefault()
+        transformed = transform(infered)
+    if not transformed or transformed is YES:
+        raise UseInferenceDefault()
+    return transformed
+
+
+def _generic_transform(arg, klass, iterables, build_elts):
+    if isinstance(arg, klass):
+        return arg
+    elif isinstance(arg, iterables):
+        if not all(isinstance(elt, nodes.Const)
+                   for elt in arg.elts):
+            # TODO(cpopa): Don't support heterogenous elements.
+            # Not yet, though.
+            raise UseInferenceDefault()
+        elts = [elt.value for elt in arg.elts]
+    elif isinstance(arg, nodes.Dict):
+        if not all(isinstance(elt[0], nodes.Const)
+                   for elt in arg.items):
+            raise UseInferenceDefault()
+        elts = [item[0].value for item in arg.items]
+    elif (isinstance(arg, nodes.Const) and
+          isinstance(arg.value, (six.string_types, six.binary_type))):
+        elts = arg.value
+    else:
+        return
+    return klass(elts=build_elts(elts))
+
+
+def _infer_builtin(node, context,
+                   klass=None, iterables=None,
+                   build_elts=None):
+    transform_func = partial(
+        _generic_transform,
+        klass=klass,
+        iterables=iterables,
+        build_elts=build_elts)
+
+    return _generic_inference(node, context, klass, transform_func)
+
+# pylint: disable=invalid-name
+infer_tuple = partial(
+    _infer_builtin,
+    klass=nodes.Tuple,
+    iterables=(nodes.List, nodes.Set),
+    build_elts=tuple)
+
+infer_list = partial(
+    _infer_builtin,
+    klass=nodes.List,
+    iterables=(nodes.Tuple, nodes.Set),
+    build_elts=list)
+
+infer_set = partial(
+    _infer_builtin,
+    klass=nodes.Set,
+    iterables=(nodes.List, nodes.Tuple),
+    build_elts=set)
+
+
+def _get_elts(arg, context):
+    is_iterable = lambda n: isinstance(n,
+                                       (nodes.List, nodes.Tuple, nodes.Set))
+    try:
+        infered = next(arg.infer(context))
+    except (InferenceError, UnresolvableName):
+        raise UseInferenceDefault()
+    if isinstance(infered, nodes.Dict):
+        items = infered.items
+    elif is_iterable(infered):
+        items = []
+        for elt in infered.elts:
+            # If an item is not a pair of two items,
+            # then fallback to the default inference.
+            # Also, take in consideration only hashable items,
+            # tuples and consts. We are choosing Names as well.
+            if not is_iterable(elt):
+                raise UseInferenceDefault()
+            if len(elt.elts) != 2:
+                raise UseInferenceDefault()
+            if not isinstance(elt.elts[0],
+                              (nodes.Tuple, nodes.Const, nodes.Name)):
+                raise UseInferenceDefault()
+            items.append(tuple(elt.elts))
+    else:
+        raise UseInferenceDefault()
+    return items
+
+def infer_dict(node, context=None):
+    """Try to infer a dict call to a Dict node.
+
+    The function treats the following cases:
+
+        * dict()
+        * dict(mapping)
+        * dict(iterable)
+        * dict(iterable, **kwargs)
+        * dict(mapping, **kwargs)
+        * dict(**kwargs)
+
+    If a case can't be infered, we'll fallback to default inference.
+    """
+    has_keywords = lambda args: all(isinstance(arg, nodes.Keyword)
+                                    for arg in args)
+    if not node.args and not node.kwargs:
+        # dict()
+        return nodes.Dict()
+    elif has_keywords(node.args) and node.args:
+        # dict(a=1, b=2, c=4)
+        items = [(nodes.Const(arg.arg), arg.value) for arg in node.args]
+    elif (len(node.args) >= 2 and
+          has_keywords(node.args[1:])):
+        # dict(some_iterable, b=2, c=4)
+        elts = _get_elts(node.args[0], context)
+        keys = [(nodes.Const(arg.arg), arg.value) for arg in node.args[1:]]
+        items = elts + keys
+    elif len(node.args) == 1:
+        items = _get_elts(node.args[0], context)
+    else:
+        raise UseInferenceDefault()
+
+    empty = nodes.Dict()
+    empty.items = items
+    return empty
+
+# Builtins inference
+register_builtin_transform(infer_tuple, 'tuple')
+register_builtin_transform(infer_set, 'set')
+register_builtin_transform(infer_list, 'list')
+register_builtin_transform(infer_dict, 'dict')
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2gi.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2gi.py
new file mode 100644
index 0000000..6747898
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2gi.py
@@ -0,0 +1,155 @@
+"""Astroid hooks for the Python 2 GObject introspection bindings.
+
+Helps with understanding everything imported from 'gi.repository'
+"""
+
+import inspect
+import itertools
+import sys
+import re
+
+from astroid import MANAGER, AstroidBuildingException
+from astroid.builder import AstroidBuilder
+
+
+_inspected_modules = {}
+
+_identifier_re = r'^[A-Za-z_]\w*$'
+
+def _gi_build_stub(parent):
+    """
+    Inspect the passed module recursively and build stubs for functions,
+    classes, etc.
+    """
+    classes = {}
+    functions = {}
+    constants = {}
+    methods = {}
+    for name in dir(parent):
+        if name.startswith("__"):
+            continue
+
+        # Check if this is a valid name in python
+        if not re.match(_identifier_re, name):
+            continue
+
+        try:
+            obj = getattr(parent, name)
+        except:
+            continue
+
+        if inspect.isclass(obj):
+            classes[name] = obj
+        elif (inspect.isfunction(obj) or
+              inspect.isbuiltin(obj)):
+            functions[name] = obj
+        elif (inspect.ismethod(obj) or
+              inspect.ismethoddescriptor(obj)):
+            methods[name] = obj
+        elif type(obj) in [int, str]:
+            constants[name] = obj
+        elif (str(obj).startswith("<flags") or
+              str(obj).startswith("<enum ") or
+              str(obj).startswith("<GType ") or
+              inspect.isdatadescriptor(obj)):
+            constants[name] = 0
+        elif callable(obj):
+            # Fall back to a function for anything callable
+            functions[name] = obj
+        else:
+            # Assume everything else is some manner of constant
+            constants[name] = 0
+
+    ret = ""
+
+    if constants:
+        ret += "# %s contants\n\n" % parent.__name__
+    for name in sorted(constants):
+        if name[0].isdigit():
+            # GDK has some busted constant names like
+            # Gdk.EventType.2BUTTON_PRESS
+            continue
+
+        val = constants[name]
+
+        strval = str(val)
+        if type(val) is str:
+            strval = '"%s"' % str(val).replace("\\", "\\\\")
+        ret += "%s = %s\n" % (name, strval)
+
+    if ret:
+        ret += "\n\n"
+    if functions:
+        ret += "# %s functions\n\n" % parent.__name__
+    for name in sorted(functions):
+        func = functions[name]
+        ret += "def %s(*args, **kwargs):\n" % name
+        ret += "    pass\n"
+
+    if ret:
+        ret += "\n\n"
+    if methods:
+        ret += "# %s methods\n\n" % parent.__name__
+    for name in sorted(methods):
+        func = methods[name]
+        ret += "def %s(self, *args, **kwargs):\n" % name
+        ret += "    pass\n"
+
+    if ret:
+        ret += "\n\n"
+    if classes:
+        ret += "# %s classes\n\n" % parent.__name__
+    for name in sorted(classes):
+        ret += "class %s(object):\n" % name
+
+        classret = _gi_build_stub(classes[name])
+        if not classret:
+            classret = "pass\n"
+
+        for line in classret.splitlines():
+            ret += "    " + line + "\n"
+        ret += "\n"
+
+    return ret
+
+def _import_gi_module(modname):
+    # we only consider gi.repository submodules
+    if not modname.startswith('gi.repository.'):
+        raise AstroidBuildingException()
+    # build astroid representation unless we already tried so
+    if modname not in _inspected_modules:
+        modnames = [modname]
+        optional_modnames = []
+
+        # GLib and GObject may have some special case handling
+        # in pygobject that we need to cope with. However at
+        # least as of pygobject3-3.13.91 the _glib module doesn't
+        # exist anymore, so if treat these modules as optional.
+        if modname == 'gi.repository.GLib':
+            optional_modnames.append('gi._glib')
+        elif modname == 'gi.repository.GObject':
+            optional_modnames.append('gi._gobject')
+
+        try:
+            modcode = ''
+            for m in itertools.chain(modnames, optional_modnames):
+                try:
+                    __import__(m)
+                    modcode += _gi_build_stub(sys.modules[m])
+                except ImportError:
+                    if m not in optional_modnames:
+                        raise
+        except ImportError:
+            astng = _inspected_modules[modname] = None
+        else:
+            astng = AstroidBuilder(MANAGER).string_build(modcode, modname)
+            _inspected_modules[modname] = astng
+    else:
+        astng = _inspected_modules[modname]
+    if astng is None:
+        raise AstroidBuildingException('Failed to import module %r' % modname)
+    return astng
+
+
+MANAGER.register_failed_import_hook(_import_gi_module)
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2mechanize.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2mechanize.py
new file mode 100644
index 0000000..20a253a
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2mechanize.py
@@ -0,0 +1,18 @@
+from astroid import MANAGER, register_module_extender
+from astroid.builder import AstroidBuilder
+
+def mechanize_transform():
+    return AstroidBuilder(MANAGER).string_build('''
+
+class Browser(object):
+    def open(self, url, data=None, timeout=None):
+        return None
+    def open_novisit(self, url, data=None, timeout=None):
+        return None
+    def open_local_file(self, filename):
+        return None
+
+''')
+
+
+register_module_extender(MANAGER, 'mechanize', mechanize_transform)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2pytest.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2pytest.py
new file mode 100644
index 0000000..e24d449
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2pytest.py
@@ -0,0 +1,31 @@
+"""Astroid hooks for pytest."""
+
+from astroid import MANAGER, register_module_extender
+from astroid.builder import AstroidBuilder
+
+
+def pytest_transform():
+    return AstroidBuilder(MANAGER).string_build('''
+
+try:
+    import _pytest.mark
+    import _pytest.recwarn
+    import _pytest.runner
+    import _pytest.python
+except ImportError:
+    pass
+else:
+    deprecated_call = _pytest.recwarn.deprecated_call
+    exit = _pytest.runner.exit
+    fail = _pytest.runner.fail
+    fixture = _pytest.python.fixture
+    importorskip = _pytest.runner.importorskip
+    mark = _pytest.mark.MarkGenerator()
+    raises = _pytest.python.raises
+    skip = _pytest.runner.skip
+    yield_fixture = _pytest.python.yield_fixture
+
+''')
+
+register_module_extender(MANAGER, 'pytest', pytest_transform)
+register_module_extender(MANAGER, 'py.test', pytest_transform)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2qt4.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2qt4.py
new file mode 100644
index 0000000..d557809
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2qt4.py
@@ -0,0 +1,22 @@
+"""Astroid hooks for the Python 2 qt4 module.
+
+Currently help understanding of :
+
+* PyQT4.QtCore
+"""
+
+from astroid import MANAGER, register_module_extender
+from astroid.builder import AstroidBuilder
+
+
+def pyqt4_qtcore_transform():
+    return AstroidBuilder(MANAGER).string_build('''
+
+def SIGNAL(signal_name): pass
+
+class QObject(object):
+    def emit(self, signal): pass
+''')
+
+
+register_module_extender(MANAGER, 'PyQt4.QtCore', pyqt4_qtcore_transform)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2stdlib.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2stdlib.py
new file mode 100644
index 0000000..2bfcbcd
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/py2stdlib.py
@@ -0,0 +1,334 @@
+
+"""Astroid hooks for the Python 2 standard library.
+
+Currently help understanding of :
+
+* hashlib.md5 and hashlib.sha1
+"""
+
+import sys
+from functools import partial
+from textwrap import dedent
+
+from astroid import (
+    MANAGER, AsStringRegexpPredicate,
+    UseInferenceDefault, inference_tip,
+    YES, InferenceError, register_module_extender)
+from astroid import exceptions
+from astroid import nodes
+from astroid.builder import AstroidBuilder
+
+PY3K = sys.version_info > (3, 0)
+PY33 = sys.version_info >= (3, 3)
+
+# general function
+
+def infer_func_form(node, base_type, context=None, enum=False):
+    """Specific inference function for namedtuple or Python 3 enum. """
+    def infer_first(node):
+        try:
+            value = next(node.infer(context=context))
+            if value is YES:
+                raise UseInferenceDefault()
+            else:
+                return value
+        except StopIteration:
+            raise InferenceError()
+
+    # node is a CallFunc node, class name as first argument and generated class
+    # attributes as second argument
+    if len(node.args) != 2:
+        # something weird here, go back to class implementation
+        raise UseInferenceDefault()
+    # namedtuple or enums list of attributes can be a list of strings or a
+    # whitespace-separate string
+    try:
+        name = infer_first(node.args[0]).value
+        names = infer_first(node.args[1])
+        try:
+            attributes = names.value.replace(',', ' ').split()
+        except AttributeError:
+            if not enum:
+                attributes = [infer_first(const).value for const in names.elts]
+            else:
+                # Enums supports either iterator of (name, value) pairs
+                # or mappings.
+                # TODO: support only list, tuples and mappings.
+                if hasattr(names, 'items') and isinstance(names.items, list):
+                    attributes = [infer_first(const[0]).value
+                                  for const in names.items
+                                  if isinstance(const[0], nodes.Const)]
+                elif hasattr(names, 'elts'):
+                    # Enums can support either ["a", "b", "c"]
+                    # or [("a", 1), ("b", 2), ...], but they can't
+                    # be mixed.
+                    if all(isinstance(const, nodes.Tuple)
+                           for const in names.elts):
+                        attributes = [infer_first(const.elts[0]).value
+                                      for const in names.elts
+                                      if isinstance(const, nodes.Tuple)]
+                    else:
+                        attributes = [infer_first(const).value
+                                      for const in names.elts]
+                else:
+                    raise AttributeError
+                if not attributes:
+                    raise AttributeError
+    except (AttributeError, exceptions.InferenceError) as exc:
+        raise UseInferenceDefault()
+    # we want to return a Class node instance with proper attributes set
+    class_node = nodes.Class(name, 'docstring')
+    class_node.parent = node.parent
+    # set base class=tuple
+    class_node.bases.append(base_type)
+    # XXX add __init__(*attributes) method
+    for attr in attributes:
+        fake_node = nodes.EmptyNode()
+        fake_node.parent = class_node
+        class_node.instance_attrs[attr] = [fake_node]
+    return class_node, name, attributes
+
+
+# module specific transformation functions #####################################
+
+def hashlib_transform():
+    template = '''
+
+class %(name)s(object):
+  def __init__(self, value=''): pass
+  def digest(self):
+    return %(digest)s
+  def copy(self):
+    return self
+  def update(self, value): pass
+  def hexdigest(self):
+    return ''
+  @property
+  def name(self):
+    return %(name)r
+  @property
+  def block_size(self):
+    return 1
+  @property
+  def digest_size(self):
+    return 1
+'''
+    algorithms = ('md5', 'sha1', 'sha224', 'sha256', 'sha384', 'sha512')
+    classes = "".join(
+        template % {'name': hashfunc, 'digest': 'b""' if PY3K else '""'} 
+        for hashfunc in algorithms)
+    return AstroidBuilder(MANAGER).string_build(classes)
+
+
+def collections_transform():
+    return AstroidBuilder(MANAGER).string_build('''
+
+class defaultdict(dict):
+    default_factory = None
+    def __missing__(self, key): pass
+
+class deque(object):
+    maxlen = 0
+    def __init__(self, iterable=None, maxlen=None): pass
+    def append(self, x): pass
+    def appendleft(self, x): pass
+    def clear(self): pass
+    def count(self, x): return 0
+    def extend(self, iterable): pass
+    def extendleft(self, iterable): pass
+    def pop(self): pass
+    def popleft(self): pass
+    def remove(self, value): pass
+    def reverse(self): pass
+    def rotate(self, n): pass
+    def __iter__(self): return self
+
+''')
+
+
+def pkg_resources_transform():
+    return AstroidBuilder(MANAGER).string_build('''
+
+def resource_exists(package_or_requirement, resource_name):
+    pass
+
+def resource_isdir(package_or_requirement, resource_name):
+    pass
+
+def resource_filename(package_or_requirement, resource_name):
+    pass
+
+def resource_stream(package_or_requirement, resource_name):
+    pass
+
+def resource_string(package_or_requirement, resource_name):
+    pass
+
+def resource_listdir(package_or_requirement, resource_name):
+    pass
+
+def extraction_error():
+    pass
+
+def get_cache_path(archive_name, names=()):
+    pass
+
+def postprocess(tempname, filename):
+    pass
+
+def set_extraction_path(path):
+    pass
+
+def cleanup_resources(force=False):
+    pass
+
+''')
+
+
+def subprocess_transform():
+    if PY3K:
+        communicate = (bytes('string', 'ascii'), bytes('string', 'ascii'))
+        init = """
+    def __init__(self, args, bufsize=0, executable=None,
+                 stdin=None, stdout=None, stderr=None,
+                 preexec_fn=None, close_fds=False, shell=False,
+                 cwd=None, env=None, universal_newlines=False,
+                 startupinfo=None, creationflags=0, restore_signals=True,
+                 start_new_session=False, pass_fds=()):
+        pass
+        """
+    else:
+        communicate = ('string', 'string')
+        init = """
+    def __init__(self, args, bufsize=0, executable=None,
+                 stdin=None, stdout=None, stderr=None,
+                 preexec_fn=None, close_fds=False, shell=False,
+                 cwd=None, env=None, universal_newlines=False,
+                 startupinfo=None, creationflags=0):
+        pass
+        """
+    if PY33:
+        wait_signature = 'def wait(self, timeout=None)'
+    else:
+        wait_signature = 'def wait(self)'
+    return AstroidBuilder(MANAGER).string_build('''
+
+class Popen(object):
+    returncode = pid = 0
+    stdin = stdout = stderr = file()
+
+    %(init)s
+
+    def communicate(self, input=None):
+        return %(communicate)r
+    %(wait_signature)s:
+        return self.returncode
+    def poll(self):
+        return self.returncode
+    def send_signal(self, signal):
+        pass
+    def terminate(self):
+        pass
+    def kill(self):
+        pass
+   ''' % {'init': init,
+          'communicate': communicate,
+          'wait_signature': wait_signature})
+
+
+# namedtuple support ###########################################################
+
+def looks_like_namedtuple(node):
+    func = node.func
+    if type(func) is nodes.Getattr:
+        return func.attrname == 'namedtuple'
+    if type(func) is nodes.Name:
+        return func.name == 'namedtuple'
+    return False
+
+def infer_named_tuple(node, context=None):
+    """Specific inference function for namedtuple CallFunc node"""
+    class_node, name, attributes = infer_func_form(node, nodes.Tuple._proxied,
+                                                   context=context)
+    fake = AstroidBuilder(MANAGER).string_build('''
+class %(name)s(tuple):
+    _fields = %(fields)r
+    def _asdict(self):
+        return self.__dict__
+    @classmethod
+    def _make(cls, iterable, new=tuple.__new__, len=len):
+        return new(cls, iterable)
+    def _replace(_self, **kwds):
+        result = _self._make(map(kwds.pop, %(fields)r, _self))
+        if kwds:
+            raise ValueError('Got unexpected field names: %%r' %% list(kwds))
+        return result
+    ''' % {'name': name, 'fields': attributes})
+    class_node.locals['_asdict'] = fake.body[0].locals['_asdict']
+    class_node.locals['_make'] = fake.body[0].locals['_make']
+    class_node.locals['_replace'] = fake.body[0].locals['_replace']
+    class_node.locals['_fields'] = fake.body[0].locals['_fields']
+    # we use UseInferenceDefault, we can't be a generator so return an iterator
+    return iter([class_node])
+
+def infer_enum(node, context=None):
+    """ Specific inference function for enum CallFunc node. """
+    enum_meta = nodes.Class("EnumMeta", 'docstring')
+    class_node = infer_func_form(node, enum_meta,
+                                 context=context, enum=True)[0]
+    return iter([class_node.instanciate_class()])
+
+def infer_enum_class(node):
+    """ Specific inference for enums. """
+    names = set(('Enum', 'IntEnum', 'enum.Enum', 'enum.IntEnum'))
+    for basename in node.basenames:
+        # TODO: doesn't handle subclasses yet. This implementation
+        # is a hack to support enums.
+        if basename not in names:
+            continue
+        if node.root().name == 'enum':
+            # Skip if the class is directly from enum module.
+            break
+        for local, values in node.locals.items():
+            if any(not isinstance(value, nodes.AssName)
+                   for value in values):
+                continue
+
+            stmt = values[0].statement()
+            if isinstance(stmt.targets[0], nodes.Tuple):
+                targets = stmt.targets[0].itered()
+            else:
+                targets = stmt.targets
+
+            new_targets = []
+            for target in targets:
+                # Replace all the assignments with our mocked class.
+                classdef = dedent('''
+                class %(name)s(object):
+                    @property
+                    def value(self):
+                        # Not the best return.
+                        return None 
+                    @property
+                    def name(self):
+                        return %(name)r
+                ''' % {'name': target.name})
+                fake = AstroidBuilder(MANAGER).string_build(classdef)[target.name]
+                fake.parent = target.parent
+                for method in node.mymethods():
+                    fake.locals[method.name] = [method]
+                new_targets.append(fake.instanciate_class())
+            node.locals[local] = new_targets
+        break
+    return node
+
+
+MANAGER.register_transform(nodes.CallFunc, inference_tip(infer_named_tuple),
+                           looks_like_namedtuple)
+MANAGER.register_transform(nodes.CallFunc, inference_tip(infer_enum),
+                           AsStringRegexpPredicate('Enum', 'func'))
+MANAGER.register_transform(nodes.Class, infer_enum_class)
+register_module_extender(MANAGER, 'hashlib', hashlib_transform)
+register_module_extender(MANAGER, 'collections', collections_transform)
+register_module_extender(MANAGER, 'pkg_resources', pkg_resources_transform)
+register_module_extender(MANAGER, 'subprocess', subprocess_transform)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/pynose.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/pynose.py
new file mode 100644
index 0000000..67a6fb8
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/pynose.py
@@ -0,0 +1,79 @@
+# copyright 2003-2015 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+
+"""Hooks for nose library."""
+
+import re
+import textwrap
+
+import astroid
+import astroid.builder
+
+_BUILDER = astroid.builder.AstroidBuilder(astroid.MANAGER)
+
+
+def _pep8(name, caps=re.compile('([A-Z])')):
+    return caps.sub(lambda m: '_' + m.groups()[0].lower(), name)
+
+
+def _nose_tools_functions():
+    """Get an iterator of names and bound methods."""
+    module = _BUILDER.string_build(textwrap.dedent('''
+    import unittest
+
+    class Test(unittest.TestCase):
+        pass
+    a = Test()
+    '''))
+    try:
+        case = next(module['a'].infer())
+    except astroid.InferenceError:
+        return
+    for method in case.methods():
+        if method.name.startswith('assert') and '_' not in method.name:
+            pep8_name = _pep8(method.name)
+            yield pep8_name, astroid.BoundMethod(method, case)
+
+
+def _nose_tools_transform(node):
+    for method_name, method in _nose_tools_functions():
+        node.locals[method_name] = [method]
+
+
+def _nose_tools_trivial_transform():
+    """Custom transform for the nose.tools module."""
+    stub = _BUILDER.string_build('''__all__ = []''')
+    all_entries = ['ok_', 'eq_']
+
+    for pep8_name, method in _nose_tools_functions():
+        all_entries.append(pep8_name)
+        stub[pep8_name] = method
+
+    # Update the __all__ variable, since nose.tools
+    # does this manually with .append.
+    all_assign = stub['__all__'].parent
+    all_object = astroid.List(all_entries)
+    all_object.parent = all_assign
+    all_assign.value = all_object
+    return stub
+
+
+astroid.register_module_extender(astroid.MANAGER, 'nose.tools.trivial',
+                                 _nose_tools_trivial_transform)
+astroid.MANAGER.register_transform(astroid.Module, _nose_tools_transform,
+                                   lambda n: n.name == 'nose.tools')
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/pysix_moves.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/pysix_moves.py
new file mode 100644
index 0000000..548d976
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/brain/pysix_moves.py
@@ -0,0 +1,261 @@
+# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# astroid is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Astroid hooks for six.moves."""
+
+import sys
+from textwrap import dedent
+
+from astroid import MANAGER, register_module_extender
+from astroid.builder import AstroidBuilder
+from astroid.exceptions import AstroidBuildingException
+
+def _indent(text, prefix, predicate=None):
+    """Adds 'prefix' to the beginning of selected lines in 'text'.
+
+    If 'predicate' is provided, 'prefix' will only be added to the lines
+    where 'predicate(line)' is True. If 'predicate' is not provided,
+    it will default to adding 'prefix' to all non-empty lines that do not
+    consist solely of whitespace characters.
+    """
+    if predicate is None:
+        predicate = lambda line: line.strip()
+
+    def prefixed_lines():
+        for line in text.splitlines(True):
+            yield prefix + line if predicate(line) else line
+    return ''.join(prefixed_lines())
+
+
+if sys.version_info[0] == 2:
+    _IMPORTS_2 = """
+    import BaseHTTPServer
+    import CGIHTTPServer
+    import SimpleHTTPServer
+
+    from StringIO import StringIO
+    from cStringIO import StringIO as cStringIO
+    from UserDict import UserDict
+    from UserList import UserList
+    from UserString import UserString
+
+    import __builtin__ as builtins
+    import thread as _thread
+    import dummy_thread as _dummy_thread
+    import ConfigParser as configparser
+    import copy_reg as copyreg
+    from itertools import (imap as map,
+                           ifilter as filter,
+                           ifilterfalse as filterfalse,
+                           izip_longest as zip_longest,
+                           izip as zip)
+    import htmlentitydefs as html_entities
+    import HTMLParser as html_parser
+    import httplib as http_client
+    import cookielib as http_cookiejar
+    import Cookie as http_cookies
+    import Queue as queue
+    import repr as reprlib
+    from pipes import quote as shlex_quote
+    import SocketServer as socketserver
+    import SimpleXMLRPCServer as xmlrpc_server
+    import xmlrpclib as xmlrpc_client
+    import _winreg as winreg
+    import robotparser as urllib_robotparser
+    import Tkinter as tkinter
+    import tkFileDialog as tkinter_tkfiledialog
+
+    input = raw_input
+    intern = intern
+    range = xrange
+    xrange = xrange
+    reduce = reduce
+    reload_module = reload
+
+    class UrllibParse(object):
+        import urlparse as _urlparse
+        import urllib as _urllib
+        ParseResult = _urlparse.ParseResult
+        SplitResult = _urlparse.SplitResult
+        parse_qs = _urlparse.parse_qs
+        parse_qsl = _urlparse.parse_qsl
+        urldefrag = _urlparse.urldefrag
+        urljoin = _urlparse.urljoin
+        urlparse = _urlparse.urlparse
+        urlsplit = _urlparse.urlsplit
+        urlunparse = _urlparse.urlunparse
+        urlunsplit = _urlparse.urlunsplit
+        quote = _urllib.quote
+        quote_plus = _urllib.quote_plus
+        unquote = _urllib.unquote
+        unquote_plus = _urllib.unquote_plus
+        urlencode = _urllib.urlencode
+        splitquery = _urllib.splitquery
+        splittag = _urllib.splittag
+        splituser = _urllib.splituser
+        uses_fragment = _urlparse.uses_fragment       
+        uses_netloc = _urlparse.uses_netloc
+        uses_params = _urlparse.uses_params
+        uses_query = _urlparse.uses_query
+        uses_relative = _urlparse.uses_relative
+
+    class UrllibError(object):
+        import urllib2 as _urllib2
+        import urllib as _urllib
+        URLError = _urllib2.URLError
+        HTTPError = _urllib2.HTTPError
+        ContentTooShortError = _urllib.ContentTooShortError
+
+    class DummyModule(object):
+        pass
+
+    class UrllibRequest(object):
+        import urlparse as _urlparse
+        import urllib2 as _urllib2
+        import urllib as _urllib
+        urlopen = _urllib2.urlopen
+        install_opener = _urllib2.install_opener
+        build_opener = _urllib2.build_opener
+        pathname2url = _urllib.pathname2url
+        url2pathname = _urllib.url2pathname
+        getproxies = _urllib.getproxies
+        Request = _urllib2.Request
+        OpenerDirector = _urllib2.OpenerDirector
+        HTTPDefaultErrorHandler = _urllib2.HTTPDefaultErrorHandler
+        HTTPRedirectHandler = _urllib2.HTTPRedirectHandler
+        HTTPCookieProcessor = _urllib2.HTTPCookieProcessor
+        ProxyHandler = _urllib2.ProxyHandler
+        BaseHandler = _urllib2.BaseHandler
+        HTTPPasswordMgr = _urllib2.HTTPPasswordMgr
+        HTTPPasswordMgrWithDefaultRealm = _urllib2.HTTPPasswordMgrWithDefaultRealm
+        AbstractBasicAuthHandler = _urllib2.AbstractBasicAuthHandler
+        HTTPBasicAuthHandler = _urllib2.HTTPBasicAuthHandler
+        ProxyBasicAuthHandler = _urllib2.ProxyBasicAuthHandler
+        AbstractDigestAuthHandler = _urllib2.AbstractDigestAuthHandler
+        HTTPDigestAuthHandler = _urllib2.HTTPDigestAuthHandler
+        ProxyDigestAuthHandler = _urllib2.ProxyDigestAuthHandler
+        HTTPHandler = _urllib2.HTTPHandler
+        HTTPSHandler = _urllib2.HTTPSHandler
+        FileHandler = _urllib2.FileHandler
+        FTPHandler = _urllib2.FTPHandler
+        CacheFTPHandler = _urllib2.CacheFTPHandler
+        UnknownHandler = _urllib2.UnknownHandler
+        HTTPErrorProcessor = _urllib2.HTTPErrorProcessor
+        urlretrieve = _urllib.urlretrieve
+        urlcleanup = _urllib.urlcleanup
+        proxy_bypass = _urllib.proxy_bypass
+
+    urllib_parse = UrllibParse()
+    urllib_error = UrllibError()
+    urllib = DummyModule()
+    urllib.request = UrllibRequest()
+    urllib.parse = UrllibParse()
+    urllib.error = UrllibError()
+    """
+else:
+    _IMPORTS_3 = """
+    import _io
+    cStringIO = _io.StringIO
+    filter = filter
+    from itertools import filterfalse
+    input = input
+    from sys import intern
+    map = map
+    range = range
+    from imp import reload as reload_module
+    from functools import reduce
+    from shlex import quote as shlex_quote
+    from io import StringIO
+    from collections import UserDict, UserList, UserString
+    xrange = range
+    zip = zip
+    from itertools import zip_longest
+    import builtins
+    import configparser
+    import copyreg
+    import _dummy_thread
+    import http.cookiejar as http_cookiejar
+    import http.cookies as http_cookies
+    import html.entities as html_entities
+    import html.parser as html_parser
+    import http.client as http_client
+    import http.server
+    BaseHTTPServer = CGIHTTPServer = SimpleHTTPServer = http.server
+    import pickle as cPickle
+    import queue
+    import reprlib
+    import socketserver
+    import _thread
+    import winreg
+    import xmlrpc.server as xmlrpc_server
+    import xmlrpc.client as xmlrpc_client
+    import urllib.robotparser as urllib_robotparser
+    import email.mime.multipart as email_mime_multipart
+    import email.mime.nonmultipart as email_mime_nonmultipart
+    import email.mime.text as email_mime_text
+    import email.mime.base as email_mime_base
+    import urllib.parse as urllib_parse
+    import urllib.error as urllib_error
+    import tkinter
+    import tkinter.dialog as tkinter_dialog
+    import tkinter.filedialog as tkinter_filedialog
+    import tkinter.scrolledtext as tkinter_scrolledtext
+    import tkinter.simpledialog as tkinder_simpledialog
+    import tkinter.tix as tkinter_tix
+    import tkinter.ttk as tkinter_ttk
+    import tkinter.constants as tkinter_constants
+    import tkinter.dnd as tkinter_dnd
+    import tkinter.colorchooser as tkinter_colorchooser
+    import tkinter.commondialog as tkinter_commondialog
+    import tkinter.filedialog as tkinter_tkfiledialog
+    import tkinter.font as tkinter_font
+    import tkinter.messagebox as tkinter_messagebox
+    import urllib.request
+    import urllib.robotparser as urllib_robotparser
+    import urllib.parse as urllib_parse
+    import urllib.error as urllib_error
+    """
+if sys.version_info[0] == 2:
+    _IMPORTS = dedent(_IMPORTS_2)
+else:
+    _IMPORTS = dedent(_IMPORTS_3)
+
+
+def six_moves_transform():
+    code = dedent('''
+    class Moves(object):
+    {}
+    moves = Moves()
+    ''').format(_indent(_IMPORTS, "    "))
+    module = AstroidBuilder(MANAGER).string_build(code)
+    module.name = 'six.moves'
+    return module
+
+
+def _six_fail_hook(modname):
+    if modname != 'six.moves':
+        raise AstroidBuildingException
+    module = AstroidBuilder(MANAGER).string_build(_IMPORTS)
+    module.name = 'six.moves'
+    return module
+
+
+register_module_extender(MANAGER, 'six', six_moves_transform)
+register_module_extender(MANAGER, 'requests.packages.urllib3.packages.six',
+                         six_moves_transform)
+MANAGER.register_failed_import_hook(_six_fail_hook)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/builder.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/builder.py
new file mode 100644
index 0000000..1fe7a36
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/builder.py
@@ -0,0 +1,240 @@
+# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""The AstroidBuilder makes astroid from living object and / or from _ast
+
+The builder is not thread safe and can't be used to parse different sources
+at the same time.
+"""
+from __future__ import with_statement
+
+__docformat__ = "restructuredtext en"
+
+import sys
+from os.path import splitext, basename, exists, abspath
+
+from astroid.exceptions import AstroidBuildingException, InferenceError
+from astroid.raw_building import InspectBuilder
+from astroid.rebuilder import TreeRebuilder
+from astroid.manager import AstroidManager
+from astroid.bases import YES, Instance
+from astroid.modutils import modpath_from_file
+
+from _ast import PyCF_ONLY_AST
+def parse(string):
+    return compile(string, "<string>", 'exec', PyCF_ONLY_AST)
+
+if sys.version_info >= (3, 0):
+    from tokenize import detect_encoding
+
+    def open_source_file(filename):
+        with open(filename, 'rb') as byte_stream:
+            encoding = detect_encoding(byte_stream.readline)[0]
+        stream = open(filename, 'r', newline=None, encoding=encoding)
+        try:
+            data = stream.read()
+        except UnicodeError: # wrong encodingg
+            # detect_encoding returns utf-8 if no encoding specified
+            msg = 'Wrong (%s) or no encoding specified' % encoding
+            raise AstroidBuildingException(msg)
+        return stream, encoding, data
+
+else:
+    import re
+
+    _ENCODING_RGX = re.compile(r"\s*#+.*coding[:=]\s*([-\w.]+)")
+
+    def _guess_encoding(string):
+        """get encoding from a python file as string or return None if not found
+        """
+        # check for UTF-8 byte-order mark
+        if string.startswith('\xef\xbb\xbf'):
+            return 'UTF-8'
+        for line in string.split('\n', 2)[:2]:
+            # check for encoding declaration
+            match = _ENCODING_RGX.match(line)
+            if match is not None:
+                return match.group(1)
+
+    def open_source_file(filename):
+        """get data for parsing a file"""
+        stream = open(filename, 'U')
+        data = stream.read()
+        encoding = _guess_encoding(data)
+        return stream, encoding, data
+
+# ast NG builder ##############################################################
+
+MANAGER = AstroidManager()
+
+class AstroidBuilder(InspectBuilder):
+    """provide astroid building methods"""
+
+    def __init__(self, manager=None):
+        InspectBuilder.__init__(self)
+        self._manager = manager or MANAGER
+
+    def module_build(self, module, modname=None):
+        """build an astroid from a living module instance
+        """
+        node = None
+        path = getattr(module, '__file__', None)
+        if path is not None:
+            path_, ext = splitext(module.__file__)
+            if ext in ('.py', '.pyc', '.pyo') and exists(path_ + '.py'):
+                node = self.file_build(path_ + '.py', modname)
+        if node is None:
+            # this is a built-in module
+            # get a partial representation by introspection
+            node = self.inspect_build(module, modname=modname, path=path)
+            # we have to handle transformation by ourselves since the rebuilder
+            # isn't called for builtin nodes
+            #
+            # XXX it's then only called for Module nodes, not for underlying
+            # nodes
+            node = self._manager.transform(node)
+        return node
+
+    def file_build(self, path, modname=None):
+        """build astroid from a source code file (i.e. from an ast)
+
+        path is expected to be a python source file
+        """
+        try:
+            stream, encoding, data = open_source_file(path)
+        except IOError as exc:
+            msg = 'Unable to load file %r (%s)' % (path, exc)
+            raise AstroidBuildingException(msg)
+        except SyntaxError as exc: # py3k encoding specification error
+            raise AstroidBuildingException(exc)
+        except LookupError as exc: # unknown encoding
+            raise AstroidBuildingException(exc)
+        with stream:
+            # get module name if necessary
+            if modname is None:
+                try:
+                    modname = '.'.join(modpath_from_file(path))
+                except ImportError:
+                    modname = splitext(basename(path))[0]
+            # build astroid representation
+            module = self._data_build(data, modname, path)
+            return self._post_build(module, encoding)
+
+    def string_build(self, data, modname='', path=None):
+        """build astroid from source code string and return rebuilded astroid"""
+        module = self._data_build(data, modname, path)
+        module.file_bytes = data.encode('utf-8')
+        return self._post_build(module, 'utf-8')
+
+    def _post_build(self, module, encoding):
+        """handles encoding and delayed nodes
+        after a module has been built
+        """
+        module.file_encoding = encoding
+        self._manager.cache_module(module)
+        # post tree building steps after we stored the module in the cache:
+        for from_node in module._from_nodes:
+            if from_node.modname == '__future__':
+                for symbol, _ in from_node.names:
+                    module.future_imports.add(symbol)
+            self.add_from_names_to_locals(from_node)
+        # handle delayed assattr nodes
+        for delayed in module._delayed_assattr:
+            self.delayed_assattr(delayed)
+        return module
+
+    def _data_build(self, data, modname, path):
+        """build tree node from data and add some informations"""
+        # this method could be wrapped with a pickle/cache function
+        try:
+            node = parse(data + '\n')
+        except TypeError as exc:
+            raise AstroidBuildingException(exc)
+        if path is not None:
+            node_file = abspath(path)
+        else:
+            node_file = '<?>'
+        if modname.endswith('.__init__'):
+            modname = modname[:-9]
+            package = True
+        else:
+            package = path and path.find('__init__.py') > -1 or False
+        rebuilder = TreeRebuilder(self._manager)
+        module = rebuilder.visit_module(node, modname, node_file, package)
+        module._from_nodes = rebuilder._from_nodes
+        module._delayed_assattr = rebuilder._delayed_assattr
+        return module
+
+    def add_from_names_to_locals(self, node):
+        """store imported names to the locals;
+        resort the locals if coming from a delayed node
+        """
+
+        _key_func = lambda node: node.fromlineno
+        def sort_locals(my_list):
+            my_list.sort(key=_key_func)
+        for (name, asname) in node.names:
+            if name == '*':
+                try:
+                    imported = node.do_import_module()
+                except InferenceError:
+                    continue
+                for name in imported.wildcard_import_names():
+                    node.parent.set_local(name, node)
+                    sort_locals(node.parent.scope().locals[name])
+            else:
+                node.parent.set_local(asname or name, node)
+                sort_locals(node.parent.scope().locals[asname or name])
+
+    def delayed_assattr(self, node):
+        """visit a AssAttr node -> add name to locals, handle members
+        definition
+        """
+        try:
+            frame = node.frame()
+            for infered in node.expr.infer():
+                if infered is YES:
+                    continue
+                try:
+                    if infered.__class__ is Instance:
+                        infered = infered._proxied
+                        iattrs = infered.instance_attrs
+                    elif isinstance(infered, Instance):
+                        # Const, Tuple, ... we may be wrong, may be not, but
+                        # anyway we don't want to pollute builtin's namespace
+                        continue
+                    elif infered.is_function:
+                        iattrs = infered.instance_attrs
+                    else:
+                        iattrs = infered.locals
+                except AttributeError:
+                    # XXX log error
+                    #import traceback
+                    #traceback.print_exc()
+                    continue
+                values = iattrs.setdefault(node.attrname, [])
+                if node in values:
+                    continue
+                # get assign in __init__ first XXX useful ?
+                if frame.name == '__init__' and values and not \
+                       values[0].frame().name == '__init__':
+                    values.insert(0, node)
+                else:
+                    values.append(node)
+        except InferenceError:
+            pass
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/exceptions.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/exceptions.py
new file mode 100644
index 0000000..3889e2e
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/exceptions.py
@@ -0,0 +1,51 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""this module contains exceptions used in the astroid library
+
+"""
+
+__doctype__ = "restructuredtext en"
+
+class AstroidError(Exception):
+    """base exception class for all astroid related exceptions"""
+
+class AstroidBuildingException(AstroidError):
+    """exception class when we are unable to build an astroid representation"""
+
+class ResolveError(AstroidError):
+    """base class of astroid resolution/inference error"""
+
+class NotFoundError(ResolveError):
+    """raised when we are unable to resolve a name"""
+
+class InferenceError(ResolveError):
+    """raised when we are unable to infer a node"""
+
+class UseInferenceDefault(Exception):
+    """exception to be raised in custom inference function to indicate that it
+    should go back to the default behaviour
+    """
+
+class UnresolvableName(InferenceError):
+    """raised when we are unable to resolve a name"""
+
+class NoDefault(AstroidError):
+    """raised by function's `default_value` method when an argument has
+    no default value
+    """
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/inference.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/inference.py
new file mode 100644
index 0000000..2280704
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/inference.py
@@ -0,0 +1,405 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""this module contains a set of functions to handle inference on astroid trees
+"""
+
+__doctype__ = "restructuredtext en"
+
+from itertools import chain
+
+from astroid import nodes
+
+from astroid.manager import AstroidManager
+from astroid.exceptions import (AstroidError, InferenceError, NoDefault,
+                                NotFoundError, UnresolvableName)
+from astroid.bases import (YES, Instance, InferenceContext,
+                           _infer_stmts, copy_context, path_wrapper,
+                           raise_if_nothing_infered)
+from astroid.protocols import (
+    _arguments_infer_argname,
+    BIN_OP_METHOD, UNARY_OP_METHOD)
+
+MANAGER = AstroidManager()
+
+
+class CallContext(object):
+    """when inferring a function call, this class is used to remember values
+    given as argument
+    """
+    def __init__(self, args, starargs, dstarargs):
+        self.args = []
+        self.nargs = {}
+        for arg in args:
+            if isinstance(arg, nodes.Keyword):
+                self.nargs[arg.arg] = arg.value
+            else:
+                self.args.append(arg)
+        self.starargs = starargs
+        self.dstarargs = dstarargs
+
+    def infer_argument(self, funcnode, name, context):
+        """infer a function argument value according to the call context"""
+        # 1. search in named keywords
+        try:
+            return self.nargs[name].infer(context)
+        except KeyError:
+            # Function.args.args can be None in astroid (means that we don't have
+            # information on argnames)
+            argindex = funcnode.args.find_argname(name)[0]
+            if argindex is not None:
+                # 2. first argument of instance/class method
+                if argindex == 0 and funcnode.type in ('method', 'classmethod'):
+                    if context.boundnode is not None:
+                        boundnode = context.boundnode
+                    else:
+                        # XXX can do better ?
+                        boundnode = funcnode.parent.frame()
+                    if funcnode.type == 'method':
+                        if not isinstance(boundnode, Instance):
+                            boundnode = Instance(boundnode)
+                        return iter((boundnode,))
+                    if funcnode.type == 'classmethod':
+                        return iter((boundnode,))
+                # if we have a method, extract one position
+                # from the index, so we'll take in account
+                # the extra parameter represented by `self` or `cls`
+                if funcnode.type in ('method', 'classmethod'):
+                    argindex -= 1
+                # 2. search arg index
+                try:
+                    return self.args[argindex].infer(context)
+                except IndexError:
+                    pass
+                # 3. search in *args (.starargs)
+                if self.starargs is not None:
+                    its = []
+                    for infered in self.starargs.infer(context):
+                        if infered is YES:
+                            its.append((YES,))
+                            continue
+                        try:
+                            its.append(infered.getitem(argindex, context).infer(context))
+                        except (InferenceError, AttributeError):
+                            its.append((YES,))
+                        except (IndexError, TypeError):
+                            continue
+                    if its:
+                        return chain(*its)
+        # 4. XXX search in **kwargs (.dstarargs)
+        if self.dstarargs is not None:
+            its = []
+            for infered in self.dstarargs.infer(context):
+                if infered is YES:
+                    its.append((YES,))
+                    continue
+                try:
+                    its.append(infered.getitem(name, context).infer(context))
+                except (InferenceError, AttributeError):
+                    its.append((YES,))
+                except (IndexError, TypeError):
+                    continue
+            if its:
+                return chain(*its)
+        # 5. */** argument, (Tuple or Dict)
+        if name == funcnode.args.vararg:
+            return iter((nodes.const_factory(())))
+        if name == funcnode.args.kwarg:
+            return iter((nodes.const_factory({})))
+        # 6. return default value if any
+        try:
+            return funcnode.args.default_value(name).infer(context)
+        except NoDefault:
+            raise InferenceError(name)
+
+
+# .infer method ###############################################################
+
+
+def infer_end(self, context=None):
+    """inference's end for node such as Module, Class, Function, Const...
+    """
+    yield self
+nodes.Module._infer = infer_end
+nodes.Class._infer = infer_end
+nodes.Function._infer = infer_end
+nodes.Lambda._infer = infer_end
+nodes.Const._infer = infer_end
+nodes.List._infer = infer_end
+nodes.Tuple._infer = infer_end
+nodes.Dict._infer = infer_end
+nodes.Set._infer = infer_end
+
+def _higher_function_scope(node):
+    """ Search for the first function which encloses the given
+    scope. This can be used for looking up in that function's
+    scope, in case looking up in a lower scope for a particular
+    name fails.
+
+    :param node: A scope node.
+    :returns:
+        ``None``, if no parent function scope was found,
+        otherwise an instance of :class:`astroid.scoped_nodes.Function`,
+        which encloses the given node.
+    """
+    current = node
+    while current.parent and not isinstance(current.parent, nodes.Function):
+        current = current.parent
+    if current and current.parent:
+        return current.parent
+
+def infer_name(self, context=None):
+    """infer a Name: use name lookup rules"""
+    frame, stmts = self.lookup(self.name)
+    if not stmts:
+        # Try to see if the name is enclosed in a nested function
+        # and use the higher (first function) scope for searching.
+        # TODO: should this be promoted to other nodes as well?
+        parent_function = _higher_function_scope(self.scope())
+        if parent_function:
+            _, stmts = parent_function.lookup(self.name)
+
+        if not stmts:
+            raise UnresolvableName(self.name)
+    context = context.clone()
+    context.lookupname = self.name
+    return _infer_stmts(stmts, context, frame)
+nodes.Name._infer = path_wrapper(infer_name)
+nodes.AssName.infer_lhs = infer_name # won't work with a path wrapper
+
+
+def infer_callfunc(self, context=None):
+    """infer a CallFunc node by trying to guess what the function returns"""
+    callcontext = context.clone()
+    callcontext.callcontext = CallContext(self.args, self.starargs, self.kwargs)
+    callcontext.boundnode = None
+    for callee in self.func.infer(context):
+        if callee is YES:
+            yield callee
+            continue
+        try:
+            if hasattr(callee, 'infer_call_result'):
+                for infered in callee.infer_call_result(self, callcontext):
+                    yield infered
+        except InferenceError:
+            ## XXX log error ?
+            continue
+nodes.CallFunc._infer = path_wrapper(raise_if_nothing_infered(infer_callfunc))
+
+
+def infer_import(self, context=None, asname=True):
+    """infer an Import node: return the imported module/object"""
+    name = context.lookupname
+    if name is None:
+        raise InferenceError()
+    if asname:
+        yield self.do_import_module(self.real_name(name))
+    else:
+        yield self.do_import_module(name)
+nodes.Import._infer = path_wrapper(infer_import)
+
+def infer_name_module(self, name):
+    context = InferenceContext()
+    context.lookupname = name
+    return self.infer(context, asname=False)
+nodes.Import.infer_name_module = infer_name_module
+
+
+def infer_from(self, context=None, asname=True):
+    """infer a From nodes: return the imported module/object"""
+    name = context.lookupname
+    if name is None:
+        raise InferenceError()
+    if asname:
+        name = self.real_name(name)
+    module = self.do_import_module()
+    try:
+        context = copy_context(context)
+        context.lookupname = name
+        return _infer_stmts(module.getattr(name, ignore_locals=module is self.root()), context)
+    except NotFoundError:
+        raise InferenceError(name)
+nodes.From._infer = path_wrapper(infer_from)
+
+
+def infer_getattr(self, context=None):
+    """infer a Getattr node by using getattr on the associated object"""
+    for owner in self.expr.infer(context):
+        if owner is YES:
+            yield owner
+            continue
+        try:
+            context.boundnode = owner
+            for obj in owner.igetattr(self.attrname, context):
+                yield obj
+            context.boundnode = None
+        except (NotFoundError, InferenceError):
+            context.boundnode = None
+        except AttributeError:
+            # XXX method / function
+            context.boundnode = None
+nodes.Getattr._infer = path_wrapper(raise_if_nothing_infered(infer_getattr))
+nodes.AssAttr.infer_lhs = raise_if_nothing_infered(infer_getattr) # # won't work with a path wrapper
+
+
+def infer_global(self, context=None):
+    if context.lookupname is None:
+        raise InferenceError()
+    try:
+        return _infer_stmts(self.root().getattr(context.lookupname), context)
+    except NotFoundError:
+        raise InferenceError()
+nodes.Global._infer = path_wrapper(infer_global)
+
+
+def infer_subscript(self, context=None):
+    """infer simple subscription such as [1,2,3][0] or (1,2,3)[-1]"""
+    value = next(self.value.infer(context))
+    if value is YES:
+        yield YES
+        return
+
+    index = next(self.slice.infer(context))
+    if index is YES:
+        yield YES
+        return
+
+    if isinstance(index, nodes.Const):
+        try:
+            assigned = value.getitem(index.value, context)
+        except AttributeError:
+            raise InferenceError()
+        except (IndexError, TypeError):
+            yield YES
+            return
+
+        # Prevent inferring if the infered subscript
+        # is the same as the original subscripted object.
+        if self is assigned:
+            yield YES
+            return
+        for infered in assigned.infer(context):
+            yield infered
+    else:
+        raise InferenceError()
+nodes.Subscript._infer = path_wrapper(infer_subscript)
+nodes.Subscript.infer_lhs = raise_if_nothing_infered(infer_subscript)
+
+def infer_unaryop(self, context=None):
+    for operand in self.operand.infer(context):
+        try:
+            yield operand.infer_unary_op(self.op)
+        except TypeError:
+            continue
+        except AttributeError:
+            meth = UNARY_OP_METHOD[self.op]
+            if meth is None:
+                yield YES
+            else:
+                try:
+                    # XXX just suppose if the type implement meth, returned type
+                    # will be the same
+                    operand.getattr(meth)
+                    yield operand
+                except GeneratorExit:
+                    raise
+                except:
+                    yield YES
+nodes.UnaryOp._infer = path_wrapper(infer_unaryop)
+
+def _infer_binop(operator, operand1, operand2, context, failures=None):
+    if operand1 is YES:
+        yield operand1
+        return
+    try:
+        for valnode in operand1.infer_binary_op(operator, operand2, context):
+            yield valnode
+    except AttributeError:
+        try:
+            # XXX just suppose if the type implement meth, returned type
+            # will be the same
+            operand1.getattr(BIN_OP_METHOD[operator])
+            yield operand1
+        except:
+            if failures is None:
+                yield YES
+            else:
+                failures.append(operand1)
+
+def infer_binop(self, context=None):
+    failures = []
+    for lhs in self.left.infer(context):
+        for val in _infer_binop(self.op, lhs, self.right, context, failures):
+            yield val
+    for lhs in failures:
+        for rhs in self.right.infer(context):
+            for val in _infer_binop(self.op, rhs, lhs, context):
+                yield val
+nodes.BinOp._infer = path_wrapper(infer_binop)
+
+
+def infer_arguments(self, context=None):
+    name = context.lookupname
+    if name is None:
+        raise InferenceError()
+    return _arguments_infer_argname(self, name, context)
+nodes.Arguments._infer = infer_arguments
+
+
+def infer_ass(self, context=None):
+    """infer a AssName/AssAttr: need to inspect the RHS part of the
+    assign node
+    """
+    stmt = self.statement()
+    if isinstance(stmt, nodes.AugAssign):
+        return stmt.infer(context)
+    stmts = list(self.assigned_stmts(context=context))
+    return _infer_stmts(stmts, context)
+nodes.AssName._infer = path_wrapper(infer_ass)
+nodes.AssAttr._infer = path_wrapper(infer_ass)
+
+def infer_augassign(self, context=None):
+    failures = []
+    for lhs in self.target.infer_lhs(context):
+        for val in _infer_binop(self.op, lhs, self.value, context, failures):
+            yield val
+    for lhs in failures:
+        for rhs in self.value.infer(context):
+            for val in _infer_binop(self.op, rhs, lhs, context):
+                yield val
+nodes.AugAssign._infer = path_wrapper(infer_augassign)
+
+
+# no infer method on DelName and DelAttr (expected InferenceError)
+
+
+def infer_empty_node(self, context=None):
+    if not self.has_underlying_object():
+        yield YES
+    else:
+        try:
+            for infered in MANAGER.infer_ast_from_something(self.object,
+                                                            context=context):
+                yield infered
+        except AstroidError:
+            yield YES
+nodes.EmptyNode._infer = path_wrapper(infer_empty_node)
+
+
+def infer_index(self, context=None):
+    return self.value.infer(context)
+nodes.Index._infer = infer_index
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/inspector.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/inspector.py
new file mode 100644
index 0000000..1fc3192
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/inspector.py
@@ -0,0 +1,273 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""visitor doing some postprocessing on the astroid tree.
+Try to resolve definitions (namespace) dictionary, relationship...
+
+This module has been imported from pyreverse
+"""
+
+__docformat__ = "restructuredtext en"
+
+from os.path import dirname
+
+import astroid
+from astroid.exceptions import InferenceError
+from astroid.utils import LocalsVisitor
+from astroid.modutils import get_module_part, is_relative, is_standard_module
+
+class IdGeneratorMixIn(object):
+    """
+    Mixin adding the ability to generate integer uid
+    """
+    def __init__(self, start_value=0):
+        self.id_count = start_value
+
+    def init_counter(self, start_value=0):
+        """init the id counter
+        """
+        self.id_count = start_value
+
+    def generate_id(self):
+        """generate a new identifier
+        """
+        self.id_count += 1
+        return self.id_count
+
+
+class Linker(IdGeneratorMixIn, LocalsVisitor):
+    """
+    walk on the project tree and resolve relationships.
+
+    According to options the following attributes may be added to visited nodes:
+
+    * uid,
+      a unique identifier for the node (on astroid.Project, astroid.Module,
+      astroid.Class and astroid.locals_type). Only if the linker has been instantiated
+      with tag=True parameter (False by default).
+
+    * Function
+      a mapping from locals names to their bounded value, which may be a
+      constant like a string or an integer, or an astroid node (on astroid.Module,
+      astroid.Class and astroid.Function).
+
+    * instance_attrs_type
+      as locals_type but for klass member attributes (only on astroid.Class)
+
+    * implements,
+      list of implemented interface _objects_ (only on astroid.Class nodes)
+    """
+
+    def __init__(self, project, inherited_interfaces=0, tag=False):
+        IdGeneratorMixIn.__init__(self)
+        LocalsVisitor.__init__(self)
+        # take inherited interface in consideration or not
+        self.inherited_interfaces = inherited_interfaces
+        # tag nodes or not
+        self.tag = tag
+        # visited project
+        self.project = project
+
+
+    def visit_project(self, node):
+        """visit an astroid.Project node
+
+         * optionally tag the node with a unique id
+        """
+        if self.tag:
+            node.uid = self.generate_id()
+        for module in node.modules:
+            self.visit(module)
+
+    def visit_package(self, node):
+        """visit an astroid.Package node
+
+         * optionally tag the node with a unique id
+        """
+        if self.tag:
+            node.uid = self.generate_id()
+        for subelmt in node.values():
+            self.visit(subelmt)
+
+    def visit_module(self, node):
+        """visit an astroid.Module node
+
+         * set the locals_type mapping
+         * set the depends mapping
+         * optionally tag the node with a unique id
+        """
+        if hasattr(node, 'locals_type'):
+            return
+        node.locals_type = {}
+        node.depends = []
+        if self.tag:
+            node.uid = self.generate_id()
+
+    def visit_class(self, node):
+        """visit an astroid.Class node
+
+         * set the locals_type and instance_attrs_type mappings
+         * set the implements list and build it
+         * optionally tag the node with a unique id
+        """
+        if hasattr(node, 'locals_type'):
+            return
+        node.locals_type = {}
+        if self.tag:
+            node.uid = self.generate_id()
+        # resolve ancestors
+        for baseobj in node.ancestors(recurs=False):
+            specializations = getattr(baseobj, 'specializations', [])
+            specializations.append(node)
+            baseobj.specializations = specializations
+        # resolve instance attributes
+        node.instance_attrs_type = {}
+        for assattrs in node.instance_attrs.values():
+            for assattr in assattrs:
+                self.handle_assattr_type(assattr, node)
+        # resolve implemented interface
+        try:
+            node.implements = list(node.interfaces(self.inherited_interfaces))
+        except InferenceError:
+            node.implements = ()
+
+    def visit_function(self, node):
+        """visit an astroid.Function node
+
+         * set the locals_type mapping
+         * optionally tag the node with a unique id
+        """
+        if hasattr(node, 'locals_type'):
+            return
+        node.locals_type = {}
+        if self.tag:
+            node.uid = self.generate_id()
+
+    link_project = visit_project
+    link_module = visit_module
+    link_class = visit_class
+    link_function = visit_function
+
+    def visit_assname(self, node):
+        """visit an astroid.AssName node
+
+        handle locals_type
+        """
+        # avoid double parsing done by different Linkers.visit
+        # running over the same project:
+        if hasattr(node, '_handled'):
+            return
+        node._handled = True
+        if node.name in node.frame():
+            frame = node.frame()
+        else:
+            # the name has been defined as 'global' in the frame and belongs
+            # there. Btw the frame is not yet visited as the name is in the
+            # root locals; the frame hence has no locals_type attribute
+            frame = node.root()
+        try:
+            values = node.infered()
+            try:
+                already_infered = frame.locals_type[node.name]
+                for valnode in values:
+                    if not valnode in already_infered:
+                        already_infered.append(valnode)
+            except KeyError:
+                frame.locals_type[node.name] = values
+        except astroid.InferenceError:
+            pass
+
+    def handle_assattr_type(self, node, parent):
+        """handle an astroid.AssAttr node
+
+        handle instance_attrs_type
+        """
+        try:
+            values = list(node.infer())
+            try:
+                already_infered = parent.instance_attrs_type[node.attrname]
+                for valnode in values:
+                    if not valnode in already_infered:
+                        already_infered.append(valnode)
+            except KeyError:
+                parent.instance_attrs_type[node.attrname] = values
+        except astroid.InferenceError:
+            pass
+
+    def visit_import(self, node):
+        """visit an astroid.Import node
+
+        resolve module dependencies
+        """
+        context_file = node.root().file
+        for name in node.names:
+            relative = is_relative(name[0], context_file)
+            self._imported_module(node, name[0], relative)
+
+
+    def visit_from(self, node):
+        """visit an astroid.From node
+
+        resolve module dependencies
+        """
+        basename = node.modname
+        context_file = node.root().file
+        if context_file is not None:
+            relative = is_relative(basename, context_file)
+        else:
+            relative = False
+        for name in node.names:
+            if name[0] == '*':
+                continue
+            # analyze dependencies
+            fullname = '%s.%s' % (basename, name[0])
+            if fullname.find('.') > -1:
+                try:
+                    # XXX: don't use get_module_part, missing package precedence
+                    fullname = get_module_part(fullname, context_file)
+                except ImportError:
+                    continue
+            if fullname != basename:
+                self._imported_module(node, fullname, relative)
+
+
+    def compute_module(self, context_name, mod_path):
+        """return true if the module should be added to dependencies"""
+        package_dir = dirname(self.project.path)
+        if context_name == mod_path:
+            return 0
+        elif is_standard_module(mod_path, (package_dir,)):
+            return 1
+        return 0
+
+    # protected methods ########################################################
+
+    def _imported_module(self, node, mod_path, relative):
+        """notify an imported module, used to analyze dependencies
+        """
+        module = node.root()
+        context_name = module.name
+        if relative:
+            mod_path = '%s.%s' % ('.'.join(context_name.split('.')[:-1]),
+                                  mod_path)
+        if self.compute_module(context_name, mod_path):
+            # handle dependencies
+            if not hasattr(module, 'depends'):
+                module.depends = []
+            mod_paths = module.depends
+            if not mod_path in mod_paths:
+                mod_paths.append(mod_path)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/manager.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/manager.py
new file mode 100644
index 0000000..b1fb305
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/manager.py
@@ -0,0 +1,391 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""astroid manager: avoid multiple astroid build of a same module when
+possible by providing a class responsible to get astroid representation
+from various source and using a cache of built modules)
+"""
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+
+import collections
+import imp
+import os
+from os.path import dirname, join, isdir, exists
+from warnings import warn
+import zipimport
+
+from logilab.common.configuration import OptionsProviderMixIn
+
+from astroid.exceptions import AstroidBuildingException
+from astroid import modutils
+
+
+def astroid_wrapper(func, modname):
+    """wrapper to give to AstroidManager.project_from_files"""
+    print('parsing %s...' % modname)
+    try:
+        return func(modname)
+    except AstroidBuildingException as exc:
+        print(exc)
+    except Exception as exc:
+        import traceback
+        traceback.print_exc()
+
+def _silent_no_wrap(func, modname):
+    """silent wrapper that doesn't do anything; can be used for tests"""
+    return func(modname)
+
+def safe_repr(obj):
+    try:
+        return repr(obj)
+    except:
+        return '???'
+
+
+
+class AstroidManager(OptionsProviderMixIn):
+    """the astroid manager, responsible to build astroid from files
+     or modules.
+
+    Use the Borg pattern.
+    """
+
+    name = 'astroid loader'
+    options = (("ignore",
+                {'type' : "csv", 'metavar' : "<file>",
+                 'dest' : "black_list", "default" : ('CVS',),
+                 'help' : "add <file> (may be a directory) to the black list\
+. It should be a base name, not a path. You may set this option multiple times\
+."}),
+               ("project",
+                {'default': "No Name", 'type' : 'string', 'short': 'p',
+                 'metavar' : '<project name>',
+                 'help' : 'set the project name.'}),
+              )
+    brain = {}
+    def __init__(self):
+        self.__dict__ = AstroidManager.brain
+        if not self.__dict__:
+            OptionsProviderMixIn.__init__(self)
+            self.load_defaults()
+            # NOTE: cache entries are added by the [re]builder
+            self.astroid_cache = {}
+            self._mod_file_cache = {}
+            self.transforms = collections.defaultdict(list)
+            self._failed_import_hooks = []
+            self.always_load_extensions = False
+            self.optimize_ast = False
+            self.extension_package_whitelist = set()
+
+    def ast_from_file(self, filepath, modname=None, fallback=True, source=False):
+        """given a module name, return the astroid object"""
+        try:
+            filepath = modutils.get_source_file(filepath, include_no_ext=True)
+            source = True
+        except modutils.NoSourceFile:
+            pass
+        if modname is None:
+            try:
+                modname = '.'.join(modutils.modpath_from_file(filepath))
+            except ImportError:
+                modname = filepath
+        if modname in self.astroid_cache and self.astroid_cache[modname].file == filepath:
+            return self.astroid_cache[modname]
+        if source:
+            from astroid.builder import AstroidBuilder
+            return AstroidBuilder(self).file_build(filepath, modname)
+        elif fallback and modname:
+            return self.ast_from_module_name(modname)
+        raise AstroidBuildingException('unable to get astroid for file %s' %
+                                       filepath)
+
+    def _build_stub_module(self, modname):
+        from astroid.builder import AstroidBuilder
+        return AstroidBuilder(self).string_build('', modname)
+
+    def _can_load_extension(self, modname):
+        if self.always_load_extensions:
+            return True
+        if modutils.is_standard_module(modname):
+            return True
+        parts = modname.split('.')
+        return any(
+            '.'.join(parts[:x]) in self.extension_package_whitelist
+            for x in range(1, len(parts) + 1))
+
+    def ast_from_module_name(self, modname, context_file=None):
+        """given a module name, return the astroid object"""
+        if modname in self.astroid_cache:
+            return self.astroid_cache[modname]
+        if modname == '__main__':
+            return self._build_stub_module(modname)
+        old_cwd = os.getcwd()
+        if context_file:
+            os.chdir(dirname(context_file))
+        try:
+            filepath, mp_type = self.file_from_module_name(modname, context_file)
+            if mp_type == modutils.PY_ZIPMODULE:
+                module = self.zip_import_data(filepath)
+                if module is not None:
+                    return module
+            elif mp_type in (imp.C_BUILTIN, imp.C_EXTENSION):
+                if mp_type == imp.C_EXTENSION and not self._can_load_extension(modname):
+                    return self._build_stub_module(modname)
+                try:
+                    module = modutils.load_module_from_name(modname)
+                except Exception as ex:
+                    msg = 'Unable to load module %s (%s)' % (modname, ex)
+                    raise AstroidBuildingException(msg)
+                return self.ast_from_module(module, modname)
+            elif mp_type == imp.PY_COMPILED:
+                raise AstroidBuildingException("Unable to load compiled module %s" % (modname,))
+            if filepath is None:
+                raise AstroidBuildingException("Unable to load module %s" % (modname,))
+            return self.ast_from_file(filepath, modname, fallback=False)
+        except AstroidBuildingException as e:
+            for hook in self._failed_import_hooks:
+                try:
+                    return hook(modname)
+                except AstroidBuildingException:
+                    pass
+            raise e
+        finally:
+            os.chdir(old_cwd)
+
+    def zip_import_data(self, filepath):
+        if zipimport is None:
+            return None
+        from astroid.builder import AstroidBuilder
+        builder = AstroidBuilder(self)
+        for ext in ('.zip', '.egg'):
+            try:
+                eggpath, resource = filepath.rsplit(ext + os.path.sep, 1)
+            except ValueError:
+                continue
+            try:
+                importer = zipimport.zipimporter(eggpath + ext)
+                zmodname = resource.replace(os.path.sep, '.')
+                if importer.is_package(resource):
+                    zmodname = zmodname + '.__init__'
+                module = builder.string_build(importer.get_source(resource),
+                                              zmodname, filepath)
+                return module
+            except:
+                continue
+        return None
+
+    def file_from_module_name(self, modname, contextfile):
+        try:
+            value = self._mod_file_cache[(modname, contextfile)]
+        except KeyError:
+            try:
+                value = modutils.file_info_from_modpath(
+                    modname.split('.'), context_file=contextfile)
+            except ImportError as ex:
+                msg = 'Unable to load module %s (%s)' % (modname, ex)
+                value = AstroidBuildingException(msg)
+            self._mod_file_cache[(modname, contextfile)] = value
+        if isinstance(value, AstroidBuildingException):
+            raise value
+        return value
+
+    def ast_from_module(self, module, modname=None):
+        """given an imported module, return the astroid object"""
+        modname = modname or module.__name__
+        if modname in self.astroid_cache:
+            return self.astroid_cache[modname]
+        try:
+            # some builtin modules don't have __file__ attribute
+            filepath = module.__file__
+            if modutils.is_python_source(filepath):
+                return self.ast_from_file(filepath, modname)
+        except AttributeError:
+            pass
+        from astroid.builder import AstroidBuilder
+        return AstroidBuilder(self).module_build(module, modname)
+
+    def ast_from_class(self, klass, modname=None):
+        """get astroid for the given class"""
+        if modname is None:
+            try:
+                modname = klass.__module__
+            except AttributeError:
+                raise AstroidBuildingException(
+                    'Unable to get module for class %s' % safe_repr(klass))
+        modastroid = self.ast_from_module_name(modname)
+        return modastroid.getattr(klass.__name__)[0] # XXX
+
+
+    def infer_ast_from_something(self, obj, context=None):
+        """infer astroid for the given class"""
+        if hasattr(obj, '__class__') and not isinstance(obj, type):
+            klass = obj.__class__
+        else:
+            klass = obj
+        try:
+            modname = klass.__module__
+        except AttributeError:
+            raise AstroidBuildingException(
+                'Unable to get module for %s' % safe_repr(klass))
+        except Exception as ex:
+            raise AstroidBuildingException(
+                'Unexpected error while retrieving module for %s: %s'
+                % (safe_repr(klass), ex))
+        try:
+            name = klass.__name__
+        except AttributeError:
+            raise AstroidBuildingException(
+                'Unable to get name for %s' % safe_repr(klass))
+        except Exception as ex:
+            raise AstroidBuildingException(
+                'Unexpected error while retrieving name for %s: %s'
+                % (safe_repr(klass), ex))
+        # take care, on living object __module__ is regularly wrong :(
+        modastroid = self.ast_from_module_name(modname)
+        if klass is obj:
+            for  infered in modastroid.igetattr(name, context):
+                yield infered
+        else:
+            for infered in modastroid.igetattr(name, context):
+                yield infered.instanciate_class()
+
+    def project_from_files(self, files, func_wrapper=astroid_wrapper,
+                           project_name=None, black_list=None):
+        """return a Project from a list of files or modules"""
+        # build the project representation
+        project_name = project_name or self.config.project
+        black_list = black_list or self.config.black_list
+        project = Project(project_name)
+        for something in files:
+            if not exists(something):
+                fpath = modutils.file_from_modpath(something.split('.'))
+            elif isdir(something):
+                fpath = join(something, '__init__.py')
+            else:
+                fpath = something
+            astroid = func_wrapper(self.ast_from_file, fpath)
+            if astroid is None:
+                continue
+            # XXX why is first file defining the project.path ?
+            project.path = project.path or astroid.file
+            project.add_module(astroid)
+            base_name = astroid.name
+            # recurse in package except if __init__ was explicitly given
+            if astroid.package and something.find('__init__') == -1:
+                # recurse on others packages / modules if this is a package
+                for fpath in modutils.get_module_files(dirname(astroid.file),
+                                                       black_list):
+                    astroid = func_wrapper(self.ast_from_file, fpath)
+                    if astroid is None or astroid.name == base_name:
+                        continue
+                    project.add_module(astroid)
+        return project
+
+    def register_transform(self, node_class, transform, predicate=None):
+        """Register `transform(node)` function to be applied on the given
+        Astroid's `node_class` if `predicate` is None or returns true
+        when called with the node as argument.
+
+        The transform function may return a value which is then used to
+        substitute the original node in the tree.
+        """
+        self.transforms[node_class].append((transform, predicate))
+
+    def unregister_transform(self, node_class, transform, predicate=None):
+        """Unregister the given transform."""
+        self.transforms[node_class].remove((transform, predicate))
+
+    def register_failed_import_hook(self, hook):
+        """Registers a hook to resolve imports that cannot be found otherwise.
+
+        `hook` must be a function that accepts a single argument `modname` which
+        contains the name of the module or package that could not be imported.
+        If `hook` can resolve the import, must return a node of type `astroid.Module`,
+        otherwise, it must raise `AstroidBuildingException`.
+        """
+        self._failed_import_hooks.append(hook)
+
+    def transform(self, node):
+        """Call matching transforms for the given node if any and return the
+        transformed node.
+        """
+        cls = node.__class__
+        if cls not in self.transforms:
+            # no transform registered for this class of node
+            return node
+
+        transforms = self.transforms[cls]
+        orig_node = node  # copy the reference
+        for transform_func, predicate in transforms:
+            if predicate is None or predicate(node):
+                ret = transform_func(node)
+                # if the transformation function returns something, it's
+                # expected to be a replacement for the node
+                if ret is not None:
+                    if node is not orig_node:
+                        # node has already be modified by some previous
+                        # transformation, warn about it
+                        warn('node %s substituted multiple times' % node)
+                    node = ret
+        return node
+
+    def cache_module(self, module):
+        """Cache a module if no module with the same name is known yet."""
+        self.astroid_cache.setdefault(module.name, module)
+
+    def clear_cache(self, astroid_builtin=None):
+        # XXX clear transforms
+        self.astroid_cache.clear()
+        # force bootstrap again, else we may ends up with cache inconsistency
+        # between the manager and CONST_PROXY, making
+        # unittest_lookup.LookupTC.test_builtin_lookup fail depending on the
+        # test order
+        import astroid.raw_building
+        astroid.raw_building._astroid_bootstrapping(
+            astroid_builtin=astroid_builtin)
+
+
+class Project(object):
+    """a project handle a set of modules / packages"""
+    def __init__(self, name=''):
+        self.name = name
+        self.path = None
+        self.modules = []
+        self.locals = {}
+        self.__getitem__ = self.locals.__getitem__
+        self.__iter__ = self.locals.__iter__
+        self.values = self.locals.values
+        self.keys = self.locals.keys
+        self.items = self.locals.items
+
+    def add_module(self, node):
+        self.locals[node.name] = node
+        self.modules.append(node)
+
+    def get_module(self, name):
+        return self.locals[name]
+
+    def get_children(self):
+        return self.modules
+
+    def __repr__(self):
+        return '<Project %r at %s (%s modules)>' % (self.name, id(self),
+                                                    len(self.modules))
+
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/mixins.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/mixins.py
new file mode 100644
index 0000000..dbf1673
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/mixins.py
@@ -0,0 +1,124 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""This module contains some mixins for the different nodes.
+"""
+
+from logilab.common.decorators import cachedproperty
+
+from astroid.exceptions import (AstroidBuildingException, InferenceError,
+                                NotFoundError)
+
+
+class BlockRangeMixIn(object):
+    """override block range """
+
+    @cachedproperty
+    def blockstart_tolineno(self):
+        return self.lineno
+
+    def _elsed_block_range(self, lineno, orelse, last=None):
+        """handle block line numbers range for try/finally, for, if and while
+        statements
+        """
+        if lineno == self.fromlineno:
+            return lineno, lineno
+        if orelse:
+            if lineno >= orelse[0].fromlineno:
+                return lineno, orelse[-1].tolineno
+            return lineno, orelse[0].fromlineno - 1
+        return lineno, last or self.tolineno
+
+
+class FilterStmtsMixin(object):
+    """Mixin for statement filtering and assignment type"""
+
+    def _get_filtered_stmts(self, _, node, _stmts, mystmt):
+        """method used in _filter_stmts to get statemtents and trigger break"""
+        if self.statement() is mystmt:
+            # original node's statement is the assignment, only keep
+            # current node (gen exp, list comp)
+            return [node], True
+        return _stmts, False
+
+    def ass_type(self):
+        return self
+
+
+class AssignTypeMixin(object):
+
+    def ass_type(self):
+        return self
+
+    def _get_filtered_stmts(self, lookup_node, node, _stmts, mystmt):
+        """method used in filter_stmts"""
+        if self is mystmt:
+            return _stmts, True
+        if self.statement() is mystmt:
+            # original node's statement is the assignment, only keep
+            # current node (gen exp, list comp)
+            return [node], True
+        return _stmts, False
+
+
+class ParentAssignTypeMixin(AssignTypeMixin):
+
+    def ass_type(self):
+        return self.parent.ass_type()
+
+
+class FromImportMixIn(FilterStmtsMixin):
+    """MixIn for From and Import Nodes"""
+
+    def _infer_name(self, frame, name):
+        return name
+
+    def do_import_module(self, modname=None):
+        """return the ast for a module whose name is <modname> imported by <self>
+        """
+        # handle special case where we are on a package node importing a module
+        # using the same name as the package, which may end in an infinite loop
+        # on relative imports
+        # XXX: no more needed ?
+        mymodule = self.root()
+        level = getattr(self, 'level', None) # Import as no level
+        if modname is None:
+            modname = self.modname
+        # XXX we should investigate deeper if we really want to check
+        # importing itself: modname and mymodule.name be relative or absolute
+        if mymodule.relative_to_absolute_name(modname, level) == mymodule.name:
+            # FIXME: we used to raise InferenceError here, but why ?
+            return mymodule
+        try:
+            return mymodule.import_module(modname, level=level)
+        except AstroidBuildingException:
+            raise InferenceError(modname)
+        except SyntaxError as ex:
+            raise InferenceError(str(ex))
+
+    def real_name(self, asname):
+        """get name from 'as' name"""
+        for name, _asname in self.names:
+            if name == '*':
+                return asname
+            if not _asname:
+                name = name.split('.', 1)[0]
+                _asname = name
+            if asname == _asname:
+                return name
+        raise NotFoundError(asname)
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/modutils.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/modutils.py
new file mode 100644
index 0000000..c547f3e
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/modutils.py
@@ -0,0 +1,670 @@
+# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# astroid is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid.  If not, see <http://www.gnu.org/licenses/>.
+"""Python modules manipulation utility functions.
+
+:type PY_SOURCE_EXTS: tuple(str)
+:var PY_SOURCE_EXTS: list of possible python source file extension
+
+:type STD_LIB_DIRS: set of str
+:var STD_LIB_DIRS: directories where standard modules are located
+
+:type BUILTIN_MODULES: dict
+:var BUILTIN_MODULES: dictionary with builtin module names has key
+"""
+from __future__ import with_statement
+
+__docformat__ = "restructuredtext en"
+
+import imp
+import os
+import sys
+from distutils.sysconfig import get_python_lib
+from distutils.errors import DistutilsPlatformError
+import zipimport
+
+try:
+    import pkg_resources
+except ImportError:
+    pkg_resources = None
+
+from logilab.common import _handle_blacklist
+
+PY_ZIPMODULE = object()
+
+if sys.platform.startswith('win'):
+    PY_SOURCE_EXTS = ('py', 'pyw')
+    PY_COMPILED_EXTS = ('dll', 'pyd')
+else:
+    PY_SOURCE_EXTS = ('py',)
+    PY_COMPILED_EXTS = ('so',)
+
+# Notes about STD_LIB_DIRS
+# Consider arch-specific installation for STD_LIB_DIRS definition
+# :mod:`distutils.sysconfig` contains to much hardcoded values to rely on
+#
+# :see: `Problems with /usr/lib64 builds <http://bugs.python.org/issue1294959>`_
+# :see: `FHS <http://www.pathname.com/fhs/pub/fhs-2.3.html#LIBLTQUALGTALTERNATEFORMATESSENTIAL>`_
+try:
+    # The explicit sys.prefix is to work around a patch in virtualenv that
+    # replaces the 'real' sys.prefix (i.e. the location of the binary)
+    # with the prefix from which the virtualenv was created. This throws
+    # off the detection logic for standard library modules, thus the
+    # workaround.
+    STD_LIB_DIRS = set([
+        get_python_lib(standard_lib=True, prefix=sys.prefix),
+        # Take care of installations where exec_prefix != prefix.
+        get_python_lib(standard_lib=True, prefix=sys.exec_prefix),
+        get_python_lib(standard_lib=True)])
+    if os.name == 'nt':
+        STD_LIB_DIRS.add(os.path.join(sys.prefix, 'dlls'))
+        try:
+            # real_prefix is defined when running inside virtualenv.
+            STD_LIB_DIRS.add(os.path.join(sys.real_prefix, 'dlls'))
+        except AttributeError:
+            pass
+# get_python_lib(standard_lib=1) is not available on pypy, set STD_LIB_DIR to
+# non-valid path, see https://bugs.pypy.org/issue1164
+except DistutilsPlatformError:
+    STD_LIB_DIRS = set()
+
+EXT_LIB_DIR = get_python_lib()
+
+BUILTIN_MODULES = dict(zip(sys.builtin_module_names,
+                           [1]*len(sys.builtin_module_names)))
+
+
+class NoSourceFile(Exception):
+    """exception raised when we are not able to get a python
+    source file for a precompiled file
+    """
+
+def _normalize_path(path):
+    return os.path.normcase(os.path.abspath(path))
+
+
+_NORM_PATH_CACHE = {}
+
+def _cache_normalize_path(path):
+    """abspath with caching"""
+    # _module_file calls abspath on every path in sys.path every time it's
+    # called; on a larger codebase this easily adds up to half a second just
+    # assembling path components. This cache alleviates that.
+    try:
+        return _NORM_PATH_CACHE[path]
+    except KeyError:
+        if not path: # don't cache result for ''
+            return _normalize_path(path)
+        result = _NORM_PATH_CACHE[path] = _normalize_path(path)
+        return result
+
+def load_module_from_name(dotted_name, path=None, use_sys=1):
+    """Load a Python module from its name.
+
+    :type dotted_name: str
+    :param dotted_name: python name of a module or package
+
+    :type path: list or None
+    :param path:
+      optional list of path where the module or package should be
+      searched (use sys.path if nothing or None is given)
+
+    :type use_sys: bool
+    :param use_sys:
+      boolean indicating whether the sys.modules dictionary should be
+      used or not
+
+
+    :raise ImportError: if the module or package is not found
+
+    :rtype: module
+    :return: the loaded module
+    """
+    return load_module_from_modpath(dotted_name.split('.'), path, use_sys)
+
+
+def load_module_from_modpath(parts, path=None, use_sys=1):
+    """Load a python module from its splitted name.
+
+    :type parts: list(str) or tuple(str)
+    :param parts:
+      python name of a module or package splitted on '.'
+
+    :type path: list or None
+    :param path:
+      optional list of path where the module or package should be
+      searched (use sys.path if nothing or None is given)
+
+    :type use_sys: bool
+    :param use_sys:
+      boolean indicating whether the sys.modules dictionary should be used or not
+
+    :raise ImportError: if the module or package is not found
+
+    :rtype: module
+    :return: the loaded module
+    """
+    if use_sys:
+        try:
+            return sys.modules['.'.join(parts)]
+        except KeyError:
+            pass
+    modpath = []
+    prevmodule = None
+    for part in parts:
+        modpath.append(part)
+        curname = '.'.join(modpath)
+        module = None
+        if len(modpath) != len(parts):
+            # even with use_sys=False, should try to get outer packages from sys.modules
+            module = sys.modules.get(curname)
+        elif use_sys:
+            # because it may have been indirectly loaded through a parent
+            module = sys.modules.get(curname)
+        if module is None:
+            mp_file, mp_filename, mp_desc = imp.find_module(part, path)
+            module = imp.load_module(curname, mp_file, mp_filename, mp_desc)
+            # mp_file still needs to be closed.
+            if mp_file:
+                mp_file.close()
+        if prevmodule:
+            setattr(prevmodule, part, module)
+        _file = getattr(module, '__file__', '')
+        if not _file and len(modpath) != len(parts):
+            raise ImportError('no module in %s' % '.'.join(parts[len(modpath):]))
+        path = [os.path.dirname(_file)]
+        prevmodule = module
+    return module
+
+
+def load_module_from_file(filepath, path=None, use_sys=1, extrapath=None):
+    """Load a Python module from it's path.
+
+    :type filepath: str
+    :param filepath: path to the python module or package
+
+    :type path: list or None
+    :param path:
+      optional list of path where the module or package should be
+      searched (use sys.path if nothing or None is given)
+
+    :type use_sys: bool
+    :param use_sys:
+      boolean indicating whether the sys.modules dictionary should be
+      used or not
+
+
+    :raise ImportError: if the module or package is not found
+
+    :rtype: module
+    :return: the loaded module
+    """
+    modpath = modpath_from_file(filepath, extrapath)
+    return load_module_from_modpath(modpath, path, use_sys)
+
+
+def _check_init(path, mod_path):
+    """check there are some __init__.py all along the way"""
+    for part in mod_path:
+        path = os.path.join(path, part)
+        if not _has_init(path):
+            return False
+    return True
+
+
+def modpath_from_file(filename, extrapath=None):
+    """given a file path return the corresponding splitted module's name
+    (i.e name of a module or package splitted on '.')
+
+    :type filename: str
+    :param filename: file's path for which we want the module's name
+
+    :type extrapath: dict
+    :param extrapath:
+      optional extra search path, with path as key and package name for the path
+      as value. This is usually useful to handle package splitted in multiple
+      directories using __path__ trick.
+
+
+    :raise ImportError:
+      if the corresponding module's name has not been found
+
+    :rtype: list(str)
+    :return: the corresponding splitted module's name
+    """
+    base = os.path.splitext(os.path.abspath(filename))[0]
+    if extrapath is not None:
+        for path_ in extrapath:
+            path = os.path.abspath(path_)
+            if path and os.path.normcase(base[:len(path)]) == os.path.normcase(path):
+                submodpath = [pkg for pkg in base[len(path):].split(os.sep)
+                              if pkg]
+                if _check_init(path, submodpath[:-1]):
+                    return extrapath[path_].split('.') + submodpath
+    for path in sys.path:
+        path = _cache_normalize_path(path)
+        if path and os.path.normcase(base).startswith(path):
+            modpath = [pkg for pkg in base[len(path):].split(os.sep) if pkg]
+            if _check_init(path, modpath[:-1]):
+                return modpath
+    raise ImportError('Unable to find module for %s in %s' % (
+        filename, ', \n'.join(sys.path)))
+
+
+def file_from_modpath(modpath, path=None, context_file=None):
+    return file_info_from_modpath(modpath, path, context_file)[0]
+
+def file_info_from_modpath(modpath, path=None, context_file=None):
+    """given a mod path (i.e. splitted module / package name), return the
+    corresponding file, giving priority to source file over precompiled
+    file if it exists
+
+    :type modpath: list or tuple
+    :param modpath:
+      splitted module's name (i.e name of a module or package splitted
+      on '.')
+      (this means explicit relative imports that start with dots have
+      empty strings in this list!)
+
+    :type path: list or None
+    :param path:
+      optional list of path where the module or package should be
+      searched (use sys.path if nothing or None is given)
+
+    :type context_file: str or None
+    :param context_file:
+      context file to consider, necessary if the identifier has been
+      introduced using a relative import unresolvable in the actual
+      context (i.e. modutils)
+
+    :raise ImportError: if there is no such module in the directory
+
+    :rtype: (str or None, import type)
+    :return:
+      the path to the module's file or None if it's an integrated
+      builtin module such as 'sys'
+    """
+    if context_file is not None:
+        context = os.path.dirname(context_file)
+    else:
+        context = context_file
+    if modpath[0] == 'xml':
+        # handle _xmlplus
+        try:
+            return _file_from_modpath(['_xmlplus'] + modpath[1:], path, context)
+        except ImportError:
+            return _file_from_modpath(modpath, path, context)
+    elif modpath == ['os', 'path']:
+        # FIXME: currently ignoring search_path...
+        return os.path.__file__, imp.PY_SOURCE
+    return _file_from_modpath(modpath, path, context)
+
+
+def get_module_part(dotted_name, context_file=None):
+    """given a dotted name return the module part of the name :
+
+    >>> get_module_part('logilab.common.modutils.get_module_part')
+    'logilab.common.modutils'
+
+    :type dotted_name: str
+    :param dotted_name: full name of the identifier we are interested in
+
+    :type context_file: str or None
+    :param context_file:
+      context file to consider, necessary if the identifier has been
+      introduced using a relative import unresolvable in the actual
+      context (i.e. modutils)
+
+
+    :raise ImportError: if there is no such module in the directory
+
+    :rtype: str or None
+    :return:
+      the module part of the name or None if we have not been able at
+      all to import the given name
+
+    XXX: deprecated, since it doesn't handle package precedence over module
+    (see #10066)
+    """
+    # os.path trick
+    if dotted_name.startswith('os.path'):
+        return 'os.path'
+    parts = dotted_name.split('.')
+    if context_file is not None:
+        # first check for builtin module which won't be considered latter
+        # in that case (path != None)
+        if parts[0] in BUILTIN_MODULES:
+            if len(parts) > 2:
+                raise ImportError(dotted_name)
+            return parts[0]
+        # don't use += or insert, we want a new list to be created !
+    path = None
+    starti = 0
+    if parts[0] == '':
+        assert context_file is not None, \
+                'explicit relative import, but no context_file?'
+        path = [] # prevent resolving the import non-relatively
+        starti = 1
+    while parts[starti] == '': # for all further dots: change context
+        starti += 1
+        context_file = os.path.dirname(context_file)
+    for i in range(starti, len(parts)):
+        try:
+            file_from_modpath(parts[starti:i+1], path=path,
+                              context_file=context_file)
+        except ImportError:
+            if not i >= max(1, len(parts) - 2):
+                raise
+            return '.'.join(parts[:i])
+    return dotted_name
+
+
+def get_module_files(src_directory, blacklist):
+    """given a package directory return a list of all available python
+    module's files in the package and its subpackages
+
+    :type src_directory: str
+    :param src_directory:
+      path of the directory corresponding to the package
+
+    :type blacklist: list or tuple
+    :param blacklist:
+      optional list of files or directory to ignore, default to the value of
+      `logilab.common.STD_BLACKLIST`
+
+    :rtype: list
+    :return:
+      the list of all available python module's files in the package and
+      its subpackages
+    """
+    files = []
+    for directory, dirnames, filenames in os.walk(src_directory):
+        _handle_blacklist(blacklist, dirnames, filenames)
+        # check for __init__.py
+        if not '__init__.py' in filenames:
+            dirnames[:] = ()
+            continue
+        for filename in filenames:
+            if _is_python_file(filename):
+                src = os.path.join(directory, filename)
+                files.append(src)
+    return files
+
+
+def get_source_file(filename, include_no_ext=False):
+    """given a python module's file name return the matching source file
+    name (the filename will be returned identically if it's a already an
+    absolute path to a python source file...)
+
+    :type filename: str
+    :param filename: python module's file name
+
+
+    :raise NoSourceFile: if no source file exists on the file system
+
+    :rtype: str
+    :return: the absolute path of the source file if it exists
+    """
+    base, orig_ext = os.path.splitext(os.path.abspath(filename))
+    for ext in PY_SOURCE_EXTS:
+        source_path = '%s.%s' % (base, ext)
+        if os.path.exists(source_path):
+            return source_path
+    if include_no_ext and not orig_ext and os.path.exists(base):
+        return base
+    raise NoSourceFile(filename)
+
+
+def is_python_source(filename):
+    """
+    rtype: bool
+    return: True if the filename is a python source file
+    """
+    return os.path.splitext(filename)[1][1:] in PY_SOURCE_EXTS
+
+
+def is_standard_module(modname, std_path=None):
+    """try to guess if a module is a standard python module (by default,
+    see `std_path` parameter's description)
+
+    :type modname: str
+    :param modname: name of the module we are interested in
+
+    :type std_path: list(str) or tuple(str)
+    :param std_path: list of path considered has standard
+
+
+    :rtype: bool
+    :return:
+      true if the module:
+      - is located on the path listed in one of the directory in `std_path`
+      - is a built-in module
+    """
+    modname = modname.split('.')[0]
+    try:
+        filename = file_from_modpath([modname])
+    except ImportError:
+        # import failed, i'm probably not so wrong by supposing it's
+        # not standard...
+        return False
+    # modules which are not living in a file are considered standard
+    # (sys and __builtin__ for instance)
+    if filename is None:
+        return True
+    filename = _normalize_path(filename)
+    if filename.startswith(_cache_normalize_path(EXT_LIB_DIR)):
+        return False
+    if std_path is None:
+        std_path = STD_LIB_DIRS
+    for path in std_path:
+        if filename.startswith(_cache_normalize_path(path)):
+            return True
+    return False
+
+
+
+def is_relative(modname, from_file):
+    """return true if the given module name is relative to the given
+    file name
+
+    :type modname: str
+    :param modname: name of the module we are interested in
+
+    :type from_file: str
+    :param from_file:
+      path of the module from which modname has been imported
+
+    :rtype: bool
+    :return:
+      true if the module has been imported relatively to `from_file`
+    """
+    if not os.path.isdir(from_file):
+        from_file = os.path.dirname(from_file)
+    if from_file in sys.path:
+        return False
+    try:
+        stream, _, _ = imp.find_module(modname.split('.')[0], [from_file])
+
+        # Close the stream to avoid ResourceWarnings.
+        if stream:
+            stream.close()
+        return True
+    except ImportError:
+        return False
+
+
+# internal only functions #####################################################
+
+def _file_from_modpath(modpath, path=None, context=None):
+    """given a mod path (i.e. splitted module / package name), return the
+    corresponding file
+
+    this function is used internally, see `file_from_modpath`'s
+    documentation for more information
+    """
+    assert len(modpath) > 0
+    if context is not None:
+        try:
+            mtype, mp_filename = _module_file(modpath, [context])
+        except ImportError:
+            mtype, mp_filename = _module_file(modpath, path)
+    else:
+        mtype, mp_filename = _module_file(modpath, path)
+    if mtype == imp.PY_COMPILED:
+        try:
+            return get_source_file(mp_filename), imp.PY_SOURCE
+        except NoSourceFile:
+            return mp_filename, imp.PY_COMPILED
+    elif mtype == imp.C_BUILTIN:
+        # integrated builtin module
+        return None, imp.C_BUILTIN
+    elif mtype == imp.PKG_DIRECTORY:
+        mp_filename = _has_init(mp_filename)
+        mtype = imp.PY_SOURCE
+    return mp_filename, mtype
+
+def _search_zip(modpath, pic):
+    for filepath, importer in pic.items():
+        if importer is not None:
+            if importer.find_module(modpath[0]):
+                if not importer.find_module(os.path.sep.join(modpath)):
+                    raise ImportError('No module named %s in %s/%s' % (
+                        '.'.join(modpath[1:]), filepath, modpath))
+                return PY_ZIPMODULE, os.path.abspath(filepath) + os.path.sep + os.path.sep.join(modpath), filepath
+    raise ImportError('No module named %s' % '.'.join(modpath))
+
+
+def _module_file(modpath, path=None):
+    """get a module type / file path
+
+    :type modpath: list or tuple
+    :param modpath:
+      splitted module's name (i.e name of a module or package splitted
+      on '.'), with leading empty strings for explicit relative import
+
+    :type path: list or None
+    :param path:
+      optional list of path where the module or package should be
+      searched (use sys.path if nothing or None is given)
+
+
+    :rtype: tuple(int, str)
+    :return: the module type flag and the file path for a module
+    """
+    # egg support compat
+    try:
+        pic = sys.path_importer_cache
+        _path = (path is None and sys.path or path)
+        for __path in _path:
+            if not __path in pic:
+                try:
+                    pic[__path] = zipimport.zipimporter(__path)
+                except zipimport.ZipImportError:
+                    pic[__path] = None
+        checkeggs = True
+    except AttributeError:
+        checkeggs = False
+    # pkg_resources support (aka setuptools namespace packages)
+    if (pkg_resources is not None
+            and modpath[0] in pkg_resources._namespace_packages
+            and modpath[0] in sys.modules
+            and len(modpath) > 1):
+        # setuptools has added into sys.modules a module object with proper
+        # __path__, get back information from there
+        module = sys.modules[modpath.pop(0)]
+        path = module.__path__
+    imported = []
+    while modpath:
+        modname = modpath[0]
+        # take care to changes in find_module implementation wrt builtin modules
+        #
+        # Python 2.6.6 (r266:84292, Sep 11 2012, 08:34:23)
+        # >>> imp.find_module('posix')
+        # (None, 'posix', ('', '', 6))
+        #
+        # Python 3.3.1 (default, Apr 26 2013, 12:08:46)
+        # >>> imp.find_module('posix')
+        # (None, None, ('', '', 6))
+        try:
+            stream, mp_filename, mp_desc = imp.find_module(modname, path)
+        except ImportError:
+            if checkeggs:
+                return _search_zip(modpath, pic)[:2]
+            raise
+        else:
+            # Don't forget to close the stream to avoid
+            # spurious ResourceWarnings.
+            if stream:
+               stream.close()
+
+            if checkeggs and mp_filename:
+                fullabspath = [_cache_normalize_path(x) for x in _path]
+                try:
+                    pathindex = fullabspath.index(os.path.dirname(_normalize_path(mp_filename)))
+                    emtype, emp_filename, zippath = _search_zip(modpath, pic)
+                    if pathindex > _path.index(zippath):
+                        # an egg takes priority
+                        return emtype, emp_filename
+                except ValueError:
+                    # XXX not in _path
+                    pass
+                except ImportError:
+                    pass
+                checkeggs = False
+        imported.append(modpath.pop(0))
+        mtype = mp_desc[2]
+        if modpath:
+            if mtype != imp.PKG_DIRECTORY:
+                raise ImportError('No module %s in %s' % ('.'.join(modpath),
+                                                          '.'.join(imported)))
+            # XXX guess if package is using pkgutil.extend_path by looking for
+            # those keywords in the first four Kbytes
+            try:
+                with open(os.path.join(mp_filename, '__init__.py'), 'rb') as stream:
+                    data = stream.read(4096)
+            except IOError:
+                path = [mp_filename]
+            else:
+                if b'pkgutil' in data and b'extend_path' in data:
+                    # extend_path is called, search sys.path for module/packages
+                    # of this name see pkgutil.extend_path documentation
+                    path = [os.path.join(p, *imported) for p in sys.path
+                            if os.path.isdir(os.path.join(p, *imported))]
+                else:
+                    path = [mp_filename]
+    return mtype, mp_filename
+
+def _is_python_file(filename):
+    """return true if the given filename should be considered as a python file
+
+    .pyc and .pyo are ignored
+    """
+    for ext in ('.py', '.so', '.pyd', '.pyw'):
+        if filename.endswith(ext):
+            return True
+    return False
+
+
+def _has_init(directory):
+    """if the given directory has a valid __init__ file, return its path,
+    else return None
+    """
+    mod_or_pack = os.path.join(directory, '__init__')
+    for ext in PY_SOURCE_EXTS + ('pyc', 'pyo'):
+        if os.path.exists(mod_or_pack + '.' + ext):
+            return mod_or_pack + '.' + ext
+    return None
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/node_classes.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/node_classes.py
new file mode 100644
index 0000000..4b413ef
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/node_classes.py
@@ -0,0 +1,966 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""Module for some node classes. More nodes in scoped_nodes.py
+"""
+
+import sys
+
+import six
+from logilab.common.decorators import cachedproperty
+
+from astroid.exceptions import NoDefault
+from astroid.bases import (NodeNG, Statement, Instance, InferenceContext,
+                           _infer_stmts, YES, BUILTINS)
+from astroid.mixins import (BlockRangeMixIn, AssignTypeMixin,
+                            ParentAssignTypeMixin, FromImportMixIn)
+
+PY3K = sys.version_info >= (3, 0)
+
+
+def unpack_infer(stmt, context=None):
+    """recursively generate nodes inferred by the given statement.
+    If the inferred value is a list or a tuple, recurse on the elements
+    """
+    if isinstance(stmt, (List, Tuple)):
+        for elt in stmt.elts:
+            for infered_elt in unpack_infer(elt, context):
+                yield infered_elt
+        return
+    # if infered is a final node, return it and stop
+    infered = next(stmt.infer(context))
+    if infered is stmt:
+        yield infered
+        return
+    # else, infer recursivly, except YES object that should be returned as is
+    for infered in stmt.infer(context):
+        if infered is YES:
+            yield infered
+        else:
+            for inf_inf in unpack_infer(infered, context):
+                yield inf_inf
+
+
+def are_exclusive(stmt1, stmt2, exceptions=None):
+    """return true if the two given statements are mutually exclusive
+
+    `exceptions` may be a list of exception names. If specified, discard If
+    branches and check one of the statement is in an exception handler catching
+    one of the given exceptions.
+
+    algorithm :
+     1) index stmt1's parents
+     2) climb among stmt2's parents until we find a common parent
+     3) if the common parent is a If or TryExcept statement, look if nodes are
+        in exclusive branches
+    """
+    # index stmt1's parents
+    stmt1_parents = {}
+    children = {}
+    node = stmt1.parent
+    previous = stmt1
+    while node:
+        stmt1_parents[node] = 1
+        children[node] = previous
+        previous = node
+        node = node.parent
+    # climb among stmt2's parents until we find a common parent
+    node = stmt2.parent
+    previous = stmt2
+    while node:
+        if node in stmt1_parents:
+            # if the common parent is a If or TryExcept statement, look if
+            # nodes are in exclusive branches
+            if isinstance(node, If) and exceptions is None:
+                if (node.locate_child(previous)[1]
+                        is not node.locate_child(children[node])[1]):
+                    return True
+            elif isinstance(node, TryExcept):
+                c2attr, c2node = node.locate_child(previous)
+                c1attr, c1node = node.locate_child(children[node])
+                if c1node is not c2node:
+                    if ((c2attr == 'body' and c1attr == 'handlers' and children[node].catch(exceptions)) or
+                            (c2attr == 'handlers' and c1attr == 'body' and previous.catch(exceptions)) or
+                            (c2attr == 'handlers' and c1attr == 'orelse') or
+                            (c2attr == 'orelse' and c1attr == 'handlers')):
+                        return True
+                elif c2attr == 'handlers' and c1attr == 'handlers':
+                    return previous is not children[node]
+            return False
+        previous = node
+        node = node.parent
+    return False
+
+
+class LookupMixIn(object):
+    """Mixin looking up a name in the right scope
+    """
+
+    def lookup(self, name):
+        """lookup a variable name
+
+        return the scope node and the list of assignments associated to the
+        given name according to the scope where it has been found (locals,
+        globals or builtin)
+
+        The lookup is starting from self's scope. If self is not a frame itself
+        and the name is found in the inner frame locals, statements will be
+        filtered to remove ignorable statements according to self's location
+        """
+        return self.scope().scope_lookup(self, name)
+
+    def ilookup(self, name):
+        """infered lookup
+
+        return an iterator on infered values of the statements returned by
+        the lookup method
+        """
+        frame, stmts = self.lookup(name)
+        context = InferenceContext()
+        return _infer_stmts(stmts, context, frame)
+
+    def _filter_stmts(self, stmts, frame, offset):
+        """filter statements to remove ignorable statements.
+
+        If self is not a frame itself and the name is found in the inner
+        frame locals, statements will be filtered to remove ignorable
+        statements according to self's location
+        """
+        # if offset == -1, my actual frame is not the inner frame but its parent
+        #
+        # class A(B): pass
+        #
+        # we need this to resolve B correctly
+        if offset == -1:
+            myframe = self.frame().parent.frame()
+        else:
+            myframe = self.frame()
+            # If the frame of this node is the same as the statement
+            # of this node, then the node is part of a class or
+            # a function definition and the frame of this node should be the
+            # the upper frame, not the frame of the definition.
+            # For more information why this is important,
+            # see Pylint issue #295.
+            # For example, for 'b', the statement is the same
+            # as the frame / scope:
+            #
+            # def test(b=1):
+            #     ...
+
+            if self.statement() is myframe and myframe.parent:
+                myframe = myframe.parent.frame()
+        if not myframe is frame or self is frame:
+            return stmts
+        mystmt = self.statement()
+        # line filtering if we are in the same frame
+        #
+        # take care node may be missing lineno information (this is the case for
+        # nodes inserted for living objects)
+        if myframe is frame and mystmt.fromlineno is not None:
+            assert mystmt.fromlineno is not None, mystmt
+            mylineno = mystmt.fromlineno + offset
+        else:
+            # disabling lineno filtering
+            mylineno = 0
+        _stmts = []
+        _stmt_parents = []
+        for node in stmts:
+            stmt = node.statement()
+            # line filtering is on and we have reached our location, break
+            if mylineno > 0 and stmt.fromlineno > mylineno:
+                break
+            assert hasattr(node, 'ass_type'), (node, node.scope(),
+                                               node.scope().locals)
+            ass_type = node.ass_type()
+
+            if node.has_base(self):
+                break
+
+            _stmts, done = ass_type._get_filtered_stmts(self, node, _stmts, mystmt)
+            if done:
+                break
+
+            optional_assign = ass_type.optional_assign
+            if optional_assign and ass_type.parent_of(self):
+                # we are inside a loop, loop var assigment is hidding previous
+                # assigment
+                _stmts = [node]
+                _stmt_parents = [stmt.parent]
+                continue
+
+            # XXX comment various branches below!!!
+            try:
+                pindex = _stmt_parents.index(stmt.parent)
+            except ValueError:
+                pass
+            else:
+                # we got a parent index, this means the currently visited node
+                # is at the same block level as a previously visited node
+                if _stmts[pindex].ass_type().parent_of(ass_type):
+                    # both statements are not at the same block level
+                    continue
+                # if currently visited node is following previously considered
+                # assignement and both are not exclusive, we can drop the
+                # previous one. For instance in the following code ::
+                #
+                #   if a:
+                #     x = 1
+                #   else:
+                #     x = 2
+                #   print x
+                #
+                # we can't remove neither x = 1 nor x = 2 when looking for 'x'
+                # of 'print x'; while in the following ::
+                #
+                #   x = 1
+                #   x = 2
+                #   print x
+                #
+                # we can remove x = 1 when we see x = 2
+                #
+                # moreover, on loop assignment types, assignment won't
+                # necessarily be done if the loop has no iteration, so we don't
+                # want to clear previous assigments if any (hence the test on
+                # optional_assign)
+                if not (optional_assign or are_exclusive(_stmts[pindex], node)):
+                    del _stmt_parents[pindex]
+                    del _stmts[pindex]
+            if isinstance(node, AssName):
+                if not optional_assign and stmt.parent is mystmt.parent:
+                    _stmts = []
+                    _stmt_parents = []
+            elif isinstance(node, DelName):
+                _stmts = []
+                _stmt_parents = []
+                continue
+            if not are_exclusive(self, node):
+                _stmts.append(node)
+                _stmt_parents.append(stmt.parent)
+        return _stmts
+
+# Name classes
+
+class AssName(LookupMixIn, ParentAssignTypeMixin, NodeNG):
+    """class representing an AssName node"""
+
+
+class DelName(LookupMixIn, ParentAssignTypeMixin, NodeNG):
+    """class representing a DelName node"""
+
+
+class Name(LookupMixIn, NodeNG):
+    """class representing a Name node"""
+
+
+
+
+#####################   node classes   ########################################
+
+class Arguments(NodeNG, AssignTypeMixin):
+    """class representing an Arguments node"""
+    if PY3K:
+        # Python 3.4+ uses a different approach regarding annotations,
+        # each argument is a new class, _ast.arg, which exposes an
+        # 'annotation' attribute. In astroid though, arguments are exposed
+        # as is in the Arguments node and the only way to expose annotations
+        # is by using something similar with Python 3.3:
+        #  - we expose 'varargannotation' and 'kwargannotation' of annotations
+        #    of varargs and kwargs.
+        #  - we expose 'annotation', a list with annotations for
+        #    for each normal argument. If an argument doesn't have an
+        #    annotation, its value will be None.
+
+        _astroid_fields = ('args', 'defaults', 'kwonlyargs',
+                           'kw_defaults', 'annotations',
+                           'varargannotation', 'kwargannotation')
+        annotations = None
+        varargannotation = None
+        kwargannotation = None
+    else:
+        _astroid_fields = ('args', 'defaults', 'kwonlyargs', 'kw_defaults')
+    args = None
+    defaults = None
+    kwonlyargs = None
+    kw_defaults = None
+
+    def __init__(self, vararg=None, kwarg=None):
+        self.vararg = vararg
+        self.kwarg = kwarg
+
+    def _infer_name(self, frame, name):
+        if self.parent is frame:
+            return name
+        return None
+
+    @cachedproperty
+    def fromlineno(self):
+        lineno = super(Arguments, self).fromlineno
+        return max(lineno, self.parent.fromlineno or 0)
+
+    def format_args(self):
+        """return arguments formatted as string"""
+        result = []
+        if self.args:
+            result.append(_format_args(self.args, self.defaults))
+        if self.vararg:
+            result.append('*%s' % self.vararg)
+        if self.kwarg:
+            result.append('**%s' % self.kwarg)
+        if self.kwonlyargs:
+            if not self.vararg:
+                result.append('*')
+            result.append(_format_args(self.kwonlyargs, self.kw_defaults))
+        return ', '.join(result)
+
+    def default_value(self, argname):
+        """return the default value for an argument
+
+        :raise `NoDefault`: if there is no default value defined
+        """
+        i = _find_arg(argname, self.args)[0]
+        if i is not None:
+            idx = i - (len(self.args) - len(self.defaults))
+            if idx >= 0:
+                return self.defaults[idx]
+        i = _find_arg(argname, self.kwonlyargs)[0]
+        if i is not None and self.kw_defaults[i] is not None:
+            return self.kw_defaults[i]
+        raise NoDefault()
+
+    def is_argument(self, name):
+        """return True if the name is defined in arguments"""
+        if name == self.vararg:
+            return True
+        if name == self.kwarg:
+            return True
+        return self.find_argname(name, True)[1] is not None
+
+    def find_argname(self, argname, rec=False):
+        """return index and Name node with given name"""
+        if self.args: # self.args may be None in some cases (builtin function)
+            return _find_arg(argname, self.args, rec)
+        return None, None
+
+    def get_children(self):
+        """override get_children to skip over None elements in kw_defaults"""
+        for child in super(Arguments, self).get_children():
+            if child is not None:
+                yield child
+
+
+def _find_arg(argname, args, rec=False):
+    for i, arg in enumerate(args):
+        if isinstance(arg, Tuple):
+            if rec:
+                found = _find_arg(argname, arg.elts)
+                if found[0] is not None:
+                    return found
+        elif arg.name == argname:
+            return i, arg
+    return None, None
+
+
+def _format_args(args, defaults=None):
+    values = []
+    if args is None:
+        return ''
+    if defaults is not None:
+        default_offset = len(args) - len(defaults)
+    for i, arg in enumerate(args):
+        if isinstance(arg, Tuple):
+            values.append('(%s)' % _format_args(arg.elts))
+        else:
+            values.append(arg.name)
+            if defaults is not None and i >= default_offset:
+                if defaults[i-default_offset] is not None:
+                    values[-1] += '=' + defaults[i-default_offset].as_string()
+    return ', '.join(values)
+
+
+class AssAttr(NodeNG, ParentAssignTypeMixin):
+    """class representing an AssAttr node"""
+    _astroid_fields = ('expr',)
+    expr = None
+
+class Assert(Statement):
+    """class representing an Assert node"""
+    _astroid_fields = ('test', 'fail',)
+    test = None
+    fail = None
+
+class Assign(Statement, AssignTypeMixin):
+    """class representing an Assign node"""
+    _astroid_fields = ('targets', 'value',)
+    targets = None
+    value = None
+
+class AugAssign(Statement, AssignTypeMixin):
+    """class representing an AugAssign node"""
+    _astroid_fields = ('target', 'value',)
+    target = None
+    value = None
+
+class Backquote(NodeNG):
+    """class representing a Backquote node"""
+    _astroid_fields = ('value',)
+    value = None
+
+class BinOp(NodeNG):
+    """class representing a BinOp node"""
+    _astroid_fields = ('left', 'right',)
+    left = None
+    right = None
+
+class BoolOp(NodeNG):
+    """class representing a BoolOp node"""
+    _astroid_fields = ('values',)
+    values = None
+
+class Break(Statement):
+    """class representing a Break node"""
+
+
+class CallFunc(NodeNG):
+    """class representing a CallFunc node"""
+    _astroid_fields = ('func', 'args', 'starargs', 'kwargs')
+    func = None
+    args = None
+    starargs = None
+    kwargs = None
+
+    def __init__(self):
+        self.starargs = None
+        self.kwargs = None
+
+class Compare(NodeNG):
+    """class representing a Compare node"""
+    _astroid_fields = ('left', 'ops',)
+    left = None
+    ops = None
+
+    def get_children(self):
+        """override get_children for tuple fields"""
+        yield self.left
+        for _, comparator in self.ops:
+            yield comparator # we don't want the 'op'
+
+    def last_child(self):
+        """override last_child"""
+        # XXX maybe if self.ops:
+        return self.ops[-1][1]
+        #return self.left
+
+class Comprehension(NodeNG):
+    """class representing a Comprehension node"""
+    _astroid_fields = ('target', 'iter', 'ifs')
+    target = None
+    iter = None
+    ifs = None
+
+    optional_assign = True
+    def ass_type(self):
+        return self
+
+    def _get_filtered_stmts(self, lookup_node, node, stmts, mystmt):
+        """method used in filter_stmts"""
+        if self is mystmt:
+            if isinstance(lookup_node, (Const, Name)):
+                return [lookup_node], True
+
+        elif self.statement() is mystmt:
+            # original node's statement is the assignment, only keeps
+            # current node (gen exp, list comp)
+
+            return [node], True
+
+        return stmts, False
+
+
+class Const(NodeNG, Instance):
+    """represent a constant node like num, str, bool, None, bytes"""
+
+    def __init__(self, value=None):
+        self.value = value
+
+    def getitem(self, index, context=None):
+        if isinstance(self.value, six.string_types):
+            return Const(self.value[index])
+        raise TypeError('%r (value=%s)' % (self, self.value))
+
+    def has_dynamic_getattr(self):
+        return False
+
+    def itered(self):
+        if isinstance(self.value, six.string_types):
+            return self.value
+        raise TypeError()
+
+    def pytype(self):
+        return self._proxied.qname()
+
+
+class Continue(Statement):
+    """class representing a Continue node"""
+
+
+class Decorators(NodeNG):
+    """class representing a Decorators node"""
+    _astroid_fields = ('nodes',)
+    nodes = None
+
+    def __init__(self, nodes=None):
+        self.nodes = nodes
+
+    def scope(self):
+        # skip the function node to go directly to the upper level scope
+        return self.parent.parent.scope()
+
+class DelAttr(NodeNG, ParentAssignTypeMixin):
+    """class representing a DelAttr node"""
+    _astroid_fields = ('expr',)
+    expr = None
+
+
+class Delete(Statement, AssignTypeMixin):
+    """class representing a Delete node"""
+    _astroid_fields = ('targets',)
+    targets = None
+
+
+class Dict(NodeNG, Instance):
+    """class representing a Dict node"""
+    _astroid_fields = ('items',)
+
+    def __init__(self, items=None):
+        if items is None:
+            self.items = []
+        else:
+            self.items = [(const_factory(k), const_factory(v))
+                          for k, v in items.items()]
+
+    def pytype(self):
+        return '%s.dict' % BUILTINS
+
+    def get_children(self):
+        """get children of a Dict node"""
+        # overrides get_children
+        for key, value in self.items:
+            yield key
+            yield value
+
+    def last_child(self):
+        """override last_child"""
+        if self.items:
+            return self.items[-1][1]
+        return None
+
+    def itered(self):
+        return self.items[::2]
+
+    def getitem(self, lookup_key, context=None):
+        for key, value in self.items:
+            for inferedkey in key.infer(context):
+                if inferedkey is YES:
+                    continue
+                if isinstance(inferedkey, Const) \
+                        and inferedkey.value == lookup_key:
+                    return value
+        # This should raise KeyError, but all call sites only catch
+        # IndexError. Let's leave it like that for now.
+        raise IndexError(lookup_key)
+
+
+class Discard(Statement):
+    """class representing a Discard node"""
+    _astroid_fields = ('value',)
+    value = None
+
+
+class Ellipsis(NodeNG):
+    """class representing an Ellipsis node"""
+
+
+class EmptyNode(NodeNG):
+    """class representing an EmptyNode node"""
+
+
+class ExceptHandler(Statement, AssignTypeMixin):
+    """class representing an ExceptHandler node"""
+    _astroid_fields = ('type', 'name', 'body',)
+    type = None
+    name = None
+    body = None
+
+    @cachedproperty
+    def blockstart_tolineno(self):
+        if self.name:
+            return self.name.tolineno
+        elif self.type:
+            return self.type.tolineno
+        else:
+            return self.lineno
+
+    def catch(self, exceptions):
+        if self.type is None or exceptions is None:
+            return True
+        for node in self.type.nodes_of_class(Name):
+            if node.name in exceptions:
+                return True
+
+
+class Exec(Statement):
+    """class representing an Exec node"""
+    _astroid_fields = ('expr', 'globals', 'locals',)
+    expr = None
+    globals = None
+    locals = None
+
+
+class ExtSlice(NodeNG):
+    """class representing an ExtSlice node"""
+    _astroid_fields = ('dims',)
+    dims = None
+
+class For(BlockRangeMixIn, AssignTypeMixin, Statement):
+    """class representing a For node"""
+    _astroid_fields = ('target', 'iter', 'body', 'orelse',)
+    target = None
+    iter = None
+    body = None
+    orelse = None
+
+    optional_assign = True
+    @cachedproperty
+    def blockstart_tolineno(self):
+        return self.iter.tolineno
+
+
+class From(FromImportMixIn, Statement):
+    """class representing a From node"""
+
+    def __init__(self, fromname, names, level=0):
+        self.modname = fromname
+        self.names = names
+        self.level = level
+
+class Getattr(NodeNG):
+    """class representing a Getattr node"""
+    _astroid_fields = ('expr',)
+    expr = None
+
+
+class Global(Statement):
+    """class representing a Global node"""
+
+    def __init__(self, names):
+        self.names = names
+
+    def _infer_name(self, frame, name):
+        return name
+
+
+class If(BlockRangeMixIn, Statement):
+    """class representing an If node"""
+    _astroid_fields = ('test', 'body', 'orelse')
+    test = None
+    body = None
+    orelse = None
+
+    @cachedproperty
+    def blockstart_tolineno(self):
+        return self.test.tolineno
+
+    def block_range(self, lineno):
+        """handle block line numbers range for if statements"""
+        if lineno == self.body[0].fromlineno:
+            return lineno, lineno
+        if lineno <= self.body[-1].tolineno:
+            return lineno, self.body[-1].tolineno
+        return self._elsed_block_range(lineno, self.orelse,
+                                       self.body[0].fromlineno - 1)
+
+
+class IfExp(NodeNG):
+    """class representing an IfExp node"""
+    _astroid_fields = ('test', 'body', 'orelse')
+    test = None
+    body = None
+    orelse = None
+
+
+class Import(FromImportMixIn, Statement):
+    """class representing an Import node"""
+
+
+class Index(NodeNG):
+    """class representing an Index node"""
+    _astroid_fields = ('value',)
+    value = None
+
+
+class Keyword(NodeNG):
+    """class representing a Keyword node"""
+    _astroid_fields = ('value',)
+    value = None
+
+
+class List(NodeNG, Instance, ParentAssignTypeMixin):
+    """class representing a List node"""
+    _astroid_fields = ('elts',)
+
+    def __init__(self, elts=None):
+        if elts is None:
+            self.elts = []
+        else:
+            self.elts = [const_factory(e) for e in elts]
+
+    def pytype(self):
+        return '%s.list' % BUILTINS
+
+    def getitem(self, index, context=None):
+        return self.elts[index]
+
+    def itered(self):
+        return self.elts
+
+
+class Nonlocal(Statement):
+    """class representing a Nonlocal node"""
+
+    def __init__(self, names):
+        self.names = names
+
+    def _infer_name(self, frame, name):
+        return name
+
+
+class Pass(Statement):
+    """class representing a Pass node"""
+
+
+class Print(Statement):
+    """class representing a Print node"""
+    _astroid_fields = ('dest', 'values',)
+    dest = None
+    values = None
+
+
+class Raise(Statement):
+    """class representing a Raise node"""
+    exc = None
+    if sys.version_info < (3, 0):
+        _astroid_fields = ('exc', 'inst', 'tback')
+        inst = None
+        tback = None
+    else:
+        _astroid_fields = ('exc', 'cause')
+        exc = None
+        cause = None
+
+    def raises_not_implemented(self):
+        if not self.exc:
+            return
+        for name in self.exc.nodes_of_class(Name):
+            if name.name == 'NotImplementedError':
+                return True
+
+
+class Return(Statement):
+    """class representing a Return node"""
+    _astroid_fields = ('value',)
+    value = None
+
+
+class Set(NodeNG, Instance, ParentAssignTypeMixin):
+    """class representing a Set node"""
+    _astroid_fields = ('elts',)
+
+    def __init__(self, elts=None):
+        if elts is None:
+            self.elts = []
+        else:
+            self.elts = [const_factory(e) for e in elts]
+
+    def pytype(self):
+        return '%s.set' % BUILTINS
+
+    def itered(self):
+        return self.elts
+
+
+class Slice(NodeNG):
+    """class representing a Slice node"""
+    _astroid_fields = ('lower', 'upper', 'step')
+    lower = None
+    upper = None
+    step = None
+
+class Starred(NodeNG, ParentAssignTypeMixin):
+    """class representing a Starred node"""
+    _astroid_fields = ('value',)
+    value = None
+
+
+class Subscript(NodeNG):
+    """class representing a Subscript node"""
+    _astroid_fields = ('value', 'slice')
+    value = None
+    slice = None
+
+
+class TryExcept(BlockRangeMixIn, Statement):
+    """class representing a TryExcept node"""
+    _astroid_fields = ('body', 'handlers', 'orelse',)
+    body = None
+    handlers = None
+    orelse = None
+
+    def _infer_name(self, frame, name):
+        return name
+
+    def block_range(self, lineno):
+        """handle block line numbers range for try/except statements"""
+        last = None
+        for exhandler in self.handlers:
+            if exhandler.type and lineno == exhandler.type.fromlineno:
+                return lineno, lineno
+            if exhandler.body[0].fromlineno <= lineno <= exhandler.body[-1].tolineno:
+                return lineno, exhandler.body[-1].tolineno
+            if last is None:
+                last = exhandler.body[0].fromlineno - 1
+        return self._elsed_block_range(lineno, self.orelse, last)
+
+
+class TryFinally(BlockRangeMixIn, Statement):
+    """class representing a TryFinally node"""
+    _astroid_fields = ('body', 'finalbody',)
+    body = None
+    finalbody = None
+
+    def block_range(self, lineno):
+        """handle block line numbers range for try/finally statements"""
+        child = self.body[0]
+        # py2.5 try: except: finally:
+        if (isinstance(child, TryExcept) and child.fromlineno == self.fromlineno
+                and lineno > self.fromlineno and lineno <= child.tolineno):
+            return child.block_range(lineno)
+        return self._elsed_block_range(lineno, self.finalbody)
+
+
+class Tuple(NodeNG, Instance, ParentAssignTypeMixin):
+    """class representing a Tuple node"""
+    _astroid_fields = ('elts',)
+
+    def __init__(self, elts=None):
+        if elts is None:
+            self.elts = []
+        else:
+            self.elts = [const_factory(e) for e in elts]
+
+    def pytype(self):
+        return '%s.tuple' % BUILTINS
+
+    def getitem(self, index, context=None):
+        return self.elts[index]
+
+    def itered(self):
+        return self.elts
+
+
+class UnaryOp(NodeNG):
+    """class representing an UnaryOp node"""
+    _astroid_fields = ('operand',)
+    operand = None
+
+
+class While(BlockRangeMixIn, Statement):
+    """class representing a While node"""
+    _astroid_fields = ('test', 'body', 'orelse',)
+    test = None
+    body = None
+    orelse = None
+
+    @cachedproperty
+    def blockstart_tolineno(self):
+        return self.test.tolineno
+
+    def block_range(self, lineno):
+        """handle block line numbers range for for and while statements"""
+        return self. _elsed_block_range(lineno, self.orelse)
+
+
+class With(BlockRangeMixIn, AssignTypeMixin, Statement):
+    """class representing a With node"""
+    _astroid_fields = ('items', 'body')
+    items = None
+    body = None
+
+    @cachedproperty
+    def blockstart_tolineno(self):
+        return self.items[-1][0].tolineno
+
+    def get_children(self):
+        for expr, var in self.items:
+            yield expr
+            if var:
+                yield var
+        for elt in self.body:
+            yield elt
+
+class Yield(NodeNG):
+    """class representing a Yield node"""
+    _astroid_fields = ('value',)
+    value = None
+
+class YieldFrom(Yield):
+    """ Class representing a YieldFrom node. """
+
+# constants ##############################################################
+
+CONST_CLS = {
+    list: List,
+    tuple: Tuple,
+    dict: Dict,
+    set: Set,
+    type(None): Const,
+    }
+
+def _update_const_classes():
+    """update constant classes, so the keys of CONST_CLS can be reused"""
+    klasses = (bool, int, float, complex, str)
+    if sys.version_info < (3, 0):
+        klasses += (unicode, long)
+    if sys.version_info >= (2, 6):
+        klasses += (bytes,)
+    for kls in klasses:
+        CONST_CLS[kls] = Const
+_update_const_classes()
+
+def const_factory(value):
+    """return an astroid node for a python value"""
+    # XXX we should probably be stricter here and only consider stuff in
+    # CONST_CLS or do better treatment: in case where value is not in CONST_CLS,
+    # we should rather recall the builder on this value than returning an empty
+    # node (another option being that const_factory shouldn't be called with something
+    # not in CONST_CLS)
+    assert not isinstance(value, NodeNG)
+    try:
+        return CONST_CLS[value.__class__](value)
+    except (KeyError, AttributeError):
+        node = EmptyNode()
+        node.object = value
+        return node
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/nodes.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/nodes.py
new file mode 100644
index 0000000..67c2f8e
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/nodes.py
@@ -0,0 +1,74 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""
+on all nodes :
+ .is_statement, returning true if the node should be considered as a
+  statement node
+ .root(), returning the root node of the tree (i.e. a Module)
+ .previous_sibling(), returning previous sibling statement node
+ .next_sibling(), returning next sibling statement node
+ .statement(), returning the first parent node marked as statement node
+ .frame(), returning the first node defining a new local scope (i.e.
+  Module, Function or Class)
+ .set_local(name, node), define an identifier <name> on the first parent frame,
+  with the node defining it. This is used by the astroid builder and should not
+  be used from out there.
+
+on From and Import :
+ .real_name(name),
+
+
+"""
+# pylint: disable=unused-import
+
+__docformat__ = "restructuredtext en"
+
+from astroid.node_classes import Arguments, AssAttr, Assert, Assign, \
+    AssName, AugAssign, Backquote, BinOp, BoolOp, Break, CallFunc, Compare, \
+    Comprehension, Const, Continue, Decorators, DelAttr, DelName, Delete, \
+    Dict, Discard, Ellipsis, EmptyNode, ExceptHandler, Exec, ExtSlice, For, \
+    From, Getattr, Global, If, IfExp, Import, Index, Keyword, \
+    List, Name, Nonlocal, Pass, Print, Raise, Return, Set, Slice, Starred, Subscript, \
+    TryExcept, TryFinally, Tuple, UnaryOp, While, With, Yield, YieldFrom, \
+    const_factory
+from astroid.scoped_nodes import Module, GenExpr, Lambda, DictComp, \
+    ListComp, SetComp, Function, Class
+
+ALL_NODE_CLASSES = (
+    Arguments, AssAttr, Assert, Assign, AssName, AugAssign,
+    Backquote, BinOp, BoolOp, Break,
+    CallFunc, Class, Compare, Comprehension, Const, Continue,
+    Decorators, DelAttr, DelName, Delete,
+    Dict, DictComp, Discard,
+    Ellipsis, EmptyNode, ExceptHandler, Exec, ExtSlice,
+    For, From, Function,
+    Getattr, GenExpr, Global,
+    If, IfExp, Import, Index,
+    Keyword,
+    Lambda, List, ListComp,
+    Name, Nonlocal,
+    Module,
+    Pass, Print,
+    Raise, Return,
+    Set, SetComp, Slice, Starred, Subscript,
+    TryExcept, TryFinally, Tuple,
+    UnaryOp,
+    While, With,
+    Yield, YieldFrom
+    )
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/protocols.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/protocols.py
new file mode 100644
index 0000000..4c11f9c
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/protocols.py
@@ -0,0 +1,415 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""this module contains a set of functions to handle python protocols for nodes
+where it makes sense.
+"""
+
+__doctype__ = "restructuredtext en"
+import collections
+
+from astroid.exceptions import InferenceError, NoDefault, NotFoundError
+from astroid.node_classes import unpack_infer
+from astroid.bases import InferenceContext, copy_context, \
+     raise_if_nothing_infered, yes_if_nothing_infered, Instance, YES
+from astroid.nodes import const_factory
+from astroid import nodes
+
+BIN_OP_METHOD = {'+':  '__add__',
+                 '-':  '__sub__',
+                 '/':  '__div__',
+                 '//': '__floordiv__',
+                 '*':  '__mul__',
+                 '**': '__power__',
+                 '%':  '__mod__',
+                 '&':  '__and__',
+                 '|':  '__or__',
+                 '^':  '__xor__',
+                 '<<': '__lshift__',
+                 '>>': '__rshift__',
+                }
+
+UNARY_OP_METHOD = {'+': '__pos__',
+                   '-': '__neg__',
+                   '~': '__invert__',
+                   'not': None, # XXX not '__nonzero__'
+                  }
+
+# unary operations ############################################################
+
+def tl_infer_unary_op(self, operator):
+    if operator == 'not':
+        return const_factory(not bool(self.elts))
+    raise TypeError() # XXX log unsupported operation
+nodes.Tuple.infer_unary_op = tl_infer_unary_op
+nodes.List.infer_unary_op = tl_infer_unary_op
+
+
+def dict_infer_unary_op(self, operator):
+    if operator == 'not':
+        return const_factory(not bool(self.items))
+    raise TypeError() # XXX log unsupported operation
+nodes.Dict.infer_unary_op = dict_infer_unary_op
+
+
+def const_infer_unary_op(self, operator):
+    if operator == 'not':
+        return const_factory(not self.value)
+    # XXX log potentially raised TypeError
+    elif operator == '+':
+        return const_factory(+self.value)
+    else: # operator == '-':
+        return const_factory(-self.value)
+nodes.Const.infer_unary_op = const_infer_unary_op
+
+
+# binary operations ###########################################################
+
+BIN_OP_IMPL = {'+':  lambda a, b: a + b,
+               '-':  lambda a, b: a - b,
+               '/':  lambda a, b: a / b,
+               '//': lambda a, b: a // b,
+               '*':  lambda a, b: a * b,
+               '**': lambda a, b: a ** b,
+               '%':  lambda a, b: a % b,
+               '&':  lambda a, b: a & b,
+               '|':  lambda a, b: a | b,
+               '^':  lambda a, b: a ^ b,
+               '<<': lambda a, b: a << b,
+               '>>': lambda a, b: a >> b,
+              }
+for key, impl in list(BIN_OP_IMPL.items()):
+    BIN_OP_IMPL[key+'='] = impl
+
+def const_infer_binary_op(self, operator, other, context):
+    for other in other.infer(context):
+        if isinstance(other, nodes.Const):
+            try:
+                impl = BIN_OP_IMPL[operator]
+
+                try:
+                    yield const_factory(impl(self.value, other.value))
+                except Exception:
+                    # ArithmeticError is not enough: float >> float is a TypeError
+                    # TODO : let pylint know about the problem
+                    pass
+            except TypeError:
+                # XXX log TypeError
+                continue
+        elif other is YES:
+            yield other
+        else:
+            try:
+                for val in other.infer_binary_op(operator, self, context):
+                    yield val
+            except AttributeError:
+                yield YES
+nodes.Const.infer_binary_op = yes_if_nothing_infered(const_infer_binary_op)
+
+
+def tl_infer_binary_op(self, operator, other, context):
+    for other in other.infer(context):
+        if isinstance(other, self.__class__) and operator == '+':
+            node = self.__class__()
+            elts = [n for elt in self.elts for n in elt.infer(context)
+                    if not n is YES]
+            elts += [n for elt in other.elts for n in elt.infer(context)
+                     if not n is YES]
+            node.elts = elts
+            yield node
+        elif isinstance(other, nodes.Const) and operator == '*':
+            if not isinstance(other.value, int):
+                yield YES
+                continue
+            node = self.__class__()
+            elts = [n for elt in self.elts for n in elt.infer(context)
+                    if not n is YES] * other.value
+            node.elts = elts
+            yield node
+        elif isinstance(other, Instance) and not isinstance(other, nodes.Const):
+            yield YES
+    # XXX else log TypeError
+nodes.Tuple.infer_binary_op = yes_if_nothing_infered(tl_infer_binary_op)
+nodes.List.infer_binary_op = yes_if_nothing_infered(tl_infer_binary_op)
+
+
+def dict_infer_binary_op(self, operator, other, context):
+    for other in other.infer(context):
+        if isinstance(other, Instance) and isinstance(other._proxied, nodes.Class):
+            yield YES
+        # XXX else log TypeError
+nodes.Dict.infer_binary_op = yes_if_nothing_infered(dict_infer_binary_op)
+
+def instance_infer_binary_op(self, operator, other, context):
+    try:
+        methods = self.getattr(BIN_OP_METHOD[operator])
+    except (NotFoundError, KeyError):
+        # Unknown operator
+        yield YES
+    else:
+        for method in methods:
+            if not isinstance(method, nodes.Function):
+                continue
+            for result in method.infer_call_result(self, context):
+                if result is not YES:
+                    yield result
+            # We are interested only in the first infered method,
+            # don't go looking in the rest of the methods of the ancestors.
+            break
+
+Instance.infer_binary_op = yes_if_nothing_infered(instance_infer_binary_op)
+
+
+# assignment ##################################################################
+
+"""the assigned_stmts method is responsible to return the assigned statement
+(e.g. not inferred) according to the assignment type.
+
+The `asspath` argument is used to record the lhs path of the original node.
+For instance if we want assigned statements for 'c' in 'a, (b,c)', asspath
+will be [1, 1] once arrived to the Assign node.
+
+The `context` argument is the current inference context which should be given
+to any intermediary inference necessary.
+"""
+
+def _resolve_looppart(parts, asspath, context):
+    """recursive function to resolve multiple assignments on loops"""
+    asspath = asspath[:]
+    index = asspath.pop(0)
+    for part in parts:
+        if part is YES:
+            continue
+        # XXX handle __iter__ and log potentially detected errors
+        if not hasattr(part, 'itered'):
+            continue
+        try:
+            itered = part.itered()
+        except TypeError:
+            continue # XXX log error
+        for stmt in itered:
+            try:
+                assigned = stmt.getitem(index, context)
+            except (AttributeError, IndexError):
+                continue
+            except TypeError: # stmt is unsubscriptable Const
+                continue
+            if not asspath:
+                # we achieved to resolved the assignment path,
+                # don't infer the last part
+                yield assigned
+            elif assigned is YES:
+                break
+            else:
+                # we are not yet on the last part of the path
+                # search on each possibly inferred value
+                try:
+                    for infered in _resolve_looppart(assigned.infer(context),
+                                                     asspath, context):
+                        yield infered
+                except InferenceError:
+                    break
+
+
+def for_assigned_stmts(self, node, context=None, asspath=None):
+    if asspath is None:
+        for lst in self.iter.infer(context):
+            if isinstance(lst, (nodes.Tuple, nodes.List)):
+                for item in lst.elts:
+                    yield item
+    else:
+        for infered in _resolve_looppart(self.iter.infer(context),
+                                         asspath, context):
+            yield infered
+
+nodes.For.assigned_stmts = raise_if_nothing_infered(for_assigned_stmts)
+nodes.Comprehension.assigned_stmts = raise_if_nothing_infered(for_assigned_stmts)
+
+
+def mulass_assigned_stmts(self, node, context=None, asspath=None):
+    if asspath is None:
+        asspath = []
+    asspath.insert(0, self.elts.index(node))
+    return self.parent.assigned_stmts(self, context, asspath)
+nodes.Tuple.assigned_stmts = mulass_assigned_stmts
+nodes.List.assigned_stmts = mulass_assigned_stmts
+
+
+def assend_assigned_stmts(self, context=None):
+    return self.parent.assigned_stmts(self, context=context)
+nodes.AssName.assigned_stmts = assend_assigned_stmts
+nodes.AssAttr.assigned_stmts = assend_assigned_stmts
+
+
+def _arguments_infer_argname(self, name, context):
+    # arguments information may be missing, in which case we can't do anything
+    # more
+    if not (self.args or self.vararg or self.kwarg):
+        yield YES
+        return
+    # first argument of instance/class method
+    if self.args and getattr(self.args[0], 'name', None) == name:
+        functype = self.parent.type
+        if functype == 'method':
+            yield Instance(self.parent.parent.frame())
+            return
+        if functype == 'classmethod':
+            yield self.parent.parent.frame()
+            return
+    if name == self.vararg:
+        vararg = const_factory(())
+        vararg.parent = self
+        yield vararg
+        return
+    if name == self.kwarg:
+        kwarg = const_factory({})
+        kwarg.parent = self
+        yield kwarg
+        return
+    # if there is a default value, yield it. And then yield YES to reflect
+    # we can't guess given argument value
+    try:
+        context = copy_context(context)
+        for infered in self.default_value(name).infer(context):
+            yield infered
+        yield YES
+    except NoDefault:
+        yield YES
+
+
+def arguments_assigned_stmts(self, node, context, asspath=None):
+    if context.callcontext:
+        # reset call context/name
+        callcontext = context.callcontext
+        context = copy_context(context)
+        context.callcontext = None
+        return callcontext.infer_argument(self.parent, node.name, context)
+    return _arguments_infer_argname(self, node.name, context)
+nodes.Arguments.assigned_stmts = arguments_assigned_stmts
+
+
+def assign_assigned_stmts(self, node, context=None, asspath=None):
+    if not asspath:
+        yield self.value
+        return
+    for infered in _resolve_asspart(self.value.infer(context), asspath, context):
+        yield infered
+nodes.Assign.assigned_stmts = raise_if_nothing_infered(assign_assigned_stmts)
+nodes.AugAssign.assigned_stmts = raise_if_nothing_infered(assign_assigned_stmts)
+
+
+def _resolve_asspart(parts, asspath, context):
+    """recursive function to resolve multiple assignments"""
+    asspath = asspath[:]
+    index = asspath.pop(0)
+    for part in parts:
+        if hasattr(part, 'getitem'):
+            try:
+                assigned = part.getitem(index, context)
+            # XXX raise a specific exception to avoid potential hiding of
+            # unexpected exception ?
+            except (TypeError, IndexError):
+                return
+            if not asspath:
+                # we achieved to resolved the assignment path, don't infer the
+                # last part
+                yield assigned
+            elif assigned is YES:
+                return
+            else:
+                # we are not yet on the last part of the path search on each
+                # possibly inferred value
+                try:
+                    for infered in _resolve_asspart(assigned.infer(context),
+                                                    asspath, context):
+                        yield infered
+                except InferenceError:
+                    return
+
+
+def excepthandler_assigned_stmts(self, node, context=None, asspath=None):
+    for assigned in unpack_infer(self.type):
+        if isinstance(assigned, nodes.Class):
+            assigned = Instance(assigned)
+        yield assigned
+nodes.ExceptHandler.assigned_stmts = raise_if_nothing_infered(excepthandler_assigned_stmts)
+
+
+def with_assigned_stmts(self, node, context=None, asspath=None):
+    if asspath is None:
+        for _, vars in self.items:
+            if vars is None:
+                continue
+            for lst in vars.infer(context):
+                if isinstance(lst, (nodes.Tuple, nodes.List)):
+                    for item in lst.nodes:
+                        yield item
+nodes.With.assigned_stmts = raise_if_nothing_infered(with_assigned_stmts)
+
+
+def starred_assigned_stmts(self, node=None, context=None, asspath=None):
+    stmt = self.statement()
+    if not isinstance(stmt, (nodes.Assign, nodes.For)):
+        raise InferenceError()
+
+    if isinstance(stmt, nodes.Assign):
+        value = stmt.value
+        lhs = stmt.targets[0]
+
+        if sum(1 for node in lhs.nodes_of_class(nodes.Starred)) > 1:
+            # Too many starred arguments in the expression.
+            raise InferenceError()
+
+        if context is None:
+            context = InferenceContext()
+        try:
+            rhs = next(value.infer(context))
+        except InferenceError:
+            yield YES
+            return
+        if rhs is YES or not hasattr(rhs, 'elts'):
+            # Not interested in inferred values without elts.
+            yield YES
+            return
+
+        elts = collections.deque(rhs.elts[:])
+        if len(lhs.elts) > len(rhs.elts):
+            # a, *b, c = (1, 2)
+            raise InferenceError()
+
+        # Unpack iteratively the values from the rhs of the assignment,
+        # until the find the starred node. What will remain will
+        # be the list of values which the Starred node will represent
+        # This is done in two steps, from left to right to remove
+        # anything before the starred node and from right to left
+        # to remvoe anything after the starred node.
+
+        for index, node in enumerate(lhs.elts):
+            if not isinstance(node, nodes.Starred):
+                elts.popleft()
+                continue
+            lhs_elts = collections.deque(reversed(lhs.elts[index:]))
+            for node in lhs_elts:
+                if not isinstance(node, nodes.Starred):
+                    elts.pop()
+                    continue
+                # We're done
+                for elt in elts:
+                    yield elt
+                break
+
+nodes.Starred.assigned_stmts = starred_assigned_stmts
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/raw_building.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/raw_building.py
new file mode 100644
index 0000000..99a026a
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/raw_building.py
@@ -0,0 +1,366 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""this module contains a set of functions to create astroid trees from scratch
+(build_* functions) or from living object (object_build_* functions)
+"""
+
+__docformat__ = "restructuredtext en"
+
+import sys
+from os.path import abspath
+from inspect import (getargspec, isdatadescriptor, isfunction, ismethod,
+                     ismethoddescriptor, isclass, isbuiltin, ismodule)
+import six
+
+from astroid.node_classes import CONST_CLS
+from astroid.nodes import (Module, Class, Const, const_factory, From,
+                           Function, EmptyNode, Name, Arguments)
+from astroid.bases import BUILTINS, Generator
+from astroid.manager import AstroidManager
+MANAGER = AstroidManager()
+
+_CONSTANTS = tuple(CONST_CLS) # the keys of CONST_CLS eg python builtin types
+
+def _io_discrepancy(member):
+    # _io module names itself `io`: http://bugs.python.org/issue18602
+    member_self = getattr(member, '__self__', None)
+    return (member_self and
+            ismodule(member_self) and
+            member_self.__name__ == '_io' and
+            member.__module__ == 'io')
+
+def _attach_local_node(parent, node, name):
+    node.name = name # needed by add_local_node
+    parent.add_local_node(node)
+
+_marker = object()
+
+def attach_dummy_node(node, name, object=_marker):
+    """create a dummy node and register it in the locals of the given
+    node with the specified name
+    """
+    enode = EmptyNode()
+    enode.object = object
+    _attach_local_node(node, enode, name)
+
+def _has_underlying_object(self):
+    return hasattr(self, 'object') and self.object is not _marker
+
+EmptyNode.has_underlying_object = _has_underlying_object
+
+def attach_const_node(node, name, value):
+    """create a Const node and register it in the locals of the given
+    node with the specified name
+    """
+    if not name in node.special_attributes:
+        _attach_local_node(node, const_factory(value), name)
+
+def attach_import_node(node, modname, membername):
+    """create a From node and register it in the locals of the given
+    node with the specified name
+    """
+    from_node = From(modname, [(membername, None)])
+    _attach_local_node(node, from_node, membername)
+
+
+def build_module(name, doc=None):
+    """create and initialize a astroid Module node"""
+    node = Module(name, doc, pure_python=False)
+    node.package = False
+    node.parent = None
+    return node
+
+def build_class(name, basenames=(), doc=None):
+    """create and initialize a astroid Class node"""
+    node = Class(name, doc)
+    for base in basenames:
+        basenode = Name()
+        basenode.name = base
+        node.bases.append(basenode)
+        basenode.parent = node
+    return node
+
+def build_function(name, args=None, defaults=None, flag=0, doc=None):
+    """create and initialize a astroid Function node"""
+    args, defaults = args or [], defaults or []
+    # first argument is now a list of decorators
+    func = Function(name, doc)
+    func.args = argsnode = Arguments()
+    argsnode.args = []
+    for arg in args:
+        argsnode.args.append(Name())
+        argsnode.args[-1].name = arg
+        argsnode.args[-1].parent = argsnode
+    argsnode.defaults = []
+    for default in defaults:
+        argsnode.defaults.append(const_factory(default))
+        argsnode.defaults[-1].parent = argsnode
+    argsnode.kwarg = None
+    argsnode.vararg = None
+    argsnode.parent = func
+    if args:
+        register_arguments(func)
+    return func
+
+
+def build_from_import(fromname, names):
+    """create and initialize an astroid From import statement"""
+    return From(fromname, [(name, None) for name in names])
+
+def register_arguments(func, args=None):
+    """add given arguments to local
+
+    args is a list that may contains nested lists
+    (i.e. def func(a, (b, c, d)): ...)
+    """
+    if args is None:
+        args = func.args.args
+        if func.args.vararg:
+            func.set_local(func.args.vararg, func.args)
+        if func.args.kwarg:
+            func.set_local(func.args.kwarg, func.args)
+    for arg in args:
+        if isinstance(arg, Name):
+            func.set_local(arg.name, arg)
+        else:
+            register_arguments(func, arg.elts)
+
+def object_build_class(node, member, localname):
+    """create astroid for a living class object"""
+    basenames = [base.__name__ for base in member.__bases__]
+    return _base_class_object_build(node, member, basenames,
+                                    localname=localname)
+
+def object_build_function(node, member, localname):
+    """create astroid for a living function object"""
+    args, varargs, varkw, defaults = getargspec(member)
+    if varargs is not None:
+        args.append(varargs)
+    if varkw is not None:
+        args.append(varkw)
+    func = build_function(getattr(member, '__name__', None) or localname, args,
+                          defaults, six.get_function_code(member).co_flags, member.__doc__)
+    node.add_local_node(func, localname)
+
+def object_build_datadescriptor(node, member, name):
+    """create astroid for a living data descriptor object"""
+    return _base_class_object_build(node, member, [], name)
+
+def object_build_methoddescriptor(node, member, localname):
+    """create astroid for a living method descriptor object"""
+    # FIXME get arguments ?
+    func = build_function(getattr(member, '__name__', None) or localname,
+                          doc=member.__doc__)
+    # set node's arguments to None to notice that we have no information, not
+    # and empty argument list
+    func.args.args = None
+    node.add_local_node(func, localname)
+
+def _base_class_object_build(node, member, basenames, name=None, localname=None):
+    """create astroid for a living class object, with a given set of base names
+    (e.g. ancestors)
+    """
+    klass = build_class(name or getattr(member, '__name__', None) or localname,
+                        basenames, member.__doc__)
+    klass._newstyle = isinstance(member, type)
+    node.add_local_node(klass, localname)
+    try:
+        # limit the instantiation trick since it's too dangerous
+        # (such as infinite test execution...)
+        # this at least resolves common case such as Exception.args,
+        # OSError.errno
+        if issubclass(member, Exception):
+            instdict = member().__dict__
+        else:
+            raise TypeError
+    except:
+        pass
+    else:
+        for name, obj in instdict.items():
+            valnode = EmptyNode()
+            valnode.object = obj
+            valnode.parent = klass
+            valnode.lineno = 1
+            klass.instance_attrs[name] = [valnode]
+    return klass
+
+
+
+
+class InspectBuilder(object):
+    """class for building nodes from living object
+
+    this is actually a really minimal representation, including only Module,
+    Function and Class nodes and some others as guessed.
+    """
+
+    # astroid from living objects ###############################################
+
+    def __init__(self):
+        self._done = {}
+        self._module = None
+
+    def inspect_build(self, module, modname=None, path=None):
+        """build astroid from a living module (i.e. using inspect)
+        this is used when there is no python source code available (either
+        because it's a built-in module or because the .py is not available)
+        """
+        self._module = module
+        if modname is None:
+            modname = module.__name__
+        try:
+            node = build_module(modname, module.__doc__)
+        except AttributeError:
+            # in jython, java modules have no __doc__ (see #109562)
+            node = build_module(modname)
+        node.file = node.path = path and abspath(path) or path
+        node.name = modname
+        MANAGER.cache_module(node)
+        node.package = hasattr(module, '__path__')
+        self._done = {}
+        self.object_build(node, module)
+        return node
+
+    def object_build(self, node, obj):
+        """recursive method which create a partial ast from real objects
+         (only function, class, and method are handled)
+        """
+        if obj in self._done:
+            return self._done[obj]
+        self._done[obj] = node
+        for name in dir(obj):
+            try:
+                member = getattr(obj, name)
+            except AttributeError:
+                # damned ExtensionClass.Base, I know you're there !
+                attach_dummy_node(node, name)
+                continue
+            if ismethod(member):
+                member = six.get_method_function(member)
+            if isfunction(member):
+                # verify this is not an imported function
+                filename = getattr(six.get_function_code(member),
+                                   'co_filename', None)
+                if filename is None:
+                    assert isinstance(member, object)
+                    object_build_methoddescriptor(node, member, name)
+                elif filename != getattr(self._module, '__file__', None):
+                    attach_dummy_node(node, name, member)
+                else:
+                    object_build_function(node, member, name)
+            elif isbuiltin(member):
+                if (not _io_discrepancy(member) and
+                        self.imported_member(node, member, name)):
+                    continue
+                object_build_methoddescriptor(node, member, name)
+            elif isclass(member):
+                if self.imported_member(node, member, name):
+                    continue
+                if member in self._done:
+                    class_node = self._done[member]
+                    if not class_node in node.locals.get(name, ()):
+                        node.add_local_node(class_node, name)
+                else:
+                    class_node = object_build_class(node, member, name)
+                    # recursion
+                    self.object_build(class_node, member)
+                if name == '__class__' and class_node.parent is None:
+                    class_node.parent = self._done[self._module]
+            elif ismethoddescriptor(member):
+                assert isinstance(member, object)
+                object_build_methoddescriptor(node, member, name)
+            elif isdatadescriptor(member):
+                assert isinstance(member, object)
+                object_build_datadescriptor(node, member, name)
+            elif type(member) in _CONSTANTS:
+                attach_const_node(node, name, member)
+            else:
+                # create an empty node so that the name is actually defined
+                attach_dummy_node(node, name, member)
+
+    def imported_member(self, node, member, name):
+        """verify this is not an imported class or handle it"""
+        # /!\ some classes like ExtensionClass doesn't have a __module__
+        # attribute ! Also, this may trigger an exception on badly built module
+        # (see http://www.logilab.org/ticket/57299 for instance)
+        try:
+            modname = getattr(member, '__module__', None)
+        except:
+            # XXX use logging
+            print('unexpected error while building astroid from living object')
+            import traceback
+            traceback.print_exc()
+            modname = None
+        if modname is None:
+            if name in ('__new__', '__subclasshook__'):
+                # Python 2.5.1 (r251:54863, Sep  1 2010, 22:03:14)
+                # >>> print object.__new__.__module__
+                # None
+                modname = BUILTINS
+            else:
+                attach_dummy_node(node, name, member)
+                return True
+        if {'gtk': 'gtk._gtk'}.get(modname, modname) != self._module.__name__:
+            # check if it sounds valid and then add an import node, else use a
+            # dummy node
+            try:
+                getattr(sys.modules[modname], name)
+            except (KeyError, AttributeError):
+                attach_dummy_node(node, name, member)
+            else:
+                attach_import_node(node, modname, name)
+            return True
+        return False
+
+
+### astroid bootstrapping ######################################################
+Astroid_BUILDER = InspectBuilder()
+
+_CONST_PROXY = {}
+def _astroid_bootstrapping(astroid_builtin=None):
+    """astroid boot strapping the builtins module"""
+    # this boot strapping is necessary since we need the Const nodes to
+    # inspect_build builtins, and then we can proxy Const
+    if astroid_builtin is None:
+        from logilab.common.compat import builtins
+        astroid_builtin = Astroid_BUILDER.inspect_build(builtins)
+
+    for cls, node_cls in CONST_CLS.items():
+        if cls is type(None):
+            proxy = build_class('NoneType')
+            proxy.parent = astroid_builtin
+        else:
+            proxy = astroid_builtin.getattr(cls.__name__)[0]
+        if cls in (dict, list, set, tuple):
+            node_cls._proxied = proxy
+        else:
+            _CONST_PROXY[cls] = proxy
+
+_astroid_bootstrapping()
+
+# TODO : find a nicer way to handle this situation;
+# However __proxied introduced an
+# infinite recursion (see https://bugs.launchpad.net/pylint/+bug/456870)
+def _set_proxied(const):
+    return _CONST_PROXY[const.value.__class__]
+Const._proxied = property(_set_proxied)
+
+from types import GeneratorType
+Generator._proxied = Class(GeneratorType.__name__, GeneratorType.__doc__)
+Astroid_BUILDER.object_build(Generator._proxied, GeneratorType)
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/rebuilder.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/rebuilder.py
new file mode 100644
index 0000000..013479a
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/rebuilder.py
@@ -0,0 +1,926 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""this module contains utilities for rebuilding a _ast tree in
+order to get a single Astroid representation
+"""
+
+import sys
+from _ast import (
+    Expr as Discard, Str,
+    # binary operators
+    Add, BinOp, Div, FloorDiv, Mod, Mult, Pow, Sub, BitAnd, BitOr, BitXor,
+    LShift, RShift,
+    # logical operators
+    And, Or,
+    # unary operators
+    UAdd, USub, Not, Invert,
+    # comparison operators
+    Eq, Gt, GtE, In, Is, IsNot, Lt, LtE, NotEq, NotIn,
+    )
+
+from astroid import nodes as new
+from astroid import astpeephole
+
+
+_BIN_OP_CLASSES = {Add: '+',
+                   BitAnd: '&',
+                   BitOr: '|',
+                   BitXor: '^',
+                   Div: '/',
+                   FloorDiv: '//',
+                   Mod: '%',
+                   Mult: '*',
+                   Pow: '**',
+                   Sub: '-',
+                   LShift: '<<',
+                   RShift: '>>',
+                  }
+
+_BOOL_OP_CLASSES = {And: 'and',
+                    Or: 'or',
+                   }
+
+_UNARY_OP_CLASSES = {UAdd: '+',
+                     USub: '-',
+                     Not: 'not',
+                     Invert: '~',
+                    }
+
+_CMP_OP_CLASSES = {Eq: '==',
+                   Gt: '>',
+                   GtE: '>=',
+                   In: 'in',
+                   Is: 'is',
+                   IsNot: 'is not',
+                   Lt: '<',
+                   LtE: '<=',
+                   NotEq: '!=',
+                   NotIn: 'not in',
+                  }
+
+CONST_NAME_TRANSFORMS = {'None':  None,
+                         'True':  True,
+                         'False': False,
+                        }
+
+REDIRECT = {'arguments': 'Arguments',
+            'Attribute': 'Getattr',
+            'comprehension': 'Comprehension',
+            'Call': 'CallFunc',
+            'ClassDef': 'Class',
+            "ListCompFor": 'Comprehension',
+            "GenExprFor": 'Comprehension',
+            'excepthandler': 'ExceptHandler',
+            'Expr': 'Discard',
+            'FunctionDef': 'Function',
+            'GeneratorExp': 'GenExpr',
+            'ImportFrom': 'From',
+            'keyword': 'Keyword',
+            'Repr': 'Backquote',
+           }
+PY3K = sys.version_info >= (3, 0)
+PY34 = sys.version_info >= (3, 4)
+
+def _init_set_doc(node, newnode):
+    newnode.doc = None
+    try:
+        if isinstance(node.body[0], Discard) and isinstance(node.body[0].value, Str):
+            newnode.doc = node.body[0].value.s
+            node.body = node.body[1:]
+
+    except IndexError:
+        pass # ast built from scratch
+
+def _lineno_parent(oldnode, newnode, parent):
+    newnode.parent = parent
+    newnode.lineno = oldnode.lineno
+    newnode.col_offset = oldnode.col_offset
+
+def _set_infos(oldnode, newnode, parent):
+    newnode.parent = parent
+    if hasattr(oldnode, 'lineno'):
+        newnode.lineno = oldnode.lineno
+    if hasattr(oldnode, 'col_offset'):
+        newnode.col_offset = oldnode.col_offset
+
+def _create_yield_node(node, parent, rebuilder, factory):
+    newnode = factory()
+    _lineno_parent(node, newnode, parent)
+    if node.value is not None:
+        newnode.value = rebuilder.visit(node.value, newnode)
+    return newnode
+
+
+class TreeRebuilder(object):
+    """Rebuilds the _ast tree to become an Astroid tree"""
+
+    def __init__(self, manager):
+        self._manager = manager
+        self.asscontext = None
+        self._global_names = []
+        self._from_nodes = []
+        self._delayed_assattr = []
+        self._visit_meths = {}
+        self._transform = manager.transform
+        self._peepholer = astpeephole.ASTPeepholeOptimizer()
+
+    def visit_module(self, node, modname, modpath, package):
+        """visit a Module node by returning a fresh instance of it"""
+        newnode = new.Module(modname, None)
+        newnode.package = package
+        newnode.parent = None
+        _init_set_doc(node, newnode)
+        newnode.body = [self.visit(child, newnode) for child in node.body]
+        newnode.file = newnode.path = modpath
+        return self._transform(newnode)
+
+    def visit(self, node, parent):
+        cls = node.__class__
+        if cls in self._visit_meths:
+            visit_method = self._visit_meths[cls]
+        else:
+            cls_name = cls.__name__
+            visit_name = 'visit_' + REDIRECT.get(cls_name, cls_name).lower()
+            visit_method = getattr(self, visit_name)
+            self._visit_meths[cls] = visit_method
+        return self._transform(visit_method(node, parent))
+
+    def _save_assignment(self, node, name=None):
+        """save assignement situation since node.parent is not available yet"""
+        if self._global_names and node.name in self._global_names[-1]:
+            node.root().set_local(node.name, node)
+        else:
+            node.parent.set_local(node.name, node)
+
+
+    def visit_arguments(self, node, parent):
+        """visit a Arguments node by returning a fresh instance of it"""
+        newnode = new.Arguments()
+        newnode.parent = parent
+        self.asscontext = "Ass"
+        newnode.args = [self.visit(child, newnode) for child in node.args]
+        self.asscontext = None
+        newnode.defaults = [self.visit(child, newnode) for child in node.defaults]
+        newnode.kwonlyargs = []
+        newnode.kw_defaults = []
+        vararg, kwarg = node.vararg, node.kwarg
+        # change added in 82732 (7c5c678e4164), vararg and kwarg
+        # are instances of `_ast.arg`, not strings
+        if vararg:
+            if PY34:
+                if vararg.annotation:
+                    newnode.varargannotation = self.visit(vararg.annotation,
+                                                          newnode)
+                vararg = vararg.arg
+            elif PY3K and node.varargannotation:
+                newnode.varargannotation = self.visit(node.varargannotation,
+                                                      newnode)
+        if kwarg:
+            if PY34:
+                if kwarg.annotation:
+                    newnode.kwargannotation = self.visit(kwarg.annotation,
+                                                         newnode)
+                kwarg = kwarg.arg
+            elif PY3K:
+                if node.kwargannotation:
+                    newnode.kwargannotation = self.visit(node.kwargannotation,
+                                                         newnode)
+        newnode.vararg = vararg
+        newnode.kwarg = kwarg
+        # save argument names in locals:
+        if vararg:
+            newnode.parent.set_local(vararg, newnode)
+        if kwarg:
+            newnode.parent.set_local(kwarg, newnode)
+        return newnode
+
+    def visit_assattr(self, node, parent):
+        """visit a AssAttr node by returning a fresh instance of it"""
+        assc, self.asscontext = self.asscontext, None
+        newnode = new.AssAttr()
+        _lineno_parent(node, newnode, parent)
+        newnode.expr = self.visit(node.expr, newnode)
+        self.asscontext = assc
+        self._delayed_assattr.append(newnode)
+        return newnode
+
+    def visit_assert(self, node, parent):
+        """visit a Assert node by returning a fresh instance of it"""
+        newnode = new.Assert()
+        _lineno_parent(node, newnode, parent)
+        newnode.test = self.visit(node.test, newnode)
+        if node.msg is not None:
+            newnode.fail = self.visit(node.msg, newnode)
+        return newnode
+
+    def visit_assign(self, node, parent):
+        """visit a Assign node by returning a fresh instance of it"""
+        newnode = new.Assign()
+        _lineno_parent(node, newnode, parent)
+        self.asscontext = "Ass"
+        newnode.targets = [self.visit(child, newnode) for child in node.targets]
+        self.asscontext = None
+        newnode.value = self.visit(node.value, newnode)
+        # set some function or metaclass infos  XXX explain ?
+        klass = newnode.parent.frame()
+        if (isinstance(klass, new.Class)
+                and isinstance(newnode.value, new.CallFunc)
+                and isinstance(newnode.value.func, new.Name)):
+            func_name = newnode.value.func.name
+            for ass_node in newnode.targets:
+                try:
+                    meth = klass[ass_node.name]
+                    if isinstance(meth, new.Function):
+                        if func_name in ('classmethod', 'staticmethod'):
+                            meth.type = func_name
+                        elif func_name == 'classproperty': # see lgc.decorators
+                            meth.type = 'classmethod'
+                        meth.extra_decorators.append(newnode.value)
+                except (AttributeError, KeyError):
+                    continue
+        return newnode
+
+    def visit_assname(self, node, parent, node_name=None):
+        '''visit a node and return a AssName node'''
+        newnode = new.AssName()
+        _set_infos(node, newnode, parent)
+        newnode.name = node_name
+        self._save_assignment(newnode)
+        return newnode
+
+    def visit_augassign(self, node, parent):
+        """visit a AugAssign node by returning a fresh instance of it"""
+        newnode = new.AugAssign()
+        _lineno_parent(node, newnode, parent)
+        newnode.op = _BIN_OP_CLASSES[node.op.__class__] + "="
+        self.asscontext = "Ass"
+        newnode.target = self.visit(node.target, newnode)
+        self.asscontext = None
+        newnode.value = self.visit(node.value, newnode)
+        return newnode
+
+    def visit_backquote(self, node, parent):
+        """visit a Backquote node by returning a fresh instance of it"""
+        newnode = new.Backquote()
+        _lineno_parent(node, newnode, parent)
+        newnode.value = self.visit(node.value, newnode)
+        return newnode
+
+    def visit_binop(self, node, parent):
+        """visit a BinOp node by returning a fresh instance of it"""
+        if isinstance(node.left, BinOp) and self._manager.optimize_ast:
+            # Optimize BinOp operations in order to remove
+            # redundant recursion. For instance, if the
+            # following code is parsed in order to obtain
+            # its ast, then the rebuilder will fail with an
+            # infinite recursion, the same will happen with the
+            # inference engine as well. There's no need to hold
+            # so many objects for the BinOp if they can be reduced
+            # to something else (also, the optimization
+            # might handle only Const binops, which isn't a big
+            # problem for the correctness of the program).
+            #
+            # ("a" + "b" + # one thousand more + "c")
+            newnode = self._peepholer.optimize_binop(node)
+            if newnode:
+                _lineno_parent(node, newnode, parent)
+                return newnode
+
+        newnode = new.BinOp()
+        _lineno_parent(node, newnode, parent)
+        newnode.left = self.visit(node.left, newnode)
+        newnode.right = self.visit(node.right, newnode)
+        newnode.op = _BIN_OP_CLASSES[node.op.__class__]
+        return newnode
+
+    def visit_boolop(self, node, parent):
+        """visit a BoolOp node by returning a fresh instance of it"""
+        newnode = new.BoolOp()
+        _lineno_parent(node, newnode, parent)
+        newnode.values = [self.visit(child, newnode) for child in node.values]
+        newnode.op = _BOOL_OP_CLASSES[node.op.__class__]
+        return newnode
+
+    def visit_break(self, node, parent):
+        """visit a Break node by returning a fresh instance of it"""
+        newnode = new.Break()
+        _set_infos(node, newnode, parent)
+        return newnode
+
+    def visit_callfunc(self, node, parent):
+        """visit a CallFunc node by returning a fresh instance of it"""
+        newnode = new.CallFunc()
+        _lineno_parent(node, newnode, parent)
+        newnode.func = self.visit(node.func, newnode)
+        newnode.args = [self.visit(child, newnode) for child in node.args]
+        if node.starargs is not None:
+            newnode.starargs = self.visit(node.starargs, newnode)
+        if node.kwargs is not None:
+            newnode.kwargs = self.visit(node.kwargs, newnode)
+        for child in node.keywords:
+            newnode.args.append(self.visit(child, newnode))
+        return newnode
+
+    def visit_class(self, node, parent):
+        """visit a Class node to become astroid"""
+        newnode = new.Class(node.name, None)
+        _lineno_parent(node, newnode, parent)
+        _init_set_doc(node, newnode)
+        newnode.bases = [self.visit(child, newnode) for child in node.bases]
+        newnode.body = [self.visit(child, newnode) for child in node.body]
+        if 'decorator_list' in node._fields and node.decorator_list:# py >= 2.6
+            newnode.decorators = self.visit_decorators(node, newnode)
+        newnode.parent.frame().set_local(newnode.name, newnode)
+        return newnode
+
+    def visit_const(self, node, parent):
+        """visit a Const node by returning a fresh instance of it"""
+        newnode = new.Const(node.value)
+        _set_infos(node, newnode, parent)
+        return newnode
+
+    def visit_continue(self, node, parent):
+        """visit a Continue node by returning a fresh instance of it"""
+        newnode = new.Continue()
+        _set_infos(node, newnode, parent)
+        return newnode
+
+    def visit_compare(self, node, parent):
+        """visit a Compare node by returning a fresh instance of it"""
+        newnode = new.Compare()
+        _lineno_parent(node, newnode, parent)
+        newnode.left = self.visit(node.left, newnode)
+        newnode.ops = [(_CMP_OP_CLASSES[op.__class__], self.visit(expr, newnode))
+                       for (op, expr) in zip(node.ops, node.comparators)]
+        return newnode
+
+    def visit_comprehension(self, node, parent):
+        """visit a Comprehension node by returning a fresh instance of it"""
+        newnode = new.Comprehension()
+        newnode.parent = parent
+        self.asscontext = "Ass"
+        newnode.target = self.visit(node.target, newnode)
+        self.asscontext = None
+        newnode.iter = self.visit(node.iter, newnode)
+        newnode.ifs = [self.visit(child, newnode) for child in node.ifs]
+        return newnode
+
+    def visit_decorators(self, node, parent):
+        """visit a Decorators node by returning a fresh instance of it"""
+        # /!\ node is actually a _ast.Function node while
+        # parent is a astroid.nodes.Function node
+        newnode = new.Decorators()
+        _lineno_parent(node, newnode, parent)
+        if 'decorators' in node._fields: # py < 2.6, i.e. 2.5
+            decorators = node.decorators
+        else:
+            decorators = node.decorator_list
+        newnode.nodes = [self.visit(child, newnode) for child in decorators]
+        return newnode
+
+    def visit_delete(self, node, parent):
+        """visit a Delete node by returning a fresh instance of it"""
+        newnode = new.Delete()
+        _lineno_parent(node, newnode, parent)
+        self.asscontext = "Del"
+        newnode.targets = [self.visit(child, newnode) for child in node.targets]
+        self.asscontext = None
+        return newnode
+
+    def visit_dict(self, node, parent):
+        """visit a Dict node by returning a fresh instance of it"""
+        newnode = new.Dict()
+        _lineno_parent(node, newnode, parent)
+        newnode.items = [(self.visit(key, newnode), self.visit(value, newnode))
+                         for key, value in zip(node.keys, node.values)]
+        return newnode
+
+    def visit_dictcomp(self, node, parent):
+        """visit a DictComp node by returning a fresh instance of it"""
+        newnode = new.DictComp()
+        _lineno_parent(node, newnode, parent)
+        newnode.key = self.visit(node.key, newnode)
+        newnode.value = self.visit(node.value, newnode)
+        newnode.generators = [self.visit(child, newnode)
+                              for child in node.generators]
+        return newnode
+
+    def visit_discard(self, node, parent):
+        """visit a Discard node by returning a fresh instance of it"""
+        newnode = new.Discard()
+        _lineno_parent(node, newnode, parent)
+        newnode.value = self.visit(node.value, newnode)
+        return newnode
+
+    def visit_ellipsis(self, node, parent):
+        """visit an Ellipsis node by returning a fresh instance of it"""
+        newnode = new.Ellipsis()
+        _set_infos(node, newnode, parent)
+        return newnode
+
+    def visit_emptynode(self, node, parent):
+        """visit an EmptyNode node by returning a fresh instance of it"""
+        newnode = new.EmptyNode()
+        _set_infos(node, newnode, parent)
+        return newnode
+
+    def visit_excepthandler(self, node, parent):
+        """visit an ExceptHandler node by returning a fresh instance of it"""
+        newnode = new.ExceptHandler()
+        _lineno_parent(node, newnode, parent)
+        if node.type is not None:
+            newnode.type = self.visit(node.type, newnode)
+        if node.name is not None:
+            # /!\ node.name can be a tuple
+            self.asscontext = "Ass"
+            newnode.name = self.visit(node.name, newnode)
+            self.asscontext = None
+        newnode.body = [self.visit(child, newnode) for child in node.body]
+        return newnode
+
+    def visit_exec(self, node, parent):
+        """visit an Exec node by returning a fresh instance of it"""
+        newnode = new.Exec()
+        _lineno_parent(node, newnode, parent)
+        newnode.expr = self.visit(node.body, newnode)
+        if node.globals is not None:
+            newnode.globals = self.visit(node.globals, newnode)
+        if node.locals is not None:
+            newnode.locals = self.visit(node.locals, newnode)
+        return newnode
+
+    def visit_extslice(self, node, parent):
+        """visit an ExtSlice node by returning a fresh instance of it"""
+        newnode = new.ExtSlice()
+        newnode.parent = parent
+        newnode.dims = [self.visit(dim, newnode) for dim in node.dims]
+        return newnode
+
+    def visit_for(self, node, parent):
+        """visit a For node by returning a fresh instance of it"""
+        newnode = new.For()
+        _lineno_parent(node, newnode, parent)
+        self.asscontext = "Ass"
+        newnode.target = self.visit(node.target, newnode)
+        self.asscontext = None
+        newnode.iter = self.visit(node.iter, newnode)
+        newnode.body = [self.visit(child, newnode) for child in node.body]
+        newnode.orelse = [self.visit(child, newnode) for child in node.orelse]
+        return newnode
+
+    def visit_from(self, node, parent):
+        """visit a From node by returning a fresh instance of it"""
+        names = [(alias.name, alias.asname) for alias in node.names]
+        newnode = new.From(node.module or '', names, node.level or None)
+        _set_infos(node, newnode, parent)
+        # store From names to add them to locals after building
+        self._from_nodes.append(newnode)
+        return newnode
+
+    def visit_function(self, node, parent):
+        """visit an Function node to become astroid"""
+        self._global_names.append({})
+        newnode = new.Function(node.name, None)
+        _lineno_parent(node, newnode, parent)
+        _init_set_doc(node, newnode)
+        newnode.args = self.visit(node.args, newnode)
+        newnode.body = [self.visit(child, newnode) for child in node.body]
+        if 'decorators' in node._fields: # py < 2.6
+            attr = 'decorators'
+        else:
+            attr = 'decorator_list'
+        decorators = getattr(node, attr)
+        if decorators:
+            newnode.decorators = self.visit_decorators(node, newnode)
+        if PY3K and node.returns:
+            newnode.returns = self.visit(node.returns, newnode)
+        self._global_names.pop()
+        frame = newnode.parent.frame()
+        if isinstance(frame, new.Class):
+            if newnode.name == '__new__':
+                newnode._type = 'classmethod'
+            else:
+                newnode._type = 'method'
+        if newnode.decorators is not None:
+            for decorator_expr in newnode.decorators.nodes:
+                if isinstance(decorator_expr, new.Name):
+                    if decorator_expr.name in ('classmethod', 'staticmethod'):
+                        newnode._type = decorator_expr.name
+                    elif decorator_expr.name == 'classproperty':
+                        newnode._type = 'classmethod'
+        frame.set_local(newnode.name, newnode)
+        return newnode
+
+    def visit_genexpr(self, node, parent):
+        """visit a GenExpr node by returning a fresh instance of it"""
+        newnode = new.GenExpr()
+        _lineno_parent(node, newnode, parent)
+        newnode.elt = self.visit(node.elt, newnode)
+        newnode.generators = [self.visit(child, newnode) for child in node.generators]
+        return newnode
+
+    def visit_getattr(self, node, parent):
+        """visit a Getattr node by returning a fresh instance of it"""
+        if self.asscontext == "Del":
+            # FIXME : maybe we should reintroduce and visit_delattr ?
+            # for instance, deactivating asscontext
+            newnode = new.DelAttr()
+        elif self.asscontext == "Ass":
+            # FIXME : maybe we should call visit_assattr ?
+            newnode = new.AssAttr()
+            self._delayed_assattr.append(newnode)
+        else:
+            newnode = new.Getattr()
+        _lineno_parent(node, newnode, parent)
+        asscontext, self.asscontext = self.asscontext, None
+        newnode.expr = self.visit(node.value, newnode)
+        self.asscontext = asscontext
+        newnode.attrname = node.attr
+        return newnode
+
+    def visit_global(self, node, parent):
+        """visit an Global node to become astroid"""
+        newnode = new.Global(node.names)
+        _set_infos(node, newnode, parent)
+        if self._global_names: # global at the module level, no effect
+            for name in node.names:
+                self._global_names[-1].setdefault(name, []).append(newnode)
+        return newnode
+
+    def visit_if(self, node, parent):
+        """visit a If node by returning a fresh instance of it"""
+        newnode = new.If()
+        _lineno_parent(node, newnode, parent)
+        newnode.test = self.visit(node.test, newnode)
+        newnode.body = [self.visit(child, newnode) for child in node.body]
+        newnode.orelse = [self.visit(child, newnode) for child in node.orelse]
+        return newnode
+
+    def visit_ifexp(self, node, parent):
+        """visit a IfExp node by returning a fresh instance of it"""
+        newnode = new.IfExp()
+        _lineno_parent(node, newnode, parent)
+        newnode.test = self.visit(node.test, newnode)
+        newnode.body = self.visit(node.body, newnode)
+        newnode.orelse = self.visit(node.orelse, newnode)
+        return newnode
+
+    def visit_import(self, node, parent):
+        """visit a Import node by returning a fresh instance of it"""
+        newnode = new.Import()
+        _set_infos(node, newnode, parent)
+        newnode.names = [(alias.name, alias.asname) for alias in node.names]
+        # save import names in parent's locals:
+        for (name, asname) in newnode.names:
+            name = asname or name
+            newnode.parent.set_local(name.split('.')[0], newnode)
+        return newnode
+
+    def visit_index(self, node, parent):
+        """visit a Index node by returning a fresh instance of it"""
+        newnode = new.Index()
+        newnode.parent = parent
+        newnode.value = self.visit(node.value, newnode)
+        return newnode
+
+    def visit_keyword(self, node, parent):
+        """visit a Keyword node by returning a fresh instance of it"""
+        newnode = new.Keyword()
+        newnode.parent = parent
+        newnode.arg = node.arg
+        newnode.value = self.visit(node.value, newnode)
+        return newnode
+
+    def visit_lambda(self, node, parent):
+        """visit a Lambda node by returning a fresh instance of it"""
+        newnode = new.Lambda()
+        _lineno_parent(node, newnode, parent)
+        newnode.args = self.visit(node.args, newnode)
+        newnode.body = self.visit(node.body, newnode)
+        return newnode
+
+    def visit_list(self, node, parent):
+        """visit a List node by returning a fresh instance of it"""
+        newnode = new.List()
+        _lineno_parent(node, newnode, parent)
+        newnode.elts = [self.visit(child, newnode) for child in node.elts]
+        return newnode
+
+    def visit_listcomp(self, node, parent):
+        """visit a ListComp node by returning a fresh instance of it"""
+        newnode = new.ListComp()
+        _lineno_parent(node, newnode, parent)
+        newnode.elt = self.visit(node.elt, newnode)
+        newnode.generators = [self.visit(child, newnode)
+                              for child in node.generators]
+        return newnode
+
+    def visit_name(self, node, parent):
+        """visit a Name node by returning a fresh instance of it"""
+        # True and False can be assigned to something in py2x, so we have to
+        # check first the asscontext
+        if self.asscontext == "Del":
+            newnode = new.DelName()
+        elif self.asscontext is not None: # Ass
+            assert self.asscontext == "Ass"
+            newnode = new.AssName()
+        elif node.id in CONST_NAME_TRANSFORMS:
+            newnode = new.Const(CONST_NAME_TRANSFORMS[node.id])
+            _set_infos(node, newnode, parent)
+            return newnode
+        else:
+            newnode = new.Name()
+        _lineno_parent(node, newnode, parent)
+        newnode.name = node.id
+        # XXX REMOVE me :
+        if self.asscontext in ('Del', 'Ass'): # 'Aug' ??
+            self._save_assignment(newnode)
+        return newnode
+
+    def visit_bytes(self, node, parent):
+        """visit a Bytes node by returning a fresh instance of Const"""
+        newnode = new.Const(node.s)
+        _set_infos(node, newnode, parent)
+        return newnode
+
+    def visit_num(self, node, parent):
+        """visit a Num node by returning a fresh instance of Const"""
+        newnode = new.Const(node.n)
+        _set_infos(node, newnode, parent)
+        return newnode
+
+    def visit_pass(self, node, parent):
+        """visit a Pass node by returning a fresh instance of it"""
+        newnode = new.Pass()
+        _set_infos(node, newnode, parent)
+        return newnode
+
+    def visit_str(self, node, parent):
+        """visit a Str node by returning a fresh instance of Const"""
+        newnode = new.Const(node.s)
+        _set_infos(node, newnode, parent)
+        return newnode
+
+    def visit_print(self, node, parent):
+        """visit a Print node by returning a fresh instance of it"""
+        newnode = new.Print()
+        _lineno_parent(node, newnode, parent)
+        newnode.nl = node.nl
+        if node.dest is not None:
+            newnode.dest = self.visit(node.dest, newnode)
+        newnode.values = [self.visit(child, newnode) for child in node.values]
+        return newnode
+
+    def visit_raise(self, node, parent):
+        """visit a Raise node by returning a fresh instance of it"""
+        newnode = new.Raise()
+        _lineno_parent(node, newnode, parent)
+        if node.type is not None:
+            newnode.exc = self.visit(node.type, newnode)
+        if node.inst is not None:
+            newnode.inst = self.visit(node.inst, newnode)
+        if node.tback is not None:
+            newnode.tback = self.visit(node.tback, newnode)
+        return newnode
+
+    def visit_return(self, node, parent):
+        """visit a Return node by returning a fresh instance of it"""
+        newnode = new.Return()
+        _lineno_parent(node, newnode, parent)
+        if node.value is not None:
+            newnode.value = self.visit(node.value, newnode)
+        return newnode
+
+    def visit_set(self, node, parent):
+        """visit a Set node by returning a fresh instance of it"""
+        newnode = new.Set()
+        _lineno_parent(node, newnode, parent)
+        newnode.elts = [self.visit(child, newnode) for child in node.elts]
+        return newnode
+
+    def visit_setcomp(self, node, parent):
+        """visit a SetComp node by returning a fresh instance of it"""
+        newnode = new.SetComp()
+        _lineno_parent(node, newnode, parent)
+        newnode.elt = self.visit(node.elt, newnode)
+        newnode.generators = [self.visit(child, newnode)
+                              for child in node.generators]
+        return newnode
+
+    def visit_slice(self, node, parent):
+        """visit a Slice node by returning a fresh instance of it"""
+        newnode = new.Slice()
+        newnode.parent = parent
+        if node.lower is not None:
+            newnode.lower = self.visit(node.lower, newnode)
+        if node.upper is not None:
+            newnode.upper = self.visit(node.upper, newnode)
+        if node.step is not None:
+            newnode.step = self.visit(node.step, newnode)
+        return newnode
+
+    def visit_subscript(self, node, parent):
+        """visit a Subscript node by returning a fresh instance of it"""
+        newnode = new.Subscript()
+        _lineno_parent(node, newnode, parent)
+        subcontext, self.asscontext = self.asscontext, None
+        newnode.value = self.visit(node.value, newnode)
+        newnode.slice = self.visit(node.slice, newnode)
+        self.asscontext = subcontext
+        return newnode
+
+    def visit_tryexcept(self, node, parent):
+        """visit a TryExcept node by returning a fresh instance of it"""
+        newnode = new.TryExcept()
+        _lineno_parent(node, newnode, parent)
+        newnode.body = [self.visit(child, newnode) for child in node.body]
+        newnode.handlers = [self.visit(child, newnode) for child in node.handlers]
+        newnode.orelse = [self.visit(child, newnode) for child in node.orelse]
+        return newnode
+
+    def visit_tryfinally(self, node, parent):
+        """visit a TryFinally node by returning a fresh instance of it"""
+        newnode = new.TryFinally()
+        _lineno_parent(node, newnode, parent)
+        newnode.body = [self.visit(child, newnode) for child in node.body]
+        newnode.finalbody = [self.visit(n, newnode) for n in node.finalbody]
+        return newnode
+
+    def visit_tuple(self, node, parent):
+        """visit a Tuple node by returning a fresh instance of it"""
+        newnode = new.Tuple()
+        _lineno_parent(node, newnode, parent)
+        newnode.elts = [self.visit(child, newnode) for child in node.elts]
+        return newnode
+
+    def visit_unaryop(self, node, parent):
+        """visit a UnaryOp node by returning a fresh instance of it"""
+        newnode = new.UnaryOp()
+        _lineno_parent(node, newnode, parent)
+        newnode.operand = self.visit(node.operand, newnode)
+        newnode.op = _UNARY_OP_CLASSES[node.op.__class__]
+        return newnode
+
+    def visit_while(self, node, parent):
+        """visit a While node by returning a fresh instance of it"""
+        newnode = new.While()
+        _lineno_parent(node, newnode, parent)
+        newnode.test = self.visit(node.test, newnode)
+        newnode.body = [self.visit(child, newnode) for child in node.body]
+        newnode.orelse = [self.visit(child, newnode) for child in node.orelse]
+        return newnode
+
+    def visit_with(self, node, parent):
+        newnode = new.With()
+        _lineno_parent(node, newnode, parent)
+        expr = self.visit(node.context_expr, newnode)
+        self.asscontext = "Ass"
+        if node.optional_vars is not None:
+            vars = self.visit(node.optional_vars, newnode)
+        else:
+            vars = None
+        self.asscontext = None
+        newnode.items = [(expr, vars)]
+        newnode.body = [self.visit(child, newnode) for child in node.body]
+        return newnode
+
+    def visit_yield(self, node, parent):
+        """visit a Yield node by returning a fresh instance of it"""
+        return _create_yield_node(node, parent, self, new.Yield)
+
+class TreeRebuilder3k(TreeRebuilder):
+    """extend and overwrite TreeRebuilder for python3k"""
+
+    def visit_arg(self, node, parent):
+        """visit a arg node by returning a fresh AssName instance"""
+        # the <arg> node is coming from py>=3.0, but we use AssName in py2.x
+        # XXX or we should instead introduce a Arg node in astroid ?
+        return self.visit_assname(node, parent, node.arg)
+
+    def visit_nameconstant(self, node, parent):
+        # in Python 3.4 we have NameConstant for True / False / None
+        newnode = new.Const(node.value)
+        _set_infos(node, newnode, parent)
+        return newnode
+
+    def visit_arguments(self, node, parent):
+        newnode = super(TreeRebuilder3k, self).visit_arguments(node, parent)
+        self.asscontext = "Ass"
+        newnode.kwonlyargs = [self.visit(child, newnode) for child in node.kwonlyargs]
+        self.asscontext = None
+        newnode.kw_defaults = [self.visit(child, newnode) if child else None for child in node.kw_defaults]
+        newnode.annotations = [
+            self.visit(arg.annotation, newnode) if arg.annotation else None
+            for arg in node.args]
+        return newnode
+
+    def visit_excepthandler(self, node, parent):
+        """visit an ExceptHandler node by returning a fresh instance of it"""
+        newnode = new.ExceptHandler()
+        _lineno_parent(node, newnode, parent)
+        if node.type is not None:
+            newnode.type = self.visit(node.type, newnode)
+        if node.name is not None:
+            newnode.name = self.visit_assname(node, newnode, node.name)
+        newnode.body = [self.visit(child, newnode) for child in node.body]
+        return newnode
+
+    def visit_nonlocal(self, node, parent):
+        """visit a Nonlocal node and return a new instance of it"""
+        newnode = new.Nonlocal(node.names)
+        _set_infos(node, newnode, parent)
+        return newnode
+
+    def visit_raise(self, node, parent):
+        """visit a Raise node by returning a fresh instance of it"""
+        newnode = new.Raise()
+        _lineno_parent(node, newnode, parent)
+        # no traceback; anyway it is not used in Pylint
+        if node.exc is not None:
+            newnode.exc = self.visit(node.exc, newnode)
+        if node.cause is not None:
+            newnode.cause = self.visit(node.cause, newnode)
+        return newnode
+
+    def visit_starred(self, node, parent):
+        """visit a Starred node and return a new instance of it"""
+        newnode = new.Starred()
+        _lineno_parent(node, newnode, parent)
+        newnode.value = self.visit(node.value, newnode)
+        return newnode
+
+    def visit_try(self, node, parent):
+        # python 3.3 introduce a new Try node replacing TryFinally/TryExcept nodes
+        if node.finalbody:
+            newnode = new.TryFinally()
+            _lineno_parent(node, newnode, parent)
+            newnode.finalbody = [self.visit(n, newnode) for n in node.finalbody]
+            if node.handlers:
+                excnode = new.TryExcept()
+                _lineno_parent(node, excnode, newnode)
+                excnode.body = [self.visit(child, excnode) for child in node.body]
+                excnode.handlers = [self.visit(child, excnode) for child in node.handlers]
+                excnode.orelse = [self.visit(child, excnode) for child in node.orelse]
+                newnode.body = [excnode]
+            else:
+                newnode.body = [self.visit(child, newnode) for child in node.body]
+        elif node.handlers:
+            newnode = new.TryExcept()
+            _lineno_parent(node, newnode, parent)
+            newnode.body = [self.visit(child, newnode) for child in node.body]
+            newnode.handlers = [self.visit(child, newnode) for child in node.handlers]
+            newnode.orelse = [self.visit(child, newnode) for child in node.orelse]
+        return newnode
+
+    def visit_with(self, node, parent):
+        if 'items' not in node._fields:
+            # python < 3.3
+            return super(TreeRebuilder3k, self).visit_with(node, parent)
+
+        newnode = new.With()
+        _lineno_parent(node, newnode, parent)
+        def visit_child(child):
+            expr = self.visit(child.context_expr, newnode)
+            self.asscontext = 'Ass'
+            if child.optional_vars:
+                var = self.visit(child.optional_vars, newnode)
+            else:
+                var = None
+            self.asscontext = None
+            return expr, var
+        newnode.items = [visit_child(child)
+                         for child in node.items]
+        newnode.body = [self.visit(child, newnode) for child in node.body]
+        return newnode
+
+    def visit_yieldfrom(self, node, parent):
+        return _create_yield_node(node, parent, self, new.YieldFrom)
+
+    def visit_class(self, node, parent):
+        newnode = super(TreeRebuilder3k, self).visit_class(node, parent)
+        newnode._newstyle = True
+        for keyword in node.keywords:
+            if keyword.arg == 'metaclass':
+                newnode._metaclass = self.visit(keyword, newnode).value
+                break
+        return newnode
+
+if sys.version_info >= (3, 0):
+    TreeRebuilder = TreeRebuilder3k
+
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/scoped_nodes.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/scoped_nodes.py
new file mode 100644
index 0000000..ac90f87
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/scoped_nodes.py
@@ -0,0 +1,1484 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""This module contains the classes for "scoped" node, i.e. which are opening a
+new local scope in the language definition : Module, Class, Function (and
+Lambda, GenExpr, DictComp and SetComp to some extent).
+"""
+from __future__ import with_statement
+
+__doctype__ = "restructuredtext en"
+
+import sys
+import warnings
+from itertools import chain
+try:
+    from io import BytesIO
+except ImportError:
+    from cStringIO import StringIO as BytesIO
+
+import six
+from logilab.common.compat import builtins
+from logilab.common.decorators import cached, cachedproperty
+
+from astroid.exceptions import NotFoundError, \
+     AstroidBuildingException, InferenceError, ResolveError
+from astroid.node_classes import Const, DelName, DelAttr, \
+     Dict, From, List, Pass, Raise, Return, Tuple, Yield, YieldFrom, \
+     LookupMixIn, const_factory as cf, unpack_infer, CallFunc
+from astroid.bases import NodeNG, InferenceContext, Instance, copy_context, \
+     YES, Generator, UnboundMethod, BoundMethod, _infer_stmts, \
+     BUILTINS
+from astroid.mixins import FilterStmtsMixin
+from astroid.bases import Statement
+from astroid.manager import AstroidManager
+
+ITER_METHODS = ('__iter__', '__getitem__')
+PY3K = sys.version_info >= (3, 0)
+
+def _c3_merge(sequences):
+    """Merges MROs in *sequences* to a single MRO using the C3 algorithm.
+
+    Adapted from http://www.python.org/download/releases/2.3/mro/.
+
+    """
+    result = []
+    while True:
+        sequences = [s for s in sequences if s]   # purge empty sequences
+        if not sequences:
+            return result
+        for s1 in sequences:   # find merge candidates among seq heads
+            candidate = s1[0]
+            for s2 in sequences:
+                if candidate in s2[1:]:
+                    candidate = None
+                    break      # reject the current head, it appears later
+            else:
+                break
+        if not candidate:
+            # Show all the remaining bases, which were considered as
+            # candidates for the next mro sequence.
+            bases = ["({})".format(", ".join(base.name
+                                             for base in subsequence))
+                     for subsequence in sequences]
+            raise ResolveError("Cannot create a consistent method resolution "
+                               "order for bases %s" % ", ".join(bases))
+        result.append(candidate)
+        # remove the chosen candidate
+        for seq in sequences:
+            if seq[0] == candidate:
+                del seq[0]
+
+
+def _verify_duplicates_mro(sequences):
+    for sequence in sequences:
+        names = [node.qname() for node in sequence]
+        if len(names) != len(set(names)):
+            raise ResolveError('Duplicates found in the mro.')
+
+
+def remove_nodes(func, cls):
+    def wrapper(*args, **kwargs):
+        nodes = [n for n in func(*args, **kwargs) if not isinstance(n, cls)]
+        if not nodes:
+            raise NotFoundError()
+        return nodes
+    return wrapper
+
+
+def function_to_method(n, klass):
+    if isinstance(n, Function):
+        if n.type == 'classmethod':
+            return BoundMethod(n, klass)
+        if n.type != 'staticmethod':
+            return UnboundMethod(n)
+    return n
+
+def std_special_attributes(self, name, add_locals=True):
+    if add_locals:
+        locals = self.locals
+    else:
+        locals = {}
+    if name == '__name__':
+        return [cf(self.name)] + locals.get(name, [])
+    if name == '__doc__':
+        return [cf(self.doc)] + locals.get(name, [])
+    if name == '__dict__':
+        return [Dict()] + locals.get(name, [])
+    raise NotFoundError(name)
+
+MANAGER = AstroidManager()
+def builtin_lookup(name):
+    """lookup a name into the builtin module
+    return the list of matching statements and the astroid for the builtin
+    module
+    """
+    builtin_astroid = MANAGER.ast_from_module(builtins)
+    if name == '__dict__':
+        return builtin_astroid, ()
+    try:
+        stmts = builtin_astroid.locals[name]
+    except KeyError:
+        stmts = ()
+    return builtin_astroid, stmts
+
+
+# TODO move this Mixin to mixins.py; problem: 'Function' in _scope_lookup
+class LocalsDictNodeNG(LookupMixIn, NodeNG):
+    """ this class provides locals handling common to Module, Function
+    and Class nodes, including a dict like interface for direct access
+    to locals information
+    """
+
+    # attributes below are set by the builder module or by raw factories
+
+    # dictionary of locals with name as key and node defining the local as
+    # value
+
+    def qname(self):
+        """return the 'qualified' name of the node, eg module.name,
+        module.class.name ...
+        """
+        if self.parent is None:
+            return self.name
+        return '%s.%s' % (self.parent.frame().qname(), self.name)
+
+    def frame(self):
+        """return the first parent frame node (i.e. Module, Function or Class)
+        """
+        return self
+
+    def scope(self):
+        """return the first node defining a new scope (i.e. Module,
+        Function, Class, Lambda but also GenExpr, DictComp and SetComp)
+        """
+        return self
+
+
+    def _scope_lookup(self, node, name, offset=0):
+        """XXX method for interfacing the scope lookup"""
+        try:
+            stmts = node._filter_stmts(self.locals[name], self, offset)
+        except KeyError:
+            stmts = ()
+        if stmts:
+            return self, stmts
+        if self.parent: # i.e. not Module
+            # nested scope: if parent scope is a function, that's fine
+            # else jump to the module
+            pscope = self.parent.scope()
+            if not pscope.is_function:
+                pscope = pscope.root()
+            return pscope.scope_lookup(node, name)
+        return builtin_lookup(name) # Module
+
+
+
+    def set_local(self, name, stmt):
+        """define <name> in locals (<stmt> is the node defining the name)
+        if the node is a Module node (i.e. has globals), add the name to
+        globals
+
+        if the name is already defined, ignore it
+        """
+        #assert not stmt in self.locals.get(name, ()), (self, stmt)
+        self.locals.setdefault(name, []).append(stmt)
+
+    __setitem__ = set_local
+
+    def _append_node(self, child):
+        """append a child, linking it in the tree"""
+        self.body.append(child)
+        child.parent = self
+
+    def add_local_node(self, child_node, name=None):
+        """append a child which should alter locals to the given node"""
+        if name != '__class__':
+            # add __class__ node as a child will cause infinite recursion later!
+            self._append_node(child_node)
+        self.set_local(name or child_node.name, child_node)
+
+
+    def __getitem__(self, item):
+        """method from the `dict` interface returning the first node
+        associated with the given name in the locals dictionary
+
+        :type item: str
+        :param item: the name of the locally defined object
+        :raises KeyError: if the name is not defined
+        """
+        return self.locals[item][0]
+
+    def __iter__(self):
+        """method from the `dict` interface returning an iterator on
+        `self.keys()`
+        """
+        return iter(self.keys())
+
+    def keys(self):
+        """method from the `dict` interface returning a tuple containing
+        locally defined names
+        """
+        return list(self.locals.keys())
+
+    def values(self):
+        """method from the `dict` interface returning a tuple containing
+        locally defined nodes which are instance of `Function` or `Class`
+        """
+        return [self[key] for key in self.keys()]
+
+    def items(self):
+        """method from the `dict` interface returning a list of tuple
+        containing each locally defined name with its associated node,
+        which is an instance of `Function` or `Class`
+        """
+        return list(zip(self.keys(), self.values()))
+
+
+    def __contains__(self, name):
+        return name in self.locals
+    has_key = __contains__
+
+# Module  #####################################################################
+
+class Module(LocalsDictNodeNG):
+    _astroid_fields = ('body',)
+
+    fromlineno = 0
+    lineno = 0
+
+    # attributes below are set by the builder module or by raw factories
+
+    # the file from which as been extracted the astroid representation. It may
+    # be None if the representation has been built from a built-in module
+    file = None
+    # Alternatively, if built from a string/bytes, this can be set
+    file_bytes = None
+    # encoding of python source file, so we can get unicode out of it (python2
+    # only)
+    file_encoding = None
+    # the module name
+    name = None
+    # boolean for astroid built from source (i.e. ast)
+    pure_python = None
+    # boolean for package module
+    package = None
+    # dictionary of globals with name as key and node defining the global
+    # as value
+    globals = None
+
+    # Future imports
+    future_imports = None
+
+    # names of python special attributes (handled by getattr impl.)
+    special_attributes = set(('__name__', '__doc__', '__file__', '__path__',
+                              '__dict__'))
+    # names of module attributes available through the global scope
+    scope_attrs = set(('__name__', '__doc__', '__file__', '__path__'))
+
+    def __init__(self, name, doc, pure_python=True):
+        self.name = name
+        self.doc = doc
+        self.pure_python = pure_python
+        self.locals = self.globals = {}
+        self.body = []
+        self.future_imports = set()
+
+    def _get_stream(self):
+        if self.file_bytes is not None:
+            return BytesIO(self.file_bytes)
+        if self.file is not None:
+            stream = open(self.file, 'rb')
+            return stream
+        return None
+
+    @property
+    def file_stream(self):
+        warnings.warn("file_stream property is deprecated and "
+                      "it is slated for removal in astroid 1.6."
+                      "Use the new method 'stream' instead.",
+                      PendingDeprecationWarning,
+                      stacklevel=2)
+        return self._get_stream()
+
+    def stream(self):
+        """Get a stream to the underlying file or bytes."""
+        return self._get_stream()
+
+    def close(self):
+        """Close the underlying file streams."""
+        warnings.warn("close method is deprecated and it is "
+                      "slated for removal in astroid 1.6, along "
+                      "with 'file_stream' property. "
+                      "Its behaviour is replaced by managing each "
+                      "file stream returned by the 'stream' method.",
+                      PendingDeprecationWarning,
+                      stacklevel=2)
+
+    def block_range(self, lineno):
+        """return block line numbers.
+
+        start from the beginning whatever the given lineno
+        """
+        return self.fromlineno, self.tolineno
+
+    def scope_lookup(self, node, name, offset=0):
+        if name in self.scope_attrs and not name in self.locals:
+            try:
+                return self, self.getattr(name)
+            except NotFoundError:
+                return self, ()
+        return self._scope_lookup(node, name, offset)
+
+    def pytype(self):
+        return '%s.module' % BUILTINS
+
+    def display_type(self):
+        return 'Module'
+
+    def getattr(self, name, context=None, ignore_locals=False):
+        if name in self.special_attributes:
+            if name == '__file__':
+                return [cf(self.file)] + self.locals.get(name, [])
+            if name == '__path__' and self.package:
+                return [List()] + self.locals.get(name, [])
+            return std_special_attributes(self, name)
+        if not ignore_locals and name in self.locals:
+            return self.locals[name]
+        if self.package:
+            try:
+                return [self.import_module(name, relative_only=True)]
+            except AstroidBuildingException:
+                raise NotFoundError(name)
+            except SyntaxError:
+                raise NotFoundError(name)
+            except Exception:# XXX pylint tests never pass here; do we need it?
+                import traceback
+                traceback.print_exc()
+        raise NotFoundError(name)
+    getattr = remove_nodes(getattr, DelName)
+
+    def igetattr(self, name, context=None):
+        """inferred getattr"""
+        # set lookup name since this is necessary to infer on import nodes for
+        # instance
+        context = copy_context(context)
+        context.lookupname = name
+        try:
+            return _infer_stmts(self.getattr(name, context), context, frame=self)
+        except NotFoundError:
+            raise InferenceError(name)
+
+    def fully_defined(self):
+        """return True if this module has been built from a .py file
+        and so contains a complete representation including the code
+        """
+        return self.file is not None and self.file.endswith('.py')
+
+    def statement(self):
+        """return the first parent node marked as statement node
+        consider a module as a statement...
+        """
+        return self
+
+    def previous_sibling(self):
+        """module has no sibling"""
+        return
+
+    def next_sibling(self):
+        """module has no sibling"""
+        return
+
+    if sys.version_info < (2, 8):
+        @cachedproperty
+        def _absolute_import_activated(self):
+            for stmt in self.locals.get('absolute_import', ()):
+                if isinstance(stmt, From) and stmt.modname == '__future__':
+                    return True
+            return False
+    else:
+        _absolute_import_activated = True
+
+    def absolute_import_activated(self):
+        return self._absolute_import_activated
+
+    def import_module(self, modname, relative_only=False, level=None):
+        """import the given module considering self as context"""
+        if relative_only and level is None:
+            level = 0
+        absmodname = self.relative_to_absolute_name(modname, level)
+        try:
+            return MANAGER.ast_from_module_name(absmodname)
+        except AstroidBuildingException:
+            # we only want to import a sub module or package of this module,
+            # skip here
+            if relative_only:
+                raise
+        return MANAGER.ast_from_module_name(modname)
+
+    def relative_to_absolute_name(self, modname, level):
+        """return the absolute module name for a relative import.
+
+        The relative import can be implicit or explicit.
+        """
+        # XXX this returns non sens when called on an absolute import
+        # like 'pylint.checkers.astroid.utils'
+        # XXX doesn't return absolute name if self.name isn't absolute name
+        if self.absolute_import_activated() and level is None:
+            return modname
+        if level:
+            if self.package:
+                level = level - 1
+            package_name = self.name.rsplit('.', level)[0]
+        elif self.package:
+            package_name = self.name
+        else:
+            package_name = self.name.rsplit('.', 1)[0]
+        if package_name:
+            if not modname:
+                return package_name
+            return '%s.%s' % (package_name, modname)
+        return modname
+
+
+    def wildcard_import_names(self):
+        """return the list of imported names when this module is 'wildcard
+        imported'
+
+        It doesn't include the '__builtins__' name which is added by the
+        current CPython implementation of wildcard imports.
+        """
+        # take advantage of a living module if it exists
+        try:
+            living = sys.modules[self.name]
+        except KeyError:
+            pass
+        else:
+            try:
+                return living.__all__
+            except AttributeError:
+                return [name for name in living.__dict__.keys()
+                        if not name.startswith('_')]
+        # else lookup the astroid
+        #
+        # We separate the different steps of lookup in try/excepts
+        # to avoid catching too many Exceptions
+        default = [name for name in self.keys() if not name.startswith('_')]
+        try:
+            all = self['__all__']
+        except KeyError:
+            return default
+        try:
+            explicit = next(all.assigned_stmts())
+        except InferenceError:
+            return default
+        except AttributeError:
+            # not an assignment node
+            # XXX infer?
+            return default
+
+        # Try our best to detect the exported name.
+        infered = []
+        try:
+            explicit = next(explicit.infer())
+        except InferenceError:
+            return default
+        if not isinstance(explicit, (Tuple, List)):
+            return default
+
+        str_const = lambda node: (isinstance(node, Const) and
+                                  isinstance(node.value, six.string_types))
+        for node in explicit.elts:
+            if str_const(node):
+                infered.append(node.value)
+            else:
+                try:
+                    infered_node = next(node.infer())
+                except InferenceError:
+                    continue
+                if str_const(infered_node):
+                    infered.append(infered_node.value)
+        return infered
+
+
+
+class ComprehensionScope(LocalsDictNodeNG):
+    def frame(self):
+        return self.parent.frame()
+
+    scope_lookup = LocalsDictNodeNG._scope_lookup
+
+
+class GenExpr(ComprehensionScope):
+    _astroid_fields = ('elt', 'generators')
+
+    def __init__(self):
+        self.locals = {}
+        self.elt = None
+        self.generators = []
+
+
+class DictComp(ComprehensionScope):
+    _astroid_fields = ('key', 'value', 'generators')
+
+    def __init__(self):
+        self.locals = {}
+        self.key = None
+        self.value = None
+        self.generators = []
+
+
+class SetComp(ComprehensionScope):
+    _astroid_fields = ('elt', 'generators')
+
+    def __init__(self):
+        self.locals = {}
+        self.elt = None
+        self.generators = []
+
+
+class _ListComp(NodeNG):
+    """class representing a ListComp node"""
+    _astroid_fields = ('elt', 'generators')
+    elt = None
+    generators = None
+
+if sys.version_info >= (3, 0):
+    class ListComp(_ListComp, ComprehensionScope):
+        """class representing a ListComp node"""
+        def __init__(self):
+            self.locals = {}
+else:
+    class ListComp(_ListComp):
+        """class representing a ListComp node"""
+
+# Function  ###################################################################
+
+def _infer_decorator_callchain(node):
+    """Detect decorator call chaining and see if the end result is a
+    static or a classmethod.
+    """
+    if not isinstance(node, Function):
+        return
+    if not node.parent:
+        return
+    try:
+       # TODO: We don't handle multiple inference results right now,
+       #       because there's no flow to reason when the return
+       #       is what we are looking for, a static or a class method.
+       result = next(node.infer_call_result(node.parent))
+    except (StopIteration, InferenceError):
+       return
+    if isinstance(result, Instance):
+       result = result._proxied
+    if isinstance(result, Class):
+       if result.is_subtype_of('%s.classmethod' % BUILTINS):
+           return 'classmethod'
+       if result.is_subtype_of('%s.staticmethod' % BUILTINS):
+           return 'staticmethod'
+
+
+def _function_type(self):
+    """
+    Function type, possible values are:
+    method, function, staticmethod, classmethod.
+    """
+    # Can't infer that this node is decorated
+    # with a subclass of `classmethod` where `type` is first set,
+    # so do it here.
+    if self.decorators:
+        for node in self.decorators.nodes:
+            if isinstance(node, CallFunc):
+                # Handle the following case:
+                # @some_decorator(arg1, arg2)
+                # def func(...)
+                #
+                try:
+                    current = next(node.func.infer())
+                except InferenceError:
+                    continue
+                _type = _infer_decorator_callchain(current)
+                if _type is not None:
+                    return _type
+
+            try:
+                for infered in node.infer():
+                    # Check to see if this returns a static or a class method.
+                    _type = _infer_decorator_callchain(infered)
+                    if _type is not None:
+                        return _type
+
+                    if not isinstance(infered, Class):
+                        continue
+                    for ancestor in infered.ancestors():
+                        if not isinstance(ancestor, Class):
+                            continue
+                        if ancestor.is_subtype_of('%s.classmethod' % BUILTINS):
+                            return 'classmethod'
+                        elif ancestor.is_subtype_of('%s.staticmethod' % BUILTINS):
+                            return 'staticmethod'
+            except InferenceError:
+                pass
+    return self._type
+
+
+class Lambda(LocalsDictNodeNG, FilterStmtsMixin):
+    _astroid_fields = ('args', 'body',)
+    name = '<lambda>'
+
+    # function's type, 'function' | 'method' | 'staticmethod' | 'classmethod'
+    type = 'function'
+
+    def __init__(self):
+        self.locals = {}
+        self.args = []
+        self.body = []
+
+    def pytype(self):
+        if 'method' in self.type:
+            return '%s.instancemethod' % BUILTINS
+        return '%s.function' % BUILTINS
+
+    def display_type(self):
+        if 'method' in self.type:
+            return 'Method'
+        return 'Function'
+
+    def callable(self):
+        return True
+
+    def argnames(self):
+        """return a list of argument names"""
+        if self.args.args: # maybe None with builtin functions
+            names = _rec_get_names(self.args.args)
+        else:
+            names = []
+        if self.args.vararg:
+            names.append(self.args.vararg)
+        if self.args.kwarg:
+            names.append(self.args.kwarg)
+        return names
+
+    def infer_call_result(self, caller, context=None):
+        """infer what a function is returning when called"""
+        return self.body.infer(context)
+
+    def scope_lookup(self, node, name, offset=0):
+        if node in self.args.defaults or node in self.args.kw_defaults:
+            frame = self.parent.frame()
+            # line offset to avoid that def func(f=func) resolve the default
+            # value to the defined function
+            offset = -1
+        else:
+            # check this is not used in function decorators
+            frame = self
+        return frame._scope_lookup(node, name, offset)
+
+
+class Function(Statement, Lambda):
+    if PY3K:
+        _astroid_fields = ('decorators', 'args', 'body', 'returns')
+        returns = None
+    else:
+        _astroid_fields = ('decorators', 'args', 'body')
+
+    special_attributes = set(('__name__', '__doc__', '__dict__'))
+    is_function = True
+    # attributes below are set by the builder module or by raw factories
+    blockstart_tolineno = None
+    decorators = None
+    _type = "function"
+    type = cachedproperty(_function_type)
+
+    def __init__(self, name, doc):
+        self.locals = {}
+        self.args = []
+        self.body = []
+        self.name = name
+        self.doc = doc
+        self.extra_decorators = []
+        self.instance_attrs = {}
+
+    @cachedproperty
+    def fromlineno(self):
+        # lineno is the line number of the first decorator, we want the def
+        # statement lineno
+        lineno = self.lineno
+        if self.decorators is not None:
+            lineno += sum(node.tolineno - node.lineno + 1
+                                   for node in self.decorators.nodes)
+
+        return lineno
+
+    @cachedproperty
+    def blockstart_tolineno(self):
+        return self.args.tolineno
+
+    def block_range(self, lineno):
+        """return block line numbers.
+
+        start from the "def" position whatever the given lineno
+        """
+        return self.fromlineno, self.tolineno
+
+    def getattr(self, name, context=None):
+        """this method doesn't look in the instance_attrs dictionary since it's
+        done by an Instance proxy at inference time.
+        """
+        if name == '__module__':
+            return [cf(self.root().qname())]
+        if name in self.instance_attrs:
+            return self.instance_attrs[name]
+        return std_special_attributes(self, name, False)
+
+    def is_method(self):
+        """return true if the function node should be considered as a method"""
+        # check we are defined in a Class, because this is usually expected
+        # (e.g. pylint...) when is_method() return True
+        return self.type != 'function' and isinstance(self.parent.frame(), Class)
+
+    def decoratornames(self):
+        """return a list of decorator qualified names"""
+        result = set()
+        decoratornodes = []
+        if self.decorators is not None:
+            decoratornodes += self.decorators.nodes
+        decoratornodes += self.extra_decorators
+        for decnode in decoratornodes:
+            for infnode in decnode.infer():
+                result.add(infnode.qname())
+        return result
+    decoratornames = cached(decoratornames)
+
+    def is_bound(self):
+        """return true if the function is bound to an Instance or a class"""
+        return self.type == 'classmethod'
+
+    def is_abstract(self, pass_is_abstract=True):
+        """Returns True if the method is abstract.
+
+        A method is considered abstract if
+         - the only statement is 'raise NotImplementedError', or
+         - the only statement is 'pass' and pass_is_abstract is True, or
+         - the method is annotated with abc.astractproperty/abc.abstractmethod
+        """
+        if self.decorators:
+            for node in self.decorators.nodes:
+                try:
+                    infered = next(node.infer())
+                except InferenceError:
+                    continue
+                if infered and infered.qname() in ('abc.abstractproperty',
+                                                   'abc.abstractmethod'):
+                    return True
+
+        for child_node in self.body:
+            if isinstance(child_node, Raise):
+                if child_node.raises_not_implemented():
+                    return True
+            if pass_is_abstract and isinstance(child_node, Pass):
+                return True
+            return False
+        # empty function is the same as function with a single "pass" statement
+        if pass_is_abstract:
+            return True
+
+    def is_generator(self):
+        """return true if this is a generator function"""
+        # XXX should be flagged, not computed
+        return next(self.nodes_of_class((Yield, YieldFrom),
+                                        skip_klass=(Function, Lambda)), False)
+
+    def infer_call_result(self, caller, context=None):
+        """infer what a function is returning when called"""
+        if self.is_generator():
+            yield Generator()
+            return
+        # This is really a gigantic hack to work around metaclass generators
+        # that return transient class-generating functions. Pylint's AST structure
+        # cannot handle a base class object that is only used for calling __new__,
+        # but does not contribute to the inheritance structure itself. We inject
+        # a fake class into the hierarchy here for several well-known metaclass
+        # generators, and filter it out later.
+        if (self.name == 'with_metaclass' and
+                len(self.args.args) == 1 and
+                self.args.vararg is not None):
+            metaclass = next(caller.args[0].infer(context))
+            if isinstance(metaclass, Class):
+                c = Class('temporary_class', None)
+                c.hide = True
+                c.parent = self
+                bases = [next(b.infer(context)) for b in caller.args[1:]]
+                c.bases = [base for base in bases if base != YES]
+                c._metaclass = metaclass
+                yield c
+                return
+        returns = self.nodes_of_class(Return, skip_klass=Function)
+        for returnnode in returns:
+            if returnnode.value is None:
+                yield Const(None)
+            else:
+                try:
+                    for infered in returnnode.value.infer(context):
+                        yield infered
+                except InferenceError:
+                    yield YES
+
+
+def _rec_get_names(args, names=None):
+    """return a list of all argument names"""
+    if names is None:
+        names = []
+    for arg in args:
+        if isinstance(arg, Tuple):
+            _rec_get_names(arg.elts, names)
+        else:
+            names.append(arg.name)
+    return names
+
+
+# Class ######################################################################
+
+
+def _is_metaclass(klass, seen=None):
+    """ Return if the given class can be
+    used as a metaclass.
+    """
+    if klass.name == 'type':
+        return True
+    if seen is None:
+        seen = set()
+    for base in klass.bases:
+        try:
+            for baseobj in base.infer():
+                if baseobj in seen:
+                    continue
+                else:
+                    seen.add(baseobj)
+                if isinstance(baseobj, Instance):
+                    # not abstract
+                    return False
+                if baseobj is YES:
+                    continue
+                if baseobj is klass:
+                    continue
+                if not isinstance(baseobj, Class):
+                    continue
+                if baseobj._type == 'metaclass':
+                    return True
+                if _is_metaclass(baseobj, seen):
+                    return True
+        except InferenceError:
+            continue
+    return False
+
+
+def _class_type(klass, ancestors=None):
+    """return a Class node type to differ metaclass, interface and exception
+    from 'regular' classes
+    """
+    # XXX we have to store ancestors in case we have a ancestor loop
+    if klass._type is not None:
+        return klass._type
+    if _is_metaclass(klass):
+        klass._type = 'metaclass'
+    elif klass.name.endswith('Interface'):
+        klass._type = 'interface'
+    elif klass.name.endswith('Exception'):
+        klass._type = 'exception'
+    else:
+        if ancestors is None:
+            ancestors = set()
+        if klass in ancestors:
+            # XXX we are in loop ancestors, and have found no type
+            klass._type = 'class'
+            return 'class'
+        ancestors.add(klass)
+        for base in klass.ancestors(recurs=False):
+            name = _class_type(base, ancestors)
+            if name != 'class':
+                if name == 'metaclass' and not _is_metaclass(klass):
+                    # don't propagate it if the current class
+                    # can't be a metaclass
+                    continue
+                klass._type = base.type
+                break
+    if klass._type is None:
+        klass._type = 'class'
+    return klass._type
+
+def _iface_hdlr(iface_node):
+    """a handler function used by interfaces to handle suspicious
+    interface nodes
+    """
+    return True
+
+
+class Class(Statement, LocalsDictNodeNG, FilterStmtsMixin):
+
+    # some of the attributes below are set by the builder module or
+    # by a raw factories
+
+    # a dictionary of class instances attributes
+    _astroid_fields = ('decorators', 'bases', 'body') # name
+
+    decorators = None
+    special_attributes = set(('__name__', '__doc__', '__dict__', '__module__',
+                              '__bases__', '__mro__', '__subclasses__'))
+    blockstart_tolineno = None
+
+    _type = None
+    _metaclass_hack = False
+    hide = False
+    type = property(_class_type,
+                    doc="class'type, possible values are 'class' | "
+                    "'metaclass' | 'interface' | 'exception'")
+
+    def __init__(self, name, doc):
+        self.instance_attrs = {}
+        self.locals = {}
+        self.bases = []
+        self.body = []
+        self.name = name
+        self.doc = doc
+
+    def _newstyle_impl(self, context=None):
+        if context is None:
+            context = InferenceContext()
+        if self._newstyle is not None:
+            return self._newstyle
+        for base in self.ancestors(recurs=False, context=context):
+            if base._newstyle_impl(context):
+                self._newstyle = True
+                break
+        klass = self._explicit_metaclass()
+        # could be any callable, we'd need to infer the result of klass(name,
+        # bases, dict).  punt if it's not a class node.
+        if klass is not None and isinstance(klass, Class):
+            self._newstyle = klass._newstyle_impl(context)
+        if self._newstyle is None:
+            self._newstyle = False
+        return self._newstyle
+
+    _newstyle = None
+    newstyle = property(_newstyle_impl,
+                        doc="boolean indicating if it's a new style class"
+                        "or not")
+
+    @cachedproperty
+    def blockstart_tolineno(self):
+        if self.bases:
+            return self.bases[-1].tolineno
+        else:
+            return self.fromlineno
+
+    def block_range(self, lineno):
+        """return block line numbers.
+
+        start from the "class" position whatever the given lineno
+        """
+        return self.fromlineno, self.tolineno
+
+    def pytype(self):
+        if self.newstyle:
+            return '%s.type' % BUILTINS
+        return '%s.classobj' % BUILTINS
+
+    def display_type(self):
+        return 'Class'
+
+    def callable(self):
+        return True
+
+    def is_subtype_of(self, type_name, context=None):
+        if self.qname() == type_name:
+            return True
+        for anc in self.ancestors(context=context):
+            if anc.qname() == type_name:
+                return True
+
+    def infer_call_result(self, caller, context=None):
+        """infer what a class is returning when called"""
+        if self.is_subtype_of('%s.type' % (BUILTINS,), context) and len(caller.args) == 3:
+            name_node = next(caller.args[0].infer(context))
+            if (isinstance(name_node, Const) and
+                    isinstance(name_node.value, six.string_types)):
+                name = name_node.value
+            else:
+                yield YES
+                return
+            result = Class(name, None)
+            bases = next(caller.args[1].infer(context))
+            if isinstance(bases, (Tuple, List)):
+                result.bases = bases.itered()
+            else:
+                # There is currently no AST node that can represent an 'unknown'
+                # node (YES is not an AST node), therefore we simply return YES here
+                # although we know at least the name of the class.
+                yield YES
+                return
+            result.parent = caller.parent
+            yield result
+        else:
+            yield Instance(self)
+
+    def scope_lookup(self, node, name, offset=0):
+        if any(node == base or base.parent_of(node)
+               for base in self.bases):
+            # Handle the case where we have either a name
+            # in the bases of a class, which exists before
+            # the actual definition or the case where we have
+            # a Getattr node, with that name.
+            #
+            # name = ...
+            # class A(name):
+            #     def name(self): ...
+            #
+            # import name
+            # class A(name.Name):
+            #     def name(self): ...
+
+            frame = self.parent.frame()
+            # line offset to avoid that class A(A) resolve the ancestor to
+            # the defined class
+            offset = -1
+        else:
+            frame = self
+        return frame._scope_lookup(node, name, offset)
+
+    # list of parent class as a list of string (i.e. names as they appear
+    # in the class definition) XXX bw compat
+    def basenames(self):
+        return [bnode.as_string() for bnode in self.bases]
+    basenames = property(basenames)
+
+    def ancestors(self, recurs=True, context=None):
+        """return an iterator on the node base classes in a prefixed
+        depth first order
+
+        :param recurs:
+          boolean indicating if it should recurse or return direct
+          ancestors only
+        """
+        # FIXME: should be possible to choose the resolution order
+        # FIXME: inference make infinite loops possible here
+        yielded = set([self])
+        if context is None:
+            context = InferenceContext()
+        if sys.version_info[0] >= 3:
+            if not self.bases and self.qname() != 'builtins.object':
+                yield builtin_lookup("object")[1][0]
+                return
+
+        for stmt in self.bases:
+            with context.restore_path():
+                try:
+                    for baseobj in stmt.infer(context):
+                        if not isinstance(baseobj, Class):
+                            if isinstance(baseobj, Instance):
+                                baseobj = baseobj._proxied
+                            else:
+                                # duh ?
+                                continue
+                        if not baseobj.hide:
+                            if baseobj in yielded:
+                                continue # cf xxx above
+                            yielded.add(baseobj)
+                            yield baseobj
+                        if recurs:
+                            for grandpa in baseobj.ancestors(recurs=True,
+                                                             context=context):
+                                if grandpa is self:
+                                    # This class is the ancestor of itself.
+                                    break
+                                if grandpa in yielded:
+                                    continue # cf xxx above
+                                yielded.add(grandpa)
+                                yield grandpa
+                except InferenceError:
+                    # XXX log error ?
+                    continue
+
+    def local_attr_ancestors(self, name, context=None):
+        """return an iterator on astroid representation of parent classes
+        which have <name> defined in their locals
+        """
+        for astroid in self.ancestors(context=context):
+            if name in astroid:
+                yield astroid
+
+    def instance_attr_ancestors(self, name, context=None):
+        """return an iterator on astroid representation of parent classes
+        which have <name> defined in their instance attribute dictionary
+        """
+        for astroid in self.ancestors(context=context):
+            if name in astroid.instance_attrs:
+                yield astroid
+
+    def has_base(self, node):
+        return node in self.bases
+
+    def local_attr(self, name, context=None):
+        """return the list of assign node associated to name in this class
+        locals or in its parents
+
+        :raises `NotFoundError`:
+          if no attribute with this name has been find in this class or
+          its parent classes
+        """
+        try:
+            return self.locals[name]
+        except KeyError:
+            # get if from the first parent implementing it if any
+            for class_node in self.local_attr_ancestors(name, context):
+                return class_node.locals[name]
+        raise NotFoundError(name)
+    local_attr = remove_nodes(local_attr, DelAttr)
+
+    def instance_attr(self, name, context=None):
+        """return the astroid nodes associated to name in this class instance
+        attributes dictionary and in its parents
+
+        :raises `NotFoundError`:
+          if no attribute with this name has been find in this class or
+          its parent classes
+        """
+        # Return a copy, so we don't modify self.instance_attrs,
+        # which could lead to infinite loop.
+        values = list(self.instance_attrs.get(name, []))
+        # get all values from parents
+        for class_node in self.instance_attr_ancestors(name, context):
+            values += class_node.instance_attrs[name]
+        if not values:
+            raise NotFoundError(name)
+        return values
+    instance_attr = remove_nodes(instance_attr, DelAttr)
+
+    def instanciate_class(self):
+        """return Instance of Class node, else return self"""
+        return Instance(self)
+
+    def getattr(self, name, context=None):
+        """this method doesn't look in the instance_attrs dictionary since it's
+        done by an Instance proxy at inference time.
+
+        It may return a YES object if the attribute has not been actually
+        found but a __getattr__ or __getattribute__ method is defined
+        """
+        values = self.locals.get(name, [])
+        if name in self.special_attributes:
+            if name == '__module__':
+                return [cf(self.root().qname())] + values
+            # FIXME: do we really need the actual list of ancestors?
+            # returning [Tuple()] + values don't break any test
+            # this is ticket http://www.logilab.org/ticket/52785
+            # XXX need proper meta class handling + MRO implementation
+            if name == '__bases__' or (name == '__mro__' and self.newstyle):
+                node = Tuple()
+                node.items = self.ancestors(recurs=True, context=context)
+                return [node] + values
+            return std_special_attributes(self, name)
+        # don't modify the list in self.locals!
+        values = list(values)
+        for classnode in self.ancestors(recurs=True, context=context):
+            values += classnode.locals.get(name, [])
+        if not values:
+            raise NotFoundError(name)
+        return values
+
+    def igetattr(self, name, context=None):
+        """inferred getattr, need special treatment in class to handle
+        descriptors
+        """
+        # set lookup name since this is necessary to infer on import nodes for
+        # instance
+        context = copy_context(context)
+        context.lookupname = name
+        try:
+            for infered in _infer_stmts(self.getattr(name, context), context,
+                                        frame=self):
+                # yield YES object instead of descriptors when necessary
+                if not isinstance(infered, Const) and isinstance(infered, Instance):
+                    try:
+                        infered._proxied.getattr('__get__', context)
+                    except NotFoundError:
+                        yield infered
+                    else:
+                        yield YES
+                else:
+                    yield function_to_method(infered, self)
+        except NotFoundError:
+            if not name.startswith('__') and self.has_dynamic_getattr(context):
+                # class handle some dynamic attributes, return a YES object
+                yield YES
+            else:
+                raise InferenceError(name)
+
+    def has_dynamic_getattr(self, context=None):
+        """return True if the class has a custom __getattr__ or
+        __getattribute__ method
+        """
+        # need to explicitly handle optparse.Values (setattr is not detected)
+        if self.name == 'Values' and self.root().name == 'optparse':
+            return True
+        try:
+            self.getattr('__getattr__', context)
+            return True
+        except NotFoundError:
+            #if self.newstyle: XXX cause an infinite recursion error
+            try:
+                getattribute = self.getattr('__getattribute__', context)[0]
+                if getattribute.root().name != BUILTINS:
+                    # class has a custom __getattribute__ defined
+                    return True
+            except NotFoundError:
+                pass
+        return False
+
+    def methods(self):
+        """return an iterator on all methods defined in the class and
+        its ancestors
+        """
+        done = {}
+        for astroid in chain(iter((self,)), self.ancestors()):
+            for meth in astroid.mymethods():
+                if meth.name in done:
+                    continue
+                done[meth.name] = None
+                yield meth
+
+    def mymethods(self):
+        """return an iterator on all methods defined in the class"""
+        for member in self.values():
+            if isinstance(member, Function):
+                yield member
+
+    def interfaces(self, herited=True, handler_func=_iface_hdlr):
+        """return an iterator on interfaces implemented by the given
+        class node
+        """
+        # FIXME: what if __implements__ = (MyIFace, MyParent.__implements__)...
+        try:
+            implements = Instance(self).getattr('__implements__')[0]
+        except NotFoundError:
+            return
+        if not herited and not implements.frame() is self:
+            return
+        found = set()
+        missing = False
+        for iface in unpack_infer(implements):
+            if iface is YES:
+                missing = True
+                continue
+            if not iface in found and handler_func(iface):
+                found.add(iface)
+                yield iface
+        if missing:
+            raise InferenceError()
+
+    _metaclass = None
+    def _explicit_metaclass(self):
+        """ Return the explicit defined metaclass
+        for the current class.
+
+        An explicit defined metaclass is defined
+        either by passing the ``metaclass`` keyword argument
+        in the class definition line (Python 3) or (Python 2) by
+        having a ``__metaclass__`` class attribute, or if there are
+        no explicit bases but there is a global ``__metaclass__`` variable.
+        """
+        for base in self.bases:
+            try:
+                for baseobj in base.infer():
+                    if isinstance(baseobj, Class) and baseobj.hide:
+                        self._metaclass = baseobj._metaclass
+                        self._metaclass_hack = True
+                        break
+            except InferenceError:
+                pass
+
+        if self._metaclass:
+            # Expects this from Py3k TreeRebuilder
+            try:
+                return next(node for node in self._metaclass.infer()
+                            if node is not YES)
+            except (InferenceError, StopIteration):
+                return None
+        if sys.version_info >= (3, ):
+            return None
+
+        if '__metaclass__' in self.locals:
+            assignment = self.locals['__metaclass__'][-1]
+        elif self.bases:
+            return None
+        elif '__metaclass__' in self.root().locals:
+            assignments = [ass for ass in self.root().locals['__metaclass__']
+                           if ass.lineno < self.lineno]
+            if not assignments:
+                return None
+            assignment = assignments[-1]
+        else:
+            return None
+
+        try:
+            infered = next(assignment.infer())
+        except InferenceError:
+            return
+        if infered is YES: # don't expose this
+            return None
+        return infered
+
+    def metaclass(self):
+        """ Return the metaclass of this class.
+
+        If this class does not define explicitly a metaclass,
+        then the first defined metaclass in ancestors will be used
+        instead.
+        """
+        klass = self._explicit_metaclass()
+        if klass is None:
+            for parent in self.ancestors():
+                klass = parent.metaclass()
+                if klass is not None:
+                    break
+        return klass
+
+    def has_metaclass_hack(self):
+        return self._metaclass_hack
+
+    def _islots(self):
+        """ Return an iterator with the inferred slots. """
+        if '__slots__' not in self.locals:
+            return
+        for slots in self.igetattr('__slots__'):
+            # check if __slots__ is a valid type
+            for meth in ITER_METHODS:
+                try:
+                    slots.getattr(meth)
+                    break
+                except NotFoundError:
+                    continue
+            else:
+                continue
+
+            if isinstance(slots, Const):
+                # a string. Ignore the following checks,
+                # but yield the node, only if it has a value
+                if slots.value:
+                    yield slots
+                continue
+            if not hasattr(slots, 'itered'):
+                # we can't obtain the values, maybe a .deque?
+                continue
+
+            if isinstance(slots, Dict):
+                values = [item[0] for item in slots.items]
+            else:
+                values = slots.itered()
+            if values is YES:
+                continue
+
+            for elt in values:
+                try:
+                    for infered in elt.infer():
+                        if infered is YES:
+                            continue
+                        if (not isinstance(infered, Const) or
+                                not isinstance(infered.value,
+                                               six.string_types)):
+                            continue
+                        if not infered.value:
+                            continue
+                        yield infered
+                except InferenceError:
+                    continue
+
+    # Cached, because inferring them all the time is expensive
+    @cached
+    def slots(self):
+        """Get all the slots for this node.
+
+        If the class doesn't define any slot, through `__slots__`
+        variable, then this function will return a None.
+        Also, it will return None in the case the slots weren't inferred.
+        Otherwise, it will return a list of slot names.
+        """
+        if not self.newstyle:
+            raise NotImplementedError(
+                "The concept of slots is undefined for old-style classes.")
+
+        slots = self._islots()
+        try:
+            first = next(slots)
+        except StopIteration:
+            # The class doesn't have a __slots__ definition.
+            return None
+        return [first] + list(slots)
+
+    def _inferred_bases(self, recurs=True, context=None):
+        # TODO(cpopa): really similar with .ancestors,
+        # but the difference is when one base is inferred,
+        # only the first object is wanted. That's because
+        # we aren't interested in superclasses, as in the following
+        # example:
+        #
+        # class SomeSuperClass(object): pass
+        # class SomeClass(SomeSuperClass): pass
+        # class Test(SomeClass): pass
+        #
+        # Inferring SomeClass from the Test's bases will give
+        # us both SomeClass and SomeSuperClass, but we are interested
+        # only in SomeClass.
+
+        if context is None:
+            context = InferenceContext()
+        if sys.version_info[0] >= 3:
+            if not self.bases and self.qname() != 'builtins.object':
+                yield builtin_lookup("object")[1][0]
+                return
+
+        for stmt in self.bases:
+            try:
+                baseobj = next(stmt.infer(context=context))
+            except InferenceError:
+                # XXX log error ?
+                continue
+            if isinstance(baseobj, Instance):
+                baseobj = baseobj._proxied
+            if not isinstance(baseobj, Class):
+                continue
+            if not baseobj.hide:
+                yield baseobj
+
+    def mro(self, context=None):
+        """Get the method resolution order, using C3 linearization.
+
+        It returns the list of ancestors sorted by the mro.
+        This will raise `NotImplementedError` for old-style classes, since
+        they don't have the concept of MRO.
+        """
+        if not self.newstyle:
+            raise NotImplementedError(
+                "Could not obtain mro for old-style classes.")
+
+        bases = list(self._inferred_bases(context=context))
+        unmerged_mro = ([[self]] +
+                        [base.mro() for base in bases if base is not self] +
+                        [bases])
+
+        _verify_duplicates_mro(unmerged_mro)
+        return _c3_merge(unmerged_mro)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/test_utils.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/test_utils.py
new file mode 100644
index 0000000..19bd7b9
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/test_utils.py
@@ -0,0 +1,218 @@
+"""Utility functions for test code that uses astroid ASTs as input."""
+import functools
+import sys
+import textwrap
+
+from astroid import nodes
+from astroid import builder
+# The name of the transient function that is used to
+# wrap expressions to be extracted when calling
+# extract_node.
+_TRANSIENT_FUNCTION = '__'
+
+# The comment used to select a statement to be extracted
+# when calling extract_node.
+_STATEMENT_SELECTOR = '#@'
+
+
+def _extract_expressions(node):
+    """Find expressions in a call to _TRANSIENT_FUNCTION and extract them.
+
+    The function walks the AST recursively to search for expressions that
+    are wrapped into a call to _TRANSIENT_FUNCTION. If it finds such an
+    expression, it completely removes the function call node from the tree,
+    replacing it by the wrapped expression inside the parent.
+
+    :param node: An astroid node.
+    :type node:  astroid.bases.NodeNG
+    :yields: The sequence of wrapped expressions on the modified tree
+    expression can be found.
+    """
+    if (isinstance(node, nodes.CallFunc)
+            and isinstance(node.func, nodes.Name)
+            and node.func.name == _TRANSIENT_FUNCTION):
+        real_expr = node.args[0]
+        real_expr.parent = node.parent
+        # Search for node in all _astng_fields (the fields checked when
+        # get_children is called) of its parent. Some of those fields may
+        # be lists or tuples, in which case the elements need to be checked.
+        # When we find it, replace it by real_expr, so that the AST looks
+        # like no call to _TRANSIENT_FUNCTION ever took place.
+        for name in node.parent._astroid_fields:
+            child = getattr(node.parent, name)
+            if isinstance(child, (list, tuple)):
+                for idx, compound_child in enumerate(child):
+                    if compound_child is node:
+                        child[idx] = real_expr
+            elif child is node:
+                setattr(node.parent, name, real_expr)
+        yield real_expr
+    else:
+        for child in node.get_children():
+            for result in _extract_expressions(child):
+                yield result
+
+
+def _find_statement_by_line(node, line):
+    """Extracts the statement on a specific line from an AST.
+
+    If the line number of node matches line, it will be returned;
+    otherwise its children are iterated and the function is called
+    recursively.
+
+    :param node: An astroid node.
+    :type node: astroid.bases.NodeNG
+    :param line: The line number of the statement to extract.
+    :type line: int
+    :returns: The statement on the line, or None if no statement for the line
+      can be found.
+    :rtype:  astroid.bases.NodeNG or None
+    """
+    if isinstance(node, (nodes.Class, nodes.Function)):
+        # This is an inaccuracy in the AST: the nodes that can be
+        # decorated do not carry explicit information on which line
+        # the actual definition (class/def), but .fromline seems to
+        # be close enough.
+        node_line = node.fromlineno
+    else:
+        node_line = node.lineno
+
+    if node_line == line:
+        return node
+
+    for child in node.get_children():
+        result = _find_statement_by_line(child, line)
+        if result:
+            return result
+
+    return None
+
+def extract_node(code, module_name=''):
+    """Parses some Python code as a module and extracts a designated AST node.
+
+    Statements:
+     To extract one or more statement nodes, append #@ to the end of the line
+
+     Examples:
+       >>> def x():
+       >>>   def y():
+       >>>     return 1 #@
+
+       The return statement will be extracted.
+
+       >>> class X(object):
+       >>>   def meth(self): #@
+       >>>     pass
+
+      The funcion object 'meth' will be extracted.
+
+    Expressions:
+     To extract arbitrary expressions, surround them with the fake
+     function call __(...). After parsing, the surrounded expression
+     will be returned and the whole AST (accessible via the returned
+     node's parent attribute) will look like the function call was
+     never there in the first place.
+
+     Examples:
+       >>> a = __(1)
+
+       The const node will be extracted.
+
+       >>> def x(d=__(foo.bar)): pass
+
+       The node containing the default argument will be extracted.
+
+       >>> def foo(a, b):
+       >>>   return 0 < __(len(a)) < b
+
+       The node containing the function call 'len' will be extracted.
+
+    If no statements or expressions are selected, the last toplevel
+    statement will be returned.
+
+    If the selected statement is a discard statement, (i.e. an expression
+    turned into a statement), the wrapped expression is returned instead.
+
+    For convenience, singleton lists are unpacked.
+
+    :param str code: A piece of Python code that is parsed as
+    a module. Will be passed through textwrap.dedent first.
+    :param str module_name: The name of the module.
+    :returns: The designated node from the parse tree, or a list of nodes.
+    :rtype: astroid.bases.NodeNG, or a list of nodes.
+    """
+    def _extract(node):
+        if isinstance(node, nodes.Discard):
+            return node.value
+        else:
+            return node
+
+    requested_lines = []
+    for idx, line in enumerate(code.splitlines()):
+        if line.strip().endswith(_STATEMENT_SELECTOR):
+            requested_lines.append(idx + 1)
+
+    tree = build_module(code, module_name=module_name)
+    extracted = []
+    if requested_lines:
+        for line in requested_lines:
+            extracted.append(_find_statement_by_line(tree, line))
+
+    # Modifies the tree.
+    extracted.extend(_extract_expressions(tree))
+
+    if not extracted:
+        extracted.append(tree.body[-1])
+
+    extracted = [_extract(node) for node in extracted]
+    if len(extracted) == 1:
+        return extracted[0]
+    else:
+        return extracted
+
+
+def build_module(code, module_name='', path=None):
+    """Parses a string module with a builder.
+    :param code: The code for the module.
+    :type code: str
+    :param module_name: The name for the module
+    :type module_name: str
+    :param path: The path for the module
+    :type module_name: str
+    :returns: The module AST.
+    :rtype:  astroid.bases.NodeNG
+    """
+    code = textwrap.dedent(code)
+    return builder.AstroidBuilder(None).string_build(code, modname=module_name, path=path)
+
+
+def require_version(minver=None, maxver=None):
+    """ Compare version of python interpreter to the given one. Skip the test
+    if older.
+    """
+    def parse(string, default=None):
+        string = string or default
+        try:
+            return tuple(int(v) for v in string.split('.'))
+        except ValueError:
+            raise ValueError('%s is not a correct version : should be X.Y[.Z].' % version)
+
+    def check_require_version(f):
+        current = sys.version_info[:3]
+        if parse(minver, "0") < current <= parse(maxver, "4"):
+            return f
+        else:
+            str_version = '.'.join(str(v) for v in sys.version_info)
+            @functools.wraps(f)
+            def new_f(self, *args, **kwargs):
+                if minver is not None:
+                    self.skipTest('Needs Python > %s. Current version is %s.' % (minver, str_version))
+                elif maxver is not None:
+                    self.skipTest('Needs Python <= %s. Current version is %s.' % (maxver, str_version))
+            return new_f
+
+
+    return check_require_version
+
+def get_name_node(start_from, name, index=0):
+    return [n for n in start_from.nodes_of_class(nodes.Name) if n.name == name][index]
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/astroid/utils.py b/vim-plugins/bundle/python-mode/pymode/libs/astroid/utils.py
new file mode 100644
index 0000000..ae72a92
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/astroid/utils.py
@@ -0,0 +1,239 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of astroid.
+#
+# astroid is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# astroid is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with astroid. If not, see <http://www.gnu.org/licenses/>.
+"""this module contains some utilities to navigate in the tree or to
+extract information from it
+"""
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+
+from astroid.exceptions import AstroidBuildingException
+from astroid.builder import parse
+
+
+class ASTWalker(object):
+    """a walker visiting a tree in preorder, calling on the handler:
+
+    * visit_<class name> on entering a node, where class name is the class of
+    the node in lower case
+
+    * leave_<class name> on leaving a node, where class name is the class of
+    the node in lower case
+    """
+
+    def __init__(self, handler):
+        self.handler = handler
+        self._cache = {}
+
+    def walk(self, node, _done=None):
+        """walk on the tree from <node>, getting callbacks from handler"""
+        if _done is None:
+            _done = set()
+        if node in _done:
+            raise AssertionError((id(node), node, node.parent))
+        _done.add(node)
+        self.visit(node)
+        for child_node in node.get_children():
+            self.handler.set_context(node, child_node)
+            assert child_node is not node
+            self.walk(child_node, _done)
+        self.leave(node)
+        assert node.parent is not node
+
+    def get_callbacks(self, node):
+        """get callbacks from handler for the visited node"""
+        klass = node.__class__
+        methods = self._cache.get(klass)
+        if methods is None:
+            handler = self.handler
+            kid = klass.__name__.lower()
+            e_method = getattr(handler, 'visit_%s' % kid,
+                               getattr(handler, 'visit_default', None))
+            l_method = getattr(handler, 'leave_%s' % kid,
+                               getattr(handler, 'leave_default', None))
+            self._cache[klass] = (e_method, l_method)
+        else:
+            e_method, l_method = methods
+        return e_method, l_method
+
+    def visit(self, node):
+        """walk on the tree from <node>, getting callbacks from handler"""
+        method = self.get_callbacks(node)[0]
+        if method is not None:
+            method(node)
+
+    def leave(self, node):
+        """walk on the tree from <node>, getting callbacks from handler"""
+        method = self.get_callbacks(node)[1]
+        if method is not None:
+            method(node)
+
+
+class LocalsVisitor(ASTWalker):
+    """visit a project by traversing the locals dictionary"""
+    def __init__(self):
+        ASTWalker.__init__(self, self)
+        self._visited = {}
+
+    def visit(self, node):
+        """launch the visit starting from the given node"""
+        if node in self._visited:
+            return
+        self._visited[node] = 1 # FIXME: use set ?
+        methods = self.get_callbacks(node)
+        if methods[0] is not None:
+            methods[0](node)
+        if 'locals' in node.__dict__: # skip Instance and other proxy
+            for local_node in node.values():
+                self.visit(local_node)
+        if methods[1] is not None:
+            return methods[1](node)
+
+
+def _check_children(node):
+    """a helper function to check children - parent relations"""
+    for child in node.get_children():
+        ok = False
+        if child is None:
+            print("Hm, child of %s is None" % node)
+            continue
+        if not hasattr(child, 'parent'):
+            print(" ERROR: %s has child %s %x with no parent" % (
+                node, child, id(child)))
+        elif not child.parent:
+            print(" ERROR: %s has child %s %x with parent %r" % (
+                node, child, id(child), child.parent))
+        elif child.parent is not node:
+            print(" ERROR: %s %x has child %s %x with wrong parent %s" % (
+                node, id(node), child, id(child), child.parent))
+        else:
+            ok = True
+        if not ok:
+            print("lines;", node.lineno, child.lineno)
+            print("of module", node.root(), node.root().name)
+            raise AstroidBuildingException
+        _check_children(child)
+
+
+class TreeTester(object):
+    '''A helper class to see _ast tree and compare with astroid tree
+
+    indent: string for tree indent representation
+    lineno: bool to tell if we should print the line numbers
+
+    >>> tester = TreeTester('print')
+    >>> print tester.native_tree_repr()
+
+    <Module>
+    .   body = [
+    .   <Print>
+    .   .   nl = True
+    .   ]
+    >>> print tester.astroid_tree_repr()
+    Module()
+        body = [
+        Print()
+            dest =
+            values = [
+            ]
+        ]
+    '''
+
+    indent = '.   '
+    lineno = False
+
+    def __init__(self, sourcecode):
+        self._string = ''
+        self.sourcecode = sourcecode
+        self._ast_node = None
+        self.build_ast()
+
+    def build_ast(self):
+        """build the _ast tree from the source code"""
+        self._ast_node = parse(self.sourcecode)
+
+    def native_tree_repr(self, node=None, indent=''):
+        """get a nice representation of the _ast tree"""
+        self._string = ''
+        if node is None:
+            node = self._ast_node
+        self._native_repr_tree(node, indent)
+        return self._string
+
+
+    def _native_repr_tree(self, node, indent, _done=None):
+        """recursive method for the native tree representation"""
+        from _ast import Load as _Load, Store as _Store, Del as _Del
+        from _ast import AST as Node
+        if _done is None:
+            _done = set()
+        if node in _done:
+            self._string += '\nloop in tree: %r (%s)' % (
+                node, getattr(node, 'lineno', None))
+            return
+        _done.add(node)
+        self._string += '\n' + indent +  '<%s>' % node.__class__.__name__
+        indent += self.indent
+        if not hasattr(node, '__dict__'):
+            self._string += '\n' + self.indent + " ** node has no __dict__ " + str(node)
+            return
+        node_dict = node.__dict__
+        if hasattr(node, '_attributes'):
+            for a in node._attributes:
+                attr = node_dict[a]
+                if attr is None:
+                    continue
+                if a in ("lineno", "col_offset") and not self.lineno:
+                    continue
+                self._string += '\n' +  indent + a + " = " + repr(attr)
+        for field in node._fields or ():
+            attr = node_dict[field]
+            if attr is None:
+                continue
+            if isinstance(attr, list):
+                if not attr:
+                    continue
+                self._string += '\n' + indent + field + ' = ['
+                for elt in attr:
+                    self._native_repr_tree(elt, indent, _done)
+                self._string += '\n' + indent + ']'
+                continue
+            if isinstance(attr, (_Load, _Store, _Del)):
+                continue
+            if isinstance(attr, Node):
+                self._string += '\n' + indent + field + " = "
+                self._native_repr_tree(attr, indent, _done)
+            else:
+                self._string += '\n' + indent + field + " = " + repr(attr)
+
+
+    def build_astroid_tree(self):
+        """build astroid tree from the _ast tree
+        """
+        from astroid.builder import AstroidBuilder
+        tree = AstroidBuilder().string_build(self.sourcecode)
+        return tree
+
+    def astroid_tree_repr(self, ids=False):
+        """build the astroid tree and return a nice tree representation"""
+        mod = self.build_astroid_tree()
+        return mod.repr_tree(ids)
+
+
+__all__ = ('LocalsVisitor', 'ASTWalker',)
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/easy_install.py b/vim-plugins/bundle/python-mode/pymode/libs/easy_install.py
new file mode 100644
index 0000000..d87e984
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/easy_install.py
@@ -0,0 +1,5 @@
+"""Run the EasyInstall command"""
+
+if __name__ == '__main__':
+    from setuptools.command.easy_install import main
+    main()
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/__init__.py
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/__init__.py
@@ -0,0 +1 @@
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..b30e6ed
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__init__.py
new file mode 100644
index 0000000..fc01e4d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__init__.py
@@ -0,0 +1,184 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Logilab common library (aka Logilab's extension to the standard library).
+
+:type STD_BLACKLIST: tuple
+:var STD_BLACKLIST: directories ignored by default by the functions in
+  this package which have to recurse into directories
+
+:type IGNORED_EXTENSIONS: tuple
+:var IGNORED_EXTENSIONS: file extensions that may usually be ignored
+"""
+__docformat__ = "restructuredtext en"
+
+import sys
+import types
+import pkg_resources
+
+__version__ = pkg_resources.get_distribution('logilab-common').version
+
+# deprecated, but keep compatibility with pylint < 1.4.4
+__pkginfo__ = types.ModuleType('__pkginfo__')
+__pkginfo__.__package__ = __name__
+__pkginfo__.version = __version__
+sys.modules['logilab.common.__pkginfo__'] = __pkginfo__
+
+STD_BLACKLIST = ('CVS', '.svn', '.hg', 'debian', 'dist', 'build')
+
+IGNORED_EXTENSIONS = ('.pyc', '.pyo', '.elc', '~', '.swp', '.orig')
+
+# set this to False if you've mx DateTime installed but you don't want your db
+# adapter to use it (should be set before you got a connection)
+USE_MX_DATETIME = True
+
+
+class attrdict(dict):
+    """A dictionary for which keys are also accessible as attributes."""
+    def __getattr__(self, attr):
+        try:
+            return self[attr]
+        except KeyError:
+            raise AttributeError(attr)
+
+class dictattr(dict):
+    def __init__(self, proxy):
+        self.__proxy = proxy
+
+    def __getitem__(self, attr):
+        try:
+            return getattr(self.__proxy, attr)
+        except AttributeError:
+            raise KeyError(attr)
+
+class nullobject(object):
+    def __repr__(self):
+        return '<nullobject>'
+    def __bool__(self):
+        return False
+    __nonzero__ = __bool__
+
+class tempattr(object):
+    def __init__(self, obj, attr, value):
+        self.obj = obj
+        self.attr = attr
+        self.value = value
+
+    def __enter__(self):
+        self.oldvalue = getattr(self.obj, self.attr)
+        setattr(self.obj, self.attr, self.value)
+        return self.obj
+
+    def __exit__(self, exctype, value, traceback):
+        setattr(self.obj, self.attr, self.oldvalue)
+
+
+
+# flatten -----
+# XXX move in a specific module and use yield instead
+# do not mix flatten and translate
+#
+# def iterable(obj):
+#    try: iter(obj)
+#    except: return False
+#    return True
+#
+# def is_string_like(obj):
+#    try: obj +''
+#    except (TypeError, ValueError): return False
+#    return True
+#
+#def is_scalar(obj):
+#    return is_string_like(obj) or not iterable(obj)
+#
+#def flatten(seq):
+#    for item in seq:
+#        if is_scalar(item):
+#            yield item
+#        else:
+#            for subitem in flatten(item):
+#               yield subitem
+
+def flatten(iterable, tr_func=None, results=None):
+    """Flatten a list of list with any level.
+
+    If tr_func is not None, it should be a one argument function that'll be called
+    on each final element.
+
+    :rtype: list
+
+    >>> flatten([1, [2, 3]])
+    [1, 2, 3]
+    """
+    if results is None:
+        results = []
+    for val in iterable:
+        if isinstance(val, (list, tuple)):
+            flatten(val, tr_func, results)
+        elif tr_func is None:
+            results.append(val)
+        else:
+            results.append(tr_func(val))
+    return results
+
+
+# XXX is function below still used ?
+
+def make_domains(lists):
+    """
+    Given a list of lists, return a list of domain for each list to produce all
+    combinations of possibles values.
+
+    :rtype: list
+
+    Example:
+
+    >>> make_domains(['a', 'b'], ['c','d', 'e'])
+    [['a', 'b', 'a', 'b', 'a', 'b'], ['c', 'c', 'd', 'd', 'e', 'e']]
+    """
+    from six.moves import range
+    domains = []
+    for iterable in lists:
+        new_domain = iterable[:]
+        for i in range(len(domains)):
+            domains[i] = domains[i]*len(iterable)
+        if domains:
+            missing = (len(domains[0]) - len(iterable)) / len(iterable)
+            i = 0
+            for j in range(len(iterable)):
+                value = iterable[j]
+                for dummy in range(missing):
+                    new_domain.insert(i, value)
+                    i += 1
+                i += 1
+        domains.append(new_domain)
+    return domains
+
+
+# private stuff ################################################################
+
+def _handle_blacklist(blacklist, dirnames, filenames):
+    """remove files/directories in the black list
+
+    dirnames/filenames are usually from os.walk
+    """
+    for norecurs in blacklist:
+        if norecurs in dirnames:
+            dirnames.remove(norecurs)
+        elif norecurs in filenames:
+            filenames.remove(norecurs)
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..0f1e667
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/changelog.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/changelog.cpython-35.pyc
new file mode 100644
index 0000000..757981b
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/changelog.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/compat.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/compat.cpython-35.pyc
new file mode 100644
index 0000000..901d5bd
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/compat.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/configuration.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/configuration.cpython-35.pyc
new file mode 100644
index 0000000..3a47262
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/configuration.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/decorators.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/decorators.cpython-35.pyc
new file mode 100644
index 0000000..0250473
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/decorators.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/deprecation.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/deprecation.cpython-35.pyc
new file mode 100644
index 0000000..81e1e16
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/deprecation.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/interface.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/interface.cpython-35.pyc
new file mode 100644
index 0000000..7cfae2e
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/interface.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/optik_ext.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/optik_ext.cpython-35.pyc
new file mode 100644
index 0000000..37ce6c7
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/optik_ext.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/textutils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/textutils.cpython-35.pyc
new file mode 100644
index 0000000..4005915
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/textutils.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/tree.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/tree.cpython-35.pyc
new file mode 100644
index 0000000..ab57ac9
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/tree.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/visitor.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/visitor.cpython-35.pyc
new file mode 100644
index 0000000..699f803
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/__pycache__/visitor.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/cache.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/cache.py
new file mode 100644
index 0000000..11ed137
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/cache.py
@@ -0,0 +1,114 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Cache module, with a least recently used algorithm for the management of the
+deletion of entries.
+
+
+
+
+"""
+__docformat__ = "restructuredtext en"
+
+from threading import Lock
+
+from logilab.common.decorators import locked
+
+_marker = object()
+
+class Cache(dict):
+    """A dictionary like cache.
+
+    inv:
+        len(self._usage) <= self.size
+        len(self.data) <= self.size
+    """
+
+    def __init__(self, size=100):
+        """ Warning : Cache.__init__() != dict.__init__().
+        Constructor does not take any arguments beside size.
+        """
+        assert size >= 0, 'cache size must be >= 0 (0 meaning no caching)'
+        self.size = size
+        self._usage = []
+        self._lock = Lock()
+        super(Cache, self).__init__()
+
+    def _acquire(self):
+        self._lock.acquire()
+
+    def _release(self):
+        self._lock.release()
+
+    def _update_usage(self, key):
+        if not self._usage:
+            self._usage.append(key)
+        elif self._usage[-1] != key:
+            try:
+                self._usage.remove(key)
+            except ValueError:
+                # we are inserting a new key
+                # check the size of the dictionary
+                # and remove the oldest item in the cache
+                if self.size and len(self._usage) >= self.size:
+                    super(Cache, self).__delitem__(self._usage[0])
+                    del self._usage[0]
+            self._usage.append(key)
+        else:
+            pass # key is already the most recently used key
+
+    def __getitem__(self, key):
+        value = super(Cache, self).__getitem__(key)
+        self._update_usage(key)
+        return value
+    __getitem__ = locked(_acquire, _release)(__getitem__)
+
+    def __setitem__(self, key, item):
+        # Just make sure that size > 0 before inserting a new item in the cache
+        if self.size > 0:
+            super(Cache, self).__setitem__(key, item)
+            self._update_usage(key)
+    __setitem__ = locked(_acquire, _release)(__setitem__)
+
+    def __delitem__(self, key):
+        super(Cache, self).__delitem__(key)
+        self._usage.remove(key)
+    __delitem__ = locked(_acquire, _release)(__delitem__)
+
+    def clear(self):
+        super(Cache, self).clear()
+        self._usage = []
+    clear = locked(_acquire, _release)(clear)
+
+    def pop(self, key, default=_marker):
+        if key in self:
+            self._usage.remove(key)
+        #if default is _marker:
+        #    return super(Cache, self).pop(key)
+        return super(Cache, self).pop(key, default)
+    pop = locked(_acquire, _release)(pop)
+
+    def popitem(self):
+        raise NotImplementedError()
+
+    def setdefault(self, key, default=None):
+        raise NotImplementedError()
+
+    def update(self, other):
+        raise NotImplementedError()
+
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/changelog.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/changelog.py
new file mode 100644
index 0000000..2fff2ed
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/changelog.py
@@ -0,0 +1,238 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Manipulation of upstream change log files.
+
+The upstream change log files format handled is simpler than the one
+often used such as those generated by the default Emacs changelog mode.
+
+Sample ChangeLog format::
+
+  Change log for project Yoo
+  ==========================
+
+   --
+      * add a new functionality
+
+  2002-02-01 -- 0.1.1
+      * fix bug #435454
+      * fix bug #434356
+
+  2002-01-01 -- 0.1
+      * initial release
+
+
+There is 3 entries in this change log, one for each released version and one
+for the next version (i.e. the current entry).
+Each entry contains a set of messages corresponding to changes done in this
+release.
+All the non empty lines before the first entry are considered as the change
+log title.
+"""
+
+__docformat__ = "restructuredtext en"
+
+import sys
+from stat import S_IWRITE
+
+from six import string_types
+
+BULLET = '*'
+SUBBULLET = '-'
+INDENT = ' ' * 4
+
+class NoEntry(Exception):
+    """raised when we are unable to find an entry"""
+
+class EntryNotFound(Exception):
+    """raised when we are unable to find a given entry"""
+
+class Version(tuple):
+    """simple class to handle soft version number has a tuple while
+    correctly printing it as X.Y.Z
+    """
+    def __new__(cls, versionstr):
+        if isinstance(versionstr, string_types):
+            versionstr = versionstr.strip(' :') # XXX (syt) duh?
+            parsed = cls.parse(versionstr)
+        else:
+            parsed = versionstr
+        return tuple.__new__(cls, parsed)
+
+    @classmethod
+    def parse(cls, versionstr):
+        versionstr = versionstr.strip(' :')
+        try:
+            return [int(i) for i in versionstr.split('.')]
+        except ValueError as ex:
+            raise ValueError("invalid literal for version '%s' (%s)"%(versionstr, ex))
+
+    def __str__(self):
+        return '.'.join([str(i) for i in self])
+
+# upstream change log #########################################################
+
+class ChangeLogEntry(object):
+    """a change log entry, i.e. a set of messages associated to a version and
+    its release date
+    """
+    version_class = Version
+
+    def __init__(self, date=None, version=None, **kwargs):
+        self.__dict__.update(kwargs)
+        if version:
+            self.version = self.version_class(version)
+        else:
+            self.version = None
+        self.date = date
+        self.messages = []
+
+    def add_message(self, msg):
+        """add a new message"""
+        self.messages.append(([msg], []))
+
+    def complete_latest_message(self, msg_suite):
+        """complete the latest added message
+        """
+        if not self.messages:
+            raise ValueError('unable to complete last message as there is no previous message)')
+        if self.messages[-1][1]: # sub messages
+            self.messages[-1][1][-1].append(msg_suite)
+        else: # message
+            self.messages[-1][0].append(msg_suite)
+
+    def add_sub_message(self, sub_msg, key=None):
+        if not self.messages:
+            raise ValueError('unable to complete last message as there is no previous message)')
+        if key is None:
+            self.messages[-1][1].append([sub_msg])
+        else:
+            raise NotImplementedError("sub message to specific key are not implemented yet")
+
+    def write(self, stream=sys.stdout):
+        """write the entry to file """
+        stream.write('%s  --  %s\n' % (self.date or '', self.version or ''))
+        for msg, sub_msgs in self.messages:
+            stream.write('%s%s %s\n' % (INDENT, BULLET, msg[0]))
+            stream.write(''.join(msg[1:]))
+            if sub_msgs:
+                stream.write('\n')
+            for sub_msg in sub_msgs:
+                stream.write('%s%s %s\n' % (INDENT * 2, SUBBULLET, sub_msg[0]))
+                stream.write(''.join(sub_msg[1:]))
+            stream.write('\n')
+
+        stream.write('\n\n')
+
+class ChangeLog(object):
+    """object representation of a whole ChangeLog file"""
+
+    entry_class = ChangeLogEntry
+
+    def __init__(self, changelog_file, title=''):
+        self.file = changelog_file
+        self.title = title
+        self.additional_content = ''
+        self.entries = []
+        self.load()
+
+    def __repr__(self):
+        return '<ChangeLog %s at %s (%s entries)>' % (self.file, id(self),
+                                                      len(self.entries))
+
+    def add_entry(self, entry):
+        """add a new entry to the change log"""
+        self.entries.append(entry)
+
+    def get_entry(self, version='', create=None):
+        """ return a given changelog entry
+        if version is omitted, return the current entry
+        """
+        if not self.entries:
+            if version or not create:
+                raise NoEntry()
+            self.entries.append(self.entry_class())
+        if not version:
+            if self.entries[0].version and create is not None:
+                self.entries.insert(0, self.entry_class())
+            return self.entries[0]
+        version = self.version_class(version)
+        for entry in self.entries:
+            if entry.version == version:
+                return entry
+        raise EntryNotFound()
+
+    def add(self, msg, create=None):
+        """add a new message to the latest opened entry"""
+        entry = self.get_entry(create=create)
+        entry.add_message(msg)
+
+    def load(self):
+        """ read a logilab's ChangeLog from file """
+        try:
+            stream = open(self.file)
+        except IOError:
+            return
+        last = None
+        expect_sub = False
+        for line in stream.readlines():
+            sline = line.strip()
+            words = sline.split()
+            # if new entry
+            if len(words) == 1 and words[0] == '--':
+                expect_sub = False
+                last = self.entry_class()
+                self.add_entry(last)
+            # if old entry
+            elif len(words) == 3 and words[1] == '--':
+                expect_sub = False
+                last = self.entry_class(words[0], words[2])
+                self.add_entry(last)
+            # if title
+            elif sline and last is None:
+                self.title = '%s%s' % (self.title, line)
+            # if new entry
+            elif sline and sline[0] == BULLET:
+                expect_sub = False
+                last.add_message(sline[1:].strip())
+            # if new sub_entry
+            elif expect_sub and sline and sline[0] == SUBBULLET:
+                last.add_sub_message(sline[1:].strip())
+            # if new line for current entry
+            elif sline and last.messages:
+                last.complete_latest_message(line)
+            else:
+                expect_sub = True
+                self.additional_content += line
+        stream.close()
+
+    def format_title(self):
+        return '%s\n\n' % self.title.strip()
+
+    def save(self):
+        """write back change log"""
+        # filetutils isn't importable in appengine, so import locally
+        from logilab.common.fileutils import ensure_fs_mode
+        ensure_fs_mode(self.file, S_IWRITE)
+        self.write(open(self.file, 'w'))
+
+    def write(self, stream=sys.stdout):
+        """write changelog to stream"""
+        stream.write(self.format_title())
+        for entry in self.entries:
+            entry.write(stream)
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/clcommands.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/clcommands.py
new file mode 100644
index 0000000..4778b99
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/clcommands.py
@@ -0,0 +1,334 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Helper functions to support command line tools providing more than
+one command.
+
+e.g called as "tool command [options] args..." where <options> and <args> are
+command'specific
+"""
+
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+
+import sys
+import logging
+from os.path import basename
+
+from logilab.common.configuration import Configuration
+from logilab.common.logging_ext import init_log, get_threshold
+from logilab.common.deprecation import deprecated
+
+
+class BadCommandUsage(Exception):
+    """Raised when an unknown command is used or when a command is not
+    correctly used (bad options, too much / missing arguments...).
+
+    Trigger display of command usage.
+    """
+
+class CommandError(Exception):
+    """Raised when a command can't be processed and we want to display it and
+    exit, without traceback nor usage displayed.
+    """
+
+
+# command line access point ####################################################
+
+class CommandLine(dict):
+    """Usage:
+
+    >>> LDI = cli.CommandLine('ldi', doc='Logilab debian installer',
+                              version=version, rcfile=RCFILE)
+    >>> LDI.register(MyCommandClass)
+    >>> LDI.register(MyOtherCommandClass)
+    >>> LDI.run(sys.argv[1:])
+
+    Arguments:
+
+    * `pgm`, the program name, default to `basename(sys.argv[0])`
+
+    * `doc`, a short description of the command line tool
+
+    * `copyright`, additional doc string that will be appended to the generated
+      doc
+
+    * `version`, version number of string of the tool. If specified, global
+      --version option will be available.
+
+    * `rcfile`, path to a configuration file. If specified, global --C/--rc-file
+      option will be available?  self.rcfile = rcfile
+
+    * `logger`, logger to propagate to commands, default to
+      `logging.getLogger(self.pgm))`
+    """
+    def __init__(self, pgm=None, doc=None, copyright=None, version=None,
+                 rcfile=None, logthreshold=logging.ERROR,
+                 check_duplicated_command=True):
+        if pgm is None:
+            pgm = basename(sys.argv[0])
+        self.pgm = pgm
+        self.doc = doc
+        self.copyright = copyright
+        self.version = version
+        self.rcfile = rcfile
+        self.logger = None
+        self.logthreshold = logthreshold
+        self.check_duplicated_command = check_duplicated_command
+
+    def register(self, cls, force=False):
+        """register the given :class:`Command` subclass"""
+        assert not self.check_duplicated_command or force or not cls.name in self, \
+               'a command %s is already defined' % cls.name
+        self[cls.name] = cls
+        return cls
+
+    def run(self, args):
+        """main command line access point:
+        * init logging
+        * handle global options (-h/--help, --version, -C/--rc-file)
+        * check command
+        * run command
+
+        Terminate by :exc:`SystemExit`
+        """
+        init_log(debug=True, # so that we use StreamHandler
+                 logthreshold=self.logthreshold,
+                 logformat='%(levelname)s: %(message)s')
+        try:
+            arg = args.pop(0)
+        except IndexError:
+            self.usage_and_exit(1)
+        if arg in ('-h', '--help'):
+            self.usage_and_exit(0)
+        if self.version is not None and arg in ('--version'):
+            print(self.version)
+            sys.exit(0)
+        rcfile = self.rcfile
+        if rcfile is not None and arg in ('-C', '--rc-file'):
+            try:
+                rcfile = args.pop(0)
+                arg = args.pop(0)
+            except IndexError:
+                self.usage_and_exit(1)
+        try:
+            command = self.get_command(arg)
+        except KeyError:
+            print('ERROR: no %s command' % arg)
+            print()
+            self.usage_and_exit(1)
+        try:
+            sys.exit(command.main_run(args, rcfile))
+        except KeyboardInterrupt as exc:
+            print('Interrupted', end=' ')
+            if str(exc):
+                print(': %s' % exc, end=' ')
+            print()
+            sys.exit(4)
+        except BadCommandUsage as err:
+            print('ERROR:', err)
+            print()
+            print(command.help())
+            sys.exit(1)
+
+    def create_logger(self, handler, logthreshold=None):
+        logger = logging.Logger(self.pgm)
+        logger.handlers = [handler]
+        if logthreshold is None:
+            logthreshold = get_threshold(self.logthreshold)
+        logger.setLevel(logthreshold)
+        return logger
+
+    def get_command(self, cmd, logger=None):
+        if logger is None:
+            logger = self.logger
+        if logger is None:
+            logger = self.logger = logging.getLogger(self.pgm)
+            logger.setLevel(get_threshold(self.logthreshold))
+        return self[cmd](logger)
+
+    def usage(self):
+        """display usage for the main program (i.e. when no command supplied)
+        and exit
+        """
+        print('usage:', self.pgm, end=' ')
+        if self.rcfile:
+            print('[--rc-file=<configuration file>]', end=' ')
+        print('<command> [options] <command argument>...')
+        if self.doc:
+            print('\n%s' % self.doc)
+        print('''
+Type "%(pgm)s <command> --help" for more information about a specific
+command. Available commands are :\n''' % self.__dict__)
+        max_len = max([len(cmd) for cmd in self])
+        padding = ' ' * max_len
+        for cmdname, cmd in sorted(self.items()):
+            if not cmd.hidden:
+                print(' ', (cmdname + padding)[:max_len], cmd.short_description())
+        if self.rcfile:
+            print('''
+Use --rc-file=<configuration file> / -C <configuration file> before the command
+to specify a configuration file. Default to %s.
+''' % self.rcfile)
+        print('''%(pgm)s -h/--help
+      display this usage information and exit''' % self.__dict__)
+        if self.version:
+            print('''%(pgm)s -v/--version
+      display version configuration and exit''' % self.__dict__)
+        if self.copyright:
+            print('\n', self.copyright)
+
+    def usage_and_exit(self, status):
+        self.usage()
+        sys.exit(status)
+
+
+# base command classes #########################################################
+
+class Command(Configuration):
+    """Base class for command line commands.
+
+    Class attributes:
+
+    * `name`, the name of the command
+
+    * `min_args`, minimum number of arguments, None if unspecified
+
+    * `max_args`, maximum number of arguments, None if unspecified
+
+    * `arguments`, string describing arguments, used in command usage
+
+    * `hidden`, boolean flag telling if the command should be hidden, e.g. does
+      not appear in help's commands list
+
+    * `options`, options list, as allowed by :mod:configuration
+    """
+
+    arguments = ''
+    name = ''
+    # hidden from help ?
+    hidden = False
+    # max/min args, None meaning unspecified
+    min_args = None
+    max_args = None
+
+    @classmethod
+    def description(cls):
+        return cls.__doc__.replace('    ', '')
+
+    @classmethod
+    def short_description(cls):
+        return cls.description().split('.')[0]
+
+    def __init__(self, logger):
+        usage = '%%prog %s %s\n\n%s' % (self.name, self.arguments,
+                                        self.description())
+        Configuration.__init__(self, usage=usage)
+        self.logger = logger
+
+    def check_args(self, args):
+        """check command's arguments are provided"""
+        if self.min_args is not None and len(args) < self.min_args:
+            raise BadCommandUsage('missing argument')
+        if self.max_args is not None and len(args) > self.max_args:
+            raise BadCommandUsage('too many arguments')
+
+    def main_run(self, args, rcfile=None):
+        """Run the command and return status 0 if everything went fine.
+
+        If :exc:`CommandError` is raised by the underlying command, simply log
+        the error and return status 2.
+
+        Any other exceptions, including :exc:`BadCommandUsage` will be
+        propagated.
+        """
+        if rcfile:
+            self.load_file_configuration(rcfile)
+        args = self.load_command_line_configuration(args)
+        try:
+            self.check_args(args)
+            self.run(args)
+        except CommandError as err:
+            self.logger.error(err)
+            return 2
+        return 0
+
+    def run(self, args):
+        """run the command with its specific arguments"""
+        raise NotImplementedError()
+
+
+class ListCommandsCommand(Command):
+    """list available commands, useful for bash completion."""
+    name = 'listcommands'
+    arguments = '[command]'
+    hidden = True
+
+    def run(self, args):
+        """run the command with its specific arguments"""
+        if args:
+            command = args.pop()
+            cmd = _COMMANDS[command]
+            for optname, optdict in cmd.options:
+                print('--help')
+                print('--' + optname)
+        else:
+            commands = sorted(_COMMANDS.keys())
+            for command in commands:
+                cmd = _COMMANDS[command]
+                if not cmd.hidden:
+                    print(command)
+
+
+# deprecated stuff #############################################################
+
+_COMMANDS = CommandLine()
+
+DEFAULT_COPYRIGHT = '''\
+Copyright (c) 2004-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+http://www.logilab.fr/ -- mailto:contact@logilab.fr'''
+
+@deprecated('use cls.register(cli)')
+def register_commands(commands):
+    """register existing commands"""
+    for command_klass in commands:
+        _COMMANDS.register(command_klass)
+
+@deprecated('use args.pop(0)')
+def main_run(args, doc=None, copyright=None, version=None):
+    """command line tool: run command specified by argument list (without the
+    program name). Raise SystemExit with status 0 if everything went fine.
+
+    >>> main_run(sys.argv[1:])
+    """
+    _COMMANDS.doc = doc
+    _COMMANDS.copyright = copyright
+    _COMMANDS.version = version
+    _COMMANDS.run(args)
+
+@deprecated('use args.pop(0)')
+def pop_arg(args_list, expected_size_after=None, msg="Missing argument"):
+    """helper function to get and check command line arguments"""
+    try:
+        value = args_list.pop(0)
+    except IndexError:
+        raise BadCommandUsage(msg)
+    if expected_size_after is not None and len(args_list) > expected_size_after:
+        raise BadCommandUsage('too many arguments')
+    return value
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/compat.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/compat.py
new file mode 100644
index 0000000..f2eb590
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/compat.py
@@ -0,0 +1,78 @@
+# pylint: disable=E0601,W0622,W0611
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Wrappers around some builtins introduced in python 2.3, 2.4 and
+2.5, making them available in for earlier versions of python.
+
+See another compatibility snippets from other projects:
+
+    :mod:`lib2to3.fixes`
+    :mod:`coverage.backward`
+    :mod:`unittest2.compatibility`
+"""
+
+
+__docformat__ = "restructuredtext en"
+
+import os
+import sys
+import types
+from warnings import warn
+
+# not used here, but imported to preserve API
+from six.moves import builtins
+
+if sys.version_info < (3, 0):
+    str_to_bytes = str
+    def str_encode(string, encoding):
+        if isinstance(string, unicode):
+            return string.encode(encoding)
+        return str(string)
+else:
+    def str_to_bytes(string):
+        return str.encode(string)
+    # we have to ignore the encoding in py3k to be able to write a string into a
+    # TextIOWrapper or like object (which expect an unicode string)
+    def str_encode(string, encoding):
+        return str(string)
+
+# See also http://bugs.python.org/issue11776
+if sys.version_info[0] == 3:
+    def method_type(callable, instance, klass):
+        # api change. klass is no more considered
+        return types.MethodType(callable, instance)
+else:
+    # alias types otherwise
+    method_type = types.MethodType
+
+# Pythons 2 and 3 differ on where to get StringIO
+if sys.version_info < (3, 0):
+    from cStringIO import StringIO
+    FileIO = file
+    BytesIO = StringIO
+    reload = reload
+else:
+    from io import FileIO, BytesIO, StringIO
+    from imp import reload
+
+from logilab.common.deprecation import deprecated
+
+# Other projects import these from here, keep providing them for
+# backwards compat
+any = deprecated('use builtin "any"')(any)
+all = deprecated('use builtin "all"')(all)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/configuration.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/configuration.py
new file mode 100644
index 0000000..b292427
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/configuration.py
@@ -0,0 +1,1105 @@
+# copyright 2003-2012 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Classes to handle advanced configuration in simple to complex applications.
+
+Allows to load the configuration from a file or from command line
+options, to generate a sample configuration file or to display
+program's usage. Fills the gap between optik/optparse and ConfigParser
+by adding data types (which are also available as a standalone optik
+extension in the `optik_ext` module).
+
+
+Quick start: simplest usage
+---------------------------
+
+.. python ::
+
+  >>> import sys
+  >>> from logilab.common.configuration import Configuration
+  >>> options = [('dothis', {'type':'yn', 'default': True, 'metavar': '<y or n>'}),
+  ...            ('value', {'type': 'string', 'metavar': '<string>'}),
+  ...            ('multiple', {'type': 'csv', 'default': ('yop',),
+  ...                          'metavar': '<comma separated values>',
+  ...                          'help': 'you can also document the option'}),
+  ...            ('number', {'type': 'int', 'default':2, 'metavar':'<int>'}),
+  ...           ]
+  >>> config = Configuration(options=options, name='My config')
+  >>> print config['dothis']
+  True
+  >>> print config['value']
+  None
+  >>> print config['multiple']
+  ('yop',)
+  >>> print config['number']
+  2
+  >>> print config.help()
+  Usage:  [options]
+
+  Options:
+    -h, --help            show this help message and exit
+    --dothis=<y or n>
+    --value=<string>
+    --multiple=<comma separated values>
+                          you can also document the option [current: none]
+    --number=<int>
+
+  >>> f = open('myconfig.ini', 'w')
+  >>> f.write('''[MY CONFIG]
+  ... number = 3
+  ... dothis = no
+  ... multiple = 1,2,3
+  ... ''')
+  >>> f.close()
+  >>> config.load_file_configuration('myconfig.ini')
+  >>> print config['dothis']
+  False
+  >>> print config['value']
+  None
+  >>> print config['multiple']
+  ['1', '2', '3']
+  >>> print config['number']
+  3
+  >>> sys.argv = ['mon prog', '--value', 'bacon', '--multiple', '4,5,6',
+  ...             'nonoptionargument']
+  >>> print config.load_command_line_configuration()
+  ['nonoptionargument']
+  >>> print config['value']
+  bacon
+  >>> config.generate_config()
+  # class for simple configurations which don't need the
+  # manager / providers model and prefer delegation to inheritance
+  #
+  # configuration values are accessible through a dict like interface
+  #
+  [MY CONFIG]
+
+  dothis=no
+
+  value=bacon
+
+  # you can also document the option
+  multiple=4,5,6
+
+  number=3
+
+  Note : starting with Python 2.7 ConfigParser is able to take into
+  account the order of occurrences of the options into a file (by
+  using an OrderedDict). If you have two options changing some common
+  state, like a 'disable-all-stuff' and a 'enable-some-stuff-a', their
+  order of appearance will be significant : the last specified in the
+  file wins. For earlier version of python and logilab.common newer
+  than 0.61 the behaviour is unspecified.
+
+"""
+
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+
+__all__ = ('OptionsManagerMixIn', 'OptionsProviderMixIn',
+           'ConfigurationMixIn', 'Configuration',
+           'OptionsManager2ConfigurationAdapter')
+
+import os
+import sys
+import re
+from os.path import exists, expanduser
+from copy import copy
+from warnings import warn
+
+from six import string_types
+from six.moves import range, configparser as cp, input
+
+from logilab.common.compat import str_encode as _encode
+from logilab.common.deprecation import deprecated
+from logilab.common.textutils import normalize_text, unquote
+from logilab.common import optik_ext
+
+OptionError = optik_ext.OptionError
+
+REQUIRED = []
+
+class UnsupportedAction(Exception):
+    """raised by set_option when it doesn't know what to do for an action"""
+
+
+def _get_encoding(encoding, stream):
+    encoding = encoding or getattr(stream, 'encoding', None)
+    if not encoding:
+        import locale
+        encoding = locale.getpreferredencoding()
+    return encoding
+
+
+# validation functions ########################################################
+
+# validators will return the validated value or raise optparse.OptionValueError
+# XXX add to documentation
+
+def choice_validator(optdict, name, value):
+    """validate and return a converted value for option of type 'choice'
+    """
+    if not value in optdict['choices']:
+        msg = "option %s: invalid value: %r, should be in %s"
+        raise optik_ext.OptionValueError(msg % (name, value, optdict['choices']))
+    return value
+
+def multiple_choice_validator(optdict, name, value):
+    """validate and return a converted value for option of type 'choice'
+    """
+    choices = optdict['choices']
+    values = optik_ext.check_csv(None, name, value)
+    for value in values:
+        if not value in choices:
+            msg = "option %s: invalid value: %r, should be in %s"
+            raise optik_ext.OptionValueError(msg % (name, value, choices))
+    return values
+
+def csv_validator(optdict, name, value):
+    """validate and return a converted value for option of type 'csv'
+    """
+    return optik_ext.check_csv(None, name, value)
+
+def yn_validator(optdict, name, value):
+    """validate and return a converted value for option of type 'yn'
+    """
+    return optik_ext.check_yn(None, name, value)
+
+def named_validator(optdict, name, value):
+    """validate and return a converted value for option of type 'named'
+    """
+    return optik_ext.check_named(None, name, value)
+
+def file_validator(optdict, name, value):
+    """validate and return a filepath for option of type 'file'"""
+    return optik_ext.check_file(None, name, value)
+
+def color_validator(optdict, name, value):
+    """validate and return a valid color for option of type 'color'"""
+    return optik_ext.check_color(None, name, value)
+
+def password_validator(optdict, name, value):
+    """validate and return a string for option of type 'password'"""
+    return optik_ext.check_password(None, name, value)
+
+def date_validator(optdict, name, value):
+    """validate and return a mx DateTime object for option of type 'date'"""
+    return optik_ext.check_date(None, name, value)
+
+def time_validator(optdict, name, value):
+    """validate and return a time object for option of type 'time'"""
+    return optik_ext.check_time(None, name, value)
+
+def bytes_validator(optdict, name, value):
+    """validate and return an integer for option of type 'bytes'"""
+    return optik_ext.check_bytes(None, name, value)
+
+
+VALIDATORS = {'string': unquote,
+              'int': int,
+              'float': float,
+              'file': file_validator,
+              'font': unquote,
+              'color': color_validator,
+              'regexp': re.compile,
+              'csv': csv_validator,
+              'yn': yn_validator,
+              'bool': yn_validator,
+              'named': named_validator,
+              'password': password_validator,
+              'date': date_validator,
+              'time': time_validator,
+              'bytes': bytes_validator,
+              'choice': choice_validator,
+              'multiple_choice': multiple_choice_validator,
+              }
+
+def _call_validator(opttype, optdict, option, value):
+    if opttype not in VALIDATORS:
+        raise Exception('Unsupported type "%s"' % opttype)
+    try:
+        return VALIDATORS[opttype](optdict, option, value)
+    except TypeError:
+        try:
+            return VALIDATORS[opttype](value)
+        except optik_ext.OptionValueError:
+            raise
+        except:
+            raise optik_ext.OptionValueError('%s value (%r) should be of type %s' %
+                                   (option, value, opttype))
+
+# user input functions ########################################################
+
+# user input functions will ask the user for input on stdin then validate
+# the result and return the validated value or raise optparse.OptionValueError
+# XXX add to documentation
+
+def input_password(optdict, question='password:'):
+    from getpass import getpass
+    while True:
+        value = getpass(question)
+        value2 = getpass('confirm: ')
+        if value == value2:
+            return value
+        print('password mismatch, try again')
+
+def input_string(optdict, question):
+    value = input(question).strip()
+    return value or None
+
+def _make_input_function(opttype):
+    def input_validator(optdict, question):
+        while True:
+            value = input(question)
+            if not value.strip():
+                return None
+            try:
+                return _call_validator(opttype, optdict, None, value)
+            except optik_ext.OptionValueError as ex:
+                msg = str(ex).split(':', 1)[-1].strip()
+                print('bad value: %s' % msg)
+    return input_validator
+
+INPUT_FUNCTIONS = {
+    'string': input_string,
+    'password': input_password,
+    }
+
+for opttype in VALIDATORS.keys():
+    INPUT_FUNCTIONS.setdefault(opttype, _make_input_function(opttype))
+
+# utility functions ############################################################
+
+def expand_default(self, option):
+    """monkey patch OptionParser.expand_default since we have a particular
+    way to handle defaults to avoid overriding values in the configuration
+    file
+    """
+    if self.parser is None or not self.default_tag:
+        return option.help
+    optname = option._long_opts[0][2:]
+    try:
+        provider = self.parser.options_manager._all_options[optname]
+    except KeyError:
+        value = None
+    else:
+        optdict = provider.get_option_def(optname)
+        optname = provider.option_attrname(optname, optdict)
+        value = getattr(provider.config, optname, optdict)
+        value = format_option_value(optdict, value)
+    if value is optik_ext.NO_DEFAULT or not value:
+        value = self.NO_DEFAULT_VALUE
+    return option.help.replace(self.default_tag, str(value))
+
+
+def _validate(value, optdict, name=''):
+    """return a validated value for an option according to its type
+
+    optional argument name is only used for error message formatting
+    """
+    try:
+        _type = optdict['type']
+    except KeyError:
+        # FIXME
+        return value
+    return _call_validator(_type, optdict, name, value)
+convert = deprecated('[0.60] convert() was renamed _validate()')(_validate)
+
+# format and output functions ##################################################
+
+def comment(string):
+    """return string as a comment"""
+    lines = [line.strip() for line in string.splitlines()]
+    return '# ' + ('%s# ' % os.linesep).join(lines)
+
+def format_time(value):
+    if not value:
+        return '0'
+    if value != int(value):
+        return '%.2fs' % value
+    value = int(value)
+    nbmin, nbsec = divmod(value, 60)
+    if nbsec:
+        return '%ss' % value
+    nbhour, nbmin_ = divmod(nbmin, 60)
+    if nbmin_:
+        return '%smin' % nbmin
+    nbday, nbhour_ = divmod(nbhour, 24)
+    if nbhour_:
+        return '%sh' % nbhour
+    return '%sd' % nbday
+
+def format_bytes(value):
+    if not value:
+        return '0'
+    if value != int(value):
+        return '%.2fB' % value
+    value = int(value)
+    prevunit = 'B'
+    for unit in ('KB', 'MB', 'GB', 'TB'):
+        next, remain = divmod(value, 1024)
+        if remain:
+            return '%s%s' % (value, prevunit)
+        prevunit = unit
+        value = next
+    return '%s%s' % (value, unit)
+
+def format_option_value(optdict, value):
+    """return the user input's value from a 'compiled' value"""
+    if isinstance(value, (list, tuple)):
+        value = ','.join(value)
+    elif isinstance(value, dict):
+        value = ','.join(['%s:%s' % (k, v) for k, v in value.items()])
+    elif hasattr(value, 'match'): # optdict.get('type') == 'regexp'
+        # compiled regexp
+        value = value.pattern
+    elif optdict.get('type') == 'yn':
+        value = value and 'yes' or 'no'
+    elif isinstance(value, string_types) and value.isspace():
+        value = "'%s'" % value
+    elif optdict.get('type') == 'time' and isinstance(value, (float, int, long)):
+        value = format_time(value)
+    elif optdict.get('type') == 'bytes' and hasattr(value, '__int__'):
+        value = format_bytes(value)
+    return value
+
+def ini_format_section(stream, section, options, encoding=None, doc=None):
+    """format an options section using the INI format"""
+    encoding = _get_encoding(encoding, stream)
+    if doc:
+        print(_encode(comment(doc), encoding), file=stream)
+    print('[%s]' % section, file=stream)
+    ini_format(stream, options, encoding)
+
+def ini_format(stream, options, encoding):
+    """format options using the INI format"""
+    for optname, optdict, value in options:
+        value = format_option_value(optdict, value)
+        help = optdict.get('help')
+        if help:
+            help = normalize_text(help, line_len=79, indent='# ')
+            print(file=stream)
+            print(_encode(help, encoding), file=stream)
+        else:
+            print(file=stream)
+        if value is None:
+            print('#%s=' % optname, file=stream)
+        else:
+            value = _encode(value, encoding).strip()
+            print('%s=%s' % (optname, value), file=stream)
+
+format_section = ini_format_section
+
+def rest_format_section(stream, section, options, encoding=None, doc=None):
+    """format an options section using as ReST formatted output"""
+    encoding = _get_encoding(encoding, stream)
+    if section:
+        print('%s\n%s' % (section, "'"*len(section)), file=stream)
+    if doc:
+        print(_encode(normalize_text(doc, line_len=79, indent=''), encoding), file=stream)
+        print(file=stream)
+    for optname, optdict, value in options:
+        help = optdict.get('help')
+        print(':%s:' % optname, file=stream)
+        if help:
+            help = normalize_text(help, line_len=79, indent='  ')
+            print(_encode(help, encoding), file=stream)
+        if value:
+            value = _encode(format_option_value(optdict, value), encoding)
+            print(file=stream)
+            print('  Default: ``%s``' % value.replace("`` ", "```` ``"), file=stream)
+
+# Options Manager ##############################################################
+
+class OptionsManagerMixIn(object):
+    """MixIn to handle a configuration from both a configuration file and
+    command line options
+    """
+
+    def __init__(self, usage, config_file=None, version=None, quiet=0):
+        self.config_file = config_file
+        self.reset_parsers(usage, version=version)
+        # list of registered options providers
+        self.options_providers = []
+        # dictionary associating option name to checker
+        self._all_options = {}
+        self._short_options = {}
+        self._nocallback_options = {}
+        self._mygroups = dict()
+        # verbosity
+        self.quiet = quiet
+        self._maxlevel = 0
+
+    def reset_parsers(self, usage='', version=None):
+        # configuration file parser
+        self.cfgfile_parser = cp.ConfigParser()
+        # command line parser
+        self.cmdline_parser = optik_ext.OptionParser(usage=usage, version=version)
+        self.cmdline_parser.options_manager = self
+        self._optik_option_attrs = set(self.cmdline_parser.option_class.ATTRS)
+
+    def register_options_provider(self, provider, own_group=True):
+        """register an options provider"""
+        assert provider.priority <= 0, "provider's priority can't be >= 0"
+        for i in range(len(self.options_providers)):
+            if provider.priority > self.options_providers[i].priority:
+                self.options_providers.insert(i, provider)
+                break
+        else:
+            self.options_providers.append(provider)
+        non_group_spec_options = [option for option in provider.options
+                                  if 'group' not in option[1]]
+        groups = getattr(provider, 'option_groups', ())
+        if own_group and non_group_spec_options:
+            self.add_option_group(provider.name.upper(), provider.__doc__,
+                                  non_group_spec_options, provider)
+        else:
+            for opt, optdict in non_group_spec_options:
+                self.add_optik_option(provider, self.cmdline_parser, opt, optdict)
+        for gname, gdoc in groups:
+            gname = gname.upper()
+            goptions = [option for option in provider.options
+                        if option[1].get('group', '').upper() == gname]
+            self.add_option_group(gname, gdoc, goptions, provider)
+
+    def add_option_group(self, group_name, doc, options, provider):
+        """add an option group including the listed options
+        """
+        assert options
+        # add option group to the command line parser
+        if group_name in self._mygroups:
+            group = self._mygroups[group_name]
+        else:
+            group = optik_ext.OptionGroup(self.cmdline_parser,
+                                         title=group_name.capitalize())
+            self.cmdline_parser.add_option_group(group)
+            group.level = provider.level
+            self._mygroups[group_name] = group
+            # add section to the config file
+            if group_name != "DEFAULT":
+                self.cfgfile_parser.add_section(group_name)
+        # add provider's specific options
+        for opt, optdict in options:
+            self.add_optik_option(provider, group, opt, optdict)
+
+    def add_optik_option(self, provider, optikcontainer, opt, optdict):
+        if 'inputlevel' in optdict:
+            warn('[0.50] "inputlevel" in option dictionary for %s is deprecated,'
+                 ' use "level"' % opt, DeprecationWarning)
+            optdict['level'] = optdict.pop('inputlevel')
+        args, optdict = self.optik_option(provider, opt, optdict)
+        option = optikcontainer.add_option(*args, **optdict)
+        self._all_options[opt] = provider
+        self._maxlevel = max(self._maxlevel, option.level or 0)
+
+    def optik_option(self, provider, opt, optdict):
+        """get our personal option definition and return a suitable form for
+        use with optik/optparse
+        """
+        optdict = copy(optdict)
+        others = {}
+        if 'action' in optdict:
+            self._nocallback_options[provider] = opt
+        else:
+            optdict['action'] = 'callback'
+            optdict['callback'] = self.cb_set_provider_option
+        # default is handled here and *must not* be given to optik if you
+        # want the whole machinery to work
+        if 'default' in optdict:
+            if ('help' in optdict
+                and optdict.get('default') is not None
+                and not optdict['action'] in ('store_true', 'store_false')):
+                optdict['help'] += ' [current: %default]'
+            del optdict['default']
+        args = ['--' + str(opt)]
+        if 'short' in optdict:
+            self._short_options[optdict['short']] = opt
+            args.append('-' + optdict['short'])
+            del optdict['short']
+        # cleanup option definition dict before giving it to optik
+        for key in list(optdict.keys()):
+            if not key in self._optik_option_attrs:
+                optdict.pop(key)
+        return args, optdict
+
+    def cb_set_provider_option(self, option, opt, value, parser):
+        """optik callback for option setting"""
+        if opt.startswith('--'):
+            # remove -- on long option
+            opt = opt[2:]
+        else:
+            # short option, get its long equivalent
+            opt = self._short_options[opt[1:]]
+        # trick since we can't set action='store_true' on options
+        if value is None:
+            value = 1
+        self.global_set_option(opt, value)
+
+    def global_set_option(self, opt, value):
+        """set option on the correct option provider"""
+        self._all_options[opt].set_option(opt, value)
+
+    def generate_config(self, stream=None, skipsections=(), encoding=None):
+        """write a configuration file according to the current configuration
+        into the given stream or stdout
+        """
+        options_by_section = {}
+        sections = []
+        for provider in self.options_providers:
+            for section, options in provider.options_by_section():
+                if section is None:
+                    section = provider.name
+                if section in skipsections:
+                    continue
+                options = [(n, d, v) for (n, d, v) in options
+                           if d.get('type') is not None]
+                if not options:
+                    continue
+                if not section in sections:
+                    sections.append(section)
+                alloptions = options_by_section.setdefault(section, [])
+                alloptions += options
+        stream = stream or sys.stdout
+        encoding = _get_encoding(encoding, stream)
+        printed = False
+        for section in sections:
+            if printed:
+                print('\n', file=stream)
+            format_section(stream, section.upper(), options_by_section[section],
+                           encoding)
+            printed = True
+
+    def generate_manpage(self, pkginfo, section=1, stream=None):
+        """write a man page for the current configuration into the given
+        stream or stdout
+        """
+        self._monkeypatch_expand_default()
+        try:
+            optik_ext.generate_manpage(self.cmdline_parser, pkginfo,
+                                      section, stream=stream or sys.stdout,
+                                      level=self._maxlevel)
+        finally:
+            self._unmonkeypatch_expand_default()
+
+    # initialization methods ##################################################
+
+    def load_provider_defaults(self):
+        """initialize configuration using default values"""
+        for provider in self.options_providers:
+            provider.load_defaults()
+
+    def load_file_configuration(self, config_file=None):
+        """load the configuration from file"""
+        self.read_config_file(config_file)
+        self.load_config_file()
+
+    def read_config_file(self, config_file=None):
+        """read the configuration file but do not load it (i.e. dispatching
+        values to each options provider)
+        """
+        helplevel = 1
+        while helplevel <= self._maxlevel:
+            opt = '-'.join(['long'] * helplevel) + '-help'
+            if opt in self._all_options:
+                break # already processed
+            def helpfunc(option, opt, val, p, level=helplevel):
+                print(self.help(level))
+                sys.exit(0)
+            helpmsg = '%s verbose help.' % ' '.join(['more'] * helplevel)
+            optdict = {'action' : 'callback', 'callback' : helpfunc,
+                       'help' : helpmsg}
+            provider = self.options_providers[0]
+            self.add_optik_option(provider, self.cmdline_parser, opt, optdict)
+            provider.options += ( (opt, optdict), )
+            helplevel += 1
+        if config_file is None:
+            config_file = self.config_file
+        if config_file is not None:
+            config_file = expanduser(config_file)
+        if config_file and exists(config_file):
+            parser = self.cfgfile_parser
+            parser.read([config_file])
+            # normalize sections'title
+            for sect, values in parser._sections.items():
+                if not sect.isupper() and values:
+                    parser._sections[sect.upper()] = values
+        elif not self.quiet:
+            msg = 'No config file found, using default configuration'
+            print(msg, file=sys.stderr)
+            return
+
+    def input_config(self, onlysection=None, inputlevel=0, stream=None):
+        """interactively get configuration values by asking to the user and generate
+        a configuration file
+        """
+        if onlysection is not None:
+            onlysection = onlysection.upper()
+        for provider in self.options_providers:
+            for section, option, optdict in provider.all_options():
+                if onlysection is not None and section != onlysection:
+                    continue
+                if not 'type' in optdict:
+                    # ignore action without type (callback, store_true...)
+                    continue
+                provider.input_option(option, optdict, inputlevel)
+        # now we can generate the configuration file
+        if stream is not None:
+            self.generate_config(stream)
+
+    def load_config_file(self):
+        """dispatch values previously read from a configuration file to each
+        options provider)
+        """
+        parser = self.cfgfile_parser
+        for section in parser.sections():
+             for option, value in parser.items(section):
+                  try:
+                       self.global_set_option(option, value)
+                  except (KeyError, OptionError):
+                       # TODO handle here undeclared options appearing in the config file
+                       continue
+
+    def load_configuration(self, **kwargs):
+        """override configuration according to given parameters
+        """
+        for opt, opt_value in kwargs.items():
+            opt = opt.replace('_', '-')
+            provider = self._all_options[opt]
+            provider.set_option(opt, opt_value)
+
+    def load_command_line_configuration(self, args=None):
+        """override configuration according to command line parameters
+
+        return additional arguments
+        """
+        self._monkeypatch_expand_default()
+        try:
+            if args is None:
+                args = sys.argv[1:]
+            else:
+                args = list(args)
+            (options, args) = self.cmdline_parser.parse_args(args=args)
+            for provider in self._nocallback_options.keys():
+                config = provider.config
+                for attr in config.__dict__.keys():
+                    value = getattr(options, attr, None)
+                    if value is None:
+                        continue
+                    setattr(config, attr, value)
+            return args
+        finally:
+            self._unmonkeypatch_expand_default()
+
+
+    # help methods ############################################################
+
+    def add_help_section(self, title, description, level=0):
+        """add a dummy option section for help purpose """
+        group = optik_ext.OptionGroup(self.cmdline_parser,
+                                     title=title.capitalize(),
+                                     description=description)
+        group.level = level
+        self._maxlevel = max(self._maxlevel, level)
+        self.cmdline_parser.add_option_group(group)
+
+    def _monkeypatch_expand_default(self):
+        # monkey patch optik_ext to deal with our default values
+        try:
+            self.__expand_default_backup = optik_ext.HelpFormatter.expand_default
+            optik_ext.HelpFormatter.expand_default = expand_default
+        except AttributeError:
+            # python < 2.4: nothing to be done
+            pass
+    def _unmonkeypatch_expand_default(self):
+        # remove monkey patch
+        if hasattr(optik_ext.HelpFormatter, 'expand_default'):
+            # unpatch optik_ext to avoid side effects
+            optik_ext.HelpFormatter.expand_default = self.__expand_default_backup
+
+    def help(self, level=0):
+        """return the usage string for available options """
+        self.cmdline_parser.formatter.output_level = level
+        self._monkeypatch_expand_default()
+        try:
+            return self.cmdline_parser.format_help()
+        finally:
+            self._unmonkeypatch_expand_default()
+
+
+class Method(object):
+    """used to ease late binding of default method (so you can define options
+    on the class using default methods on the configuration instance)
+    """
+    def __init__(self, methname):
+        self.method = methname
+        self._inst = None
+
+    def bind(self, instance):
+        """bind the method to its instance"""
+        if self._inst is None:
+            self._inst = instance
+
+    def __call__(self, *args, **kwargs):
+        assert self._inst, 'unbound method'
+        return getattr(self._inst, self.method)(*args, **kwargs)
+
+# Options Provider #############################################################
+
+class OptionsProviderMixIn(object):
+    """Mixin to provide options to an OptionsManager"""
+
+    # those attributes should be overridden
+    priority = -1
+    name = 'default'
+    options = ()
+    level = 0
+
+    def __init__(self):
+        self.config = optik_ext.Values()
+        for option in self.options:
+            try:
+                option, optdict = option
+            except ValueError:
+                raise Exception('Bad option: %r' % option)
+            if isinstance(optdict.get('default'), Method):
+                optdict['default'].bind(self)
+            elif isinstance(optdict.get('callback'), Method):
+                optdict['callback'].bind(self)
+        self.load_defaults()
+
+    def load_defaults(self):
+        """initialize the provider using default values"""
+        for opt, optdict in self.options:
+            action = optdict.get('action')
+            if action != 'callback':
+                # callback action have no default
+                default = self.option_default(opt, optdict)
+                if default is REQUIRED:
+                    continue
+                self.set_option(opt, default, action, optdict)
+
+    def option_default(self, opt, optdict=None):
+        """return the default value for an option"""
+        if optdict is None:
+            optdict = self.get_option_def(opt)
+        default = optdict.get('default')
+        if callable(default):
+            default = default()
+        return default
+
+    def option_attrname(self, opt, optdict=None):
+        """get the config attribute corresponding to opt
+        """
+        if optdict is None:
+            optdict = self.get_option_def(opt)
+        return optdict.get('dest', opt.replace('-', '_'))
+    option_name = deprecated('[0.60] OptionsProviderMixIn.option_name() was renamed to option_attrname()')(option_attrname)
+
+    def option_value(self, opt):
+        """get the current value for the given option"""
+        return getattr(self.config, self.option_attrname(opt), None)
+
+    def set_option(self, opt, value, action=None, optdict=None):
+        """method called to set an option (registered in the options list)
+        """
+        if optdict is None:
+            optdict = self.get_option_def(opt)
+        if value is not None:
+            value = _validate(value, optdict, opt)
+        if action is None:
+            action = optdict.get('action', 'store')
+        if optdict.get('type') == 'named': # XXX need specific handling
+            optname = self.option_attrname(opt, optdict)
+            currentvalue = getattr(self.config, optname, None)
+            if currentvalue:
+                currentvalue.update(value)
+                value = currentvalue
+        if action == 'store':
+            setattr(self.config, self.option_attrname(opt, optdict), value)
+        elif action in ('store_true', 'count'):
+            setattr(self.config, self.option_attrname(opt, optdict), 0)
+        elif action == 'store_false':
+            setattr(self.config, self.option_attrname(opt, optdict), 1)
+        elif action == 'append':
+            opt = self.option_attrname(opt, optdict)
+            _list = getattr(self.config, opt, None)
+            if _list is None:
+                if isinstance(value, (list, tuple)):
+                    _list = value
+                elif value is not None:
+                    _list = []
+                    _list.append(value)
+                setattr(self.config, opt, _list)
+            elif isinstance(_list, tuple):
+                setattr(self.config, opt, _list + (value,))
+            else:
+                _list.append(value)
+        elif action == 'callback':
+            optdict['callback'](None, opt, value, None)
+        else:
+            raise UnsupportedAction(action)
+
+    def input_option(self, option, optdict, inputlevel=99):
+        default = self.option_default(option, optdict)
+        if default is REQUIRED:
+            defaultstr = '(required): '
+        elif optdict.get('level', 0) > inputlevel:
+            return
+        elif optdict['type'] == 'password' or default is None:
+            defaultstr = ': '
+        else:
+            defaultstr = '(default: %s): ' % format_option_value(optdict, default)
+        print(':%s:' % option)
+        print(optdict.get('help') or option)
+        inputfunc = INPUT_FUNCTIONS[optdict['type']]
+        value = inputfunc(optdict, defaultstr)
+        while default is REQUIRED and not value:
+            print('please specify a value')
+            value = inputfunc(optdict, '%s: ' % option)
+        if value is None and default is not None:
+            value = default
+        self.set_option(option, value, optdict=optdict)
+
+    def get_option_def(self, opt):
+        """return the dictionary defining an option given it's name"""
+        assert self.options
+        for option in self.options:
+            if option[0] == opt:
+                return option[1]
+        raise OptionError('no such option %s in section %r'
+                          % (opt, self.name), opt)
+
+
+    def all_options(self):
+        """return an iterator on available options for this provider
+        option are actually described by a 3-uple:
+        (section, option name, option dictionary)
+        """
+        for section, options in self.options_by_section():
+            if section is None:
+                if self.name is None:
+                    continue
+                section = self.name.upper()
+            for option, optiondict, value in options:
+                yield section, option, optiondict
+
+    def options_by_section(self):
+        """return an iterator on options grouped by section
+
+        (section, [list of (optname, optdict, optvalue)])
+        """
+        sections = {}
+        for optname, optdict in self.options:
+            sections.setdefault(optdict.get('group'), []).append(
+                (optname, optdict, self.option_value(optname)))
+        if None in sections:
+            yield None, sections.pop(None)
+        for section, options in sections.items():
+            yield section.upper(), options
+
+    def options_and_values(self, options=None):
+        if options is None:
+            options = self.options
+        for optname, optdict in options:
+            yield (optname, optdict, self.option_value(optname))
+
+# configuration ################################################################
+
+class ConfigurationMixIn(OptionsManagerMixIn, OptionsProviderMixIn):
+    """basic mixin for simple configurations which don't need the
+    manager / providers model
+    """
+    def __init__(self, *args, **kwargs):
+        if not args:
+            kwargs.setdefault('usage', '')
+        kwargs.setdefault('quiet', 1)
+        OptionsManagerMixIn.__init__(self, *args, **kwargs)
+        OptionsProviderMixIn.__init__(self)
+        if not getattr(self, 'option_groups', None):
+            self.option_groups = []
+            for option, optdict in self.options:
+                try:
+                    gdef = (optdict['group'].upper(), '')
+                except KeyError:
+                    continue
+                if not gdef in self.option_groups:
+                    self.option_groups.append(gdef)
+        self.register_options_provider(self, own_group=False)
+
+    def register_options(self, options):
+        """add some options to the configuration"""
+        options_by_group = {}
+        for optname, optdict in options:
+            options_by_group.setdefault(optdict.get('group', self.name.upper()), []).append((optname, optdict))
+        for group, options in options_by_group.items():
+            self.add_option_group(group, None, options, self)
+        self.options += tuple(options)
+
+    def load_defaults(self):
+        OptionsProviderMixIn.load_defaults(self)
+
+    def __iter__(self):
+        return iter(self.config.__dict__.iteritems())
+
+    def __getitem__(self, key):
+        try:
+            return getattr(self.config, self.option_attrname(key))
+        except (optik_ext.OptionValueError, AttributeError):
+            raise KeyError(key)
+
+    def __setitem__(self, key, value):
+        self.set_option(key, value)
+
+    def get(self, key, default=None):
+        try:
+            return getattr(self.config, self.option_attrname(key))
+        except (OptionError, AttributeError):
+            return default
+
+
+class Configuration(ConfigurationMixIn):
+    """class for simple configurations which don't need the
+    manager / providers model and prefer delegation to inheritance
+
+    configuration values are accessible through a dict like interface
+    """
+
+    def __init__(self, config_file=None, options=None, name=None,
+                 usage=None, doc=None, version=None):
+        if options is not None:
+            self.options = options
+        if name is not None:
+            self.name = name
+        if doc is not None:
+            self.__doc__ = doc
+        super(Configuration, self).__init__(config_file=config_file, usage=usage, version=version)
+
+
+class OptionsManager2ConfigurationAdapter(object):
+    """Adapt an option manager to behave like a
+    `logilab.common.configuration.Configuration` instance
+    """
+    def __init__(self, provider):
+        self.config = provider
+
+    def __getattr__(self, key):
+        return getattr(self.config, key)
+
+    def __getitem__(self, key):
+        provider = self.config._all_options[key]
+        try:
+            return getattr(provider.config, provider.option_attrname(key))
+        except AttributeError:
+            raise KeyError(key)
+
+    def __setitem__(self, key, value):
+        self.config.global_set_option(self.config.option_attrname(key), value)
+
+    def get(self, key, default=None):
+        provider = self.config._all_options[key]
+        try:
+            return getattr(provider.config, provider.option_attrname(key))
+        except AttributeError:
+            return default
+
+# other functions ##############################################################
+
+def read_old_config(newconfig, changes, configfile):
+    """initialize newconfig from a deprecated configuration file
+
+    possible changes:
+    * ('renamed', oldname, newname)
+    * ('moved', option, oldgroup, newgroup)
+    * ('typechanged', option, oldtype, newvalue)
+    """
+    # build an index of changes
+    changesindex = {}
+    for action in changes:
+        if action[0] == 'moved':
+            option, oldgroup, newgroup = action[1:]
+            changesindex.setdefault(option, []).append((action[0], oldgroup, newgroup))
+            continue
+        if action[0] == 'renamed':
+            oldname, newname = action[1:]
+            changesindex.setdefault(newname, []).append((action[0], oldname))
+            continue
+        if action[0] == 'typechanged':
+            option, oldtype, newvalue = action[1:]
+            changesindex.setdefault(option, []).append((action[0], oldtype, newvalue))
+            continue
+        if action[1] in ('added', 'removed'):
+            continue # nothing to do here
+        raise Exception('unknown change %s' % action[0])
+    # build a config object able to read the old config
+    options = []
+    for optname, optdef in newconfig.options:
+        for action in changesindex.pop(optname, ()):
+            if action[0] == 'moved':
+                oldgroup, newgroup = action[1:]
+                optdef = optdef.copy()
+                optdef['group'] = oldgroup
+            elif action[0] == 'renamed':
+                optname = action[1]
+            elif action[0] == 'typechanged':
+                oldtype = action[1]
+                optdef = optdef.copy()
+                optdef['type'] = oldtype
+        options.append((optname, optdef))
+    if changesindex:
+        raise Exception('unapplied changes: %s' % changesindex)
+    oldconfig = Configuration(options=options, name=newconfig.name)
+    # read the old config
+    oldconfig.load_file_configuration(configfile)
+    # apply values reverting changes
+    changes.reverse()
+    done = set()
+    for action in changes:
+        if action[0] == 'renamed':
+            oldname, newname = action[1:]
+            newconfig[newname] = oldconfig[oldname]
+            done.add(newname)
+        elif action[0] == 'typechanged':
+            optname, oldtype, newvalue = action[1:]
+            newconfig[optname] = newvalue
+            done.add(optname)
+    for optname, optdef in newconfig.options:
+        if optdef.get('type') and not optname in done:
+            newconfig.set_option(optname, oldconfig[optname], optdict=optdef)
+
+
+def merge_options(options, optgroup=None):
+    """preprocess a list of options and remove duplicates, returning a new list
+    (tuple actually) of options.
+
+    Options dictionaries are copied to avoid later side-effect. Also, if
+    `otpgroup` argument is specified, ensure all options are in the given group.
+    """
+    alloptions = {}
+    options = list(options)
+    for i in range(len(options)-1, -1, -1):
+        optname, optdict = options[i]
+        if optname in alloptions:
+            options.pop(i)
+            alloptions[optname].update(optdict)
+        else:
+            optdict = optdict.copy()
+            options[i] = (optname, optdict)
+            alloptions[optname] = optdict
+        if optgroup is not None:
+            alloptions[optname]['group'] = optgroup
+    return tuple(options)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/daemon.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/daemon.py
new file mode 100644
index 0000000..40319a4
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/daemon.py
@@ -0,0 +1,101 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""A daemonize function (for Unices)"""
+
+__docformat__ = "restructuredtext en"
+
+import os
+import errno
+import signal
+import sys
+import time
+import warnings
+
+from six.moves import range
+
+def setugid(user):
+    """Change process user and group ID
+
+    Argument is a numeric user id or a user name"""
+    try:
+        from pwd import getpwuid
+        passwd = getpwuid(int(user))
+    except ValueError:
+        from pwd import getpwnam
+        passwd = getpwnam(user)
+
+    if hasattr(os, 'initgroups'): # python >= 2.7
+        os.initgroups(passwd.pw_name, passwd.pw_gid)
+    else:
+        import ctypes
+        if ctypes.CDLL(None).initgroups(passwd.pw_name, passwd.pw_gid) < 0:
+            err = ctypes.c_int.in_dll(ctypes.pythonapi,"errno").value
+            raise OSError(err, os.strerror(err), 'initgroups')
+    os.setgid(passwd.pw_gid)
+    os.setuid(passwd.pw_uid)
+    os.environ['HOME'] = passwd.pw_dir
+
+
+def daemonize(pidfile=None, uid=None, umask=0o77):
+    """daemonize a Unix process. Set paranoid umask by default.
+
+    Return 1 in the original process, 2 in the first fork, and None for the
+    second fork (eg daemon process).
+    """
+    # http://www.faqs.org/faqs/unix-faq/programmer/faq/
+    #
+    # fork so the parent can exit
+    if os.fork():   # launch child and...
+        return 1
+    # disconnect from tty and create a new session
+    os.setsid()
+    # fork again so the parent, (the session group leader), can exit.
+    # as a non-session group leader, we can never regain a controlling
+    # terminal.
+    if os.fork():   # launch child again.
+        return 2
+    # move to the root to avoit mount pb
+    os.chdir('/')
+    # redirect standard descriptors
+    null = os.open('/dev/null', os.O_RDWR)
+    for i in range(3):
+        try:
+            os.dup2(null, i)
+        except OSError as e:
+            if e.errno != errno.EBADF:
+                raise
+    os.close(null)
+    # filter warnings
+    warnings.filterwarnings('ignore')
+    # write pid in a file
+    if pidfile:
+        # ensure the directory where the pid-file should be set exists (for
+        # instance /var/run/cubicweb may be deleted on computer restart)
+        piddir = os.path.dirname(pidfile)
+        if not os.path.exists(piddir):
+            os.makedirs(piddir)
+        f = file(pidfile, 'w')
+        f.write(str(os.getpid()))
+        f.close()
+    # set umask if specified
+    if umask is not None:
+        os.umask(umask)
+    # change process uid
+    if uid:
+        setugid(uid)
+    return None
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/date.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/date.py
new file mode 100644
index 0000000..a093a8a
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/date.py
@@ -0,0 +1,335 @@
+# copyright 2003-2012 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Date manipulation helper functions."""
+from __future__ import division
+
+__docformat__ = "restructuredtext en"
+
+import math
+import re
+import sys
+from locale import getlocale, LC_TIME
+from datetime import date, time, datetime, timedelta
+from time import strptime as time_strptime
+from calendar import monthrange, timegm
+
+from six.moves import range
+
+try:
+    from mx.DateTime import RelativeDateTime, Date, DateTimeType
+except ImportError:
+    endOfMonth = None
+    DateTimeType = datetime
+else:
+    endOfMonth = RelativeDateTime(months=1, day=-1)
+
+# NOTE: should we implement a compatibility layer between date representations
+#       as we have in lgc.db ?
+
+FRENCH_FIXED_HOLIDAYS = {
+    'jour_an': '%s-01-01',
+    'fete_travail': '%s-05-01',
+    'armistice1945': '%s-05-08',
+    'fete_nat': '%s-07-14',
+    'assomption': '%s-08-15',
+    'toussaint': '%s-11-01',
+    'armistice1918': '%s-11-11',
+    'noel': '%s-12-25',
+    }
+
+FRENCH_MOBILE_HOLIDAYS = {
+    'paques2004': '2004-04-12',
+    'ascension2004': '2004-05-20',
+    'pentecote2004': '2004-05-31',
+
+    'paques2005': '2005-03-28',
+    'ascension2005': '2005-05-05',
+    'pentecote2005': '2005-05-16',
+
+    'paques2006': '2006-04-17',
+    'ascension2006': '2006-05-25',
+    'pentecote2006': '2006-06-05',
+
+    'paques2007': '2007-04-09',
+    'ascension2007': '2007-05-17',
+    'pentecote2007': '2007-05-28',
+
+    'paques2008': '2008-03-24',
+    'ascension2008': '2008-05-01',
+    'pentecote2008': '2008-05-12',
+
+    'paques2009': '2009-04-13',
+    'ascension2009': '2009-05-21',
+    'pentecote2009': '2009-06-01',
+
+    'paques2010': '2010-04-05',
+    'ascension2010': '2010-05-13',
+    'pentecote2010': '2010-05-24',
+
+    'paques2011': '2011-04-25',
+    'ascension2011': '2011-06-02',
+    'pentecote2011': '2011-06-13',
+
+    'paques2012': '2012-04-09',
+    'ascension2012': '2012-05-17',
+    'pentecote2012': '2012-05-28',
+    }
+
+# XXX this implementation cries for multimethod dispatching
+
+def get_step(dateobj, nbdays=1):
+    # assume date is either a python datetime or a mx.DateTime object
+    if isinstance(dateobj, date):
+        return ONEDAY * nbdays
+    return nbdays # mx.DateTime is ok with integers
+
+def datefactory(year, month, day, sampledate):
+    # assume date is either a python datetime or a mx.DateTime object
+    if isinstance(sampledate, datetime):
+        return datetime(year, month, day)
+    if isinstance(sampledate, date):
+        return date(year, month, day)
+    return Date(year, month, day)
+
+def weekday(dateobj):
+    # assume date is either a python datetime or a mx.DateTime object
+    if isinstance(dateobj, date):
+        return dateobj.weekday()
+    return dateobj.day_of_week
+
+def str2date(datestr, sampledate):
+    # NOTE: datetime.strptime is not an option until we drop py2.4 compat
+    year, month, day = [int(chunk) for chunk in datestr.split('-')]
+    return datefactory(year, month, day, sampledate)
+
+def days_between(start, end):
+    if isinstance(start, date):
+        delta = end - start
+        # datetime.timedelta.days is always an integer (floored)
+        if delta.seconds:
+            return delta.days + 1
+        return delta.days
+    else:
+        return int(math.ceil((end - start).days))
+
+def get_national_holidays(begin, end):
+    """return french national days off between begin and end"""
+    begin = datefactory(begin.year, begin.month, begin.day, begin)
+    end = datefactory(end.year, end.month, end.day, end)
+    holidays = [str2date(datestr, begin)
+                for datestr in FRENCH_MOBILE_HOLIDAYS.values()]
+    for year in range(begin.year, end.year+1):
+        for datestr in FRENCH_FIXED_HOLIDAYS.values():
+            date = str2date(datestr % year, begin)
+            if date not in holidays:
+                holidays.append(date)
+    return [day for day in holidays if begin <= day < end]
+
+def add_days_worked(start, days):
+    """adds date but try to only take days worked into account"""
+    step = get_step(start)
+    weeks, plus = divmod(days, 5)
+    end = start + ((weeks * 7) + plus) * step
+    if weekday(end) >= 5: # saturday or sunday
+        end += (2 * step)
+    end += len([x for x in get_national_holidays(start, end + step)
+                if weekday(x) < 5]) * step
+    if weekday(end) >= 5: # saturday or sunday
+        end += (2 * step)
+    return end
+
+def nb_open_days(start, end):
+    assert start <= end
+    step = get_step(start)
+    days = days_between(start, end)
+    weeks, plus = divmod(days, 7)
+    if weekday(start) > weekday(end):
+        plus -= 2
+    elif weekday(end) == 6:
+        plus -= 1
+    open_days = weeks * 5 + plus
+    nb_week_holidays = len([x for x in get_national_holidays(start, end+step)
+                            if weekday(x) < 5 and x < end])
+    open_days -= nb_week_holidays
+    if open_days < 0:
+        return 0
+    return open_days
+
+def date_range(begin, end, incday=None, incmonth=None):
+    """yields each date between begin and end
+
+    :param begin: the start date
+    :param end: the end date
+    :param incr: the step to use to iterate over dates. Default is
+                 one day.
+    :param include: None (means no exclusion) or a function taking a
+                    date as parameter, and returning True if the date
+                    should be included.
+
+    When using mx datetime, you should *NOT* use incmonth argument, use instead
+    oneDay, oneHour, oneMinute, oneSecond, oneWeek or endOfMonth (to enumerate
+    months) as `incday` argument
+    """
+    assert not (incday and incmonth)
+    begin = todate(begin)
+    end = todate(end)
+    if incmonth:
+        while begin < end:
+            yield begin
+            begin = next_month(begin, incmonth)
+    else:
+        incr = get_step(begin, incday or 1)
+        while begin < end:
+           yield begin
+           begin += incr
+
+# makes py datetime usable #####################################################
+
+ONEDAY = timedelta(days=1)
+ONEWEEK = timedelta(days=7)
+
+try:
+    strptime = datetime.strptime
+except AttributeError: # py < 2.5
+    from time import strptime as time_strptime
+    def strptime(value, format):
+        return datetime(*time_strptime(value, format)[:6])
+
+def strptime_time(value, format='%H:%M'):
+    return time(*time_strptime(value, format)[3:6])
+
+def todate(somedate):
+    """return a date from a date (leaving unchanged) or a datetime"""
+    if isinstance(somedate, datetime):
+        return date(somedate.year, somedate.month, somedate.day)
+    assert isinstance(somedate, (date, DateTimeType)), repr(somedate)
+    return somedate
+
+def totime(somedate):
+    """return a time from a time (leaving unchanged), date or datetime"""
+    # XXX mx compat
+    if not isinstance(somedate, time):
+        return time(somedate.hour, somedate.minute, somedate.second)
+    assert isinstance(somedate, (time)), repr(somedate)
+    return somedate
+
+def todatetime(somedate):
+    """return a date from a date (leaving unchanged) or a datetime"""
+    # take care, datetime is a subclass of date
+    if isinstance(somedate, datetime):
+        return somedate
+    assert isinstance(somedate, (date, DateTimeType)), repr(somedate)
+    return datetime(somedate.year, somedate.month, somedate.day)
+
+def datetime2ticks(somedate):
+    return timegm(somedate.timetuple()) * 1000
+
+def ticks2datetime(ticks):
+    miliseconds, microseconds = divmod(ticks, 1000)
+    try:
+        return datetime.fromtimestamp(miliseconds)
+    except (ValueError, OverflowError):
+        epoch = datetime.fromtimestamp(0)
+        nb_days, seconds = divmod(int(miliseconds), 86400)
+        delta = timedelta(nb_days, seconds=seconds, microseconds=microseconds)
+        try:
+            return epoch + delta
+        except (ValueError, OverflowError):
+            raise
+
+def days_in_month(somedate):
+    return monthrange(somedate.year, somedate.month)[1]
+
+def days_in_year(somedate):
+    feb = date(somedate.year, 2, 1)
+    if days_in_month(feb) == 29:
+        return 366
+    else:
+        return 365
+
+def previous_month(somedate, nbmonth=1):
+    while nbmonth:
+        somedate = first_day(somedate) - ONEDAY
+        nbmonth -= 1
+    return somedate
+
+def next_month(somedate, nbmonth=1):
+    while nbmonth:
+        somedate = last_day(somedate) + ONEDAY
+        nbmonth -= 1
+    return somedate
+
+def first_day(somedate):
+    return date(somedate.year, somedate.month, 1)
+
+def last_day(somedate):
+    return date(somedate.year, somedate.month, days_in_month(somedate))
+
+def ustrftime(somedate, fmt='%Y-%m-%d'):
+    """like strftime, but returns a unicode string instead of an encoded
+    string which may be problematic with localized date.
+    """
+    if sys.version_info >= (3, 3):
+        # datetime.date.strftime() supports dates since year 1 in Python >=3.3.
+        return somedate.strftime(fmt)
+    else:
+        try:
+            if sys.version_info < (3, 0):
+                encoding = getlocale(LC_TIME)[1] or 'ascii'
+                return unicode(somedate.strftime(str(fmt)), encoding)
+            else:
+                return somedate.strftime(fmt)
+        except ValueError:
+            if somedate.year >= 1900:
+                raise
+            # datetime is not happy with dates before 1900
+            # we try to work around this, assuming a simple
+            # format string
+            fields = {'Y': somedate.year,
+                      'm': somedate.month,
+                      'd': somedate.day,
+                      }
+            if isinstance(somedate, datetime):
+                fields.update({'H': somedate.hour,
+                               'M': somedate.minute,
+                               'S': somedate.second})
+            fmt = re.sub('%([YmdHMS])', r'%(\1)02d', fmt)
+            return unicode(fmt) % fields
+
+def utcdatetime(dt):
+    if dt.tzinfo is None:
+        return dt
+    return (dt.replace(tzinfo=None) - dt.utcoffset())
+
+def utctime(dt):
+    if dt.tzinfo is None:
+        return dt
+    return (dt + dt.utcoffset() + dt.dst()).replace(tzinfo=None)
+
+def datetime_to_seconds(date):
+    """return the number of seconds since the begining of the day for that date
+    """
+    return date.second+60*date.minute + 3600*date.hour
+
+def timedelta_to_days(delta):
+    """return the time delta as a number of seconds"""
+    return delta.days + delta.seconds / (3600*24)
+
+def timedelta_to_seconds(delta):
+    """return the time delta as a fraction of days"""
+    return delta.days*(3600*24) + delta.seconds
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/debugger.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/debugger.py
new file mode 100644
index 0000000..1f540a1
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/debugger.py
@@ -0,0 +1,214 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Customized version of pdb's default debugger.
+
+- sets up a history file
+- uses ipython if available to colorize lines of code
+- overrides list command to search for current block instead
+  of using 5 lines of context
+
+
+
+
+"""
+
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+
+try:
+    import readline
+except ImportError:
+    readline = None
+import os
+import os.path as osp
+import sys
+from pdb import Pdb
+import inspect
+
+from logilab.common.compat import StringIO
+
+try:
+    from IPython import PyColorize
+except ImportError:
+    def colorize(source, *args):
+        """fallback colorize function"""
+        return source
+    def colorize_source(source, *args):
+        return source
+else:
+    def colorize(source, start_lineno, curlineno):
+        """colorize and annotate source with linenos
+        (as in pdb's list command)
+        """
+        parser = PyColorize.Parser()
+        output = StringIO()
+        parser.format(source, output)
+        annotated = []
+        for index, line in enumerate(output.getvalue().splitlines()):
+            lineno = index + start_lineno
+            if lineno == curlineno:
+                annotated.append('%4s\t->\t%s' % (lineno, line))
+            else:
+                annotated.append('%4s\t\t%s' % (lineno, line))
+        return '\n'.join(annotated)
+
+    def colorize_source(source):
+        """colorize given source"""
+        parser = PyColorize.Parser()
+        output = StringIO()
+        parser.format(source, output)
+        return output.getvalue()
+
+
+def getsource(obj):
+    """Return the text of the source code for an object.
+
+    The argument may be a module, class, method, function, traceback, frame,
+    or code object.  The source code is returned as a single string.  An
+    IOError is raised if the source code cannot be retrieved."""
+    lines, lnum = inspect.getsourcelines(obj)
+    return ''.join(lines), lnum
+
+
+################################################################
+class Debugger(Pdb):
+    """custom debugger
+
+    - sets up a history file
+    - uses ipython if available to colorize lines of code
+    - overrides list command to search for current block instead
+      of using 5 lines of context
+    """
+    def __init__(self, tcbk=None):
+        Pdb.__init__(self)
+        self.reset()
+        if tcbk:
+            while tcbk.tb_next is not None:
+                tcbk = tcbk.tb_next
+        self._tcbk = tcbk
+        self._histfile = os.path.expanduser("~/.pdbhist")
+
+    def setup_history_file(self):
+        """if readline is available, read pdb history file
+        """
+        if readline is not None:
+            try:
+                # XXX try..except shouldn't be necessary
+                # read_history_file() can accept None
+                readline.read_history_file(self._histfile)
+            except IOError:
+                pass
+
+    def start(self):
+        """starts the interactive mode"""
+        self.interaction(self._tcbk.tb_frame, self._tcbk)
+
+    def setup(self, frame, tcbk):
+        """setup hook: set up history file"""
+        self.setup_history_file()
+        Pdb.setup(self, frame, tcbk)
+
+    def set_quit(self):
+        """quit hook: save commands in the history file"""
+        if readline is not None:
+            readline.write_history_file(self._histfile)
+        Pdb.set_quit(self)
+
+    def complete_p(self, text, line, begin_idx, end_idx):
+        """provide variable names completion for the ``p`` command"""
+        namespace = dict(self.curframe.f_globals)
+        namespace.update(self.curframe.f_locals)
+        if '.' in text:
+            return self.attr_matches(text, namespace)
+        return [varname for varname in namespace if varname.startswith(text)]
+
+
+    def attr_matches(self, text, namespace):
+        """implementation coming from rlcompleter.Completer.attr_matches
+        Compute matches when text contains a dot.
+
+        Assuming the text is of the form NAME.NAME....[NAME], and is
+        evaluatable in self.namespace, it will be evaluated and its attributes
+        (as revealed by dir()) are used as possible completions.  (For class
+        instances, class members are also considered.)
+
+        WARNING: this can still invoke arbitrary C code, if an object
+        with a __getattr__ hook is evaluated.
+
+        """
+        import re
+        m = re.match(r"(\w+(\.\w+)*)\.(\w*)", text)
+        if not m:
+            return
+        expr, attr = m.group(1, 3)
+        object = eval(expr, namespace)
+        words = dir(object)
+        if hasattr(object, '__class__'):
+            words.append('__class__')
+            words = words + self.get_class_members(object.__class__)
+        matches = []
+        n = len(attr)
+        for word in words:
+            if word[:n] == attr and word != "__builtins__":
+                matches.append("%s.%s" % (expr, word))
+        return matches
+
+    def get_class_members(self, klass):
+        """implementation coming from rlcompleter.get_class_members"""
+        ret = dir(klass)
+        if hasattr(klass, '__bases__'):
+            for base in klass.__bases__:
+                ret = ret + self.get_class_members(base)
+        return ret
+
+    ## specific / overridden commands
+    def do_list(self, arg):
+        """overrides default list command to display the surrounding block
+        instead of 5 lines of context
+        """
+        self.lastcmd = 'list'
+        if not arg:
+            try:
+                source, start_lineno = getsource(self.curframe)
+                print(colorize(''.join(source), start_lineno,
+                               self.curframe.f_lineno))
+            except KeyboardInterrupt:
+                pass
+            except IOError:
+                Pdb.do_list(self, arg)
+        else:
+            Pdb.do_list(self, arg)
+    do_l = do_list
+
+    def do_open(self, arg):
+        """opens source file corresponding to the current stack level"""
+        filename = self.curframe.f_code.co_filename
+        lineno = self.curframe.f_lineno
+        cmd = 'emacsclient --no-wait +%s %s' % (lineno, filename)
+        os.system(cmd)
+
+    do_o = do_open
+
+def pm():
+    """use our custom debugger"""
+    dbg = Debugger(sys.last_traceback)
+    dbg.start()
+
+def set_trace():
+    Debugger().set_trace(sys._getframe().f_back)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/decorators.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/decorators.py
new file mode 100644
index 0000000..beafa20
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/decorators.py
@@ -0,0 +1,281 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+""" A few useful function/method decorators. """
+
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+
+import sys
+import types
+from time import clock, time
+from inspect import isgeneratorfunction, getargspec
+
+from logilab.common.compat import method_type
+
+# XXX rewrite so we can use the decorator syntax when keyarg has to be specified
+
+class cached_decorator(object):
+    def __init__(self, cacheattr=None, keyarg=None):
+        self.cacheattr = cacheattr
+        self.keyarg = keyarg
+    def __call__(self, callableobj=None):
+        assert not isgeneratorfunction(callableobj), \
+               'cannot cache generator function: %s' % callableobj
+        if len(getargspec(callableobj).args) == 1 or self.keyarg == 0:
+            cache = _SingleValueCache(callableobj, self.cacheattr)
+        elif self.keyarg:
+            cache = _MultiValuesKeyArgCache(callableobj, self.keyarg, self.cacheattr)
+        else:
+            cache = _MultiValuesCache(callableobj, self.cacheattr)
+        return cache.closure()
+
+class _SingleValueCache(object):
+    def __init__(self, callableobj, cacheattr=None):
+        self.callable = callableobj
+        if cacheattr is None:
+            self.cacheattr = '_%s_cache_' % callableobj.__name__
+        else:
+            assert cacheattr != callableobj.__name__
+            self.cacheattr = cacheattr
+
+    def __call__(__me, self, *args):
+        try:
+            return self.__dict__[__me.cacheattr]
+        except KeyError:
+            value = __me.callable(self, *args)
+            setattr(self, __me.cacheattr, value)
+            return value
+
+    def closure(self):
+        def wrapped(*args, **kwargs):
+            return self.__call__(*args, **kwargs)
+        wrapped.cache_obj = self
+        try:
+            wrapped.__doc__ = self.callable.__doc__
+            wrapped.__name__ = self.callable.__name__
+        except:
+            pass
+        return wrapped
+
+    def clear(self, holder):
+        holder.__dict__.pop(self.cacheattr, None)
+
+
+class _MultiValuesCache(_SingleValueCache):
+    def _get_cache(self, holder):
+        try:
+            _cache = holder.__dict__[self.cacheattr]
+        except KeyError:
+            _cache = {}
+            setattr(holder, self.cacheattr, _cache)
+        return _cache
+
+    def __call__(__me, self, *args, **kwargs):
+        _cache = __me._get_cache(self)
+        try:
+            return _cache[args]
+        except KeyError:
+            _cache[args] = __me.callable(self, *args)
+            return _cache[args]
+
+class _MultiValuesKeyArgCache(_MultiValuesCache):
+    def __init__(self, callableobj, keyarg, cacheattr=None):
+        super(_MultiValuesKeyArgCache, self).__init__(callableobj, cacheattr)
+        self.keyarg = keyarg
+
+    def __call__(__me, self, *args, **kwargs):
+        _cache = __me._get_cache(self)
+        key = args[__me.keyarg-1]
+        try:
+            return _cache[key]
+        except KeyError:
+            _cache[key] = __me.callable(self, *args, **kwargs)
+            return _cache[key]
+
+
+def cached(callableobj=None, keyarg=None, **kwargs):
+    """Simple decorator to cache result of method call."""
+    kwargs['keyarg'] = keyarg
+    decorator = cached_decorator(**kwargs)
+    if callableobj is None:
+        return decorator
+    else:
+        return decorator(callableobj)
+
+
+class cachedproperty(object):
+    """ Provides a cached property equivalent to the stacking of
+    @cached and @property, but more efficient.
+
+    After first usage, the <property_name> becomes part of the object's
+    __dict__. Doing:
+
+      del obj.<property_name> empties the cache.
+
+    Idea taken from the pyramid_ framework and the mercurial_ project.
+
+    .. _pyramid: http://pypi.python.org/pypi/pyramid
+    .. _mercurial: http://pypi.python.org/pypi/Mercurial
+    """
+    __slots__ = ('wrapped',)
+
+    def __init__(self, wrapped):
+        try:
+            wrapped.__name__
+        except AttributeError:
+            raise TypeError('%s must have a __name__ attribute' %
+                            wrapped)
+        self.wrapped = wrapped
+
+    @property
+    def __doc__(self):
+        doc = getattr(self.wrapped, '__doc__', None)
+        return ('<wrapped by the cachedproperty decorator>%s'
+                % ('\n%s' % doc if doc else ''))
+
+    def __get__(self, inst, objtype=None):
+        if inst is None:
+            return self
+        val = self.wrapped(inst)
+        setattr(inst, self.wrapped.__name__, val)
+        return val
+
+
+def get_cache_impl(obj, funcname):
+    cls = obj.__class__
+    member = getattr(cls, funcname)
+    if isinstance(member, property):
+        member = member.fget
+    return member.cache_obj
+
+def clear_cache(obj, funcname):
+    """Clear a cache handled by the :func:`cached` decorator. If 'x' class has
+    @cached on its method `foo`, type
+
+    >>> clear_cache(x, 'foo')
+
+    to purge this method's cache on the instance.
+    """
+    get_cache_impl(obj, funcname).clear(obj)
+
+def copy_cache(obj, funcname, cacheobj):
+    """Copy cache for <funcname> from cacheobj to obj."""
+    cacheattr = get_cache_impl(obj, funcname).cacheattr
+    try:
+        setattr(obj, cacheattr, cacheobj.__dict__[cacheattr])
+    except KeyError:
+        pass
+
+
+class wproperty(object):
+    """Simple descriptor expecting to take a modifier function as first argument
+    and looking for a _<function name> to retrieve the attribute.
+    """
+    def __init__(self, setfunc):
+        self.setfunc = setfunc
+        self.attrname = '_%s' % setfunc.__name__
+
+    def __set__(self, obj, value):
+        self.setfunc(obj, value)
+
+    def __get__(self, obj, cls):
+        assert obj is not None
+        return getattr(obj, self.attrname)
+
+
+class classproperty(object):
+    """this is a simple property-like class but for class attributes.
+    """
+    def __init__(self, get):
+        self.get = get
+    def __get__(self, inst, cls):
+        return self.get(cls)
+
+
+class iclassmethod(object):
+    '''Descriptor for method which should be available as class method if called
+    on the class or instance method if called on an instance.
+    '''
+    def __init__(self, func):
+        self.func = func
+    def __get__(self, instance, objtype):
+        if instance is None:
+            return method_type(self.func, objtype, objtype.__class__)
+        return method_type(self.func, instance, objtype)
+    def __set__(self, instance, value):
+        raise AttributeError("can't set attribute")
+
+
+def timed(f):
+    def wrap(*args, **kwargs):
+        t = time()
+        c = clock()
+        res = f(*args, **kwargs)
+        print('%s clock: %.9f / time: %.9f' % (f.__name__,
+                                               clock() - c, time() - t))
+        return res
+    return wrap
+
+
+def locked(acquire, release):
+    """Decorator taking two methods to acquire/release a lock as argument,
+    returning a decorator function which will call the inner method after
+    having called acquire(self) et will call release(self) afterwards.
+    """
+    def decorator(f):
+        def wrapper(self, *args, **kwargs):
+            acquire(self)
+            try:
+                return f(self, *args, **kwargs)
+            finally:
+                release(self)
+        return wrapper
+    return decorator
+
+
+def monkeypatch(klass, methodname=None):
+    """Decorator extending class with the decorated callable. This is basically
+    a syntactic sugar vs class assignment.
+
+    >>> class A:
+    ...     pass
+    >>> @monkeypatch(A)
+    ... def meth(self):
+    ...     return 12
+    ...
+    >>> a = A()
+    >>> a.meth()
+    12
+    >>> @monkeypatch(A, 'foo')
+    ... def meth(self):
+    ...     return 12
+    ...
+    >>> a.foo()
+    12
+    """
+    def decorator(func):
+        try:
+            name = methodname or func.__name__
+        except AttributeError:
+            raise AttributeError('%s has no __name__ attribute: '
+                                 'you should provide an explicit `methodname`'
+                                 % func)
+        setattr(klass, name, func)
+        return func
+    return decorator
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/deprecation.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/deprecation.py
new file mode 100644
index 0000000..1c81b63
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/deprecation.py
@@ -0,0 +1,189 @@
+# copyright 2003-2012 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Deprecation utilities."""
+
+__docformat__ = "restructuredtext en"
+
+import sys
+from warnings import warn
+
+from logilab.common.changelog import Version
+
+
+class DeprecationWrapper(object):
+    """proxy to print a warning on access to any attribute of the wrapped object
+    """
+    def __init__(self, proxied, msg=None):
+        self._proxied = proxied
+        self._msg = msg
+
+    def __getattr__(self, attr):
+        warn(self._msg, DeprecationWarning, stacklevel=2)
+        return getattr(self._proxied, attr)
+
+    def __setattr__(self, attr, value):
+        if attr in ('_proxied', '_msg'):
+            self.__dict__[attr] = value
+        else:
+            warn(self._msg, DeprecationWarning, stacklevel=2)
+            setattr(self._proxied, attr, value)
+
+
+class DeprecationManager(object):
+    """Manage the deprecation message handling. Messages are dropped for
+    versions more recent than the 'compatible' version. Example::
+
+        deprecator = deprecation.DeprecationManager("module_name")
+        deprecator.compatibility('1.3')
+
+        deprecator.warn('1.2', "message.")
+
+        @deprecator.deprecated('1.2', 'Message')
+        def any_func():
+            pass
+
+        class AnyClass(object):
+            __metaclass__ = deprecator.class_deprecated('1.2')
+    """
+    def __init__(self, module_name=None):
+        """
+        """
+        self.module_name = module_name
+        self.compatible_version = None
+
+    def compatibility(self, compatible_version):
+        """Set the compatible version.
+        """
+        self.compatible_version = Version(compatible_version)
+
+    def deprecated(self, version=None, reason=None, stacklevel=2, name=None, doc=None):
+        """Display a deprecation message only if the version is older than the
+        compatible version.
+        """
+        def decorator(func):
+            message = reason or 'The function "%s" is deprecated'
+            if '%s' in message:
+                message %= func.__name__
+            def wrapped(*args, **kwargs):
+                self.warn(version, message, stacklevel+1)
+                return func(*args, **kwargs)
+            return wrapped
+        return decorator
+
+    def class_deprecated(self, version=None):
+        class metaclass(type):
+            """metaclass to print a warning on instantiation of a deprecated class"""
+
+            def __call__(cls, *args, **kwargs):
+                msg = getattr(cls, "__deprecation_warning__",
+                              "%(cls)s is deprecated") % {'cls': cls.__name__}
+                self.warn(version, msg, stacklevel=3)
+                return type.__call__(cls, *args, **kwargs)
+        return metaclass
+
+    def moved(self, version, modpath, objname):
+        """use to tell that a callable has been moved to a new module.
+
+        It returns a callable wrapper, so that when its called a warning is printed
+        telling where the object can be found, import is done (and not before) and
+        the actual object is called.
+
+        NOTE: the usage is somewhat limited on classes since it will fail if the
+        wrapper is use in a class ancestors list, use the `class_moved` function
+        instead (which has no lazy import feature though).
+        """
+        def callnew(*args, **kwargs):
+            from logilab.common.modutils import load_module_from_name
+            message = "object %s has been moved to module %s" % (objname, modpath)
+            self.warn(version, message)
+            m = load_module_from_name(modpath)
+            return getattr(m, objname)(*args, **kwargs)
+        return callnew
+
+    def class_renamed(self, version, old_name, new_class, message=None):
+        clsdict = {}
+        if message is None:
+            message = '%s is deprecated, use %s' % (old_name, new_class.__name__)
+        clsdict['__deprecation_warning__'] = message
+        try:
+            # new-style class
+            return self.class_deprecated(version)(old_name, (new_class,), clsdict)
+        except (NameError, TypeError):
+            # old-style class
+            warn = self.warn
+            class DeprecatedClass(new_class):
+                """FIXME: There might be a better way to handle old/new-style class
+                """
+                def __init__(self, *args, **kwargs):
+                    warn(version, message, stacklevel=3)
+                    new_class.__init__(self, *args, **kwargs)
+            return DeprecatedClass
+
+    def class_moved(self, version, new_class, old_name=None, message=None):
+        """nice wrapper around class_renamed when a class has been moved into
+        another module
+        """
+        if old_name is None:
+            old_name = new_class.__name__
+        if message is None:
+            message = 'class %s is now available as %s.%s' % (
+                old_name, new_class.__module__, new_class.__name__)
+        return self.class_renamed(version, old_name, new_class, message)
+
+    def warn(self, version=None, reason="", stacklevel=2):
+        """Display a deprecation message only if the version is older than the
+        compatible version.
+        """
+        if (self.compatible_version is None
+            or version is None
+            or Version(version) < self.compatible_version):
+            if self.module_name and version:
+                reason = '[%s %s] %s' % (self.module_name, version, reason)
+            elif self.module_name:
+                reason = '[%s] %s' % (self.module_name, reason)
+            elif version:
+                reason = '[%s] %s' % (version, reason)
+            warn(reason, DeprecationWarning, stacklevel=stacklevel)
+
+_defaultdeprecator = DeprecationManager()
+
+def deprecated(reason=None, stacklevel=2, name=None, doc=None):
+    return _defaultdeprecator.deprecated(None, reason, stacklevel, name, doc)
+
+class_deprecated = _defaultdeprecator.class_deprecated()
+
+def moved(modpath, objname):
+    return _defaultdeprecator.moved(None, modpath, objname)
+moved.__doc__ = _defaultdeprecator.moved.__doc__
+
+def class_renamed(old_name, new_class, message=None):
+    """automatically creates a class which fires a DeprecationWarning
+    when instantiated.
+
+    >>> Set = class_renamed('Set', set, 'Set is now replaced by set')
+    >>> s = Set()
+    sample.py:57: DeprecationWarning: Set is now replaced by set
+    s = Set()
+    >>>
+    """
+    return _defaultdeprecator.class_renamed(None, old_name, new_class, message)
+
+def class_moved(new_class, old_name=None, message=None):
+    return _defaultdeprecator.class_moved(None, new_class, old_name, message)
+class_moved.__doc__ = _defaultdeprecator.class_moved.__doc__
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/fileutils.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/fileutils.py
new file mode 100644
index 0000000..b30cf5f
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/fileutils.py
@@ -0,0 +1,404 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""File and file-path manipulation utilities.
+
+:group path manipulation: first_level_directory, relative_path, is_binary,\
+get_by_ext, remove_dead_links
+:group file manipulation: norm_read, norm_open, lines, stream_lines, lines,\
+write_open_mode, ensure_fs_mode, export
+:sort: path manipulation, file manipulation
+"""
+
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+
+import sys
+import shutil
+import mimetypes
+from os.path import isabs, isdir, islink, split, exists, normpath, join
+from os.path import abspath
+from os import sep, mkdir, remove, listdir, stat, chmod, walk
+from stat import ST_MODE, S_IWRITE
+
+from logilab.common import STD_BLACKLIST as BASE_BLACKLIST, IGNORED_EXTENSIONS
+from logilab.common.shellutils import find
+from logilab.common.deprecation import deprecated
+from logilab.common.compat import FileIO
+
+def first_level_directory(path):
+    """Return the first level directory of a path.
+
+    >>> first_level_directory('home/syt/work')
+    'home'
+    >>> first_level_directory('/home/syt/work')
+    '/'
+    >>> first_level_directory('work')
+    'work'
+    >>>
+
+    :type path: str
+    :param path: the path for which we want the first level directory
+
+    :rtype: str
+    :return: the first level directory appearing in `path`
+    """
+    head, tail = split(path)
+    while head and tail:
+        head, tail = split(head)
+    if tail:
+        return tail
+    # path was absolute, head is the fs root
+    return head
+
+def abspath_listdir(path):
+    """Lists path's content using absolute paths.
+
+    >>> os.listdir('/home')
+    ['adim', 'alf', 'arthur', 'auc']
+    >>> abspath_listdir('/home')
+    ['/home/adim', '/home/alf', '/home/arthur', '/home/auc']
+    """
+    path = abspath(path)
+    return [join(path, filename) for filename in listdir(path)]
+
+
+def is_binary(filename):
+    """Return true if filename may be a binary file, according to it's
+    extension.
+
+    :type filename: str
+    :param filename: the name of the file
+
+    :rtype: bool
+    :return:
+      true if the file is a binary file (actually if it's mime type
+      isn't beginning by text/)
+    """
+    try:
+        return not mimetypes.guess_type(filename)[0].startswith('text')
+    except AttributeError:
+        return 1
+
+
+def write_open_mode(filename):
+    """Return the write mode that should used to open file.
+
+    :type filename: str
+    :param filename: the name of the file
+
+    :rtype: str
+    :return: the mode that should be use to open the file ('w' or 'wb')
+    """
+    if is_binary(filename):
+        return 'wb'
+    return 'w'
+
+
+def ensure_fs_mode(filepath, desired_mode=S_IWRITE):
+    """Check that the given file has the given mode(s) set, else try to
+    set it.
+
+    :type filepath: str
+    :param filepath: path of the file
+
+    :type desired_mode: int
+    :param desired_mode:
+      ORed flags describing the desired mode. Use constants from the
+      `stat` module for file permission's modes
+    """
+    mode = stat(filepath)[ST_MODE]
+    if not mode & desired_mode:
+        chmod(filepath, mode | desired_mode)
+
+
+# XXX (syt) unused? kill?
+class ProtectedFile(FileIO):
+    """A special file-object class that automatically does a 'chmod +w' when
+    needed.
+
+    XXX: for now, the way it is done allows 'normal file-objects' to be
+    created during the ProtectedFile object lifetime.
+    One way to circumvent this would be to chmod / unchmod on each
+    write operation.
+
+    One other way would be to :
+
+    - catch the IOError in the __init__
+
+    - if IOError, then create a StringIO object
+
+    - each write operation writes in this StringIO object
+
+    - on close()/del(), write/append the StringIO content to the file and
+      do the chmod only once
+    """
+    def __init__(self, filepath, mode):
+        self.original_mode = stat(filepath)[ST_MODE]
+        self.mode_changed = False
+        if mode in ('w', 'a', 'wb', 'ab'):
+            if not self.original_mode & S_IWRITE:
+                chmod(filepath, self.original_mode | S_IWRITE)
+                self.mode_changed = True
+        FileIO.__init__(self, filepath, mode)
+
+    def _restore_mode(self):
+        """restores the original mode if needed"""
+        if self.mode_changed:
+            chmod(self.name, self.original_mode)
+            # Don't re-chmod in case of several restore
+            self.mode_changed = False
+
+    def close(self):
+        """restore mode before closing"""
+        self._restore_mode()
+        FileIO.close(self)
+
+    def __del__(self):
+        if not self.closed:
+            self.close()
+
+
+class UnresolvableError(Exception):
+    """Exception raised by relative path when it's unable to compute relative
+    path between two paths.
+    """
+
+def relative_path(from_file, to_file):
+    """Try to get a relative path from `from_file` to `to_file`
+    (path will be absolute if to_file is an absolute file). This function
+    is useful to create link in `from_file` to `to_file`. This typical use
+    case is used in this function description.
+
+    If both files are relative, they're expected to be relative to the same
+    directory.
+
+    >>> relative_path( from_file='toto/index.html', to_file='index.html')
+    '../index.html'
+    >>> relative_path( from_file='index.html', to_file='toto/index.html')
+    'toto/index.html'
+    >>> relative_path( from_file='tutu/index.html', to_file='toto/index.html')
+    '../toto/index.html'
+    >>> relative_path( from_file='toto/index.html', to_file='/index.html')
+    '/index.html'
+    >>> relative_path( from_file='/toto/index.html', to_file='/index.html')
+    '../index.html'
+    >>> relative_path( from_file='/toto/index.html', to_file='/toto/summary.html')
+    'summary.html'
+    >>> relative_path( from_file='index.html', to_file='index.html')
+    ''
+    >>> relative_path( from_file='/index.html', to_file='toto/index.html')
+    Traceback (most recent call last):
+      File "<string>", line 1, in ?
+      File "<stdin>", line 37, in relative_path
+    UnresolvableError
+    >>> relative_path( from_file='/index.html', to_file='/index.html')
+    ''
+    >>>
+
+    :type from_file: str
+    :param from_file: source file (where links will be inserted)
+
+    :type to_file: str
+    :param to_file: target file (on which links point)
+
+    :raise UnresolvableError: if it has been unable to guess a correct path
+
+    :rtype: str
+    :return: the relative path of `to_file` from `from_file`
+    """
+    from_file = normpath(from_file)
+    to_file = normpath(to_file)
+    if from_file == to_file:
+        return ''
+    if isabs(to_file):
+        if not isabs(from_file):
+            return to_file
+    elif isabs(from_file):
+        raise UnresolvableError()
+    from_parts = from_file.split(sep)
+    to_parts = to_file.split(sep)
+    idem = 1
+    result = []
+    while len(from_parts) > 1:
+        dirname = from_parts.pop(0)
+        if idem and len(to_parts) > 1 and dirname == to_parts[0]:
+            to_parts.pop(0)
+        else:
+            idem = 0
+            result.append('..')
+    result += to_parts
+    return sep.join(result)
+
+
+def norm_read(path):
+    """Return the content of the file with normalized line feeds.
+
+    :type path: str
+    :param path: path to the file to read
+
+    :rtype: str
+    :return: the content of the file with normalized line feeds
+    """
+    return open(path, 'U').read()
+norm_read = deprecated("use \"open(path, 'U').read()\"")(norm_read)
+
+def norm_open(path):
+    """Return a stream for a file with content with normalized line feeds.
+
+    :type path: str
+    :param path: path to the file to open
+
+    :rtype: file or StringIO
+    :return: the opened file with normalized line feeds
+    """
+    return open(path, 'U')
+norm_open = deprecated("use \"open(path, 'U')\"")(norm_open)
+
+def lines(path, comments=None):
+    """Return a list of non empty lines in the file located at `path`.
+
+    :type path: str
+    :param path: path to the file
+
+    :type comments: str or None
+    :param comments:
+      optional string which can be used to comment a line in the file
+      (i.e. lines starting with this string won't be returned)
+
+    :rtype: list
+    :return:
+      a list of stripped line in the file, without empty and commented
+      lines
+
+    :warning: at some point this function will probably return an iterator
+    """
+    stream = open(path, 'U')
+    result = stream_lines(stream, comments)
+    stream.close()
+    return result
+
+
+def stream_lines(stream, comments=None):
+    """Return a list of non empty lines in the given `stream`.
+
+    :type stream: object implementing 'xreadlines' or 'readlines'
+    :param stream: file like object
+
+    :type comments: str or None
+    :param comments:
+      optional string which can be used to comment a line in the file
+      (i.e. lines starting with this string won't be returned)
+
+    :rtype: list
+    :return:
+      a list of stripped line in the file, without empty and commented
+      lines
+
+    :warning: at some point this function will probably return an iterator
+    """
+    try:
+        readlines = stream.xreadlines
+    except AttributeError:
+        readlines = stream.readlines
+    result = []
+    for line in readlines():
+        line = line.strip()
+        if line and (comments is None or not line.startswith(comments)):
+            result.append(line)
+    return result
+
+
+def export(from_dir, to_dir,
+           blacklist=BASE_BLACKLIST, ignore_ext=IGNORED_EXTENSIONS,
+           verbose=0):
+    """Make a mirror of `from_dir` in `to_dir`, omitting directories and
+    files listed in the black list or ending with one of the given
+    extensions.
+
+    :type from_dir: str
+    :param from_dir: directory to export
+
+    :type to_dir: str
+    :param to_dir: destination directory
+
+    :type blacklist: list or tuple
+    :param blacklist:
+      list of files or directories to ignore, default to the content of
+      `BASE_BLACKLIST`
+
+    :type ignore_ext: list or tuple
+    :param ignore_ext:
+      list of extensions to ignore, default to  the content of
+      `IGNORED_EXTENSIONS`
+
+    :type verbose: bool
+    :param verbose:
+      flag indicating whether information about exported files should be
+      printed to stderr, default to False
+    """
+    try:
+        mkdir(to_dir)
+    except OSError:
+        pass # FIXME we should use "exists" if the point is about existing dir
+             # else (permission problems?) shouldn't return / raise ?
+    for directory, dirnames, filenames in walk(from_dir):
+        for norecurs in blacklist:
+            try:
+                dirnames.remove(norecurs)
+            except ValueError:
+                continue
+        for dirname in dirnames:
+            src = join(directory, dirname)
+            dest = to_dir + src[len(from_dir):]
+            if isdir(src):
+                if not exists(dest):
+                    mkdir(dest)
+        for filename in filenames:
+            # don't include binary files
+            # endswith does not accept tuple in 2.4
+            if any([filename.endswith(ext) for ext in ignore_ext]):
+                continue
+            src = join(directory, filename)
+            dest = to_dir + src[len(from_dir):]
+            if verbose:
+                print(src, '->', dest, file=sys.stderr)
+            if exists(dest):
+                remove(dest)
+            shutil.copy2(src, dest)
+
+
+def remove_dead_links(directory, verbose=0):
+    """Recursively traverse directory and remove all dead links.
+
+    :type directory: str
+    :param directory: directory to cleanup
+
+    :type verbose: bool
+    :param verbose:
+      flag indicating whether information about deleted links should be
+      printed to stderr, default to False
+    """
+    for dirpath, dirname, filenames in walk(directory):
+        for filename in dirnames + filenames:
+            src = join(dirpath, filename)
+            if islink(src) and not exists(src):
+                if verbose:
+                    print('remove dead link', src)
+                remove(src)
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/graph.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/graph.py
new file mode 100644
index 0000000..cef1c98
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/graph.py
@@ -0,0 +1,282 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Graph manipulation utilities.
+
+(dot generation adapted from pypy/translator/tool/make_dot.py)
+"""
+
+__docformat__ = "restructuredtext en"
+
+__metaclass__ = type
+
+import os.path as osp
+import os
+import sys
+import tempfile
+import codecs
+import errno
+
+def escape(value):
+    """Make <value> usable in a dot file."""
+    lines = [line.replace('"', '\\"') for line in value.split('\n')]
+    data = '\\l'.join(lines)
+    return '\\n' + data
+
+def target_info_from_filename(filename):
+    """Transforms /some/path/foo.png into ('/some/path', 'foo.png', 'png')."""
+    basename = osp.basename(filename)
+    storedir = osp.dirname(osp.abspath(filename))
+    target = filename.split('.')[-1]
+    return storedir, basename, target
+
+
+class DotBackend:
+    """Dot File backend."""
+    def __init__(self, graphname, rankdir=None, size=None, ratio=None,
+            charset='utf-8', renderer='dot', additionnal_param={}):
+        self.graphname = graphname
+        self.renderer = renderer
+        self.lines = []
+        self._source = None
+        self.emit("digraph %s {" % normalize_node_id(graphname))
+        if rankdir:
+            self.emit('rankdir=%s' % rankdir)
+        if ratio:
+            self.emit('ratio=%s' % ratio)
+        if size:
+            self.emit('size="%s"' % size)
+        if charset:
+            assert charset.lower() in ('utf-8', 'iso-8859-1', 'latin1'), \
+                   'unsupported charset %s' % charset
+            self.emit('charset="%s"' % charset)
+        for param in sorted(additionnal_param.items()):
+            self.emit('='.join(param))
+
+    def get_source(self):
+        """returns self._source"""
+        if self._source is None:
+            self.emit("}\n")
+            self._source = '\n'.join(self.lines)
+            del self.lines
+        return self._source
+
+    source = property(get_source)
+
+    def generate(self, outputfile=None, dotfile=None, mapfile=None):
+        """Generates a graph file.
+
+        :param outputfile: filename and path [defaults to graphname.png]
+        :param dotfile: filename and path [defaults to graphname.dot]
+
+        :rtype: str
+        :return: a path to the generated file
+        """
+        import subprocess # introduced in py 2.4
+        name = self.graphname
+        if not dotfile:
+            # if 'outputfile' is a dot file use it as 'dotfile'
+            if outputfile and outputfile.endswith(".dot"):
+                dotfile = outputfile
+            else:
+                dotfile = '%s.dot' % name
+        if outputfile is not None:
+            storedir, basename, target = target_info_from_filename(outputfile)
+            if target != "dot":
+                pdot, dot_sourcepath = tempfile.mkstemp(".dot", name)
+                os.close(pdot)
+            else:
+                dot_sourcepath = osp.join(storedir, dotfile)
+        else:
+            target = 'png'
+            pdot, dot_sourcepath = tempfile.mkstemp(".dot", name)
+            ppng, outputfile = tempfile.mkstemp(".png", name)
+            os.close(pdot)
+            os.close(ppng)
+        pdot = codecs.open(dot_sourcepath, 'w', encoding='utf8')
+        pdot.write(self.source)
+        pdot.close()
+        if target != 'dot':
+            if sys.platform == 'win32':
+                use_shell = True
+            else:
+                use_shell = False
+            try:
+                if mapfile:
+                    subprocess.call([self.renderer,  '-Tcmapx', '-o', mapfile, '-T', target, dot_sourcepath, '-o', outputfile],
+                                    shell=use_shell)
+                else:
+                    subprocess.call([self.renderer, '-T',  target,
+                                     dot_sourcepath, '-o',  outputfile],
+                                    shell=use_shell)
+            except OSError as e:
+                if e.errno == errno.ENOENT:
+                    e.strerror = 'File not found: {0}'.format(self.renderer)
+                    raise
+            os.unlink(dot_sourcepath)
+        return outputfile
+
+    def emit(self, line):
+        """Adds <line> to final output."""
+        self.lines.append(line)
+
+    def emit_edge(self, name1, name2, **props):
+        """emit an edge from <name1> to <name2>.
+        edge properties: see http://www.graphviz.org/doc/info/attrs.html
+        """
+        attrs = ['%s="%s"' % (prop, value) for prop, value in props.items()]
+        n_from, n_to = normalize_node_id(name1), normalize_node_id(name2)
+        self.emit('%s -> %s [%s];' % (n_from, n_to, ', '.join(sorted(attrs))) )
+
+    def emit_node(self, name, **props):
+        """emit a node with given properties.
+        node properties: see http://www.graphviz.org/doc/info/attrs.html
+        """
+        attrs = ['%s="%s"' % (prop, value) for prop, value in props.items()]
+        self.emit('%s [%s];' % (normalize_node_id(name), ', '.join(sorted(attrs))))
+
+def normalize_node_id(nid):
+    """Returns a suitable DOT node id for `nid`."""
+    return '"%s"' % nid
+
+class GraphGenerator:
+    def __init__(self, backend):
+        # the backend is responsible to output the graph in a particular format
+        self.backend = backend
+
+    # XXX doesn't like space in outpufile / mapfile
+    def generate(self, visitor, propshdlr, outputfile=None, mapfile=None):
+        # the visitor
+        # the property handler is used to get node and edge properties
+        # according to the graph and to the backend
+        self.propshdlr = propshdlr
+        for nodeid, node in visitor.nodes():
+            props = propshdlr.node_properties(node)
+            self.backend.emit_node(nodeid, **props)
+        for subjnode, objnode, edge in visitor.edges():
+            props = propshdlr.edge_properties(edge, subjnode, objnode)
+            self.backend.emit_edge(subjnode, objnode, **props)
+        return self.backend.generate(outputfile=outputfile, mapfile=mapfile)
+
+
+class UnorderableGraph(Exception):
+    pass
+
+def ordered_nodes(graph):
+    """takes a dependency graph dict as arguments and return an ordered tuple of
+    nodes starting with nodes without dependencies and up to the outermost node.
+
+    If there is some cycle in the graph, :exc:`UnorderableGraph` will be raised.
+
+    Also the given graph dict will be emptied.
+    """
+    # check graph consistency
+    cycles = get_cycles(graph)
+    if cycles:
+        cycles = '\n'.join([' -> '.join(cycle) for cycle in cycles])
+        raise UnorderableGraph('cycles in graph: %s' % cycles)
+    vertices = set(graph)
+    to_vertices = set()
+    for edges in graph.values():
+        to_vertices |= set(edges)
+    missing_vertices = to_vertices - vertices
+    if missing_vertices:
+        raise UnorderableGraph('missing vertices: %s' % ', '.join(missing_vertices))
+    # order vertices
+    order = []
+    order_set = set()
+    old_len = None
+    while graph:
+        if old_len == len(graph):
+            raise UnorderableGraph('unknown problem with %s' % graph)
+        old_len = len(graph)
+        deps_ok = []
+        for node, node_deps in graph.items():
+            for dep in node_deps:
+                if dep not in order_set:
+                    break
+            else:
+                deps_ok.append(node)
+        order.append(deps_ok)
+        order_set |= set(deps_ok)
+        for node in deps_ok:
+            del graph[node]
+    result = []
+    for grp in reversed(order):
+        result.extend(sorted(grp))
+    return tuple(result)
+
+
+def get_cycles(graph_dict, vertices=None):
+    '''given a dictionary representing an ordered graph (i.e. key are vertices
+    and values is a list of destination vertices representing edges), return a
+    list of detected cycles
+    '''
+    if not graph_dict:
+        return ()
+    result = []
+    if vertices is None:
+        vertices = graph_dict.keys()
+    for vertice in vertices:
+        _get_cycles(graph_dict, [], set(), result, vertice)
+    return result
+
+def _get_cycles(graph_dict, path, visited, result, vertice):
+    """recursive function doing the real work for get_cycles"""
+    if vertice in path:
+        cycle = [vertice]
+        for node in path[::-1]:
+            if node == vertice:
+                break
+            cycle.insert(0, node)
+        # make a canonical representation
+        start_from = min(cycle)
+        index = cycle.index(start_from)
+        cycle = cycle[index:] + cycle[0:index]
+        # append it to result if not already in
+        if not cycle in result:
+            result.append(cycle)
+        return
+    path.append(vertice)
+    try:
+        for node in graph_dict[vertice]:
+            # don't check already visited nodes again
+            if node not in visited:
+                _get_cycles(graph_dict, path, visited, result, node)
+                visited.add(node)
+    except KeyError:
+        pass
+    path.pop()
+
+def has_path(graph_dict, fromnode, tonode, path=None):
+    """generic function taking a simple graph definition as a dictionary, with
+    node has key associated to a list of nodes directly reachable from it.
+
+    Return None if no path exists to go from `fromnode` to `tonode`, else the
+    first path found (as a list including the destination node at last)
+    """
+    if path is None:
+        path = []
+    elif fromnode in path:
+        return None
+    path.append(fromnode)
+    for destnode in graph_dict[fromnode]:
+        if destnode == tonode or has_path(graph_dict, destnode, tonode, path):
+            return path[1:] + [tonode]
+    path.pop()
+    return None
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/interface.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/interface.py
new file mode 100644
index 0000000..3ea4ab7
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/interface.py
@@ -0,0 +1,71 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Bases class for interfaces to provide 'light' interface handling.
+
+ TODO:
+  _ implements a check method which check that an object implements the
+    interface
+  _ Attribute objects
+
+  This module requires at least python 2.2
+"""
+__docformat__ = "restructuredtext en"
+
+
+class Interface(object):
+    """Base class for interfaces."""
+    def is_implemented_by(cls, instance):
+        return implements(instance, cls)
+    is_implemented_by = classmethod(is_implemented_by)
+
+
+def implements(obj, interface):
+    """Return true if the give object (maybe an instance or class) implements
+    the interface.
+    """
+    kimplements = getattr(obj, '__implements__', ())
+    if not isinstance(kimplements, (list, tuple)):
+        kimplements = (kimplements,)
+    for implementedinterface in kimplements:
+        if issubclass(implementedinterface, interface):
+            return True
+    return False
+
+
+def extend(klass, interface, _recurs=False):
+    """Add interface to klass'__implements__ if not already implemented in.
+
+    If klass is subclassed, ensure subclasses __implements__ it as well.
+
+    NOTE: klass should be e new class.
+    """
+    if not implements(klass, interface):
+        try:
+            kimplements = klass.__implements__
+            kimplementsklass = type(kimplements)
+            kimplements = list(kimplements)
+        except AttributeError:
+            kimplementsklass = tuple
+            kimplements = []
+        kimplements.append(interface)
+        klass.__implements__ = kimplementsklass(kimplements)
+        for subklass in klass.__subclasses__():
+            extend(subklass, interface, _recurs=True)
+    elif _recurs:
+        for subklass in klass.__subclasses__():
+            extend(subklass, interface, _recurs=True)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/logging_ext.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/logging_ext.py
new file mode 100644
index 0000000..3b6a580
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/logging_ext.py
@@ -0,0 +1,195 @@
+# -*- coding: utf-8 -*-
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Extends the logging module from the standard library."""
+
+__docformat__ = "restructuredtext en"
+
+import os
+import sys
+import logging
+
+from six import string_types
+
+from logilab.common.textutils import colorize_ansi
+
+
+def set_log_methods(cls, logger):
+    """bind standard logger's methods as methods on the class"""
+    cls.__logger = logger
+    for attr in ('debug', 'info', 'warning', 'error', 'critical', 'exception'):
+        setattr(cls, attr, getattr(logger, attr))
+
+
+def xxx_cyan(record):
+    if 'XXX' in record.message:
+        return 'cyan'
+
+class ColorFormatter(logging.Formatter):
+    """
+    A color Formatter for the logging standard module.
+
+    By default, colorize CRITICAL and ERROR in red, WARNING in orange, INFO in
+    green and DEBUG in yellow.
+
+    self.colors is customizable via the 'color' constructor argument (dictionary).
+
+    self.colorfilters is a list of functions that get the LogRecord
+    and return a color name or None.
+    """
+
+    def __init__(self, fmt=None, datefmt=None, colors=None):
+        logging.Formatter.__init__(self, fmt, datefmt)
+        self.colorfilters = []
+        self.colors = {'CRITICAL': 'red',
+                       'ERROR': 'red',
+                       'WARNING': 'magenta',
+                       'INFO': 'green',
+                       'DEBUG': 'yellow',
+                       }
+        if colors is not None:
+            assert isinstance(colors, dict)
+            self.colors.update(colors)
+
+    def format(self, record):
+        msg = logging.Formatter.format(self, record)
+        if record.levelname in self.colors:
+            color = self.colors[record.levelname]
+            return colorize_ansi(msg, color)
+        else:
+            for cf in self.colorfilters:
+                color = cf(record)
+                if color:
+                    return colorize_ansi(msg, color)
+        return msg
+
+def set_color_formatter(logger=None, **kw):
+    """
+    Install a color formatter on the 'logger'. If not given, it will
+    defaults to the default logger.
+
+    Any additional keyword will be passed as-is to the ColorFormatter
+    constructor.
+    """
+    if logger is None:
+        logger = logging.getLogger()
+        if not logger.handlers:
+            logging.basicConfig()
+    format_msg = logger.handlers[0].formatter._fmt
+    fmt = ColorFormatter(format_msg, **kw)
+    fmt.colorfilters.append(xxx_cyan)
+    logger.handlers[0].setFormatter(fmt)
+
+
+LOG_FORMAT = '%(asctime)s - (%(name)s) %(levelname)s: %(message)s'
+LOG_DATE_FORMAT = '%Y-%m-%d %H:%M:%S'
+
+def get_handler(debug=False, syslog=False, logfile=None, rotation_parameters=None):
+    """get an apropriate handler according to given parameters"""
+    if os.environ.get('APYCOT_ROOT'):
+        handler = logging.StreamHandler(sys.stdout)
+    if debug:
+        handler = logging.StreamHandler()
+    elif logfile is None:
+        if syslog:
+            from logging import handlers
+            handler = handlers.SysLogHandler()
+        else:
+            handler = logging.StreamHandler()
+    else:
+        try:
+            if rotation_parameters is None:
+                if os.name == 'posix' and sys.version_info >= (2, 6):
+                    from logging.handlers import WatchedFileHandler
+                    handler = WatchedFileHandler(logfile)
+                else:
+                    handler = logging.FileHandler(logfile)
+            else:
+                from logging.handlers import TimedRotatingFileHandler
+                handler = TimedRotatingFileHandler(
+                    logfile, **rotation_parameters)
+        except IOError:
+            handler = logging.StreamHandler()
+    return handler
+
+def get_threshold(debug=False, logthreshold=None):
+    if logthreshold is None:
+        if debug:
+            logthreshold = logging.DEBUG
+        else:
+            logthreshold = logging.ERROR
+    elif isinstance(logthreshold, string_types):
+        logthreshold = getattr(logging, THRESHOLD_MAP.get(logthreshold,
+                                                          logthreshold))
+    return logthreshold
+
+def _colorable_terminal():
+    isatty = hasattr(sys.__stdout__, 'isatty') and sys.__stdout__.isatty()
+    if not isatty:
+        return False
+    if os.name == 'nt':
+        try:
+            from colorama import init as init_win32_colors
+        except ImportError:
+            return False
+        init_win32_colors()
+    return True
+
+def get_formatter(logformat=LOG_FORMAT, logdateformat=LOG_DATE_FORMAT):
+    if _colorable_terminal():
+        fmt = ColorFormatter(logformat, logdateformat)
+        def col_fact(record):
+            if 'XXX' in record.message:
+                return 'cyan'
+            if 'kick' in record.message:
+                return 'red'
+        fmt.colorfilters.append(col_fact)
+    else:
+        fmt = logging.Formatter(logformat, logdateformat)
+    return fmt
+
+def init_log(debug=False, syslog=False, logthreshold=None, logfile=None,
+             logformat=LOG_FORMAT, logdateformat=LOG_DATE_FORMAT, fmt=None,
+             rotation_parameters=None, handler=None):
+    """init the log service"""
+    logger = logging.getLogger()
+    if handler is None:
+        handler = get_handler(debug, syslog, logfile, rotation_parameters)
+    # only addHandler and removeHandler method while I would like a setHandler
+    # method, so do it this way :$
+    logger.handlers = [handler]
+    logthreshold = get_threshold(debug, logthreshold)
+    logger.setLevel(logthreshold)
+    if fmt is None:
+        if debug:
+            fmt = get_formatter(logformat=logformat, logdateformat=logdateformat)
+        else:
+            fmt = logging.Formatter(logformat, logdateformat)
+    handler.setFormatter(fmt)
+    return handler
+
+# map logilab.common.logger thresholds to logging thresholds
+THRESHOLD_MAP = {'LOG_DEBUG':   'DEBUG',
+                 'LOG_INFO':    'INFO',
+                 'LOG_NOTICE':  'INFO',
+                 'LOG_WARN':    'WARNING',
+                 'LOG_WARNING': 'WARNING',
+                 'LOG_ERR':     'ERROR',
+                 'LOG_ERROR':   'ERROR',
+                 'LOG_CRIT':    'CRITICAL',
+                 }
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/modutils.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/modutils.py
new file mode 100644
index 0000000..dd725d2
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/modutils.py
@@ -0,0 +1,713 @@
+# -*- coding: utf-8 -*-
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Python modules manipulation utility functions.
+
+:type PY_SOURCE_EXTS: tuple(str)
+:var PY_SOURCE_EXTS: list of possible python source file extension
+
+:type STD_LIB_DIR: str
+:var STD_LIB_DIR: directory where standard modules are located
+
+:type BUILTIN_MODULES: dict
+:var BUILTIN_MODULES: dictionary with builtin module names as key
+"""
+
+__docformat__ = "restructuredtext en"
+
+import sys
+import os
+from os.path import splitext, join, abspath, isdir, dirname, exists, basename
+from imp import find_module, load_module, C_BUILTIN, PY_COMPILED, PKG_DIRECTORY
+from distutils.sysconfig import get_config_var, get_python_lib, get_python_version
+from distutils.errors import DistutilsPlatformError
+
+from six.moves import range
+
+try:
+    import zipimport
+except ImportError:
+    zipimport = None
+
+ZIPFILE = object()
+
+from logilab.common import STD_BLACKLIST, _handle_blacklist
+
+# Notes about STD_LIB_DIR
+# Consider arch-specific installation for STD_LIB_DIR definition
+# :mod:`distutils.sysconfig` contains to much hardcoded values to rely on
+#
+# :see: `Problems with /usr/lib64 builds <http://bugs.python.org/issue1294959>`_
+# :see: `FHS <http://www.pathname.com/fhs/pub/fhs-2.3.html#LIBLTQUALGTALTERNATEFORMATESSENTIAL>`_
+if sys.platform.startswith('win'):
+    PY_SOURCE_EXTS = ('py', 'pyw')
+    PY_COMPILED_EXTS = ('dll', 'pyd')
+else:
+    PY_SOURCE_EXTS = ('py',)
+    PY_COMPILED_EXTS = ('so',)
+
+try:
+    STD_LIB_DIR = get_python_lib(standard_lib=True)
+# get_python_lib(standard_lib=1) is not available on pypy, set STD_LIB_DIR to
+# non-valid path, see https://bugs.pypy.org/issue1164
+except DistutilsPlatformError:
+    STD_LIB_DIR = '//'
+
+EXT_LIB_DIR = get_python_lib()
+
+BUILTIN_MODULES = dict.fromkeys(sys.builtin_module_names, True)
+
+
+class NoSourceFile(Exception):
+    """exception raised when we are not able to get a python
+    source file for a precompiled file
+    """
+
+class LazyObject(object):
+    def __init__(self, module, obj):
+        self.module = module
+        self.obj = obj
+        self._imported = None
+
+    def _getobj(self):
+        if self._imported is None:
+           self._imported = getattr(load_module_from_name(self.module),
+                                    self.obj)
+        return self._imported
+
+    def __getattribute__(self, attr):
+        try:
+            return super(LazyObject, self).__getattribute__(attr)
+        except AttributeError as ex:
+            return getattr(self._getobj(), attr)
+
+    def __call__(self, *args, **kwargs):
+        return self._getobj()(*args, **kwargs)
+
+
+def load_module_from_name(dotted_name, path=None, use_sys=True):
+    """Load a Python module from its name.
+
+    :type dotted_name: str
+    :param dotted_name: python name of a module or package
+
+    :type path: list or None
+    :param path:
+      optional list of path where the module or package should be
+      searched (use sys.path if nothing or None is given)
+
+    :type use_sys: bool
+    :param use_sys:
+      boolean indicating whether the sys.modules dictionary should be
+      used or not
+
+
+    :raise ImportError: if the module or package is not found
+
+    :rtype: module
+    :return: the loaded module
+    """
+    return load_module_from_modpath(dotted_name.split('.'), path, use_sys)
+
+
+def load_module_from_modpath(parts, path=None, use_sys=True):
+    """Load a python module from its splitted name.
+
+    :type parts: list(str) or tuple(str)
+    :param parts:
+      python name of a module or package splitted on '.'
+
+    :type path: list or None
+    :param path:
+      optional list of path where the module or package should be
+      searched (use sys.path if nothing or None is given)
+
+    :type use_sys: bool
+    :param use_sys:
+      boolean indicating whether the sys.modules dictionary should be used or not
+
+    :raise ImportError: if the module or package is not found
+
+    :rtype: module
+    :return: the loaded module
+    """
+    if use_sys:
+        try:
+            return sys.modules['.'.join(parts)]
+        except KeyError:
+            pass
+    modpath = []
+    prevmodule = None
+    for part in parts:
+        modpath.append(part)
+        curname = '.'.join(modpath)
+        module = None
+        if len(modpath) != len(parts):
+            # even with use_sys=False, should try to get outer packages from sys.modules
+            module = sys.modules.get(curname)
+        elif use_sys:
+            # because it may have been indirectly loaded through a parent
+            module = sys.modules.get(curname)
+        if module is None:
+            mp_file, mp_filename, mp_desc = find_module(part, path)
+            module = load_module(curname, mp_file, mp_filename, mp_desc)
+        if prevmodule:
+            setattr(prevmodule, part, module)
+        _file = getattr(module, '__file__', '')
+        prevmodule = module
+        if not _file and _is_namespace(curname):
+            continue
+        if not _file and len(modpath) != len(parts):
+            raise ImportError('no module in %s' % '.'.join(parts[len(modpath):]) )
+        path = [dirname( _file )]
+    return module
+
+
+def load_module_from_file(filepath, path=None, use_sys=True, extrapath=None):
+    """Load a Python module from it's path.
+
+    :type filepath: str
+    :param filepath: path to the python module or package
+
+    :type path: list or None
+    :param path:
+      optional list of path where the module or package should be
+      searched (use sys.path if nothing or None is given)
+
+    :type use_sys: bool
+    :param use_sys:
+      boolean indicating whether the sys.modules dictionary should be
+      used or not
+
+
+    :raise ImportError: if the module or package is not found
+
+    :rtype: module
+    :return: the loaded module
+    """
+    modpath = modpath_from_file(filepath, extrapath)
+    return load_module_from_modpath(modpath, path, use_sys)
+
+
+def _check_init(path, mod_path):
+    """check there are some __init__.py all along the way"""
+    modpath = []
+    for part in mod_path:
+        modpath.append(part)
+        path = join(path, part)
+        if not _is_namespace('.'.join(modpath)) and not _has_init(path):
+            return False
+    return True
+
+
+def modpath_from_file(filename, extrapath=None):
+    """given a file path return the corresponding splitted module's name
+    (i.e name of a module or package splitted on '.')
+
+    :type filename: str
+    :param filename: file's path for which we want the module's name
+
+    :type extrapath: dict
+    :param extrapath:
+      optional extra search path, with path as key and package name for the path
+      as value. This is usually useful to handle package splitted in multiple
+      directories using __path__ trick.
+
+
+    :raise ImportError:
+      if the corresponding module's name has not been found
+
+    :rtype: list(str)
+    :return: the corresponding splitted module's name
+    """
+    base = splitext(abspath(filename))[0]
+    if extrapath is not None:
+        for path_ in extrapath:
+            path = abspath(path_)
+            if path and base[:len(path)] == path:
+                submodpath = [pkg for pkg in base[len(path):].split(os.sep)
+                              if pkg]
+                if _check_init(path, submodpath[:-1]):
+                    return extrapath[path_].split('.') + submodpath
+    for path in sys.path:
+        path = abspath(path)
+        if path and base.startswith(path):
+            modpath = [pkg for pkg in base[len(path):].split(os.sep) if pkg]
+            if _check_init(path, modpath[:-1]):
+                return modpath
+    raise ImportError('Unable to find module for %s in %s' % (
+        filename, ', \n'.join(sys.path)))
+
+
+
+def file_from_modpath(modpath, path=None, context_file=None):
+    """given a mod path (i.e. splitted module / package name), return the
+    corresponding file, giving priority to source file over precompiled
+    file if it exists
+
+    :type modpath: list or tuple
+    :param modpath:
+      splitted module's name (i.e name of a module or package splitted
+      on '.')
+      (this means explicit relative imports that start with dots have
+      empty strings in this list!)
+
+    :type path: list or None
+    :param path:
+      optional list of path where the module or package should be
+      searched (use sys.path if nothing or None is given)
+
+    :type context_file: str or None
+    :param context_file:
+      context file to consider, necessary if the identifier has been
+      introduced using a relative import unresolvable in the actual
+      context (i.e. modutils)
+
+    :raise ImportError: if there is no such module in the directory
+
+    :rtype: str or None
+    :return:
+      the path to the module's file or None if it's an integrated
+      builtin module such as 'sys'
+    """
+    if context_file is not None:
+        context = dirname(context_file)
+    else:
+        context = context_file
+    if modpath[0] == 'xml':
+        # handle _xmlplus
+        try:
+            return _file_from_modpath(['_xmlplus'] + modpath[1:], path, context)
+        except ImportError:
+            return _file_from_modpath(modpath, path, context)
+    elif modpath == ['os', 'path']:
+        # FIXME: currently ignoring search_path...
+        return os.path.__file__
+    return _file_from_modpath(modpath, path, context)
+
+
+
+def get_module_part(dotted_name, context_file=None):
+    """given a dotted name return the module part of the name :
+
+    >>> get_module_part('logilab.common.modutils.get_module_part')
+    'logilab.common.modutils'
+
+    :type dotted_name: str
+    :param dotted_name: full name of the identifier we are interested in
+
+    :type context_file: str or None
+    :param context_file:
+      context file to consider, necessary if the identifier has been
+      introduced using a relative import unresolvable in the actual
+      context (i.e. modutils)
+
+
+    :raise ImportError: if there is no such module in the directory
+
+    :rtype: str or None
+    :return:
+      the module part of the name or None if we have not been able at
+      all to import the given name
+
+    XXX: deprecated, since it doesn't handle package precedence over module
+    (see #10066)
+    """
+    # os.path trick
+    if dotted_name.startswith('os.path'):
+        return 'os.path'
+    parts = dotted_name.split('.')
+    if context_file is not None:
+        # first check for builtin module which won't be considered latter
+        # in that case (path != None)
+        if parts[0] in BUILTIN_MODULES:
+            if len(parts) > 2:
+                raise ImportError(dotted_name)
+            return parts[0]
+        # don't use += or insert, we want a new list to be created !
+    path = None
+    starti = 0
+    if parts[0] == '':
+        assert context_file is not None, \
+                'explicit relative import, but no context_file?'
+        path = [] # prevent resolving the import non-relatively
+        starti = 1
+    while parts[starti] == '': # for all further dots: change context
+        starti += 1
+        context_file = dirname(context_file)
+    for i in range(starti, len(parts)):
+        try:
+            file_from_modpath(parts[starti:i+1],
+                    path=path, context_file=context_file)
+        except ImportError:
+            if not i >= max(1, len(parts) - 2):
+                raise
+            return '.'.join(parts[:i])
+    return dotted_name
+
+
+def get_modules(package, src_directory, blacklist=STD_BLACKLIST):
+    """given a package directory return a list of all available python
+    modules in the package and its subpackages
+
+    :type package: str
+    :param package: the python name for the package
+
+    :type src_directory: str
+    :param src_directory:
+      path of the directory corresponding to the package
+
+    :type blacklist: list or tuple
+    :param blacklist:
+      optional list of files or directory to ignore, default to
+      the value of `logilab.common.STD_BLACKLIST`
+
+    :rtype: list
+    :return:
+      the list of all available python modules in the package and its
+      subpackages
+    """
+    modules = []
+    for directory, dirnames, filenames in os.walk(src_directory):
+        _handle_blacklist(blacklist, dirnames, filenames)
+        # check for __init__.py
+        if not '__init__.py' in filenames:
+            dirnames[:] = ()
+            continue
+        if directory != src_directory:
+            dir_package = directory[len(src_directory):].replace(os.sep, '.')
+            modules.append(package + dir_package)
+        for filename in filenames:
+            if _is_python_file(filename) and filename != '__init__.py':
+                src = join(directory, filename)
+                module = package + src[len(src_directory):-3]
+                modules.append(module.replace(os.sep, '.'))
+    return modules
+
+
+
+def get_module_files(src_directory, blacklist=STD_BLACKLIST):
+    """given a package directory return a list of all available python
+    module's files in the package and its subpackages
+
+    :type src_directory: str
+    :param src_directory:
+      path of the directory corresponding to the package
+
+    :type blacklist: list or tuple
+    :param blacklist:
+      optional list of files or directory to ignore, default to the value of
+      `logilab.common.STD_BLACKLIST`
+
+    :rtype: list
+    :return:
+      the list of all available python module's files in the package and
+      its subpackages
+    """
+    files = []
+    for directory, dirnames, filenames in os.walk(src_directory):
+        _handle_blacklist(blacklist, dirnames, filenames)
+        # check for __init__.py
+        if not '__init__.py' in filenames:
+            dirnames[:] = ()
+            continue
+        for filename in filenames:
+            if _is_python_file(filename):
+                src = join(directory, filename)
+                files.append(src)
+    return files
+
+
+def get_source_file(filename, include_no_ext=False):
+    """given a python module's file name return the matching source file
+    name (the filename will be returned identically if it's a already an
+    absolute path to a python source file...)
+
+    :type filename: str
+    :param filename: python module's file name
+
+
+    :raise NoSourceFile: if no source file exists on the file system
+
+    :rtype: str
+    :return: the absolute path of the source file if it exists
+    """
+    base, orig_ext = splitext(abspath(filename))
+    for ext in PY_SOURCE_EXTS:
+        source_path = '%s.%s' % (base, ext)
+        if exists(source_path):
+            return source_path
+    if include_no_ext and not orig_ext and exists(base):
+        return base
+    raise NoSourceFile(filename)
+
+
+def cleanup_sys_modules(directories):
+    """remove submodules of `directories` from `sys.modules`"""
+    cleaned = []
+    for modname, module in list(sys.modules.items()):
+        modfile = getattr(module, '__file__', None)
+        if modfile:
+            for directory in directories:
+                if modfile.startswith(directory):
+                    cleaned.append(modname)
+                    del sys.modules[modname]
+                    break
+    return cleaned
+
+
+def is_python_source(filename):
+    """
+    rtype: bool
+    return: True if the filename is a python source file
+    """
+    return splitext(filename)[1][1:] in PY_SOURCE_EXTS
+
+
+def is_standard_module(modname, std_path=(STD_LIB_DIR,)):
+    """try to guess if a module is a standard python module (by default,
+    see `std_path` parameter's description)
+
+    :type modname: str
+    :param modname: name of the module we are interested in
+
+    :type std_path: list(str) or tuple(str)
+    :param std_path: list of path considered as standard
+
+
+    :rtype: bool
+    :return:
+      true if the module:
+      - is located on the path listed in one of the directory in `std_path`
+      - is a built-in module
+
+    Note: this function is known to return wrong values when inside virtualenv.
+    See https://www.logilab.org/ticket/294756.
+    """
+    modname = modname.split('.')[0]
+    try:
+        filename = file_from_modpath([modname])
+    except ImportError as ex:
+        # import failed, i'm probably not so wrong by supposing it's
+        # not standard...
+        return False
+    # modules which are not living in a file are considered standard
+    # (sys and __builtin__ for instance)
+    if filename is None:
+        # we assume there are no namespaces in stdlib
+        return not _is_namespace(modname)
+    filename = abspath(filename)
+    if filename.startswith(EXT_LIB_DIR):
+        return False
+    for path in std_path:
+        if filename.startswith(abspath(path)):
+            return True
+    return False
+
+
+
+def is_relative(modname, from_file):
+    """return true if the given module name is relative to the given
+    file name
+
+    :type modname: str
+    :param modname: name of the module we are interested in
+
+    :type from_file: str
+    :param from_file:
+      path of the module from which modname has been imported
+
+    :rtype: bool
+    :return:
+      true if the module has been imported relatively to `from_file`
+    """
+    if not isdir(from_file):
+        from_file = dirname(from_file)
+    if from_file in sys.path:
+        return False
+    try:
+        find_module(modname.split('.')[0], [from_file])
+        return True
+    except ImportError:
+        return False
+
+
+# internal only functions #####################################################
+
+def _file_from_modpath(modpath, path=None, context=None):
+    """given a mod path (i.e. splitted module / package name), return the
+    corresponding file
+
+    this function is used internally, see `file_from_modpath`'s
+    documentation for more information
+    """
+    assert len(modpath) > 0
+    if context is not None:
+        try:
+            mtype, mp_filename = _module_file(modpath, [context])
+        except ImportError:
+            mtype, mp_filename = _module_file(modpath, path)
+    else:
+        mtype, mp_filename = _module_file(modpath, path)
+    if mtype == PY_COMPILED:
+        try:
+            return get_source_file(mp_filename)
+        except NoSourceFile:
+            return mp_filename
+    elif mtype == C_BUILTIN:
+        # integrated builtin module
+        return None
+    elif mtype == PKG_DIRECTORY:
+        mp_filename = _has_init(mp_filename)
+    return mp_filename
+
+def _search_zip(modpath, pic):
+    for filepath, importer in pic.items():
+        if importer is not None:
+            if importer.find_module(modpath[0]):
+                if not importer.find_module('/'.join(modpath)):
+                    raise ImportError('No module named %s in %s/%s' % (
+                        '.'.join(modpath[1:]), filepath, modpath))
+                return ZIPFILE, abspath(filepath) + '/' + '/'.join(modpath), filepath
+    raise ImportError('No module named %s' % '.'.join(modpath))
+
+try:
+    import pkg_resources
+except ImportError:
+    pkg_resources = None
+
+
+def _is_namespace(modname):
+    return (pkg_resources is not None
+            and modname in pkg_resources._namespace_packages)
+
+
+def _module_file(modpath, path=None):
+    """get a module type / file path
+
+    :type modpath: list or tuple
+    :param modpath:
+      splitted module's name (i.e name of a module or package splitted
+      on '.'), with leading empty strings for explicit relative import
+
+    :type path: list or None
+    :param path:
+      optional list of path where the module or package should be
+      searched (use sys.path if nothing or None is given)
+
+
+    :rtype: tuple(int, str)
+    :return: the module type flag and the file path for a module
+    """
+    # egg support compat
+    try:
+        pic = sys.path_importer_cache
+        _path = (path is None and sys.path or path)
+        for __path in _path:
+            if not __path in pic:
+                try:
+                    pic[__path] = zipimport.zipimporter(__path)
+                except zipimport.ZipImportError:
+                    pic[__path] = None
+        checkeggs = True
+    except AttributeError:
+        checkeggs = False
+    # pkg_resources support (aka setuptools namespace packages)
+    if (_is_namespace(modpath[0]) and modpath[0] in sys.modules):
+        # setuptools has added into sys.modules a module object with proper
+        # __path__, get back information from there
+        module = sys.modules[modpath.pop(0)]
+        path = module.__path__
+        if not modpath:
+            return C_BUILTIN, None
+    imported = []
+    while modpath:
+        modname = modpath[0]
+        # take care to changes in find_module implementation wrt builtin modules
+        #
+        # Python 2.6.6 (r266:84292, Sep 11 2012, 08:34:23)
+        # >>> imp.find_module('posix')
+        # (None, 'posix', ('', '', 6))
+        #
+        # Python 3.3.1 (default, Apr 26 2013, 12:08:46)
+        # >>> imp.find_module('posix')
+        # (None, None, ('', '', 6))
+        try:
+            _, mp_filename, mp_desc = find_module(modname, path)
+        except ImportError:
+            if checkeggs:
+                return _search_zip(modpath, pic)[:2]
+            raise
+        else:
+            if checkeggs and mp_filename:
+                fullabspath = [abspath(x) for x in _path]
+                try:
+                    pathindex = fullabspath.index(dirname(abspath(mp_filename)))
+                    emtype, emp_filename, zippath = _search_zip(modpath, pic)
+                    if pathindex > _path.index(zippath):
+                        # an egg takes priority
+                        return emtype, emp_filename
+                except ValueError:
+                    # XXX not in _path
+                    pass
+                except ImportError:
+                    pass
+                checkeggs = False
+        imported.append(modpath.pop(0))
+        mtype = mp_desc[2]
+        if modpath:
+            if mtype != PKG_DIRECTORY:
+                raise ImportError('No module %s in %s' % ('.'.join(modpath),
+                                                          '.'.join(imported)))
+            # XXX guess if package is using pkgutil.extend_path by looking for
+            # those keywords in the first four Kbytes
+            try:
+                with open(join(mp_filename, '__init__.py')) as stream:
+                    data = stream.read(4096)
+            except IOError:
+                path = [mp_filename]
+            else:
+                if 'pkgutil' in data and 'extend_path' in data:
+                    # extend_path is called, search sys.path for module/packages
+                    # of this name see pkgutil.extend_path documentation
+                    path = [join(p, *imported) for p in sys.path
+                            if isdir(join(p, *imported))]
+                else:
+                    path = [mp_filename]
+    return mtype, mp_filename
+
+def _is_python_file(filename):
+    """return true if the given filename should be considered as a python file
+
+    .pyc and .pyo are ignored
+    """
+    for ext in ('.py', '.so', '.pyd', '.pyw'):
+        if filename.endswith(ext):
+            return True
+    return False
+
+
+def _has_init(directory):
+    """if the given directory has a valid __init__ file, return its path,
+    else return None
+    """
+    mod_or_pack = join(directory, '__init__')
+    for ext in PY_SOURCE_EXTS + ('pyc', 'pyo'):
+        if exists(mod_or_pack + '.' + ext):
+            return mod_or_pack + '.' + ext
+    return None
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/optik_ext.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/optik_ext.py
new file mode 100644
index 0000000..1fd2a7f
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/optik_ext.py
@@ -0,0 +1,392 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Add an abstraction level to transparently import optik classes from optparse
+(python >= 2.3) or the optik package.
+
+It also defines three new types for optik/optparse command line parser :
+
+  * regexp
+    argument of this type will be converted using re.compile
+  * csv
+    argument of this type will be converted using split(',')
+  * yn
+    argument of this type will be true if 'y' or 'yes', false if 'n' or 'no'
+  * named
+    argument of this type are in the form <NAME>=<VALUE> or <NAME>:<VALUE>
+  * password
+    argument of this type wont be converted but this is used by other tools
+    such as interactive prompt for configuration to double check value and
+    use an invisible field
+  * multiple_choice
+    same as default "choice" type but multiple choices allowed
+  * file
+    argument of this type wont be converted but checked that the given file exists
+  * color
+    argument of this type wont be converted but checked its either a
+    named color or a color specified using hexadecimal notation (preceded by a #)
+  * time
+    argument of this type will be converted to a float value in seconds
+    according to time units (ms, s, min, h, d)
+  * bytes
+    argument of this type will be converted to a float value in bytes
+    according to byte units (b, kb, mb, gb, tb)
+"""
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+
+import re
+import sys
+import time
+from copy import copy
+from os.path import exists
+
+# python >= 2.3
+from optparse import OptionParser as BaseParser, Option as BaseOption, \
+     OptionGroup, OptionContainer, OptionValueError, OptionError, \
+     Values, HelpFormatter, NO_DEFAULT, SUPPRESS_HELP
+
+try:
+    from mx import DateTime
+    HAS_MX_DATETIME = True
+except ImportError:
+    HAS_MX_DATETIME = False
+
+from logilab.common.textutils import splitstrip, TIME_UNITS, BYTE_UNITS, \
+    apply_units
+
+
+def check_regexp(option, opt, value):
+    """check a regexp value by trying to compile it
+    return the compiled regexp
+    """
+    if hasattr(value, 'pattern'):
+        return value
+    try:
+        return re.compile(value)
+    except ValueError:
+        raise OptionValueError(
+            "option %s: invalid regexp value: %r" % (opt, value))
+
+def check_csv(option, opt, value):
+    """check a csv value by trying to split it
+    return the list of separated values
+    """
+    if isinstance(value, (list, tuple)):
+        return value
+    try:
+        return splitstrip(value)
+    except ValueError:
+        raise OptionValueError(
+            "option %s: invalid csv value: %r" % (opt, value))
+
+def check_yn(option, opt, value):
+    """check a yn value
+    return true for yes and false for no
+    """
+    if isinstance(value, int):
+        return bool(value)
+    if value in ('y', 'yes'):
+        return True
+    if value in ('n', 'no'):
+        return False
+    msg = "option %s: invalid yn value %r, should be in (y, yes, n, no)"
+    raise OptionValueError(msg % (opt, value))
+
+def check_named(option, opt, value):
+    """check a named value
+    return a dictionary containing (name, value) associations
+    """
+    if isinstance(value, dict):
+        return value
+    values = []
+    for value in check_csv(option, opt, value):
+        if value.find('=') != -1:
+            values.append(value.split('=', 1))
+        elif value.find(':') != -1:
+            values.append(value.split(':', 1))
+    if values:
+        return dict(values)
+    msg = "option %s: invalid named value %r, should be <NAME>=<VALUE> or \
+<NAME>:<VALUE>"
+    raise OptionValueError(msg % (opt, value))
+
+def check_password(option, opt, value):
+    """check a password value (can't be empty)
+    """
+    # no actual checking, monkey patch if you want more
+    return value
+
+def check_file(option, opt, value):
+    """check a file value
+    return the filepath
+    """
+    if exists(value):
+        return value
+    msg = "option %s: file %r does not exist"
+    raise OptionValueError(msg % (opt, value))
+
+# XXX use python datetime
+def check_date(option, opt, value):
+    """check a file value
+    return the filepath
+    """
+    try:
+        return DateTime.strptime(value, "%Y/%m/%d")
+    except DateTime.Error :
+        raise OptionValueError(
+            "expected format of %s is yyyy/mm/dd" % opt)
+
+def check_color(option, opt, value):
+    """check a color value and returns it
+    /!\ does *not* check color labels (like 'red', 'green'), only
+    checks hexadecimal forms
+    """
+    # Case (1) : color label, we trust the end-user
+    if re.match('[a-z0-9 ]+$', value, re.I):
+        return value
+    # Case (2) : only accepts hexadecimal forms
+    if re.match('#[a-f0-9]{6}', value, re.I):
+        return value
+    # Else : not a color label neither a valid hexadecimal form => error
+    msg = "option %s: invalid color : %r, should be either hexadecimal \
+    value or predefined color"
+    raise OptionValueError(msg % (opt, value))
+
+def check_time(option, opt, value):
+    if isinstance(value, (int, long, float)):
+        return value
+    return apply_units(value, TIME_UNITS)
+
+def check_bytes(option, opt, value):
+    if hasattr(value, '__int__'):
+        return value
+    return apply_units(value, BYTE_UNITS)
+
+
+class Option(BaseOption):
+    """override optik.Option to add some new option types
+    """
+    TYPES = BaseOption.TYPES + ('regexp', 'csv', 'yn', 'named', 'password',
+                                'multiple_choice', 'file', 'color',
+                                'time', 'bytes')
+    ATTRS = BaseOption.ATTRS + ['hide', 'level']
+    TYPE_CHECKER = copy(BaseOption.TYPE_CHECKER)
+    TYPE_CHECKER['regexp'] = check_regexp
+    TYPE_CHECKER['csv'] = check_csv
+    TYPE_CHECKER['yn'] = check_yn
+    TYPE_CHECKER['named'] = check_named
+    TYPE_CHECKER['multiple_choice'] = check_csv
+    TYPE_CHECKER['file'] = check_file
+    TYPE_CHECKER['color'] = check_color
+    TYPE_CHECKER['password'] = check_password
+    TYPE_CHECKER['time'] = check_time
+    TYPE_CHECKER['bytes'] = check_bytes
+    if HAS_MX_DATETIME:
+        TYPES += ('date',)
+        TYPE_CHECKER['date'] = check_date
+
+    def __init__(self, *opts, **attrs):
+        BaseOption.__init__(self, *opts, **attrs)
+        if hasattr(self, "hide") and self.hide:
+            self.help = SUPPRESS_HELP
+
+    def _check_choice(self):
+        """FIXME: need to override this due to optik misdesign"""
+        if self.type in ("choice", "multiple_choice"):
+            if self.choices is None:
+                raise OptionError(
+                    "must supply a list of choices for type 'choice'", self)
+            elif not isinstance(self.choices, (tuple, list)):
+                raise OptionError(
+                    "choices must be a list of strings ('%s' supplied)"
+                    % str(type(self.choices)).split("'")[1], self)
+        elif self.choices is not None:
+            raise OptionError(
+                "must not supply choices for type %r" % self.type, self)
+    BaseOption.CHECK_METHODS[2] = _check_choice
+
+
+    def process(self, opt, value, values, parser):
+        # First, convert the value(s) to the right type.  Howl if any
+        # value(s) are bogus.
+        value = self.convert_value(opt, value)
+        if self.type == 'named':
+            existant = getattr(values, self.dest)
+            if existant:
+                existant.update(value)
+                value = existant
+       # And then take whatever action is expected of us.
+        # This is a separate method to make life easier for
+        # subclasses to add new actions.
+        return self.take_action(
+            self.action, self.dest, opt, value, values, parser)
+
+
+class OptionParser(BaseParser):
+    """override optik.OptionParser to use our Option class
+    """
+    def __init__(self, option_class=Option, *args, **kwargs):
+        BaseParser.__init__(self, option_class=Option, *args, **kwargs)
+
+    def format_option_help(self, formatter=None):
+        if formatter is None:
+            formatter = self.formatter
+        outputlevel = getattr(formatter, 'output_level', 0)
+        formatter.store_option_strings(self)
+        result = []
+        result.append(formatter.format_heading("Options"))
+        formatter.indent()
+        if self.option_list:
+            result.append(OptionContainer.format_option_help(self, formatter))
+            result.append("\n")
+        for group in self.option_groups:
+            if group.level <= outputlevel and (
+                group.description or level_options(group, outputlevel)):
+                result.append(group.format_help(formatter))
+                result.append("\n")
+        formatter.dedent()
+        # Drop the last "\n", or the header if no options or option groups:
+        return "".join(result[:-1])
+
+
+OptionGroup.level = 0
+
+def level_options(group, outputlevel):
+    return [option for option in group.option_list
+            if (getattr(option, 'level', 0) or 0) <= outputlevel
+            and not option.help is SUPPRESS_HELP]
+
+def format_option_help(self, formatter):
+    result = []
+    outputlevel = getattr(formatter, 'output_level', 0) or 0
+    for option in level_options(self, outputlevel):
+        result.append(formatter.format_option(option))
+    return "".join(result)
+OptionContainer.format_option_help = format_option_help
+
+
+class ManHelpFormatter(HelpFormatter):
+    """Format help using man pages ROFF format"""
+
+    def __init__ (self,
+                  indent_increment=0,
+                  max_help_position=24,
+                  width=79,
+                  short_first=0):
+        HelpFormatter.__init__ (
+            self, indent_increment, max_help_position, width, short_first)
+
+    def format_heading(self, heading):
+        return '.SH %s\n' % heading.upper()
+
+    def format_description(self, description):
+        return description
+
+    def format_option(self, option):
+        try:
+            optstring = option.option_strings
+        except AttributeError:
+            optstring = self.format_option_strings(option)
+        if option.help:
+            help_text = self.expand_default(option)
+            help = ' '.join([l.strip() for l in help_text.splitlines()])
+        else:
+            help = ''
+        return '''.IP "%s"
+%s
+''' % (optstring, help)
+
+    def format_head(self, optparser, pkginfo, section=1):
+        long_desc = ""
+        try:
+            pgm = optparser._get_prog_name()
+        except AttributeError:
+            # py >= 2.4.X (dunno which X exactly, at least 2)
+            pgm = optparser.get_prog_name()
+        short_desc = self.format_short_description(pgm, pkginfo.description)
+        if hasattr(pkginfo, "long_desc"):
+            long_desc = self.format_long_description(pgm, pkginfo.long_desc)
+        return '%s\n%s\n%s\n%s' % (self.format_title(pgm, section),
+                                   short_desc, self.format_synopsis(pgm),
+                                   long_desc)
+
+    def format_title(self, pgm, section):
+        date = '-'.join([str(num) for num in time.localtime()[:3]])
+        return '.TH %s %s "%s" %s' % (pgm, section, date, pgm)
+
+    def format_short_description(self, pgm, short_desc):
+        return '''.SH NAME
+.B %s
+\- %s
+''' % (pgm, short_desc.strip())
+
+    def format_synopsis(self, pgm):
+        return '''.SH SYNOPSIS
+.B  %s
+[
+.I OPTIONS
+] [
+.I <arguments>
+]
+''' % pgm
+
+    def format_long_description(self, pgm, long_desc):
+        long_desc = '\n'.join([line.lstrip()
+                               for line in long_desc.splitlines()])
+        long_desc = long_desc.replace('\n.\n', '\n\n')
+        if long_desc.lower().startswith(pgm):
+            long_desc = long_desc[len(pgm):]
+        return '''.SH DESCRIPTION
+.B %s
+%s
+''' % (pgm, long_desc.strip())
+
+    def format_tail(self, pkginfo):
+        tail = '''.SH SEE ALSO
+/usr/share/doc/pythonX.Y-%s/
+
+.SH BUGS
+Please report bugs on the project\'s mailing list:
+%s
+
+.SH AUTHOR
+%s <%s>
+''' % (getattr(pkginfo, 'debian_name', pkginfo.modname),
+       pkginfo.mailinglist, pkginfo.author, pkginfo.author_email)
+
+        if hasattr(pkginfo, "copyright"):
+            tail += '''
+.SH COPYRIGHT
+%s
+''' % pkginfo.copyright
+
+        return tail
+
+def generate_manpage(optparser, pkginfo, section=1, stream=sys.stdout, level=0):
+    """generate a man page from an optik parser"""
+    formatter = ManHelpFormatter()
+    formatter.output_level = level
+    formatter.parser = optparser
+    print(formatter.format_head(optparser, pkginfo, section), file=stream)
+    print(optparser.format_option_help(formatter), file=stream)
+    print(formatter.format_tail(pkginfo), file=stream)
+
+
+__all__ = ('OptionParser', 'Option', 'OptionGroup', 'OptionValueError',
+           'Values')
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/optparser.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/optparser.py
new file mode 100644
index 0000000..aa17750
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/optparser.py
@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Extend OptionParser with commands.
+
+Example:
+
+>>> parser = OptionParser()
+>>> parser.usage = '%prog COMMAND [options] <arg> ...'
+>>> parser.add_command('build', 'mymod.build')
+>>> parser.add_command('clean', run_clean, add_opt_clean)
+>>> run, options, args = parser.parse_command(sys.argv[1:])
+>>> return run(options, args[1:])
+
+With mymod.build that defines two functions run and add_options
+"""
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+
+from warnings import warn
+warn('lgc.optparser module is deprecated, use lgc.clcommands instead', DeprecationWarning,
+     stacklevel=2)
+
+import sys
+import optparse
+
+class OptionParser(optparse.OptionParser):
+
+    def __init__(self, *args, **kwargs):
+        optparse.OptionParser.__init__(self, *args, **kwargs)
+        self._commands = {}
+        self.min_args, self.max_args = 0, 1
+
+    def add_command(self, name, mod_or_funcs, help=''):
+        """name of the command, name of module or tuple of functions
+        (run, add_options)
+        """
+        assert isinstance(mod_or_funcs, str) or isinstance(mod_or_funcs, tuple), \
+            "mod_or_funcs has to be a module name or a tuple of functions"
+        self._commands[name] = (mod_or_funcs, help)
+
+    def print_main_help(self):
+        optparse.OptionParser.print_help(self)
+        print('\ncommands:')
+        for cmdname, (_, help) in self._commands.items():
+            print('% 10s - %s' % (cmdname, help))
+
+    def parse_command(self, args):
+        if len(args) == 0:
+            self.print_main_help()
+            sys.exit(1)
+        cmd = args[0]
+        args = args[1:]
+        if cmd not in self._commands:
+            if cmd in ('-h', '--help'):
+                self.print_main_help()
+                sys.exit(0)
+            elif self.version is not None and cmd == "--version":
+                self.print_version()
+                sys.exit(0)
+            self.error('unknown command')
+        self.prog = '%s %s' % (self.prog, cmd)
+        mod_or_f, help = self._commands[cmd]
+        # optparse inserts self.description between usage and options help
+        self.description = help
+        if isinstance(mod_or_f, str):
+            exec('from %s import run, add_options' % mod_or_f)
+        else:
+            run, add_options = mod_or_f
+        add_options(self)
+        (options, args) = self.parse_args(args)
+        if not (self.min_args <= len(args) <= self.max_args):
+            self.error('incorrect number of arguments')
+        return run, options, args
+
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/proc.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/proc.py
new file mode 100644
index 0000000..c27356c
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/proc.py
@@ -0,0 +1,277 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""module providing:
+* process information (linux specific: rely on /proc)
+* a class for resource control (memory / time / cpu time)
+
+This module doesn't work on windows platforms (only tested on linux)
+
+:organization: Logilab
+
+
+
+"""
+__docformat__ = "restructuredtext en"
+
+import os
+import stat
+from resource import getrlimit, setrlimit, RLIMIT_CPU, RLIMIT_AS
+from signal import signal, SIGXCPU, SIGKILL, SIGUSR2, SIGUSR1
+from threading import Timer, currentThread, Thread, Event
+from time import time
+
+from logilab.common.tree import Node
+
+class NoSuchProcess(Exception): pass
+
+def proc_exists(pid):
+    """check the a pid is registered in /proc
+    raise NoSuchProcess exception if not
+    """
+    if not os.path.exists('/proc/%s' % pid):
+        raise NoSuchProcess()
+
+PPID = 3
+UTIME = 13
+STIME = 14
+CUTIME = 15
+CSTIME = 16
+VSIZE = 22
+
+class ProcInfo(Node):
+    """provide access to process information found in /proc"""
+
+    def __init__(self, pid):
+        self.pid = int(pid)
+        Node.__init__(self, self.pid)
+        proc_exists(self.pid)
+        self.file = '/proc/%s/stat' % self.pid
+        self.ppid = int(self.status()[PPID])
+
+    def memory_usage(self):
+        """return the memory usage of the process in Ko"""
+        try :
+            return int(self.status()[VSIZE])
+        except IOError:
+            return 0
+
+    def lineage_memory_usage(self):
+        return self.memory_usage() + sum([child.lineage_memory_usage()
+                                          for child in self.children])
+
+    def time(self, children=0):
+        """return the number of jiffies that this process has been scheduled
+        in user and kernel mode"""
+        status = self.status()
+        time = int(status[UTIME]) + int(status[STIME])
+        if children:
+            time += int(status[CUTIME]) + int(status[CSTIME])
+        return time
+
+    def status(self):
+        """return the list of fields found in /proc/<pid>/stat"""
+        return open(self.file).read().split()
+
+    def name(self):
+        """return the process name found in /proc/<pid>/stat
+        """
+        return self.status()[1].strip('()')
+
+    def age(self):
+        """return the age of the process
+        """
+        return os.stat(self.file)[stat.ST_MTIME]
+
+class ProcInfoLoader:
+    """manage process information"""
+
+    def __init__(self):
+        self._loaded = {}
+
+    def list_pids(self):
+        """return a list of existent process ids"""
+        for subdir in os.listdir('/proc'):
+            if subdir.isdigit():
+                yield int(subdir)
+
+    def load(self, pid):
+        """get a ProcInfo object for a given pid"""
+        pid = int(pid)
+        try:
+            return self._loaded[pid]
+        except KeyError:
+            procinfo = ProcInfo(pid)
+            procinfo.manager = self
+            self._loaded[pid] = procinfo
+            return procinfo
+
+
+    def load_all(self):
+        """load all processes information"""
+        for pid in self.list_pids():
+            try:
+                procinfo = self.load(pid)
+                if procinfo.parent is None and procinfo.ppid:
+                    pprocinfo = self.load(procinfo.ppid)
+                    pprocinfo.append(procinfo)
+            except NoSuchProcess:
+                pass
+
+
+try:
+    class ResourceError(BaseException):
+        """Error raise when resource limit is reached"""
+        limit = "Unknown Resource Limit"
+except NameError:
+    class ResourceError(Exception):
+        """Error raise when resource limit is reached"""
+        limit = "Unknown Resource Limit"
+
+
+class XCPUError(ResourceError):
+    """Error raised when CPU Time limit is reached"""
+    limit = "CPU Time"
+
+class LineageMemoryError(ResourceError):
+    """Error raised when the total amount of memory used by a process and
+    it's child is reached"""
+    limit = "Lineage total Memory"
+
+class TimeoutError(ResourceError):
+    """Error raised when the process is running for to much time"""
+    limit = "Real Time"
+
+# Can't use subclass because the StandardError MemoryError raised
+RESOURCE_LIMIT_EXCEPTION = (ResourceError, MemoryError)
+
+
+class MemorySentinel(Thread):
+    """A class checking a process don't use too much memory in a separated
+    daemonic thread
+    """
+    def __init__(self, interval, memory_limit, gpid=os.getpid()):
+        Thread.__init__(self, target=self._run, name="Test.Sentinel")
+        self.memory_limit = memory_limit
+        self._stop = Event()
+        self.interval = interval
+        self.setDaemon(True)
+        self.gpid = gpid
+
+    def stop(self):
+        """stop ap"""
+        self._stop.set()
+
+    def _run(self):
+        pil = ProcInfoLoader()
+        while not self._stop.isSet():
+            if self.memory_limit <= pil.load(self.gpid).lineage_memory_usage():
+                os.killpg(self.gpid, SIGUSR1)
+            self._stop.wait(self.interval)
+
+
+class ResourceController:
+
+    def __init__(self, max_cpu_time=None, max_time=None, max_memory=None,
+                 max_reprieve=60):
+        if SIGXCPU == -1:
+            raise RuntimeError("Unsupported platform")
+        self.max_time = max_time
+        self.max_memory = max_memory
+        self.max_cpu_time = max_cpu_time
+        self._reprieve = max_reprieve
+        self._timer = None
+        self._msentinel = None
+        self._old_max_memory = None
+        self._old_usr1_hdlr = None
+        self._old_max_cpu_time = None
+        self._old_usr2_hdlr = None
+        self._old_sigxcpu_hdlr = None
+        self._limit_set = 0
+        self._abort_try = 0
+        self._start_time = None
+        self._elapse_time = 0
+
+    def _hangle_sig_timeout(self, sig, frame):
+        raise TimeoutError()
+
+    def _hangle_sig_memory(self, sig, frame):
+        if self._abort_try < self._reprieve:
+            self._abort_try += 1
+            raise LineageMemoryError("Memory limit reached")
+        else:
+            os.killpg(os.getpid(), SIGKILL)
+
+    def _handle_sigxcpu(self, sig, frame):
+        if self._abort_try < self._reprieve:
+            self._abort_try += 1
+            raise XCPUError("Soft CPU time limit reached")
+        else:
+            os.killpg(os.getpid(), SIGKILL)
+
+    def _time_out(self):
+        if self._abort_try < self._reprieve:
+            self._abort_try += 1
+            os.killpg(os.getpid(), SIGUSR2)
+            if self._limit_set > 0:
+                self._timer = Timer(1, self._time_out)
+                self._timer.start()
+        else:
+            os.killpg(os.getpid(), SIGKILL)
+
+    def setup_limit(self):
+        """set up the process limit"""
+        assert currentThread().getName() == 'MainThread'
+        os.setpgrp()
+        if self._limit_set <= 0:
+            if self.max_time is not None:
+                self._old_usr2_hdlr = signal(SIGUSR2, self._hangle_sig_timeout)
+                self._timer = Timer(max(1, int(self.max_time) - self._elapse_time),
+                                    self._time_out)
+                self._start_time = int(time())
+                self._timer.start()
+            if self.max_cpu_time is not None:
+                self._old_max_cpu_time = getrlimit(RLIMIT_CPU)
+                cpu_limit = (int(self.max_cpu_time), self._old_max_cpu_time[1])
+                self._old_sigxcpu_hdlr = signal(SIGXCPU, self._handle_sigxcpu)
+                setrlimit(RLIMIT_CPU, cpu_limit)
+            if self.max_memory is not None:
+                self._msentinel = MemorySentinel(1, int(self.max_memory) )
+                self._old_max_memory = getrlimit(RLIMIT_AS)
+                self._old_usr1_hdlr = signal(SIGUSR1, self._hangle_sig_memory)
+                as_limit = (int(self.max_memory), self._old_max_memory[1])
+                setrlimit(RLIMIT_AS, as_limit)
+                self._msentinel.start()
+        self._limit_set += 1
+
+    def clean_limit(self):
+        """reinstall the old process limit"""
+        if self._limit_set > 0:
+            if self.max_time is not None:
+                self._timer.cancel()
+                self._elapse_time += int(time())-self._start_time
+                self._timer = None
+                signal(SIGUSR2, self._old_usr2_hdlr)
+            if self.max_cpu_time is not None:
+                setrlimit(RLIMIT_CPU, self._old_max_cpu_time)
+                signal(SIGXCPU, self._old_sigxcpu_hdlr)
+            if self.max_memory is not None:
+                self._msentinel.stop()
+                self._msentinel = None
+                setrlimit(RLIMIT_AS, self._old_max_memory)
+                signal(SIGUSR1, self._old_usr1_hdlr)
+        self._limit_set -= 1
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/pytest.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/pytest.py
new file mode 100644
index 0000000..3d8aca3
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/pytest.py
@@ -0,0 +1,1202 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""pytest is a tool that eases test running and debugging.
+
+To be able to use pytest, you should either write tests using
+the logilab.common.testlib's framework or the unittest module of the
+Python's standard library.
+
+You can customize pytest's behaviour by defining a ``pytestconf.py`` file
+somewhere in your test directory. In this file, you can add options or
+change the way tests are run.
+
+To add command line options, you must define a ``update_parser`` function in
+your ``pytestconf.py`` file. The function must accept a single parameter
+that will be the OptionParser's instance to customize.
+
+If you wish to customize the tester, you'll have to define a class named
+``CustomPyTester``. This class should extend the default `PyTester` class
+defined in the pytest module. Take a look at the `PyTester` and `DjangoTester`
+classes for more information about what can be done.
+
+For instance, if you wish to add a custom -l option to specify a loglevel, you
+could define the following ``pytestconf.py`` file ::
+
+    import logging
+    from logilab.common.pytest import PyTester
+
+    def update_parser(parser):
+        parser.add_option('-l', '--loglevel', dest='loglevel', action='store',
+                          choices=('debug', 'info', 'warning', 'error', 'critical'),
+                          default='critical', help="the default log level possible choices are "
+                          "('debug', 'info', 'warning', 'error', 'critical')")
+        return parser
+
+
+    class CustomPyTester(PyTester):
+        def __init__(self, cvg, options):
+            super(CustomPyTester, self).__init__(cvg, options)
+            loglevel = options.loglevel.upper()
+            logger = logging.getLogger('erudi')
+            logger.setLevel(logging.getLevelName(loglevel))
+
+
+In your TestCase class you can then get the value of a specific option with
+the ``optval`` method::
+
+    class MyTestCase(TestCase):
+        def test_foo(self):
+            loglevel = self.optval('loglevel')
+            # ...
+
+
+You can also tag your tag your test for fine filtering
+
+With those tag::
+
+    from logilab.common.testlib import tag, TestCase
+
+    class Exemple(TestCase):
+
+        @tag('rouge', 'carre')
+        def toto(self):
+            pass
+
+        @tag('carre', 'vert')
+        def tata(self):
+            pass
+
+        @tag('rouge')
+        def titi(test):
+            pass
+
+you can filter the function with a simple python expression
+
+ * ``toto`` and ``titi`` match ``rouge``
+ * ``toto``, ``tata`` and ``titi``, match ``rouge or carre``
+ * ``tata`` and ``titi`` match``rouge ^ carre``
+ * ``titi`` match ``rouge and not carre``
+"""
+
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+
+PYTEST_DOC = """%prog [OPTIONS] [testfile [testpattern]]
+
+examples:
+
+pytest path/to/mytests.py
+pytest path/to/mytests.py TheseTests
+pytest path/to/mytests.py TheseTests.test_thisone
+pytest path/to/mytests.py -m '(not long and database) or regr'
+
+pytest one (will run both test_thisone and test_thatone)
+pytest path/to/mytests.py -s not (will skip test_notthisone)
+"""
+
+ENABLE_DBC = False
+FILE_RESTART = ".pytest.restart"
+
+import os, sys, re
+import os.path as osp
+from time import time, clock
+import warnings
+import types
+from inspect import isgeneratorfunction, isclass
+from contextlib import contextmanager
+from random import shuffle
+
+from logilab.common.fileutils import abspath_listdir
+from logilab.common import textutils
+from logilab.common import testlib, STD_BLACKLIST
+# use the same unittest module as testlib
+from logilab.common.testlib import unittest, start_interactive_mode
+from logilab.common.deprecation import deprecated
+import doctest
+
+import unittest as unittest_legacy
+if not getattr(unittest_legacy, "__package__", None):
+    try:
+        import unittest2.suite as unittest_suite
+    except ImportError:
+        sys.exit("You have to install python-unittest2 to use this module")
+else:
+    import unittest.suite as unittest_suite
+
+try:
+    import django
+    from logilab.common.modutils import modpath_from_file, load_module_from_modpath
+    DJANGO_FOUND = True
+except ImportError:
+    DJANGO_FOUND = False
+
+CONF_FILE = 'pytestconf.py'
+
+## coverage pausing tools
+
+@contextmanager
+def replace_trace(trace=None):
+    """A context manager that temporary replaces the trace function"""
+    oldtrace = sys.gettrace()
+    sys.settrace(trace)
+    try:
+        yield
+    finally:
+        # specific hack to work around a bug in pycoverage, see
+        # https://bitbucket.org/ned/coveragepy/issue/123
+        if (oldtrace is not None and not callable(oldtrace) and
+            hasattr(oldtrace, 'pytrace')):
+            oldtrace = oldtrace.pytrace
+        sys.settrace(oldtrace)
+
+
+def pause_trace():
+    """A context manager that temporary pauses any tracing"""
+    return replace_trace()
+
+class TraceController(object):
+    ctx_stack = []
+
+    @classmethod
+    @deprecated('[lgc 0.63.1] Use the pause_trace() context manager')
+    def pause_tracing(cls):
+        cls.ctx_stack.append(pause_trace())
+        cls.ctx_stack[-1].__enter__()
+
+    @classmethod
+    @deprecated('[lgc 0.63.1] Use the pause_trace() context manager')
+    def resume_tracing(cls):
+        cls.ctx_stack.pop().__exit__(None, None, None)
+
+
+pause_tracing = TraceController.pause_tracing
+resume_tracing = TraceController.resume_tracing
+
+
+def nocoverage(func):
+    """Function decorator that pauses tracing functions"""
+    if hasattr(func, 'uncovered'):
+        return func
+    func.uncovered = True
+
+    def not_covered(*args, **kwargs):
+        with pause_trace():
+            return func(*args, **kwargs)
+    not_covered.uncovered = True
+    return not_covered
+
+## end of coverage pausing tools
+
+
+TESTFILE_RE = re.compile("^((unit)?test.*|smoketest)\.py$")
+def this_is_a_testfile(filename):
+    """returns True if `filename` seems to be a test file"""
+    return TESTFILE_RE.match(osp.basename(filename))
+
+TESTDIR_RE = re.compile("^(unit)?tests?$")
+def this_is_a_testdir(dirpath):
+    """returns True if `filename` seems to be a test directory"""
+    return TESTDIR_RE.match(osp.basename(dirpath))
+
+
+def load_pytest_conf(path, parser):
+    """loads a ``pytestconf.py`` file and update default parser
+    and / or tester.
+    """
+    namespace = {}
+    exec(open(path, 'rb').read(), namespace)
+    if 'update_parser' in namespace:
+        namespace['update_parser'](parser)
+    return namespace.get('CustomPyTester', PyTester)
+
+
+def project_root(parser, projdir=os.getcwd()):
+    """try to find project's root and add it to sys.path"""
+    previousdir = curdir = osp.abspath(projdir)
+    testercls = PyTester
+    conf_file_path = osp.join(curdir, CONF_FILE)
+    if osp.isfile(conf_file_path):
+        testercls = load_pytest_conf(conf_file_path, parser)
+    while this_is_a_testdir(curdir) or \
+              osp.isfile(osp.join(curdir, '__init__.py')):
+        newdir = osp.normpath(osp.join(curdir, os.pardir))
+        if newdir == curdir:
+            break
+        previousdir = curdir
+        curdir = newdir
+        conf_file_path = osp.join(curdir, CONF_FILE)
+        if osp.isfile(conf_file_path):
+            testercls = load_pytest_conf(conf_file_path, parser)
+    return previousdir, testercls
+
+
+class GlobalTestReport(object):
+    """this class holds global test statistics"""
+    def __init__(self):
+        self.ran = 0
+        self.skipped = 0
+        self.failures = 0
+        self.errors = 0
+        self.ttime = 0
+        self.ctime = 0
+        self.modulescount = 0
+        self.errmodules = []
+
+    def feed(self, filename, testresult, ttime, ctime):
+        """integrates new test information into internal statistics"""
+        ran = testresult.testsRun
+        self.ran += ran
+        self.skipped += len(getattr(testresult, 'skipped', ()))
+        self.failures += len(testresult.failures)
+        self.errors += len(testresult.errors)
+        self.ttime += ttime
+        self.ctime += ctime
+        self.modulescount += 1
+        if not testresult.wasSuccessful():
+            problems = len(testresult.failures) + len(testresult.errors)
+            self.errmodules.append((filename[:-3], problems, ran))
+
+    def failed_to_test_module(self, filename):
+        """called when the test module could not be imported by unittest
+        """
+        self.errors += 1
+        self.modulescount += 1
+        self.ran += 1
+        self.errmodules.append((filename[:-3], 1, 1))
+
+    def skip_module(self, filename):
+        self.modulescount += 1
+        self.ran += 1
+        self.errmodules.append((filename[:-3], 0, 0))
+
+    def __str__(self):
+        """this is just presentation stuff"""
+        line1 = ['Ran %s test cases in %.2fs (%.2fs CPU)'
+                 % (self.ran, self.ttime, self.ctime)]
+        if self.errors:
+            line1.append('%s errors' % self.errors)
+        if self.failures:
+            line1.append('%s failures' % self.failures)
+        if self.skipped:
+            line1.append('%s skipped' % self.skipped)
+        modulesok = self.modulescount - len(self.errmodules)
+        if self.errors or self.failures:
+            line2 = '%s modules OK (%s failed)' % (modulesok,
+                                                   len(self.errmodules))
+            descr = ', '.join(['%s [%s/%s]' % info for info in self.errmodules])
+            line3 = '\nfailures: %s' % descr
+        elif modulesok:
+            line2 = 'All %s modules OK' % modulesok
+            line3 = ''
+        else:
+            return ''
+        return '%s\n%s%s' % (', '.join(line1), line2, line3)
+
+
+
+def remove_local_modules_from_sys(testdir):
+    """remove all modules from cache that come from `testdir`
+
+    This is used to avoid strange side-effects when using the
+    testall() mode of pytest.
+    For instance, if we run pytest on this tree::
+
+      A/test/test_utils.py
+      B/test/test_utils.py
+
+    we **have** to clean sys.modules to make sure the correct test_utils
+    module is ran in B
+    """
+    for modname, mod in list(sys.modules.items()):
+        if mod is None:
+            continue
+        if not hasattr(mod, '__file__'):
+            # this is the case of some built-in modules like sys, imp, marshal
+            continue
+        modfile = mod.__file__
+        # if modfile is not an absolute path, it was probably loaded locally
+        # during the tests
+        if not osp.isabs(modfile) or modfile.startswith(testdir):
+            del sys.modules[modname]
+
+
+
+class PyTester(object):
+    """encapsulates testrun logic"""
+
+    def __init__(self, cvg, options):
+        self.report = GlobalTestReport()
+        self.cvg = cvg
+        self.options = options
+        self.firstwrite = True
+        self._errcode = None
+
+    def show_report(self):
+        """prints the report and returns appropriate exitcode"""
+        # everything has been ran, print report
+        print("*" * 79)
+        print(self.report)
+
+    def get_errcode(self):
+        # errcode set explicitly
+        if self._errcode is not None:
+            return self._errcode
+        return self.report.failures + self.report.errors
+
+    def set_errcode(self, errcode):
+        self._errcode = errcode
+    errcode = property(get_errcode, set_errcode)
+
+    def testall(self, exitfirst=False):
+        """walks through current working directory, finds something
+        which can be considered as a testdir and runs every test there
+        """
+        here = os.getcwd()
+        for dirname, dirs, _ in os.walk(here):
+            for skipped in STD_BLACKLIST:
+                if skipped in dirs:
+                    dirs.remove(skipped)
+            basename = osp.basename(dirname)
+            if this_is_a_testdir(basename):
+                print("going into", dirname)
+                # we found a testdir, let's explore it !
+                if not self.testonedir(dirname, exitfirst):
+                    break
+                dirs[:] = []
+        if self.report.ran == 0:
+            print("no test dir found testing here:", here)
+            # if no test was found during the visit, consider
+            # the local directory as a test directory even if
+            # it doesn't have a traditional test directory name
+            self.testonedir(here)
+
+    def testonedir(self, testdir, exitfirst=False):
+        """finds each testfile in the `testdir` and runs it
+
+        return true when all tests has been executed, false if exitfirst and
+        some test has failed.
+        """
+        files = abspath_listdir(testdir)
+        shuffle(files)
+        for filename in files:
+            if this_is_a_testfile(filename):
+                if self.options.exitfirst and not self.options.restart:
+                    # overwrite restart file
+                    try:
+                        restartfile = open(FILE_RESTART, "w")
+                        restartfile.close()
+                    except Exception:
+                        print("Error while overwriting succeeded test file :",
+                              osp.join(os.getcwd(), FILE_RESTART),
+                              file=sys.__stderr__)
+                        raise
+                # run test and collect information
+                prog = self.testfile(filename, batchmode=True)
+                if exitfirst and (prog is None or not prog.result.wasSuccessful()):
+                    return False
+                self.firstwrite = True
+        # clean local modules
+        remove_local_modules_from_sys(testdir)
+        return True
+
+    def testfile(self, filename, batchmode=False):
+        """runs every test in `filename`
+
+        :param filename: an absolute path pointing to a unittest file
+        """
+        here = os.getcwd()
+        dirname = osp.dirname(filename)
+        if dirname:
+            os.chdir(dirname)
+        # overwrite restart file if it has not been done already
+        if self.options.exitfirst and not self.options.restart and self.firstwrite:
+            try:
+                restartfile = open(FILE_RESTART, "w")
+                restartfile.close()
+            except Exception:
+                print("Error while overwriting succeeded test file :",
+                      osp.join(os.getcwd(), FILE_RESTART), file=sys.__stderr__)
+                raise
+        modname = osp.basename(filename)[:-3]
+        print(('  %s  ' % osp.basename(filename)).center(70, '='),
+              file=sys.__stderr__)
+        try:
+            tstart, cstart = time(), clock()
+            try:
+                testprog = SkipAwareTestProgram(modname, batchmode=batchmode, cvg=self.cvg,
+                                                 options=self.options, outstream=sys.stderr)
+            except KeyboardInterrupt:
+                raise
+            except SystemExit as exc:
+                self.errcode = exc.code
+                raise
+            except testlib.SkipTest:
+                print("Module skipped:", filename)
+                self.report.skip_module(filename)
+                return None
+            except Exception:
+                self.report.failed_to_test_module(filename)
+                print('unhandled exception occurred while testing', modname,
+                      file=sys.stderr)
+                import traceback
+                traceback.print_exc(file=sys.stderr)
+                return None
+
+            tend, cend = time(), clock()
+            ttime, ctime = (tend - tstart), (cend - cstart)
+            self.report.feed(filename, testprog.result, ttime, ctime)
+            return testprog
+        finally:
+            if dirname:
+                os.chdir(here)
+
+
+
+class DjangoTester(PyTester):
+
+    def load_django_settings(self, dirname):
+        """try to find project's setting and load it"""
+        curdir = osp.abspath(dirname)
+        previousdir = curdir
+        while not osp.isfile(osp.join(curdir, 'settings.py')) and \
+                  osp.isfile(osp.join(curdir, '__init__.py')):
+            newdir = osp.normpath(osp.join(curdir, os.pardir))
+            if newdir == curdir:
+                raise AssertionError('could not find settings.py')
+            previousdir = curdir
+            curdir = newdir
+        # late django initialization
+        settings = load_module_from_modpath(modpath_from_file(osp.join(curdir, 'settings.py')))
+        from django.core.management import setup_environ
+        setup_environ(settings)
+        settings.DEBUG = False
+        self.settings = settings
+        # add settings dir to pythonpath since it's the project's root
+        if curdir not in sys.path:
+            sys.path.insert(1, curdir)
+
+    def before_testfile(self):
+        # Those imports must be done **after** setup_environ was called
+        from django.test.utils import setup_test_environment
+        from django.test.utils import create_test_db
+        setup_test_environment()
+        create_test_db(verbosity=0)
+        self.dbname = self.settings.TEST_DATABASE_NAME
+
+    def after_testfile(self):
+        # Those imports must be done **after** setup_environ was called
+        from django.test.utils import teardown_test_environment
+        from django.test.utils import destroy_test_db
+        teardown_test_environment()
+        print('destroying', self.dbname)
+        destroy_test_db(self.dbname, verbosity=0)
+
+    def testall(self, exitfirst=False):
+        """walks through current working directory, finds something
+        which can be considered as a testdir and runs every test there
+        """
+        for dirname, dirs, files in os.walk(os.getcwd()):
+            for skipped in ('CVS', '.svn', '.hg'):
+                if skipped in dirs:
+                    dirs.remove(skipped)
+            if 'tests.py' in files:
+                if not self.testonedir(dirname, exitfirst):
+                    break
+                dirs[:] = []
+            else:
+                basename = osp.basename(dirname)
+                if basename in ('test', 'tests'):
+                    print("going into", dirname)
+                    # we found a testdir, let's explore it !
+                    if not self.testonedir(dirname, exitfirst):
+                        break
+                    dirs[:] = []
+
+    def testonedir(self, testdir, exitfirst=False):
+        """finds each testfile in the `testdir` and runs it
+
+        return true when all tests has been executed, false if exitfirst and
+        some test has failed.
+        """
+        # special django behaviour : if tests are splitted in several files,
+        # remove the main tests.py file and tests each test file separately
+        testfiles = [fpath for fpath in abspath_listdir(testdir)
+                     if this_is_a_testfile(fpath)]
+        if len(testfiles) > 1:
+            try:
+                testfiles.remove(osp.join(testdir, 'tests.py'))
+            except ValueError:
+                pass
+        for filename in testfiles:
+            # run test and collect information
+            prog = self.testfile(filename, batchmode=True)
+            if exitfirst and (prog is None or not prog.result.wasSuccessful()):
+                return False
+        # clean local modules
+        remove_local_modules_from_sys(testdir)
+        return True
+
+    def testfile(self, filename, batchmode=False):
+        """runs every test in `filename`
+
+        :param filename: an absolute path pointing to a unittest file
+        """
+        here = os.getcwd()
+        dirname = osp.dirname(filename)
+        if dirname:
+            os.chdir(dirname)
+        self.load_django_settings(dirname)
+        modname = osp.basename(filename)[:-3]
+        print(('  %s  ' % osp.basename(filename)).center(70, '='),
+              file=sys.stderr)
+        try:
+            try:
+                tstart, cstart = time(), clock()
+                self.before_testfile()
+                testprog = SkipAwareTestProgram(modname, batchmode=batchmode, cvg=self.cvg)
+                tend, cend = time(), clock()
+                ttime, ctime = (tend - tstart), (cend - cstart)
+                self.report.feed(filename, testprog.result, ttime, ctime)
+                return testprog
+            except SystemExit:
+                raise
+            except Exception as exc:
+                import traceback
+                traceback.print_exc()
+                self.report.failed_to_test_module(filename)
+                print('unhandled exception occurred while testing', modname)
+                print('error: %s' % exc)
+                return None
+        finally:
+            self.after_testfile()
+            if dirname:
+                os.chdir(here)
+
+
+def make_parser():
+    """creates the OptionParser instance
+    """
+    from optparse import OptionParser
+    parser = OptionParser(usage=PYTEST_DOC)
+
+    parser.newargs = []
+    def rebuild_cmdline(option, opt, value, parser):
+        """carry the option to unittest_main"""
+        parser.newargs.append(opt)
+
+    def rebuild_and_store(option, opt, value, parser):
+        """carry the option to unittest_main and store
+        the value on current parser
+        """
+        parser.newargs.append(opt)
+        setattr(parser.values, option.dest, True)
+
+    def capture_and_rebuild(option, opt, value, parser):
+        warnings.simplefilter('ignore', DeprecationWarning)
+        rebuild_cmdline(option, opt, value, parser)
+
+    # pytest options
+    parser.add_option('-t', dest='testdir', default=None,
+                      help="directory where the tests will be found")
+    parser.add_option('-d', dest='dbc', default=False,
+                      action="store_true", help="enable design-by-contract")
+    # unittest_main options provided and passed through pytest
+    parser.add_option('-v', '--verbose', callback=rebuild_cmdline,
+                      action="callback", help="Verbose output")
+    parser.add_option('-i', '--pdb', callback=rebuild_and_store,
+                      dest="pdb", action="callback",
+                      help="Enable test failure inspection")
+    parser.add_option('-x', '--exitfirst', callback=rebuild_and_store,
+                      dest="exitfirst", default=False,
+                      action="callback", help="Exit on first failure "
+                      "(only make sense when pytest run one test file)")
+    parser.add_option('-R', '--restart', callback=rebuild_and_store,
+                      dest="restart", default=False,
+                      action="callback",
+                      help="Restart tests from where it failed (implies exitfirst) "
+                        "(only make sense if tests previously ran with exitfirst only)")
+    parser.add_option('--color', callback=rebuild_cmdline,
+                      action="callback",
+                      help="colorize tracebacks")
+    parser.add_option('-s', '--skip',
+                      # XXX: I wish I could use the callback action but it
+                      #      doesn't seem to be able to get the value
+                      #      associated to the option
+                      action="store", dest="skipped", default=None,
+                      help="test names matching this name will be skipped "
+                      "to skip several patterns, use commas")
+    parser.add_option('-q', '--quiet', callback=rebuild_cmdline,
+                      action="callback", help="Minimal output")
+    parser.add_option('-P', '--profile', default=None, dest='profile',
+                      help="Profile execution and store data in the given file")
+    parser.add_option('-m', '--match', default=None, dest='tags_pattern',
+                      help="only execute test whose tag match the current pattern")
+
+    if DJANGO_FOUND:
+        parser.add_option('-J', '--django', dest='django', default=False,
+                          action="store_true",
+                          help='use pytest for django test cases')
+    return parser
+
+
+def parseargs(parser):
+    """Parse the command line and return (options processed), (options to pass to
+    unittest_main()), (explicitfile or None).
+    """
+    # parse the command line
+    options, args = parser.parse_args()
+    filenames = [arg for arg in args if arg.endswith('.py')]
+    if filenames:
+        if len(filenames) > 1:
+            parser.error("only one filename is acceptable")
+        explicitfile = filenames[0]
+        args.remove(explicitfile)
+    else:
+        explicitfile = None
+    # someone wants DBC
+    testlib.ENABLE_DBC = options.dbc
+    newargs = parser.newargs
+    if options.skipped:
+        newargs.extend(['--skip', options.skipped])
+    # restart implies exitfirst
+    if options.restart:
+        options.exitfirst = True
+    # append additional args to the new sys.argv and let unittest_main
+    # do the rest
+    newargs += args
+    return options, explicitfile
+
+
+
+def run():
+    parser = make_parser()
+    rootdir, testercls = project_root(parser)
+    options, explicitfile = parseargs(parser)
+    # mock a new command line
+    sys.argv[1:] = parser.newargs
+    cvg = None
+    if not '' in sys.path:
+        sys.path.insert(0, '')
+    if DJANGO_FOUND and options.django:
+        tester = DjangoTester(cvg, options)
+    else:
+        tester = testercls(cvg, options)
+    if explicitfile:
+        cmd, args = tester.testfile, (explicitfile,)
+    elif options.testdir:
+        cmd, args = tester.testonedir, (options.testdir, options.exitfirst)
+    else:
+        cmd, args = tester.testall, (options.exitfirst,)
+    try:
+        try:
+            if options.profile:
+                import hotshot
+                prof = hotshot.Profile(options.profile)
+                prof.runcall(cmd, *args)
+                prof.close()
+                print('profile data saved in', options.profile)
+            else:
+                cmd(*args)
+        except SystemExit:
+            raise
+        except:
+            import traceback
+            traceback.print_exc()
+    finally:
+        tester.show_report()
+        sys.exit(tester.errcode)
+
+class SkipAwareTestProgram(unittest.TestProgram):
+    # XXX: don't try to stay close to unittest.py, use optparse
+    USAGE = """\
+Usage: %(progName)s [options] [test] [...]
+
+Options:
+  -h, --help       Show this message
+  -v, --verbose    Verbose output
+  -i, --pdb        Enable test failure inspection
+  -x, --exitfirst  Exit on first failure
+  -s, --skip       skip test matching this pattern (no regexp for now)
+  -q, --quiet      Minimal output
+  --color          colorize tracebacks
+
+  -m, --match      Run only test whose tag match this pattern
+
+  -P, --profile    FILE: Run the tests using cProfile and saving results
+                   in FILE
+
+Examples:
+  %(progName)s                               - run default set of tests
+  %(progName)s MyTestSuite                   - run suite 'MyTestSuite'
+  %(progName)s MyTestCase.testSomething      - run MyTestCase.testSomething
+  %(progName)s MyTestCase                    - run all 'test*' test methods
+                                               in MyTestCase
+"""
+    def __init__(self, module='__main__', defaultTest=None, batchmode=False,
+                 cvg=None, options=None, outstream=sys.stderr):
+        self.batchmode = batchmode
+        self.cvg = cvg
+        self.options = options
+        self.outstream = outstream
+        super(SkipAwareTestProgram, self).__init__(
+            module=module, defaultTest=defaultTest,
+            testLoader=NonStrictTestLoader())
+
+    def parseArgs(self, argv):
+        self.pdbmode = False
+        self.exitfirst = False
+        self.skipped_patterns = []
+        self.test_pattern = None
+        self.tags_pattern = None
+        self.colorize = False
+        self.profile_name = None
+        import getopt
+        try:
+            options, args = getopt.getopt(argv[1:], 'hHvixrqcp:s:m:P:',
+                                          ['help', 'verbose', 'quiet', 'pdb',
+                                           'exitfirst', 'restart',
+                                           'skip=', 'color', 'match=', 'profile='])
+            for opt, value in options:
+                if opt in ('-h', '-H', '--help'):
+                    self.usageExit()
+                if opt in ('-i', '--pdb'):
+                    self.pdbmode = True
+                if opt in ('-x', '--exitfirst'):
+                    self.exitfirst = True
+                if opt in ('-r', '--restart'):
+                    self.restart = True
+                    self.exitfirst = True
+                if opt in ('-q', '--quiet'):
+                    self.verbosity = 0
+                if opt in ('-v', '--verbose'):
+                    self.verbosity = 2
+                if opt in ('-s', '--skip'):
+                    self.skipped_patterns = [pat.strip() for pat in
+                                             value.split(', ')]
+                if opt == '--color':
+                    self.colorize = True
+                if opt in ('-m', '--match'):
+                    #self.tags_pattern = value
+                    self.options["tag_pattern"] = value
+                if opt in ('-P', '--profile'):
+                    self.profile_name = value
+            self.testLoader.skipped_patterns = self.skipped_patterns
+            if len(args) == 0 and self.defaultTest is None:
+                suitefunc = getattr(self.module, 'suite', None)
+                if isinstance(suitefunc, (types.FunctionType,
+                        types.MethodType)):
+                    self.test = self.module.suite()
+                else:
+                    self.test = self.testLoader.loadTestsFromModule(self.module)
+                return
+            if len(args) > 0:
+                self.test_pattern = args[0]
+                self.testNames = args
+            else:
+                self.testNames = (self.defaultTest, )
+            self.createTests()
+        except getopt.error as msg:
+            self.usageExit(msg)
+
+    def runTests(self):
+        if self.profile_name:
+            import cProfile
+            cProfile.runctx('self._runTests()', globals(), locals(), self.profile_name )
+        else:
+            return self._runTests()
+
+    def _runTests(self):
+        self.testRunner = SkipAwareTextTestRunner(verbosity=self.verbosity,
+                                                  stream=self.outstream,
+                                                  exitfirst=self.exitfirst,
+                                                  pdbmode=self.pdbmode,
+                                                  cvg=self.cvg,
+                                                  test_pattern=self.test_pattern,
+                                                  skipped_patterns=self.skipped_patterns,
+                                                  colorize=self.colorize,
+                                                  batchmode=self.batchmode,
+                                                  options=self.options)
+
+        def removeSucceededTests(obj, succTests):
+            """ Recursive function that removes succTests from
+            a TestSuite or TestCase
+            """
+            if isinstance(obj, unittest.TestSuite):
+                removeSucceededTests(obj._tests, succTests)
+            if isinstance(obj, list):
+                for el in obj[:]:
+                    if isinstance(el, unittest.TestSuite):
+                        removeSucceededTests(el, succTests)
+                    elif isinstance(el, unittest.TestCase):
+                        descr = '.'.join((el.__class__.__module__,
+                                el.__class__.__name__,
+                                el._testMethodName))
+                        if descr in succTests:
+                            obj.remove(el)
+        # take care, self.options may be None
+        if getattr(self.options, 'restart', False):
+            # retrieve succeeded tests from FILE_RESTART
+            try:
+                restartfile = open(FILE_RESTART, 'r')
+                try:
+                    succeededtests = list(elem.rstrip('\n\r') for elem in
+                                          restartfile.readlines())
+                    removeSucceededTests(self.test, succeededtests)
+                finally:
+                    restartfile.close()
+            except Exception as ex:
+                raise Exception("Error while reading succeeded tests into %s: %s"
+                                % (osp.join(os.getcwd(), FILE_RESTART), ex))
+
+        result = self.testRunner.run(self.test)
+        # help garbage collection: we want TestSuite, which hold refs to every
+        # executed TestCase, to be gc'ed
+        del self.test
+        if getattr(result, "debuggers", None) and \
+           getattr(self, "pdbmode", None):
+            start_interactive_mode(result)
+        if not getattr(self, "batchmode", None):
+            sys.exit(not result.wasSuccessful())
+        self.result = result
+
+
+class SkipAwareTextTestRunner(unittest.TextTestRunner):
+
+    def __init__(self, stream=sys.stderr, verbosity=1,
+                 exitfirst=False, pdbmode=False, cvg=None, test_pattern=None,
+                 skipped_patterns=(), colorize=False, batchmode=False,
+                 options=None):
+        super(SkipAwareTextTestRunner, self).__init__(stream=stream,
+                                                      verbosity=verbosity)
+        self.exitfirst = exitfirst
+        self.pdbmode = pdbmode
+        self.cvg = cvg
+        self.test_pattern = test_pattern
+        self.skipped_patterns = skipped_patterns
+        self.colorize = colorize
+        self.batchmode = batchmode
+        self.options = options
+
+    def _this_is_skipped(self, testedname):
+        return any([(pat in testedname) for pat in self.skipped_patterns])
+
+    def _runcondition(self, test, skipgenerator=True):
+        if isinstance(test, testlib.InnerTest):
+            testname = test.name
+        else:
+            if isinstance(test, testlib.TestCase):
+                meth = test._get_test_method()
+                testname = '%s.%s' % (test.__name__, meth.__name__)
+            elif isinstance(test, types.FunctionType):
+                func = test
+                testname = func.__name__
+            elif isinstance(test, types.MethodType):
+                cls = test.__self__.__class__
+                testname = '%s.%s' % (cls.__name__, test.__name__)
+            else:
+                return True # Not sure when this happens
+            if isgeneratorfunction(test) and skipgenerator:
+                return self.does_match_tags(test) # Let inner tests decide at run time
+        if self._this_is_skipped(testname):
+            return False # this was explicitly skipped
+        if self.test_pattern is not None:
+            try:
+                classpattern, testpattern = self.test_pattern.split('.')
+                klass, name = testname.split('.')
+                if classpattern not in klass or testpattern not in name:
+                    return False
+            except ValueError:
+                if self.test_pattern not in testname:
+                    return False
+
+        return self.does_match_tags(test)
+
+    def does_match_tags(self, test):
+        if self.options is not None:
+            tags_pattern = getattr(self.options, 'tags_pattern', None)
+            if tags_pattern is not None:
+                tags = getattr(test, 'tags', testlib.Tags())
+                if tags.inherit and isinstance(test, types.MethodType):
+                    tags = tags | getattr(test.__self__.__class__, 'tags', testlib.Tags())
+                return tags.match(tags_pattern)
+        return True # no pattern
+
+    def _makeResult(self):
+        return testlib.SkipAwareTestResult(self.stream, self.descriptions,
+                                   self.verbosity, self.exitfirst,
+                                   self.pdbmode, self.cvg, self.colorize)
+
+    def run(self, test):
+        "Run the given test case or test suite."
+        result = self._makeResult()
+        startTime = time()
+        test(result, runcondition=self._runcondition, options=self.options)
+        stopTime = time()
+        timeTaken = stopTime - startTime
+        result.printErrors()
+        if not self.batchmode:
+            self.stream.writeln(result.separator2)
+            run = result.testsRun
+            self.stream.writeln("Ran %d test%s in %.3fs" %
+                                (run, run != 1 and "s" or "", timeTaken))
+            self.stream.writeln()
+            if not result.wasSuccessful():
+                if self.colorize:
+                    self.stream.write(textutils.colorize_ansi("FAILED", color='red'))
+                else:
+                    self.stream.write("FAILED")
+            else:
+                if self.colorize:
+                    self.stream.write(textutils.colorize_ansi("OK", color='green'))
+                else:
+                    self.stream.write("OK")
+            failed, errored, skipped = map(len, (result.failures,
+                                                 result.errors,
+                                                 result.skipped))
+
+            det_results = []
+            for name, value in (("failures", result.failures),
+                                ("errors",result.errors),
+                                ("skipped", result.skipped)):
+                if value:
+                    det_results.append("%s=%i" % (name, len(value)))
+            if det_results:
+                self.stream.write(" (")
+                self.stream.write(', '.join(det_results))
+                self.stream.write(")")
+            self.stream.writeln("")
+        return result
+
+class NonStrictTestLoader(unittest.TestLoader):
+    """
+    Overrides default testloader to be able to omit classname when
+    specifying tests to run on command line.
+
+    For example, if the file test_foo.py contains ::
+
+        class FooTC(TestCase):
+            def test_foo1(self): # ...
+            def test_foo2(self): # ...
+            def test_bar1(self): # ...
+
+        class BarTC(TestCase):
+            def test_bar2(self): # ...
+
+    'python test_foo.py' will run the 3 tests in FooTC
+    'python test_foo.py FooTC' will run the 3 tests in FooTC
+    'python test_foo.py test_foo' will run test_foo1 and test_foo2
+    'python test_foo.py test_foo1' will run test_foo1
+    'python test_foo.py test_bar' will run FooTC.test_bar1 and BarTC.test_bar2
+    """
+
+    def __init__(self):
+        self.skipped_patterns = ()
+
+    # some magic here to accept empty list by extending
+    # and to provide callable capability
+    def loadTestsFromNames(self, names, module=None):
+        suites = []
+        for name in names:
+            suites.extend(self.loadTestsFromName(name, module))
+        return self.suiteClass(suites)
+
+    def _collect_tests(self, module):
+        tests = {}
+        for obj in vars(module).values():
+            if isclass(obj) and issubclass(obj, unittest.TestCase):
+                classname = obj.__name__
+                if classname[0] == '_' or self._this_is_skipped(classname):
+                    continue
+                methodnames = []
+                # obj is a TestCase class
+                for attrname in dir(obj):
+                    if attrname.startswith(self.testMethodPrefix):
+                        attr = getattr(obj, attrname)
+                        if callable(attr):
+                            methodnames.append(attrname)
+                # keep track of class (obj) for convenience
+                tests[classname] = (obj, methodnames)
+        return tests
+
+    def loadTestsFromSuite(self, module, suitename):
+        try:
+            suite = getattr(module, suitename)()
+        except AttributeError:
+            return []
+        assert hasattr(suite, '_tests'), \
+               "%s.%s is not a valid TestSuite" % (module.__name__, suitename)
+        # python2.3 does not implement __iter__ on suites, we need to return
+        # _tests explicitly
+        return suite._tests
+
+    def loadTestsFromName(self, name, module=None):
+        parts = name.split('.')
+        if module is None or len(parts) > 2:
+            # let the base class do its job here
+            return [super(NonStrictTestLoader, self).loadTestsFromName(name)]
+        tests = self._collect_tests(module)
+        collected = []
+        if len(parts) == 1:
+            pattern = parts[0]
+            if callable(getattr(module, pattern, None)
+                    )  and pattern not in tests:
+                # consider it as a suite
+                return self.loadTestsFromSuite(module, pattern)
+            if pattern in tests:
+                # case python unittest_foo.py MyTestTC
+                klass, methodnames = tests[pattern]
+                for methodname in methodnames:
+                    collected = [klass(methodname)
+                        for methodname in methodnames]
+            else:
+                # case python unittest_foo.py something
+                for klass, methodnames in tests.values():
+                    # skip methodname if matched by skipped_patterns
+                    for skip_pattern in self.skipped_patterns:
+                        methodnames = [methodname
+                                      for methodname in methodnames
+                                      if skip_pattern not in methodname]
+                    collected += [klass(methodname)
+                                  for methodname in methodnames
+                                  if pattern in methodname]
+        elif len(parts) == 2:
+            # case "MyClass.test_1"
+            classname, pattern = parts
+            klass, methodnames = tests.get(classname, (None, []))
+            for methodname in methodnames:
+                collected = [klass(methodname) for methodname in methodnames
+                            if pattern in methodname]
+        return collected
+
+    def _this_is_skipped(self, testedname):
+        return any([(pat in testedname) for pat in self.skipped_patterns])
+
+    def getTestCaseNames(self, testCaseClass):
+        """Return a sorted sequence of method names found within testCaseClass
+        """
+        is_skipped = self._this_is_skipped
+        classname = testCaseClass.__name__
+        if classname[0] == '_' or is_skipped(classname):
+            return []
+        testnames = super(NonStrictTestLoader, self).getTestCaseNames(
+                testCaseClass)
+        return [testname for testname in testnames if not is_skipped(testname)]
+
+
+# The 2 functions below are modified versions of the TestSuite.run method
+# that is provided with unittest2 for python 2.6, in unittest2/suite.py
+# It is used to monkeypatch the original implementation to support
+# extra runcondition and options arguments (see in testlib.py)
+
+def _ts_run(self, result, runcondition=None, options=None):
+    self._wrapped_run(result, runcondition=runcondition, options=options)
+    self._tearDownPreviousClass(None, result)
+    self._handleModuleTearDown(result)
+    return result
+
+def _ts_wrapped_run(self, result, debug=False, runcondition=None, options=None):
+    for test in self:
+        if result.shouldStop:
+            break
+        if unittest_suite._isnotsuite(test):
+            self._tearDownPreviousClass(test, result)
+            self._handleModuleFixture(test, result)
+            self._handleClassSetUp(test, result)
+            result._previousTestClass = test.__class__
+            if (getattr(test.__class__, '_classSetupFailed', False) or
+                getattr(result, '_moduleSetUpFailed', False)):
+                continue
+
+        # --- modifications to deal with _wrapped_run ---
+        # original code is:
+        #
+        # if not debug:
+        #     test(result)
+        # else:
+        #     test.debug()
+        if hasattr(test, '_wrapped_run'):
+            try:
+                test._wrapped_run(result, debug, runcondition=runcondition, options=options)
+            except TypeError:
+                test._wrapped_run(result, debug)
+        elif not debug:
+            try:
+                test(result, runcondition, options)
+            except TypeError:
+                test(result)
+        else:
+            test.debug()
+        # --- end of modifications to deal with _wrapped_run ---
+    return result
+
+if sys.version_info >= (2, 7):
+    # The function below implements a modified version of the
+    # TestSuite.run method that is provided with python 2.7, in
+    # unittest/suite.py
+    def _ts_run(self, result, debug=False, runcondition=None, options=None):
+        topLevel = False
+        if getattr(result, '_testRunEntered', False) is False:
+            result._testRunEntered = topLevel = True
+
+        self._wrapped_run(result, debug, runcondition, options)
+
+        if topLevel:
+            self._tearDownPreviousClass(None, result)
+            self._handleModuleTearDown(result)
+            result._testRunEntered = False
+        return result
+
+
+def enable_dbc(*args):
+    """
+    Without arguments, return True if contracts can be enabled and should be
+    enabled (see option -d), return False otherwise.
+
+    With arguments, return False if contracts can't or shouldn't be enabled,
+    otherwise weave ContractAspect with items passed as arguments.
+    """
+    if not ENABLE_DBC:
+        return False
+    try:
+        from logilab.aspects.weaver import weaver
+        from logilab.aspects.lib.contracts import ContractAspect
+    except ImportError:
+        sys.stderr.write(
+            'Warning: logilab.aspects is not available. Contracts disabled.')
+        return False
+    for arg in args:
+        weaver.weave_module(arg, ContractAspect)
+    return True
+
+
+# monkeypatch unittest and doctest (ouch !)
+unittest._TextTestResult = testlib.SkipAwareTestResult
+unittest.TextTestRunner = SkipAwareTextTestRunner
+unittest.TestLoader = NonStrictTestLoader
+unittest.TestProgram = SkipAwareTestProgram
+
+if sys.version_info >= (2, 4):
+    doctest.DocTestCase.__bases__ = (testlib.TestCase,)
+    # XXX check python2.6 compatibility
+    #doctest.DocTestCase._cleanups = []
+    #doctest.DocTestCase._out = []
+else:
+    unittest.FunctionTestCase.__bases__ = (testlib.TestCase,)
+unittest.TestSuite.run = _ts_run
+unittest.TestSuite._wrapped_run = _ts_wrapped_run
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/registry.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/registry.py
new file mode 100644
index 0000000..86a85f9
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/registry.py
@@ -0,0 +1,1125 @@
+# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of Logilab-common.
+#
+# Logilab-common is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by the
+# Free Software Foundation, either version 2.1 of the License, or (at your
+# option) any later version.
+#
+# Logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with Logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""This module provides bases for predicates dispatching (the pattern in use
+here is similar to what's refered as multi-dispatch or predicate-dispatch in the
+literature, though a bit different since the idea is to select across different
+implementation 'e.g. classes), not to dispatch a message to a function or
+method. It contains the following classes:
+
+* :class:`RegistryStore`, the top level object which loads implementation
+  objects and stores them into registries. You'll usually use it to access
+  registries and their contained objects;
+
+* :class:`Registry`, the base class which contains objects semantically grouped
+  (for instance, sharing a same API, hence the 'implementation' name). You'll
+  use it to select the proper implementation according to a context. Notice you
+  may use registries on their own without using the store.
+
+.. Note::
+
+  implementation objects are usually designed to be accessed through the
+  registry and not by direct instantiation, besides to use it as base classe.
+
+The selection procedure is delegated to a selector, which is responsible for
+scoring the object according to some context. At the end of the selection, if an
+implementation has been found, an instance of this class is returned. A selector
+is built from one or more predicates combined together using AND, OR, NOT
+operators (actually `&`, `|` and `~`). You'll thus find some base classes to
+build predicates:
+
+* :class:`Predicate`, the abstract base predicate class
+
+* :class:`AndPredicate`, :class:`OrPredicate`, :class:`NotPredicate`, which you
+  shouldn't have to use directly. You'll use `&`, `|` and '~' operators between
+  predicates directly
+
+* :func:`objectify_predicate`
+
+You'll eventually find one concrete predicate: :class:`yes`
+
+.. autoclass:: RegistryStore
+.. autoclass:: Registry
+
+Predicates
+----------
+.. autoclass:: Predicate
+.. autofunc:: objectify_predicate
+.. autoclass:: yes
+
+Debugging
+---------
+.. autoclass:: traced_selection
+
+Exceptions
+----------
+.. autoclass:: RegistryException
+.. autoclass:: RegistryNotFound
+.. autoclass:: ObjectNotFound
+.. autoclass:: NoSelectableObject
+"""
+
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+
+import sys
+import types
+import weakref
+import traceback as tb
+from os import listdir, stat
+from os.path import join, isdir, exists
+from logging import getLogger
+from warnings import warn
+
+from six import string_types, add_metaclass
+
+from logilab.common.modutils import modpath_from_file
+from logilab.common.logging_ext import set_log_methods
+from logilab.common.decorators import classproperty
+
+
+class RegistryException(Exception):
+    """Base class for registry exception."""
+
+class RegistryNotFound(RegistryException):
+    """Raised when an unknown registry is requested.
+
+    This is usually a programming/typo error.
+    """
+
+class ObjectNotFound(RegistryException):
+    """Raised when an unregistered object is requested.
+
+    This may be a programming/typo or a misconfiguration error.
+    """
+
+class NoSelectableObject(RegistryException):
+    """Raised when no object is selectable for a given context."""
+    def __init__(self, args, kwargs, objects):
+        self.args = args
+        self.kwargs = kwargs
+        self.objects = objects
+
+    def __str__(self):
+        return ('args: %s, kwargs: %s\ncandidates: %s'
+                % (self.args, self.kwargs.keys(), self.objects))
+
+class SelectAmbiguity(RegistryException):
+    """Raised when several objects compete at selection time with an equal
+    score.
+
+    """
+
+
+def _modname_from_path(path, extrapath=None):
+    modpath = modpath_from_file(path, extrapath)
+    # omit '__init__' from package's name to avoid loading that module
+    # once for each name when it is imported by some other object
+    # module. This supposes import in modules are done as::
+    #
+    #   from package import something
+    #
+    # not::
+    #
+    #   from package.__init__ import something
+    #
+    # which seems quite correct.
+    if modpath[-1] == '__init__':
+        modpath.pop()
+    return '.'.join(modpath)
+
+
+def _toload_info(path, extrapath, _toload=None):
+    """Return a dictionary of <modname>: <modpath> and an ordered list of
+    (file, module name) to load
+    """
+    if _toload is None:
+        assert isinstance(path, list)
+        _toload = {}, []
+    for fileordir in path:
+        if isdir(fileordir) and exists(join(fileordir, '__init__.py')):
+            subfiles = [join(fileordir, fname) for fname in listdir(fileordir)]
+            _toload_info(subfiles, extrapath, _toload)
+        elif fileordir[-3:] == '.py':
+            modname = _modname_from_path(fileordir, extrapath)
+            _toload[0][modname] = fileordir
+            _toload[1].append((fileordir, modname))
+    return _toload
+
+
+class RegistrableObject(object):
+    """This is the base class for registrable objects which are selected
+    according to a context.
+
+    :attr:`__registry__`
+      name of the registry for this object (string like 'views',
+      'templates'...). You may want to define `__registries__` directly if your
+      object should be registered in several registries.
+
+    :attr:`__regid__`
+      object's identifier in the registry (string like 'main',
+      'primary', 'folder_box')
+
+    :attr:`__select__`
+      class'selector
+
+    Moreover, the `__abstract__` attribute may be set to True to indicate that a
+    class is abstract and should not be registered.
+
+    You don't have to inherit from this class to put it in a registry (having
+    `__regid__` and `__select__` is enough), though this is needed for classes
+    that should be automatically registered.
+    """
+
+    __registry__ = None
+    __regid__ = None
+    __select__ = None
+    __abstract__ = True # see doc snipppets below (in Registry class)
+
+    @classproperty
+    def __registries__(cls):
+        if cls.__registry__ is None:
+            return ()
+        return (cls.__registry__,)
+
+
+class RegistrableInstance(RegistrableObject):
+    """Inherit this class if you want instances of the classes to be
+    automatically registered.
+    """
+
+    def __new__(cls, *args, **kwargs):
+        """Add a __module__ attribute telling the module where the instance was
+        created, for automatic registration.
+        """
+        obj = super(RegistrableInstance, cls).__new__(cls)
+        # XXX subclass must no override __new__
+        filepath = tb.extract_stack(limit=2)[0][0]
+        obj.__module__ = _modname_from_path(filepath)
+        return obj
+
+
+class Registry(dict):
+    """The registry store a set of implementations associated to identifier:
+
+    * to each identifier are associated a list of implementations
+
+    * to select an implementation of a given identifier, you should use one of the
+      :meth:`select` or :meth:`select_or_none` method
+
+    * to select a list of implementations for a context, you should use the
+      :meth:`possible_objects` method
+
+    * dictionary like access to an identifier will return the bare list of
+      implementations for this identifier.
+
+    To be usable in a registry, the only requirement is to have a `__select__`
+    attribute.
+
+    At the end of the registration process, the :meth:`__registered__`
+    method is called on each registered object which have them, given the
+    registry in which it's registered as argument.
+
+    Registration methods:
+
+    .. automethod: register
+    .. automethod: unregister
+
+    Selection methods:
+
+    .. automethod: select
+    .. automethod: select_or_none
+    .. automethod: possible_objects
+    .. automethod: object_by_id
+    """
+    def __init__(self, debugmode):
+        super(Registry, self).__init__()
+        self.debugmode = debugmode
+
+    def __getitem__(self, name):
+        """return the registry (list of implementation objects) associated to
+        this name
+        """
+        try:
+            return super(Registry, self).__getitem__(name)
+        except KeyError:
+            exc = ObjectNotFound(name)
+            exc.__traceback__ = sys.exc_info()[-1]
+            raise exc
+
+    @classmethod
+    def objid(cls, obj):
+        """returns a unique identifier for an object stored in the registry"""
+        return '%s.%s' % (obj.__module__, cls.objname(obj))
+
+    @classmethod
+    def objname(cls, obj):
+        """returns a readable name for an object stored in the registry"""
+        return getattr(obj, '__name__', id(obj))
+
+    def initialization_completed(self):
+        """call method __registered__() on registered objects when the callback
+        is defined"""
+        for objects in self.values():
+            for objectcls in objects:
+                registered = getattr(objectcls, '__registered__', None)
+                if registered:
+                    registered(self)
+        if self.debugmode:
+            wrap_predicates(_lltrace)
+
+    def register(self, obj, oid=None, clear=False):
+        """base method to add an object in the registry"""
+        assert not '__abstract__' in obj.__dict__, obj
+        assert obj.__select__, obj
+        oid = oid or obj.__regid__
+        assert oid, ('no explicit name supplied to register object %s, '
+                     'which has no __regid__ set' % obj)
+        if clear:
+            objects = self[oid] =  []
+        else:
+            objects = self.setdefault(oid, [])
+        assert not obj in objects, 'object %s is already registered' % obj
+        objects.append(obj)
+
+    def register_and_replace(self, obj, replaced):
+        """remove <replaced> and register <obj>"""
+        # XXXFIXME this is a duplication of unregister()
+        # remove register_and_replace in favor of unregister + register
+        # or simplify by calling unregister then register here
+        if not isinstance(replaced, string_types):
+            replaced = self.objid(replaced)
+        # prevent from misspelling
+        assert obj is not replaced, 'replacing an object by itself: %s' % obj
+        registered_objs = self.get(obj.__regid__, ())
+        for index, registered in enumerate(registered_objs):
+            if self.objid(registered) == replaced:
+                del registered_objs[index]
+                break
+        else:
+            self.warning('trying to replace %s that is not registered with %s',
+                         replaced, obj)
+        self.register(obj)
+
+    def unregister(self, obj):
+        """remove object <obj> from this registry"""
+        objid = self.objid(obj)
+        oid = obj.__regid__
+        for registered in self.get(oid, ()):
+            # use self.objid() to compare objects because vreg will probably
+            # have its own version of the object, loaded through execfile
+            if self.objid(registered) == objid:
+                self[oid].remove(registered)
+                break
+        else:
+            self.warning('can\'t remove %s, no id %s in the registry',
+                         objid, oid)
+
+    def all_objects(self):
+        """return a list containing all objects in this registry.
+        """
+        result = []
+        for objs in self.values():
+            result += objs
+        return result
+
+    # dynamic selection methods ################################################
+
+    def object_by_id(self, oid, *args, **kwargs):
+        """return object with the `oid` identifier. Only one object is expected
+        to be found.
+
+        raise :exc:`ObjectNotFound` if there are no object with id `oid` in this
+        registry
+
+        raise :exc:`AssertionError` if there is more than one object there
+        """
+        objects = self[oid]
+        assert len(objects) == 1, objects
+        return objects[0](*args, **kwargs)
+
+    def select(self, __oid, *args, **kwargs):
+        """return the most specific object among those with the given oid
+        according to the given context.
+
+        raise :exc:`ObjectNotFound` if there are no object with id `oid` in this
+        registry
+
+        raise :exc:`NoSelectableObject` if no object can be selected
+        """
+        obj =  self._select_best(self[__oid], *args, **kwargs)
+        if obj is None:
+            raise NoSelectableObject(args, kwargs, self[__oid] )
+        return obj
+
+    def select_or_none(self, __oid, *args, **kwargs):
+        """return the most specific object among those with the given oid
+        according to the given context, or None if no object applies.
+        """
+        try:
+            return self._select_best(self[__oid], *args, **kwargs)
+        except ObjectNotFound:
+            return None
+
+    def possible_objects(self, *args, **kwargs):
+        """return an iterator on possible objects in this registry for the given
+        context
+        """
+        for objects in self.values():
+            obj = self._select_best(objects,  *args, **kwargs)
+            if obj is None:
+                continue
+            yield obj
+
+    def _select_best(self, objects, *args, **kwargs):
+        """return an instance of the most specific object according
+        to parameters
+
+        return None if not object apply (don't raise `NoSelectableObject` since
+        it's costly when searching objects using `possible_objects`
+        (e.g. searching for hooks).
+        """
+        score, winners = 0, None
+        for obj in objects:
+            objectscore = obj.__select__(obj, *args, **kwargs)
+            if objectscore > score:
+                score, winners = objectscore, [obj]
+            elif objectscore > 0 and objectscore == score:
+                winners.append(obj)
+        if winners is None:
+            return None
+        if len(winners) > 1:
+            # log in production environement / test, error while debugging
+            msg = 'select ambiguity: %s\n(args: %s, kwargs: %s)'
+            if self.debugmode:
+                # raise bare exception in debug mode
+                raise SelectAmbiguity(msg % (winners, args, kwargs.keys()))
+            self.error(msg, winners, args, kwargs.keys())
+        # return the result of calling the object
+        return self.selected(winners[0], args, kwargs)
+
+    def selected(self, winner, args, kwargs):
+        """override here if for instance you don't want "instanciation"
+        """
+        return winner(*args, **kwargs)
+
+    # these are overridden by set_log_methods below
+    # only defining here to prevent pylint from complaining
+    info = warning = error = critical = exception = debug = lambda msg, *a, **kw: None
+
+
+def obj_registries(cls, registryname=None):
+    """return a tuple of registry names (see __registries__)"""
+    if registryname:
+        return (registryname,)
+    return cls.__registries__
+
+
+class RegistryStore(dict):
+    """This class is responsible for loading objects and storing them
+    in their registry which is created on the fly as needed.
+
+    It handles dynamic registration of objects and provides a
+    convenient api to access them. To be recognized as an object that
+    should be stored into one of the store's registry
+    (:class:`Registry`), an object must provide the following
+    attributes, used control how they interact with the registry:
+
+    :attr:`__registries__`
+      list of registry names (string like 'views', 'templates'...) into which
+      the object should be registered
+
+    :attr:`__regid__`
+      object identifier in the registry (string like 'main',
+      'primary', 'folder_box')
+
+    :attr:`__select__`
+      the object predicate selectors
+
+    Moreover, the :attr:`__abstract__` attribute may be set to `True`
+    to indicate that an object is abstract and should not be registered
+    (such inherited attributes not considered).
+
+    .. Note::
+
+      When using the store to load objects dynamically, you *always* have
+      to use **super()** to get the methods and attributes of the
+      superclasses, and not use the class identifier. If not, you'll get into
+      trouble at reload time.
+
+      For example, instead of writing::
+
+          class Thing(Parent):
+              __regid__ = 'athing'
+              __select__ = yes()
+
+              def f(self, arg1):
+                  Parent.f(self, arg1)
+
+      You must write::
+
+          class Thing(Parent):
+              __regid__ = 'athing'
+              __select__ = yes()
+
+              def f(self, arg1):
+                  super(Thing, self).f(arg1)
+
+    Controlling object registration
+    -------------------------------
+
+    Dynamic loading is triggered by calling the
+    :meth:`register_objects` method, given a list of directories to
+    inspect for python modules.
+
+    .. automethod: register_objects
+
+    For each module, by default, all compatible objects are registered
+    automatically. However if some objects come as replacement of
+    other objects, or have to be included only if some condition is
+    met, you'll have to define a `registration_callback(vreg)`
+    function in the module and explicitly register **all objects** in
+    this module, using the api defined below.
+
+
+    .. automethod:: RegistryStore.register_all
+    .. automethod:: RegistryStore.register_and_replace
+    .. automethod:: RegistryStore.register
+    .. automethod:: RegistryStore.unregister
+
+    .. Note::
+        Once the function `registration_callback(vreg)` is implemented in a
+        module, all the objects from this module have to be explicitly
+        registered as it disables the automatic object registration.
+
+
+    Examples:
+
+    .. sourcecode:: python
+
+       def registration_callback(store):
+          # register everything in the module except BabarClass
+          store.register_all(globals().values(), __name__, (BabarClass,))
+
+          # conditionally register BabarClass
+          if 'babar_relation' in store.schema:
+              store.register(BabarClass)
+
+    In this example, we register all application object classes defined in the module
+    except `BabarClass`. This class is then registered only if the 'babar_relation'
+    relation type is defined in the instance schema.
+
+    .. sourcecode:: python
+
+       def registration_callback(store):
+          store.register(Elephant)
+          # replace Babar by Celeste
+          store.register_and_replace(Celeste, Babar)
+
+    In this example, we explicitly register classes one by one:
+
+    * the `Elephant` class
+    * the `Celeste` to replace `Babar`
+
+    If at some point we register a new appobject class in this module, it won't be
+    registered at all without modification to the `registration_callback`
+    implementation. The first example will register it though, thanks to the call
+    to the `register_all` method.
+
+    Controlling registry instantiation
+    ----------------------------------
+
+    The `REGISTRY_FACTORY` class dictionary allows to specify which class should
+    be instantiated for a given registry name. The class associated to `None`
+    key will be the class used when there is no specific class for a name.
+    """
+
+    def __init__(self, debugmode=False):
+        super(RegistryStore, self).__init__()
+        self.debugmode = debugmode
+
+    def reset(self):
+        """clear all registries managed by this store"""
+        # don't use self.clear, we want to keep existing subdictionaries
+        for subdict in self.values():
+            subdict.clear()
+        self._lastmodifs = {}
+
+    def __getitem__(self, name):
+        """return the registry (dictionary of class objects) associated to
+        this name
+        """
+        try:
+            return super(RegistryStore, self).__getitem__(name)
+        except KeyError:
+            exc = RegistryNotFound(name)
+            exc.__traceback__ = sys.exc_info()[-1]
+            raise exc
+
+    # methods for explicit (un)registration ###################################
+
+    # default class, when no specific class set
+    REGISTRY_FACTORY = {None: Registry}
+
+    def registry_class(self, regid):
+        """return existing registry named regid or use factory to create one and
+        return it"""
+        try:
+            return self.REGISTRY_FACTORY[regid]
+        except KeyError:
+            return self.REGISTRY_FACTORY[None]
+
+    def setdefault(self, regid):
+        try:
+            return self[regid]
+        except RegistryNotFound:
+            self[regid] = self.registry_class(regid)(self.debugmode)
+            return self[regid]
+
+    def register_all(self, objects, modname, butclasses=()):
+        """register registrable objects into `objects`.
+
+        Registrable objects are properly configured subclasses of
+        :class:`RegistrableObject`.  Objects which are not defined in the module
+        `modname` or which are in `butclasses` won't be registered.
+
+        Typical usage is:
+
+        .. sourcecode:: python
+
+            store.register_all(globals().values(), __name__, (ClassIWantToRegisterExplicitly,))
+
+        So you get partially automatic registration, keeping manual registration
+        for some object (to use
+        :meth:`~logilab.common.registry.RegistryStore.register_and_replace` for
+        instance).
+        """
+        assert isinstance(modname, string_types), \
+            'modname expected to be a module name (ie string), got %r' % modname
+        for obj in objects:
+            if self.is_registrable(obj) and obj.__module__ == modname and not obj in butclasses:
+                if isinstance(obj, type):
+                    self._load_ancestors_then_object(modname, obj, butclasses)
+                else:
+                    self.register(obj)
+
+    def register(self, obj, registryname=None, oid=None, clear=False):
+        """register `obj` implementation into `registryname` or
+        `obj.__registries__` if not specified, with identifier `oid` or
+        `obj.__regid__` if not specified.
+
+        If `clear` is true, all objects with the same identifier will be
+        previously unregistered.
+        """
+        assert not obj.__dict__.get('__abstract__'), obj
+        for registryname in obj_registries(obj, registryname):
+            registry = self.setdefault(registryname)
+            registry.register(obj, oid=oid, clear=clear)
+            self.debug("register %s in %s['%s']",
+                       registry.objname(obj), registryname, oid or obj.__regid__)
+            self._loadedmods.setdefault(obj.__module__, {})[registry.objid(obj)] = obj
+
+    def unregister(self, obj, registryname=None):
+        """unregister `obj` object from the registry `registryname` or
+        `obj.__registries__` if not specified.
+        """
+        for registryname in obj_registries(obj, registryname):
+            registry = self[registryname]
+            registry.unregister(obj)
+            self.debug("unregister %s from %s['%s']",
+                       registry.objname(obj), registryname, obj.__regid__)
+
+    def register_and_replace(self, obj, replaced, registryname=None):
+        """register `obj` object into `registryname` or
+        `obj.__registries__` if not specified. If found, the `replaced` object
+        will be unregistered first (else a warning will be issued as it is
+        generally unexpected).
+        """
+        for registryname in obj_registries(obj, registryname):
+            registry = self[registryname]
+            registry.register_and_replace(obj, replaced)
+            self.debug("register %s in %s['%s'] instead of %s",
+                       registry.objname(obj), registryname, obj.__regid__,
+                       registry.objname(replaced))
+
+    # initialization methods ###################################################
+
+    def init_registration(self, path, extrapath=None):
+        """reset registry and walk down path to return list of (path, name)
+        file modules to be loaded"""
+        # XXX make this private by renaming it to _init_registration ?
+        self.reset()
+        # compute list of all modules that have to be loaded
+        self._toloadmods, filemods = _toload_info(path, extrapath)
+        # XXX is _loadedmods still necessary ? It seems like it's useful
+        #     to avoid loading same module twice, especially with the
+        #     _load_ancestors_then_object logic but this needs to be checked
+        self._loadedmods = {}
+        return filemods
+
+    def register_objects(self, path, extrapath=None):
+        """register all objects found walking down <path>"""
+        # load views from each directory in the instance's path
+        # XXX inline init_registration ?
+        filemods = self.init_registration(path, extrapath)
+        for filepath, modname in filemods:
+            self.load_file(filepath, modname)
+        self.initialization_completed()
+
+    def initialization_completed(self):
+        """call initialization_completed() on all known registries"""
+        for reg in self.values():
+            reg.initialization_completed()
+
+    def _mdate(self, filepath):
+        """ return the modification date of a file path """
+        try:
+            return stat(filepath)[-2]
+        except OSError:
+            # this typically happens on emacs backup files (.#foo.py)
+            self.warning('Unable to load %s. It is likely to be a backup file',
+                         filepath)
+            return None
+
+    def is_reload_needed(self, path):
+        """return True if something module changed and the registry should be
+        reloaded
+        """
+        lastmodifs = self._lastmodifs
+        for fileordir in path:
+            if isdir(fileordir) and exists(join(fileordir, '__init__.py')):
+                if self.is_reload_needed([join(fileordir, fname)
+                                          for fname in listdir(fileordir)]):
+                    return True
+            elif fileordir[-3:] == '.py':
+                mdate = self._mdate(fileordir)
+                if mdate is None:
+                    continue # backup file, see _mdate implementation
+                elif "flymake" in fileordir:
+                    # flymake + pylint in use, don't consider these they will corrupt the registry
+                    continue
+                if fileordir not in lastmodifs or lastmodifs[fileordir] < mdate:
+                    self.info('File %s changed since last visit', fileordir)
+                    return True
+        return False
+
+    def load_file(self, filepath, modname):
+        """ load registrable objects (if any) from a python file """
+        from logilab.common.modutils import load_module_from_name
+        if modname in self._loadedmods:
+            return
+        self._loadedmods[modname] = {}
+        mdate = self._mdate(filepath)
+        if mdate is None:
+            return # backup file, see _mdate implementation
+        elif "flymake" in filepath:
+            # flymake + pylint in use, don't consider these they will corrupt the registry
+            return
+        # set update time before module loading, else we get some reloading
+        # weirdness in case of syntax error or other error while importing the
+        # module
+        self._lastmodifs[filepath] = mdate
+        # load the module
+        module = load_module_from_name(modname)
+        self.load_module(module)
+
+    def load_module(self, module):
+        """Automatically handle module objects registration.
+
+        Instances are registered as soon as they are hashable and have the
+        following attributes:
+
+        * __regid__ (a string)
+        * __select__ (a callable)
+        * __registries__ (a tuple/list of string)
+
+        For classes this is a bit more complicated :
+
+        - first ensure parent classes are already registered
+
+        - class with __abstract__ == True in their local dictionary are skipped
+
+        - object class needs to have registries and identifier properly set to a
+          non empty string to be registered.
+        """
+        self.info('loading %s from %s', module.__name__, module.__file__)
+        if hasattr(module, 'registration_callback'):
+            module.registration_callback(self)
+        else:
+            self.register_all(vars(module).values(), module.__name__)
+
+    def _load_ancestors_then_object(self, modname, objectcls, butclasses=()):
+        """handle class registration according to rules defined in
+        :meth:`load_module`
+        """
+        # backward compat, we used to allow whatever else than classes
+        if not isinstance(objectcls, type):
+            if self.is_registrable(objectcls) and objectcls.__module__ == modname:
+                self.register(objectcls)
+            return
+        # imported classes
+        objmodname = objectcls.__module__
+        if objmodname != modname:
+            # The module of the object is not the same as the currently
+            # worked on module, or this is actually an instance, which
+            # has no module at all
+            if objmodname in self._toloadmods:
+                # if this is still scheduled for loading, let's proceed immediately,
+                # but using the object module
+                self.load_file(self._toloadmods[objmodname], objmodname)
+            return
+        # ensure object hasn't been already processed
+        clsid = '%s.%s' % (modname, objectcls.__name__)
+        if clsid in self._loadedmods[modname]:
+            return
+        self._loadedmods[modname][clsid] = objectcls
+        # ensure ancestors are registered
+        for parent in objectcls.__bases__:
+            self._load_ancestors_then_object(modname, parent, butclasses)
+        # ensure object is registrable
+        if objectcls in butclasses or not self.is_registrable(objectcls):
+            return
+        # backward compat
+        reg = self.setdefault(obj_registries(objectcls)[0])
+        if reg.objname(objectcls)[0] == '_':
+            warn("[lgc 0.59] object whose name start with '_' won't be "
+                 "skipped anymore at some point, use __abstract__ = True "
+                 "instead (%s)" % objectcls, DeprecationWarning)
+            return
+        # register, finally
+        self.register(objectcls)
+
+    @classmethod
+    def is_registrable(cls, obj):
+        """ensure `obj` should be registered
+
+        as arbitrary stuff may be registered, do a lot of check and warn about
+        weird cases (think to dumb proxy objects)
+        """
+        if isinstance(obj, type):
+            if not issubclass(obj, RegistrableObject):
+                # ducktyping backward compat
+                if not (getattr(obj, '__registries__', None)
+                        and getattr(obj, '__regid__', None)
+                        and getattr(obj, '__select__', None)):
+                    return False
+            elif issubclass(obj, RegistrableInstance):
+                return False
+        elif not isinstance(obj, RegistrableInstance):
+            return False
+        if not obj.__regid__:
+            return False # no regid
+        registries = obj.__registries__
+        if not registries:
+            return False # no registries
+        selector = obj.__select__
+        if not selector:
+            return False # no selector
+        if obj.__dict__.get('__abstract__', False):
+            return False
+        # then detect potential problems that should be warned
+        if not isinstance(registries, (tuple, list)):
+            cls.warning('%s has __registries__ which is not a list or tuple', obj)
+            return False
+        if not callable(selector):
+            cls.warning('%s has not callable __select__', obj)
+            return False
+        return True
+
+    # these are overridden by set_log_methods below
+    # only defining here to prevent pylint from complaining
+    info = warning = error = critical = exception = debug = lambda msg, *a, **kw: None
+
+
+# init logging
+set_log_methods(RegistryStore, getLogger('registry.store'))
+set_log_methods(Registry, getLogger('registry'))
+
+
+# helpers for debugging selectors
+TRACED_OIDS = None
+
+def _trace_selector(cls, selector, args, ret):
+    vobj = args[0]
+    if TRACED_OIDS == 'all' or vobj.__regid__ in TRACED_OIDS:
+        print('%s -> %s for %s(%s)' % (cls, ret, vobj, vobj.__regid__))
+
+def _lltrace(selector):
+    """use this decorator on your predicates so they become traceable with
+    :class:`traced_selection`
+    """
+    def traced(cls, *args, **kwargs):
+        ret = selector(cls, *args, **kwargs)
+        if TRACED_OIDS is not None:
+            _trace_selector(cls, selector, args, ret)
+        return ret
+    traced.__name__ = selector.__name__
+    traced.__doc__ = selector.__doc__
+    return traced
+
+class traced_selection(object): # pylint: disable=C0103
+    """
+    Typical usage is :
+
+    .. sourcecode:: python
+
+        >>> from logilab.common.registry import traced_selection
+        >>> with traced_selection():
+        ...     # some code in which you want to debug selectors
+        ...     # for all objects
+
+    This will yield lines like this in the logs::
+
+        selector one_line_rset returned 0 for <class 'elephant.Babar'>
+
+    You can also give to :class:`traced_selection` the identifiers of objects on
+    which you want to debug selection ('oid1' and 'oid2' in the example above).
+
+    .. sourcecode:: python
+
+        >>> with traced_selection( ('regid1', 'regid2') ):
+        ...     # some code in which you want to debug selectors
+        ...     # for objects with __regid__ 'regid1' and 'regid2'
+
+    A potentially useful point to set up such a tracing function is
+    the `logilab.common.registry.Registry.select` method body.
+    """
+
+    def __init__(self, traced='all'):
+        self.traced = traced
+
+    def __enter__(self):
+        global TRACED_OIDS
+        TRACED_OIDS = self.traced
+
+    def __exit__(self, exctype, exc, traceback):
+        global TRACED_OIDS
+        TRACED_OIDS = None
+        return traceback is None
+
+# selector base classes and operations ########################################
+
+def objectify_predicate(selector_func):
+    """Most of the time, a simple score function is enough to build a selector.
+    The :func:`objectify_predicate` decorator turn it into a proper selector
+    class::
+
+        @objectify_predicate
+        def one(cls, req, rset=None, **kwargs):
+            return 1
+
+        class MyView(View):
+            __select__ = View.__select__ & one()
+
+    """
+    return type(selector_func.__name__, (Predicate,),
+                {'__doc__': selector_func.__doc__,
+                 '__call__': lambda self, *a, **kw: selector_func(*a, **kw)})
+
+
+_PREDICATES = {}
+
+def wrap_predicates(decorator):
+    for predicate in _PREDICATES.values():
+        if not '_decorators' in predicate.__dict__:
+            predicate._decorators = set()
+        if decorator in predicate._decorators:
+            continue
+        predicate._decorators.add(decorator)
+        predicate.__call__ = decorator(predicate.__call__)
+
+class PredicateMetaClass(type):
+    def __new__(mcs, *args, **kwargs):
+        # use __new__ so subclasses doesn't have to call Predicate.__init__
+        inst = type.__new__(mcs, *args, **kwargs)
+        proxy = weakref.proxy(inst, lambda p: _PREDICATES.pop(id(p)))
+        _PREDICATES[id(proxy)] = proxy
+        return inst
+
+
+@add_metaclass(PredicateMetaClass)
+class Predicate(object):
+    """base class for selector classes providing implementation
+    for operators ``&``, ``|`` and  ``~``
+
+    This class is only here to give access to binary operators, the selector
+    logic itself should be implemented in the :meth:`__call__` method. Notice it
+    should usually accept any arbitrary arguments (the context), though that may
+    vary depending on your usage of the registry.
+
+    a selector is called to help choosing the correct object for a
+    particular context by returning a score (`int`) telling how well
+    the implementation given as first argument fit to the given context.
+
+    0 score means that the class doesn't apply.
+    """
+
+    @property
+    def func_name(self):
+        # backward compatibility
+        return self.__class__.__name__
+
+    def search_selector(self, selector):
+        """search for the given selector, selector instance or tuple of
+        selectors in the selectors tree. Return None if not found.
+        """
+        if self is selector:
+            return self
+        if (isinstance(selector, type) or isinstance(selector, tuple)) and \
+               isinstance(self, selector):
+            return self
+        return None
+
+    def __str__(self):
+        return self.__class__.__name__
+
+    def __and__(self, other):
+        return AndPredicate(self, other)
+    def __rand__(self, other):
+        return AndPredicate(other, self)
+    def __iand__(self, other):
+        return AndPredicate(self, other)
+    def __or__(self, other):
+        return OrPredicate(self, other)
+    def __ror__(self, other):
+        return OrPredicate(other, self)
+    def __ior__(self, other):
+        return OrPredicate(self, other)
+
+    def __invert__(self):
+        return NotPredicate(self)
+
+    # XXX (function | function) or (function & function) not managed yet
+
+    def __call__(self, cls, *args, **kwargs):
+        return NotImplementedError("selector %s must implement its logic "
+                                   "in its __call__ method" % self.__class__)
+
+    def __repr__(self):
+        return u'<Predicate %s at %x>' % (self.__class__.__name__, id(self))
+
+
+class MultiPredicate(Predicate):
+    """base class for compound selector classes"""
+
+    def __init__(self, *selectors):
+        self.selectors = self.merge_selectors(selectors)
+
+    def __str__(self):
+        return '%s(%s)' % (self.__class__.__name__,
+                           ','.join(str(s) for s in self.selectors))
+
+    @classmethod
+    def merge_selectors(cls, selectors):
+        """deal with selector instanciation when necessary and merge
+        multi-selectors if possible:
+
+        AndPredicate(AndPredicate(sel1, sel2), AndPredicate(sel3, sel4))
+        ==> AndPredicate(sel1, sel2, sel3, sel4)
+        """
+        merged_selectors = []
+        for selector in selectors:
+            # XXX do we really want magic-transformations below?
+            # if so, wanna warn about them?
+            if isinstance(selector, types.FunctionType):
+                selector = objectify_predicate(selector)()
+            if isinstance(selector, type) and issubclass(selector, Predicate):
+                selector = selector()
+            assert isinstance(selector, Predicate), selector
+            if isinstance(selector, cls):
+                merged_selectors += selector.selectors
+            else:
+                merged_selectors.append(selector)
+        return merged_selectors
+
+    def search_selector(self, selector):
+        """search for the given selector or selector instance (or tuple of
+        selectors) in the selectors tree. Return None if not found
+        """
+        for childselector in self.selectors:
+            if childselector is selector:
+                return childselector
+            found = childselector.search_selector(selector)
+            if found is not None:
+                return found
+        # if not found in children, maybe we are looking for self?
+        return super(MultiPredicate, self).search_selector(selector)
+
+
+class AndPredicate(MultiPredicate):
+    """and-chained selectors"""
+    def __call__(self, cls, *args, **kwargs):
+        score = 0
+        for selector in self.selectors:
+            partscore = selector(cls, *args, **kwargs)
+            if not partscore:
+                return 0
+            score += partscore
+        return score
+
+
+class OrPredicate(MultiPredicate):
+    """or-chained selectors"""
+    def __call__(self, cls, *args, **kwargs):
+        for selector in self.selectors:
+            partscore = selector(cls, *args, **kwargs)
+            if partscore:
+                return partscore
+        return 0
+
+class NotPredicate(Predicate):
+    """negation selector"""
+    def __init__(self, selector):
+        self.selector = selector
+
+    def __call__(self, cls, *args, **kwargs):
+        score = self.selector(cls, *args, **kwargs)
+        return int(not score)
+
+    def __str__(self):
+        return 'NOT(%s)' % self.selector
+
+
+class yes(Predicate): # pylint: disable=C0103
+    """Return the score given as parameter, with a default score of 0.5 so any
+    other selector take precedence.
+
+    Usually used for objects which can be selected whatever the context, or
+    also sometimes to add arbitrary points to a score.
+
+    Take care, `yes(0)` could be named 'no'...
+    """
+    def __init__(self, score=0.5):
+        self.score = score
+
+    def __call__(self, *args, **kwargs):
+        return self.score
+
+
+# deprecated stuff #############################################################
+
+from logilab.common.deprecation import deprecated
+
+@deprecated('[lgc 0.59] use Registry.objid class method instead')
+def classid(cls):
+    return '%s.%s' % (cls.__module__, cls.__name__)
+
+@deprecated('[lgc 0.59] use obj_registries function instead')
+def class_registries(cls, registryname):
+    return obj_registries(cls, registryname)
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/shellutils.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/shellutils.py
new file mode 100644
index 0000000..4e68956
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/shellutils.py
@@ -0,0 +1,462 @@
+# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""shell/term utilities, useful to write some python scripts instead of shell
+scripts.
+"""
+
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+
+import os
+import glob
+import shutil
+import stat
+import sys
+import tempfile
+import time
+import fnmatch
+import errno
+import string
+import random
+import subprocess
+from os.path import exists, isdir, islink, basename, join
+
+from six import string_types
+from six.moves import range, input as raw_input
+
+from logilab.common import STD_BLACKLIST, _handle_blacklist
+from logilab.common.compat import str_to_bytes
+from logilab.common.deprecation import deprecated
+
+try:
+    from logilab.common.proc import ProcInfo, NoSuchProcess
+except ImportError:
+    # windows platform
+    class NoSuchProcess(Exception): pass
+
+    def ProcInfo(pid):
+        raise NoSuchProcess()
+
+
+class tempdir(object):
+
+    def __enter__(self):
+        self.path = tempfile.mkdtemp()
+        return self.path
+
+    def __exit__(self, exctype, value, traceback):
+        # rmtree in all cases
+        shutil.rmtree(self.path)
+        return traceback is None
+
+
+class pushd(object):
+    def __init__(self, directory):
+        self.directory = directory
+
+    def __enter__(self):
+        self.cwd = os.getcwd()
+        os.chdir(self.directory)
+        return self.directory
+
+    def __exit__(self, exctype, value, traceback):
+        os.chdir(self.cwd)
+
+
+def chown(path, login=None, group=None):
+    """Same as `os.chown` function but accepting user login or group name as
+    argument. If login or group is omitted, it's left unchanged.
+
+    Note: you must own the file to chown it (or be root). Otherwise OSError is raised.
+    """
+    if login is None:
+        uid = -1
+    else:
+        try:
+            uid = int(login)
+        except ValueError:
+            import pwd # Platforms: Unix
+            uid = pwd.getpwnam(login).pw_uid
+    if group is None:
+        gid = -1
+    else:
+        try:
+            gid = int(group)
+        except ValueError:
+            import grp
+            gid = grp.getgrnam(group).gr_gid
+    os.chown(path, uid, gid)
+
+def mv(source, destination, _action=shutil.move):
+    """A shell-like mv, supporting wildcards.
+    """
+    sources = glob.glob(source)
+    if len(sources) > 1:
+        assert isdir(destination)
+        for filename in sources:
+            _action(filename, join(destination, basename(filename)))
+    else:
+        try:
+            source = sources[0]
+        except IndexError:
+            raise OSError('No file matching %s' % source)
+        if isdir(destination) and exists(destination):
+            destination = join(destination, basename(source))
+        try:
+            _action(source, destination)
+        except OSError as ex:
+            raise OSError('Unable to move %r to %r (%s)' % (
+                source, destination, ex))
+
+def rm(*files):
+    """A shell-like rm, supporting wildcards.
+    """
+    for wfile in files:
+        for filename in glob.glob(wfile):
+            if islink(filename):
+                os.remove(filename)
+            elif isdir(filename):
+                shutil.rmtree(filename)
+            else:
+                os.remove(filename)
+
+def cp(source, destination):
+    """A shell-like cp, supporting wildcards.
+    """
+    mv(source, destination, _action=shutil.copy)
+
+def find(directory, exts, exclude=False, blacklist=STD_BLACKLIST):
+    """Recursively find files ending with the given extensions from the directory.
+
+    :type directory: str
+    :param directory:
+      directory where the search should start
+
+    :type exts: basestring or list or tuple
+    :param exts:
+      extensions or lists or extensions to search
+
+    :type exclude: boolean
+    :param exts:
+      if this argument is True, returning files NOT ending with the given
+      extensions
+
+    :type blacklist: list or tuple
+    :param blacklist:
+      optional list of files or directory to ignore, default to the value of
+      `logilab.common.STD_BLACKLIST`
+
+    :rtype: list
+    :return:
+      the list of all matching files
+    """
+    if isinstance(exts, string_types):
+        exts = (exts,)
+    if exclude:
+        def match(filename, exts):
+            for ext in exts:
+                if filename.endswith(ext):
+                    return False
+            return True
+    else:
+        def match(filename, exts):
+            for ext in exts:
+                if filename.endswith(ext):
+                    return True
+            return False
+    files = []
+    for dirpath, dirnames, filenames in os.walk(directory):
+        _handle_blacklist(blacklist, dirnames, filenames)
+        # don't append files if the directory is blacklisted
+        dirname = basename(dirpath)
+        if dirname in blacklist:
+            continue
+        files.extend([join(dirpath, f) for f in filenames if match(f, exts)])
+    return files
+
+
+def globfind(directory, pattern, blacklist=STD_BLACKLIST):
+    """Recursively finds files matching glob `pattern` under `directory`.
+
+    This is an alternative to `logilab.common.shellutils.find`.
+
+    :type directory: str
+    :param directory:
+      directory where the search should start
+
+    :type pattern: basestring
+    :param pattern:
+      the glob pattern (e.g *.py, foo*.py, etc.)
+
+    :type blacklist: list or tuple
+    :param blacklist:
+      optional list of files or directory to ignore, default to the value of
+      `logilab.common.STD_BLACKLIST`
+
+    :rtype: iterator
+    :return:
+      iterator over the list of all matching files
+    """
+    for curdir, dirnames, filenames in os.walk(directory):
+        _handle_blacklist(blacklist, dirnames, filenames)
+        for fname in fnmatch.filter(filenames, pattern):
+            yield join(curdir, fname)
+
+def unzip(archive, destdir):
+    import zipfile
+    if not exists(destdir):
+        os.mkdir(destdir)
+    zfobj = zipfile.ZipFile(archive)
+    for name in zfobj.namelist():
+        if name.endswith('/'):
+            os.mkdir(join(destdir, name))
+        else:
+            outfile = open(join(destdir, name), 'wb')
+            outfile.write(zfobj.read(name))
+            outfile.close()
+
+
+class Execute:
+    """This is a deadlock safe version of popen2 (no stdin), that returns
+    an object with errorlevel, out and err.
+    """
+
+    def __init__(self, command):
+        cmd = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        self.out, self.err = cmd.communicate()
+        self.status = os.WEXITSTATUS(cmd.returncode)
+
+Execute = deprecated('Use subprocess.Popen instead')(Execute)
+
+
+def acquire_lock(lock_file, max_try=10, delay=10, max_delay=3600):
+    """Acquire a lock represented by a file on the file system
+
+    If the process written in lock file doesn't exist anymore, we remove the
+    lock file immediately
+    If age of the lock_file is greater than max_delay, then we raise a UserWarning
+    """
+    count = abs(max_try)
+    while count:
+        try:
+            fd = os.open(lock_file, os.O_EXCL | os.O_RDWR | os.O_CREAT)
+            os.write(fd, str_to_bytes(str(os.getpid())) )
+            os.close(fd)
+            return True
+        except OSError as e:
+            if e.errno == errno.EEXIST:
+                try:
+                    fd = open(lock_file, "r")
+                    pid = int(fd.readline())
+                    pi = ProcInfo(pid)
+                    age = (time.time() - os.stat(lock_file)[stat.ST_MTIME])
+                    if age / max_delay > 1 :
+                        raise UserWarning("Command '%s' (pid %s) has locked the "
+                                          "file '%s' for %s minutes"
+                                          % (pi.name(), pid, lock_file, age/60))
+                except UserWarning:
+                    raise
+                except NoSuchProcess:
+                    os.remove(lock_file)
+                except Exception:
+                    # The try block is not essential. can be skipped.
+                    # Note: ProcInfo object is only available for linux
+                    # process information are not accessible...
+                    # or lock_file is no more present...
+                    pass
+            else:
+                raise
+            count -= 1
+            time.sleep(delay)
+    else:
+        raise Exception('Unable to acquire %s' % lock_file)
+
+def release_lock(lock_file):
+    """Release a lock represented by a file on the file system."""
+    os.remove(lock_file)
+
+
+class ProgressBar(object):
+    """A simple text progression bar."""
+
+    def __init__(self, nbops, size=20, stream=sys.stdout, title=''):
+        if title:
+            self._fstr = '\r%s [%%-%ss]' % (title, int(size))
+        else:
+            self._fstr = '\r[%%-%ss]' % int(size)
+        self._stream = stream
+        self._total = nbops
+        self._size = size
+        self._current = 0
+        self._progress = 0
+        self._current_text = None
+        self._last_text_write_size = 0
+
+    def _get_text(self):
+        return self._current_text
+
+    def _set_text(self, text=None):
+        if text != self._current_text:
+            self._current_text = text
+            self.refresh()
+
+    def _del_text(self):
+        self.text = None
+
+    text = property(_get_text, _set_text, _del_text)
+
+    def update(self, offset=1, exact=False):
+        """Move FORWARD to new cursor position (cursor will never go backward).
+
+        :offset: fraction of ``size``
+
+        :exact:
+
+          - False: offset relative to current cursor position if True
+          - True: offset as an asbsolute position
+
+        """
+        if exact:
+            self._current = offset
+        else:
+            self._current += offset
+
+        progress = int((float(self._current)/float(self._total))*self._size)
+        if progress > self._progress:
+            self._progress = progress
+            self.refresh()
+
+    def refresh(self):
+        """Refresh the progression bar display."""
+        self._stream.write(self._fstr % ('=' * min(self._progress, self._size)) )
+        if self._last_text_write_size or self._current_text:
+            template = ' %%-%is' % (self._last_text_write_size)
+            text = self._current_text
+            if text is None:
+                text = ''
+            self._stream.write(template % text)
+            self._last_text_write_size = len(text.rstrip())
+        self._stream.flush()
+
+    def finish(self):
+        self._stream.write('\n')
+        self._stream.flush()
+
+
+class DummyProgressBar(object):
+    __slot__ = ('text',)
+
+    def refresh(self):
+        pass
+    def update(self):
+        pass
+    def finish(self):
+        pass
+
+
+_MARKER = object()
+class progress(object):
+
+    def __init__(self, nbops=_MARKER, size=_MARKER, stream=_MARKER, title=_MARKER, enabled=True):
+        self.nbops = nbops
+        self.size = size
+        self.stream = stream
+        self.title = title
+        self.enabled = enabled
+
+    def __enter__(self):
+        if self.enabled:
+            kwargs = {}
+            for attr in ('nbops', 'size', 'stream', 'title'):
+                value = getattr(self, attr)
+                if value is not _MARKER:
+                    kwargs[attr] = value
+            self.pb = ProgressBar(**kwargs)
+        else:
+            self.pb =  DummyProgressBar()
+        return self.pb
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.pb.finish()
+
+class RawInput(object):
+
+    def __init__(self, input=None, printer=None):
+        self._input = input or raw_input
+        self._print = printer
+
+    def ask(self, question, options, default):
+        assert default in options
+        choices = []
+        for option in options:
+            if option == default:
+                label = option[0].upper()
+            else:
+                label = option[0].lower()
+            if len(option) > 1:
+                label += '(%s)' % option[1:].lower()
+            choices.append((option, label))
+        prompt = "%s [%s]: " % (question,
+                                '/'.join([opt[1] for opt in choices]))
+        tries = 3
+        while tries > 0:
+            answer = self._input(prompt).strip().lower()
+            if not answer:
+                return default
+            possible = [option for option, label in choices
+                        if option.lower().startswith(answer)]
+            if len(possible) == 1:
+                return possible[0]
+            elif len(possible) == 0:
+                msg = '%s is not an option.' % answer
+            else:
+                msg = ('%s is an ambiguous answer, do you mean %s ?' % (
+                        answer, ' or '.join(possible)))
+            if self._print:
+                self._print(msg)
+            else:
+                print(msg)
+            tries -= 1
+        raise Exception('unable to get a sensible answer')
+
+    def confirm(self, question, default_is_yes=True):
+        default = default_is_yes and 'y' or 'n'
+        answer = self.ask(question, ('y', 'n'), default)
+        return answer == 'y'
+
+ASK = RawInput()
+
+
+def getlogin():
+    """avoid using os.getlogin() because of strange tty / stdin problems
+    (man 3 getlogin)
+    Another solution would be to use $LOGNAME, $USER or $USERNAME
+    """
+    if sys.platform != 'win32':
+        import pwd # Platforms: Unix
+        return pwd.getpwuid(os.getuid())[0]
+    else:
+        return os.environ['USERNAME']
+
+def generate_password(length=8, vocab=string.ascii_letters + string.digits):
+    """dumb password generation function"""
+    pwd = ''
+    for i in range(length):
+        pwd += random.choice(vocab)
+    return pwd
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/sphinx_ext.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/sphinx_ext.py
new file mode 100644
index 0000000..a24608c
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/sphinx_ext.py
@@ -0,0 +1,87 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+from logilab.common.decorators import monkeypatch
+
+from sphinx.ext import autodoc
+
+class DocstringOnlyModuleDocumenter(autodoc.ModuleDocumenter):
+    objtype = 'docstring'
+    def format_signature(self):
+        pass
+    def add_directive_header(self, sig):
+        pass
+    def document_members(self, all_members=False):
+        pass
+
+    def resolve_name(self, modname, parents, path, base):
+        if modname is not None:
+            return modname, parents + [base]
+        return (path or '') + base, []
+
+
+#autodoc.add_documenter(DocstringOnlyModuleDocumenter)
+
+def setup(app):
+    app.add_autodocumenter(DocstringOnlyModuleDocumenter)
+
+
+
+from sphinx.ext.autodoc import (ViewList, Options, AutodocReporter, nodes,
+                                assemble_option_dict, nested_parse_with_titles)
+
+@monkeypatch(autodoc.AutoDirective)
+def run(self):
+    self.filename_set = set()  # a set of dependent filenames
+    self.reporter = self.state.document.reporter
+    self.env = self.state.document.settings.env
+    self.warnings = []
+    self.result = ViewList()
+
+    # find out what documenter to call
+    objtype = self.name[4:]
+    doc_class = self._registry[objtype]
+    # process the options with the selected documenter's option_spec
+    self.genopt = Options(assemble_option_dict(
+        self.options.items(), doc_class.option_spec))
+    # generate the output
+    documenter = doc_class(self, self.arguments[0])
+    documenter.generate(more_content=self.content)
+    if not self.result:
+        return self.warnings
+
+    # record all filenames as dependencies -- this will at least
+    # partially make automatic invalidation possible
+    for fn in self.filename_set:
+        self.env.note_dependency(fn)
+
+    # use a custom reporter that correctly assigns lines to source
+    # filename/description and lineno
+    old_reporter = self.state.memo.reporter
+    self.state.memo.reporter = AutodocReporter(self.result,
+                                               self.state.memo.reporter)
+    if self.name in ('automodule', 'autodocstring'):
+        node = nodes.section()
+        # necessary so that the child nodes get the right source/line set
+        node.document = self.state.document
+        nested_parse_with_titles(self.state, self.result, node)
+    else:
+        node = nodes.paragraph()
+        node.document = self.state.document
+        self.state.nested_parse(self.result, 0, node)
+    self.state.memo.reporter = old_reporter
+    return self.warnings + node.children
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/sphinxutils.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/sphinxutils.py
new file mode 100644
index 0000000..ab6e8a1
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/sphinxutils.py
@@ -0,0 +1,122 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Sphinx utils
+
+ModuleGenerator: Generate a file that lists all the modules of a list of
+packages in order to pull all the docstring.
+This should not be used in a makefile to systematically generate sphinx
+documentation!
+
+Typical usage:
+
+>>> from logilab.common.sphinxutils import ModuleGenerator
+>>> mgen = ModuleGenerator('logilab common', '/home/adim/src/logilab/common')
+>>> mgen.generate('api_logilab_common.rst', exclude_dirs=('test',))
+"""
+
+import os, sys
+import os.path as osp
+import inspect
+
+from logilab.common import STD_BLACKLIST
+from logilab.common.shellutils import globfind
+from logilab.common.modutils import load_module_from_file, modpath_from_file
+
+def module_members(module):
+    members = []
+    for name, value in inspect.getmembers(module):
+        if getattr(value, '__module__', None) == module.__name__:
+            members.append( (name, value) )
+    return sorted(members)
+
+
+def class_members(klass):
+    return sorted([name for name in vars(klass)
+                   if name not in ('__doc__', '__module__',
+                                   '__dict__', '__weakref__')])
+
+class ModuleGenerator:
+    file_header = """.. -*- coding: utf-8 -*-\n\n%s\n"""
+    module_def = """
+:mod:`%s`
+=======%s
+
+.. automodule:: %s
+   :members: %s
+"""
+    class_def = """
+
+.. autoclass:: %s
+   :members: %s
+
+"""
+
+    def __init__(self, project_title, code_dir):
+        self.title = project_title
+        self.code_dir = osp.abspath(code_dir)
+
+    def generate(self, dest_file, exclude_dirs=STD_BLACKLIST):
+        """make the module file"""
+        self.fn = open(dest_file, 'w')
+        num = len(self.title) + 6
+        title = "=" * num + "\n %s API\n" % self.title + "=" * num
+        self.fn.write(self.file_header % title)
+        self.gen_modules(exclude_dirs=exclude_dirs)
+        self.fn.close()
+
+    def gen_modules(self, exclude_dirs):
+        """generate all modules"""
+        for module in self.find_modules(exclude_dirs):
+            modname = module.__name__
+            classes = []
+            modmembers = []
+            for objname, obj in module_members(module):
+                if inspect.isclass(obj):
+                    classmembers = class_members(obj)
+                    classes.append( (objname, classmembers) )
+                else:
+                    modmembers.append(objname)
+            self.fn.write(self.module_def % (modname, '=' * len(modname),
+                                             modname,
+                                             ', '.join(modmembers)))
+            for klass, members in classes:
+                self.fn.write(self.class_def % (klass, ', '.join(members)))
+
+    def find_modules(self, exclude_dirs):
+        basepath = osp.dirname(self.code_dir)
+        basedir = osp.basename(basepath) + osp.sep
+        if basedir not in sys.path:
+            sys.path.insert(1, basedir)
+        for filepath in globfind(self.code_dir, '*.py', exclude_dirs):
+            if osp.basename(filepath) in ('setup.py', '__pkginfo__.py'):
+                continue
+            try:
+                module = load_module_from_file(filepath)
+            except: # module might be broken or magic
+                dotted_path = modpath_from_file(filepath)
+                module = type('.'.join(dotted_path), (), {}) # mock it
+            yield module
+
+
+if __name__ == '__main__':
+    # example :
+    title, code_dir, outfile = sys.argv[1:]
+    generator = ModuleGenerator(title, code_dir)
+    # XXX modnames = ['logilab']
+    generator.generate(outfile, ('test', 'tests', 'examples',
+                             'data', 'doc', '.hg', 'migration'))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/table.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/table.py
new file mode 100644
index 0000000..2f3df69
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/table.py
@@ -0,0 +1,929 @@
+# copyright 2003-2012 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Table management module."""
+
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+
+from six.moves import range
+
+class Table(object):
+    """Table defines a data table with column and row names.
+    inv:
+        len(self.data) <= len(self.row_names)
+        forall(self.data, lambda x: len(x) <= len(self.col_names))
+    """
+
+    def __init__(self, default_value=0, col_names=None, row_names=None):
+        self.col_names = []
+        self.row_names = []
+        self.data = []
+        self.default_value = default_value
+        if col_names:
+            self.create_columns(col_names)
+        if row_names:
+            self.create_rows(row_names)
+
+    def _next_row_name(self):
+        return 'row%s' % (len(self.row_names)+1)
+
+    def __iter__(self):
+        return iter(self.data)
+
+    def __eq__(self, other):
+        if other is None:
+            return False
+        else:
+            return list(self) == list(other)
+
+    __hash__ = object.__hash__
+
+    def __ne__(self, other):
+        return not self == other
+
+    def __len__(self):
+        return len(self.row_names)
+
+    ## Rows / Columns creation #################################################
+    def create_rows(self, row_names):
+        """Appends row_names to the list of existing rows
+        """
+        self.row_names.extend(row_names)
+        for row_name in row_names:
+            self.data.append([self.default_value]*len(self.col_names))
+
+    def create_columns(self, col_names):
+        """Appends col_names to the list of existing columns
+        """
+        for col_name in col_names:
+            self.create_column(col_name)
+
+    def create_row(self, row_name=None):
+        """Creates a rowname to the row_names list
+        """
+        row_name = row_name or self._next_row_name()
+        self.row_names.append(row_name)
+        self.data.append([self.default_value]*len(self.col_names))
+
+
+    def create_column(self, col_name):
+        """Creates a colname to the col_names list
+        """
+        self.col_names.append(col_name)
+        for row in self.data:
+            row.append(self.default_value)
+
+    ## Sort by column ##########################################################
+    def sort_by_column_id(self, col_id, method = 'asc'):
+        """Sorts the table (in-place) according to data stored in col_id
+        """
+        try:
+            col_index = self.col_names.index(col_id)
+            self.sort_by_column_index(col_index, method)
+        except ValueError:
+            raise KeyError("Col (%s) not found in table" % (col_id))
+
+
+    def sort_by_column_index(self, col_index, method = 'asc'):
+        """Sorts the table 'in-place' according to data stored in col_index
+
+        method should be in ('asc', 'desc')
+        """
+        sort_list = sorted([(row[col_index], row, row_name)
+                     for row, row_name in zip(self.data, self.row_names)])
+        # Sorting sort_list will sort according to col_index
+        # If we want reverse sort, then reverse list
+        if method.lower() == 'desc':
+            sort_list.reverse()
+
+        # Rebuild data / row names
+        self.data = []
+        self.row_names = []
+        for val, row, row_name in sort_list:
+            self.data.append(row)
+            self.row_names.append(row_name)
+
+    def groupby(self, colname, *others):
+        """builds indexes of data
+        :returns: nested dictionaries pointing to actual rows
+        """
+        groups = {}
+        colnames = (colname,) + others
+        col_indexes = [self.col_names.index(col_id) for col_id in colnames]
+        for row in self.data:
+            ptr = groups
+            for col_index in col_indexes[:-1]:
+                ptr = ptr.setdefault(row[col_index], {})
+            ptr = ptr.setdefault(row[col_indexes[-1]],
+                                 Table(default_value=self.default_value,
+                                       col_names=self.col_names))
+            ptr.append_row(tuple(row))
+        return groups
+
+    def select(self, colname, value):
+        grouped = self.groupby(colname)
+        try:
+            return grouped[value]
+        except KeyError:
+            return []
+
+    def remove(self, colname, value):
+        col_index = self.col_names.index(colname)
+        for row in self.data[:]:
+            if row[col_index] == value:
+                self.data.remove(row)
+
+
+    ## The 'setter' part #######################################################
+    def set_cell(self, row_index, col_index, data):
+        """sets value of cell 'row_indew', 'col_index' to data
+        """
+        self.data[row_index][col_index] = data
+
+
+    def set_cell_by_ids(self, row_id, col_id, data):
+        """sets value of cell mapped by row_id and col_id to data
+        Raises a KeyError if row_id or col_id are not found in the table
+        """
+        try:
+            row_index = self.row_names.index(row_id)
+        except ValueError:
+            raise KeyError("Row (%s) not found in table" % (row_id))
+        else:
+            try:
+                col_index = self.col_names.index(col_id)
+                self.data[row_index][col_index] = data
+            except ValueError:
+                raise KeyError("Column (%s) not found in table" % (col_id))
+
+
+    def set_row(self, row_index, row_data):
+        """sets the 'row_index' row
+        pre:
+            type(row_data) == types.ListType
+            len(row_data) == len(self.col_names)
+        """
+        self.data[row_index] = row_data
+
+
+    def set_row_by_id(self, row_id, row_data):
+        """sets the 'row_id' column
+        pre:
+            type(row_data) == types.ListType
+            len(row_data) == len(self.row_names)
+        Raises a KeyError if row_id is not found
+        """
+        try:
+            row_index = self.row_names.index(row_id)
+            self.set_row(row_index, row_data)
+        except ValueError:
+            raise KeyError('Row (%s) not found in table' % (row_id))
+
+
+    def append_row(self, row_data, row_name=None):
+        """Appends a row to the table
+        pre:
+            type(row_data) == types.ListType
+            len(row_data) == len(self.col_names)
+        """
+        row_name = row_name or self._next_row_name()
+        self.row_names.append(row_name)
+        self.data.append(row_data)
+        return len(self.data) - 1
+
+    def insert_row(self, index, row_data, row_name=None):
+        """Appends row_data before 'index' in the table. To make 'insert'
+        behave like 'list.insert', inserting in an out of range index will
+        insert row_data to the end of the list
+        pre:
+            type(row_data) == types.ListType
+            len(row_data) == len(self.col_names)
+        """
+        row_name = row_name or self._next_row_name()
+        self.row_names.insert(index, row_name)
+        self.data.insert(index, row_data)
+
+
+    def delete_row(self, index):
+        """Deletes the 'index' row in the table, and returns it.
+        Raises an IndexError if index is out of range
+        """
+        self.row_names.pop(index)
+        return self.data.pop(index)
+
+
+    def delete_row_by_id(self, row_id):
+        """Deletes the 'row_id' row in the table.
+        Raises a KeyError if row_id was not found.
+        """
+        try:
+            row_index = self.row_names.index(row_id)
+            self.delete_row(row_index)
+        except ValueError:
+            raise KeyError('Row (%s) not found in table' % (row_id))
+
+
+    def set_column(self, col_index, col_data):
+        """sets the 'col_index' column
+        pre:
+            type(col_data) == types.ListType
+            len(col_data) == len(self.row_names)
+        """
+
+        for row_index, cell_data in enumerate(col_data):
+            self.data[row_index][col_index] = cell_data
+
+
+    def set_column_by_id(self, col_id, col_data):
+        """sets the 'col_id' column
+        pre:
+            type(col_data) == types.ListType
+            len(col_data) == len(self.col_names)
+        Raises a KeyError if col_id is not found
+        """
+        try:
+            col_index = self.col_names.index(col_id)
+            self.set_column(col_index, col_data)
+        except ValueError:
+            raise KeyError('Column (%s) not found in table' % (col_id))
+
+
+    def append_column(self, col_data, col_name):
+        """Appends the 'col_index' column
+        pre:
+            type(col_data) == types.ListType
+            len(col_data) == len(self.row_names)
+        """
+        self.col_names.append(col_name)
+        for row_index, cell_data in enumerate(col_data):
+            self.data[row_index].append(cell_data)
+
+
+    def insert_column(self, index, col_data, col_name):
+        """Appends col_data before 'index' in the table. To make 'insert'
+        behave like 'list.insert', inserting in an out of range index will
+        insert col_data to the end of the list
+        pre:
+            type(col_data) == types.ListType
+            len(col_data) == len(self.row_names)
+        """
+        self.col_names.insert(index, col_name)
+        for row_index, cell_data in enumerate(col_data):
+            self.data[row_index].insert(index, cell_data)
+
+
+    def delete_column(self, index):
+        """Deletes the 'index' column in the table, and returns it.
+        Raises an IndexError if index is out of range
+        """
+        self.col_names.pop(index)
+        return [row.pop(index) for row in self.data]
+
+
+    def delete_column_by_id(self, col_id):
+        """Deletes the 'col_id' col in the table.
+        Raises a KeyError if col_id was not found.
+        """
+        try:
+            col_index = self.col_names.index(col_id)
+            self.delete_column(col_index)
+        except ValueError:
+            raise KeyError('Column (%s) not found in table' % (col_id))
+
+
+    ## The 'getter' part #######################################################
+
+    def get_shape(self):
+        """Returns a tuple which represents the table's shape
+        """
+        return len(self.row_names), len(self.col_names)
+    shape = property(get_shape)
+
+    def __getitem__(self, indices):
+        """provided for convenience"""
+        rows, multirows = None, False
+        cols, multicols = None, False
+        if isinstance(indices, tuple):
+            rows = indices[0]
+            if len(indices) > 1:
+                cols = indices[1]
+        else:
+            rows = indices
+        # define row slice
+        if isinstance(rows, str):
+            try:
+                rows = self.row_names.index(rows)
+            except ValueError:
+                raise KeyError("Row (%s) not found in table" % (rows))
+        if isinstance(rows, int):
+            rows = slice(rows, rows+1)
+            multirows = False
+        else:
+            rows = slice(None)
+            multirows = True
+        # define col slice
+        if isinstance(cols, str):
+            try:
+                cols = self.col_names.index(cols)
+            except ValueError:
+                raise KeyError("Column (%s) not found in table" % (cols))
+        if isinstance(cols, int):
+            cols = slice(cols, cols+1)
+            multicols = False
+        else:
+            cols = slice(None)
+            multicols = True
+        # get sub-table
+        tab = Table()
+        tab.default_value = self.default_value
+        tab.create_rows(self.row_names[rows])
+        tab.create_columns(self.col_names[cols])
+        for idx, row in enumerate(self.data[rows]):
+            tab.set_row(idx, row[cols])
+        if multirows :
+            if multicols:
+                return tab
+            else:
+                return [item[0] for item in tab.data]
+        else:
+            if multicols:
+                return tab.data[0]
+            else:
+                return tab.data[0][0]
+
+    def get_cell_by_ids(self, row_id, col_id):
+        """Returns the element at [row_id][col_id]
+        """
+        try:
+            row_index = self.row_names.index(row_id)
+        except ValueError:
+            raise KeyError("Row (%s) not found in table" % (row_id))
+        else:
+            try:
+                col_index = self.col_names.index(col_id)
+            except ValueError:
+                raise KeyError("Column (%s) not found in table" % (col_id))
+        return self.data[row_index][col_index]
+
+    def get_row_by_id(self, row_id):
+        """Returns the 'row_id' row
+        """
+        try:
+            row_index = self.row_names.index(row_id)
+        except ValueError:
+            raise KeyError("Row (%s) not found in table" % (row_id))
+        return self.data[row_index]
+
+    def get_column_by_id(self, col_id, distinct=False):
+        """Returns the 'col_id' col
+        """
+        try:
+            col_index = self.col_names.index(col_id)
+        except ValueError:
+            raise KeyError("Column (%s) not found in table" % (col_id))
+        return self.get_column(col_index, distinct)
+
+    def get_columns(self):
+        """Returns all the columns in the table
+        """
+        return [self[:, index] for index in range(len(self.col_names))]
+
+    def get_column(self, col_index, distinct=False):
+        """get a column by index"""
+        col = [row[col_index] for row in self.data]
+        if distinct:
+            col = list(set(col))
+        return col
+
+    def apply_stylesheet(self, stylesheet):
+        """Applies the stylesheet to this table
+        """
+        for instruction in stylesheet.instructions:
+            eval(instruction)
+
+
+    def transpose(self):
+        """Keeps the self object intact, and returns the transposed (rotated)
+        table.
+        """
+        transposed = Table()
+        transposed.create_rows(self.col_names)
+        transposed.create_columns(self.row_names)
+        for col_index, column in enumerate(self.get_columns()):
+            transposed.set_row(col_index, column)
+        return transposed
+
+
+    def pprint(self):
+        """returns a string representing the table in a pretty
+        printed 'text' format.
+        """
+        # The maximum row name (to know the start_index of the first col)
+        max_row_name = 0
+        for row_name in self.row_names:
+            if len(row_name) > max_row_name:
+                max_row_name = len(row_name)
+        col_start = max_row_name + 5
+
+        lines = []
+        # Build the 'first' line <=> the col_names one
+        # The first cell <=> an empty one
+        col_names_line = [' '*col_start]
+        for col_name in self.col_names:
+            col_names_line.append(col_name + ' '*5)
+        lines.append('|' + '|'.join(col_names_line) + '|')
+        max_line_length = len(lines[0])
+
+        # Build the table
+        for row_index, row in enumerate(self.data):
+            line = []
+            # First, build the row_name's cell
+            row_name = self.row_names[row_index]
+            line.append(row_name + ' '*(col_start-len(row_name)))
+
+            # Then, build all the table's cell for this line.
+            for col_index, cell in enumerate(row):
+                col_name_length = len(self.col_names[col_index]) + 5
+                data = str(cell)
+                line.append(data + ' '*(col_name_length - len(data)))
+            lines.append('|' + '|'.join(line) + '|')
+            if len(lines[-1]) > max_line_length:
+                max_line_length = len(lines[-1])
+
+        # Wrap the table with '-' to make a frame
+        lines.insert(0, '-'*max_line_length)
+        lines.append('-'*max_line_length)
+        return '\n'.join(lines)
+
+
+    def __repr__(self):
+        return repr(self.data)
+
+    def as_text(self):
+        data = []
+        # We must convert cells into strings before joining them
+        for row in self.data:
+            data.append([str(cell) for cell in row])
+        lines = ['\t'.join(row) for row in data]
+        return '\n'.join(lines)
+
+
+
+class TableStyle:
+    """Defines a table's style
+    """
+
+    def __init__(self, table):
+
+        self._table = table
+        self.size = dict([(col_name, '1*') for col_name in table.col_names])
+        # __row_column__ is a special key to define the first column which
+        # actually has no name (<=> left most column <=> row names column)
+        self.size['__row_column__'] = '1*'
+        self.alignment = dict([(col_name, 'right')
+                               for col_name in table.col_names])
+        self.alignment['__row_column__'] = 'right'
+
+        # We shouldn't have to create an entry for
+        # the 1st col (the row_column one)
+        self.units = dict([(col_name, '') for col_name in table.col_names])
+        self.units['__row_column__'] = ''
+
+    # XXX FIXME : params order should be reversed for all set() methods
+    def set_size(self, value, col_id):
+        """sets the size of the specified col_id to value
+        """
+        self.size[col_id] = value
+
+    def set_size_by_index(self, value, col_index):
+        """Allows to set the size according to the column index rather than
+        using the column's id.
+        BE CAREFUL : the '0' column is the '__row_column__' one !
+        """
+        if col_index == 0:
+            col_id = '__row_column__'
+        else:
+            col_id = self._table.col_names[col_index-1]
+
+        self.size[col_id] = value
+
+
+    def set_alignment(self, value, col_id):
+        """sets the alignment of the specified col_id to value
+        """
+        self.alignment[col_id] = value
+
+
+    def set_alignment_by_index(self, value, col_index):
+        """Allows to set the alignment according to the column index rather than
+        using the column's id.
+        BE CAREFUL : the '0' column is the '__row_column__' one !
+        """
+        if col_index == 0:
+            col_id = '__row_column__'
+        else:
+            col_id = self._table.col_names[col_index-1]
+
+        self.alignment[col_id] = value
+
+
+    def set_unit(self, value, col_id):
+        """sets the unit of the specified col_id to value
+        """
+        self.units[col_id] = value
+
+
+    def set_unit_by_index(self, value, col_index):
+        """Allows to set the unit according to the column index rather than
+        using the column's id.
+        BE CAREFUL :  the '0' column is the '__row_column__' one !
+        (Note that in the 'unit' case, you shouldn't have to set a unit
+        for the 1st column (the __row__column__ one))
+        """
+        if col_index == 0:
+            col_id = '__row_column__'
+        else:
+            col_id = self._table.col_names[col_index-1]
+
+        self.units[col_id] = value
+
+
+    def get_size(self, col_id):
+        """Returns the size of the specified col_id
+        """
+        return self.size[col_id]
+
+
+    def get_size_by_index(self, col_index):
+        """Allows to get the size  according to the column index rather than
+        using the column's id.
+        BE CAREFUL : the '0' column is the '__row_column__' one !
+        """
+        if col_index == 0:
+            col_id = '__row_column__'
+        else:
+            col_id = self._table.col_names[col_index-1]
+
+        return self.size[col_id]
+
+
+    def get_alignment(self, col_id):
+        """Returns the alignment of the specified col_id
+        """
+        return self.alignment[col_id]
+
+
+    def get_alignment_by_index(self, col_index):
+        """Allors to get the alignment according to the column index rather than
+        using the column's id.
+        BE CAREFUL : the '0' column is the '__row_column__' one !
+        """
+        if col_index == 0:
+            col_id = '__row_column__'
+        else:
+            col_id = self._table.col_names[col_index-1]
+
+        return self.alignment[col_id]
+
+
+    def get_unit(self, col_id):
+        """Returns the unit of the specified col_id
+        """
+        return self.units[col_id]
+
+
+    def get_unit_by_index(self, col_index):
+        """Allors to get the unit according to the column index rather than
+        using the column's id.
+        BE CAREFUL : the '0' column is the '__row_column__' one !
+        """
+        if col_index == 0:
+            col_id = '__row_column__'
+        else:
+            col_id = self._table.col_names[col_index-1]
+
+        return self.units[col_id]
+
+
+import re
+CELL_PROG = re.compile("([0-9]+)_([0-9]+)")
+
+class TableStyleSheet:
+    """A simple Table stylesheet
+    Rules are expressions where cells are defined by the row_index
+    and col_index separated by an underscore ('_').
+    For example, suppose you want to say that the (2,5) cell must be
+    the sum of its two preceding cells in the row, you would create
+    the following rule :
+        2_5 = 2_3 + 2_4
+    You can also use all the math.* operations you want. For example:
+        2_5 = sqrt(2_3**2 + 2_4**2)
+    """
+
+    def __init__(self, rules = None):
+        rules = rules or []
+        self.rules = []
+        self.instructions = []
+        for rule in rules:
+            self.add_rule(rule)
+
+
+    def add_rule(self, rule):
+        """Adds a rule to the stylesheet rules
+        """
+        try:
+            source_code = ['from math import *']
+            source_code.append(CELL_PROG.sub(r'self.data[\1][\2]', rule))
+            self.instructions.append(compile('\n'.join(source_code),
+                'table.py', 'exec'))
+            self.rules.append(rule)
+        except SyntaxError:
+            print("Bad Stylesheet Rule : %s [skipped]" % rule)
+
+
+    def add_rowsum_rule(self, dest_cell, row_index, start_col, end_col):
+        """Creates and adds a rule to sum over the row at row_index from
+        start_col to end_col.
+        dest_cell is a tuple of two elements (x,y) of the destination cell
+        No check is done for indexes ranges.
+        pre:
+            start_col >= 0
+            end_col > start_col
+        """
+        cell_list = ['%d_%d'%(row_index, index) for index in range(start_col,
+                                                                   end_col + 1)]
+        rule = '%d_%d=' % dest_cell + '+'.join(cell_list)
+        self.add_rule(rule)
+
+
+    def add_rowavg_rule(self, dest_cell, row_index, start_col, end_col):
+        """Creates and adds a rule to make the row average (from start_col
+        to end_col)
+        dest_cell is a tuple of two elements (x,y) of the destination cell
+        No check is done for indexes ranges.
+        pre:
+            start_col >= 0
+            end_col > start_col
+        """
+        cell_list = ['%d_%d'%(row_index, index) for index in range(start_col,
+                                                                   end_col + 1)]
+        num = (end_col - start_col + 1)
+        rule = '%d_%d=' % dest_cell + '('+'+'.join(cell_list)+')/%f'%num
+        self.add_rule(rule)
+
+
+    def add_colsum_rule(self, dest_cell, col_index, start_row, end_row):
+        """Creates and adds a rule to sum over the col at col_index from
+        start_row to end_row.
+        dest_cell is a tuple of two elements (x,y) of the destination cell
+        No check is done for indexes ranges.
+        pre:
+            start_row >= 0
+            end_row > start_row
+        """
+        cell_list = ['%d_%d'%(index, col_index) for index in range(start_row,
+                                                                   end_row + 1)]
+        rule = '%d_%d=' % dest_cell + '+'.join(cell_list)
+        self.add_rule(rule)
+
+
+    def add_colavg_rule(self, dest_cell, col_index, start_row, end_row):
+        """Creates and adds a rule to make the col average (from start_row
+        to end_row)
+        dest_cell is a tuple of two elements (x,y) of the destination cell
+        No check is done for indexes ranges.
+        pre:
+            start_row >= 0
+            end_row > start_row
+        """
+        cell_list = ['%d_%d'%(index, col_index) for index in range(start_row,
+                                                                   end_row + 1)]
+        num = (end_row - start_row + 1)
+        rule = '%d_%d=' % dest_cell + '('+'+'.join(cell_list)+')/%f'%num
+        self.add_rule(rule)
+
+
+
+class TableCellRenderer:
+    """Defines a simple text renderer
+    """
+
+    def __init__(self, **properties):
+        """keywords should be properties with an associated boolean as value.
+        For example :
+            renderer = TableCellRenderer(units = True, alignment = False)
+        An unspecified property will have a 'False' value by default.
+        Possible properties are :
+            alignment, unit
+        """
+        self.properties = properties
+
+
+    def render_cell(self, cell_coord, table, table_style):
+        """Renders the cell at 'cell_coord' in the table, using table_style
+        """
+        row_index, col_index = cell_coord
+        cell_value = table.data[row_index][col_index]
+        final_content = self._make_cell_content(cell_value,
+                                                table_style, col_index  +1)
+        return self._render_cell_content(final_content,
+                                         table_style, col_index + 1)
+
+
+    def render_row_cell(self, row_name, table, table_style):
+        """Renders the cell for 'row_id' row
+        """
+        cell_value = row_name
+        return self._render_cell_content(cell_value, table_style, 0)
+
+
+    def render_col_cell(self, col_name, table, table_style):
+        """Renders the cell for 'col_id' row
+        """
+        cell_value = col_name
+        col_index = table.col_names.index(col_name)
+        return self._render_cell_content(cell_value, table_style, col_index +1)
+
+
+
+    def _render_cell_content(self, content, table_style, col_index):
+        """Makes the appropriate rendering for this cell content.
+        Rendering properties will be searched using the
+        *table_style.get_xxx_by_index(col_index)' methods
+
+        **This method should be overridden in the derived renderer classes.**
+        """
+        return content
+
+
+    def _make_cell_content(self, cell_content, table_style, col_index):
+        """Makes the cell content (adds decoration data, like units for
+        example)
+        """
+        final_content = cell_content
+        if 'skip_zero' in self.properties:
+            replacement_char = self.properties['skip_zero']
+        else:
+            replacement_char = 0
+        if replacement_char and final_content == 0:
+            return replacement_char
+
+        try:
+            units_on = self.properties['units']
+            if units_on:
+                final_content = self._add_unit(
+                    cell_content, table_style, col_index)
+        except KeyError:
+            pass
+
+        return final_content
+
+
+    def _add_unit(self, cell_content, table_style, col_index):
+        """Adds unit to the cell_content if needed
+        """
+        unit = table_style.get_unit_by_index(col_index)
+        return str(cell_content) + " " + unit
+
+
+
+class DocbookRenderer(TableCellRenderer):
+    """Defines how to render a cell for a docboook table
+    """
+
+    def define_col_header(self, col_index, table_style):
+        """Computes the colspec element according to the style
+        """
+        size = table_style.get_size_by_index(col_index)
+        return '<colspec colname="c%d" colwidth="%s"/>\n' % \
+               (col_index, size)
+
+
+    def _render_cell_content(self, cell_content, table_style, col_index):
+        """Makes the appropriate rendering for this cell content.
+        Rendering properties will be searched using the
+        table_style.get_xxx_by_index(col_index)' methods.
+        """
+        try:
+            align_on = self.properties['alignment']
+            alignment = table_style.get_alignment_by_index(col_index)
+            if align_on:
+                return "<entry align='%s'>%s</entry>\n" % \
+                       (alignment, cell_content)
+        except KeyError:
+            # KeyError <=> Default alignment
+            return "<entry>%s</entry>\n" % cell_content
+
+
+class TableWriter:
+    """A class to write tables
+    """
+
+    def __init__(self, stream, table, style, **properties):
+        self._stream = stream
+        self.style = style or TableStyle(table)
+        self._table = table
+        self.properties = properties
+        self.renderer = None
+
+
+    def set_style(self, style):
+        """sets the table's associated style
+        """
+        self.style = style
+
+
+    def set_renderer(self, renderer):
+        """sets the way to render cell
+        """
+        self.renderer = renderer
+
+
+    def update_properties(self, **properties):
+        """Updates writer's properties (for cell rendering)
+        """
+        self.properties.update(properties)
+
+
+    def write_table(self, title = ""):
+        """Writes the table
+        """
+        raise NotImplementedError("write_table must be implemented !")
+
+
+
+class DocbookTableWriter(TableWriter):
+    """Defines an implementation of TableWriter to write a table in Docbook
+    """
+
+    def _write_headers(self):
+        """Writes col headers
+        """
+        # Define col_headers (colstpec elements)
+        for col_index in range(len(self._table.col_names)+1):
+            self._stream.write(self.renderer.define_col_header(col_index,
+                                                              self.style))
+
+        self._stream.write("<thead>\n<row>\n")
+        # XXX FIXME : write an empty entry <=> the first (__row_column) column
+        self._stream.write('<entry></entry>\n')
+        for col_name in self._table.col_names:
+            self._stream.write(self.renderer.render_col_cell(
+                col_name, self._table,
+                self.style))
+
+        self._stream.write("</row>\n</thead>\n")
+
+
+    def _write_body(self):
+        """Writes the table body
+        """
+        self._stream.write('<tbody>\n')
+
+        for row_index, row in enumerate(self._table.data):
+            self._stream.write('<row>\n')
+            row_name = self._table.row_names[row_index]
+            # Write the first entry (row_name)
+            self._stream.write(self.renderer.render_row_cell(row_name,
+                                                            self._table,
+                                                            self.style))
+
+            for col_index, cell in enumerate(row):
+                self._stream.write(self.renderer.render_cell(
+                    (row_index, col_index),
+                    self._table, self.style))
+
+            self._stream.write('</row>\n')
+
+        self._stream.write('</tbody>\n')
+
+
+    def write_table(self, title = ""):
+        """Writes the table
+        """
+        self._stream.write('<table>\n<title>%s></title>\n'%(title))
+        self._stream.write(
+            '<tgroup cols="%d" align="left" colsep="1" rowsep="1">\n'%
+            (len(self._table.col_names)+1))
+        self._write_headers()
+        self._write_body()
+
+        self._stream.write('</tgroup>\n</table>\n')
+
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/tasksqueue.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/tasksqueue.py
new file mode 100644
index 0000000..ed74cf5
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/tasksqueue.py
@@ -0,0 +1,101 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Prioritized tasks queue"""
+
+__docformat__ = "restructuredtext en"
+
+from bisect import insort_left
+
+from six.moves import queue
+
+LOW = 0
+MEDIUM = 10
+HIGH = 100
+
+PRIORITY = {
+    'LOW': LOW,
+    'MEDIUM': MEDIUM,
+    'HIGH': HIGH,
+    }
+REVERSE_PRIORITY = dict((values, key) for key, values in PRIORITY.items())
+
+
+
+class PrioritizedTasksQueue(queue.Queue):
+
+    def _init(self, maxsize):
+        """Initialize the queue representation"""
+        self.maxsize = maxsize
+        # ordered list of task, from the lowest to the highest priority
+        self.queue = []
+
+    def _put(self, item):
+        """Put a new item in the queue"""
+        for i, task in enumerate(self.queue):
+            # equivalent task
+            if task == item:
+                # if new task has a higher priority, remove the one already
+                # queued so the new priority will be considered
+                if task < item:
+                    item.merge(task)
+                    del self.queue[i]
+                    break
+                # else keep it so current order is kept
+                task.merge(item)
+                return
+        insort_left(self.queue, item)
+
+    def _get(self):
+        """Get an item from the queue"""
+        return self.queue.pop()
+
+    def __iter__(self):
+        return iter(self.queue)
+
+    def remove(self, tid):
+        """remove a specific task from the queue"""
+        # XXX acquire lock
+        for i, task in enumerate(self):
+            if task.id == tid:
+                self.queue.pop(i)
+                return
+        raise ValueError('not task of id %s in queue' % tid)
+
+class Task(object):
+    def __init__(self, tid, priority=LOW):
+        # task id
+        self.id = tid
+        # task priority
+        self.priority = priority
+
+    def __repr__(self):
+        return '<Task %s @%#x>' % (self.id, id(self))
+
+    def __cmp__(self, other):
+        return cmp(self.priority, other.priority)
+
+    def __lt__(self, other):
+        return self.priority < other.priority
+
+    def __eq__(self, other):
+        return self.id == other.id
+
+    __hash__ = object.__hash__
+
+    def merge(self, other):
+        pass
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/testlib.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/testlib.py
new file mode 100644
index 0000000..a6b4b1e
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/testlib.py
@@ -0,0 +1,1338 @@
+# -*- coding: utf-8 -*-
+# copyright 2003-2012 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Run tests.
+
+This will find all modules whose name match a given prefix in the test
+directory, and run them. Various command line options provide
+additional facilities.
+
+Command line options:
+
+ -v  verbose -- run tests in verbose mode with output to stdout
+ -q  quiet   -- don't print anything except if a test fails
+ -t  testdir -- directory where the tests will be found
+ -x  exclude -- add a test to exclude
+ -p  profile -- profiled execution
+ -d  dbc     -- enable design-by-contract
+ -m  match   -- only run test matching the tag pattern which follow
+
+If no non-option arguments are present, prefixes used are 'test',
+'regrtest', 'smoketest' and 'unittest'.
+
+"""
+
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+# modified copy of some functions from test/regrtest.py from PyXml
+# disable camel case warning
+# pylint: disable=C0103
+
+import sys
+import os, os.path as osp
+import re
+import traceback
+import inspect
+import difflib
+import tempfile
+import math
+import warnings
+from shutil import rmtree
+from operator import itemgetter
+from itertools import dropwhile
+from inspect import isgeneratorfunction
+
+from six import string_types
+from six.moves import builtins, range, configparser, input
+
+from logilab.common.deprecation import deprecated
+
+import unittest as unittest_legacy
+if not getattr(unittest_legacy, "__package__", None):
+    try:
+        import unittest2 as unittest
+        from unittest2 import SkipTest
+    except ImportError:
+        raise ImportError("You have to install python-unittest2 to use %s" % __name__)
+else:
+    import unittest
+    from unittest import SkipTest
+
+from functools import wraps
+
+from logilab.common.debugger import Debugger, colorize_source
+from logilab.common.decorators import cached, classproperty
+from logilab.common import textutils
+
+
+__all__ = ['main', 'unittest_main', 'find_tests', 'run_test', 'spawn']
+
+DEFAULT_PREFIXES = ('test', 'regrtest', 'smoketest', 'unittest',
+                    'func', 'validation')
+
+is_generator = deprecated('[lgc 0.63] use inspect.isgeneratorfunction')(isgeneratorfunction)
+
+# used by unittest to count the number of relevant levels in the traceback
+__unittest = 1
+
+
+def with_tempdir(callable):
+    """A decorator ensuring no temporary file left when the function return
+    Work only for temporary file created with the tempfile module"""
+    if isgeneratorfunction(callable):
+        def proxy(*args, **kwargs):
+            old_tmpdir = tempfile.gettempdir()
+            new_tmpdir = tempfile.mkdtemp(prefix="temp-lgc-")
+            tempfile.tempdir = new_tmpdir
+            try:
+                for x in callable(*args, **kwargs):
+                    yield x
+            finally:
+                try:
+                    rmtree(new_tmpdir, ignore_errors=True)
+                finally:
+                    tempfile.tempdir = old_tmpdir
+        return proxy
+
+    @wraps(callable)
+    def proxy(*args, **kargs):
+
+        old_tmpdir = tempfile.gettempdir()
+        new_tmpdir = tempfile.mkdtemp(prefix="temp-lgc-")
+        tempfile.tempdir = new_tmpdir
+        try:
+            return callable(*args, **kargs)
+        finally:
+            try:
+                rmtree(new_tmpdir, ignore_errors=True)
+            finally:
+                tempfile.tempdir = old_tmpdir
+    return proxy
+
+def in_tempdir(callable):
+    """A decorator moving the enclosed function inside the tempfile.tempfdir
+    """
+    @wraps(callable)
+    def proxy(*args, **kargs):
+
+        old_cwd = os.getcwd()
+        os.chdir(tempfile.tempdir)
+        try:
+            return callable(*args, **kargs)
+        finally:
+            os.chdir(old_cwd)
+    return proxy
+
+def within_tempdir(callable):
+    """A decorator run the enclosed function inside a tmpdir removed after execution
+    """
+    proxy = with_tempdir(in_tempdir(callable))
+    proxy.__name__ = callable.__name__
+    return proxy
+
+def find_tests(testdir,
+               prefixes=DEFAULT_PREFIXES, suffix=".py",
+               excludes=(),
+               remove_suffix=True):
+    """
+    Return a list of all applicable test modules.
+    """
+    tests = []
+    for name in os.listdir(testdir):
+        if not suffix or name.endswith(suffix):
+            for prefix in prefixes:
+                if name.startswith(prefix):
+                    if remove_suffix and name.endswith(suffix):
+                        name = name[:-len(suffix)]
+                    if name not in excludes:
+                        tests.append(name)
+    tests.sort()
+    return tests
+
+
+## PostMortem Debug facilities #####
+def start_interactive_mode(result):
+    """starts an interactive shell so that the user can inspect errors
+    """
+    debuggers = result.debuggers
+    descrs = result.error_descrs + result.fail_descrs
+    if len(debuggers) == 1:
+        # don't ask for test name if there's only one failure
+        debuggers[0].start()
+    else:
+        while True:
+            testindex = 0
+            print("Choose a test to debug:")
+            # order debuggers in the same way than errors were printed
+            print("\n".join(['\t%s : %s' % (i, descr) for i, (_, descr)
+                  in enumerate(descrs)]))
+            print("Type 'exit' (or ^D) to quit")
+            print()
+            try:
+                todebug = input('Enter a test name: ')
+                if todebug.strip().lower() == 'exit':
+                    print()
+                    break
+                else:
+                    try:
+                        testindex = int(todebug)
+                        debugger = debuggers[descrs[testindex][0]]
+                    except (ValueError, IndexError):
+                        print("ERROR: invalid test number %r" % (todebug, ))
+                    else:
+                        debugger.start()
+            except (EOFError, KeyboardInterrupt):
+                print()
+                break
+
+
+# test utils ##################################################################
+
+class SkipAwareTestResult(unittest._TextTestResult):
+
+    def __init__(self, stream, descriptions, verbosity,
+                 exitfirst=False, pdbmode=False, cvg=None, colorize=False):
+        super(SkipAwareTestResult, self).__init__(stream,
+                                                  descriptions, verbosity)
+        self.skipped = []
+        self.debuggers = []
+        self.fail_descrs = []
+        self.error_descrs = []
+        self.exitfirst = exitfirst
+        self.pdbmode = pdbmode
+        self.cvg = cvg
+        self.colorize = colorize
+        self.pdbclass = Debugger
+        self.verbose = verbosity > 1
+
+    def descrs_for(self, flavour):
+        return getattr(self, '%s_descrs' % flavour.lower())
+
+    def _create_pdb(self, test_descr, flavour):
+        self.descrs_for(flavour).append( (len(self.debuggers), test_descr) )
+        if self.pdbmode:
+            self.debuggers.append(self.pdbclass(sys.exc_info()[2]))
+
+    def _iter_valid_frames(self, frames):
+        """only consider non-testlib frames when formatting  traceback"""
+        lgc_testlib = osp.abspath(__file__)
+        std_testlib = osp.abspath(unittest.__file__)
+        invalid = lambda fi: osp.abspath(fi[1]) in (lgc_testlib, std_testlib)
+        for frameinfo in dropwhile(invalid, frames):
+            yield frameinfo
+
+    def _exc_info_to_string(self, err, test):
+        """Converts a sys.exc_info()-style tuple of values into a string.
+
+        This method is overridden here because we want to colorize
+        lines if --color is passed, and display local variables if
+        --verbose is passed
+        """
+        exctype, exc, tb = err
+        output = ['Traceback (most recent call last)']
+        frames = inspect.getinnerframes(tb)
+        colorize = self.colorize
+        frames = enumerate(self._iter_valid_frames(frames))
+        for index, (frame, filename, lineno, funcname, ctx, ctxindex) in frames:
+            filename = osp.abspath(filename)
+            if ctx is None: # pyc files or C extensions for instance
+                source = '<no source available>'
+            else:
+                source = ''.join(ctx)
+            if colorize:
+                filename = textutils.colorize_ansi(filename, 'magenta')
+                source = colorize_source(source)
+            output.append('  File "%s", line %s, in %s' % (filename, lineno, funcname))
+            output.append('    %s' % source.strip())
+            if self.verbose:
+                output.append('%r == %r' % (dir(frame), test.__module__))
+                output.append('')
+                output.append('    ' + ' local variables '.center(66, '-'))
+                for varname, value in sorted(frame.f_locals.items()):
+                    output.append('    %s: %r' % (varname, value))
+                    if varname == 'self': # special handy processing for self
+                        for varname, value in sorted(vars(value).items()):
+                            output.append('      self.%s: %r' % (varname, value))
+                output.append('    ' + '-' * 66)
+                output.append('')
+        output.append(''.join(traceback.format_exception_only(exctype, exc)))
+        return '\n'.join(output)
+
+    def addError(self, test, err):
+        """err ->  (exc_type, exc, tcbk)"""
+        exc_type, exc, _ = err
+        if isinstance(exc, SkipTest):
+            assert exc_type == SkipTest
+            self.addSkip(test, exc)
+        else:
+            if self.exitfirst:
+                self.shouldStop = True
+            descr = self.getDescription(test)
+            super(SkipAwareTestResult, self).addError(test, err)
+            self._create_pdb(descr, 'error')
+
+    def addFailure(self, test, err):
+        if self.exitfirst:
+            self.shouldStop = True
+        descr = self.getDescription(test)
+        super(SkipAwareTestResult, self).addFailure(test, err)
+        self._create_pdb(descr, 'fail')
+
+    def addSkip(self, test, reason):
+        self.skipped.append((test, reason))
+        if self.showAll:
+            self.stream.writeln("SKIPPED")
+        elif self.dots:
+            self.stream.write('S')
+
+    def printErrors(self):
+        super(SkipAwareTestResult, self).printErrors()
+        self.printSkippedList()
+
+    def printSkippedList(self):
+        # format (test, err) compatible with unittest2
+        for test, err in self.skipped:
+            descr = self.getDescription(test)
+            self.stream.writeln(self.separator1)
+            self.stream.writeln("%s: %s" % ('SKIPPED', descr))
+            self.stream.writeln("\t%s" % err)
+
+    def printErrorList(self, flavour, errors):
+        for (_, descr), (test, err) in zip(self.descrs_for(flavour), errors):
+            self.stream.writeln(self.separator1)
+            self.stream.writeln("%s: %s" % (flavour, descr))
+            self.stream.writeln(self.separator2)
+            self.stream.writeln(err)
+            self.stream.writeln('no stdout'.center(len(self.separator2)))
+            self.stream.writeln('no stderr'.center(len(self.separator2)))
+
+# Add deprecation warnings about new api used by module level fixtures in unittest2
+# http://www.voidspace.org.uk/python/articles/unittest2.shtml#setupmodule-and-teardownmodule
+class _DebugResult(object): # simplify import statement among unittest flavors..
+    "Used by the TestSuite to hold previous class when running in debug."
+    _previousTestClass = None
+    _moduleSetUpFailed = False
+    shouldStop = False
+
+# backward compatibility: TestSuite might be imported from lgc.testlib
+TestSuite = unittest.TestSuite
+
+class keywords(dict):
+    """Keyword args (**kwargs) support for generative tests."""
+
+class starargs(tuple):
+    """Variable arguments (*args) for generative tests."""
+    def __new__(cls, *args):
+        return tuple.__new__(cls, args)
+
+unittest_main = unittest.main
+
+
+class InnerTestSkipped(SkipTest):
+    """raised when a test is skipped"""
+    pass
+
+def parse_generative_args(params):
+    args = []
+    varargs = ()
+    kwargs = {}
+    flags = 0 # 2 <=> starargs, 4 <=> kwargs
+    for param in params:
+        if isinstance(param, starargs):
+            varargs = param
+            if flags:
+                raise TypeError('found starargs after keywords !')
+            flags |= 2
+            args += list(varargs)
+        elif isinstance(param, keywords):
+            kwargs = param
+            if flags & 4:
+                raise TypeError('got multiple keywords parameters')
+            flags |= 4
+        elif flags & 2 or flags & 4:
+            raise TypeError('found parameters after kwargs or args')
+        else:
+            args.append(param)
+
+    return args, kwargs
+
+
+class InnerTest(tuple):
+    def __new__(cls, name, *data):
+        instance = tuple.__new__(cls, data)
+        instance.name = name
+        return instance
+
+class Tags(set):
+    """A set of tag able validate an expression"""
+
+    def __init__(self, *tags, **kwargs):
+        self.inherit = kwargs.pop('inherit', True)
+        if kwargs:
+           raise TypeError("%s are an invalid keyword argument for this function" % kwargs.keys())
+
+        if len(tags) == 1 and not isinstance(tags[0], string_types):
+            tags = tags[0]
+        super(Tags, self).__init__(tags, **kwargs)
+
+    def __getitem__(self, key):
+        return key in self
+
+    def match(self, exp):
+        return eval(exp, {}, self)
+
+    def __or__(self, other):
+        return Tags(*super(Tags, self).__or__(other))
+
+
+# duplicate definition from unittest2 of the _deprecate decorator
+def _deprecate(original_func):
+    def deprecated_func(*args, **kwargs):
+        warnings.warn(
+            ('Please use %s instead.' % original_func.__name__),
+            DeprecationWarning, 2)
+        return original_func(*args, **kwargs)
+    return deprecated_func
+
+class TestCase(unittest.TestCase):
+    """A unittest.TestCase extension with some additional methods."""
+    maxDiff = None
+    pdbclass = Debugger
+    tags = Tags()
+
+    def __init__(self, methodName='runTest'):
+        super(TestCase, self).__init__(methodName)
+        self.__exc_info = sys.exc_info
+        self.__testMethodName = self._testMethodName
+        self._current_test_descr = None
+        self._options_ = None
+
+    @classproperty
+    @cached
+    def datadir(cls): # pylint: disable=E0213
+        """helper attribute holding the standard test's data directory
+
+        NOTE: this is a logilab's standard
+        """
+        mod = sys.modules[cls.__module__]
+        return osp.join(osp.dirname(osp.abspath(mod.__file__)), 'data')
+    # cache it (use a class method to cache on class since TestCase is
+    # instantiated for each test run)
+
+    @classmethod
+    def datapath(cls, *fname):
+        """joins the object's datadir and `fname`"""
+        return osp.join(cls.datadir, *fname)
+
+    def set_description(self, descr):
+        """sets the current test's description.
+        This can be useful for generative tests because it allows to specify
+        a description per yield
+        """
+        self._current_test_descr = descr
+
+    # override default's unittest.py feature
+    def shortDescription(self):
+        """override default unittest shortDescription to handle correctly
+        generative tests
+        """
+        if self._current_test_descr is not None:
+            return self._current_test_descr
+        return super(TestCase, self).shortDescription()
+
+    def quiet_run(self, result, func, *args, **kwargs):
+        try:
+            func(*args, **kwargs)
+        except (KeyboardInterrupt, SystemExit):
+            raise
+        except unittest.SkipTest as e:
+            if hasattr(result, 'addSkip'):
+                result.addSkip(self, str(e))
+            else:
+                warnings.warn("TestResult has no addSkip method, skips not reported",
+                              RuntimeWarning, 2)
+                result.addSuccess(self)
+            return False
+        except:
+            result.addError(self, self.__exc_info())
+            return False
+        return True
+
+    def _get_test_method(self):
+        """return the test method"""
+        return getattr(self, self._testMethodName)
+
+    def optval(self, option, default=None):
+        """return the option value or default if the option is not define"""
+        return getattr(self._options_, option, default)
+
+    def __call__(self, result=None, runcondition=None, options=None):
+        """rewrite TestCase.__call__ to support generative tests
+        This is mostly a copy/paste from unittest.py (i.e same
+        variable names, same logic, except for the generative tests part)
+        """
+        from logilab.common.pytest import FILE_RESTART
+        if result is None:
+            result = self.defaultTestResult()
+        result.pdbclass = self.pdbclass
+        self._options_ = options
+        # if result.cvg:
+        #     result.cvg.start()
+        testMethod = self._get_test_method()
+        if (getattr(self.__class__, "__unittest_skip__", False) or
+            getattr(testMethod, "__unittest_skip__", False)):
+            # If the class or method was skipped.
+            try:
+                skip_why = (getattr(self.__class__, '__unittest_skip_why__', '')
+                            or getattr(testMethod, '__unittest_skip_why__', ''))
+                self._addSkip(result, skip_why)
+            finally:
+                result.stopTest(self)
+            return
+        if runcondition and not runcondition(testMethod):
+            return # test is skipped
+        result.startTest(self)
+        try:
+            if not self.quiet_run(result, self.setUp):
+                return
+            generative = isgeneratorfunction(testMethod)
+            # generative tests
+            if generative:
+                self._proceed_generative(result, testMethod,
+                                         runcondition)
+            else:
+                status = self._proceed(result, testMethod)
+                success = (status == 0)
+            if not self.quiet_run(result, self.tearDown):
+                return
+            if not generative and success:
+                if hasattr(options, "exitfirst") and options.exitfirst:
+                    # add this test to restart file
+                    try:
+                        restartfile = open(FILE_RESTART, 'a')
+                        try:
+                            descr = '.'.join((self.__class__.__module__,
+                                              self.__class__.__name__,
+                                              self._testMethodName))
+                            restartfile.write(descr+os.linesep)
+                        finally:
+                            restartfile.close()
+                    except Exception:
+                        print("Error while saving succeeded test into",
+                              osp.join(os.getcwd(), FILE_RESTART),
+                              file=sys.__stderr__)
+                        raise
+                result.addSuccess(self)
+        finally:
+            # if result.cvg:
+            #     result.cvg.stop()
+            result.stopTest(self)
+
+    def _proceed_generative(self, result, testfunc, runcondition=None):
+        # cancel startTest()'s increment
+        result.testsRun -= 1
+        success = True
+        try:
+            for params in testfunc():
+                if runcondition and not runcondition(testfunc,
+                        skipgenerator=False):
+                    if not (isinstance(params, InnerTest)
+                            and runcondition(params)):
+                        continue
+                if not isinstance(params, (tuple, list)):
+                    params = (params, )
+                func = params[0]
+                args, kwargs = parse_generative_args(params[1:])
+                # increment test counter manually
+                result.testsRun += 1
+                status = self._proceed(result, func, args, kwargs)
+                if status == 0:
+                    result.addSuccess(self)
+                    success = True
+                else:
+                    success = False
+                    # XXX Don't stop anymore if an error occured
+                    #if status == 2:
+                    #    result.shouldStop = True
+                if result.shouldStop: # either on error or on exitfirst + error
+                    break
+        except:
+            # if an error occurs between two yield
+            result.addError(self, self.__exc_info())
+            success = False
+        return success
+
+    def _proceed(self, result, testfunc, args=(), kwargs=None):
+        """proceed the actual test
+        returns 0 on success, 1 on failure, 2 on error
+
+        Note: addSuccess can't be called here because we have to wait
+        for tearDown to be successfully executed to declare the test as
+        successful
+        """
+        kwargs = kwargs or {}
+        try:
+            testfunc(*args, **kwargs)
+        except self.failureException:
+            result.addFailure(self, self.__exc_info())
+            return 1
+        except KeyboardInterrupt:
+            raise
+        except InnerTestSkipped as e:
+            result.addSkip(self, e)
+            return 1
+        except SkipTest as e:
+            result.addSkip(self, e)
+            return 0
+        except:
+            result.addError(self, self.__exc_info())
+            return 2
+        return 0
+
+    def defaultTestResult(self):
+        """return a new instance of the defaultTestResult"""
+        return SkipAwareTestResult()
+
+    skip = _deprecate(unittest.TestCase.skipTest)
+    assertEquals = _deprecate(unittest.TestCase.assertEqual)
+    assertNotEquals = _deprecate(unittest.TestCase.assertNotEqual)
+    assertAlmostEquals = _deprecate(unittest.TestCase.assertAlmostEqual)
+    assertNotAlmostEquals = _deprecate(unittest.TestCase.assertNotAlmostEqual)
+
+    def innerSkip(self, msg=None):
+        """mark a generative test as skipped for the <msg> reason"""
+        msg = msg or 'test was skipped'
+        raise InnerTestSkipped(msg)
+
+    @deprecated('Please use assertDictEqual instead.')
+    def assertDictEquals(self, dict1, dict2, msg=None, context=None):
+        """compares two dicts
+
+        If the two dict differ, the first difference is shown in the error
+        message
+        :param dict1: a Python Dictionary
+        :param dict2: a Python Dictionary
+        :param msg: custom message (String) in case of failure
+        """
+        dict1 = dict(dict1)
+        msgs = []
+        for key, value in dict2.items():
+            try:
+                if dict1[key] != value:
+                    msgs.append('%r != %r for key %r' % (dict1[key], value,
+                        key))
+                del dict1[key]
+            except KeyError:
+                msgs.append('missing %r key' % key)
+        if dict1:
+            msgs.append('dict2 is lacking %r' % dict1)
+        if msg:
+            self.failureException(msg)
+        elif msgs:
+            if context is not None:
+                base = '%s\n' % context
+            else:
+                base = ''
+            self.fail(base + '\n'.join(msgs))
+
+    @deprecated('Please use assertCountEqual instead.')
+    def assertUnorderedIterableEquals(self, got, expected, msg=None):
+        """compares two iterable and shows difference between both
+
+        :param got: the unordered Iterable that we found
+        :param expected: the expected unordered Iterable
+        :param msg: custom message (String) in case of failure
+        """
+        got, expected = list(got), list(expected)
+        self.assertSetEqual(set(got), set(expected), msg)
+        if len(got) != len(expected):
+            if msg is None:
+                msg = ['Iterable have the same elements but not the same number',
+                       '\t<element>\t<expected>i\t<got>']
+                got_count = {}
+                expected_count = {}
+                for element in got:
+                    got_count[element] = got_count.get(element, 0) + 1
+                for element in expected:
+                    expected_count[element] = expected_count.get(element, 0) + 1
+                # we know that got_count.key() == expected_count.key()
+                # because of assertSetEqual
+                for element, count in got_count.iteritems():
+                    other_count = expected_count[element]
+                    if other_count != count:
+                        msg.append('\t%s\t%s\t%s' % (element, other_count, count))
+
+            self.fail(msg)
+
+    assertUnorderedIterableEqual = assertUnorderedIterableEquals
+    assertUnordIterEquals = assertUnordIterEqual = assertUnorderedIterableEqual
+
+    @deprecated('Please use assertSetEqual instead.')
+    def assertSetEquals(self,got,expected, msg=None):
+        """compares two sets and shows difference between both
+
+        Don't use it for iterables other than sets.
+
+        :param got: the Set that we found
+        :param expected: the second Set to be compared to the first one
+        :param msg: custom message (String) in case of failure
+        """
+
+        if not(isinstance(got, set) and isinstance(expected, set)):
+            warnings.warn("the assertSetEquals function if now intended for set only."\
+                          "use assertUnorderedIterableEquals instead.",
+                DeprecationWarning, 2)
+            return self.assertUnorderedIterableEquals(got, expected, msg)
+
+        items={}
+        items['missing'] = expected - got
+        items['unexpected'] = got - expected
+        if any(items.itervalues()):
+            if msg is None:
+                msg = '\n'.join('%s:\n\t%s' % (key, "\n\t".join(str(value) for value in values))
+                    for key, values in items.iteritems() if values)
+            self.fail(msg)
+
+    @deprecated('Please use assertListEqual instead.')
+    def assertListEquals(self, list_1, list_2, msg=None):
+        """compares two lists
+
+        If the two list differ, the first difference is shown in the error
+        message
+
+        :param list_1: a Python List
+        :param list_2: a second Python List
+        :param msg: custom message (String) in case of failure
+        """
+        _l1 = list_1[:]
+        for i, value in enumerate(list_2):
+            try:
+                if _l1[0] != value:
+                    from pprint import pprint
+                    pprint(list_1)
+                    pprint(list_2)
+                    self.fail('%r != %r for index %d' % (_l1[0], value, i))
+                del _l1[0]
+            except IndexError:
+                if msg is None:
+                    msg = 'list_1 has only %d elements, not %s '\
+                        '(at least %r missing)'% (i, len(list_2), value)
+                self.fail(msg)
+        if _l1:
+            if msg is None:
+                msg = 'list_2 is lacking %r' % _l1
+            self.fail(msg)
+
+    @deprecated('Non-standard. Please use assertMultiLineEqual instead.')
+    def assertLinesEquals(self, string1, string2, msg=None, striplines=False):
+        """compare two strings and assert that the text lines of the strings
+        are equal.
+
+        :param string1: a String
+        :param string2: a String
+        :param msg: custom message (String) in case of failure
+        :param striplines: Boolean to trigger line stripping before comparing
+        """
+        lines1 = string1.splitlines()
+        lines2 = string2.splitlines()
+        if striplines:
+            lines1 = [l.strip() for l in lines1]
+            lines2 = [l.strip() for l in lines2]
+        self.assertListEqual(lines1, lines2, msg)
+    assertLineEqual = assertLinesEquals
+
+    @deprecated('Non-standard: please copy test method to your TestCase class')
+    def assertXMLWellFormed(self, stream, msg=None, context=2):
+        """asserts the XML stream is well-formed (no DTD conformance check)
+
+        :param context: number of context lines in standard message
+                        (show all data if negative).
+                        Only available with element tree
+        """
+        try:
+            from xml.etree.ElementTree import parse
+            self._assertETXMLWellFormed(stream, parse, msg)
+        except ImportError:
+            from xml.sax import make_parser, SAXParseException
+            parser = make_parser()
+            try:
+                parser.parse(stream)
+            except SAXParseException as ex:
+                if msg is None:
+                    stream.seek(0)
+                    for _ in range(ex.getLineNumber()):
+                        line = stream.readline()
+                    pointer = ('' * (ex.getLineNumber() - 1)) + '^'
+                    msg = 'XML stream not well formed: %s\n%s%s' % (ex, line, pointer)
+                self.fail(msg)
+
+    @deprecated('Non-standard: please copy test method to your TestCase class')
+    def assertXMLStringWellFormed(self, xml_string, msg=None, context=2):
+        """asserts the XML string is well-formed (no DTD conformance check)
+
+        :param context: number of context lines in standard message
+                        (show all data if negative).
+                        Only available with element tree
+        """
+        try:
+            from xml.etree.ElementTree import fromstring
+        except ImportError:
+            from elementtree.ElementTree import fromstring
+        self._assertETXMLWellFormed(xml_string, fromstring, msg)
+
+    def _assertETXMLWellFormed(self, data, parse, msg=None, context=2):
+        """internal function used by /assertXML(String)?WellFormed/ functions
+
+        :param data: xml_data
+        :param parse: appropriate parser function for this data
+        :param msg: error message
+        :param context: number of context lines in standard message
+                        (show all data if negative).
+                        Only available with element tree
+        """
+        from xml.parsers.expat import ExpatError
+        try:
+            from xml.etree.ElementTree import ParseError
+        except ImportError:
+            # compatibility for <python2.7
+            ParseError = ExpatError
+        try:
+            parse(data)
+        except (ExpatError, ParseError) as ex:
+            if msg is None:
+                if hasattr(data, 'readlines'): #file like object
+                    data.seek(0)
+                    lines = data.readlines()
+                else:
+                    lines = data.splitlines(True)
+                nb_lines = len(lines)
+                context_lines = []
+
+                # catch when ParseError doesn't set valid lineno
+                if ex.lineno is not None:
+                    if context < 0:
+                        start = 1
+                        end   = nb_lines
+                    else:
+                        start = max(ex.lineno-context, 1)
+                        end   = min(ex.lineno+context, nb_lines)
+                    line_number_length = len('%i' % end)
+                    line_pattern = " %%%ii: %%s" % line_number_length
+
+                    for line_no in range(start, ex.lineno):
+                        context_lines.append(line_pattern % (line_no, lines[line_no-1]))
+                    context_lines.append(line_pattern % (ex.lineno, lines[ex.lineno-1]))
+                    context_lines.append('%s^\n' % (' ' * (1 + line_number_length + 2 +ex.offset)))
+                    for line_no in range(ex.lineno+1, end+1):
+                        context_lines.append(line_pattern % (line_no, lines[line_no-1]))
+
+                rich_context = ''.join(context_lines)
+                msg = 'XML stream not well formed: %s\n%s' % (ex, rich_context)
+            self.fail(msg)
+
+    @deprecated('Non-standard: please copy test method to your TestCase class')
+    def assertXMLEqualsTuple(self, element, tup):
+        """compare an ElementTree Element to a tuple formatted as follow:
+        (tagname, [attrib[, children[, text[, tail]]]])"""
+        # check tag
+        self.assertTextEquals(element.tag, tup[0])
+        # check attrib
+        if len(element.attrib) or len(tup)>1:
+            if len(tup)<=1:
+                self.fail( "tuple %s has no attributes (%s expected)"%(tup,
+                    dict(element.attrib)))
+            self.assertDictEqual(element.attrib, tup[1])
+        # check children
+        if len(element) or len(tup)>2:
+            if len(tup)<=2:
+                self.fail( "tuple %s has no children (%i expected)"%(tup,
+                    len(element)))
+            if len(element) != len(tup[2]):
+                self.fail( "tuple %s has %i children%s (%i expected)"%(tup,
+                    len(tup[2]),
+                        ('', 's')[len(tup[2])>1], len(element)))
+            for index in range(len(tup[2])):
+                self.assertXMLEqualsTuple(element[index], tup[2][index])
+        #check text
+        if element.text or len(tup)>3:
+            if len(tup)<=3:
+                self.fail( "tuple %s has no text value (%r expected)"%(tup,
+                    element.text))
+            self.assertTextEquals(element.text, tup[3])
+        #check tail
+        if element.tail or len(tup)>4:
+            if len(tup)<=4:
+                self.fail( "tuple %s has no tail value (%r expected)"%(tup,
+                    element.tail))
+            self.assertTextEquals(element.tail, tup[4])
+
+    def _difftext(self, lines1, lines2, junk=None, msg_prefix='Texts differ'):
+        junk = junk or (' ', '\t')
+        # result is a generator
+        result = difflib.ndiff(lines1, lines2, charjunk=lambda x: x in junk)
+        read = []
+        for line in result:
+            read.append(line)
+            # lines that don't start with a ' ' are diff ones
+            if not line.startswith(' '):
+                self.fail('\n'.join(['%s\n'%msg_prefix]+read + list(result)))
+
+    @deprecated('Non-standard. Please use assertMultiLineEqual instead.')
+    def assertTextEquals(self, text1, text2, junk=None,
+            msg_prefix='Text differ', striplines=False):
+        """compare two multiline strings (using difflib and splitlines())
+
+        :param text1: a Python BaseString
+        :param text2: a second Python Basestring
+        :param junk: List of Caracters
+        :param msg_prefix: String (message prefix)
+        :param striplines: Boolean to trigger line stripping before comparing
+        """
+        msg = []
+        if not isinstance(text1, string_types):
+            msg.append('text1 is not a string (%s)'%(type(text1)))
+        if not isinstance(text2, string_types):
+            msg.append('text2 is not a string (%s)'%(type(text2)))
+        if msg:
+            self.fail('\n'.join(msg))
+        lines1 = text1.strip().splitlines(True)
+        lines2 = text2.strip().splitlines(True)
+        if striplines:
+            lines1 = [line.strip() for line in lines1]
+            lines2 = [line.strip() for line in lines2]
+        self._difftext(lines1, lines2, junk,  msg_prefix)
+    assertTextEqual = assertTextEquals
+
+    @deprecated('Non-standard: please copy test method to your TestCase class')
+    def assertStreamEquals(self, stream1, stream2, junk=None,
+            msg_prefix='Stream differ'):
+        """compare two streams (using difflib and readlines())"""
+        # if stream2 is stream2, readlines() on stream1 will also read lines
+        # in stream2, so they'll appear different, although they're not
+        if stream1 is stream2:
+            return
+        # make sure we compare from the beginning of the stream
+        stream1.seek(0)
+        stream2.seek(0)
+        # compare
+        self._difftext(stream1.readlines(), stream2.readlines(), junk,
+             msg_prefix)
+
+    assertStreamEqual = assertStreamEquals
+
+    @deprecated('Non-standard: please copy test method to your TestCase class')
+    def assertFileEquals(self, fname1, fname2, junk=(' ', '\t')):
+        """compares two files using difflib"""
+        self.assertStreamEqual(open(fname1), open(fname2), junk,
+            msg_prefix='Files differs\n-:%s\n+:%s\n'%(fname1, fname2))
+
+    assertFileEqual = assertFileEquals
+
+    @deprecated('Non-standard: please copy test method to your TestCase class')
+    def assertDirEquals(self, path_a, path_b):
+        """compares two files using difflib"""
+        assert osp.exists(path_a), "%s doesn't exists" % path_a
+        assert osp.exists(path_b), "%s doesn't exists" % path_b
+
+        all_a = [ (ipath[len(path_a):].lstrip('/'), idirs, ifiles)
+                    for ipath, idirs, ifiles in os.walk(path_a)]
+        all_a.sort(key=itemgetter(0))
+
+        all_b = [ (ipath[len(path_b):].lstrip('/'), idirs, ifiles)
+                    for ipath, idirs, ifiles in os.walk(path_b)]
+        all_b.sort(key=itemgetter(0))
+
+        iter_a, iter_b = iter(all_a), iter(all_b)
+        partial_iter = True
+        ipath_a, idirs_a, ifiles_a = data_a = None, None, None
+        while True:
+            try:
+                ipath_a, idirs_a, ifiles_a = datas_a = next(iter_a)
+                partial_iter = False
+                ipath_b, idirs_b, ifiles_b = datas_b = next(iter_b)
+                partial_iter = True
+
+
+                self.assertTrue(ipath_a == ipath_b,
+                    "unexpected %s in %s while looking %s from %s" %
+                    (ipath_a, path_a, ipath_b, path_b))
+
+
+                errors = {}
+                sdirs_a = set(idirs_a)
+                sdirs_b = set(idirs_b)
+                errors["unexpected directories"] = sdirs_a - sdirs_b
+                errors["missing directories"] = sdirs_b - sdirs_a
+
+                sfiles_a = set(ifiles_a)
+                sfiles_b = set(ifiles_b)
+                errors["unexpected files"] = sfiles_a - sfiles_b
+                errors["missing files"] = sfiles_b - sfiles_a
+
+
+                msgs = [ "%s: %s"% (name, items)
+                    for name, items in errors.items() if items]
+
+                if msgs:
+                    msgs.insert(0, "%s and %s differ :" % (
+                        osp.join(path_a, ipath_a),
+                        osp.join(path_b, ipath_b),
+                        ))
+                    self.fail("\n".join(msgs))
+
+                for files in (ifiles_a, ifiles_b):
+                    files.sort()
+
+                for index, path in enumerate(ifiles_a):
+                    self.assertFileEquals(osp.join(path_a, ipath_a, path),
+                        osp.join(path_b, ipath_b, ifiles_b[index]))
+
+            except StopIteration:
+                break
+
+    assertDirEqual = assertDirEquals
+
+    def assertIsInstance(self, obj, klass, msg=None, strict=False):
+        """check if an object is an instance of a class
+
+        :param obj: the Python Object to be checked
+        :param klass: the target class
+        :param msg: a String for a custom message
+        :param strict: if True, check that the class of <obj> is <klass>;
+                       else check with 'isinstance'
+        """
+        if strict:
+            warnings.warn('[API] Non-standard. Strict parameter has vanished',
+                          DeprecationWarning, stacklevel=2)
+        if msg is None:
+            if strict:
+                msg = '%r is not of class %s but of %s'
+            else:
+                msg = '%r is not an instance of %s but of %s'
+            msg = msg % (obj, klass, type(obj))
+        if strict:
+            self.assertTrue(obj.__class__ is klass, msg)
+        else:
+            self.assertTrue(isinstance(obj, klass), msg)
+
+    @deprecated('Please use assertIsNone instead.')
+    def assertNone(self, obj, msg=None):
+        """assert obj is None
+
+        :param obj: Python Object to be tested
+        """
+        if msg is None:
+            msg = "reference to %r when None expected"%(obj,)
+        self.assertTrue( obj is None, msg )
+
+    @deprecated('Please use assertIsNotNone instead.')
+    def assertNotNone(self, obj, msg=None):
+        """assert obj is not None"""
+        if msg is None:
+            msg = "unexpected reference to None"
+        self.assertTrue( obj is not None, msg )
+
+    @deprecated('Non-standard. Please use assertAlmostEqual instead.')
+    def assertFloatAlmostEquals(self, obj, other, prec=1e-5,
+                                relative=False, msg=None):
+        """compares if two floats have a distance smaller than expected
+        precision.
+
+        :param obj: a Float
+        :param other: another Float to be comparted to <obj>
+        :param prec: a Float describing the precision
+        :param relative: boolean switching to relative/absolute precision
+        :param msg: a String for a custom message
+        """
+        if msg is None:
+            msg = "%r != %r" % (obj, other)
+        if relative:
+            prec = prec*math.fabs(obj)
+        self.assertTrue(math.fabs(obj - other) < prec, msg)
+
+    def failUnlessRaises(self, excClass, callableObj=None, *args, **kwargs):
+        """override default failUnlessRaises method to return the raised
+        exception instance.
+
+        Fail unless an exception of class excClass is thrown
+        by callableObj when invoked with arguments args and keyword
+        arguments kwargs. If a different type of exception is
+        thrown, it will not be caught, and the test case will be
+        deemed to have suffered an error, exactly as for an
+        unexpected exception.
+
+        CAUTION! There are subtle differences between Logilab and unittest2
+        - exc is not returned in standard version
+        - context capabilities in standard version
+        - try/except/else construction (minor)
+
+        :param excClass: the Exception to be raised
+        :param callableObj: a callable Object which should raise <excClass>
+        :param args: a List of arguments for <callableObj>
+        :param kwargs: a List of keyword arguments  for <callableObj>
+        """
+        # XXX cube vcslib : test_branches_from_app
+        if callableObj is None:
+            _assert = super(TestCase, self).assertRaises
+            return _assert(excClass, callableObj, *args, **kwargs)
+        try:
+            callableObj(*args, **kwargs)
+        except excClass as exc:
+            class ProxyException:
+                def __init__(self, obj):
+                    self._obj = obj
+                def __getattr__(self, attr):
+                    warn_msg = ("This exception was retrieved with the old testlib way "
+                                "`exc = self.assertRaises(Exc, callable)`, please use "
+                                "the context manager instead'")
+                    warnings.warn(warn_msg, DeprecationWarning, 2)
+                    return self._obj.__getattribute__(attr)
+            return ProxyException(exc)
+        else:
+            if hasattr(excClass, '__name__'):
+                excName = excClass.__name__
+            else:
+                excName = str(excClass)
+            raise self.failureException("%s not raised" % excName)
+
+    assertRaises = failUnlessRaises
+
+    if sys.version_info >= (3,2):
+        assertItemsEqual = unittest.TestCase.assertCountEqual
+    else:
+        assertCountEqual = unittest.TestCase.assertItemsEqual
+        if sys.version_info < (2,7):
+            def assertIsNotNone(self, value, *args, **kwargs):
+                self.assertNotEqual(None, value, *args, **kwargs)
+
+TestCase.assertItemsEqual = deprecated('assertItemsEqual is deprecated, use assertCountEqual')(
+    TestCase.assertItemsEqual)
+
+import doctest
+
+class SkippedSuite(unittest.TestSuite):
+    def test(self):
+        """just there to trigger test execution"""
+        self.skipped_test('doctest module has no DocTestSuite class')
+
+
+class DocTestFinder(doctest.DocTestFinder):
+
+    def __init__(self, *args, **kwargs):
+        self.skipped = kwargs.pop('skipped', ())
+        doctest.DocTestFinder.__init__(self, *args, **kwargs)
+
+    def _get_test(self, obj, name, module, globs, source_lines):
+        """override default _get_test method to be able to skip tests
+        according to skipped attribute's value
+        """
+        if getattr(obj, '__name__', '') in self.skipped:
+            return None
+        return doctest.DocTestFinder._get_test(self, obj, name, module,
+                                               globs, source_lines)
+
+
+class DocTest(TestCase):
+    """trigger module doctest
+    I don't know how to make unittest.main consider the DocTestSuite instance
+    without this hack
+    """
+    skipped = ()
+    def __call__(self, result=None, runcondition=None, options=None):\
+        # pylint: disable=W0613
+        try:
+            finder = DocTestFinder(skipped=self.skipped)
+            suite = doctest.DocTestSuite(self.module, test_finder=finder)
+            # XXX iirk
+            doctest.DocTestCase._TestCase__exc_info = sys.exc_info
+        except AttributeError:
+            suite = SkippedSuite()
+        # doctest may gork the builtins dictionnary
+        # This happen to the "_" entry used by gettext
+        old_builtins = builtins.__dict__.copy()
+        try:
+            return suite.run(result)
+        finally:
+            builtins.__dict__.clear()
+            builtins.__dict__.update(old_builtins)
+    run = __call__
+
+    def test(self):
+        """just there to trigger test execution"""
+
+MAILBOX = None
+
+class MockSMTP:
+    """fake smtplib.SMTP"""
+
+    def __init__(self, host, port):
+        self.host = host
+        self.port = port
+        global MAILBOX
+        self.reveived = MAILBOX = []
+
+    def set_debuglevel(self, debuglevel):
+        """ignore debug level"""
+
+    def sendmail(self, fromaddr, toaddres, body):
+        """push sent mail in the mailbox"""
+        self.reveived.append((fromaddr, toaddres, body))
+
+    def quit(self):
+        """ignore quit"""
+
+
+class MockConfigParser(configparser.ConfigParser):
+    """fake ConfigParser.ConfigParser"""
+
+    def __init__(self, options):
+        configparser.ConfigParser.__init__(self)
+        for section, pairs in options.iteritems():
+            self.add_section(section)
+            for key, value in pairs.iteritems():
+                self.set(section, key, value)
+    def write(self, _):
+        raise NotImplementedError()
+
+
+class MockConnection:
+    """fake DB-API 2.0 connexion AND cursor (i.e. cursor() return self)"""
+
+    def __init__(self, results):
+        self.received = []
+        self.states = []
+        self.results = results
+
+    def cursor(self):
+        """Mock cursor method"""
+        return self
+    def execute(self, query, args=None):
+        """Mock execute method"""
+        self.received.append( (query, args) )
+    def fetchone(self):
+        """Mock fetchone method"""
+        return self.results[0]
+    def fetchall(self):
+        """Mock fetchall method"""
+        return self.results
+    def commit(self):
+        """Mock commiy method"""
+        self.states.append( ('commit', len(self.received)) )
+    def rollback(self):
+        """Mock rollback method"""
+        self.states.append( ('rollback', len(self.received)) )
+    def close(self):
+        """Mock close method"""
+        pass
+
+
+def mock_object(**params):
+    """creates an object using params to set attributes
+    >>> option = mock_object(verbose=False, index=range(5))
+    >>> option.verbose
+    False
+    >>> option.index
+    [0, 1, 2, 3, 4]
+    """
+    return type('Mock', (), params)()
+
+
+def create_files(paths, chroot):
+    """Creates directories and files found in <path>.
+
+    :param paths: list of relative paths to files or directories
+    :param chroot: the root directory in which paths will be created
+
+    >>> from os.path import isdir, isfile
+    >>> isdir('/tmp/a')
+    False
+    >>> create_files(['a/b/foo.py', 'a/b/c/', 'a/b/c/d/e.py'], '/tmp')
+    >>> isdir('/tmp/a')
+    True
+    >>> isdir('/tmp/a/b/c')
+    True
+    >>> isfile('/tmp/a/b/c/d/e.py')
+    True
+    >>> isfile('/tmp/a/b/foo.py')
+    True
+    """
+    dirs, files = set(), set()
+    for path in paths:
+        path = osp.join(chroot, path)
+        filename = osp.basename(path)
+        # path is a directory path
+        if filename == '':
+            dirs.add(path)
+        # path is a filename path
+        else:
+            dirs.add(osp.dirname(path))
+            files.add(path)
+    for dirpath in dirs:
+        if not osp.isdir(dirpath):
+            os.makedirs(dirpath)
+    for filepath in files:
+        open(filepath, 'w').close()
+
+
+class AttrObject: # XXX cf mock_object
+    def __init__(self, **kwargs):
+        self.__dict__.update(kwargs)
+
+def tag(*args, **kwargs):
+    """descriptor adding tag to a function"""
+    def desc(func):
+        assert not hasattr(func, 'tags')
+        func.tags = Tags(*args, **kwargs)
+        return func
+    return desc
+
+def require_version(version):
+    """ Compare version of python interpreter to the given one. Skip the test
+    if older.
+    """
+    def check_require_version(f):
+        version_elements = version.split('.')
+        try:
+            compare = tuple([int(v) for v in version_elements])
+        except ValueError:
+            raise ValueError('%s is not a correct version : should be X.Y[.Z].' % version)
+        current = sys.version_info[:3]
+        if current < compare:
+            def new_f(self, *args, **kwargs):
+                self.skipTest('Need at least %s version of python. Current version is %s.' % (version, '.'.join([str(element) for element in current])))
+            new_f.__name__ = f.__name__
+            return new_f
+        else:
+            return f
+    return check_require_version
+
+def require_module(module):
+    """ Check if the given module is loaded. Skip the test if not.
+    """
+    def check_require_module(f):
+        try:
+            __import__(module)
+            return f
+        except ImportError:
+            def new_f(self, *args, **kwargs):
+                self.skipTest('%s can not be imported.' % module)
+            new_f.__name__ = f.__name__
+            return new_f
+    return check_require_module
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/textutils.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/textutils.py
new file mode 100644
index 0000000..9046f97
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/textutils.py
@@ -0,0 +1,537 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Some text manipulation utility functions.
+
+
+:group text formatting: normalize_text, normalize_paragraph, pretty_match,\
+unquote, colorize_ansi
+:group text manipulation: searchall, splitstrip
+:sort: text formatting, text manipulation
+
+:type ANSI_STYLES: dict(str)
+:var ANSI_STYLES: dictionary mapping style identifier to ANSI terminal code
+
+:type ANSI_COLORS: dict(str)
+:var ANSI_COLORS: dictionary mapping color identifier to ANSI terminal code
+
+:type ANSI_PREFIX: str
+:var ANSI_PREFIX:
+  ANSI terminal code notifying the start of an ANSI escape sequence
+
+:type ANSI_END: str
+:var ANSI_END:
+  ANSI terminal code notifying the end of an ANSI escape sequence
+
+:type ANSI_RESET: str
+:var ANSI_RESET:
+  ANSI terminal code resetting format defined by a previous ANSI escape sequence
+"""
+__docformat__ = "restructuredtext en"
+
+import sys
+import re
+import os.path as osp
+from warnings import warn
+from unicodedata import normalize as _uninormalize
+try:
+    from os import linesep
+except ImportError:
+    linesep = '\n' # gae
+
+from logilab.common.deprecation import deprecated
+
+MANUAL_UNICODE_MAP = {
+    u'\xa1': u'!',    # INVERTED EXCLAMATION MARK
+    u'\u0142': u'l',  # LATIN SMALL LETTER L WITH STROKE
+    u'\u2044': u'/',  # FRACTION SLASH
+    u'\xc6': u'AE',   # LATIN CAPITAL LETTER AE
+    u'\xa9': u'(c)',  # COPYRIGHT SIGN
+    u'\xab': u'"',    # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+    u'\xe6': u'ae',   # LATIN SMALL LETTER AE
+    u'\xae': u'(r)',  # REGISTERED SIGN
+    u'\u0153': u'oe', # LATIN SMALL LIGATURE OE
+    u'\u0152': u'OE', # LATIN CAPITAL LIGATURE OE
+    u'\xd8': u'O',    # LATIN CAPITAL LETTER O WITH STROKE
+    u'\xf8': u'o',    # LATIN SMALL LETTER O WITH STROKE
+    u'\xbb': u'"',    # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+    u'\xdf': u'ss',   # LATIN SMALL LETTER SHARP S
+    }
+
+def unormalize(ustring, ignorenonascii=None, substitute=None):
+    """replace diacritical characters with their corresponding ascii characters
+
+    Convert the unicode string to its long normalized form (unicode character
+    will be transform into several characters) and keep the first one only.
+    The normal form KD (NFKD) will apply the compatibility decomposition, i.e.
+    replace all compatibility characters with their equivalents.
+
+    :type substitute: str
+    :param substitute: replacement character to use if decomposition fails
+
+    :see: Another project about ASCII transliterations of Unicode text
+          http://pypi.python.org/pypi/Unidecode
+    """
+    # backward compatibility, ignorenonascii was a boolean
+    if ignorenonascii is not None:
+        warn("ignorenonascii is deprecated, use substitute named parameter instead",
+             DeprecationWarning, stacklevel=2)
+        if ignorenonascii:
+            substitute = ''
+    res = []
+    for letter in ustring[:]:
+        try:
+            replacement = MANUAL_UNICODE_MAP[letter]
+        except KeyError:
+            replacement = _uninormalize('NFKD', letter)[0]
+            if ord(replacement) >= 2 ** 7:
+                if substitute is None:
+                    raise ValueError("can't deal with non-ascii based characters")
+                replacement = substitute
+        res.append(replacement)
+    return u''.join(res)
+
+def unquote(string):
+    """remove optional quotes (simple or double) from the string
+
+    :type string: str or unicode
+    :param string: an optionally quoted string
+
+    :rtype: str or unicode
+    :return: the unquoted string (or the input string if it wasn't quoted)
+    """
+    if not string:
+        return string
+    if string[0] in '"\'':
+        string = string[1:]
+    if string[-1] in '"\'':
+        string = string[:-1]
+    return string
+
+
+_BLANKLINES_RGX = re.compile('\r?\n\r?\n')
+_NORM_SPACES_RGX = re.compile('\s+')
+
+def normalize_text(text, line_len=80, indent='', rest=False):
+    """normalize a text to display it with a maximum line size and
+    optionally arbitrary indentation. Line jumps are normalized but blank
+    lines are kept. The indentation string may be used to insert a
+    comment (#) or a quoting (>) mark  for instance.
+
+    :type text: str or unicode
+    :param text: the input text to normalize
+
+    :type line_len: int
+    :param line_len: expected maximum line's length, default to 80
+
+    :type indent: str or unicode
+    :param indent: optional string to use as indentation
+
+    :rtype: str or unicode
+    :return:
+      the input text normalized to fit on lines with a maximized size
+      inferior to `line_len`, and optionally prefixed by an
+      indentation string
+    """
+    if rest:
+        normp = normalize_rest_paragraph
+    else:
+        normp = normalize_paragraph
+    result = []
+    for text in _BLANKLINES_RGX.split(text):
+        result.append(normp(text, line_len, indent))
+    return ('%s%s%s' % (linesep, indent, linesep)).join(result)
+
+
+def normalize_paragraph(text, line_len=80, indent=''):
+    """normalize a text to display it with a maximum line size and
+    optionally arbitrary indentation. Line jumps are normalized. The
+    indentation string may be used top insert a comment mark for
+    instance.
+
+    :type text: str or unicode
+    :param text: the input text to normalize
+
+    :type line_len: int
+    :param line_len: expected maximum line's length, default to 80
+
+    :type indent: str or unicode
+    :param indent: optional string to use as indentation
+
+    :rtype: str or unicode
+    :return:
+      the input text normalized to fit on lines with a maximized size
+      inferior to `line_len`, and optionally prefixed by an
+      indentation string
+    """
+    text = _NORM_SPACES_RGX.sub(' ', text)
+    line_len = line_len - len(indent)
+    lines = []
+    while text:
+        aline, text = splittext(text.strip(), line_len)
+        lines.append(indent + aline)
+    return linesep.join(lines)
+
+def normalize_rest_paragraph(text, line_len=80, indent=''):
+    """normalize a ReST text to display it with a maximum line size and
+    optionally arbitrary indentation. Line jumps are normalized. The
+    indentation string may be used top insert a comment mark for
+    instance.
+
+    :type text: str or unicode
+    :param text: the input text to normalize
+
+    :type line_len: int
+    :param line_len: expected maximum line's length, default to 80
+
+    :type indent: str or unicode
+    :param indent: optional string to use as indentation
+
+    :rtype: str or unicode
+    :return:
+      the input text normalized to fit on lines with a maximized size
+      inferior to `line_len`, and optionally prefixed by an
+      indentation string
+    """
+    toreport = ''
+    lines = []
+    line_len = line_len - len(indent)
+    for line in text.splitlines():
+        line = toreport + _NORM_SPACES_RGX.sub(' ', line.strip())
+        toreport = ''
+        while len(line) > line_len:
+            # too long line, need split
+            line, toreport = splittext(line, line_len)
+            lines.append(indent + line)
+            if toreport:
+                line = toreport + ' '
+                toreport = ''
+            else:
+                line = ''
+        if line:
+            lines.append(indent + line.strip())
+    return linesep.join(lines)
+
+
+def splittext(text, line_len):
+    """split the given text on space according to the given max line size
+
+    return a 2-uple:
+    * a line <= line_len if possible
+    * the rest of the text which has to be reported on another line
+    """
+    if len(text) <= line_len:
+        return text, ''
+    pos = min(len(text)-1, line_len)
+    while pos > 0 and text[pos] != ' ':
+        pos -= 1
+    if pos == 0:
+        pos = min(len(text), line_len)
+        while len(text) > pos and text[pos] != ' ':
+            pos += 1
+    return text[:pos], text[pos+1:].strip()
+
+
+def splitstrip(string, sep=','):
+    """return a list of stripped string by splitting the string given as
+    argument on `sep` (',' by default). Empty string are discarded.
+
+    >>> splitstrip('a, b, c   ,  4,,')
+    ['a', 'b', 'c', '4']
+    >>> splitstrip('a')
+    ['a']
+    >>>
+
+    :type string: str or unicode
+    :param string: a csv line
+
+    :type sep: str or unicode
+    :param sep: field separator, default to the comma (',')
+
+    :rtype: str or unicode
+    :return: the unquoted string (or the input string if it wasn't quoted)
+    """
+    return [word.strip() for word in string.split(sep) if word.strip()]
+
+get_csv = deprecated('get_csv is deprecated, use splitstrip')(splitstrip)
+
+
+def split_url_or_path(url_or_path):
+    """return the latest component of a string containing either an url of the
+    form <scheme>://<path> or a local file system path
+    """
+    if '://' in url_or_path:
+        return url_or_path.rstrip('/').rsplit('/', 1)
+    return osp.split(url_or_path.rstrip(osp.sep))
+
+
+def text_to_dict(text):
+    """parse multilines text containing simple 'key=value' lines and return a
+    dict of {'key': 'value'}. When the same key is encountered multiple time,
+    value is turned into a list containing all values.
+
+    >>> d = text_to_dict('''multiple=1
+    ... multiple= 2
+    ... single =3
+    ... ''')
+    >>> d['single']
+    '3'
+    >>> d['multiple']
+    ['1', '2']
+
+    """
+    res = {}
+    if not text:
+        return res
+    for line in text.splitlines():
+        line = line.strip()
+        if line and not line.startswith('#'):
+            key, value = [w.strip() for w in line.split('=', 1)]
+            if key in res:
+                try:
+                    res[key].append(value)
+                except AttributeError:
+                    res[key] = [res[key], value]
+            else:
+                res[key] = value
+    return res
+
+
+_BLANK_URE = r'(\s|,)+'
+_BLANK_RE = re.compile(_BLANK_URE)
+__VALUE_URE = r'-?(([0-9]+\.[0-9]*)|((0x?)?[0-9]+))'
+__UNITS_URE = r'[a-zA-Z]+'
+_VALUE_RE = re.compile(r'(?P<value>%s)(?P<unit>%s)?'%(__VALUE_URE, __UNITS_URE))
+_VALIDATION_RE = re.compile(r'^((%s)(%s))*(%s)?$' % (__VALUE_URE, __UNITS_URE,
+                                                    __VALUE_URE))
+
+BYTE_UNITS = {
+    "b": 1,
+    "kb": 1024,
+    "mb": 1024 ** 2,
+    "gb": 1024 ** 3,
+    "tb": 1024 ** 4,
+}
+
+TIME_UNITS = {
+    "ms": 0.0001,
+    "s": 1,
+    "min": 60,
+    "h": 60 * 60,
+    "d": 60 * 60 *24,
+}
+
+def apply_units(string, units, inter=None, final=float, blank_reg=_BLANK_RE,
+                value_reg=_VALUE_RE):
+    """Parse the string applying the units defined in units
+    (e.g.: "1.5m",{'m',60} -> 80).
+
+    :type string: str or unicode
+    :param string: the string to parse
+
+    :type units: dict (or any object with __getitem__ using basestring key)
+    :param units: a dict mapping a unit string repr to its value
+
+    :type inter: type
+    :param inter: used to parse every intermediate value (need __sum__)
+
+    :type blank_reg: regexp
+    :param blank_reg: should match every blank char to ignore.
+
+    :type value_reg: regexp with "value" and optional "unit" group
+    :param value_reg: match a value and it's unit into the
+    """
+    if inter is None:
+        inter = final
+    fstring = _BLANK_RE.sub('', string)
+    if not (fstring and _VALIDATION_RE.match(fstring)):
+        raise ValueError("Invalid unit string: %r." % string)
+    values = []
+    for match in value_reg.finditer(fstring):
+        dic = match.groupdict()
+        lit, unit = dic["value"], dic.get("unit")
+        value = inter(lit)
+        if unit is not None:
+            try:
+                value *= units[unit.lower()]
+            except KeyError:
+                raise KeyError('invalid unit %s. valid units are %s' %
+                               (unit, units.keys()))
+        values.append(value)
+    return final(sum(values))
+
+
+_LINE_RGX = re.compile('\r\n|\r+|\n')
+
+def pretty_match(match, string, underline_char='^'):
+    """return a string with the match location underlined:
+
+    >>> import re
+    >>> print(pretty_match(re.search('mange', 'il mange du bacon'), 'il mange du bacon'))
+    il mange du bacon
+       ^^^^^
+    >>>
+
+    :type match: _sre.SRE_match
+    :param match: object returned by re.match, re.search or re.finditer
+
+    :type string: str or unicode
+    :param string:
+      the string on which the regular expression has been applied to
+      obtain the `match` object
+
+    :type underline_char: str or unicode
+    :param underline_char:
+      character to use to underline the matched section, default to the
+      carret '^'
+
+    :rtype: str or unicode
+    :return:
+      the original string with an inserted line to underline the match
+      location
+    """
+    start = match.start()
+    end = match.end()
+    string = _LINE_RGX.sub(linesep, string)
+    start_line_pos = string.rfind(linesep, 0, start)
+    if start_line_pos == -1:
+        start_line_pos = 0
+        result = []
+    else:
+        result = [string[:start_line_pos]]
+        start_line_pos += len(linesep)
+    offset = start - start_line_pos
+    underline = ' ' * offset + underline_char * (end - start)
+    end_line_pos = string.find(linesep, end)
+    if end_line_pos == -1:
+        string = string[start_line_pos:]
+        result.append(string)
+        result.append(underline)
+    else:
+        end = string[end_line_pos + len(linesep):]
+        string = string[start_line_pos:end_line_pos]
+        result.append(string)
+        result.append(underline)
+        result.append(end)
+    return linesep.join(result).rstrip()
+
+
+# Ansi colorization ###########################################################
+
+ANSI_PREFIX = '\033['
+ANSI_END = 'm'
+ANSI_RESET = '\033[0m'
+ANSI_STYLES = {
+    'reset': "0",
+    'bold': "1",
+    'italic': "3",
+    'underline': "4",
+    'blink': "5",
+    'inverse': "7",
+    'strike': "9",
+}
+ANSI_COLORS = {
+    'reset': "0",
+    'black': "30",
+    'red': "31",
+    'green': "32",
+    'yellow': "33",
+    'blue': "34",
+    'magenta': "35",
+    'cyan': "36",
+    'white': "37",
+}
+
+def _get_ansi_code(color=None, style=None):
+    """return ansi escape code corresponding to color and style
+
+    :type color: str or None
+    :param color:
+      the color name (see `ANSI_COLORS` for available values)
+      or the color number when 256 colors are available
+
+    :type style: str or None
+    :param style:
+      style string (see `ANSI_COLORS` for available values). To get
+      several style effects at the same time, use a coma as separator.
+
+    :raise KeyError: if an unexistent color or style identifier is given
+
+    :rtype: str
+    :return: the built escape code
+    """
+    ansi_code = []
+    if style:
+        style_attrs = splitstrip(style)
+        for effect in style_attrs:
+            ansi_code.append(ANSI_STYLES[effect])
+    if color:
+        if color.isdigit():
+            ansi_code.extend(['38', '5'])
+            ansi_code.append(color)
+        else:
+            ansi_code.append(ANSI_COLORS[color])
+    if ansi_code:
+        return ANSI_PREFIX + ';'.join(ansi_code) + ANSI_END
+    return ''
+
+def colorize_ansi(msg, color=None, style=None):
+    """colorize message by wrapping it with ansi escape codes
+
+    :type msg: str or unicode
+    :param msg: the message string to colorize
+
+    :type color: str or None
+    :param color:
+      the color identifier (see `ANSI_COLORS` for available values)
+
+    :type style: str or None
+    :param style:
+      style string (see `ANSI_COLORS` for available values). To get
+      several style effects at the same time, use a coma as separator.
+
+    :raise KeyError: if an unexistent color or style identifier is given
+
+    :rtype: str or unicode
+    :return: the ansi escaped string
+    """
+    # If both color and style are not defined, then leave the text as is
+    if color is None and style is None:
+        return msg
+    escape_code = _get_ansi_code(color, style)
+    # If invalid (or unknown) color, don't wrap msg with ansi codes
+    if escape_code:
+        return '%s%s%s' % (escape_code, msg, ANSI_RESET)
+    return msg
+
+DIFF_STYLE = {'separator': 'cyan', 'remove': 'red', 'add': 'green'}
+
+def diff_colorize_ansi(lines, out=sys.stdout, style=DIFF_STYLE):
+    for line in lines:
+        if line[:4] in ('--- ', '+++ '):
+            out.write(colorize_ansi(line, style['separator']))
+        elif line[0] == '-':
+            out.write(colorize_ansi(line, style['remove']))
+        elif line[0] == '+':
+            out.write(colorize_ansi(line, style['add']))
+        elif line[:4] == '--- ':
+            out.write(colorize_ansi(line, style['separator']))
+        elif line[:4] == '+++ ':
+            out.write(colorize_ansi(line, style['separator']))
+        else:
+            out.write(line)
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/tree.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/tree.py
new file mode 100644
index 0000000..885eb0f
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/tree.py
@@ -0,0 +1,369 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Base class to represent a tree structure.
+
+
+
+
+"""
+__docformat__ = "restructuredtext en"
+
+import sys
+
+from logilab.common import flatten
+from logilab.common.visitor import VisitedMixIn, FilteredIterator, no_filter
+
+## Exceptions #################################################################
+
+class NodeNotFound(Exception):
+    """raised when a node has not been found"""
+
+EX_SIBLING_NOT_FOUND = "No such sibling as '%s'"
+EX_CHILD_NOT_FOUND = "No such child as '%s'"
+EX_NODE_NOT_FOUND = "No such node as '%s'"
+
+
+# Base node ###################################################################
+
+class Node(object):
+    """a basic tree node, characterized by an id"""
+
+    def __init__(self, nid=None) :
+        self.id = nid
+        # navigation
+        self.parent = None
+        self.children = []
+
+    def __iter__(self):
+        return iter(self.children)
+
+    def __str__(self, indent=0):
+        s = ['%s%s %s' % (' '*indent, self.__class__.__name__, self.id)]
+        indent += 2
+        for child in self.children:
+            try:
+                s.append(child.__str__(indent))
+            except TypeError:
+                s.append(child.__str__())
+        return '\n'.join(s)
+
+    def is_leaf(self):
+        return not self.children
+
+    def append(self, child):
+        """add a node to children"""
+        self.children.append(child)
+        child.parent = self
+
+    def remove(self, child):
+        """remove a child node"""
+        self.children.remove(child)
+        child.parent = None
+
+    def insert(self, index, child):
+        """insert a child node"""
+        self.children.insert(index, child)
+        child.parent = self
+
+    def replace(self, old_child, new_child):
+        """replace a child node with another"""
+        i = self.children.index(old_child)
+        self.children.pop(i)
+        self.children.insert(i, new_child)
+        new_child.parent = self
+
+    def get_sibling(self, nid):
+        """return the sibling node that has given id"""
+        try:
+            return self.parent.get_child_by_id(nid)
+        except NodeNotFound :
+            raise NodeNotFound(EX_SIBLING_NOT_FOUND % nid)
+
+    def next_sibling(self):
+        """
+        return the next sibling for this node if any
+        """
+        parent = self.parent
+        if parent is None:
+            # root node has no sibling
+            return None
+        index = parent.children.index(self)
+        try:
+            return parent.children[index+1]
+        except IndexError:
+            return None
+
+    def previous_sibling(self):
+        """
+        return the previous sibling for this node if any
+        """
+        parent = self.parent
+        if parent is None:
+            # root node has no sibling
+            return None
+        index = parent.children.index(self)
+        if index > 0:
+            return parent.children[index-1]
+        return None
+
+    def get_node_by_id(self, nid):
+        """
+        return node in whole hierarchy that has given id
+        """
+        root = self.root()
+        try:
+            return root.get_child_by_id(nid, 1)
+        except NodeNotFound :
+            raise NodeNotFound(EX_NODE_NOT_FOUND % nid)
+
+    def get_child_by_id(self, nid, recurse=None):
+        """
+        return child of given id
+        """
+        if self.id == nid:
+            return self
+        for c in self.children :
+            if recurse:
+                try:
+                    return c.get_child_by_id(nid, 1)
+                except NodeNotFound :
+                    continue
+            if c.id == nid :
+                return c
+        raise NodeNotFound(EX_CHILD_NOT_FOUND % nid)
+
+    def get_child_by_path(self, path):
+        """
+        return child of given path (path is a list of ids)
+        """
+        if len(path) > 0 and path[0] == self.id:
+            if len(path) == 1 :
+                return self
+            else :
+                for c in self.children :
+                    try:
+                        return c.get_child_by_path(path[1:])
+                    except NodeNotFound :
+                        pass
+        raise NodeNotFound(EX_CHILD_NOT_FOUND % path)
+
+    def depth(self):
+        """
+        return depth of this node in the tree
+        """
+        if self.parent is not None:
+            return 1 + self.parent.depth()
+        else :
+            return 0
+
+    def depth_down(self):
+        """
+        return depth of the tree from this node
+        """
+        if self.children:
+            return 1 + max([c.depth_down() for c in self.children])
+        return 1
+
+    def width(self):
+        """
+        return the width of the tree from this node
+        """
+        return len(self.leaves())
+
+    def root(self):
+        """
+        return the root node of the tree
+        """
+        if self.parent is not None:
+            return self.parent.root()
+        return self
+
+    def leaves(self):
+        """
+        return a list with all the leaves nodes descendant from this node
+        """
+        leaves = []
+        if self.children:
+            for child in self.children:
+                leaves += child.leaves()
+            return leaves
+        else:
+            return [self]
+
+    def flatten(self, _list=None):
+        """
+        return a list with all the nodes descendant from this node
+        """
+        if _list is None:
+            _list = []
+        _list.append(self)
+        for c in self.children:
+            c.flatten(_list)
+        return _list
+
+    def lineage(self):
+        """
+        return list of parents up to root node
+        """
+        lst = [self]
+        if self.parent is not None:
+            lst.extend(self.parent.lineage())
+        return lst
+
+class VNode(Node, VisitedMixIn):
+    """a visitable node
+    """
+    pass
+
+
+class BinaryNode(VNode):
+    """a binary node (i.e. only two children
+    """
+    def __init__(self, lhs=None, rhs=None) :
+        VNode.__init__(self)
+        if lhs is not None or rhs is not None:
+            assert lhs and rhs
+            self.append(lhs)
+            self.append(rhs)
+
+    def remove(self, child):
+        """remove the child and replace this node with the other child
+        """
+        self.children.remove(child)
+        self.parent.replace(self, self.children[0])
+
+    def get_parts(self):
+        """
+        return the left hand side and the right hand side of this node
+        """
+        return self.children[0], self.children[1]
+
+
+
+if sys.version_info[0:2] >= (2, 2):
+    list_class = list
+else:
+    from UserList import UserList
+    list_class = UserList
+
+class ListNode(VNode, list_class):
+    """Used to manipulate Nodes as Lists
+    """
+    def __init__(self):
+        list_class.__init__(self)
+        VNode.__init__(self)
+        self.children = self
+
+    def __str__(self, indent=0):
+        return '%s%s %s' % (indent*' ', self.__class__.__name__,
+                            ', '.join([str(v) for v in self]))
+
+    def append(self, child):
+        """add a node to children"""
+        list_class.append(self, child)
+        child.parent = self
+
+    def insert(self, index, child):
+        """add a node to children"""
+        list_class.insert(self, index, child)
+        child.parent = self
+
+    def remove(self, child):
+        """add a node to children"""
+        list_class.remove(self, child)
+        child.parent = None
+
+    def pop(self, index):
+        """add a node to children"""
+        child = list_class.pop(self, index)
+        child.parent = None
+
+    def __iter__(self):
+        return list_class.__iter__(self)
+
+# construct list from tree ####################################################
+
+def post_order_list(node, filter_func=no_filter):
+    """
+    create a list with tree nodes for which the <filter> function returned true
+    in a post order fashion
+    """
+    l, stack = [], []
+    poped, index = 0, 0
+    while node:
+        if filter_func(node):
+            if node.children and not poped:
+                stack.append((node, index))
+                index = 0
+                node = node.children[0]
+            else:
+                l.append(node)
+                index += 1
+                try:
+                    node = stack[-1][0].children[index]
+                except IndexError:
+                    node = None
+        else:
+            node = None
+        poped = 0
+        if node is None and stack:
+            node, index = stack.pop()
+            poped = 1
+    return l
+
+def pre_order_list(node, filter_func=no_filter):
+    """
+    create a list with tree nodes for which the <filter> function returned true
+    in a pre order fashion
+    """
+    l, stack = [], []
+    poped, index = 0, 0
+    while node:
+        if filter_func(node):
+            if not poped:
+                l.append(node)
+            if node.children and not poped:
+                stack.append((node, index))
+                index = 0
+                node = node.children[0]
+            else:
+                index += 1
+                try:
+                    node = stack[-1][0].children[index]
+                except IndexError:
+                    node = None
+        else:
+            node = None
+        poped = 0
+        if node is None and len(stack) > 1:
+            node, index = stack.pop()
+            poped = 1
+    return l
+
+class PostfixedDepthFirstIterator(FilteredIterator):
+    """a postfixed depth first iterator, designed to be used with visitors
+    """
+    def __init__(self, node, filter_func=None):
+        FilteredIterator.__init__(self, node, post_order_list, filter_func)
+
+class PrefixedDepthFirstIterator(FilteredIterator):
+    """a prefixed depth first iterator, designed to be used with visitors
+    """
+    def __init__(self, node, filter_func=None):
+        FilteredIterator.__init__(self, node, pre_order_list, filter_func)
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/umessage.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/umessage.py
new file mode 100644
index 0000000..a5e4799
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/umessage.py
@@ -0,0 +1,194 @@
+# copyright 2003-2012 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Unicode email support (extends email from stdlib)"""
+
+__docformat__ = "restructuredtext en"
+
+import email
+from encodings import search_function
+import sys
+if sys.version_info >= (2, 5):
+    from email.utils import parseaddr, parsedate
+    from email.header import decode_header
+else:
+    from email.Utils import parseaddr, parsedate
+    from email.Header import decode_header
+
+from datetime import datetime
+
+try:
+    from mx.DateTime import DateTime
+except ImportError:
+    DateTime = datetime
+
+import logilab.common as lgc
+
+
+def decode_QP(string):
+    parts = []
+    for decoded, charset in decode_header(string):
+        if not charset :
+            charset = 'iso-8859-15'
+        parts.append(decoded.decode(charset, 'replace'))
+
+    if sys.version_info < (3, 3):
+        # decoding was non-RFC compliant wrt to whitespace handling
+        # see http://bugs.python.org/issue1079
+        return u' '.join(parts)
+    return u''.join(parts)
+
+def message_from_file(fd):
+    try:
+        return UMessage(email.message_from_file(fd))
+    except email.Errors.MessageParseError:
+        return ''
+
+def message_from_string(string):
+    try:
+        return UMessage(email.message_from_string(string))
+    except email.Errors.MessageParseError:
+        return ''
+
+class UMessage:
+    """Encapsulates an email.Message instance and returns only unicode objects.
+    """
+
+    def __init__(self, message):
+        self.message = message
+
+    # email.Message interface #################################################
+
+    def get(self, header, default=None):
+        value = self.message.get(header, default)
+        if value:
+            return decode_QP(value)
+        return value
+
+    def __getitem__(self, header):
+        return self.get(header)
+
+    def get_all(self, header, default=()):
+        return [decode_QP(val) for val in self.message.get_all(header, default)
+                if val is not None]
+
+    def is_multipart(self):
+        return self.message.is_multipart()
+
+    def get_boundary(self):
+        return self.message.get_boundary()
+
+    def walk(self):
+        for part in self.message.walk():
+            yield UMessage(part)
+
+    if sys.version_info < (3, 0):
+
+        def get_payload(self, index=None, decode=False):
+            message = self.message
+            if index is None:
+                payload = message.get_payload(index, decode)
+                if isinstance(payload, list):
+                    return [UMessage(msg) for msg in payload]
+                if message.get_content_maintype() != 'text':
+                    return payload
+
+                charset = message.get_content_charset() or 'iso-8859-1'
+                if search_function(charset) is None:
+                    charset = 'iso-8859-1'
+                return unicode(payload or '', charset, "replace")
+            else:
+                payload = UMessage(message.get_payload(index, decode))
+            return payload
+
+        def get_content_maintype(self):
+            return unicode(self.message.get_content_maintype())
+
+        def get_content_type(self):
+            return unicode(self.message.get_content_type())
+
+        def get_filename(self, failobj=None):
+            value = self.message.get_filename(failobj)
+            if value is failobj:
+                return value
+            try:
+                return unicode(value)
+            except UnicodeDecodeError:
+                return u'error decoding filename'
+
+    else:
+
+        def get_payload(self, index=None, decode=False):
+            message = self.message
+            if index is None:
+                payload = message.get_payload(index, decode)
+                if isinstance(payload, list):
+                    return [UMessage(msg) for msg in payload]
+                return payload
+            else:
+                payload = UMessage(message.get_payload(index, decode))
+            return payload
+
+        def get_content_maintype(self):
+            return self.message.get_content_maintype()
+
+        def get_content_type(self):
+            return self.message.get_content_type()
+
+        def get_filename(self, failobj=None):
+            return self.message.get_filename(failobj)
+
+    # other convenience methods ###############################################
+
+    def headers(self):
+        """return an unicode string containing all the message's headers"""
+        values = []
+        for header in self.message.keys():
+            values.append(u'%s: %s' % (header, self.get(header)))
+        return '\n'.join(values)
+
+    def multi_addrs(self, header):
+        """return a list of 2-uple (name, address) for the given address (which
+        is expected to be an header containing address such as from, to, cc...)
+        """
+        persons = []
+        for person in self.get_all(header, ()):
+            name, mail = parseaddr(person)
+            persons.append((name, mail))
+        return persons
+
+    def date(self, alternative_source=False, return_str=False):
+        """return a datetime object for the email's date or None if no date is
+        set or if it can't be parsed
+        """
+        value = self.get('date')
+        if value is None and alternative_source:
+            unix_from = self.message.get_unixfrom()
+            if unix_from is not None:
+                try:
+                    value = unix_from.split(" ", 2)[2]
+                except IndexError:
+                    pass
+        if value is not None:
+            datetuple = parsedate(value)
+            if datetuple:
+                if lgc.USE_MX_DATETIME:
+                    return DateTime(*datetuple[:6])
+                return datetime(*datetuple[:6])
+            elif not return_str:
+                return None
+        return value
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__init__.py
new file mode 100644
index 0000000..d76ebe5
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__init__.py
@@ -0,0 +1,172 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Universal report objects and some formatting drivers.
+
+A way to create simple reports using python objects, primarily designed to be
+formatted as text and html.
+"""
+__docformat__ = "restructuredtext en"
+
+import sys
+
+from logilab.common.compat import StringIO
+from logilab.common.textutils import linesep
+
+
+def get_nodes(node, klass):
+    """return an iterator on all children node of the given klass"""
+    for child in node.children:
+        if isinstance(child, klass):
+            yield child
+        # recurse (FIXME: recursion controled by an option)
+        for grandchild in get_nodes(child, klass):
+            yield grandchild
+
+def layout_title(layout):
+    """try to return the layout's title as string, return None if not found
+    """
+    for child in layout.children:
+        if isinstance(child, Title):
+            return u' '.join([node.data for node in get_nodes(child, Text)])
+
+def build_summary(layout, level=1):
+    """make a summary for the report, including X level"""
+    assert level > 0
+    level -= 1
+    summary = List(klass=u'summary')
+    for child in layout.children:
+        if not isinstance(child, Section):
+            continue
+        label = layout_title(child)
+        if not label and not child.id:
+            continue
+        if not child.id:
+            child.id = label.replace(' ', '-')
+        node = Link(u'#'+child.id, label=label or child.id)
+        # FIXME: Three following lines produce not very compliant
+        # docbook: there are some useless <para><para>. They might be
+        # replaced by the three commented lines but this then produces
+        # a bug in html display...
+        if level and [n for n in child.children if isinstance(n, Section)]:
+            node = Paragraph([node, build_summary(child, level)])
+        summary.append(node)
+#         summary.append(node)
+#         if level and [n for n in child.children if isinstance(n, Section)]:
+#             summary.append(build_summary(child, level))
+    return summary
+
+
+class BaseWriter(object):
+    """base class for ureport writers"""
+
+    def format(self, layout, stream=None, encoding=None):
+        """format and write the given layout into the stream object
+
+        unicode policy: unicode strings may be found in the layout;
+        try to call stream.write with it, but give it back encoded using
+        the given encoding if it fails
+        """
+        if stream is None:
+            stream = sys.stdout
+        if not encoding:
+            encoding = getattr(stream, 'encoding', 'UTF-8')
+        self.encoding = encoding or 'UTF-8'
+        self.__compute_funcs = []
+        self.out = stream
+        self.begin_format(layout)
+        layout.accept(self)
+        self.end_format(layout)
+
+    def format_children(self, layout):
+        """recurse on the layout children and call their accept method
+        (see the Visitor pattern)
+        """
+        for child in getattr(layout, 'children', ()):
+            child.accept(self)
+
+    def writeln(self, string=u''):
+        """write a line in the output buffer"""
+        self.write(string + linesep)
+
+    def write(self, string):
+        """write a string in the output buffer"""
+        try:
+            self.out.write(string)
+        except UnicodeEncodeError:
+            self.out.write(string.encode(self.encoding))
+
+    def begin_format(self, layout):
+        """begin to format a layout"""
+        self.section = 0
+
+    def end_format(self, layout):
+        """finished to format a layout"""
+
+    def get_table_content(self, table):
+        """trick to get table content without actually writing it
+
+        return an aligned list of lists containing table cells values as string
+        """
+        result = [[]]
+        cols = table.cols
+        for cell in self.compute_content(table):
+            if cols == 0:
+                result.append([])
+                cols = table.cols
+            cols -= 1
+            result[-1].append(cell)
+        # fill missing cells
+        while len(result[-1]) < cols:
+            result[-1].append(u'')
+        return result
+
+    def compute_content(self, layout):
+        """trick to compute the formatting of children layout before actually
+        writing it
+
+        return an iterator on strings (one for each child element)
+        """
+        # use cells !
+        def write(data):
+            try:
+                stream.write(data)
+            except UnicodeEncodeError:
+                stream.write(data.encode(self.encoding))
+        def writeln(data=u''):
+            try:
+                stream.write(data+linesep)
+            except UnicodeEncodeError:
+                stream.write(data.encode(self.encoding)+linesep)
+        self.write = write
+        self.writeln = writeln
+        self.__compute_funcs.append((write, writeln))
+        for child in layout.children:
+            stream = StringIO()
+            child.accept(self)
+            yield stream.getvalue()
+        self.__compute_funcs.pop()
+        try:
+            self.write, self.writeln = self.__compute_funcs[-1]
+        except IndexError:
+            del self.write
+            del self.writeln
+
+
+from logilab.common.ureports.nodes import *
+from logilab.common.ureports.text_writer import TextWriter
+from logilab.common.ureports.html_writer import HTMLWriter
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..e8b70cf
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/html_writer.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/html_writer.cpython-35.pyc
new file mode 100644
index 0000000..2e1ef00
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/html_writer.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/nodes.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/nodes.cpython-35.pyc
new file mode 100644
index 0000000..3dc8d00
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/nodes.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/text_writer.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/text_writer.cpython-35.pyc
new file mode 100644
index 0000000..01be0f5
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/__pycache__/text_writer.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/docbook_writer.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/docbook_writer.py
new file mode 100644
index 0000000..857068c
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/docbook_writer.py
@@ -0,0 +1,140 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""HTML formatting drivers for ureports"""
+__docformat__ = "restructuredtext en"
+
+from six.moves import range
+
+from logilab.common.ureports import HTMLWriter
+
+class DocbookWriter(HTMLWriter):
+    """format layouts as HTML"""
+
+    def begin_format(self, layout):
+        """begin to format a layout"""
+        super(HTMLWriter, self).begin_format(layout)
+        if self.snippet is None:
+            self.writeln('<?xml version="1.0" encoding="ISO-8859-1"?>')
+            self.writeln("""
+<book xmlns:xi='http://www.w3.org/2001/XInclude'
+      lang='fr'>
+""")
+
+    def end_format(self, layout):
+        """finished to format a layout"""
+        if self.snippet is None:
+            self.writeln('</book>')
+
+    def visit_section(self, layout):
+        """display a section (using <chapter> (level 0) or <section>)"""
+        if self.section == 0:
+            tag = "chapter"
+        else:
+            tag = "section"
+        self.section += 1
+        self.writeln(self._indent('<%s%s>' % (tag, self.handle_attrs(layout))))
+        self.format_children(layout)
+        self.writeln(self._indent('</%s>'% tag))
+        self.section -= 1
+
+    def visit_title(self, layout):
+        """display a title using <title>"""
+        self.write(self._indent('  <title%s>' % self.handle_attrs(layout)))
+        self.format_children(layout)
+        self.writeln('</title>')
+
+    def visit_table(self, layout):
+        """display a table as html"""
+        self.writeln(self._indent('  <table%s><title>%s</title>' \
+                     % (self.handle_attrs(layout), layout.title)))
+        self.writeln(self._indent('    <tgroup cols="%s">'% layout.cols))
+        for i in range(layout.cols):
+            self.writeln(self._indent('      <colspec colname="c%s" colwidth="1*"/>' % i))
+
+        table_content = self.get_table_content(layout)
+        # write headers
+        if layout.cheaders:
+            self.writeln(self._indent('      <thead>'))
+            self._write_row(table_content[0])
+            self.writeln(self._indent('      </thead>'))
+            table_content = table_content[1:]
+        elif layout.rcheaders:
+            self.writeln(self._indent('      <thead>'))
+            self._write_row(table_content[-1])
+            self.writeln(self._indent('      </thead>'))
+            table_content = table_content[:-1]
+        # write body
+        self.writeln(self._indent('      <tbody>'))
+        for i in range(len(table_content)):
+            row = table_content[i]
+            self.writeln(self._indent('        <row>'))
+            for j in range(len(row)):
+                cell = row[j] or '&#160;'
+                self.writeln(self._indent('          <entry>%s</entry>' % cell))
+            self.writeln(self._indent('        </row>'))
+        self.writeln(self._indent('      </tbody>'))
+        self.writeln(self._indent('    </tgroup>'))
+        self.writeln(self._indent('  </table>'))
+
+    def _write_row(self, row):
+        """write content of row (using <row> <entry>)"""
+        self.writeln('        <row>')
+        for j in range(len(row)):
+            cell = row[j] or '&#160;'
+            self.writeln('          <entry>%s</entry>' % cell)
+        self.writeln(self._indent('        </row>'))
+
+    def visit_list(self, layout):
+        """display a list (using <itemizedlist>)"""
+        self.writeln(self._indent('  <itemizedlist%s>' % self.handle_attrs(layout)))
+        for row in list(self.compute_content(layout)):
+            self.writeln('    <listitem><para>%s</para></listitem>' % row)
+        self.writeln(self._indent('  </itemizedlist>'))
+
+    def visit_paragraph(self, layout):
+        """display links (using <para>)"""
+        self.write(self._indent('  <para>'))
+        self.format_children(layout)
+        self.writeln('</para>')
+
+    def visit_span(self, layout):
+        """display links (using <p>)"""
+        #TODO: translate in docbook
+        self.write('<literal %s>' % self.handle_attrs(layout))
+        self.format_children(layout)
+        self.write('</literal>')
+
+    def visit_link(self, layout):
+        """display links (using <ulink>)"""
+        self.write('<ulink url="%s"%s>%s</ulink>' % (layout.url,
+                                               self.handle_attrs(layout),
+                                               layout.label))
+
+    def visit_verbatimtext(self, layout):
+        """display verbatim text (using <programlisting>)"""
+        self.writeln(self._indent('  <programlisting>'))
+        self.write(layout.data.replace('&', '&amp;').replace('<', '&lt;'))
+        self.writeln(self._indent('  </programlisting>'))
+
+    def visit_text(self, layout):
+        """add some text"""
+        self.write(layout.data.replace('&', '&amp;').replace('<', '&lt;'))
+
+    def _indent(self, string):
+        """correctly indent string according to section"""
+        return ' ' * 2*(self.section) + string
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/html_writer.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/html_writer.py
new file mode 100644
index 0000000..eba34ea
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/html_writer.py
@@ -0,0 +1,133 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""HTML formatting drivers for ureports"""
+__docformat__ = "restructuredtext en"
+
+from cgi import escape
+
+from six.moves import range
+
+from logilab.common.ureports import BaseWriter
+
+
+class HTMLWriter(BaseWriter):
+    """format layouts as HTML"""
+
+    def __init__(self, snippet=None):
+        super(HTMLWriter, self).__init__()
+        self.snippet = snippet
+
+    def handle_attrs(self, layout):
+        """get an attribute string from layout member attributes"""
+        attrs = u''
+        klass = getattr(layout, 'klass', None)
+        if klass:
+            attrs += u' class="%s"' % klass
+        nid = getattr(layout, 'id', None)
+        if nid:
+            attrs += u' id="%s"' % nid
+        return attrs
+
+    def begin_format(self, layout):
+        """begin to format a layout"""
+        super(HTMLWriter, self).begin_format(layout)
+        if self.snippet is None:
+            self.writeln(u'<html>')
+            self.writeln(u'<body>')
+
+    def end_format(self, layout):
+        """finished to format a layout"""
+        if self.snippet is None:
+            self.writeln(u'</body>')
+            self.writeln(u'</html>')
+
+
+    def visit_section(self, layout):
+        """display a section as html, using div + h[section level]"""
+        self.section += 1
+        self.writeln(u'<div%s>' % self.handle_attrs(layout))
+        self.format_children(layout)
+        self.writeln(u'</div>')
+        self.section -= 1
+
+    def visit_title(self, layout):
+        """display a title using <hX>"""
+        self.write(u'<h%s%s>' % (self.section, self.handle_attrs(layout)))
+        self.format_children(layout)
+        self.writeln(u'</h%s>' % self.section)
+
+    def visit_table(self, layout):
+        """display a table as html"""
+        self.writeln(u'<table%s>' % self.handle_attrs(layout))
+        table_content = self.get_table_content(layout)
+        for i in range(len(table_content)):
+            row = table_content[i]
+            if i == 0 and layout.rheaders:
+                self.writeln(u'<tr class="header">')
+            elif i+1 == len(table_content) and layout.rrheaders:
+                self.writeln(u'<tr class="header">')
+            else:
+                self.writeln(u'<tr class="%s">' % (i%2 and 'even' or 'odd'))
+            for j in range(len(row)):
+                cell = row[j] or u'&#160;'
+                if (layout.rheaders and i == 0) or \
+                   (layout.cheaders and j == 0) or \
+                   (layout.rrheaders and i+1 == len(table_content)) or \
+                   (layout.rcheaders and j+1 == len(row)):
+                    self.writeln(u'<th>%s</th>' % cell)
+                else:
+                    self.writeln(u'<td>%s</td>' % cell)
+            self.writeln(u'</tr>')
+        self.writeln(u'</table>')
+
+    def visit_list(self, layout):
+        """display a list as html"""
+        self.writeln(u'<ul%s>' % self.handle_attrs(layout))
+        for row in list(self.compute_content(layout)):
+            self.writeln(u'<li>%s</li>' % row)
+        self.writeln(u'</ul>')
+
+    def visit_paragraph(self, layout):
+        """display links (using <p>)"""
+        self.write(u'<p>')
+        self.format_children(layout)
+        self.write(u'</p>')
+
+    def visit_span(self, layout):
+        """display links (using <p>)"""
+        self.write(u'<span%s>' % self.handle_attrs(layout))
+        self.format_children(layout)
+        self.write(u'</span>')
+
+    def visit_link(self, layout):
+        """display links (using <a>)"""
+        self.write(u' <a href="%s"%s>%s</a>' % (layout.url,
+                                                self.handle_attrs(layout),
+                                                layout.label))
+    def visit_verbatimtext(self, layout):
+        """display verbatim text (using <pre>)"""
+        self.write(u'<pre>')
+        self.write(layout.data.replace(u'&', u'&amp;').replace(u'<', u'&lt;'))
+        self.write(u'</pre>')
+
+    def visit_text(self, layout):
+        """add some text"""
+        data = layout.data
+        if layout.escaped:
+            data = data.replace(u'&', u'&amp;').replace(u'<', u'&lt;')
+        self.write(data)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/nodes.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/nodes.py
new file mode 100644
index 0000000..a9585b3
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/nodes.py
@@ -0,0 +1,203 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Micro reports objects.
+
+A micro report is a tree of layout and content objects.
+"""
+__docformat__ = "restructuredtext en"
+
+from logilab.common.tree import VNode
+
+from six import string_types
+
+class BaseComponent(VNode):
+    """base report component
+
+    attributes
+    * id : the component's optional id
+    * klass : the component's optional klass
+    """
+    def __init__(self, id=None, klass=None):
+        VNode.__init__(self, id)
+        self.klass = klass
+
+class BaseLayout(BaseComponent):
+    """base container node
+
+    attributes
+    * BaseComponent attributes
+    * children : components in this table (i.e. the table's cells)
+    """
+    def __init__(self, children=(), **kwargs):
+        super(BaseLayout, self).__init__(**kwargs)
+        for child in children:
+            if isinstance(child, BaseComponent):
+                self.append(child)
+            else:
+                self.add_text(child)
+
+    def append(self, child):
+        """overridden to detect problems easily"""
+        assert child not in self.parents()
+        VNode.append(self, child)
+
+    def parents(self):
+        """return the ancestor nodes"""
+        assert self.parent is not self
+        if self.parent is None:
+            return []
+        return [self.parent] + self.parent.parents()
+
+    def add_text(self, text):
+        """shortcut to add text data"""
+        self.children.append(Text(text))
+
+
+# non container nodes #########################################################
+
+class Text(BaseComponent):
+    """a text portion
+
+    attributes :
+    * BaseComponent attributes
+    * data : the text value as an encoded or unicode string
+    """
+    def __init__(self, data, escaped=True, **kwargs):
+        super(Text, self).__init__(**kwargs)
+        #if isinstance(data, unicode):
+        #    data = data.encode('ascii')
+        assert isinstance(data, string_types), data.__class__
+        self.escaped = escaped
+        self.data = data
+
+class VerbatimText(Text):
+    """a verbatim text, display the raw data
+
+    attributes :
+    * BaseComponent attributes
+    * data : the text value as an encoded or unicode string
+    """
+
+class Link(BaseComponent):
+    """a labelled link
+
+    attributes :
+    * BaseComponent attributes
+    * url : the link's target (REQUIRED)
+    * label : the link's label as a string (use the url by default)
+    """
+    def __init__(self, url, label=None, **kwargs):
+        super(Link, self).__init__(**kwargs)
+        assert url
+        self.url = url
+        self.label = label or url
+
+
+class Image(BaseComponent):
+    """an embedded or a single image
+
+    attributes :
+    * BaseComponent attributes
+    * filename : the image's filename (REQUIRED)
+    * stream : the stream object containing the image data (REQUIRED)
+    * title : the image's optional title
+    """
+    def __init__(self, filename, stream, title=None, **kwargs):
+        super(Image, self).__init__(**kwargs)
+        assert filename
+        assert stream
+        self.filename = filename
+        self.stream = stream
+        self.title = title
+
+
+# container nodes #############################################################
+
+class Section(BaseLayout):
+    """a section
+
+    attributes :
+    * BaseLayout attributes
+
+    a title may also be given to the constructor, it'll be added
+    as a first element
+    a description may also be given to the constructor, it'll be added
+    as a first paragraph
+    """
+    def __init__(self, title=None, description=None, **kwargs):
+        super(Section, self).__init__(**kwargs)
+        if description:
+            self.insert(0, Paragraph([Text(description)]))
+        if title:
+            self.insert(0, Title(children=(title,)))
+
+class Title(BaseLayout):
+    """a title
+
+    attributes :
+    * BaseLayout attributes
+
+    A title must not contains a section nor a paragraph!
+    """
+
+class Span(BaseLayout):
+    """a title
+
+    attributes :
+    * BaseLayout attributes
+
+    A span should only contains Text and Link nodes (in-line elements)
+    """
+
+class Paragraph(BaseLayout):
+    """a simple text paragraph
+
+    attributes :
+    * BaseLayout attributes
+
+    A paragraph must not contains a section !
+    """
+
+class Table(BaseLayout):
+    """some tabular data
+
+    attributes :
+    * BaseLayout attributes
+    * cols : the number of columns of the table (REQUIRED)
+    * rheaders : the first row's elements are table's header
+    * cheaders : the first col's elements are table's header
+    * title : the table's optional title
+    """
+    def __init__(self, cols, title=None,
+                 rheaders=0, cheaders=0, rrheaders=0, rcheaders=0,
+                 **kwargs):
+        super(Table, self).__init__(**kwargs)
+        assert isinstance(cols, int)
+        self.cols = cols
+        self.title = title
+        self.rheaders = rheaders
+        self.cheaders = cheaders
+        self.rrheaders = rrheaders
+        self.rcheaders = rcheaders
+
+class List(BaseLayout):
+    """some list data
+
+    attributes :
+    * BaseLayout attributes
+    """
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/text_writer.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/text_writer.py
new file mode 100644
index 0000000..c87613c
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/ureports/text_writer.py
@@ -0,0 +1,145 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Text formatting drivers for ureports"""
+
+from __future__ import print_function
+
+__docformat__ = "restructuredtext en"
+
+from six.moves import range
+
+from logilab.common.textutils import linesep
+from logilab.common.ureports import BaseWriter
+
+
+TITLE_UNDERLINES = [u'', u'=', u'-', u'`', u'.', u'~', u'^']
+BULLETS = [u'*', u'-']
+
+class TextWriter(BaseWriter):
+    """format layouts as text
+    (ReStructured inspiration but not totally handled yet)
+    """
+    def begin_format(self, layout):
+        super(TextWriter, self).begin_format(layout)
+        self.list_level = 0
+        self.pending_urls = []
+
+    def visit_section(self, layout):
+        """display a section as text
+        """
+        self.section += 1
+        self.writeln()
+        self.format_children(layout)
+        if self.pending_urls:
+            self.writeln()
+            for label, url in self.pending_urls:
+                self.writeln(u'.. _`%s`: %s' % (label, url))
+            self.pending_urls = []
+        self.section -= 1
+        self.writeln()
+
+    def visit_title(self, layout):
+        title = u''.join(list(self.compute_content(layout)))
+        self.writeln(title)
+        try:
+            self.writeln(TITLE_UNDERLINES[self.section] * len(title))
+        except IndexError:
+            print("FIXME TITLE TOO DEEP. TURNING TITLE INTO TEXT")
+
+    def visit_paragraph(self, layout):
+        """enter a paragraph"""
+        self.format_children(layout)
+        self.writeln()
+
+    def visit_span(self, layout):
+        """enter a span"""
+        self.format_children(layout)
+
+    def visit_table(self, layout):
+        """display a table as text"""
+        table_content = self.get_table_content(layout)
+        # get columns width
+        cols_width = [0]*len(table_content[0])
+        for row in table_content:
+            for index in range(len(row)):
+                col = row[index]
+                cols_width[index] = max(cols_width[index], len(col))
+        if layout.klass == 'field':
+            self.field_table(layout, table_content, cols_width)
+        else:
+            self.default_table(layout, table_content, cols_width)
+        self.writeln()
+
+    def default_table(self, layout, table_content, cols_width):
+        """format a table"""
+        cols_width = [size+1 for size in cols_width]
+        format_strings = u' '.join([u'%%-%ss'] * len(cols_width))
+        format_strings = format_strings % tuple(cols_width)
+        format_strings = format_strings.split(' ')
+        table_linesep = u'\n+' + u'+'.join([u'-'*w for w in cols_width]) + u'+\n'
+        headsep = u'\n+' + u'+'.join([u'='*w for w in cols_width]) + u'+\n'
+        # FIXME: layout.cheaders
+        self.write(table_linesep)
+        for i in range(len(table_content)):
+            self.write(u'|')
+            line = table_content[i]
+            for j in range(len(line)):
+                self.write(format_strings[j] % line[j])
+                self.write(u'|')
+            if i == 0 and layout.rheaders:
+                self.write(headsep)
+            else:
+                self.write(table_linesep)
+
+    def field_table(self, layout, table_content, cols_width):
+        """special case for field table"""
+        assert layout.cols == 2
+        format_string = u'%s%%-%ss: %%s' % (linesep, cols_width[0])
+        for field, value in table_content:
+            self.write(format_string % (field, value))
+
+
+    def visit_list(self, layout):
+        """display a list layout as text"""
+        bullet = BULLETS[self.list_level % len(BULLETS)]
+        indent = '  ' * self.list_level
+        self.list_level += 1
+        for child in layout.children:
+            self.write(u'%s%s%s ' % (linesep, indent, bullet))
+            child.accept(self)
+        self.list_level -= 1
+
+    def visit_link(self, layout):
+        """add a hyperlink"""
+        if layout.label != layout.url:
+            self.write(u'`%s`_' % layout.label)
+            self.pending_urls.append( (layout.label, layout.url) )
+        else:
+            self.write(layout.url)
+
+    def visit_verbatimtext(self, layout):
+        """display a verbatim layout as text (so difficult ;)
+        """
+        self.writeln(u'::\n')
+        for line in layout.data.splitlines():
+            self.writeln(u'    ' + line)
+        self.writeln()
+
+    def visit_text(self, layout):
+        """add some text"""
+        self.write(u'%s' % layout.data)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/urllib2ext.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/urllib2ext.py
new file mode 100644
index 0000000..339aec0
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/urllib2ext.py
@@ -0,0 +1,89 @@
+from __future__ import print_function
+
+import logging
+import urllib2
+
+import kerberos as krb
+
+class GssapiAuthError(Exception):
+    """raised on error during authentication process"""
+
+import re
+RGX = re.compile('(?:.*,)*\s*Negotiate\s*([^,]*),?', re.I)
+
+def get_negociate_value(headers):
+    for authreq in headers.getheaders('www-authenticate'):
+        match = RGX.search(authreq)
+        if match:
+            return match.group(1)
+
+class HTTPGssapiAuthHandler(urllib2.BaseHandler):
+    """Negotiate HTTP authentication using context from GSSAPI"""
+
+    handler_order = 400 # before Digest Auth
+
+    def __init__(self):
+        self._reset()
+
+    def _reset(self):
+        self._retried = 0
+        self._context = None
+
+    def clean_context(self):
+        if self._context is not None:
+            krb.authGSSClientClean(self._context)
+
+    def http_error_401(self, req, fp, code, msg, headers):
+        try:
+            if self._retried > 5:
+                raise urllib2.HTTPError(req.get_full_url(), 401,
+                                        "negotiate auth failed", headers, None)
+            self._retried += 1
+            logging.debug('gssapi handler, try %s' % self._retried)
+            negotiate = get_negociate_value(headers)
+            if negotiate is None:
+                logging.debug('no negociate found in a www-authenticate header')
+                return None
+            logging.debug('HTTPGssapiAuthHandler: negotiate 1 is %r' % negotiate)
+            result, self._context = krb.authGSSClientInit("HTTP@%s" % req.get_host())
+            if result < 1:
+                raise GssapiAuthError("HTTPGssapiAuthHandler: init failed with %d" % result)
+            result = krb.authGSSClientStep(self._context, negotiate)
+            if result < 0:
+                raise GssapiAuthError("HTTPGssapiAuthHandler: step 1 failed with %d" % result)
+            client_response = krb.authGSSClientResponse(self._context)
+            logging.debug('HTTPGssapiAuthHandler: client response is %s...' % client_response[:10])
+            req.add_unredirected_header('Authorization', "Negotiate %s" % client_response)
+            server_response = self.parent.open(req)
+            negotiate = get_negociate_value(server_response.info())
+            if negotiate is None:
+                logging.warning('HTTPGssapiAuthHandler: failed to authenticate server')
+            else:
+                logging.debug('HTTPGssapiAuthHandler negotiate 2: %s' % negotiate)
+                result = krb.authGSSClientStep(self._context, negotiate)
+                if result < 1:
+                    raise GssapiAuthError("HTTPGssapiAuthHandler: step 2 failed with %d" % result)
+            return server_response
+        except GssapiAuthError as exc:
+            logging.error(repr(exc))
+        finally:
+            self.clean_context()
+            self._reset()
+
+if __name__ == '__main__':
+    import sys
+    # debug
+    import httplib
+    httplib.HTTPConnection.debuglevel = 1
+    httplib.HTTPSConnection.debuglevel = 1
+    # debug
+    import logging
+    logging.basicConfig(level=logging.DEBUG)
+    # handle cookies
+    import cookielib
+    cj = cookielib.CookieJar()
+    ch = urllib2.HTTPCookieProcessor(cj)
+    # test with url sys.argv[1]
+    h = HTTPGssapiAuthHandler()
+    response = urllib2.build_opener(h, ch).open(sys.argv[1])
+    print('\nresponse: %s\n--------------\n' % response.code, response.info())
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/vcgutils.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/vcgutils.py
new file mode 100644
index 0000000..9cd2acd
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/vcgutils.py
@@ -0,0 +1,216 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""Functions to generate files readable with Georg Sander's vcg
+(Visualization of Compiler Graphs).
+
+You can download vcg at http://rw4.cs.uni-sb.de/~sander/html/gshome.html
+Note that vcg exists as a debian package.
+
+See vcg's documentation for explanation about the different values that
+maybe used for the functions parameters.
+
+
+
+
+"""
+__docformat__ = "restructuredtext en"
+
+import string
+
+ATTRS_VAL = {
+    'algos':       ('dfs', 'tree', 'minbackward',
+                    'left_to_right', 'right_to_left',
+                    'top_to_bottom', 'bottom_to_top',
+                    'maxdepth', 'maxdepthslow', 'mindepth', 'mindepthslow',
+                    'mindegree', 'minindegree', 'minoutdegree',
+                    'maxdegree', 'maxindegree', 'maxoutdegree'),
+    'booleans':    ('yes', 'no'),
+    'colors':      ('black', 'white', 'blue', 'red', 'green', 'yellow',
+                    'magenta', 'lightgrey',
+                    'cyan', 'darkgrey', 'darkblue', 'darkred', 'darkgreen',
+                    'darkyellow', 'darkmagenta', 'darkcyan', 'gold',
+                    'lightblue', 'lightred', 'lightgreen', 'lightyellow',
+                    'lightmagenta', 'lightcyan', 'lilac', 'turquoise',
+                    'aquamarine', 'khaki', 'purple', 'yellowgreen', 'pink',
+                    'orange', 'orchid'),
+    'shapes':      ('box', 'ellipse', 'rhomb', 'triangle'),
+    'textmodes':   ('center', 'left_justify', 'right_justify'),
+    'arrowstyles': ('solid', 'line', 'none'),
+    'linestyles':  ('continuous', 'dashed', 'dotted', 'invisible'),
+    }
+
+# meaning of possible values:
+#   O    -> string
+#   1    -> int
+#   list -> value in list
+GRAPH_ATTRS = {
+    'title':              0,
+    'label':              0,
+    'color':               ATTRS_VAL['colors'],
+    'textcolor':           ATTRS_VAL['colors'],
+    'bordercolor':         ATTRS_VAL['colors'],
+    'width':               1,
+    'height':              1,
+    'borderwidth':         1,
+    'textmode':            ATTRS_VAL['textmodes'],
+    'shape':               ATTRS_VAL['shapes'],
+    'shrink':              1,
+    'stretch':             1,
+    'orientation':         ATTRS_VAL['algos'],
+    'vertical_order':      1,
+    'horizontal_order':    1,
+    'xspace':              1,
+    'yspace':              1,
+    'layoutalgorithm':    ATTRS_VAL['algos'],
+    'late_edge_labels':   ATTRS_VAL['booleans'],
+    'display_edge_labels': ATTRS_VAL['booleans'],
+    'dirty_edge_labels':  ATTRS_VAL['booleans'],
+    'finetuning':          ATTRS_VAL['booleans'],
+    'manhattan_edges':     ATTRS_VAL['booleans'],
+    'smanhattan_edges':    ATTRS_VAL['booleans'],
+    'port_sharing':        ATTRS_VAL['booleans'],
+    'edges':               ATTRS_VAL['booleans'],
+    'nodes':               ATTRS_VAL['booleans'],
+    'splines':             ATTRS_VAL['booleans'],
+    }
+NODE_ATTRS = {
+    'title':              0,
+    'label':              0,
+    'color':               ATTRS_VAL['colors'],
+    'textcolor':           ATTRS_VAL['colors'],
+    'bordercolor':         ATTRS_VAL['colors'],
+    'width':               1,
+    'height':              1,
+    'borderwidth':         1,
+    'textmode':            ATTRS_VAL['textmodes'],
+    'shape':               ATTRS_VAL['shapes'],
+    'shrink':              1,
+    'stretch':             1,
+    'vertical_order':      1,
+    'horizontal_order':    1,
+    }
+EDGE_ATTRS = {
+    'sourcename':         0,
+    'targetname':         0,
+    'label':              0,
+    'linestyle':          ATTRS_VAL['linestyles'],
+    'class':              1,
+    'thickness':          0,
+    'color':               ATTRS_VAL['colors'],
+    'textcolor':           ATTRS_VAL['colors'],
+    'arrowcolor':          ATTRS_VAL['colors'],
+    'backarrowcolor':      ATTRS_VAL['colors'],
+    'arrowsize':           1,
+    'backarrowsize':       1,
+    'arrowstyle':          ATTRS_VAL['arrowstyles'],
+    'backarrowstyle':      ATTRS_VAL['arrowstyles'],
+    'textmode':            ATTRS_VAL['textmodes'],
+    'priority':            1,
+    'anchor':              1,
+    'horizontal_order':    1,
+    }
+
+
+# Misc utilities ###############################################################
+
+def latin_to_vcg(st):
+    """Convert latin characters using vcg escape sequence.
+    """
+    for char in st:
+        if char not in string.ascii_letters:
+            try:
+                num = ord(char)
+                if num >= 192:
+                    st = st.replace(char, r'\fi%d'%ord(char))
+            except:
+                pass
+    return st
+
+
+class VCGPrinter:
+    """A vcg graph writer.
+    """
+
+    def __init__(self, output_stream):
+        self._stream = output_stream
+        self._indent = ''
+
+    def open_graph(self, **args):
+        """open a vcg graph
+        """
+        self._stream.write('%sgraph:{\n'%self._indent)
+        self._inc_indent()
+        self._write_attributes(GRAPH_ATTRS, **args)
+
+    def close_graph(self):
+        """close a vcg graph
+        """
+        self._dec_indent()
+        self._stream.write('%s}\n'%self._indent)
+
+
+    def node(self, title, **args):
+        """draw a node
+        """
+        self._stream.write('%snode: {title:"%s"' % (self._indent, title))
+        self._write_attributes(NODE_ATTRS, **args)
+        self._stream.write('}\n')
+
+
+    def edge(self, from_node, to_node, edge_type='', **args):
+        """draw an edge from a node to another.
+        """
+        self._stream.write(
+            '%s%sedge: {sourcename:"%s" targetname:"%s"' % (
+            self._indent, edge_type, from_node, to_node))
+        self._write_attributes(EDGE_ATTRS, **args)
+        self._stream.write('}\n')
+
+
+    # private ##################################################################
+
+    def _write_attributes(self, attributes_dict, **args):
+        """write graph, node or edge attributes
+        """
+        for key, value in args.items():
+            try:
+                _type =  attributes_dict[key]
+            except KeyError:
+                raise Exception('''no such attribute %s
+possible attributes are %s''' % (key, attributes_dict.keys()))
+
+            if not _type:
+                self._stream.write('%s%s:"%s"\n' % (self._indent, key, value))
+            elif _type == 1:
+                self._stream.write('%s%s:%s\n' % (self._indent, key,
+                                                  int(value)))
+            elif value in _type:
+                self._stream.write('%s%s:%s\n' % (self._indent, key, value))
+            else:
+                raise Exception('''value %s isn\'t correct for attribute %s
+correct values are %s''' % (value, key, _type))
+
+    def _inc_indent(self):
+        """increment indentation
+        """
+        self._indent = '  %s' % self._indent
+
+    def _dec_indent(self):
+        """decrement indentation
+        """
+        self._indent = self._indent[:-2]
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/visitor.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/visitor.py
new file mode 100644
index 0000000..ed2b70f
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/visitor.py
@@ -0,0 +1,109 @@
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""A generic visitor abstract implementation.
+
+
+
+
+"""
+__docformat__ = "restructuredtext en"
+
+def no_filter(_):
+    return 1
+
+# Iterators ###################################################################
+class FilteredIterator(object):
+
+    def __init__(self, node, list_func, filter_func=None):
+        self._next = [(node, 0)]
+        if filter_func is None:
+            filter_func = no_filter
+        self._list = list_func(node, filter_func)
+
+    def __next__(self):
+        try:
+            return self._list.pop(0)
+        except :
+            return None
+
+    next = __next__
+
+# Base Visitor ################################################################
+class Visitor(object):
+
+    def __init__(self, iterator_class, filter_func=None):
+        self._iter_class = iterator_class
+        self.filter = filter_func
+
+    def visit(self, node, *args, **kargs):
+        """
+        launch the visit on a given node
+
+        call 'open_visit' before the beginning of the visit, with extra args
+        given
+        when all nodes have been visited, call the 'close_visit' method
+        """
+        self.open_visit(node, *args, **kargs)
+        return self.close_visit(self._visit(node))
+
+    def _visit(self, node):
+        iterator = self._get_iterator(node)
+        n = next(iterator)
+        while n:
+            result = n.accept(self)
+            n = next(iterator)
+        return result
+
+    def _get_iterator(self, node):
+        return self._iter_class(node, self.filter)
+
+    def open_visit(self, *args, **kargs):
+        """
+        method called at the beginning of the visit
+        """
+        pass
+
+    def close_visit(self, result):
+        """
+        method called at the end of the visit
+        """
+        return result
+
+# standard visited mixin ######################################################
+class VisitedMixIn(object):
+    """
+    Visited interface allow node visitors to use the node
+    """
+    def get_visit_name(self):
+        """
+        return the visit name for the mixed class. When calling 'accept', the
+        method <'visit_' + name returned by this method> will be called on the
+        visitor
+        """
+        try:
+            return self.TYPE.replace('-', '_')
+        except:
+            return self.__class__.__name__.lower()
+
+    def accept(self, visitor, *args, **kwargs):
+        func = getattr(visitor, 'visit_%s' % self.get_visit_name())
+        return func(self, *args, **kwargs)
+
+    def leave(self, visitor, *args, **kwargs):
+        func = getattr(visitor, 'leave_%s' % self.get_visit_name())
+        return func(self, *args, **kwargs)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/xmlutils.py b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/xmlutils.py
new file mode 100644
index 0000000..d383b9d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab/common/xmlutils.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This file is part of logilab-common.
+#
+# logilab-common is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 2.1 of the License, or (at your option) any
+# later version.
+#
+# logilab-common is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with logilab-common.  If not, see <http://www.gnu.org/licenses/>.
+"""XML utilities.
+
+This module contains useful functions for parsing and using XML data. For the
+moment, there is only one function that can parse the data inside a processing
+instruction and return a Python dictionary.
+
+
+
+
+"""
+__docformat__ = "restructuredtext en"
+
+import re
+
+RE_DOUBLE_QUOTE = re.compile('([\w\-\.]+)="([^"]+)"')
+RE_SIMPLE_QUOTE = re.compile("([\w\-\.]+)='([^']+)'")
+
+def parse_pi_data(pi_data):
+    """
+    Utility function that parses the data contained in an XML
+    processing instruction and returns a dictionary of keywords and their
+    associated values (most of the time, the processing instructions contain
+    data like ``keyword="value"``, if a keyword is not associated to a value,
+    for example ``keyword``, it will be associated to ``None``).
+
+    :param pi_data: data contained in an XML processing instruction.
+    :type pi_data: unicode
+
+    :returns: Dictionary of the keywords (Unicode strings) associated to
+              their values (Unicode strings) as they were defined in the
+              data.
+    :rtype: dict
+    """
+    results = {}
+    for elt in pi_data.split():
+        if RE_DOUBLE_QUOTE.match(elt):
+            kwd, val = RE_DOUBLE_QUOTE.match(elt).groups()
+        elif RE_SIMPLE_QUOTE.match(elt):
+            kwd, val = RE_SIMPLE_QUOTE.match(elt).groups()
+        else:
+            kwd, val = elt, None
+        results[kwd] = val
+    return results
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2-py2.7-nspkg.pth b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2-py2.7-nspkg.pth
new file mode 100644
index 0000000..d268b88
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2-py2.7-nspkg.pth
@@ -0,0 +1 @@
+import sys, types, os;p = os.path.join(sys._getframe(1).f_locals['sitedir'], *('logilab',));ie = os.path.exists(os.path.join(p,'__init__.py'));m = not ie and sys.modules.setdefault('logilab', types.ModuleType('logilab'));mp = (m or []) and m.__dict__.setdefault('__path__',[]);(p not in mp) and mp.append(p)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/DESCRIPTION.rst b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/DESCRIPTION.rst
new file mode 100644
index 0000000..6b483af
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/DESCRIPTION.rst
@@ -0,0 +1,153 @@
+Logilab's common library
+========================
+
+What's this ?
+-------------
+
+This package contains some modules used by different Logilab projects.
+
+It is released under the GNU Lesser General Public License.
+
+There is no documentation available yet but the source code should be clean and
+well documented.
+
+Designed to ease:
+
+* handling command line options and configuration files
+* writing interactive command line tools
+* manipulation of files and character strings
+* manipulation of common structures such as graph, tree, and pattern such as visitor
+* generating text and HTML reports
+* more...
+
+
+Installation
+------------
+
+Extract the tarball, jump into the created directory and run ::
+
+	python setup.py install
+
+For installation options, see ::
+
+	python setup.py install --help
+
+
+Provided modules
+----------------
+
+Here is a brief description of the available modules.
+
+Modules providing high-level features
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `cache`, a cache implementation with a least recently used algorithm.
+
+* `changelog`, a tiny library to manipulate our simplified ChangeLog file format.
+
+* `clcommands`, high-level classes to define command line programs handling
+  different subcommands. It is based on `configuration` to get easy command line
+  / configuration file handling.
+
+* `configuration`, some classes to handle unified configuration from both
+  command line (using optparse) and configuration file (using ConfigParser).
+
+* `proc`, interface to Linux /proc.
+
+* `umessage`, unicode email support.
+
+* `ureports`, micro-reports, a way to create simple reports using python objects
+  without care of the final formatting. ReST and html formatters are provided.
+
+
+Modules providing low-level functions and structures
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `compat`, provides a transparent compatibility layer between different python
+  versions.
+
+* `date`, a set of date manipulation functions.
+
+* `daemon`, a daemon function and mix-in class to properly start an Unix daemon
+  process.
+
+* `decorators`, function decorators such as cached, timed...
+
+* `deprecation`, decorator, metaclass & all to mark functions / classes as
+  deprecated or moved
+
+* `fileutils`, some file / file path manipulation utilities.
+
+* `graph`, graph manipulations functions such as cycle detection, bases for dot
+  file generation.
+
+* `modutils`, python module manipulation functions.
+
+* `shellutils`, some powerful shell like functions to replace shell scripts with
+  python scripts.
+
+* `tasksqueue`, a prioritized tasks queue implementation.
+
+* `textutils`, some text manipulation functions (ansi colorization, line wrapping,
+  rest support...).
+
+* `tree`, base class to represent tree structure, and some others to make it
+  works with the visitor implementation (see below).
+
+* `visitor`, a generic visitor pattern implementation.
+
+
+Modules extending some standard modules
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `debugger`,  `pdb` customization.
+
+* `logging_ext`, extensions to `logging` module such as a colorized formatter
+  and an easier initialization function.
+
+* `optik_ext`, defines some new option types (regexp, csv, color, date, etc.)
+  for `optik` / `optparse`
+
+
+Modules extending some external modules
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `sphinx_ext`, Sphinx_ plugin defining a `autodocstring` directive.
+
+* `vcgutils` , utilities functions to generate file readable with Georg Sander's
+  vcg tool (Visualization of Compiler Graphs).
+
+
+To be deprecated modules
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Those `logilab.common` modules will much probably be deprecated in future
+versions:
+
+* `testlib`: use `unittest2`_ instead
+* `pytest`: use `discover`_ instead
+* `interface`: use `zope.interface`_ if you really want this
+* `table`, `xmlutils`: is that used?
+* `sphinxutils`: we won't go that way imo (i == syt)
+
+
+Comments, support, bug reports
+------------------------------
+
+Project page https://www.logilab.org/project/logilab-common
+
+Use the python-projects@lists.logilab.org mailing list.
+
+You can subscribe to this mailing list at
+https://lists.logilab.org/mailman/listinfo/python-projects
+
+Archives are available at
+https://lists.logilab.org/pipermail/python-projects/
+
+
+.. _Sphinx: http://sphinx.pocoo.org/
+.. _`unittest2`: http://pypi.python.org/pypi/unittest2
+.. _`discover`: http://pypi.python.org/pypi/discover
+.. _`zope.interface`: http://pypi.python.org/pypi/zope.interface
+
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/METADATA b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/METADATA
new file mode 100644
index 0000000..9a00a49
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/METADATA
@@ -0,0 +1,169 @@
+Metadata-Version: 2.0
+Name: logilab-common
+Version: 1.0.2
+Summary: collection of low-level Python packages and modules used by Logilab projects
+Home-page: http://www.logilab.org/project/logilab-common
+Author: Logilab
+Author-email: contact@logilab.fr
+License: LGPL
+Platform: UNKNOWN
+Classifier: Topic :: Utilities
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Requires-Dist: setuptools
+Requires-Dist: six (>=1.4.0)
+
+Logilab's common library
+========================
+
+What's this ?
+-------------
+
+This package contains some modules used by different Logilab projects.
+
+It is released under the GNU Lesser General Public License.
+
+There is no documentation available yet but the source code should be clean and
+well documented.
+
+Designed to ease:
+
+* handling command line options and configuration files
+* writing interactive command line tools
+* manipulation of files and character strings
+* manipulation of common structures such as graph, tree, and pattern such as visitor
+* generating text and HTML reports
+* more...
+
+
+Installation
+------------
+
+Extract the tarball, jump into the created directory and run ::
+
+	python setup.py install
+
+For installation options, see ::
+
+	python setup.py install --help
+
+
+Provided modules
+----------------
+
+Here is a brief description of the available modules.
+
+Modules providing high-level features
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `cache`, a cache implementation with a least recently used algorithm.
+
+* `changelog`, a tiny library to manipulate our simplified ChangeLog file format.
+
+* `clcommands`, high-level classes to define command line programs handling
+  different subcommands. It is based on `configuration` to get easy command line
+  / configuration file handling.
+
+* `configuration`, some classes to handle unified configuration from both
+  command line (using optparse) and configuration file (using ConfigParser).
+
+* `proc`, interface to Linux /proc.
+
+* `umessage`, unicode email support.
+
+* `ureports`, micro-reports, a way to create simple reports using python objects
+  without care of the final formatting. ReST and html formatters are provided.
+
+
+Modules providing low-level functions and structures
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `compat`, provides a transparent compatibility layer between different python
+  versions.
+
+* `date`, a set of date manipulation functions.
+
+* `daemon`, a daemon function and mix-in class to properly start an Unix daemon
+  process.
+
+* `decorators`, function decorators such as cached, timed...
+
+* `deprecation`, decorator, metaclass & all to mark functions / classes as
+  deprecated or moved
+
+* `fileutils`, some file / file path manipulation utilities.
+
+* `graph`, graph manipulations functions such as cycle detection, bases for dot
+  file generation.
+
+* `modutils`, python module manipulation functions.
+
+* `shellutils`, some powerful shell like functions to replace shell scripts with
+  python scripts.
+
+* `tasksqueue`, a prioritized tasks queue implementation.
+
+* `textutils`, some text manipulation functions (ansi colorization, line wrapping,
+  rest support...).
+
+* `tree`, base class to represent tree structure, and some others to make it
+  works with the visitor implementation (see below).
+
+* `visitor`, a generic visitor pattern implementation.
+
+
+Modules extending some standard modules
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `debugger`,  `pdb` customization.
+
+* `logging_ext`, extensions to `logging` module such as a colorized formatter
+  and an easier initialization function.
+
+* `optik_ext`, defines some new option types (regexp, csv, color, date, etc.)
+  for `optik` / `optparse`
+
+
+Modules extending some external modules
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `sphinx_ext`, Sphinx_ plugin defining a `autodocstring` directive.
+
+* `vcgutils` , utilities functions to generate file readable with Georg Sander's
+  vcg tool (Visualization of Compiler Graphs).
+
+
+To be deprecated modules
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Those `logilab.common` modules will much probably be deprecated in future
+versions:
+
+* `testlib`: use `unittest2`_ instead
+* `pytest`: use `discover`_ instead
+* `interface`: use `zope.interface`_ if you really want this
+* `table`, `xmlutils`: is that used?
+* `sphinxutils`: we won't go that way imo (i == syt)
+
+
+Comments, support, bug reports
+------------------------------
+
+Project page https://www.logilab.org/project/logilab-common
+
+Use the python-projects@lists.logilab.org mailing list.
+
+You can subscribe to this mailing list at
+https://lists.logilab.org/mailman/listinfo/python-projects
+
+Archives are available at
+https://lists.logilab.org/pipermail/python-projects/
+
+
+.. _Sphinx: http://sphinx.pocoo.org/
+.. _`unittest2`: http://pypi.python.org/pypi/unittest2
+.. _`discover`: http://pypi.python.org/pypi/discover
+.. _`zope.interface`: http://pypi.python.org/pypi/zope.interface
+
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/RECORD b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/RECORD
new file mode 100644
index 0000000..e6e4730
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/RECORD
@@ -0,0 +1,87 @@
+logilab_common-1.0.2-py2.7-nspkg.pth,sha256=ZY-Jf8tK2WQu_mjLvZuFpvpX9uwdpX3yDS1AuRncCZA,308
+logilab/common/__init__.py,sha256=UiR9rv7f7WsAnIHsxa3UApVCJGTzXbZoC-c4EQJpcvg,5390
+logilab/common/cache.py,sha256=wmY87WSoyERDhAlfIKKUipYavlZPpm3sGAQMpzbDHTM,3621
+logilab/common/changelog.py,sha256=Ea_4j22rWJJ33VSCj4Lz0pBGP0wP7LMP2Zo4DR7iZIo,8075
+logilab/common/clcommands.py,sha256=abMNAsB6ADT7Ns5MsxNtAMOlTQGJLCMO9MUkNYdsVG8,11237
+logilab/common/compat.py,sha256=rMGytWS1DCo35MdKUocU1LfLbZA0RyK79Gyu7lvd6Rg,2593
+logilab/common/configuration.py,sha256=s4rg7Qa1_4bpWlTg-bEaHYUcrgvuoDt75ZJgRnlFsME,42160
+logilab/common/daemon.py,sha256=Eqwo_oKjrHtS9SLrtSfeghRTCjqvveGho43s7vMkd7A,3337
+logilab/common/date.py,sha256=nnUN-4onEaWSR8r4PvtmJyn5ukfFzasjEcOGzEdrvqQ,11230
+logilab/common/debugger.py,sha256=Bw2-yI9KrvSgPLDksda4F8nuK_DvxnSCS-ymPSVc778,7094
+logilab/common/decorators.py,sha256=4DD3iNgEQPVz5hPp-SbbgD-ZObXhaeazGqKleyHdXaw,8868
+logilab/common/deprecation.py,sha256=MAxc_Ds9H_j6C7d4VQqMQPB1j-Ib8vy7iBWoQa8aRHs,7417
+logilab/common/fileutils.py,sha256=kCk_8odmAKnYPHPhUruuV-6og8N9kT8fplV-pvwwd4A,12738
+logilab/common/graph.py,sha256=GTSN-kP40EHjnHXk1vxO-56rEszo-esu1S3hf-SOddw,10247
+logilab/common/interface.py,sha256=dXl6kiuXSpefxauu7J6CUv0soe09wjT4_vXbeWQFgJ8,2593
+logilab/common/logging_ext.py,sha256=Yi8k2fGqr_tt-YApT1JjroNpXETxfj84HKmgTgO22Nw,6975
+logilab/common/modutils.py,sha256=w2LVy_vzhGoyBRrKivx0hqx8n326KrtTUezelEwDAcc,24002
+logilab/common/optik_ext.py,sha256=_aZgWKTKCC8_vYIpstNCOk8wewwZ4jfrpvXWrmPzn5Y,13451
+logilab/common/optparser.py,sha256=QgDoAyVoRy7U1fG9BSZ0O7LQsyNayo1HAelZaKlb4kY,3386
+logilab/common/proc.py,sha256=RGMlPuc11FfrIsqzqNFO3Q6buqt8dvMwXfXKXfwAHks,9352
+logilab/common/pytest.py,sha256=ac7hVpAb06TstSjPV586h1wW21Y__XH5bjrwX55dDOE,46736
+logilab/common/registry.py,sha256=0qIJfNJiqM1HkI-twKHfXiTPU5HKSGRrS-P0Dsj56qw,41550
+logilab/common/shellutils.py,sha256=ZFZ19eX0TCcDrsbOWiy7sr1oqnhQsLixv9n8HakcJiM,14363
+logilab/common/sphinx_ext.py,sha256=pbKN0ObMDY_jy9ehP_7NOKMo40LbQLjf0xntmxHnGr8,3329
+logilab/common/sphinxutils.py,sha256=piY1R04GNR-i1mIb4PRhbGbmbDZPhDsn1FBAiA_Bbrg,4444
+logilab/common/table.py,sha256=5NEx4Ju-jk2CV6W-jxTpOoYArt2BlRpaTZZUBGwu1kg,31408
+logilab/common/tasksqueue.py,sha256=wFE0C0FiuHGBoCnvU-_Kno1eM_Em6yYxYvND6emRN34,2987
+logilab/common/testlib.py,sha256=2Ra9OPs5QpQv7hoZod3M2yYCUdtqSaN3LAvVyiQyA1k,50506
+logilab/common/textutils.py,sha256=TgPGqkN3JsJuR7VxnkoWaOWfkwHiVNB9gpId_3S2xO4,17277
+logilab/common/tree.py,sha256=Y-sa_pfI17cCb-vkyJMaBW3XKVNrreexBgBMPpQJDy0,10606
+logilab/common/umessage.py,sha256=2BuxspHkPEXhlf-XVDye25Mt0RUELneay-K1KNLcS9c,6551
+logilab/common/urllib2ext.py,sha256=FOpxVrbAPtY_6ssq3Qui3zxzckAqLJe9kGkp8tLR0Ic,3416
+logilab/common/vcgutils.py,sha256=tNfi6jxZ4xdUvrjw1cKOodecRlcD0U3MQvTb5HrY5fE,7673
+logilab/common/visitor.py,sha256=5Oc9Y88Kx4wiZ6JAFYFeXwKrMS8jNph9ENVWG3oim1E,3444
+logilab/common/xmlutils.py,sha256=2e4FM-X1PLKBaTG6etLHsAIrtZQiDEA9U7WqM3KjNks,2273
+logilab/common/ureports/__init__.py,sha256=b3_8f4mAm6T3O_-klutleWZ99XjlR-AELfuLEyCbzQ8,6113
+logilab/common/ureports/docbook_writer.py,sha256=KSkIk0W4C4E6DR-Ul_Y9jgnd4_tgVVu15LnU8p2RoeM,5706
+logilab/common/ureports/html_writer.py,sha256=Ee_x9rXjx2NZp290e-0C7nu7VYuKpkCsrl79m4HLI5g,4956
+logilab/common/ureports/nodes.py,sha256=t2NQiL6LQV94D8ugitklVnZRVbz6kP5QkUrl8zGsmMQ,5838
+logilab/common/ureports/text_writer.py,sha256=cMBHbA36_1NrKKnx5LBKczGQmBRg4aObkpr1d581ORU,5212
+../../bin/pytest,sha256=vkYcOC21mDzGBrz4-ajilr8TGxa9tRabxQhyYyXeEDE,124
+logilab_common-1.0.2.dist-info/DESCRIPTION.rst,sha256=bMLyPRBRS-tSzW5zhchxcLlPbYHRv0XEMqs6Oln2z5U,4426
+logilab_common-1.0.2.dist-info/METADATA,sha256=3_iFYhN84fXSjkdjzHv3grHBY2xIZVLSkmuBeTSnLQE,4934
+logilab_common-1.0.2.dist-info/metadata.json,sha256=dTwpZUieC7dZFkKiNdtgVExm2w1B44k4ZDSaCP3ASXo,742
+logilab_common-1.0.2.dist-info/namespace_packages.txt,sha256=xXemaIbd-285ANf3yiCDkMHRTZSuLvlqL_MTLEJKMuk,8
+logilab_common-1.0.2.dist-info/RECORD,,
+logilab_common-1.0.2.dist-info/top_level.txt,sha256=xXemaIbd-285ANf3yiCDkMHRTZSuLvlqL_MTLEJKMuk,8
+logilab_common-1.0.2.dist-info/WHEEL,sha256=54bVun1KfEBTJ68SHUmbxNPj80VxlQ0sHi4gZdGZXEY,92
+logilab/common/logging_ext.pyc,,
+logilab/common/date.pyc,,
+logilab/common/modutils.pyc,,
+logilab/common/ureports/__init__.pyc,,
+logilab/common/sphinxutils.pyc,,
+logilab/common/ureports/text_writer.pyc,,
+logilab/common/optik_ext.pyc,,
+logilab/common/visitor.pyc,,
+logilab/common/debugger.pyc,,
+logilab/common/compat.pyc,,
+logilab/common/decorators.pyc,,
+logilab/common/textutils.pyc,,
+logilab/common/ureports/docbook_writer.pyc,,
+logilab/common/shellutils.pyc,,
+logilab/common/changelog.pyc,,
+logilab/common/interface.pyc,,
+logilab/common/ureports/nodes.pyc,,
+logilab/common/pytest.pyc,,
+logilab/common/sphinx_ext.pyc,,
+logilab/common/xmlutils.pyc,,
+logilab/common/__init__.pyc,,
+logilab/common/tree.pyc,,
+logilab/common/umessage.pyc,,
+logilab/common/registry.pyc,,
+logilab/common/proc.pyc,,
+logilab/common/urllib2ext.pyc,,
+logilab/common/testlib.pyc,,
+logilab/common/clcommands.pyc,,
+logilab/common/ureports/html_writer.pyc,,
+logilab/common/vcgutils.pyc,,
+logilab/common/daemon.pyc,,
+logilab/common/table.pyc,,
+logilab/common/optparser.pyc,,
+logilab/common/deprecation.pyc,,
+logilab/common/tasksqueue.pyc,,
+logilab/common/fileutils.pyc,,
+logilab/common/graph.pyc,,
+logilab/common/cache.pyc,,
+logilab/common/configuration.pyc,,
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/WHEEL b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/WHEEL
new file mode 100644
index 0000000..45a0cd8
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: bdist_wheel (0.24.0)
+Root-Is-Purelib: true
+Tag: py2-none-any
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/metadata.json b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/metadata.json
new file mode 100644
index 0000000..5421266
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/metadata.json
@@ -0,0 +1 @@
+{"license": "LGPL", "name": "logilab-common", "metadata_version": "2.0", "generator": "bdist_wheel (0.24.0)", "test_requires": [{"requires": ["pytz"]}], "summary": "collection of low-level Python packages and modules used by Logilab projects", "run_requires": [{"requires": ["setuptools", "six (>=1.4.0)"]}], "version": "1.0.2", "extensions": {"python.details": {"project_urls": {"Home": "http://www.logilab.org/project/logilab-common"}, "document_names": {"description": "DESCRIPTION.rst"}, "contacts": [{"role": "author", "email": "contact@logilab.fr", "name": "Logilab"}]}}, "classifiers": ["Topic :: Utilities", "Programming Language :: Python", "Programming Language :: Python :: 2", "Programming Language :: Python :: 3"], "extras": []}
\ No newline at end of file
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/namespace_packages.txt b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/namespace_packages.txt
new file mode 100644
index 0000000..3ac267a
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/namespace_packages.txt
@@ -0,0 +1 @@
+logilab
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/top_level.txt b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/top_level.txt
new file mode 100644
index 0000000..3ac267a
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/logilab_common-1.0.2.dist-info/top_level.txt
@@ -0,0 +1 @@
+logilab
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/mccabe.py b/vim-plugins/bundle/python-mode/pymode/libs/mccabe.py
new file mode 100644
index 0000000..90bf19c
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/mccabe.py
@@ -0,0 +1,311 @@
+""" Meager code path measurement tool.
+    Ned Batchelder
+    http://nedbatchelder.com/blog/200803/python_code_complexity_microtool.html
+    MIT License.
+"""
+from __future__ import with_statement
+
+import optparse
+import sys
+from collections import defaultdict
+try:
+    import ast
+    from ast import iter_child_nodes
+except ImportError:   # Python 2.5
+    from flake8.util import ast, iter_child_nodes
+
+__version__ = '0.3.1'
+
+
+class ASTVisitor(object):
+    """Performs a depth-first walk of the AST."""
+
+    def __init__(self):
+        self.node = None
+        self._cache = {}
+
+    def default(self, node, *args):
+        for child in iter_child_nodes(node):
+            self.dispatch(child, *args)
+
+    def dispatch(self, node, *args):
+        self.node = node
+        klass = node.__class__
+        meth = self._cache.get(klass)
+        if meth is None:
+            className = klass.__name__
+            meth = getattr(self.visitor, 'visit' + className, self.default)
+            self._cache[klass] = meth
+        return meth(node, *args)
+
+    def preorder(self, tree, visitor, *args):
+        """Do preorder walk of tree using visitor"""
+        self.visitor = visitor
+        visitor.visit = self.dispatch
+        self.dispatch(tree, *args)  # XXX *args make sense?
+
+
+class PathNode(object):
+    def __init__(self, name, look="circle"):
+        self.name = name
+        self.look = look
+
+    def to_dot(self):
+        print('node [shape=%s,label="%s"] %d;' % (
+            self.look, self.name, self.dot_id()))
+
+    def dot_id(self):
+        return id(self)
+
+
+class PathGraph(object):
+    def __init__(self, name, entity, lineno):
+        self.name = name
+        self.entity = entity
+        self.lineno = lineno
+        self.nodes = defaultdict(list)
+
+    def connect(self, n1, n2):
+        self.nodes[n1].append(n2)
+        # Ensure that the destination node is always counted.
+        self.nodes[n2] = []
+
+    def to_dot(self):
+        print('subgraph {')
+        for node in self.nodes:
+            node.to_dot()
+        for node, nexts in self.nodes.items():
+            for next in nexts:
+                print('%s -- %s;' % (node.dot_id(), next.dot_id()))
+        print('}')
+
+    def complexity(self):
+        """ Return the McCabe complexity for the graph.
+            V-E+2
+        """
+        num_edges = sum([len(n) for n in self.nodes.values()])
+        num_nodes = len(self.nodes)
+        return num_edges - num_nodes + 2
+
+
+class PathGraphingAstVisitor(ASTVisitor):
+    """ A visitor for a parsed Abstract Syntax Tree which finds executable
+        statements.
+    """
+
+    def __init__(self):
+        super(PathGraphingAstVisitor, self).__init__()
+        self.classname = ""
+        self.graphs = {}
+        self.reset()
+
+    def reset(self):
+        self.graph = None
+        self.tail = None
+
+    def dispatch_list(self, node_list):
+        for node in node_list:
+            self.dispatch(node)
+
+    def visitFunctionDef(self, node):
+
+        if self.classname:
+            entity = '%s%s' % (self.classname, node.name)
+        else:
+            entity = node.name
+
+        name = '%d:1: %r' % (node.lineno, entity)
+
+        if self.graph is not None:
+            # closure
+            pathnode = self.appendPathNode(name)
+            self.tail = pathnode
+            self.dispatch_list(node.body)
+            bottom = PathNode("", look='point')
+            self.graph.connect(self.tail, bottom)
+            self.graph.connect(pathnode, bottom)
+            self.tail = bottom
+        else:
+            self.graph = PathGraph(name, entity, node.lineno)
+            pathnode = PathNode(name)
+            self.tail = pathnode
+            self.dispatch_list(node.body)
+            self.graphs["%s%s" % (self.classname, node.name)] = self.graph
+            self.reset()
+
+    def visitClassDef(self, node):
+        old_classname = self.classname
+        self.classname += node.name + "."
+        self.dispatch_list(node.body)
+        self.classname = old_classname
+
+    def appendPathNode(self, name):
+        if not self.tail:
+            return
+        pathnode = PathNode(name)
+        self.graph.connect(self.tail, pathnode)
+        self.tail = pathnode
+        return pathnode
+
+    def visitSimpleStatement(self, node):
+        if node.lineno is None:
+            lineno = 0
+        else:
+            lineno = node.lineno
+        name = "Stmt %d" % lineno
+        self.appendPathNode(name)
+
+    visitAssert = visitAssign = visitAugAssign = visitDelete = visitPrint = \
+        visitRaise = visitYield = visitImport = visitCall = visitSubscript = \
+        visitPass = visitContinue = visitBreak = visitGlobal = visitReturn = \
+        visitSimpleStatement
+
+    def visitLoop(self, node):
+        name = "Loop %d" % node.lineno
+        self._subgraph(node, name)
+
+    visitFor = visitWhile = visitLoop
+
+    def visitIf(self, node):
+        name = "If %d" % node.lineno
+        self._subgraph(node, name)
+
+    def _subgraph(self, node, name, extra_blocks=()):
+        """create the subgraphs representing any `if` and `for` statements"""
+        if self.graph is None:
+            # global loop
+            self.graph = PathGraph(name, name, node.lineno)
+            pathnode = PathNode(name)
+            self._subgraph_parse(node, pathnode, extra_blocks)
+            self.graphs["%s%s" % (self.classname, name)] = self.graph
+            self.reset()
+        else:
+            pathnode = self.appendPathNode(name)
+            self._subgraph_parse(node, pathnode, extra_blocks)
+
+    def _subgraph_parse(self, node, pathnode, extra_blocks):
+        """parse the body and any `else` block of `if` and `for` statements"""
+        loose_ends = []
+        self.tail = pathnode
+        self.dispatch_list(node.body)
+        loose_ends.append(self.tail)
+        for extra in extra_blocks:
+            self.tail = pathnode
+            self.dispatch_list(extra.body)
+            loose_ends.append(self.tail)
+        if node.orelse:
+            self.tail = pathnode
+            self.dispatch_list(node.orelse)
+            loose_ends.append(self.tail)
+        else:
+            loose_ends.append(pathnode)
+        if pathnode:
+            bottom = PathNode("", look='point')
+            for le in loose_ends:
+                self.graph.connect(le, bottom)
+            self.tail = bottom
+
+    def visitTryExcept(self, node):
+        name = "TryExcept %d" % node.lineno
+        self._subgraph(node, name, extra_blocks=node.handlers)
+
+    visitTry = visitTryExcept
+
+    def visitWith(self, node):
+        name = "With %d" % node.lineno
+        self.appendPathNode(name)
+        self.dispatch_list(node.body)
+
+
+class McCabeChecker(object):
+    """McCabe cyclomatic complexity checker."""
+    name = 'mccabe'
+    version = __version__
+    _code = 'C901'
+    _error_tmpl = "C901 %r is too complex (%d)"
+    max_complexity = 0
+
+    def __init__(self, tree, filename):
+        self.tree = tree
+
+    @classmethod
+    def add_options(cls, parser):
+        parser.add_option('--max-complexity', default=-1, action='store',
+                          type='int', help="McCabe complexity threshold")
+        parser.config_options.append('max-complexity')
+
+    @classmethod
+    def parse_options(cls, options):
+        cls.max_complexity = int(options.max_complexity)
+
+    def run(self):
+        if self.max_complexity < 0:
+            return
+        visitor = PathGraphingAstVisitor()
+        visitor.preorder(self.tree, visitor)
+        for graph in visitor.graphs.values():
+            if graph.complexity() > self.max_complexity:
+                text = self._error_tmpl % (graph.entity, graph.complexity())
+                yield graph.lineno, 0, text, type(self)
+
+
+def get_code_complexity(code, threshold=7, filename='stdin'):
+    try:
+        tree = compile(code, filename, "exec", ast.PyCF_ONLY_AST)
+    except SyntaxError:
+        e = sys.exc_info()[1]
+        sys.stderr.write("Unable to parse %s: %s\n" % (filename, e))
+        return 0
+
+    complx = []
+    McCabeChecker.max_complexity = threshold
+    for lineno, offset, text, check in McCabeChecker(tree, filename).run():
+        complx.append('%s:%d:1: %s' % (filename, lineno, text))
+
+    if len(complx) == 0:
+        return 0
+    print('\n'.join(complx))
+    return len(complx)
+
+
+def get_module_complexity(module_path, threshold=7):
+    """Returns the complexity of a module"""
+    with open(module_path, "rU") as mod:
+        code = mod.read()
+    return get_code_complexity(code, threshold, filename=module_path)
+
+
+def main(argv=None):
+    if argv is None:
+        argv = sys.argv[1:]
+    opar = optparse.OptionParser()
+    opar.add_option("-d", "--dot", dest="dot",
+                    help="output a graphviz dot file", action="store_true")
+    opar.add_option("-m", "--min", dest="threshold",
+                    help="minimum complexity for output", type="int",
+                    default=1)
+
+    options, args = opar.parse_args(argv)
+
+    with open(args[0], "rU") as mod:
+        code = mod.read()
+    tree = compile(code, args[0], "exec", ast.PyCF_ONLY_AST)
+    visitor = PathGraphingAstVisitor()
+    visitor.preorder(tree, visitor)
+
+    if options.dot:
+        print('graph {')
+        for graph in visitor.graphs.values():
+            if (not options.threshold or
+                    graph.complexity() >= options.threshold):
+                graph.to_dot()
+        print('}')
+    else:
+        for graph in visitor.graphs.values():
+            if graph.complexity() >= options.threshold:
+                print(graph.name, graph.complexity())
+
+
+if __name__ == '__main__':
+    main(sys.argv[1:])
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pep257.py b/vim-plugins/bundle/python-mode/pymode/libs/pep257.py
new file mode 100644
index 0000000..79d9eee
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pep257.py
@@ -0,0 +1,1187 @@
+#! /usr/bin/env python
+"""Static analysis tool for checking docstring conventions and style.
+
+Implemented checks cover PEP257:
+http://www.python.org/dev/peps/pep-0257/
+
+Other checks can be added, e.g. NumPy docstring conventions:
+https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt
+
+The repository is located at:
+http://github.com/GreenSteam/pep257
+
+"""
+from __future__ import with_statement
+
+import os
+import sys
+import logging
+import tokenize as tk
+from itertools import takewhile, dropwhile, chain
+from optparse import OptionParser
+from re import compile as re
+import itertools
+
+try:  # Python 3.x
+    from ConfigParser import RawConfigParser
+except ImportError:  # Python 2.x
+    from configparser import RawConfigParser
+
+log = logging.getLogger(__name__)
+
+
+try:
+    from StringIO import StringIO
+except ImportError:  # Python 3.0 and later
+    from io import StringIO
+
+
+try:
+    next
+except NameError:  # Python 2.5 and earlier
+    nothing = object()
+
+    def next(obj, default=nothing):
+        if default == nothing:
+            return obj.next()
+        else:
+            try:
+                return obj.next()
+            except StopIteration:
+                return default
+
+
+# If possible (python >= 3.2) use tokenize.open to open files, so PEP 263
+# encoding markers are interpreted.
+try:
+    tokenize_open = tk.open
+except AttributeError:
+    tokenize_open = open
+
+
+__version__ = '0.6.1-alpha'
+__all__ = ('check', 'collect')
+
+PROJECT_CONFIG = ('setup.cfg', 'tox.ini', '.pep257')
+NO_VIOLATIONS_RETURN_CODE = 0
+VIOLATIONS_RETURN_CODE = 1
+INVALID_OPTIONS_RETURN_CODE = 2
+
+
+def humanize(string):
+    return re(r'(.)([A-Z]+)').sub(r'\1 \2', string).lower()
+
+
+def is_magic(name):
+    return name.startswith('__') and name.endswith('__')
+
+
+def is_ascii(string):
+    return all(ord(char) < 128 for char in string)
+
+
+def is_blank(string):
+    return not string.strip()
+
+
+def leading_space(string):
+    return re('\s*').match(string).group()
+
+
+class Value(object):
+
+    def __init__(self, *args):
+        vars(self).update(zip(self._fields, args))
+
+    def __hash__(self):
+        return hash(repr(self))
+
+    def __eq__(self, other):
+        return other and vars(self) == vars(other)
+
+    def __repr__(self):
+        kwargs = ', '.join('{}={!r}'.format(field, getattr(self, field))
+                           for field in self._fields)
+        return '{}({})'.format(self.__class__.__name__, kwargs)
+
+
+class Definition(Value):
+
+    _fields = ('name', '_source', 'start', 'end', 'decorators', 'docstring',
+               'children', 'parent')
+
+    _human = property(lambda self: humanize(type(self).__name__))
+    kind = property(lambda self: self._human.split()[-1])
+    module = property(lambda self: self.parent.module)
+    all = property(lambda self: self.module.all)
+    _slice = property(lambda self: slice(self.start - 1, self.end))
+    source = property(lambda self: ''.join(self._source[self._slice]))
+
+    def __iter__(self):
+        return chain([self], *self.children)
+
+    @property
+    def _publicity(self):
+        return {True: 'public', False: 'private'}[self.is_public]
+
+    def __str__(self):
+        return 'in %s %s `%s`' % (self._publicity, self._human, self.name)
+
+
+class Module(Definition):
+
+    _fields = ('name', '_source', 'start', 'end', 'decorators', 'docstring',
+               'children', 'parent', '_all')
+    is_public = True
+    _nest = staticmethod(lambda s: {'def': Function, 'class': Class}[s])
+    module = property(lambda self: self)
+    all = property(lambda self: self._all)
+
+    def __str__(self):
+        return 'at module level'
+
+
+class Package(Module):
+
+    """A package is a __init__.py module."""
+
+
+class Function(Definition):
+
+    _nest = staticmethod(lambda s: {'def': NestedFunction,
+                                    'class': NestedClass}[s])
+
+    @property
+    def is_public(self):
+        if self.all is not None:
+            return self.name in self.all
+        else:  # TODO: are there any magic functions? not methods
+            return not self.name.startswith('_') or is_magic(self.name)
+
+
+class NestedFunction(Function):
+
+    is_public = False
+
+
+class Method(Function):
+
+    @property
+    def is_public(self):
+        # Check if we are a setter/deleter method, and mark as private if so.
+        for decorator in self.decorators:
+            # Given 'foo', match 'foo.bar' but not 'foobar' or 'sfoo'
+            if re(r"^{0}\.".format(self.name)).match(decorator.name):
+                return False
+        name_is_public = not self.name.startswith('_') or is_magic(self.name)
+        return self.parent.is_public and name_is_public
+
+
+class Class(Definition):
+
+    _nest = staticmethod(lambda s: {'def': Method, 'class': NestedClass}[s])
+    is_public = Function.is_public
+
+
+class NestedClass(Class):
+
+    is_public = False
+
+
+class Decorator(Value):
+
+    """A decorator for function, method or class."""
+
+    _fields = 'name arguments'.split()
+
+
+class TokenKind(int):
+    def __repr__(self):
+        return "tk.{}".format(tk.tok_name[self])
+
+
+class Token(Value):
+
+    _fields = 'kind value start end source'.split()
+
+    def __init__(self, *args):
+        super(Token, self).__init__(*args)
+        self.kind = TokenKind(self.kind)
+
+
+class TokenStream(object):
+
+    def __init__(self, filelike):
+        self._generator = tk.generate_tokens(filelike.readline)
+        self.current = Token(*next(self._generator, None))
+        self.line = self.current.start[0]
+
+    def move(self):
+        previous = self.current
+        current = next(self._generator, None)
+        self.current = None if current is None else Token(*current)
+        self.line = self.current.start[0] if self.current else self.line
+        return previous
+
+    def __iter__(self):
+        while True:
+            if self.current is not None:
+                yield self.current
+            else:
+                return
+            self.move()
+
+
+class AllError(Exception):
+
+    def __init__(self, message):
+        Exception.__init__(
+            self, message +
+            'That means pep257 cannot decide which definitions are public. '
+            'Variable __all__ should be present at most once in each file, '
+            "in form `__all__ = ('a_public_function', 'APublicClass', ...)`. "
+            'More info on __all__: http://stackoverflow.com/q/44834/. ')
+
+
+class Parser(object):
+
+    def __call__(self, filelike, filename):
+        self.source = filelike.readlines()
+        src = ''.join(self.source)
+        self.stream = TokenStream(StringIO(src))
+        self.filename = filename
+        self.all = None
+        self._accumulated_decorators = []
+        return self.parse_module()
+
+    current = property(lambda self: self.stream.current)
+    line = property(lambda self: self.stream.line)
+
+    def consume(self, kind):
+        assert self.stream.move().kind == kind
+
+    def leapfrog(self, kind, value=None):
+        """Skip tokens in the stream until a certain token kind is reached.
+
+        If `value` is specified, tokens whose values are different will also
+        be skipped.
+        """
+        while self.current is not None:
+            if (self.current.kind == kind and
+               (value is None or self.current.value == value)):
+                self.consume(kind)
+                return
+            self.stream.move()
+
+    def parse_docstring(self):
+        """Parse a single docstring and return its value."""
+        log.debug("parsing docstring, token is %r (%s)",
+                  self.current.kind, self.current.value)
+        while self.current.kind in (tk.COMMENT, tk.NEWLINE, tk.NL):
+            self.stream.move()
+            log.debug("parsing docstring, token is %r (%s)",
+                      self.current.kind, self.current.value)
+        if self.current.kind == tk.STRING:
+            docstring = self.current.value
+            self.stream.move()
+            return docstring
+        return None
+
+    def parse_decorators(self):
+        """Called after first @ is found.
+
+        Parse decorators into self._accumulated_decorators.
+        Continue to do so until encountering the 'def' or 'class' start token.
+        """
+        name = []
+        arguments = []
+        at_arguments = False
+
+        while self.current is not None:
+            if (self.current.kind == tk.NAME and
+                    self.current.value in ['def', 'class']):
+                # Done with decorators - found function or class proper
+                break
+            elif self.current.kind == tk.OP and self.current.value == '@':
+                # New decorator found. Store the decorator accumulated so far:
+                self._accumulated_decorators.append(
+                    Decorator(''.join(name), ''.join(arguments)))
+                # Now reset to begin accumulating the new decorator:
+                name = []
+                arguments = []
+                at_arguments = False
+            elif self.current.kind == tk.OP and self.current.value == '(':
+                at_arguments = True
+            elif self.current.kind == tk.OP and self.current.value == ')':
+                # Ignore close parenthesis
+                pass
+            elif self.current.kind == tk.NEWLINE or self.current.kind == tk.NL:
+                # Ignore newlines
+                pass
+            else:
+                # Keep accumulating current decorator's name or argument.
+                if not at_arguments:
+                    name.append(self.current.value)
+                else:
+                    arguments.append(self.current.value)
+            self.stream.move()
+
+        # Add decorator accumulated so far
+        self._accumulated_decorators.append(
+            Decorator(''.join(name), ''.join(arguments)))
+
+    def parse_definitions(self, class_, all=False):
+        """Parse multiple defintions and yield them."""
+        while self.current is not None:
+            log.debug("parsing defintion list, current token is %r (%s)",
+                      self.current.kind, self.current.value)
+            if all and self.current.value == '__all__':
+                self.parse_all()
+            elif self.current.kind == tk.OP and self.current.value == '@':
+                self.consume(tk.OP)
+                self.parse_decorators()
+            elif self.current.value in ['def', 'class']:
+                yield self.parse_definition(class_._nest(self.current.value))
+            elif self.current.kind == tk.INDENT:
+                self.consume(tk.INDENT)
+                for definition in self.parse_definitions(class_):
+                    yield definition
+            elif self.current.kind == tk.DEDENT:
+                self.consume(tk.DEDENT)
+                return
+            else:
+                self.stream.move()
+
+    def parse_all(self):
+        """Parse the __all__ definition in a module."""
+        assert self.current.value == '__all__'
+        self.consume(tk.NAME)
+        if self.current.value != '=':
+            raise AllError('Could not evaluate contents of __all__. ')
+        self.consume(tk.OP)
+        if self.current.value not in '([':
+            raise AllError('Could not evaluate contents of __all__. ')
+        if self.current.value == '[':
+            msg = ("%s WARNING: __all__ is defined as a list, this means "
+                   "pep257 cannot reliably detect contents of the __all__ "
+                   "variable, because it can be mutated. Change __all__ to be "
+                   "an (immutable) tuple, to remove this warning. Note, "
+                   "pep257 uses __all__ to detect which definitions are "
+                   "public, to warn if public definitions are missing "
+                   "docstrings. If __all__ is a (mutable) list, pep257 cannot "
+                   "reliably assume its contents. pep257 will proceed "
+                   "assuming __all__ is not mutated.\n" % self.filename)
+            sys.stderr.write(msg)
+        self.consume(tk.OP)
+
+        self.all = []
+        all_content = "("
+        while self.current.kind != tk.OP or self.current.value not in ")]":
+            if self.current.kind in (tk.NL, tk.COMMENT):
+                pass
+            elif (self.current.kind == tk.STRING or
+                  self.current.value == ','):
+                all_content += self.current.value
+            else:
+                kind = token.tok_name[self.current.kind]
+                raise AllError('Unexpected token kind in  __all__: %s' % kind)
+            self.stream.move()
+        self.consume(tk.OP)
+        all_content += ")"
+        try:
+            self.all = eval(all_content, {})
+        except BaseException as e:
+            raise AllError('Could not evaluate contents of __all__.'
+                           '\bThe value was %s. The exception was:\n%s'
+                           % (all_content, e))
+
+    def parse_module(self):
+        """Parse a module (and its children) and return a Module object."""
+        log.debug("parsing module.")
+        start = self.line
+        docstring = self.parse_docstring()
+        children = list(self.parse_definitions(Module, all=True))
+        assert self.current is None, self.current
+        end = self.line
+        cls = Module
+        if self.filename.endswith('__init__.py'):
+            cls = Package
+        module = cls(self.filename, self.source, start, end,
+                     [], docstring, children, None, self.all)
+        for child in module.children:
+            child.parent = module
+        log.debug("finished parsing module.")
+        return module
+
+    def parse_definition(self, class_):
+        """Parse a defintion and return its value in a `class_` object."""
+        start = self.line
+        self.consume(tk.NAME)
+        name = self.current.value
+        log.debug("parsing %s '%s'", class_.__name__, name)
+        self.stream.move()
+        if self.current.kind == tk.OP and self.current.value == '(':
+            parenthesis_level = 0
+            while True:
+                if self.current.kind == tk.OP:
+                    if self.current.value == '(':
+                        parenthesis_level += 1
+                    elif self.current.value == ')':
+                        parenthesis_level -= 1
+                        if parenthesis_level == 0:
+                            break
+                self.stream.move()
+        if self.current.kind != tk.OP or self.current.value != ':':
+            self.leapfrog(tk.OP, value=":")
+        else:
+            self.consume(tk.OP)
+        if self.current.kind in (tk.NEWLINE, tk.COMMENT):
+            self.leapfrog(tk.INDENT)
+            assert self.current.kind != tk.INDENT
+            docstring = self.parse_docstring()
+            decorators = self._accumulated_decorators
+            self._accumulated_decorators = []
+            log.debug("parsing nested defintions.")
+            children = list(self.parse_definitions(class_))
+            log.debug("finished parsing nested defintions for '%s'", name)
+            end = self.line - 1
+        else:  # one-liner definition
+            docstring = self.parse_docstring()
+            decorators = []  # TODO
+            children = []
+            end = self.line
+            self.leapfrog(tk.NEWLINE)
+        definition = class_(name, self.source, start, end,
+                            decorators, docstring, children, None)
+        for child in definition.children:
+            child.parent = definition
+        log.debug("finished parsing %s '%s'. Next token is %r (%s)",
+                  class_.__name__, name, self.current.kind,
+                  self.current.value)
+        return definition
+
+
+class Error(object):
+
+    """Error in docstring style."""
+
+    # should be overridden by inheriting classes
+    code = None
+    short_desc = None
+    context = None
+
+    # Options that define how errors are printed:
+    explain = False
+    source = False
+
+    def __init__(self, *parameters):
+        self.parameters = parameters
+        self.definition = None
+        self.explanation = None
+
+    def set_context(self, definition, explanation):
+        self.definition = definition
+        self.explanation = explanation
+
+    filename = property(lambda self: self.definition.module.name)
+    line = property(lambda self: self.definition.start)
+
+    @property
+    def message(self):
+        ret = '%s: %s' % (self.code, self.short_desc)
+        if self.context is not None:
+            ret += ' (' + self.context % self.parameters + ')'
+        return ret
+
+    @property
+    def lines(self):
+        source = ''
+        lines = self.definition._source[self.definition._slice]
+        offset = self.definition.start
+        lines_stripped = list(reversed(list(dropwhile(is_blank,
+                                                      reversed(lines)))))
+        numbers_width = 0
+        for n, line in enumerate(lines_stripped):
+            numbers_width = max(numbers_width, n + offset)
+        numbers_width = len(str(numbers_width))
+        numbers_width = 6
+        for n, line in enumerate(lines_stripped):
+            source += '%*d: %s' % (numbers_width, n + offset, line)
+            if n > 5:
+                source += '        ...\n'
+                break
+        return source
+
+    def __str__(self):
+        self.explanation = '\n'.join(l for l in self.explanation.split('\n')
+                                     if not is_blank(l))
+        template = '%(filename)s:%(line)s %(definition)s:\n        %(message)s'
+        if self.source and self.explain:
+            template += '\n\n%(explanation)s\n\n%(lines)s\n'
+        elif self.source and not self.explain:
+            template += '\n\n%(lines)s\n'
+        elif self.explain and not self.source:
+            template += '\n\n%(explanation)s\n\n'
+        return template % dict((name, getattr(self, name)) for name in
+                               ['filename', 'line', 'definition', 'message',
+                                'explanation', 'lines'])
+
+    __repr__ = __str__
+
+    def __lt__(self, other):
+        return (self.filename, self.line) < (other.filename, other.line)
+
+
+class ErrorRegistry(object):
+    groups = []
+
+    class ErrorGroup(object):
+
+        def __init__(self, prefix, name):
+            self.prefix = prefix
+            self.name = name
+            self.errors = []
+
+        def create_error(self, error_code, error_desc, error_context=None):
+            # TODO: check prefix
+
+            class _Error(Error):
+                code = error_code
+                short_desc = error_desc
+                context = error_context
+
+            self.errors.append(_Error)
+            return _Error
+
+    @classmethod
+    def create_group(cls, prefix, name):
+        group = cls.ErrorGroup(prefix, name)
+        cls.groups.append(group)
+        return group
+
+    @classmethod
+    def get_error_codes(cls):
+        for group in cls.groups:
+            for error in group.errors:
+                yield error.code
+
+    @classmethod
+    def to_rst(cls):
+        sep_line = '+' + 6 * '-' + '+' + '-' * 71 + '+\n'
+        blank_line = '|' + 78 * ' ' + '|\n'
+        table = ''
+        for group in cls.groups:
+            table += sep_line
+            table += blank_line
+            table += '|' + ('**%s**' % group.name).center(78) + '|\n'
+            table += blank_line
+            for error in group.errors:
+                table += sep_line
+                table += ('|' + error.code.center(6) + '| ' +
+                          error.short_desc.ljust(70) + '|\n')
+        table += sep_line
+        return table
+
+
+D1xx = ErrorRegistry.create_group('D1', 'Missing Docstrings')
+D100 = D1xx.create_error('D100', 'Missing docstring in public module')
+D101 = D1xx.create_error('D101', 'Missing docstring in public class')
+D102 = D1xx.create_error('D102', 'Missing docstring in public method')
+D103 = D1xx.create_error('D103', 'Missing docstring in public function')
+D104 = D1xx.create_error('D104', 'Missing docstring in public package')
+
+D2xx = ErrorRegistry.create_group('D2', 'Whitespace Issues')
+D200 = D2xx.create_error('D200', 'One-line docstring should fit on one line '
+                                 'with quotes', 'found %s')
+D201 = D2xx.create_error('D201', 'No blank lines allowed before function '
+                                 'docstring', 'found %s')
+D202 = D2xx.create_error('D202', 'No blank lines allowed after function '
+                                 'docstring', 'found %s')
+D203 = D2xx.create_error('D203', '1 blank line required before class '
+                                 'docstring', 'found %s')
+D204 = D2xx.create_error('D204', '1 blank line required after class '
+                                 'docstring', 'found %s')
+D205 = D2xx.create_error('D205', '1 blank line required between summary line '
+                                 'and description', 'found %s')
+D206 = D2xx.create_error('D206', 'Docstring should be indented with spaces, '
+                                 'not tabs')
+D207 = D2xx.create_error('D207', 'Docstring is under-indented')
+D208 = D2xx.create_error('D208', 'Docstring is over-indented')
+D209 = D2xx.create_error('D209', 'Multi-line docstring closing quotes should '
+                                 'be on a separate line')
+D210 = D2xx.create_error('D210', 'No whitespaces allowed surrounding '
+                                 'docstring text')
+
+D3xx = ErrorRegistry.create_group('D3', 'Quotes Issues')
+D300 = D3xx.create_error('D300', 'Use """triple double quotes"""',
+                         'found %s-quotes')
+D301 = D3xx.create_error('D301', 'Use r""" if any backslashes in a docstring')
+D302 = D3xx.create_error('D302', 'Use u""" for Unicode docstrings')
+
+D4xx = ErrorRegistry.create_group('D4', 'Docstring Content Issues')
+D400 = D4xx.create_error('D400', 'First line should end with a period',
+                         'not %r')
+D401 = D4xx.create_error('D401', 'First line should be in imperative mood',
+                         '%r, not %r')
+D402 = D4xx.create_error('D402', 'First line should not be the function\'s '
+                                 '"signature"')
+
+
+class Conventions(object):
+    pep257 = set(ErrorRegistry.get_error_codes())
+
+
+def get_option_parser():
+    parser = OptionParser(version=__version__,
+                          usage='Usage: pep257 [options] [<file|dir>...]')
+    parser.config_options = ('explain', 'source', 'ignore', 'match', 'select',
+                             'match-dir', 'debug', 'verbose', 'count',
+                             'convention')
+    option = parser.add_option
+    option('-e', '--explain', action='store_true',
+           help='show explanation of each error')
+    option('-s', '--source', action='store_true',
+           help='show source for each error')
+    option('--select', metavar='<codes>', default='',
+           help='choose the basic list of checked errors by specifying which '
+                'errors to check for (with a list of comma-separated error '
+                'codes). for example: --select=D101,D202')
+    option('--ignore', metavar='<codes>', default='',
+           help='choose the basic list of checked errors by specifying which '
+                'errors to ignore (with a list of comma-separated error '
+                'codes). for example: --ignore=D101,D202')
+    option('--convention', metavar='<name>', default='',
+           help='choose the basic list of checked errors by specifying an '
+                'existing convention. for example: --convention=pep257')
+    option('--add-select', metavar='<codes>', default='',
+           help='amend the list of errors to check for by specifying more '
+                'error codes to check.')
+    option('--add-ignore', metavar='<codes>', default='',
+           help='amend the list of errors to check for by specifying more '
+                'error codes to ignore.')
+    option('--match', metavar='<pattern>', default='(?!test_).*\.py',
+           help="check only files that exactly match <pattern> regular "
+                "expression; default is --match='(?!test_).*\.py' which "
+                "matches files that don't start with 'test_' but end with "
+                "'.py'")
+    option('--match-dir', metavar='<pattern>', default='[^\.].*',
+           help="search only dirs that exactly match <pattern> regular "
+                "expression; default is --match-dir='[^\.].*', which matches "
+                "all dirs that don't start with a dot")
+    option('-d', '--debug', action='store_true',
+           help='print debug information')
+    option('-v', '--verbose', action='store_true',
+           help='print status information')
+    option('--count', action='store_true',
+           help='print total number of errors to stdout')
+    return parser
+
+
+def collect(names, match=lambda name: True, match_dir=lambda name: True):
+    """Walk dir trees under `names` and generate filnames that `match`.
+
+    Example
+    -------
+    >>> sorted(collect(['non-dir.txt', './'],
+    ...                match=lambda name: name.endswith('.py')))
+    ['non-dir.txt', './pep257.py', './setup.py', './test_pep257.py']
+
+    """
+    for name in names:  # map(expanduser, names):
+        if os.path.isdir(name):
+            for root, dirs, filenames in os.walk(name):
+                # Skip any dirs that do not match match_dir
+                dirs[:] = [dir for dir in dirs if match_dir(dir)]
+                for filename in filenames:
+                    if match(filename):
+                        yield os.path.join(root, filename)
+        else:
+            yield name
+
+
+def check(filenames, select=None, ignore=None):
+    """Generate PEP 257 errors that exist in `filenames` iterable.
+
+    Only returns errors with error-codes defined in `checked_codes` iterable.
+
+    Example
+    -------
+    >>> check(['pep257.py'], checked_codes=['D100'])
+    <generator object check at 0x...>
+
+    """
+    if select and ignore:
+        raise ValueError('Cannot pass both select and ignore. They are '
+                         'mutually exclusive.')
+    elif select or ignore:
+        checked_codes = (select or
+                         set(ErrorRegistry.get_error_codes()) - set(ignore))
+    else:
+        checked_codes = Conventions.pep257
+
+    for filename in filenames:
+        log.info('Checking file %s.', filename)
+        try:
+            with tokenize_open(filename) as file:
+                source = file.read()
+            for error in PEP257Checker().check_source(source, filename):
+                code = getattr(error, 'code', None)
+                if code in checked_codes:
+                    yield error
+        except (EnvironmentError, AllError):
+            yield sys.exc_info()[1]
+        except tk.TokenError:
+            yield SyntaxError('invalid syntax in file %s' % filename)
+
+
+def get_options(args, opt_parser):
+    config = RawConfigParser()
+    parent = tail = os.path.abspath(os.path.commonprefix(args))
+    config_found = False
+    while tail and not config_found:
+        log.info(tail)
+        for fn in PROJECT_CONFIG:
+            full_path = os.path.join(parent, fn)
+            if config.read(full_path):
+                log.info('local configuration: in %s.', full_path)
+                config_found = True
+                break
+        parent, tail = os.path.split(parent)
+
+    new_options = None
+    if config.has_section('pep257'):
+        option_list = dict([(o.dest, o.type or o.action)
+                            for o in opt_parser.option_list])
+
+        # First, read the default values
+        new_options, _ = opt_parser.parse_args([])
+
+        # Second, parse the configuration
+        pep257_section = 'pep257'
+        for opt in config.options(pep257_section):
+            if opt.replace('_', '-') not in opt_parser.config_options:
+                log.warning("Unknown option '{}' ignored".format(opt))
+                continue
+            normalized_opt = opt.replace('-', '_')
+            opt_type = option_list[normalized_opt]
+            if opt_type in ('int', 'count'):
+                value = config.getint(pep257_section, opt)
+            elif opt_type == 'string':
+                value = config.get(pep257_section, opt)
+            else:
+                assert opt_type in ('store_true', 'store_false')
+                value = config.getboolean(pep257_section, opt)
+            setattr(new_options, normalized_opt, value)
+
+    # Third, overwrite with the command-line options
+    options, _ = opt_parser.parse_args(values=new_options)
+    log.debug("options: %s", options)
+    return options
+
+
+def setup_stream_handlers(options):
+    """Setup logging stream handlers according to the options."""
+    class StdoutFilter(logging.Filter):
+        def filter(self, record):
+            return record.levelno in (logging.DEBUG, logging.INFO)
+
+    if log.handlers:
+        for handler in log.handlers:
+            log.removeHandler(handler)
+
+    stdout_handler = logging.StreamHandler(sys.stdout)
+    stdout_handler.setLevel(logging.WARNING)
+    stdout_handler.addFilter(StdoutFilter())
+    if options.debug:
+        stdout_handler.setLevel(logging.DEBUG)
+    elif options.verbose:
+        stdout_handler.setLevel(logging.INFO)
+    else:
+        stdout_handler.setLevel(logging.WARNING)
+    log.addHandler(stdout_handler)
+
+    stderr_handler = logging.StreamHandler(sys.stderr)
+    stderr_handler.setLevel(logging.WARNING)
+    log.addHandler(stderr_handler)
+
+
+def get_checked_error_codes(options):
+    codes = set(ErrorRegistry.get_error_codes())
+    if options.ignore:
+        checked_codes = codes - set(options.ignore.split(','))
+    elif options.select:
+        checked_codes = set(options.select.split(','))
+    elif options.convention:
+        checked_codes = getattr(Conventions, options.convention)
+    else:
+        checked_codes = Conventions.pep257
+    checked_codes -= set(options.add_ignore.split(','))
+    checked_codes |= set(options.add_select.split(','))
+    return checked_codes - set('')
+
+
+def validate_options(options):
+    mutually_exclusive = ('ignore', 'select', 'convention')
+    for opt1, opt2 in itertools.permutations(mutually_exclusive, 2):
+        if getattr(options, opt1) and getattr(options, opt2):
+            log.error('Cannot pass both {0} and {1}. They are '
+                      'mutually exclusive.'.format(opt1, opt2))
+            return False
+    if options.convention and not hasattr(Conventions, options.convention):
+        return False
+    return True
+
+
+def run_pep257():
+    log.setLevel(logging.DEBUG)
+    opt_parser = get_option_parser()
+    # setup the logger before parsing the config file, so that command line
+    # arguments for debug / verbose will be printed.
+    options, arguments = opt_parser.parse_args()
+    setup_stream_handlers(options)
+    # We parse the files before opening the config file, since it changes where
+    # we look for the file.
+    options = get_options(arguments, opt_parser)
+    if not validate_options(options):
+        return INVALID_OPTIONS_RETURN_CODE
+    # Setup the handler again with values from the config file.
+    setup_stream_handlers(options)
+
+    collected = collect(arguments or ['.'],
+                        match=re(options.match + '$').match,
+                        match_dir=re(options.match_dir + '$').match)
+
+    log.debug("starting pep257 in debug mode.")
+
+    Error.explain = options.explain
+    Error.source = options.source
+    collected = list(collected)
+    checked_codes = get_checked_error_codes(options)
+    errors = check(collected, select=checked_codes)
+    code = NO_VIOLATIONS_RETURN_CODE
+    count = 0
+    for error in errors:
+        sys.stderr.write('%s\n' % error)
+        code = VIOLATIONS_RETURN_CODE
+        count += 1
+    if options.count:
+        print(count)
+    return code
+
+
+parse = Parser()
+
+
+def check_for(kind, terminal=False):
+    def decorator(f):
+        f._check_for = kind
+        f._terminal = terminal
+        return f
+    return decorator
+
+
+class PEP257Checker(object):
+
+    """Checker for PEP 257.
+
+    D10x: Missing docstrings
+    D20x: Whitespace issues
+    D30x: Docstring formatting
+    D40x: Docstring content issues
+
+    """
+
+    def check_source(self, source, filename):
+        module = parse(StringIO(source), filename)
+        for definition in module:
+            for check in self.checks:
+                terminate = False
+                if isinstance(definition, check._check_for):
+                    error = check(None, definition, definition.docstring)
+                    errors = error if hasattr(error, '__iter__') else [error]
+                    for error in errors:
+                        if error is not None:
+                            partition = check.__doc__.partition('.\n')
+                            message, _, explanation = partition
+                            error.set_context(explanation=explanation,
+                                              definition=definition)
+                            yield error
+                            if check._terminal:
+                                terminate = True
+                                break
+                if terminate:
+                    break
+
+    @property
+    def checks(self):
+        all = [check for check in vars(type(self)).values()
+               if hasattr(check, '_check_for')]
+        return sorted(all, key=lambda check: not check._terminal)
+
+    @check_for(Definition, terminal=True)
+    def check_docstring_missing(self, definition, docstring):
+        """D10{0,1,2,3}: Public definitions should have docstrings.
+
+        All modules should normally have docstrings.  [...] all functions and
+        classes exported by a module should also have docstrings. Public
+        methods (including the __init__ constructor) should also have
+        docstrings.
+
+        Note: Public (exported) definitions are either those with names listed
+              in __all__ variable (if present), or those that do not start
+              with a single underscore.
+
+        """
+        if (not docstring and definition.is_public or
+                docstring and is_blank(eval(docstring))):
+            codes = {Module: D100, Class: D101, NestedClass: D101,
+                     Method: D102, Function: D103, NestedFunction: D103,
+                     Package: D104}
+            return codes[type(definition)]()
+
+    @check_for(Definition)
+    def check_one_liners(self, definition, docstring):
+        """D200: One-liner docstrings should fit on one line with quotes.
+
+        The closing quotes are on the same line as the opening quotes.
+        This looks better for one-liners.
+
+        """
+        if docstring:
+            lines = eval(docstring).split('\n')
+            if len(lines) > 1:
+                non_empty_lines = sum(1 for l in lines if not is_blank(l))
+                if non_empty_lines == 1:
+                    return D200(len(lines))
+
+    @check_for(Function)
+    def check_no_blank_before(self, function, docstring):  # def
+        """D20{1,2}: No blank lines allowed around function/method docstring.
+
+        There's no blank line either before or after the docstring.
+
+        """
+        # NOTE: This does not take comments into account.
+        # NOTE: This does not take into account functions with groups of code.
+        if docstring:
+            before, _, after = function.source.partition(docstring)
+            blanks_before = list(map(is_blank, before.split('\n')[:-1]))
+            blanks_after = list(map(is_blank, after.split('\n')[1:]))
+            blanks_before_count = sum(takewhile(bool, reversed(blanks_before)))
+            blanks_after_count = sum(takewhile(bool, blanks_after))
+            if blanks_before_count != 0:
+                yield D201(blanks_before_count)
+            if not all(blanks_after) and blanks_after_count != 0:
+                yield D202(blanks_after_count)
+
+    @check_for(Class)
+    def check_blank_before_after_class(slef, class_, docstring):
+        """D20{3,4}: Class docstring should have 1 blank line around them.
+
+        Insert a blank line before and after all docstrings (one-line or
+        multi-line) that document a class -- generally speaking, the class's
+        methods are separated from each other by a single blank line, and the
+        docstring needs to be offset from the first method by a blank line;
+        for symmetry, put a blank line between the class header and the
+        docstring.
+
+        """
+        # NOTE: this gives false-positive in this case
+        # class Foo:
+        #
+        #     """Docstring."""
+        #
+        #
+        # # comment here
+        # def foo(): pass
+        if docstring:
+            before, _, after = class_.source.partition(docstring)
+            blanks_before = list(map(is_blank, before.split('\n')[:-1]))
+            blanks_after = list(map(is_blank, after.split('\n')[1:]))
+            blanks_before_count = sum(takewhile(bool, reversed(blanks_before)))
+            blanks_after_count = sum(takewhile(bool, blanks_after))
+            if blanks_before_count != 1:
+                yield D203(blanks_before_count)
+            if not all(blanks_after) and blanks_after_count != 1:
+                yield D204(blanks_after_count)
+
+    @check_for(Definition)
+    def check_blank_after_summary(self, definition, docstring):
+        """D205: Put one blank line between summary line and description.
+
+        Multi-line docstrings consist of a summary line just like a one-line
+        docstring, followed by a blank line, followed by a more elaborate
+        description. The summary line may be used by automatic indexing tools;
+        it is important that it fits on one line and is separated from the
+        rest of the docstring by a blank line.
+
+        """
+        if docstring:
+            lines = eval(docstring).strip().split('\n')
+            if len(lines) > 1:
+                post_summary_blanks = list(map(is_blank, lines[1:]))
+                blanks_count = sum(takewhile(bool, post_summary_blanks))
+                if blanks_count != 1:
+                    return D205(blanks_count)
+
+    @check_for(Definition)
+    def check_indent(self, definition, docstring):
+        """D20{6,7,8}: The entire docstring should be indented same as code.
+
+        The entire docstring is indented the same as the quotes at its
+        first line.
+
+        """
+        if docstring:
+            before_docstring, _, _ = definition.source.partition(docstring)
+            _, _, indent = before_docstring.rpartition('\n')
+            lines = docstring.split('\n')
+            if len(lines) > 1:
+                lines = lines[1:]  # First line does not need indent.
+                indents = [leading_space(l) for l in lines if not is_blank(l)]
+                if set(' \t') == set(''.join(indents) + indent):
+                    yield D206()
+                if (len(indents) > 1 and min(indents[:-1]) > indent or
+                        indents[-1] > indent):
+                    yield D208()
+                if min(indents) < indent:
+                    yield D207()
+
+    @check_for(Definition)
+    def check_newline_after_last_paragraph(self, definition, docstring):
+        """D209: Put multi-line docstring closing quotes on separate line.
+
+        Unless the entire docstring fits on a line, place the closing
+        quotes on a line by themselves.
+
+        """
+        if docstring:
+            lines = [l for l in eval(docstring).split('\n') if not is_blank(l)]
+            if len(lines) > 1:
+                if docstring.split("\n")[-1].strip() not in ['"""', "'''"]:
+                    return D209()
+
+    @check_for(Definition)
+    def check_surrounding_whitespaces(self, definition, docstring):
+        """D210: No whitespaces allowed surrounding docstring text."""
+        if docstring:
+            lines = eval(docstring).split('\n')
+            if lines[0].startswith(' ') or \
+                    len(lines) == 1 and lines[0].endswith(' '):
+                return D210()
+
+    @check_for(Definition)
+    def check_triple_double_quotes(self, definition, docstring):
+        r'''D300: Use """triple double quotes""".
+
+        For consistency, always use """triple double quotes""" around
+        docstrings. Use r"""raw triple double quotes""" if you use any
+        backslashes in your docstrings. For Unicode docstrings, use
+        u"""Unicode triple-quoted strings""".
+
+        Note: Exception to this is made if the docstring contains
+              """ quotes in its body.
+
+        '''
+        if docstring and '"""' in eval(docstring) and docstring.startswith(
+                ("'''", "r'''", "u'''", "ur'''")):
+            # Allow ''' quotes if docstring contains """, because otherwise """
+            # quotes could not be expressed inside docstring.  Not in PEP 257.
+            return
+        if docstring and not docstring.startswith(
+                ('"""', 'r"""', 'u"""', 'ur"""')):
+            quotes = "'''" if "'''" in docstring[:4] else "'"
+            return D300(quotes)
+
+    @check_for(Definition)
+    def check_backslashes(self, definition, docstring):
+        r'''D301: Use r""" if any backslashes in a docstring.
+
+        Use r"""raw triple double quotes""" if you use any backslashes
+        (\) in your docstrings.
+
+        '''
+        # Just check that docstring is raw, check_triple_double_quotes
+        # ensures the correct quotes.
+        if docstring and '\\' in docstring and not docstring.startswith(
+                ('r', 'ur')):
+            return D301()
+
+    @check_for(Definition)
+    def check_unicode_docstring(self, definition, docstring):
+        r'''D302: Use u""" for docstrings with Unicode.
+
+        For Unicode docstrings, use u"""Unicode triple-quoted strings""".
+
+        '''
+        # Just check that docstring is unicode, check_triple_double_quotes
+        # ensures the correct quotes.
+        if docstring and sys.version_info[0] <= 2:
+            if not is_ascii(docstring) and not docstring.startswith(
+                    ('u', 'ur')):
+                return D302()
+
+    @check_for(Definition)
+    def check_ends_with_period(self, definition, docstring):
+        """D400: First line should end with a period.
+
+        The [first line of a] docstring is a phrase ending in a period.
+
+        """
+        if docstring:
+            summary_line = eval(docstring).strip().split('\n')[0]
+            if not summary_line.endswith('.'):
+                return D400(summary_line[-1])
+
+    @check_for(Function)
+    def check_imperative_mood(self, function, docstring):  # def context
+        """D401: First line should be in imperative mood: 'Do', not 'Does'.
+
+        [Docstring] prescribes the function or method's effect as a command:
+        ("Do this", "Return that"), not as a description; e.g. don't write
+        "Returns the pathname ...".
+
+        """
+        if docstring:
+            stripped = eval(docstring).strip()
+            if stripped:
+                first_word = stripped.split()[0]
+                if first_word.endswith('s') and not first_word.endswith('ss'):
+                    return D401(first_word[:-1], first_word)
+
+    @check_for(Function)
+    def check_no_signature(self, function, docstring):  # def context
+        """D402: First line should not be function's or method's "signature".
+
+        The one-line docstring should NOT be a "signature" reiterating the
+        function/method parameters (which can be obtained by introspection).
+
+        """
+        if docstring:
+            first_line = eval(docstring).strip().split('\n')[0]
+            if function.name + '(' in first_line.replace(' ', ''):
+                return D402()
+
+    # Somewhat hard to determine if return value is mentioned.
+    # @check(Function)
+    def SKIP_check_return_type(self, function, docstring):
+        """D40x: Return value type should be mentioned.
+
+        [T]he nature of the return value cannot be determined by
+        introspection, so it should be mentioned.
+
+        """
+        if docstring and function.returns_value:
+            if 'return' not in docstring.lower():
+                return Error()
+
+
+def main():
+    try:
+        sys.exit(run_pep257())
+    except KeyboardInterrupt:
+        pass
+
+
+if __name__ == '__main__':
+    main()
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pep8.py b/vim-plugins/bundle/python-mode/pymode/libs/pep8.py
new file mode 100644
index 0000000..34ce07a
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pep8.py
@@ -0,0 +1,2127 @@
+#!/usr/bin/env python
+# pep8.py - Check Python source code formatting, according to PEP 8
+# Copyright (C) 2006-2009 Johann C. Rocholl <johann@rocholl.net>
+# Copyright (C) 2009-2014 Florent Xicluna <florent.xicluna@gmail.com>
+# Copyright (C) 2014-2015 Ian Lee <ianlee1521@gmail.com>
+#
+# 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.
+
+r"""
+Check Python source code formatting, according to PEP 8.
+
+For usage and a list of options, try this:
+$ python pep8.py -h
+
+This program and its regression test suite live here:
+http://github.com/jcrocholl/pep8
+
+Groups of errors and warnings:
+E errors
+W warnings
+100 indentation
+200 whitespace
+300 blank lines
+400 imports
+500 line length
+600 deprecation
+700 statements
+900 syntax error
+"""
+from __future__ import with_statement
+
+import os
+import sys
+import re
+import time
+import inspect
+import keyword
+import tokenize
+from optparse import OptionParser
+from fnmatch import fnmatch
+try:
+    from configparser import RawConfigParser
+    from io import TextIOWrapper
+except ImportError:
+    from ConfigParser import RawConfigParser
+
+__version__ = '1.6.3a0'
+
+DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox'
+DEFAULT_IGNORE = 'E121,E123,E126,E226,E24,E704'
+try:
+    if sys.platform == 'win32':
+        USER_CONFIG = os.path.expanduser(r'~\.pep8')
+    else:
+        USER_CONFIG = os.path.join(
+            os.getenv('XDG_CONFIG_HOME') or os.path.expanduser('~/.config'),
+            'pep8'
+        )
+except ImportError:
+    USER_CONFIG = None
+
+PROJECT_CONFIG = ('setup.cfg', 'tox.ini', '.pep8')
+TESTSUITE_PATH = os.path.join(os.path.dirname(__file__), 'testsuite')
+MAX_LINE_LENGTH = 79
+REPORT_FORMAT = {
+    'default': '%(path)s:%(row)d:%(col)d: %(code)s %(text)s',
+    'pylint': '%(path)s:%(row)d: [%(code)s] %(text)s',
+}
+
+PyCF_ONLY_AST = 1024
+SINGLETONS = frozenset(['False', 'None', 'True'])
+KEYWORDS = frozenset(keyword.kwlist + ['print']) - SINGLETONS
+UNARY_OPERATORS = frozenset(['>>', '**', '*', '+', '-'])
+ARITHMETIC_OP = frozenset(['**', '*', '/', '//', '+', '-'])
+WS_OPTIONAL_OPERATORS = ARITHMETIC_OP.union(['^', '&', '|', '<<', '>>', '%'])
+WS_NEEDED_OPERATORS = frozenset([
+    '**=', '*=', '/=', '//=', '+=', '-=', '!=', '<>', '<', '>',
+    '%=', '^=', '&=', '|=', '==', '<=', '>=', '<<=', '>>=', '='])
+WHITESPACE = frozenset(' \t')
+NEWLINE = frozenset([tokenize.NL, tokenize.NEWLINE])
+SKIP_TOKENS = NEWLINE.union([tokenize.INDENT, tokenize.DEDENT])
+# ERRORTOKEN is triggered by backticks in Python 3
+SKIP_COMMENTS = SKIP_TOKENS.union([tokenize.COMMENT, tokenize.ERRORTOKEN])
+BENCHMARK_KEYS = ['directories', 'files', 'logical lines', 'physical lines']
+
+INDENT_REGEX = re.compile(r'([ \t]*)')
+RAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,')
+RERAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,.*,\s*\w+\s*$')
+ERRORCODE_REGEX = re.compile(r'\b[A-Z]\d{3}\b')
+DOCSTRING_REGEX = re.compile(r'u?r?["\']')
+EXTRANEOUS_WHITESPACE_REGEX = re.compile(r'[[({] | []}),;:]')
+WHITESPACE_AFTER_COMMA_REGEX = re.compile(r'[,;:]\s*(?:  |\t)')
+COMPARE_SINGLETON_REGEX = re.compile(r'\b(None|False|True)?\s*([=!]=)'
+                                     r'\s*(?(1)|(None|False|True))\b')
+COMPARE_NEGATIVE_REGEX = re.compile(r'\b(not)\s+[^][)(}{ ]+\s+(in|is)\s')
+COMPARE_TYPE_REGEX = re.compile(r'(?:[=!]=|is(?:\s+not)?)\s*type(?:s.\w+Type'
+                                r'|\s*\(\s*([^)]*[^ )])\s*\))')
+KEYWORD_REGEX = re.compile(r'(\s*)\b(?:%s)\b(\s*)' % r'|'.join(KEYWORDS))
+OPERATOR_REGEX = re.compile(r'(?:[^,\s])(\s*)(?:[-+*/|!<=>%&^]+)(\s*)')
+LAMBDA_REGEX = re.compile(r'\blambda\b')
+HUNK_REGEX = re.compile(r'^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@.*$')
+
+# Work around Python < 2.6 behaviour, which does not generate NL after
+# a comment which is on a line by itself.
+COMMENT_WITH_NL = tokenize.generate_tokens(['#\n'].pop).send(None)[1] == '#\n'
+
+
+##############################################################################
+# Plugins (check functions) for physical lines
+##############################################################################
+
+
+def tabs_or_spaces(physical_line, indent_char):
+    r"""Never mix tabs and spaces.
+
+    The most popular way of indenting Python is with spaces only.  The
+    second-most popular way is with tabs only.  Code indented with a mixture
+    of tabs and spaces should be converted to using spaces exclusively.  When
+    invoking the Python command line interpreter with the -t option, it issues
+    warnings about code that illegally mixes tabs and spaces.  When using -tt
+    these warnings become errors.  These options are highly recommended!
+
+    Okay: if a == 0:\n        a = 1\n        b = 1
+    E101: if a == 0:\n        a = 1\n\tb = 1
+    """
+    indent = INDENT_REGEX.match(physical_line).group(1)
+    for offset, char in enumerate(indent):
+        if char != indent_char:
+            return offset, "E101 indentation contains mixed spaces and tabs"
+
+
+def tabs_obsolete(physical_line):
+    r"""For new projects, spaces-only are strongly recommended over tabs.
+
+    Okay: if True:\n    return
+    W191: if True:\n\treturn
+    """
+    indent = INDENT_REGEX.match(physical_line).group(1)
+    if '\t' in indent:
+        return indent.index('\t'), "W191 indentation contains tabs"
+
+
+def trailing_whitespace(physical_line):
+    r"""Trailing whitespace is superfluous.
+
+    The warning returned varies on whether the line itself is blank, for easier
+    filtering for those who want to indent their blank lines.
+
+    Okay: spam(1)\n#
+    W291: spam(1) \n#
+    W293: class Foo(object):\n    \n    bang = 12
+    """
+    physical_line = physical_line.rstrip('\n')    # chr(10), newline
+    physical_line = physical_line.rstrip('\r')    # chr(13), carriage return
+    physical_line = physical_line.rstrip('\x0c')  # chr(12), form feed, ^L
+    stripped = physical_line.rstrip(' \t\v')
+    if physical_line != stripped:
+        if stripped:
+            return len(stripped), "W291 trailing whitespace"
+        else:
+            return 0, "W293 blank line contains whitespace"
+
+
+def trailing_blank_lines(physical_line, lines, line_number, total_lines):
+    r"""Trailing blank lines are superfluous.
+
+    Okay: spam(1)
+    W391: spam(1)\n
+
+    However the last line should end with a new line (warning W292).
+    """
+    if line_number == total_lines:
+        stripped_last_line = physical_line.rstrip()
+        if not stripped_last_line:
+            return 0, "W391 blank line at end of file"
+        if stripped_last_line == physical_line:
+            return len(physical_line), "W292 no newline at end of file"
+
+
+def maximum_line_length(physical_line, max_line_length, multiline):
+    r"""Limit all lines to a maximum of 79 characters.
+
+    There are still many devices around that are limited to 80 character
+    lines; plus, limiting windows to 80 characters makes it possible to have
+    several windows side-by-side.  The default wrapping on such devices looks
+    ugly.  Therefore, please limit all lines to a maximum of 79 characters.
+    For flowing long blocks of text (docstrings or comments), limiting the
+    length to 72 characters is recommended.
+
+    Reports error E501.
+    """
+    line = physical_line.rstrip()
+    length = len(line)
+    if length > max_line_length and not noqa(line):
+        # Special case for long URLs in multi-line docstrings or comments,
+        # but still report the error when the 72 first chars are whitespaces.
+        chunks = line.split()
+        if ((len(chunks) == 1 and multiline) or
+            (len(chunks) == 2 and chunks[0] == '#')) and \
+                len(line) - len(chunks[-1]) < max_line_length - 7:
+            return
+        if hasattr(line, 'decode'):   # Python 2
+            # The line could contain multi-byte characters
+            try:
+                length = len(line.decode('utf-8'))
+            except UnicodeError:
+                pass
+        if length > max_line_length:
+            return (max_line_length, "E501 line too long "
+                    "(%d > %d characters)" % (length, max_line_length))
+
+
+##############################################################################
+# Plugins (check functions) for logical lines
+##############################################################################
+
+
+def blank_lines(logical_line, blank_lines, indent_level, line_number,
+                blank_before, previous_logical, previous_indent_level):
+    r"""Separate top-level function and class definitions with two blank lines.
+
+    Method definitions inside a class are separated by a single blank line.
+
+    Extra blank lines may be used (sparingly) to separate groups of related
+    functions.  Blank lines may be omitted between a bunch of related
+    one-liners (e.g. a set of dummy implementations).
+
+    Use blank lines in functions, sparingly, to indicate logical sections.
+
+    Okay: def a():\n    pass\n\n\ndef b():\n    pass
+    Okay: def a():\n    pass\n\n\n# Foo\n# Bar\n\ndef b():\n    pass
+
+    E301: class Foo:\n    b = 0\n    def bar():\n        pass
+    E302: def a():\n    pass\n\ndef b(n):\n    pass
+    E303: def a():\n    pass\n\n\n\ndef b(n):\n    pass
+    E303: def a():\n\n\n\n    pass
+    E304: @decorator\n\ndef a():\n    pass
+    """
+    if line_number < 3 and not previous_logical:
+        return  # Don't expect blank lines before the first line
+    if previous_logical.startswith('@'):
+        if blank_lines:
+            yield 0, "E304 blank lines found after function decorator"
+    elif blank_lines > 2 or (indent_level and blank_lines == 2):
+        yield 0, "E303 too many blank lines (%d)" % blank_lines
+    elif logical_line.startswith(('def ', 'class ', '@')):
+        if indent_level:
+            if not (blank_before or previous_indent_level < indent_level or
+                    DOCSTRING_REGEX.match(previous_logical)):
+                yield 0, "E301 expected 1 blank line, found 0"
+        elif blank_before != 2:
+            yield 0, "E302 expected 2 blank lines, found %d" % blank_before
+
+
+def extraneous_whitespace(logical_line):
+    r"""Avoid extraneous whitespace.
+
+    Avoid extraneous whitespace in these situations:
+    - Immediately inside parentheses, brackets or braces.
+    - Immediately before a comma, semicolon, or colon.
+
+    Okay: spam(ham[1], {eggs: 2})
+    E201: spam( ham[1], {eggs: 2})
+    E201: spam(ham[ 1], {eggs: 2})
+    E201: spam(ham[1], { eggs: 2})
+    E202: spam(ham[1], {eggs: 2} )
+    E202: spam(ham[1 ], {eggs: 2})
+    E202: spam(ham[1], {eggs: 2 })
+
+    E203: if x == 4: print x, y; x, y = y , x
+    E203: if x == 4: print x, y ; x, y = y, x
+    E203: if x == 4 : print x, y; x, y = y, x
+    """
+    line = logical_line
+    for match in EXTRANEOUS_WHITESPACE_REGEX.finditer(line):
+        text = match.group()
+        char = text.strip()
+        found = match.start()
+        if text == char + ' ':
+            # assert char in '([{'
+            yield found + 1, "E201 whitespace after '%s'" % char
+        elif line[found - 1] != ',':
+            code = ('E202' if char in '}])' else 'E203')  # if char in ',;:'
+            yield found, "%s whitespace before '%s'" % (code, char)
+
+
+def whitespace_around_keywords(logical_line):
+    r"""Avoid extraneous whitespace around keywords.
+
+    Okay: True and False
+    E271: True and  False
+    E272: True  and False
+    E273: True and\tFalse
+    E274: True\tand False
+    """
+    for match in KEYWORD_REGEX.finditer(logical_line):
+        before, after = match.groups()
+
+        if '\t' in before:
+            yield match.start(1), "E274 tab before keyword"
+        elif len(before) > 1:
+            yield match.start(1), "E272 multiple spaces before keyword"
+
+        if '\t' in after:
+            yield match.start(2), "E273 tab after keyword"
+        elif len(after) > 1:
+            yield match.start(2), "E271 multiple spaces after keyword"
+
+
+def missing_whitespace(logical_line):
+    r"""Each comma, semicolon or colon should be followed by whitespace.
+
+    Okay: [a, b]
+    Okay: (3,)
+    Okay: a[1:4]
+    Okay: a[:4]
+    Okay: a[1:]
+    Okay: a[1:4:2]
+    E231: ['a','b']
+    E231: foo(bar,baz)
+    E231: [{'a':'b'}]
+    """
+    line = logical_line
+    for index in range(len(line) - 1):
+        char = line[index]
+        if char in ',;:' and line[index + 1] not in WHITESPACE:
+            before = line[:index]
+            if char == ':' and before.count('[') > before.count(']') and \
+                    before.rfind('{') < before.rfind('['):
+                continue  # Slice syntax, no space required
+            if char == ',' and line[index + 1] == ')':
+                continue  # Allow tuple with only one element: (3,)
+            yield index, "E231 missing whitespace after '%s'" % char
+
+
+def indentation(logical_line, previous_logical, indent_char,
+                indent_level, previous_indent_level):
+    r"""Use 4 spaces per indentation level.
+
+    For really old code that you don't want to mess up, you can continue to
+    use 8-space tabs.
+
+    Okay: a = 1
+    Okay: if a == 0:\n    a = 1
+    E111:   a = 1
+    E114:   # a = 1
+
+    Okay: for item in items:\n    pass
+    E112: for item in items:\npass
+    E115: for item in items:\n# Hi\n    pass
+
+    Okay: a = 1\nb = 2
+    E113: a = 1\n    b = 2
+    E116: a = 1\n    # b = 2
+    """
+    c = 0 if logical_line else 3
+    tmpl = "E11%d %s" if logical_line else "E11%d %s (comment)"
+    if indent_level % 4:
+        yield 0, tmpl % (1 + c, "indentation is not a multiple of four")
+    indent_expect = previous_logical.endswith(':')
+    if indent_expect and indent_level <= previous_indent_level:
+        yield 0, tmpl % (2 + c, "expected an indented block")
+    elif not indent_expect and indent_level > previous_indent_level:
+        yield 0, tmpl % (3 + c, "unexpected indentation")
+
+
+def continued_indentation(logical_line, tokens, indent_level, hang_closing,
+                          indent_char, noqa, verbose):
+    r"""Continuation lines indentation.
+
+    Continuation lines should align wrapped elements either vertically
+    using Python's implicit line joining inside parentheses, brackets
+    and braces, or using a hanging indent.
+
+    When using a hanging indent these considerations should be applied:
+    - there should be no arguments on the first line, and
+    - further indentation should be used to clearly distinguish itself as a
+      continuation line.
+
+    Okay: a = (\n)
+    E123: a = (\n    )
+
+    Okay: a = (\n    42)
+    E121: a = (\n   42)
+    E122: a = (\n42)
+    E123: a = (\n    42\n    )
+    E124: a = (24,\n     42\n)
+    E125: if (\n    b):\n    pass
+    E126: a = (\n        42)
+    E127: a = (24,\n      42)
+    E128: a = (24,\n    42)
+    E129: if (a or\n    b):\n    pass
+    E131: a = (\n    42\n 24)
+    """
+    first_row = tokens[0][2][0]
+    nrows = 1 + tokens[-1][2][0] - first_row
+    if noqa or nrows == 1:
+        return
+
+    # indent_next tells us whether the next block is indented; assuming
+    # that it is indented by 4 spaces, then we should not allow 4-space
+    # indents on the final continuation line; in turn, some other
+    # indents are allowed to have an extra 4 spaces.
+    indent_next = logical_line.endswith(':')
+
+    row = depth = 0
+    valid_hangs = (4,) if indent_char != '\t' else (4, 8)
+    # remember how many brackets were opened on each line
+    parens = [0] * nrows
+    # relative indents of physical lines
+    rel_indent = [0] * nrows
+    # for each depth, collect a list of opening rows
+    open_rows = [[0]]
+    # for each depth, memorize the hanging indentation
+    hangs = [None]
+    # visual indents
+    indent_chances = {}
+    last_indent = tokens[0][2]
+    visual_indent = None
+    last_token_multiline = False
+    # for each depth, memorize the visual indent column
+    indent = [last_indent[1]]
+    if verbose >= 3:
+        print(">>> " + tokens[0][4].rstrip())
+
+    for token_type, text, start, end, line in tokens:
+
+        newline = row < start[0] - first_row
+        if newline:
+            row = start[0] - first_row
+            newline = not last_token_multiline and token_type not in NEWLINE
+
+        if newline:
+            # this is the beginning of a continuation line.
+            last_indent = start
+            if verbose >= 3:
+                print("... " + line.rstrip())
+
+            # record the initial indent.
+            rel_indent[row] = expand_indent(line) - indent_level
+
+            # identify closing bracket
+            close_bracket = (token_type == tokenize.OP and text in ']})')
+
+            # is the indent relative to an opening bracket line?
+            for open_row in reversed(open_rows[depth]):
+                hang = rel_indent[row] - rel_indent[open_row]
+                hanging_indent = hang in valid_hangs
+                if hanging_indent:
+                    break
+            if hangs[depth]:
+                hanging_indent = (hang == hangs[depth])
+            # is there any chance of visual indent?
+            visual_indent = (not close_bracket and hang > 0 and
+                             indent_chances.get(start[1]))
+
+            if close_bracket and indent[depth]:
+                # closing bracket for visual indent
+                if start[1] != indent[depth]:
+                    yield (start, "E124 closing bracket does not match "
+                           "visual indentation")
+            elif close_bracket and not hang:
+                # closing bracket matches indentation of opening bracket's line
+                if hang_closing:
+                    yield start, "E133 closing bracket is missing indentation"
+            elif indent[depth] and start[1] < indent[depth]:
+                if visual_indent is not True:
+                    # visual indent is broken
+                    yield (start, "E128 continuation line "
+                           "under-indented for visual indent")
+            elif hanging_indent or (indent_next and rel_indent[row] == 8):
+                # hanging indent is verified
+                if close_bracket and not hang_closing:
+                    yield (start, "E123 closing bracket does not match "
+                           "indentation of opening bracket's line")
+                hangs[depth] = hang
+            elif visual_indent is True:
+                # visual indent is verified
+                indent[depth] = start[1]
+            elif visual_indent in (text, str):
+                # ignore token lined up with matching one from a previous line
+                pass
+            else:
+                # indent is broken
+                if hang <= 0:
+                    error = "E122", "missing indentation or outdented"
+                elif indent[depth]:
+                    error = "E127", "over-indented for visual indent"
+                elif not close_bracket and hangs[depth]:
+                    error = "E131", "unaligned for hanging indent"
+                else:
+                    hangs[depth] = hang
+                    if hang > 4:
+                        error = "E126", "over-indented for hanging indent"
+                    else:
+                        error = "E121", "under-indented for hanging indent"
+                yield start, "%s continuation line %s" % error
+
+        # look for visual indenting
+        if (parens[row] and
+                token_type not in (tokenize.NL, tokenize.COMMENT) and
+                not indent[depth]):
+            indent[depth] = start[1]
+            indent_chances[start[1]] = True
+            if verbose >= 4:
+                print("bracket depth %s indent to %s" % (depth, start[1]))
+        # deal with implicit string concatenation
+        elif (token_type in (tokenize.STRING, tokenize.COMMENT) or
+              text in ('u', 'ur', 'b', 'br')):
+            indent_chances[start[1]] = str
+        # special case for the "if" statement because len("if (") == 4
+        elif not indent_chances and not row and not depth and text == 'if':
+            indent_chances[end[1] + 1] = True
+        elif text == ':' and line[end[1]:].isspace():
+            open_rows[depth].append(row)
+
+        # keep track of bracket depth
+        if token_type == tokenize.OP:
+            if text in '([{':
+                depth += 1
+                indent.append(0)
+                hangs.append(None)
+                if len(open_rows) == depth:
+                    open_rows.append([])
+                open_rows[depth].append(row)
+                parens[row] += 1
+                if verbose >= 4:
+                    print("bracket depth %s seen, col %s, visual min = %s" %
+                          (depth, start[1], indent[depth]))
+            elif text in ')]}' and depth > 0:
+                # parent indents should not be more than this one
+                prev_indent = indent.pop() or last_indent[1]
+                hangs.pop()
+                for d in range(depth):
+                    if indent[d] > prev_indent:
+                        indent[d] = 0
+                for ind in list(indent_chances):
+                    if ind >= prev_indent:
+                        del indent_chances[ind]
+                del open_rows[depth + 1:]
+                depth -= 1
+                if depth:
+                    indent_chances[indent[depth]] = True
+                for idx in range(row, -1, -1):
+                    if parens[idx]:
+                        parens[idx] -= 1
+                        break
+            assert len(indent) == depth + 1
+            if start[1] not in indent_chances:
+                # allow to line up tokens
+                indent_chances[start[1]] = text
+
+        last_token_multiline = (start[0] != end[0])
+        if last_token_multiline:
+            rel_indent[end[0] - first_row] = rel_indent[row]
+
+    if indent_next and expand_indent(line) == indent_level + 4:
+        pos = (start[0], indent[0] + 4)
+        if visual_indent:
+            code = "E129 visually indented line"
+        else:
+            code = "E125 continuation line"
+        yield pos, "%s with same indent as next logical line" % code
+
+
+def whitespace_before_parameters(logical_line, tokens):
+    r"""Avoid extraneous whitespace.
+
+    Avoid extraneous whitespace in the following situations:
+    - before the open parenthesis that starts the argument list of a
+      function call.
+    - before the open parenthesis that starts an indexing or slicing.
+
+    Okay: spam(1)
+    E211: spam (1)
+
+    Okay: dict['key'] = list[index]
+    E211: dict ['key'] = list[index]
+    E211: dict['key'] = list [index]
+    """
+    prev_type, prev_text, __, prev_end, __ = tokens[0]
+    for index in range(1, len(tokens)):
+        token_type, text, start, end, __ = tokens[index]
+        if (token_type == tokenize.OP and
+            text in '([' and
+            start != prev_end and
+            (prev_type == tokenize.NAME or prev_text in '}])') and
+            # Syntax "class A (B):" is allowed, but avoid it
+            (index < 2 or tokens[index - 2][1] != 'class') and
+                # Allow "return (a.foo for a in range(5))"
+                not keyword.iskeyword(prev_text)):
+            yield prev_end, "E211 whitespace before '%s'" % text
+        prev_type = token_type
+        prev_text = text
+        prev_end = end
+
+
+def whitespace_around_operator(logical_line):
+    r"""Avoid extraneous whitespace around an operator.
+
+    Okay: a = 12 + 3
+    E221: a = 4  + 5
+    E222: a = 4 +  5
+    E223: a = 4\t+ 5
+    E224: a = 4 +\t5
+    """
+    for match in OPERATOR_REGEX.finditer(logical_line):
+        before, after = match.groups()
+
+        if '\t' in before:
+            yield match.start(1), "E223 tab before operator"
+        elif len(before) > 1:
+            yield match.start(1), "E221 multiple spaces before operator"
+
+        if '\t' in after:
+            yield match.start(2), "E224 tab after operator"
+        elif len(after) > 1:
+            yield match.start(2), "E222 multiple spaces after operator"
+
+
+def missing_whitespace_around_operator(logical_line, tokens):
+    r"""Surround operators with a single space on either side.
+
+    - Always surround these binary operators with a single space on
+      either side: assignment (=), augmented assignment (+=, -= etc.),
+      comparisons (==, <, >, !=, <=, >=, in, not in, is, is not),
+      Booleans (and, or, not).
+
+    - If operators with different priorities are used, consider adding
+      whitespace around the operators with the lowest priorities.
+
+    Okay: i = i + 1
+    Okay: submitted += 1
+    Okay: x = x * 2 - 1
+    Okay: hypot2 = x * x + y * y
+    Okay: c = (a + b) * (a - b)
+    Okay: foo(bar, key='word', *args, **kwargs)
+    Okay: alpha[:-i]
+
+    E225: i=i+1
+    E225: submitted +=1
+    E225: x = x /2 - 1
+    E225: z = x **y
+    E226: c = (a+b) * (a-b)
+    E226: hypot2 = x*x + y*y
+    E227: c = a|b
+    E228: msg = fmt%(errno, errmsg)
+    """
+    parens = 0
+    need_space = False
+    prev_type = tokenize.OP
+    prev_text = prev_end = None
+    for token_type, text, start, end, line in tokens:
+        if token_type in SKIP_COMMENTS:
+            continue
+        if text in ('(', 'lambda'):
+            parens += 1
+        elif text == ')':
+            parens -= 1
+        if need_space:
+            if start != prev_end:
+                # Found a (probably) needed space
+                if need_space is not True and not need_space[1]:
+                    yield (need_space[0],
+                           "E225 missing whitespace around operator")
+                need_space = False
+            elif text == '>' and prev_text in ('<', '-'):
+                # Tolerate the "<>" operator, even if running Python 3
+                # Deal with Python 3's annotated return value "->"
+                pass
+            else:
+                if need_space is True or need_space[1]:
+                    # A needed trailing space was not found
+                    yield prev_end, "E225 missing whitespace around operator"
+                elif prev_text != '**':
+                    code, optype = 'E226', 'arithmetic'
+                    if prev_text == '%':
+                        code, optype = 'E228', 'modulo'
+                    elif prev_text not in ARITHMETIC_OP:
+                        code, optype = 'E227', 'bitwise or shift'
+                    yield (need_space[0], "%s missing whitespace "
+                           "around %s operator" % (code, optype))
+                need_space = False
+        elif token_type == tokenize.OP and prev_end is not None:
+            if text == '=' and parens:
+                # Allow keyword args or defaults: foo(bar=None).
+                pass
+            elif text in WS_NEEDED_OPERATORS:
+                need_space = True
+            elif text in UNARY_OPERATORS:
+                # Check if the operator is being used as a binary operator
+                # Allow unary operators: -123, -x, +1.
+                # Allow argument unpacking: foo(*args, **kwargs).
+                if (prev_text in '}])' if prev_type == tokenize.OP
+                        else prev_text not in KEYWORDS):
+                    need_space = None
+            elif text in WS_OPTIONAL_OPERATORS:
+                need_space = None
+
+            if need_space is None:
+                # Surrounding space is optional, but ensure that
+                # trailing space matches opening space
+                need_space = (prev_end, start != prev_end)
+            elif need_space and start == prev_end:
+                # A needed opening space was not found
+                yield prev_end, "E225 missing whitespace around operator"
+                need_space = False
+        prev_type = token_type
+        prev_text = text
+        prev_end = end
+
+
+def whitespace_around_comma(logical_line):
+    r"""Avoid extraneous whitespace after a comma or a colon.
+
+    Note: these checks are disabled by default
+
+    Okay: a = (1, 2)
+    E241: a = (1,  2)
+    E242: a = (1,\t2)
+    """
+    line = logical_line
+    for m in WHITESPACE_AFTER_COMMA_REGEX.finditer(line):
+        found = m.start() + 1
+        if '\t' in m.group():
+            yield found, "E242 tab after '%s'" % m.group()[0]
+        else:
+            yield found, "E241 multiple spaces after '%s'" % m.group()[0]
+
+
+def whitespace_around_named_parameter_equals(logical_line, tokens):
+    r"""Don't use spaces around the '=' sign in function arguments.
+
+    Don't use spaces around the '=' sign when used to indicate a
+    keyword argument or a default parameter value.
+
+    Okay: def complex(real, imag=0.0):
+    Okay: return magic(r=real, i=imag)
+    Okay: boolean(a == b)
+    Okay: boolean(a != b)
+    Okay: boolean(a <= b)
+    Okay: boolean(a >= b)
+    Okay: def foo(arg: int = 42):
+
+    E251: def complex(real, imag = 0.0):
+    E251: return magic(r = real, i = imag)
+    """
+    parens = 0
+    no_space = False
+    prev_end = None
+    annotated_func_arg = False
+    in_def = logical_line.startswith('def')
+    message = "E251 unexpected spaces around keyword / parameter equals"
+    for token_type, text, start, end, line in tokens:
+        if token_type == tokenize.NL:
+            continue
+        if no_space:
+            no_space = False
+            if start != prev_end:
+                yield (prev_end, message)
+        if token_type == tokenize.OP:
+            if text == '(':
+                parens += 1
+            elif text == ')':
+                parens -= 1
+            elif in_def and text == ':' and parens == 1:
+                annotated_func_arg = True
+            elif parens and text == ',' and parens == 1:
+                annotated_func_arg = False
+            elif parens and text == '=' and not annotated_func_arg:
+                no_space = True
+                if start != prev_end:
+                    yield (prev_end, message)
+            if not parens:
+                annotated_func_arg = False
+
+        prev_end = end
+
+
+def whitespace_before_comment(logical_line, tokens):
+    r"""Separate inline comments by at least two spaces.
+
+    An inline comment is a comment on the same line as a statement.  Inline
+    comments should be separated by at least two spaces from the statement.
+    They should start with a # and a single space.
+
+    Each line of a block comment starts with a # and a single space
+    (unless it is indented text inside the comment).
+
+    Okay: x = x + 1  # Increment x
+    Okay: x = x + 1    # Increment x
+    Okay: # Block comment
+    E261: x = x + 1 # Increment x
+    E262: x = x + 1  #Increment x
+    E262: x = x + 1  #  Increment x
+    E265: #Block comment
+    E266: ### Block comment
+    """
+    prev_end = (0, 0)
+    for token_type, text, start, end, line in tokens:
+        if token_type == tokenize.COMMENT:
+            inline_comment = line[:start[1]].strip()
+            if inline_comment:
+                if prev_end[0] == start[0] and start[1] < prev_end[1] + 2:
+                    yield (prev_end,
+                           "E261 at least two spaces before inline comment")
+            symbol, sp, comment = text.partition(' ')
+            bad_prefix = symbol not in '#:' and (symbol.lstrip('#')[:1] or '#')
+            if inline_comment:
+                if bad_prefix or comment[:1] in WHITESPACE:
+                    yield start, "E262 inline comment should start with '# '"
+            elif bad_prefix and (bad_prefix != '!' or start[0] > 1):
+                if bad_prefix != '#':
+                    yield start, "E265 block comment should start with '# '"
+                elif comment:
+                    yield start, "E266 too many leading '#' for block comment"
+        elif token_type != tokenize.NL:
+            prev_end = end
+
+
+def imports_on_separate_lines(logical_line):
+    r"""Imports should usually be on separate lines.
+
+    Okay: import os\nimport sys
+    E401: import sys, os
+
+    Okay: from subprocess import Popen, PIPE
+    Okay: from myclas import MyClass
+    Okay: from foo.bar.yourclass import YourClass
+    Okay: import myclass
+    Okay: import foo.bar.yourclass
+    """
+    line = logical_line
+    if line.startswith('import '):
+        found = line.find(',')
+        if -1 < found and ';' not in line[:found]:
+            yield found, "E401 multiple imports on one line"
+
+
+def module_imports_on_top_of_file(
+        logical_line, indent_level, checker_state, noqa):
+    r"""Imports are always put at the top of the file, just after any module
+    comments and docstrings, and before module globals and constants.
+
+    Okay: import os
+    Okay: # this is a comment\nimport os
+    Okay: '''this is a module docstring'''\nimport os
+    Okay: r'''this is a module docstring'''\nimport os
+    Okay: try:\n    import x\nexcept:\n    pass\nelse:\n    pass\nimport y
+    Okay: try:\n    import x\nexcept:\n    pass\nfinally:\n    pass\nimport y
+    E402: a=1\nimport os
+    E402: 'One string'\n"Two string"\nimport os
+    E402: a=1\nfrom sys import x
+
+    Okay: if x:\n    import os
+    """
+    def is_string_literal(line):
+        if line[0] in 'uUbB':
+            line = line[1:]
+        if line and line[0] in 'rR':
+            line = line[1:]
+        return line and (line[0] == '"' or line[0] == "'")
+
+    allowed_try_keywords = ('try', 'except', 'else', 'finally')
+
+    if indent_level:  # Allow imports in conditional statements or functions
+        return
+    if not logical_line:  # Allow empty lines or comments
+        return
+    if noqa:
+        return
+    line = logical_line
+    if line.startswith('import ') or line.startswith('from '):
+        if checker_state.get('seen_non_imports', False):
+            yield 0, "E402 module level import not at top of file"
+    elif any(line.startswith(kw) for kw in allowed_try_keywords):
+        # Allow try, except, else, finally keywords intermixed with imports in
+        # order to support conditional importing
+        return
+    elif is_string_literal(line):
+        # The first literal is a docstring, allow it. Otherwise, report error.
+        if checker_state.get('seen_docstring', False):
+            checker_state['seen_non_imports'] = True
+        else:
+            checker_state['seen_docstring'] = True
+    else:
+        checker_state['seen_non_imports'] = True
+
+
+def compound_statements(logical_line):
+    r"""Compound statements (on the same line) are generally discouraged.
+
+    While sometimes it's okay to put an if/for/while with a small body
+    on the same line, never do this for multi-clause statements.
+    Also avoid folding such long lines!
+
+    Always use a def statement instead of an assignment statement that
+    binds a lambda expression directly to a name.
+
+    Okay: if foo == 'blah':\n    do_blah_thing()
+    Okay: do_one()
+    Okay: do_two()
+    Okay: do_three()
+
+    E701: if foo == 'blah': do_blah_thing()
+    E701: for x in lst: total += x
+    E701: while t < 10: t = delay()
+    E701: if foo == 'blah': do_blah_thing()
+    E701: else: do_non_blah_thing()
+    E701: try: something()
+    E701: finally: cleanup()
+    E701: if foo == 'blah': one(); two(); three()
+    E702: do_one(); do_two(); do_three()
+    E703: do_four();  # useless semicolon
+    E704: def f(x): return 2*x
+    E731: f = lambda x: 2*x
+    """
+    line = logical_line
+    last_char = len(line) - 1
+    found = line.find(':')
+    while -1 < found < last_char:
+        before = line[:found]
+        if ((before.count('{') <= before.count('}') and   # {'a': 1} (dict)
+             before.count('[') <= before.count(']') and   # [1:2] (slice)
+             before.count('(') <= before.count(')'))):    # (annotation)
+            lambda_kw = LAMBDA_REGEX.search(before)
+            if lambda_kw:
+                before = line[:lambda_kw.start()].rstrip()
+                if before[-1:] == '=' and isidentifier(before[:-1].strip()):
+                    yield 0, ("E731 do not assign a lambda expression, use a "
+                              "def")
+                break
+            if before.startswith('def '):
+                yield 0, "E704 multiple statements on one line (def)"
+            else:
+                yield found, "E701 multiple statements on one line (colon)"
+        found = line.find(':', found + 1)
+    found = line.find(';')
+    while -1 < found:
+        if found < last_char:
+            yield found, "E702 multiple statements on one line (semicolon)"
+        else:
+            yield found, "E703 statement ends with a semicolon"
+        found = line.find(';', found + 1)
+
+
+def explicit_line_join(logical_line, tokens):
+    r"""Avoid explicit line join between brackets.
+
+    The preferred way of wrapping long lines is by using Python's implied line
+    continuation inside parentheses, brackets and braces.  Long lines can be
+    broken over multiple lines by wrapping expressions in parentheses.  These
+    should be used in preference to using a backslash for line continuation.
+
+    E502: aaa = [123, \\n       123]
+    E502: aaa = ("bbb " \\n       "ccc")
+
+    Okay: aaa = [123,\n       123]
+    Okay: aaa = ("bbb "\n       "ccc")
+    Okay: aaa = "bbb " \\n    "ccc"
+    Okay: aaa = 123  # \\
+    """
+    prev_start = prev_end = parens = 0
+    comment = False
+    backslash = None
+    for token_type, text, start, end, line in tokens:
+        if token_type == tokenize.COMMENT:
+            comment = True
+        if start[0] != prev_start and parens and backslash and not comment:
+            yield backslash, "E502 the backslash is redundant between brackets"
+        if end[0] != prev_end:
+            if line.rstrip('\r\n').endswith('\\'):
+                backslash = (end[0], len(line.splitlines()[-1]) - 1)
+            else:
+                backslash = None
+            prev_start = prev_end = end[0]
+        else:
+            prev_start = start[0]
+        if token_type == tokenize.OP:
+            if text in '([{':
+                parens += 1
+            elif text in ')]}':
+                parens -= 1
+
+
+def break_around_binary_operator(logical_line, tokens):
+    r"""
+    Avoid breaks before binary operators.
+
+    The preferred place to break around a binary operator is after the
+    operator, not before it.
+
+    W503: (width == 0\n + height == 0)
+    W503: (width == 0\n and height == 0)
+
+    Okay: (width == 0 +\n height == 0)
+    Okay: foo(\n    -x)
+    Okay: foo(x\n    [])
+    Okay: x = '''\n''' + ''
+    Okay: foo(x,\n    -y)
+    Okay: foo(x,  # comment\n    -y)
+    """
+    def is_binary_operator(token_type, text):
+        # The % character is strictly speaking a binary operator, but the
+        # common usage seems to be to put it next to the format parameters,
+        # after a line break.
+        return ((token_type == tokenize.OP or text in ['and', 'or']) and
+                text not in "()[]{},:.;@=%")
+
+    line_break = False
+    unary_context = True
+    for token_type, text, start, end, line in tokens:
+        if token_type == tokenize.COMMENT:
+            continue
+        if ('\n' in text or '\r' in text) and token_type != tokenize.STRING:
+            line_break = True
+        else:
+            if (is_binary_operator(token_type, text) and line_break and
+                    not unary_context):
+                yield start, "W503 line break before binary operator"
+            unary_context = text in '([{,;'
+            line_break = False
+
+
+def comparison_to_singleton(logical_line, noqa):
+    r"""Comparison to singletons should use "is" or "is not".
+
+    Comparisons to singletons like None should always be done
+    with "is" or "is not", never the equality operators.
+
+    Okay: if arg is not None:
+    E711: if arg != None:
+    E711: if None == arg:
+    E712: if arg == True:
+    E712: if False == arg:
+
+    Also, beware of writing if x when you really mean if x is not None --
+    e.g. when testing whether a variable or argument that defaults to None was
+    set to some other value.  The other value might have a type (such as a
+    container) that could be false in a boolean context!
+    """
+    match = not noqa and COMPARE_SINGLETON_REGEX.search(logical_line)
+    if match:
+        singleton = match.group(1) or match.group(3)
+        same = (match.group(2) == '==')
+
+        msg = "'if cond is %s:'" % (('' if same else 'not ') + singleton)
+        if singleton in ('None',):
+            code = 'E711'
+        else:
+            code = 'E712'
+            nonzero = ((singleton == 'True' and same) or
+                       (singleton == 'False' and not same))
+            msg += " or 'if %scond:'" % ('' if nonzero else 'not ')
+        yield match.start(2), ("%s comparison to %s should be %s" %
+                               (code, singleton, msg))
+
+
+def comparison_negative(logical_line):
+    r"""Negative comparison should be done using "not in" and "is not".
+
+    Okay: if x not in y:\n    pass
+    Okay: assert (X in Y or X is Z)
+    Okay: if not (X in Y):\n    pass
+    Okay: zz = x is not y
+    E713: Z = not X in Y
+    E713: if not X.B in Y:\n    pass
+    E714: if not X is Y:\n    pass
+    E714: Z = not X.B is Y
+    """
+    match = COMPARE_NEGATIVE_REGEX.search(logical_line)
+    if match:
+        pos = match.start(1)
+        if match.group(2) == 'in':
+            yield pos, "E713 test for membership should be 'not in'"
+        else:
+            yield pos, "E714 test for object identity should be 'is not'"
+
+
+def comparison_type(logical_line, noqa):
+    r"""Object type comparisons should always use isinstance().
+
+    Do not compare types directly.
+
+    Okay: if isinstance(obj, int):
+    E721: if type(obj) is type(1):
+
+    When checking if an object is a string, keep in mind that it might be a
+    unicode string too! In Python 2.3, str and unicode have a common base
+    class, basestring, so you can do:
+
+    Okay: if isinstance(obj, basestring):
+    Okay: if type(a1) is type(b1):
+    """
+    match = COMPARE_TYPE_REGEX.search(logical_line)
+    if match and not noqa:
+        inst = match.group(1)
+        if inst and isidentifier(inst) and inst not in SINGLETONS:
+            return  # Allow comparison for types which are not obvious
+        yield match.start(), "E721 do not compare types, use 'isinstance()'"
+
+
+def python_3000_has_key(logical_line, noqa):
+    r"""The {}.has_key() method is removed in Python 3: use the 'in' operator.
+
+    Okay: if "alph" in d:\n    print d["alph"]
+    W601: assert d.has_key('alph')
+    """
+    pos = logical_line.find('.has_key(')
+    if pos > -1 and not noqa:
+        yield pos, "W601 .has_key() is deprecated, use 'in'"
+
+
+def python_3000_raise_comma(logical_line):
+    r"""When raising an exception, use "raise ValueError('message')".
+
+    The older form is removed in Python 3.
+
+    Okay: raise DummyError("Message")
+    W602: raise DummyError, "Message"
+    """
+    match = RAISE_COMMA_REGEX.match(logical_line)
+    if match and not RERAISE_COMMA_REGEX.match(logical_line):
+        yield match.end() - 1, "W602 deprecated form of raising exception"
+
+
+def python_3000_not_equal(logical_line):
+    r"""New code should always use != instead of <>.
+
+    The older syntax is removed in Python 3.
+
+    Okay: if a != 'no':
+    W603: if a <> 'no':
+    """
+    pos = logical_line.find('<>')
+    if pos > -1:
+        yield pos, "W603 '<>' is deprecated, use '!='"
+
+
+def python_3000_backticks(logical_line):
+    r"""Backticks are removed in Python 3: use repr() instead.
+
+    Okay: val = repr(1 + 2)
+    W604: val = `1 + 2`
+    """
+    pos = logical_line.find('`')
+    if pos > -1:
+        yield pos, "W604 backticks are deprecated, use 'repr()'"
+
+
+##############################################################################
+# Helper functions
+##############################################################################
+
+
+if '' == ''.encode():
+    # Python 2: implicit encoding.
+    def readlines(filename):
+        """Read the source code."""
+        with open(filename, 'rU') as f:
+            return f.readlines()
+    isidentifier = re.compile(r'[a-zA-Z_]\w*$').match
+    stdin_get_value = sys.stdin.read
+else:
+    # Python 3
+    def readlines(filename):
+        """Read the source code."""
+        try:
+            with open(filename, 'rb') as f:
+                (coding, lines) = tokenize.detect_encoding(f.readline)
+                f = TextIOWrapper(f, coding, line_buffering=True)
+                return [l.decode(coding) for l in lines] + f.readlines()
+        except (LookupError, SyntaxError, UnicodeError):
+            # Fall back if file encoding is improperly declared
+            with open(filename, encoding='latin-1') as f:
+                return f.readlines()
+    isidentifier = str.isidentifier
+
+    def stdin_get_value():
+        return TextIOWrapper(sys.stdin.buffer, errors='ignore').read()
+noqa = re.compile(r'# no(?:qa|pep8)\b', re.I).search
+
+
+def expand_indent(line):
+    r"""Return the amount of indentation.
+
+    Tabs are expanded to the next multiple of 8.
+
+    >>> expand_indent('    ')
+    4
+    >>> expand_indent('\t')
+    8
+    >>> expand_indent('       \t')
+    8
+    >>> expand_indent('        \t')
+    16
+    """
+    if '\t' not in line:
+        return len(line) - len(line.lstrip())
+    result = 0
+    for char in line:
+        if char == '\t':
+            result = result // 8 * 8 + 8
+        elif char == ' ':
+            result += 1
+        else:
+            break
+    return result
+
+
+def mute_string(text):
+    """Replace contents with 'xxx' to prevent syntax matching.
+
+    >>> mute_string('"abc"')
+    '"xxx"'
+    >>> mute_string("'''abc'''")
+    "'''xxx'''"
+    >>> mute_string("r'abc'")
+    "r'xxx'"
+    """
+    # String modifiers (e.g. u or r)
+    start = text.index(text[-1]) + 1
+    end = len(text) - 1
+    # Triple quotes
+    if text[-3:] in ('"""', "'''"):
+        start += 2
+        end -= 2
+    return text[:start] + 'x' * (end - start) + text[end:]
+
+
+def parse_udiff(diff, patterns=None, parent='.'):
+    """Return a dictionary of matching lines."""
+    # For each file of the diff, the entry key is the filename,
+    # and the value is a set of row numbers to consider.
+    rv = {}
+    path = nrows = None
+    for line in diff.splitlines():
+        if nrows:
+            if line[:1] != '-':
+                nrows -= 1
+            continue
+        if line[:3] == '@@ ':
+            hunk_match = HUNK_REGEX.match(line)
+            (row, nrows) = [int(g or '1') for g in hunk_match.groups()]
+            rv[path].update(range(row, row + nrows))
+        elif line[:3] == '+++':
+            path = line[4:].split('\t', 1)[0]
+            if path[:2] == 'b/':
+                path = path[2:]
+            rv[path] = set()
+    return dict([(os.path.join(parent, path), rows)
+                 for (path, rows) in rv.items()
+                 if rows and filename_match(path, patterns)])
+
+
+def normalize_paths(value, parent=os.curdir):
+    """Parse a comma-separated list of paths.
+
+    Return a list of absolute paths.
+    """
+    if not value:
+        return []
+    if isinstance(value, list):
+        return value
+    paths = []
+    for path in value.split(','):
+        path = path.strip()
+        if '/' in path:
+            path = os.path.abspath(os.path.join(parent, path))
+        paths.append(path.rstrip('/'))
+    return paths
+
+
+def filename_match(filename, patterns, default=True):
+    """Check if patterns contains a pattern that matches filename.
+
+    If patterns is unspecified, this always returns True.
+    """
+    if not patterns:
+        return default
+    return any(fnmatch(filename, pattern) for pattern in patterns)
+
+
+def _is_eol_token(token):
+    return token[0] in NEWLINE or token[4][token[3][1]:].lstrip() == '\\\n'
+if COMMENT_WITH_NL:
+    def _is_eol_token(token, _eol_token=_is_eol_token):
+        return _eol_token(token) or (token[0] == tokenize.COMMENT and
+                                     token[1] == token[4])
+
+##############################################################################
+# Framework to run all checks
+##############################################################################
+
+
+_checks = {'physical_line': {}, 'logical_line': {}, 'tree': {}}
+
+
+def _get_parameters(function):
+    if sys.version_info >= (3, 3):
+        return list(inspect.signature(function).parameters)
+    else:
+        return inspect.getargspec(function)[0]
+
+
+def register_check(check, codes=None):
+    """Register a new check object."""
+    def _add_check(check, kind, codes, args):
+        if check in _checks[kind]:
+            _checks[kind][check][0].extend(codes or [])
+        else:
+            _checks[kind][check] = (codes or [''], args)
+    if inspect.isfunction(check):
+        args = _get_parameters(check)
+        if args and args[0] in ('physical_line', 'logical_line'):
+            if codes is None:
+                codes = ERRORCODE_REGEX.findall(check.__doc__ or '')
+            _add_check(check, args[0], codes, args)
+    elif inspect.isclass(check):
+        if _get_parameters(check.__init__)[:2] == ['self', 'tree']:
+            _add_check(check, 'tree', codes, None)
+
+
+def init_checks_registry():
+    """Register all globally visible functions.
+
+    The first argument name is either 'physical_line' or 'logical_line'.
+    """
+    mod = inspect.getmodule(register_check)
+    for (name, function) in inspect.getmembers(mod, inspect.isfunction):
+        register_check(function)
+init_checks_registry()
+
+
+class Checker(object):
+    """Load a Python source file, tokenize it, check coding style."""
+
+    def __init__(self, filename=None, lines=None,
+                 options=None, report=None, **kwargs):
+        if options is None:
+            options = StyleGuide(kwargs).options
+        else:
+            assert not kwargs
+        self._io_error = None
+        self._physical_checks = options.physical_checks
+        self._logical_checks = options.logical_checks
+        self._ast_checks = options.ast_checks
+        self.max_line_length = options.max_line_length
+        self.multiline = False  # in a multiline string?
+        self.hang_closing = options.hang_closing
+        self.verbose = options.verbose
+        self.filename = filename
+        # Dictionary where a checker can store its custom state.
+        self._checker_states = {}
+        if filename is None:
+            self.filename = 'stdin'
+            self.lines = lines or []
+        elif filename == '-':
+            self.filename = 'stdin'
+            self.lines = stdin_get_value().splitlines(True)
+        elif lines is None:
+            try:
+                self.lines = readlines(filename)
+            except IOError:
+                (exc_type, exc) = sys.exc_info()[:2]
+                self._io_error = '%s: %s' % (exc_type.__name__, exc)
+                self.lines = []
+        else:
+            self.lines = lines
+        if self.lines:
+            ord0 = ord(self.lines[0][0])
+            if ord0 in (0xef, 0xfeff):  # Strip the UTF-8 BOM
+                if ord0 == 0xfeff:
+                    self.lines[0] = self.lines[0][1:]
+                elif self.lines[0][:3] == '\xef\xbb\xbf':
+                    self.lines[0] = self.lines[0][3:]
+        self.report = report or options.report
+        self.report_error = self.report.error
+
+    def report_invalid_syntax(self):
+        """Check if the syntax is valid."""
+        (exc_type, exc) = sys.exc_info()[:2]
+        if len(exc.args) > 1:
+            offset = exc.args[1]
+            if len(offset) > 2:
+                offset = offset[1:3]
+        else:
+            offset = (1, 0)
+        self.report_error(offset[0], offset[1] or 0,
+                          'E901 %s: %s' % (exc_type.__name__, exc.args[0]),
+                          self.report_invalid_syntax)
+
+    def readline(self):
+        """Get the next line from the input buffer."""
+        if self.line_number >= self.total_lines:
+            return ''
+        line = self.lines[self.line_number]
+        self.line_number += 1
+        if self.indent_char is None and line[:1] in WHITESPACE:
+            self.indent_char = line[0]
+        return line
+
+    def run_check(self, check, argument_names):
+        """Run a check plugin."""
+        arguments = []
+        for name in argument_names:
+            arguments.append(getattr(self, name))
+        return check(*arguments)
+
+    def init_checker_state(self, name, argument_names):
+        """ Prepares a custom state for the specific checker plugin."""
+        if 'checker_state' in argument_names:
+            self.checker_state = self._checker_states.setdefault(name, {})
+
+    def check_physical(self, line):
+        """Run all physical checks on a raw input line."""
+        self.physical_line = line
+        for name, check, argument_names in self._physical_checks:
+            self.init_checker_state(name, argument_names)
+            result = self.run_check(check, argument_names)
+            if result is not None:
+                (offset, text) = result
+                self.report_error(self.line_number, offset, text, check)
+                if text[:4] == 'E101':
+                    self.indent_char = line[0]
+
+    def build_tokens_line(self):
+        """Build a logical line from tokens."""
+        logical = []
+        comments = []
+        length = 0
+        prev_row = prev_col = mapping = None
+        for token_type, text, start, end, line in self.tokens:
+            if token_type in SKIP_TOKENS:
+                continue
+            if not mapping:
+                mapping = [(0, start)]
+            if token_type == tokenize.COMMENT:
+                comments.append(text)
+                continue
+            if token_type == tokenize.STRING:
+                text = mute_string(text)
+            if prev_row:
+                (start_row, start_col) = start
+                if prev_row != start_row:    # different row
+                    prev_text = self.lines[prev_row - 1][prev_col - 1]
+                    if prev_text == ',' or (prev_text not in '{[(' and
+                                            text not in '}])'):
+                        text = ' ' + text
+                elif prev_col != start_col:  # different column
+                    text = line[prev_col:start_col] + text
+            logical.append(text)
+            length += len(text)
+            mapping.append((length, end))
+            (prev_row, prev_col) = end
+        self.logical_line = ''.join(logical)
+        self.noqa = comments and noqa(''.join(comments))
+        return mapping
+
+    def check_logical(self):
+        """Build a line from tokens and run all logical checks on it."""
+        self.report.increment_logical_line()
+        mapping = self.build_tokens_line()
+
+        if not mapping:
+            return
+
+        (start_row, start_col) = mapping[0][1]
+        start_line = self.lines[start_row - 1]
+        self.indent_level = expand_indent(start_line[:start_col])
+        if self.blank_before < self.blank_lines:
+            self.blank_before = self.blank_lines
+        if self.verbose >= 2:
+            print(self.logical_line[:80].rstrip())
+        for name, check, argument_names in self._logical_checks:
+            if self.verbose >= 4:
+                print('   ' + name)
+            self.init_checker_state(name, argument_names)
+            for offset, text in self.run_check(check, argument_names) or ():
+                if not isinstance(offset, tuple):
+                    for token_offset, pos in mapping:
+                        if offset <= token_offset:
+                            break
+                    offset = (pos[0], pos[1] + offset - token_offset)
+                self.report_error(offset[0], offset[1], text, check)
+        if self.logical_line:
+            self.previous_indent_level = self.indent_level
+            self.previous_logical = self.logical_line
+        self.blank_lines = 0
+        self.tokens = []
+
+    def check_ast(self):
+        """Build the file's AST and run all AST checks."""
+        try:
+            tree = compile(''.join(self.lines), '', 'exec', PyCF_ONLY_AST)
+        except (ValueError, SyntaxError, TypeError):
+            return self.report_invalid_syntax()
+        for name, cls, __ in self._ast_checks:
+            checker = cls(tree, self.filename)
+            for lineno, offset, text, check in checker.run():
+                if not self.lines or not noqa(self.lines[lineno - 1]):
+                    self.report_error(lineno, offset, text, check)
+
+    def generate_tokens(self):
+        """Tokenize the file, run physical line checks and yield tokens."""
+        if self._io_error:
+            self.report_error(1, 0, 'E902 %s' % self._io_error, readlines)
+        tokengen = tokenize.generate_tokens(self.readline)
+        try:
+            for token in tokengen:
+                if token[2][0] > self.total_lines:
+                    return
+                self.maybe_check_physical(token)
+                yield token
+        except (SyntaxError, tokenize.TokenError):
+            self.report_invalid_syntax()
+
+    def maybe_check_physical(self, token):
+        """If appropriate (based on token), check current physical line(s)."""
+        # Called after every token, but act only on end of line.
+        if _is_eol_token(token):
+            # Obviously, a newline token ends a single physical line.
+            self.check_physical(token[4])
+        elif token[0] == tokenize.STRING and '\n' in token[1]:
+            # Less obviously, a string that contains newlines is a
+            # multiline string, either triple-quoted or with internal
+            # newlines backslash-escaped. Check every physical line in the
+            # string *except* for the last one: its newline is outside of
+            # the multiline string, so we consider it a regular physical
+            # line, and will check it like any other physical line.
+            #
+            # Subtleties:
+            # - we don't *completely* ignore the last line; if it contains
+            #   the magical "# noqa" comment, we disable all physical
+            #   checks for the entire multiline string
+            # - have to wind self.line_number back because initially it
+            #   points to the last line of the string, and we want
+            #   check_physical() to give accurate feedback
+            if noqa(token[4]):
+                return
+            self.multiline = True
+            self.line_number = token[2][0]
+            for line in token[1].split('\n')[:-1]:
+                self.check_physical(line + '\n')
+                self.line_number += 1
+            self.multiline = False
+
+    def check_all(self, expected=None, line_offset=0):
+        """Run all checks on the input file."""
+        self.report.init_file(self.filename, self.lines, expected, line_offset)
+        self.total_lines = len(self.lines)
+        if self._ast_checks:
+            self.check_ast()
+        self.line_number = 0
+        self.indent_char = None
+        self.indent_level = self.previous_indent_level = 0
+        self.previous_logical = ''
+        self.tokens = []
+        self.blank_lines = self.blank_before = 0
+        parens = 0
+        for token in self.generate_tokens():
+            self.tokens.append(token)
+            token_type, text = token[0:2]
+            if self.verbose >= 3:
+                if token[2][0] == token[3][0]:
+                    pos = '[%s:%s]' % (token[2][1] or '', token[3][1])
+                else:
+                    pos = 'l.%s' % token[3][0]
+                print('l.%s\t%s\t%s\t%r' %
+                      (token[2][0], pos, tokenize.tok_name[token[0]], text))
+            if token_type == tokenize.OP:
+                if text in '([{':
+                    parens += 1
+                elif text in '}])':
+                    parens -= 1
+            elif not parens:
+                if token_type in NEWLINE:
+                    if token_type == tokenize.NEWLINE:
+                        self.check_logical()
+                        self.blank_before = 0
+                    elif len(self.tokens) == 1:
+                        # The physical line contains only this token.
+                        self.blank_lines += 1
+                        del self.tokens[0]
+                    else:
+                        self.check_logical()
+                elif COMMENT_WITH_NL and token_type == tokenize.COMMENT:
+                    if len(self.tokens) == 1:
+                        # The comment also ends a physical line
+                        token = list(token)
+                        token[1] = text.rstrip('\r\n')
+                        token[3] = (token[2][0], token[2][1] + len(token[1]))
+                        self.tokens = [tuple(token)]
+                        self.check_logical()
+        if self.tokens:
+            self.check_physical(self.lines[-1])
+            self.check_logical()
+        return self.report.get_file_results()
+
+
+class BaseReport(object):
+    """Collect the results of the checks."""
+
+    print_filename = False
+
+    def __init__(self, options):
+        self._benchmark_keys = options.benchmark_keys
+        self._ignore_code = options.ignore_code
+        # Results
+        self.elapsed = 0
+        self.total_errors = 0
+        self.counters = dict.fromkeys(self._benchmark_keys, 0)
+        self.messages = {}
+
+    def start(self):
+        """Start the timer."""
+        self._start_time = time.time()
+
+    def stop(self):
+        """Stop the timer."""
+        self.elapsed = time.time() - self._start_time
+
+    def init_file(self, filename, lines, expected, line_offset):
+        """Signal a new file."""
+        self.filename = filename
+        self.lines = lines
+        self.expected = expected or ()
+        self.line_offset = line_offset
+        self.file_errors = 0
+        self.counters['files'] += 1
+        self.counters['physical lines'] += len(lines)
+
+    def increment_logical_line(self):
+        """Signal a new logical line."""
+        self.counters['logical lines'] += 1
+
+    def error(self, line_number, offset, text, check):
+        """Report an error, according to options."""
+        code = text[:4]
+        if self._ignore_code(code):
+            return
+        if code in self.counters:
+            self.counters[code] += 1
+        else:
+            self.counters[code] = 1
+            self.messages[code] = text[5:]
+        # Don't care about expected errors or warnings
+        if code in self.expected:
+            return
+        if self.print_filename and not self.file_errors:
+            print(self.filename)
+        self.file_errors += 1
+        self.total_errors += 1
+        return code
+
+    def get_file_results(self):
+        """Return the count of errors and warnings for this file."""
+        return self.file_errors
+
+    def get_count(self, prefix=''):
+        """Return the total count of errors and warnings."""
+        return sum([self.counters[key]
+                    for key in self.messages if key.startswith(prefix)])
+
+    def get_statistics(self, prefix=''):
+        """Get statistics for message codes that start with the prefix.
+
+        prefix='' matches all errors and warnings
+        prefix='E' matches all errors
+        prefix='W' matches all warnings
+        prefix='E4' matches all errors that have to do with imports
+        """
+        return ['%-7s %s %s' % (self.counters[key], key, self.messages[key])
+                for key in sorted(self.messages) if key.startswith(prefix)]
+
+    def print_statistics(self, prefix=''):
+        """Print overall statistics (number of errors and warnings)."""
+        for line in self.get_statistics(prefix):
+            print(line)
+
+    def print_benchmark(self):
+        """Print benchmark numbers."""
+        print('%-7.2f %s' % (self.elapsed, 'seconds elapsed'))
+        if self.elapsed:
+            for key in self._benchmark_keys:
+                print('%-7d %s per second (%d total)' %
+                      (self.counters[key] / self.elapsed, key,
+                       self.counters[key]))
+
+
+class FileReport(BaseReport):
+    """Collect the results of the checks and print only the filenames."""
+    print_filename = True
+
+
+class StandardReport(BaseReport):
+    """Collect and print the results of the checks."""
+
+    def __init__(self, options):
+        super(StandardReport, self).__init__(options)
+        self._fmt = REPORT_FORMAT.get(options.format.lower(),
+                                      options.format)
+        self._repeat = options.repeat
+        self._show_source = options.show_source
+        self._show_pep8 = options.show_pep8
+
+    def init_file(self, filename, lines, expected, line_offset):
+        """Signal a new file."""
+        self._deferred_print = []
+        return super(StandardReport, self).init_file(
+            filename, lines, expected, line_offset)
+
+    def error(self, line_number, offset, text, check):
+        """Report an error, according to options."""
+        code = super(StandardReport, self).error(line_number, offset,
+                                                 text, check)
+        if code and (self.counters[code] == 1 or self._repeat):
+            self._deferred_print.append(
+                (line_number, offset, code, text[5:], check.__doc__))
+        return code
+
+    def get_file_results(self):
+        """Print the result and return the overall count for this file."""
+        self._deferred_print.sort()
+        for line_number, offset, code, text, doc in self._deferred_print:
+            print(self._fmt % {
+                'path': self.filename,
+                'row': self.line_offset + line_number, 'col': offset + 1,
+                'code': code, 'text': text,
+            })
+            if self._show_source:
+                if line_number > len(self.lines):
+                    line = ''
+                else:
+                    line = self.lines[line_number - 1]
+                print(line.rstrip())
+                print(re.sub(r'\S', ' ', line[:offset]) + '^')
+            if self._show_pep8 and doc:
+                print('    ' + doc.strip())
+
+            # stdout is block buffered when not stdout.isatty().
+            # line can be broken where buffer boundary since other processes
+            # write to same file.
+            # flush() after print() to avoid buffer boundary.
+            # Typical buffer size is 8192. line written safely when
+            # len(line) < 8192.
+            sys.stdout.flush()
+        return self.file_errors
+
+
+class DiffReport(StandardReport):
+    """Collect and print the results for the changed lines only."""
+
+    def __init__(self, options):
+        super(DiffReport, self).__init__(options)
+        self._selected = options.selected_lines
+
+    def error(self, line_number, offset, text, check):
+        if line_number not in self._selected[self.filename]:
+            return
+        return super(DiffReport, self).error(line_number, offset, text, check)
+
+
+class StyleGuide(object):
+    """Initialize a PEP-8 instance with few options."""
+
+    def __init__(self, *args, **kwargs):
+        # build options from the command line
+        self.checker_class = kwargs.pop('checker_class', Checker)
+        parse_argv = kwargs.pop('parse_argv', False)
+        config_file = kwargs.pop('config_file', False)
+        parser = kwargs.pop('parser', None)
+        # build options from dict
+        options_dict = dict(*args, **kwargs)
+        arglist = None if parse_argv else options_dict.get('paths', None)
+        options, self.paths = process_options(
+            arglist, parse_argv, config_file, parser)
+        if options_dict:
+            options.__dict__.update(options_dict)
+            if 'paths' in options_dict:
+                self.paths = options_dict['paths']
+
+        self.runner = self.input_file
+        self.options = options
+
+        if not options.reporter:
+            options.reporter = BaseReport if options.quiet else StandardReport
+
+        options.select = tuple(options.select or ())
+        if not (options.select or options.ignore or
+                options.testsuite or options.doctest) and DEFAULT_IGNORE:
+            # The default choice: ignore controversial checks
+            options.ignore = tuple(DEFAULT_IGNORE.split(','))
+        else:
+            # Ignore all checks which are not explicitly selected
+            options.ignore = ('',) if options.select else tuple(options.ignore)
+        options.benchmark_keys = BENCHMARK_KEYS[:]
+        options.ignore_code = self.ignore_code
+        options.physical_checks = self.get_checks('physical_line')
+        options.logical_checks = self.get_checks('logical_line')
+        options.ast_checks = self.get_checks('tree')
+        self.init_report()
+
+    def init_report(self, reporter=None):
+        """Initialize the report instance."""
+        self.options.report = (reporter or self.options.reporter)(self.options)
+        return self.options.report
+
+    def check_files(self, paths=None):
+        """Run all checks on the paths."""
+        if paths is None:
+            paths = self.paths
+        report = self.options.report
+        runner = self.runner
+        report.start()
+        try:
+            for path in paths:
+                if os.path.isdir(path):
+                    self.input_dir(path)
+                elif not self.excluded(path):
+                    runner(path)
+        except KeyboardInterrupt:
+            print('... stopped')
+        report.stop()
+        return report
+
+    def input_file(self, filename, lines=None, expected=None, line_offset=0):
+        """Run all checks on a Python source file."""
+        if self.options.verbose:
+            print('checking %s' % filename)
+        fchecker = self.checker_class(
+            filename, lines=lines, options=self.options)
+        return fchecker.check_all(expected=expected, line_offset=line_offset)
+
+    def input_dir(self, dirname):
+        """Check all files in this directory and all subdirectories."""
+        dirname = dirname.rstrip('/')
+        if self.excluded(dirname):
+            return 0
+        counters = self.options.report.counters
+        verbose = self.options.verbose
+        filepatterns = self.options.filename
+        runner = self.runner
+        for root, dirs, files in os.walk(dirname):
+            if verbose:
+                print('directory ' + root)
+            counters['directories'] += 1
+            for subdir in sorted(dirs):
+                if self.excluded(subdir, root):
+                    dirs.remove(subdir)
+            for filename in sorted(files):
+                # contain a pattern that matches?
+                if ((filename_match(filename, filepatterns) and
+                     not self.excluded(filename, root))):
+                    runner(os.path.join(root, filename))
+
+    def excluded(self, filename, parent=None):
+        """Check if the file should be excluded.
+
+        Check if 'options.exclude' contains a pattern that matches filename.
+        """
+        if not self.options.exclude:
+            return False
+        basename = os.path.basename(filename)
+        if filename_match(basename, self.options.exclude):
+            return True
+        if parent:
+            filename = os.path.join(parent, filename)
+        filename = os.path.abspath(filename)
+        return filename_match(filename, self.options.exclude)
+
+    def ignore_code(self, code):
+        """Check if the error code should be ignored.
+
+        If 'options.select' contains a prefix of the error code,
+        return False.  Else, if 'options.ignore' contains a prefix of
+        the error code, return True.
+        """
+        if len(code) < 4 and any(s.startswith(code)
+                                 for s in self.options.select):
+            return False
+        return (code.startswith(self.options.ignore) and
+                not code.startswith(self.options.select))
+
+    def get_checks(self, argument_name):
+        """Get all the checks for this category.
+
+        Find all globally visible functions where the first argument name
+        starts with argument_name and which contain selected tests.
+        """
+        checks = []
+        for check, attrs in _checks[argument_name].items():
+            (codes, args) = attrs
+            if any(not (code and self.ignore_code(code)) for code in codes):
+                checks.append((check.__name__, check, args))
+        return sorted(checks)
+
+
+def get_parser(prog='pep8', version=__version__):
+    parser = OptionParser(prog=prog, version=version,
+                          usage="%prog [options] input ...")
+    parser.config_options = [
+        'exclude', 'filename', 'select', 'ignore', 'max-line-length',
+        'hang-closing', 'count', 'format', 'quiet', 'show-pep8',
+        'show-source', 'statistics', 'verbose']
+    parser.add_option('-v', '--verbose', default=0, action='count',
+                      help="print status messages, or debug with -vv")
+    parser.add_option('-q', '--quiet', default=0, action='count',
+                      help="report only file names, or nothing with -qq")
+    parser.add_option('-r', '--repeat', default=True, action='store_true',
+                      help="(obsolete) show all occurrences of the same error")
+    parser.add_option('--first', action='store_false', dest='repeat',
+                      help="show first occurrence of each error")
+    parser.add_option('--exclude', metavar='patterns', default=DEFAULT_EXCLUDE,
+                      help="exclude files or directories which match these "
+                           "comma separated patterns (default: %default)")
+    parser.add_option('--filename', metavar='patterns', default='*.py',
+                      help="when parsing directories, only check filenames "
+                           "matching these comma separated patterns "
+                           "(default: %default)")
+    parser.add_option('--select', metavar='errors', default='',
+                      help="select errors and warnings (e.g. E,W6)")
+    parser.add_option('--ignore', metavar='errors', default='',
+                      help="skip errors and warnings (e.g. E4,W) "
+                           "(default: %s)" % DEFAULT_IGNORE)
+    parser.add_option('--show-source', action='store_true',
+                      help="show source code for each error")
+    parser.add_option('--show-pep8', action='store_true',
+                      help="show text of PEP 8 for each error "
+                           "(implies --first)")
+    parser.add_option('--statistics', action='store_true',
+                      help="count errors and warnings")
+    parser.add_option('--count', action='store_true',
+                      help="print total number of errors and warnings "
+                           "to standard error and set exit code to 1 if "
+                           "total is not null")
+    parser.add_option('--max-line-length', type='int', metavar='n',
+                      default=MAX_LINE_LENGTH,
+                      help="set maximum allowed line length "
+                           "(default: %default)")
+    parser.add_option('--hang-closing', action='store_true',
+                      help="hang closing bracket instead of matching "
+                           "indentation of opening bracket's line")
+    parser.add_option('--format', metavar='format', default='default',
+                      help="set the error format [default|pylint|<custom>]")
+    parser.add_option('--diff', action='store_true',
+                      help="report only lines changed according to the "
+                           "unified diff received on STDIN")
+    group = parser.add_option_group("Testing Options")
+    if os.path.exists(TESTSUITE_PATH):
+        group.add_option('--testsuite', metavar='dir',
+                         help="run regression tests from dir")
+        group.add_option('--doctest', action='store_true',
+                         help="run doctest on myself")
+    group.add_option('--benchmark', action='store_true',
+                     help="measure processing speed")
+    return parser
+
+
+def read_config(options, args, arglist, parser):
+    """Read and parse configurations
+
+    If a config file is specified on the command line with the "--config"
+    option, then only it is used for configuration.
+
+    Otherwise, the user configuration (~/.config/pep8) and any local
+    configurations in the current directory or above will be merged together
+    (in that order) using the read method of ConfigParser.
+    """
+    config = RawConfigParser()
+
+    cli_conf = options.config
+
+    local_dir = os.curdir
+
+    if USER_CONFIG and os.path.isfile(USER_CONFIG):
+        if options.verbose:
+            print('user configuration: %s' % USER_CONFIG)
+        config.read(USER_CONFIG)
+
+    parent = tail = args and os.path.abspath(os.path.commonprefix(args))
+    while tail:
+        if config.read(os.path.join(parent, fn) for fn in PROJECT_CONFIG):
+            local_dir = parent
+            if options.verbose:
+                print('local configuration: in %s' % parent)
+            break
+        (parent, tail) = os.path.split(parent)
+
+    if cli_conf and os.path.isfile(cli_conf):
+        if options.verbose:
+            print('cli configuration: %s' % cli_conf)
+        config.read(cli_conf)
+
+    pep8_section = parser.prog
+    if config.has_section(pep8_section):
+        option_list = dict([(o.dest, o.type or o.action)
+                            for o in parser.option_list])
+
+        # First, read the default values
+        (new_options, __) = parser.parse_args([])
+
+        # Second, parse the configuration
+        for opt in config.options(pep8_section):
+            if opt.replace('_', '-') not in parser.config_options:
+                print("  unknown option '%s' ignored" % opt)
+                continue
+            if options.verbose > 1:
+                print("  %s = %s" % (opt, config.get(pep8_section, opt)))
+            normalized_opt = opt.replace('-', '_')
+            opt_type = option_list[normalized_opt]
+            if opt_type in ('int', 'count'):
+                value = config.getint(pep8_section, opt)
+            elif opt_type == 'string':
+                value = config.get(pep8_section, opt)
+                if normalized_opt == 'exclude':
+                    value = normalize_paths(value, local_dir)
+            else:
+                assert opt_type in ('store_true', 'store_false')
+                value = config.getboolean(pep8_section, opt)
+            setattr(new_options, normalized_opt, value)
+
+        # Third, overwrite with the command-line options
+        (options, __) = parser.parse_args(arglist, values=new_options)
+    options.doctest = options.testsuite = False
+    return options
+
+
+def process_options(arglist=None, parse_argv=False, config_file=None,
+                    parser=None):
+    """Process options passed either via arglist or via command line args.
+
+    Passing in the ``config_file`` parameter allows other tools, such as flake8
+    to specify their own options to be processed in pep8.
+    """
+    if not parser:
+        parser = get_parser()
+    if not parser.has_option('--config'):
+        group = parser.add_option_group("Configuration", description=(
+            "The project options are read from the [%s] section of the "
+            "tox.ini file or the setup.cfg file located in any parent folder "
+            "of the path(s) being processed.  Allowed options are: %s." %
+            (parser.prog, ', '.join(parser.config_options))))
+        group.add_option('--config', metavar='path', default=config_file,
+                         help="user config file location")
+    # Don't read the command line if the module is used as a library.
+    if not arglist and not parse_argv:
+        arglist = []
+    # If parse_argv is True and arglist is None, arguments are
+    # parsed from the command line (sys.argv)
+    (options, args) = parser.parse_args(arglist)
+    options.reporter = None
+
+    if options.ensure_value('testsuite', False):
+        args.append(options.testsuite)
+    elif not options.ensure_value('doctest', False):
+        if parse_argv and not args:
+            if options.diff or any(os.path.exists(name)
+                                   for name in PROJECT_CONFIG):
+                args = ['.']
+            else:
+                parser.error('input not specified')
+        options = read_config(options, args, arglist, parser)
+        options.reporter = parse_argv and options.quiet == 1 and FileReport
+
+    options.filename = options.filename and options.filename.split(',')
+    options.exclude = normalize_paths(options.exclude)
+    options.select = options.select and options.select.split(',')
+    options.ignore = options.ignore and options.ignore.split(',')
+
+    if options.diff:
+        options.reporter = DiffReport
+        stdin = stdin_get_value()
+        options.selected_lines = parse_udiff(stdin, options.filename, args[0])
+        args = sorted(options.selected_lines)
+
+    return options, args
+
+
+def _main():
+    """Parse options and run checks on Python source."""
+    import signal
+
+    # Handle "Broken pipe" gracefully
+    try:
+        signal.signal(signal.SIGPIPE, lambda signum, frame: sys.exit(1))
+    except AttributeError:
+        pass    # not supported on Windows
+
+    pep8style = StyleGuide(parse_argv=True)
+    options = pep8style.options
+    if options.doctest or options.testsuite:
+        from testsuite.support import run_tests
+        report = run_tests(pep8style)
+    else:
+        report = pep8style.check_files()
+    if options.statistics:
+        report.print_statistics()
+    if options.benchmark:
+        report.print_benchmark()
+    if options.testsuite and not options.quiet:
+        report.print_results()
+    if report.total_errors:
+        if options.count:
+            sys.stderr.write(str(report.total_errors) + '\n')
+        sys.exit(1)
+
+if __name__ == '__main__':
+    _main()
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/__init__.py
new file mode 100644
index 0000000..42ddcf7
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/__init__.py
@@ -0,0 +1,3113 @@
+"""
+Package resource API
+--------------------
+
+A resource is a logical file contained within a package, or a logical
+subdirectory thereof.  The package resource API expects resource names
+to have their path parts separated with ``/``, *not* whatever the local
+path separator is.  Do not use os.path operations to manipulate resource
+names being passed into the API.
+
+The package resource API is designed to work with normal filesystem packages,
+.egg files, and unpacked .egg files.  It can also work in a limited way with
+.zip files and with custom PEP 302 loaders that support the ``get_data()``
+method.
+"""
+
+from __future__ import absolute_import
+
+import sys
+import os
+import io
+import time
+import re
+import types
+import zipfile
+import zipimport
+import warnings
+import stat
+import functools
+import pkgutil
+import token
+import symbol
+import operator
+import platform
+import collections
+import plistlib
+import email.parser
+import tempfile
+import textwrap
+from pkgutil import get_importer
+
+try:
+    import _imp
+except ImportError:
+    # Python 3.2 compatibility
+    import imp as _imp
+
+PY3 = sys.version_info > (3,)
+PY2 = not PY3
+
+if PY3:
+    from urllib.parse import urlparse, urlunparse
+
+if PY2:
+    from urlparse import urlparse, urlunparse
+
+if PY3:
+    string_types = str,
+else:
+    string_types = str, eval('unicode')
+
+iteritems = (lambda i: i.items()) if PY3 else lambda i: i.iteritems()
+
+# capture these to bypass sandboxing
+from os import utime
+try:
+    from os import mkdir, rename, unlink
+    WRITE_SUPPORT = True
+except ImportError:
+    # no write support, probably under GAE
+    WRITE_SUPPORT = False
+
+from os import open as os_open
+from os.path import isdir, split
+
+# Avoid try/except due to potential problems with delayed import mechanisms.
+if sys.version_info >= (3, 3) and sys.implementation.name == "cpython":
+    import importlib.machinery as importlib_machinery
+else:
+    importlib_machinery = None
+
+try:
+    import parser
+except ImportError:
+    pass
+
+try:
+    import pkg_resources._vendor.packaging.version
+    import pkg_resources._vendor.packaging.specifiers
+    packaging = pkg_resources._vendor.packaging
+except ImportError:
+    # fallback to naturally-installed version; allows system packagers to
+    #  omit vendored packages.
+    import packaging.version
+    import packaging.specifiers
+
+
+# declare some globals that will be defined later to
+# satisfy the linters.
+require = None
+working_set = None
+
+
+class PEP440Warning(RuntimeWarning):
+    """
+    Used when there is an issue with a version or specifier not complying with
+    PEP 440.
+    """
+
+
+class _SetuptoolsVersionMixin(object):
+
+    def __hash__(self):
+        return super(_SetuptoolsVersionMixin, self).__hash__()
+
+    def __lt__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) < other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__lt__(other)
+
+    def __le__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) <= other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__le__(other)
+
+    def __eq__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) == other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__eq__(other)
+
+    def __ge__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) >= other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__ge__(other)
+
+    def __gt__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) > other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__gt__(other)
+
+    def __ne__(self, other):
+        if isinstance(other, tuple):
+            return tuple(self) != other
+        else:
+            return super(_SetuptoolsVersionMixin, self).__ne__(other)
+
+    def __getitem__(self, key):
+        return tuple(self)[key]
+
+    def __iter__(self):
+        component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE)
+        replace = {
+            'pre': 'c',
+            'preview': 'c',
+            '-': 'final-',
+            'rc': 'c',
+            'dev': '@',
+        }.get
+
+        def _parse_version_parts(s):
+            for part in component_re.split(s):
+                part = replace(part, part)
+                if not part or part == '.':
+                    continue
+                if part[:1] in '0123456789':
+                    # pad for numeric comparison
+                    yield part.zfill(8)
+                else:
+                    yield '*'+part
+
+            # ensure that alpha/beta/candidate are before final
+            yield '*final'
+
+        def old_parse_version(s):
+            parts = []
+            for part in _parse_version_parts(s.lower()):
+                if part.startswith('*'):
+                    # remove '-' before a prerelease tag
+                    if part < '*final':
+                        while parts and parts[-1] == '*final-':
+                            parts.pop()
+                    # remove trailing zeros from each series of numeric parts
+                    while parts and parts[-1] == '00000000':
+                        parts.pop()
+                parts.append(part)
+            return tuple(parts)
+
+        # Warn for use of this function
+        warnings.warn(
+            "You have iterated over the result of "
+            "pkg_resources.parse_version. This is a legacy behavior which is "
+            "inconsistent with the new version class introduced in setuptools "
+            "8.0. In most cases, conversion to a tuple is unnecessary. For "
+            "comparison of versions, sort the Version instances directly. If "
+            "you have another use case requiring the tuple, please file a "
+            "bug with the setuptools project describing that need.",
+            RuntimeWarning,
+            stacklevel=1,
+        )
+
+        for part in old_parse_version(str(self)):
+            yield part
+
+
+class SetuptoolsVersion(_SetuptoolsVersionMixin, packaging.version.Version):
+    pass
+
+
+class SetuptoolsLegacyVersion(_SetuptoolsVersionMixin,
+                              packaging.version.LegacyVersion):
+    pass
+
+
+def parse_version(v):
+    try:
+        return SetuptoolsVersion(v)
+    except packaging.version.InvalidVersion:
+        return SetuptoolsLegacyVersion(v)
+
+
+_state_vars = {}
+
+def _declare_state(vartype, **kw):
+    globals().update(kw)
+    _state_vars.update(dict.fromkeys(kw, vartype))
+
+def __getstate__():
+    state = {}
+    g = globals()
+    for k, v in _state_vars.items():
+        state[k] = g['_sget_'+v](g[k])
+    return state
+
+def __setstate__(state):
+    g = globals()
+    for k, v in state.items():
+        g['_sset_'+_state_vars[k]](k, g[k], v)
+    return state
+
+def _sget_dict(val):
+    return val.copy()
+
+def _sset_dict(key, ob, state):
+    ob.clear()
+    ob.update(state)
+
+def _sget_object(val):
+    return val.__getstate__()
+
+def _sset_object(key, ob, state):
+    ob.__setstate__(state)
+
+_sget_none = _sset_none = lambda *args: None
+
+
+def get_supported_platform():
+    """Return this platform's maximum compatible version.
+
+    distutils.util.get_platform() normally reports the minimum version
+    of Mac OS X that would be required to *use* extensions produced by
+    distutils.  But what we want when checking compatibility is to know the
+    version of Mac OS X that we are *running*.  To allow usage of packages that
+    explicitly require a newer version of Mac OS X, we must also know the
+    current version of the OS.
+
+    If this condition occurs for any other platform with a version in its
+    platform strings, this function should be extended accordingly.
+    """
+    plat = get_build_platform()
+    m = macosVersionString.match(plat)
+    if m is not None and sys.platform == "darwin":
+        try:
+            plat = 'macosx-%s-%s' % ('.'.join(_macosx_vers()[:2]), m.group(3))
+        except ValueError:
+            # not Mac OS X
+            pass
+    return plat
+
+__all__ = [
+    # Basic resource access and distribution/entry point discovery
+    'require', 'run_script', 'get_provider',  'get_distribution',
+    'load_entry_point', 'get_entry_map', 'get_entry_info',
+    'iter_entry_points',
+    'resource_string', 'resource_stream', 'resource_filename',
+    'resource_listdir', 'resource_exists', 'resource_isdir',
+
+    # Environmental control
+    'declare_namespace', 'working_set', 'add_activation_listener',
+    'find_distributions', 'set_extraction_path', 'cleanup_resources',
+    'get_default_cache',
+
+    # Primary implementation classes
+    'Environment', 'WorkingSet', 'ResourceManager',
+    'Distribution', 'Requirement', 'EntryPoint',
+
+    # Exceptions
+    'ResolutionError', 'VersionConflict', 'DistributionNotFound',
+    'UnknownExtra', 'ExtractionError',
+
+    # Warnings
+    'PEP440Warning',
+
+    # Parsing functions and string utilities
+    'parse_requirements', 'parse_version', 'safe_name', 'safe_version',
+    'get_platform', 'compatible_platforms', 'yield_lines', 'split_sections',
+    'safe_extra', 'to_filename', 'invalid_marker', 'evaluate_marker',
+
+    # filesystem utilities
+    'ensure_directory', 'normalize_path',
+
+    # Distribution "precedence" constants
+    'EGG_DIST', 'BINARY_DIST', 'SOURCE_DIST', 'CHECKOUT_DIST', 'DEVELOP_DIST',
+
+    # "Provider" interfaces, implementations, and registration/lookup APIs
+    'IMetadataProvider', 'IResourceProvider', 'FileMetadata',
+    'PathMetadata', 'EggMetadata', 'EmptyProvider', 'empty_provider',
+    'NullProvider', 'EggProvider', 'DefaultProvider', 'ZipProvider',
+    'register_finder', 'register_namespace_handler', 'register_loader_type',
+    'fixup_namespace_packages', 'get_importer',
+
+    # Deprecated/backward compatibility only
+    'run_main', 'AvailableDistributions',
+]
+
+class ResolutionError(Exception):
+    """Abstract base for dependency resolution errors"""
+    def __repr__(self):
+        return self.__class__.__name__+repr(self.args)
+
+
+class VersionConflict(ResolutionError):
+    """
+    An already-installed version conflicts with the requested version.
+
+    Should be initialized with the installed Distribution and the requested
+    Requirement.
+    """
+
+    _template = "{self.dist} is installed but {self.req} is required"
+
+    @property
+    def dist(self):
+        return self.args[0]
+
+    @property
+    def req(self):
+        return self.args[1]
+
+    def report(self):
+        return self._template.format(**locals())
+
+    def with_context(self, required_by):
+        """
+        If required_by is non-empty, return a version of self that is a
+        ContextualVersionConflict.
+        """
+        if not required_by:
+            return self
+        args = self.args + (required_by,)
+        return ContextualVersionConflict(*args)
+
+
+class ContextualVersionConflict(VersionConflict):
+    """
+    A VersionConflict that accepts a third parameter, the set of the
+    requirements that required the installed Distribution.
+    """
+
+    _template = VersionConflict._template + ' by {self.required_by}'
+
+    @property
+    def required_by(self):
+        return self.args[2]
+
+
+class DistributionNotFound(ResolutionError):
+    """A requested distribution was not found"""
+
+    _template = ("The '{self.req}' distribution was not found "
+                 "and is required by {self.requirers_str}")
+
+    @property
+    def req(self):
+        return self.args[0]
+
+    @property
+    def requirers(self):
+        return self.args[1]
+
+    @property
+    def requirers_str(self):
+        if not self.requirers:
+            return 'the application'
+        return ', '.join(self.requirers)
+
+    def report(self):
+        return self._template.format(**locals())
+
+    def __str__(self):
+        return self.report()
+
+
+class UnknownExtra(ResolutionError):
+    """Distribution doesn't have an "extra feature" of the given name"""
+_provider_factories = {}
+
+PY_MAJOR = sys.version[:3]
+EGG_DIST = 3
+BINARY_DIST = 2
+SOURCE_DIST = 1
+CHECKOUT_DIST = 0
+DEVELOP_DIST = -1
+
+def register_loader_type(loader_type, provider_factory):
+    """Register `provider_factory` to make providers for `loader_type`
+
+    `loader_type` is the type or class of a PEP 302 ``module.__loader__``,
+    and `provider_factory` is a function that, passed a *module* object,
+    returns an ``IResourceProvider`` for that module.
+    """
+    _provider_factories[loader_type] = provider_factory
+
+def get_provider(moduleOrReq):
+    """Return an IResourceProvider for the named module or requirement"""
+    if isinstance(moduleOrReq, Requirement):
+        return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0]
+    try:
+        module = sys.modules[moduleOrReq]
+    except KeyError:
+        __import__(moduleOrReq)
+        module = sys.modules[moduleOrReq]
+    loader = getattr(module, '__loader__', None)
+    return _find_adapter(_provider_factories, loader)(module)
+
+def _macosx_vers(_cache=[]):
+    if not _cache:
+        version = platform.mac_ver()[0]
+        # fallback for MacPorts
+        if version == '':
+            plist = '/System/Library/CoreServices/SystemVersion.plist'
+            if os.path.exists(plist):
+                if hasattr(plistlib, 'readPlist'):
+                    plist_content = plistlib.readPlist(plist)
+                    if 'ProductVersion' in plist_content:
+                        version = plist_content['ProductVersion']
+
+        _cache.append(version.split('.'))
+    return _cache[0]
+
+def _macosx_arch(machine):
+    return {'PowerPC': 'ppc', 'Power_Macintosh': 'ppc'}.get(machine, machine)
+
+def get_build_platform():
+    """Return this platform's string for platform-specific distributions
+
+    XXX Currently this is the same as ``distutils.util.get_platform()``, but it
+    needs some hacks for Linux and Mac OS X.
+    """
+    try:
+        # Python 2.7 or >=3.2
+        from sysconfig import get_platform
+    except ImportError:
+        from distutils.util import get_platform
+
+    plat = get_platform()
+    if sys.platform == "darwin" and not plat.startswith('macosx-'):
+        try:
+            version = _macosx_vers()
+            machine = os.uname()[4].replace(" ", "_")
+            return "macosx-%d.%d-%s" % (int(version[0]), int(version[1]),
+                _macosx_arch(machine))
+        except ValueError:
+            # if someone is running a non-Mac darwin system, this will fall
+            # through to the default implementation
+            pass
+    return plat
+
+macosVersionString = re.compile(r"macosx-(\d+)\.(\d+)-(.*)")
+darwinVersionString = re.compile(r"darwin-(\d+)\.(\d+)\.(\d+)-(.*)")
+# XXX backward compat
+get_platform = get_build_platform
+
+
+def compatible_platforms(provided, required):
+    """Can code for the `provided` platform run on the `required` platform?
+
+    Returns true if either platform is ``None``, or the platforms are equal.
+
+    XXX Needs compatibility checks for Linux and other unixy OSes.
+    """
+    if provided is None or required is None or provided==required:
+        # easy case
+        return True
+
+    # Mac OS X special cases
+    reqMac = macosVersionString.match(required)
+    if reqMac:
+        provMac = macosVersionString.match(provided)
+
+        # is this a Mac package?
+        if not provMac:
+            # this is backwards compatibility for packages built before
+            # setuptools 0.6. All packages built after this point will
+            # use the new macosx designation.
+            provDarwin = darwinVersionString.match(provided)
+            if provDarwin:
+                dversion = int(provDarwin.group(1))
+                macosversion = "%s.%s" % (reqMac.group(1), reqMac.group(2))
+                if dversion == 7 and macosversion >= "10.3" or \
+                        dversion == 8 and macosversion >= "10.4":
+                    return True
+            # egg isn't macosx or legacy darwin
+            return False
+
+        # are they the same major version and machine type?
+        if provMac.group(1) != reqMac.group(1) or \
+                provMac.group(3) != reqMac.group(3):
+            return False
+
+        # is the required OS major update >= the provided one?
+        if int(provMac.group(2)) > int(reqMac.group(2)):
+            return False
+
+        return True
+
+    # XXX Linux and other platforms' special cases should go here
+    return False
+
+
+def run_script(dist_spec, script_name):
+    """Locate distribution `dist_spec` and run its `script_name` script"""
+    ns = sys._getframe(1).f_globals
+    name = ns['__name__']
+    ns.clear()
+    ns['__name__'] = name
+    require(dist_spec)[0].run_script(script_name, ns)
+
+# backward compatibility
+run_main = run_script
+
+def get_distribution(dist):
+    """Return a current distribution object for a Requirement or string"""
+    if isinstance(dist, string_types):
+        dist = Requirement.parse(dist)
+    if isinstance(dist, Requirement):
+        dist = get_provider(dist)
+    if not isinstance(dist, Distribution):
+        raise TypeError("Expected string, Requirement, or Distribution", dist)
+    return dist
+
+def load_entry_point(dist, group, name):
+    """Return `name` entry point of `group` for `dist` or raise ImportError"""
+    return get_distribution(dist).load_entry_point(group, name)
+
+def get_entry_map(dist, group=None):
+    """Return the entry point map for `group`, or the full entry map"""
+    return get_distribution(dist).get_entry_map(group)
+
+def get_entry_info(dist, group, name):
+    """Return the EntryPoint object for `group`+`name`, or ``None``"""
+    return get_distribution(dist).get_entry_info(group, name)
+
+
+class IMetadataProvider:
+
+    def has_metadata(name):
+        """Does the package's distribution contain the named metadata?"""
+
+    def get_metadata(name):
+        """The named metadata resource as a string"""
+
+    def get_metadata_lines(name):
+        """Yield named metadata resource as list of non-blank non-comment lines
+
+       Leading and trailing whitespace is stripped from each line, and lines
+       with ``#`` as the first non-blank character are omitted."""
+
+    def metadata_isdir(name):
+        """Is the named metadata a directory?  (like ``os.path.isdir()``)"""
+
+    def metadata_listdir(name):
+        """List of metadata names in the directory (like ``os.listdir()``)"""
+
+    def run_script(script_name, namespace):
+        """Execute the named script in the supplied namespace dictionary"""
+
+
+class IResourceProvider(IMetadataProvider):
+    """An object that provides access to package resources"""
+
+    def get_resource_filename(manager, resource_name):
+        """Return a true filesystem path for `resource_name`
+
+        `manager` must be an ``IResourceManager``"""
+
+    def get_resource_stream(manager, resource_name):
+        """Return a readable file-like object for `resource_name`
+
+        `manager` must be an ``IResourceManager``"""
+
+    def get_resource_string(manager, resource_name):
+        """Return a string containing the contents of `resource_name`
+
+        `manager` must be an ``IResourceManager``"""
+
+    def has_resource(resource_name):
+        """Does the package contain the named resource?"""
+
+    def resource_isdir(resource_name):
+        """Is the named resource a directory?  (like ``os.path.isdir()``)"""
+
+    def resource_listdir(resource_name):
+        """List of resource names in the directory (like ``os.listdir()``)"""
+
+
+class WorkingSet(object):
+    """A collection of active distributions on sys.path (or a similar list)"""
+
+    def __init__(self, entries=None):
+        """Create working set from list of path entries (default=sys.path)"""
+        self.entries = []
+        self.entry_keys = {}
+        self.by_key = {}
+        self.callbacks = []
+
+        if entries is None:
+            entries = sys.path
+
+        for entry in entries:
+            self.add_entry(entry)
+
+    @classmethod
+    def _build_master(cls):
+        """
+        Prepare the master working set.
+        """
+        ws = cls()
+        try:
+            from __main__ import __requires__
+        except ImportError:
+            # The main program does not list any requirements
+            return ws
+
+        # ensure the requirements are met
+        try:
+            ws.require(__requires__)
+        except VersionConflict:
+            return cls._build_from_requirements(__requires__)
+
+        return ws
+
+    @classmethod
+    def _build_from_requirements(cls, req_spec):
+        """
+        Build a working set from a requirement spec. Rewrites sys.path.
+        """
+        # try it without defaults already on sys.path
+        # by starting with an empty path
+        ws = cls([])
+        reqs = parse_requirements(req_spec)
+        dists = ws.resolve(reqs, Environment())
+        for dist in dists:
+            ws.add(dist)
+
+        # add any missing entries from sys.path
+        for entry in sys.path:
+            if entry not in ws.entries:
+                ws.add_entry(entry)
+
+        # then copy back to sys.path
+        sys.path[:] = ws.entries
+        return ws
+
+    def add_entry(self, entry):
+        """Add a path item to ``.entries``, finding any distributions on it
+
+        ``find_distributions(entry, True)`` is used to find distributions
+        corresponding to the path entry, and they are added.  `entry` is
+        always appended to ``.entries``, even if it is already present.
+        (This is because ``sys.path`` can contain the same value more than
+        once, and the ``.entries`` of the ``sys.path`` WorkingSet should always
+        equal ``sys.path``.)
+        """
+        self.entry_keys.setdefault(entry, [])
+        self.entries.append(entry)
+        for dist in find_distributions(entry, True):
+            self.add(dist, entry, False)
+
+    def __contains__(self, dist):
+        """True if `dist` is the active distribution for its project"""
+        return self.by_key.get(dist.key) == dist
+
+    def find(self, req):
+        """Find a distribution matching requirement `req`
+
+        If there is an active distribution for the requested project, this
+        returns it as long as it meets the version requirement specified by
+        `req`.  But, if there is an active distribution for the project and it
+        does *not* meet the `req` requirement, ``VersionConflict`` is raised.
+        If there is no active distribution for the requested project, ``None``
+        is returned.
+        """
+        dist = self.by_key.get(req.key)
+        if dist is not None and dist not in req:
+            # XXX add more info
+            raise VersionConflict(dist, req)
+        return dist
+
+    def iter_entry_points(self, group, name=None):
+        """Yield entry point objects from `group` matching `name`
+
+        If `name` is None, yields all entry points in `group` from all
+        distributions in the working set, otherwise only ones matching
+        both `group` and `name` are yielded (in distribution order).
+        """
+        for dist in self:
+            entries = dist.get_entry_map(group)
+            if name is None:
+                for ep in entries.values():
+                    yield ep
+            elif name in entries:
+                yield entries[name]
+
+    def run_script(self, requires, script_name):
+        """Locate distribution for `requires` and run `script_name` script"""
+        ns = sys._getframe(1).f_globals
+        name = ns['__name__']
+        ns.clear()
+        ns['__name__'] = name
+        self.require(requires)[0].run_script(script_name, ns)
+
+    def __iter__(self):
+        """Yield distributions for non-duplicate projects in the working set
+
+        The yield order is the order in which the items' path entries were
+        added to the working set.
+        """
+        seen = {}
+        for item in self.entries:
+            if item not in self.entry_keys:
+                # workaround a cache issue
+                continue
+
+            for key in self.entry_keys[item]:
+                if key not in seen:
+                    seen[key]=1
+                    yield self.by_key[key]
+
+    def add(self, dist, entry=None, insert=True, replace=False):
+        """Add `dist` to working set, associated with `entry`
+
+        If `entry` is unspecified, it defaults to the ``.location`` of `dist`.
+        On exit from this routine, `entry` is added to the end of the working
+        set's ``.entries`` (if it wasn't already present).
+
+        `dist` is only added to the working set if it's for a project that
+        doesn't already have a distribution in the set, unless `replace=True`.
+        If it's added, any callbacks registered with the ``subscribe()`` method
+        will be called.
+        """
+        if insert:
+            dist.insert_on(self.entries, entry)
+
+        if entry is None:
+            entry = dist.location
+        keys = self.entry_keys.setdefault(entry,[])
+        keys2 = self.entry_keys.setdefault(dist.location,[])
+        if not replace and dist.key in self.by_key:
+            # ignore hidden distros
+            return
+
+        self.by_key[dist.key] = dist
+        if dist.key not in keys:
+            keys.append(dist.key)
+        if dist.key not in keys2:
+            keys2.append(dist.key)
+        self._added_new(dist)
+
+    def resolve(self, requirements, env=None, installer=None,
+            replace_conflicting=False):
+        """List all distributions needed to (recursively) meet `requirements`
+
+        `requirements` must be a sequence of ``Requirement`` objects.  `env`,
+        if supplied, should be an ``Environment`` instance.  If
+        not supplied, it defaults to all distributions available within any
+        entry or distribution in the working set.  `installer`, if supplied,
+        will be invoked with each requirement that cannot be met by an
+        already-installed distribution; it should return a ``Distribution`` or
+        ``None``.
+
+        Unless `replace_conflicting=True`, raises a VersionConflict exception if
+        any requirements are found on the path that have the correct name but
+        the wrong version.  Otherwise, if an `installer` is supplied it will be
+        invoked to obtain the correct version of the requirement and activate
+        it.
+        """
+
+        # set up the stack
+        requirements = list(requirements)[::-1]
+        # set of processed requirements
+        processed = {}
+        # key -> dist
+        best = {}
+        to_activate = []
+
+        # Mapping of requirement to set of distributions that required it;
+        # useful for reporting info about conflicts.
+        required_by = collections.defaultdict(set)
+
+        while requirements:
+            # process dependencies breadth-first
+            req = requirements.pop(0)
+            if req in processed:
+                # Ignore cyclic or redundant dependencies
+                continue
+            dist = best.get(req.key)
+            if dist is None:
+                # Find the best distribution and add it to the map
+                dist = self.by_key.get(req.key)
+                if dist is None or (dist not in req and replace_conflicting):
+                    ws = self
+                    if env is None:
+                        if dist is None:
+                            env = Environment(self.entries)
+                        else:
+                            # Use an empty environment and workingset to avoid
+                            # any further conflicts with the conflicting
+                            # distribution
+                            env = Environment([])
+                            ws = WorkingSet([])
+                    dist = best[req.key] = env.best_match(req, ws, installer)
+                    if dist is None:
+                        requirers = required_by.get(req, None)
+                        raise DistributionNotFound(req, requirers)
+                to_activate.append(dist)
+            if dist not in req:
+                # Oops, the "best" so far conflicts with a dependency
+                dependent_req = required_by[req]
+                raise VersionConflict(dist, req).with_context(dependent_req)
+
+            # push the new requirements onto the stack
+            new_requirements = dist.requires(req.extras)[::-1]
+            requirements.extend(new_requirements)
+
+            # Register the new requirements needed by req
+            for new_requirement in new_requirements:
+                required_by[new_requirement].add(req.project_name)
+
+            processed[req] = True
+
+        # return list of distros to activate
+        return to_activate
+
+    def find_plugins(self, plugin_env, full_env=None, installer=None,
+            fallback=True):
+        """Find all activatable distributions in `plugin_env`
+
+        Example usage::
+
+            distributions, errors = working_set.find_plugins(
+                Environment(plugin_dirlist)
+            )
+            # add plugins+libs to sys.path
+            map(working_set.add, distributions)
+            # display errors
+            print('Could not load', errors)
+
+        The `plugin_env` should be an ``Environment`` instance that contains
+        only distributions that are in the project's "plugin directory" or
+        directories. The `full_env`, if supplied, should be an ``Environment``
+        contains all currently-available distributions.  If `full_env` is not
+        supplied, one is created automatically from the ``WorkingSet`` this
+        method is called on, which will typically mean that every directory on
+        ``sys.path`` will be scanned for distributions.
+
+        `installer` is a standard installer callback as used by the
+        ``resolve()`` method. The `fallback` flag indicates whether we should
+        attempt to resolve older versions of a plugin if the newest version
+        cannot be resolved.
+
+        This method returns a 2-tuple: (`distributions`, `error_info`), where
+        `distributions` is a list of the distributions found in `plugin_env`
+        that were loadable, along with any other distributions that are needed
+        to resolve their dependencies.  `error_info` is a dictionary mapping
+        unloadable plugin distributions to an exception instance describing the
+        error that occurred. Usually this will be a ``DistributionNotFound`` or
+        ``VersionConflict`` instance.
+        """
+
+        plugin_projects = list(plugin_env)
+        # scan project names in alphabetic order
+        plugin_projects.sort()
+
+        error_info = {}
+        distributions = {}
+
+        if full_env is None:
+            env = Environment(self.entries)
+            env += plugin_env
+        else:
+            env = full_env + plugin_env
+
+        shadow_set = self.__class__([])
+        # put all our entries in shadow_set
+        list(map(shadow_set.add, self))
+
+        for project_name in plugin_projects:
+
+            for dist in plugin_env[project_name]:
+
+                req = [dist.as_requirement()]
+
+                try:
+                    resolvees = shadow_set.resolve(req, env, installer)
+
+                except ResolutionError as v:
+                    # save error info
+                    error_info[dist] = v
+                    if fallback:
+                        # try the next older version of project
+                        continue
+                    else:
+                        # give up on this project, keep going
+                        break
+
+                else:
+                    list(map(shadow_set.add, resolvees))
+                    distributions.update(dict.fromkeys(resolvees))
+
+                    # success, no need to try any more versions of this project
+                    break
+
+        distributions = list(distributions)
+        distributions.sort()
+
+        return distributions, error_info
+
+    def require(self, *requirements):
+        """Ensure that distributions matching `requirements` are activated
+
+        `requirements` must be a string or a (possibly-nested) sequence
+        thereof, specifying the distributions and versions required.  The
+        return value is a sequence of the distributions that needed to be
+        activated to fulfill the requirements; all relevant distributions are
+        included, even if they were already activated in this working set.
+        """
+        needed = self.resolve(parse_requirements(requirements))
+
+        for dist in needed:
+            self.add(dist)
+
+        return needed
+
+    def subscribe(self, callback):
+        """Invoke `callback` for all distributions (including existing ones)"""
+        if callback in self.callbacks:
+            return
+        self.callbacks.append(callback)
+        for dist in self:
+            callback(dist)
+
+    def _added_new(self, dist):
+        for callback in self.callbacks:
+            callback(dist)
+
+    def __getstate__(self):
+        return (
+            self.entries[:], self.entry_keys.copy(), self.by_key.copy(),
+            self.callbacks[:]
+        )
+
+    def __setstate__(self, e_k_b_c):
+        entries, keys, by_key, callbacks = e_k_b_c
+        self.entries = entries[:]
+        self.entry_keys = keys.copy()
+        self.by_key = by_key.copy()
+        self.callbacks = callbacks[:]
+
+
+class Environment(object):
+    """Searchable snapshot of distributions on a search path"""
+
+    def __init__(self, search_path=None, platform=get_supported_platform(),
+            python=PY_MAJOR):
+        """Snapshot distributions available on a search path
+
+        Any distributions found on `search_path` are added to the environment.
+        `search_path` should be a sequence of ``sys.path`` items.  If not
+        supplied, ``sys.path`` is used.
+
+        `platform` is an optional string specifying the name of the platform
+        that platform-specific distributions must be compatible with.  If
+        unspecified, it defaults to the current platform.  `python` is an
+        optional string naming the desired version of Python (e.g. ``'3.3'``);
+        it defaults to the current version.
+
+        You may explicitly set `platform` (and/or `python`) to ``None`` if you
+        wish to map *all* distributions, not just those compatible with the
+        running platform or Python version.
+        """
+        self._distmap = {}
+        self.platform = platform
+        self.python = python
+        self.scan(search_path)
+
+    def can_add(self, dist):
+        """Is distribution `dist` acceptable for this environment?
+
+        The distribution must match the platform and python version
+        requirements specified when this environment was created, or False
+        is returned.
+        """
+        return (self.python is None or dist.py_version is None
+            or dist.py_version==self.python) \
+            and compatible_platforms(dist.platform, self.platform)
+
+    def remove(self, dist):
+        """Remove `dist` from the environment"""
+        self._distmap[dist.key].remove(dist)
+
+    def scan(self, search_path=None):
+        """Scan `search_path` for distributions usable in this environment
+
+        Any distributions found are added to the environment.
+        `search_path` should be a sequence of ``sys.path`` items.  If not
+        supplied, ``sys.path`` is used.  Only distributions conforming to
+        the platform/python version defined at initialization are added.
+        """
+        if search_path is None:
+            search_path = sys.path
+
+        for item in search_path:
+            for dist in find_distributions(item):
+                self.add(dist)
+
+    def __getitem__(self, project_name):
+        """Return a newest-to-oldest list of distributions for `project_name`
+
+        Uses case-insensitive `project_name` comparison, assuming all the
+        project's distributions use their project's name converted to all
+        lowercase as their key.
+
+        """
+        distribution_key = project_name.lower()
+        return self._distmap.get(distribution_key, [])
+
+    def add(self, dist):
+        """Add `dist` if we ``can_add()`` it and it has not already been added
+        """
+        if self.can_add(dist) and dist.has_version():
+            dists = self._distmap.setdefault(dist.key, [])
+            if dist not in dists:
+                dists.append(dist)
+                dists.sort(key=operator.attrgetter('hashcmp'), reverse=True)
+
+    def best_match(self, req, working_set, installer=None):
+        """Find distribution best matching `req` and usable on `working_set`
+
+        This calls the ``find(req)`` method of the `working_set` to see if a
+        suitable distribution is already active.  (This may raise
+        ``VersionConflict`` if an unsuitable version of the project is already
+        active in the specified `working_set`.)  If a suitable distribution
+        isn't active, this method returns the newest distribution in the
+        environment that meets the ``Requirement`` in `req`.  If no suitable
+        distribution is found, and `installer` is supplied, then the result of
+        calling the environment's ``obtain(req, installer)`` method will be
+        returned.
+        """
+        dist = working_set.find(req)
+        if dist is not None:
+            return dist
+        for dist in self[req.key]:
+            if dist in req:
+                return dist
+        # try to download/install
+        return self.obtain(req, installer)
+
+    def obtain(self, requirement, installer=None):
+        """Obtain a distribution matching `requirement` (e.g. via download)
+
+        Obtain a distro that matches requirement (e.g. via download).  In the
+        base ``Environment`` class, this routine just returns
+        ``installer(requirement)``, unless `installer` is None, in which case
+        None is returned instead.  This method is a hook that allows subclasses
+        to attempt other ways of obtaining a distribution before falling back
+        to the `installer` argument."""
+        if installer is not None:
+            return installer(requirement)
+
+    def __iter__(self):
+        """Yield the unique project names of the available distributions"""
+        for key in self._distmap.keys():
+            if self[key]:
+                yield key
+
+    def __iadd__(self, other):
+        """In-place addition of a distribution or environment"""
+        if isinstance(other, Distribution):
+            self.add(other)
+        elif isinstance(other, Environment):
+            for project in other:
+                for dist in other[project]:
+                    self.add(dist)
+        else:
+            raise TypeError("Can't add %r to environment" % (other,))
+        return self
+
+    def __add__(self, other):
+        """Add an environment or distribution to an environment"""
+        new = self.__class__([], platform=None, python=None)
+        for env in self, other:
+            new += env
+        return new
+
+
+# XXX backward compatibility
+AvailableDistributions = Environment
+
+
+class ExtractionError(RuntimeError):
+    """An error occurred extracting a resource
+
+    The following attributes are available from instances of this exception:
+
+    manager
+        The resource manager that raised this exception
+
+    cache_path
+        The base directory for resource extraction
+
+    original_error
+        The exception instance that caused extraction to fail
+    """
+
+
+class ResourceManager:
+    """Manage resource extraction and packages"""
+    extraction_path = None
+
+    def __init__(self):
+        self.cached_files = {}
+
+    def resource_exists(self, package_or_requirement, resource_name):
+        """Does the named resource exist?"""
+        return get_provider(package_or_requirement).has_resource(resource_name)
+
+    def resource_isdir(self, package_or_requirement, resource_name):
+        """Is the named resource an existing directory?"""
+        return get_provider(package_or_requirement).resource_isdir(
+            resource_name
+        )
+
+    def resource_filename(self, package_or_requirement, resource_name):
+        """Return a true filesystem path for specified resource"""
+        return get_provider(package_or_requirement).get_resource_filename(
+            self, resource_name
+        )
+
+    def resource_stream(self, package_or_requirement, resource_name):
+        """Return a readable file-like object for specified resource"""
+        return get_provider(package_or_requirement).get_resource_stream(
+            self, resource_name
+        )
+
+    def resource_string(self, package_or_requirement, resource_name):
+        """Return specified resource as a string"""
+        return get_provider(package_or_requirement).get_resource_string(
+            self, resource_name
+        )
+
+    def resource_listdir(self, package_or_requirement, resource_name):
+        """List the contents of the named resource directory"""
+        return get_provider(package_or_requirement).resource_listdir(
+            resource_name
+        )
+
+    def extraction_error(self):
+        """Give an error message for problems extracting file(s)"""
+
+        old_exc = sys.exc_info()[1]
+        cache_path = self.extraction_path or get_default_cache()
+
+        err = ExtractionError("""Can't extract file(s) to egg cache
+
+The following error occurred while trying to extract file(s) to the Python egg
+cache:
+
+  %s
+
+The Python egg cache directory is currently set to:
+
+  %s
+
+Perhaps your account does not have write access to this directory?  You can
+change the cache directory by setting the PYTHON_EGG_CACHE environment
+variable to point to an accessible directory.
+""" % (old_exc, cache_path)
+        )
+        err.manager = self
+        err.cache_path = cache_path
+        err.original_error = old_exc
+        raise err
+
+    def get_cache_path(self, archive_name, names=()):
+        """Return absolute location in cache for `archive_name` and `names`
+
+        The parent directory of the resulting path will be created if it does
+        not already exist.  `archive_name` should be the base filename of the
+        enclosing egg (which may not be the name of the enclosing zipfile!),
+        including its ".egg" extension.  `names`, if provided, should be a
+        sequence of path name parts "under" the egg's extraction location.
+
+        This method should only be called by resource providers that need to
+        obtain an extraction location, and only for names they intend to
+        extract, as it tracks the generated names for possible cleanup later.
+        """
+        extract_path = self.extraction_path or get_default_cache()
+        target_path = os.path.join(extract_path, archive_name+'-tmp', *names)
+        try:
+            _bypass_ensure_directory(target_path)
+        except:
+            self.extraction_error()
+
+        self._warn_unsafe_extraction_path(extract_path)
+
+        self.cached_files[target_path] = 1
+        return target_path
+
+    @staticmethod
+    def _warn_unsafe_extraction_path(path):
+        """
+        If the default extraction path is overridden and set to an insecure
+        location, such as /tmp, it opens up an opportunity for an attacker to
+        replace an extracted file with an unauthorized payload. Warn the user
+        if a known insecure location is used.
+
+        See Distribute #375 for more details.
+        """
+        if os.name == 'nt' and not path.startswith(os.environ['windir']):
+            # On Windows, permissions are generally restrictive by default
+            #  and temp directories are not writable by other users, so
+            #  bypass the warning.
+            return
+        mode = os.stat(path).st_mode
+        if mode & stat.S_IWOTH or mode & stat.S_IWGRP:
+            msg = ("%s is writable by group/others and vulnerable to attack "
+                "when "
+                "used with get_resource_filename. Consider a more secure "
+                "location (set with .set_extraction_path or the "
+                "PYTHON_EGG_CACHE environment variable)." % path)
+            warnings.warn(msg, UserWarning)
+
+    def postprocess(self, tempname, filename):
+        """Perform any platform-specific postprocessing of `tempname`
+
+        This is where Mac header rewrites should be done; other platforms don't
+        have anything special they should do.
+
+        Resource providers should call this method ONLY after successfully
+        extracting a compressed resource.  They must NOT call it on resources
+        that are already in the filesystem.
+
+        `tempname` is the current (temporary) name of the file, and `filename`
+        is the name it will be renamed to by the caller after this routine
+        returns.
+        """
+
+        if os.name == 'posix':
+            # Make the resource executable
+            mode = ((os.stat(tempname).st_mode) | 0o555) & 0o7777
+            os.chmod(tempname, mode)
+
+    def set_extraction_path(self, path):
+        """Set the base path where resources will be extracted to, if needed.
+
+        If you do not call this routine before any extractions take place, the
+        path defaults to the return value of ``get_default_cache()``.  (Which
+        is based on the ``PYTHON_EGG_CACHE`` environment variable, with various
+        platform-specific fallbacks.  See that routine's documentation for more
+        details.)
+
+        Resources are extracted to subdirectories of this path based upon
+        information given by the ``IResourceProvider``.  You may set this to a
+        temporary directory, but then you must call ``cleanup_resources()`` to
+        delete the extracted files when done.  There is no guarantee that
+        ``cleanup_resources()`` will be able to remove all extracted files.
+
+        (Note: you may not change the extraction path for a given resource
+        manager once resources have been extracted, unless you first call
+        ``cleanup_resources()``.)
+        """
+        if self.cached_files:
+            raise ValueError(
+                "Can't change extraction path, files already extracted"
+            )
+
+        self.extraction_path = path
+
+    def cleanup_resources(self, force=False):
+        """
+        Delete all extracted resource files and directories, returning a list
+        of the file and directory names that could not be successfully removed.
+        This function does not have any concurrency protection, so it should
+        generally only be called when the extraction path is a temporary
+        directory exclusive to a single process.  This method is not
+        automatically called; you must call it explicitly or register it as an
+        ``atexit`` function if you wish to ensure cleanup of a temporary
+        directory used for extractions.
+        """
+        # XXX
+
+def get_default_cache():
+    """Determine the default cache location
+
+    This returns the ``PYTHON_EGG_CACHE`` environment variable, if set.
+    Otherwise, on Windows, it returns a "Python-Eggs" subdirectory of the
+    "Application Data" directory.  On all other systems, it's "~/.python-eggs".
+    """
+    try:
+        return os.environ['PYTHON_EGG_CACHE']
+    except KeyError:
+        pass
+
+    if os.name!='nt':
+        return os.path.expanduser('~/.python-eggs')
+
+    # XXX this may be locale-specific!
+    app_data = 'Application Data'
+    app_homes = [
+        # best option, should be locale-safe
+        (('APPDATA',), None),
+        (('USERPROFILE',), app_data),
+        (('HOMEDRIVE','HOMEPATH'), app_data),
+        (('HOMEPATH',), app_data),
+        (('HOME',), None),
+        # 95/98/ME
+        (('WINDIR',), app_data),
+    ]
+
+    for keys, subdir in app_homes:
+        dirname = ''
+        for key in keys:
+            if key in os.environ:
+                dirname = os.path.join(dirname, os.environ[key])
+            else:
+                break
+        else:
+            if subdir:
+                dirname = os.path.join(dirname, subdir)
+            return os.path.join(dirname, 'Python-Eggs')
+    else:
+        raise RuntimeError(
+            "Please set the PYTHON_EGG_CACHE enviroment variable"
+        )
+
+def safe_name(name):
+    """Convert an arbitrary string to a standard distribution name
+
+    Any runs of non-alphanumeric/. characters are replaced with a single '-'.
+    """
+    return re.sub('[^A-Za-z0-9.]+', '-', name)
+
+
+def safe_version(version):
+    """
+    Convert an arbitrary string to a standard version string
+    """
+    try:
+        # normalize the version
+        return str(packaging.version.Version(version))
+    except packaging.version.InvalidVersion:
+        version = version.replace(' ','.')
+        return re.sub('[^A-Za-z0-9.]+', '-', version)
+
+
+def safe_extra(extra):
+    """Convert an arbitrary string to a standard 'extra' name
+
+    Any runs of non-alphanumeric characters are replaced with a single '_',
+    and the result is always lowercased.
+    """
+    return re.sub('[^A-Za-z0-9.]+', '_', extra).lower()
+
+
+def to_filename(name):
+    """Convert a project or version name to its filename-escaped form
+
+    Any '-' characters are currently replaced with '_'.
+    """
+    return name.replace('-','_')
+
+
+class MarkerEvaluation(object):
+    values = {
+        'os_name': lambda: os.name,
+        'sys_platform': lambda: sys.platform,
+        'python_full_version': platform.python_version,
+        'python_version': lambda: platform.python_version()[:3],
+        'platform_version': platform.version,
+        'platform_machine': platform.machine,
+        'python_implementation': platform.python_implementation,
+    }
+
+    @classmethod
+    def is_invalid_marker(cls, text):
+        """
+        Validate text as a PEP 426 environment marker; return an exception
+        if invalid or False otherwise.
+        """
+        try:
+            cls.evaluate_marker(text)
+        except SyntaxError as e:
+            return cls.normalize_exception(e)
+        return False
+
+    @staticmethod
+    def normalize_exception(exc):
+        """
+        Given a SyntaxError from a marker evaluation, normalize the error
+        message:
+         - Remove indications of filename and line number.
+         - Replace platform-specific error messages with standard error
+           messages.
+        """
+        subs = {
+            'unexpected EOF while parsing': 'invalid syntax',
+            'parenthesis is never closed': 'invalid syntax',
+        }
+        exc.filename = None
+        exc.lineno = None
+        exc.msg = subs.get(exc.msg, exc.msg)
+        return exc
+
+    @classmethod
+    def and_test(cls, nodelist):
+        # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
+        items = [
+            cls.interpret(nodelist[i])
+            for i in range(1, len(nodelist), 2)
+        ]
+        return functools.reduce(operator.and_, items)
+
+    @classmethod
+    def test(cls, nodelist):
+        # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
+        items = [
+            cls.interpret(nodelist[i])
+            for i in range(1, len(nodelist), 2)
+        ]
+        return functools.reduce(operator.or_, items)
+
+    @classmethod
+    def atom(cls, nodelist):
+        t = nodelist[1][0]
+        if t == token.LPAR:
+            if nodelist[2][0] == token.RPAR:
+                raise SyntaxError("Empty parentheses")
+            return cls.interpret(nodelist[2])
+        msg = "Language feature not supported in environment markers"
+        raise SyntaxError(msg)
+
+    @classmethod
+    def comparison(cls, nodelist):
+        if len(nodelist) > 4:
+            msg = "Chained comparison not allowed in environment markers"
+            raise SyntaxError(msg)
+        comp = nodelist[2][1]
+        cop = comp[1]
+        if comp[0] == token.NAME:
+            if len(nodelist[2]) == 3:
+                if cop == 'not':
+                    cop = 'not in'
+                else:
+                    cop = 'is not'
+        try:
+            cop = cls.get_op(cop)
+        except KeyError:
+            msg = repr(cop) + " operator not allowed in environment markers"
+            raise SyntaxError(msg)
+        return cop(cls.evaluate(nodelist[1]), cls.evaluate(nodelist[3]))
+
+    @classmethod
+    def get_op(cls, op):
+        ops = {
+            symbol.test: cls.test,
+            symbol.and_test: cls.and_test,
+            symbol.atom: cls.atom,
+            symbol.comparison: cls.comparison,
+            'not in': lambda x, y: x not in y,
+            'in': lambda x, y: x in y,
+            '==': operator.eq,
+            '!=': operator.ne,
+            '<':  operator.lt,
+            '>':  operator.gt,
+            '<=': operator.le,
+            '>=': operator.ge,
+        }
+        if hasattr(symbol, 'or_test'):
+            ops[symbol.or_test] = cls.test
+        return ops[op]
+
+    @classmethod
+    def evaluate_marker(cls, text, extra=None):
+        """
+        Evaluate a PEP 426 environment marker on CPython 2.4+.
+        Return a boolean indicating the marker result in this environment.
+        Raise SyntaxError if marker is invalid.
+
+        This implementation uses the 'parser' module, which is not implemented
+        on
+        Jython and has been superseded by the 'ast' module in Python 2.6 and
+        later.
+        """
+        return cls.interpret(parser.expr(text).totuple(1)[1])
+
+    @classmethod
+    def _markerlib_evaluate(cls, text):
+        """
+        Evaluate a PEP 426 environment marker using markerlib.
+        Return a boolean indicating the marker result in this environment.
+        Raise SyntaxError if marker is invalid.
+        """
+        import _markerlib
+        # markerlib implements Metadata 1.2 (PEP 345) environment markers.
+        # Translate the variables to Metadata 2.0 (PEP 426).
+        env = _markerlib.default_environment()
+        for key in env.keys():
+            new_key = key.replace('.', '_')
+            env[new_key] = env.pop(key)
+        try:
+            result = _markerlib.interpret(text, env)
+        except NameError as e:
+            raise SyntaxError(e.args[0])
+        return result
+
+    if 'parser' not in globals():
+        # Fall back to less-complete _markerlib implementation if 'parser' module
+        # is not available.
+        evaluate_marker = _markerlib_evaluate
+
+    @classmethod
+    def interpret(cls, nodelist):
+        while len(nodelist)==2: nodelist = nodelist[1]
+        try:
+            op = cls.get_op(nodelist[0])
+        except KeyError:
+            raise SyntaxError("Comparison or logical expression expected")
+        return op(nodelist)
+
+    @classmethod
+    def evaluate(cls, nodelist):
+        while len(nodelist)==2: nodelist = nodelist[1]
+        kind = nodelist[0]
+        name = nodelist[1]
+        if kind==token.NAME:
+            try:
+                op = cls.values[name]
+            except KeyError:
+                raise SyntaxError("Unknown name %r" % name)
+            return op()
+        if kind==token.STRING:
+            s = nodelist[1]
+            if not cls._safe_string(s):
+                raise SyntaxError(
+                    "Only plain strings allowed in environment markers")
+            return s[1:-1]
+        msg = "Language feature not supported in environment markers"
+        raise SyntaxError(msg)
+
+    @staticmethod
+    def _safe_string(cand):
+        return (
+            cand[:1] in "'\"" and
+            not cand.startswith('"""') and
+            not cand.startswith("'''") and
+            '\\' not in cand
+        )
+
+invalid_marker = MarkerEvaluation.is_invalid_marker
+evaluate_marker = MarkerEvaluation.evaluate_marker
+
+class NullProvider:
+    """Try to implement resources and metadata for arbitrary PEP 302 loaders"""
+
+    egg_name = None
+    egg_info = None
+    loader = None
+
+    def __init__(self, module):
+        self.loader = getattr(module, '__loader__', None)
+        self.module_path = os.path.dirname(getattr(module, '__file__', ''))
+
+    def get_resource_filename(self, manager, resource_name):
+        return self._fn(self.module_path, resource_name)
+
+    def get_resource_stream(self, manager, resource_name):
+        return io.BytesIO(self.get_resource_string(manager, resource_name))
+
+    def get_resource_string(self, manager, resource_name):
+        return self._get(self._fn(self.module_path, resource_name))
+
+    def has_resource(self, resource_name):
+        return self._has(self._fn(self.module_path, resource_name))
+
+    def has_metadata(self, name):
+        return self.egg_info and self._has(self._fn(self.egg_info, name))
+
+    if sys.version_info <= (3,):
+        def get_metadata(self, name):
+            if not self.egg_info:
+                return ""
+            return self._get(self._fn(self.egg_info, name))
+    else:
+        def get_metadata(self, name):
+            if not self.egg_info:
+                return ""
+            return self._get(self._fn(self.egg_info, name)).decode("utf-8")
+
+    def get_metadata_lines(self, name):
+        return yield_lines(self.get_metadata(name))
+
+    def resource_isdir(self, resource_name):
+        return self._isdir(self._fn(self.module_path, resource_name))
+
+    def metadata_isdir(self, name):
+        return self.egg_info and self._isdir(self._fn(self.egg_info, name))
+
+    def resource_listdir(self, resource_name):
+        return self._listdir(self._fn(self.module_path, resource_name))
+
+    def metadata_listdir(self, name):
+        if self.egg_info:
+            return self._listdir(self._fn(self.egg_info, name))
+        return []
+
+    def run_script(self, script_name, namespace):
+        script = 'scripts/'+script_name
+        if not self.has_metadata(script):
+            raise ResolutionError("No script named %r" % script_name)
+        script_text = self.get_metadata(script).replace('\r\n', '\n')
+        script_text = script_text.replace('\r', '\n')
+        script_filename = self._fn(self.egg_info, script)
+        namespace['__file__'] = script_filename
+        if os.path.exists(script_filename):
+            source = open(script_filename).read()
+            code = compile(source, script_filename, 'exec')
+            exec(code, namespace, namespace)
+        else:
+            from linecache import cache
+            cache[script_filename] = (
+                len(script_text), 0, script_text.split('\n'), script_filename
+            )
+            script_code = compile(script_text, script_filename,'exec')
+            exec(script_code, namespace, namespace)
+
+    def _has(self, path):
+        raise NotImplementedError(
+            "Can't perform this operation for unregistered loader type"
+        )
+
+    def _isdir(self, path):
+        raise NotImplementedError(
+            "Can't perform this operation for unregistered loader type"
+        )
+
+    def _listdir(self, path):
+        raise NotImplementedError(
+            "Can't perform this operation for unregistered loader type"
+        )
+
+    def _fn(self, base, resource_name):
+        if resource_name:
+            return os.path.join(base, *resource_name.split('/'))
+        return base
+
+    def _get(self, path):
+        if hasattr(self.loader, 'get_data'):
+            return self.loader.get_data(path)
+        raise NotImplementedError(
+            "Can't perform this operation for loaders without 'get_data()'"
+        )
+
+register_loader_type(object, NullProvider)
+
+
+class EggProvider(NullProvider):
+    """Provider based on a virtual filesystem"""
+
+    def __init__(self, module):
+        NullProvider.__init__(self, module)
+        self._setup_prefix()
+
+    def _setup_prefix(self):
+        # we assume here that our metadata may be nested inside a "basket"
+        # of multiple eggs; that's why we use module_path instead of .archive
+        path = self.module_path
+        old = None
+        while path!=old:
+            if path.lower().endswith('.egg'):
+                self.egg_name = os.path.basename(path)
+                self.egg_info = os.path.join(path, 'EGG-INFO')
+                self.egg_root = path
+                break
+            old = path
+            path, base = os.path.split(path)
+
+class DefaultProvider(EggProvider):
+    """Provides access to package resources in the filesystem"""
+
+    def _has(self, path):
+        return os.path.exists(path)
+
+    def _isdir(self, path):
+        return os.path.isdir(path)
+
+    def _listdir(self, path):
+        return os.listdir(path)
+
+    def get_resource_stream(self, manager, resource_name):
+        return open(self._fn(self.module_path, resource_name), 'rb')
+
+    def _get(self, path):
+        with open(path, 'rb') as stream:
+            return stream.read()
+
+register_loader_type(type(None), DefaultProvider)
+
+if importlib_machinery is not None:
+    register_loader_type(importlib_machinery.SourceFileLoader, DefaultProvider)
+
+
+class EmptyProvider(NullProvider):
+    """Provider that returns nothing for all requests"""
+
+    _isdir = _has = lambda self, path: False
+    _get = lambda self, path: ''
+    _listdir = lambda self, path: []
+    module_path = None
+
+    def __init__(self):
+        pass
+
+empty_provider = EmptyProvider()
+
+
+class ZipManifests(dict):
+    """
+    zip manifest builder
+    """
+
+    @classmethod
+    def build(cls, path):
+        """
+        Build a dictionary similar to the zipimport directory
+        caches, except instead of tuples, store ZipInfo objects.
+
+        Use a platform-specific path separator (os.sep) for the path keys
+        for compatibility with pypy on Windows.
+        """
+        with ContextualZipFile(path) as zfile:
+            items = (
+                (
+                    name.replace('/', os.sep),
+                    zfile.getinfo(name),
+                )
+                for name in zfile.namelist()
+            )
+            return dict(items)
+
+    load = build
+
+
+class MemoizedZipManifests(ZipManifests):
+    """
+    Memoized zipfile manifests.
+    """
+    manifest_mod = collections.namedtuple('manifest_mod', 'manifest mtime')
+
+    def load(self, path):
+        """
+        Load a manifest at path or return a suitable manifest already loaded.
+        """
+        path = os.path.normpath(path)
+        mtime = os.stat(path).st_mtime
+
+        if path not in self or self[path].mtime != mtime:
+            manifest = self.build(path)
+            self[path] = self.manifest_mod(manifest, mtime)
+
+        return self[path].manifest
+
+
+class ContextualZipFile(zipfile.ZipFile):
+    """
+    Supplement ZipFile class to support context manager for Python 2.6
+    """
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self.close()
+
+    def __new__(cls, *args, **kwargs):
+        """
+        Construct a ZipFile or ContextualZipFile as appropriate
+        """
+        if hasattr(zipfile.ZipFile, '__exit__'):
+            return zipfile.ZipFile(*args, **kwargs)
+        return super(ContextualZipFile, cls).__new__(cls)
+
+
+class ZipProvider(EggProvider):
+    """Resource support for zips and eggs"""
+
+    eagers = None
+    _zip_manifests = MemoizedZipManifests()
+
+    def __init__(self, module):
+        EggProvider.__init__(self, module)
+        self.zip_pre = self.loader.archive+os.sep
+
+    def _zipinfo_name(self, fspath):
+        # Convert a virtual filename (full path to file) into a zipfile subpath
+        # usable with the zipimport directory cache for our target archive
+        if fspath.startswith(self.zip_pre):
+            return fspath[len(self.zip_pre):]
+        raise AssertionError(
+            "%s is not a subpath of %s" % (fspath, self.zip_pre)
+        )
+
+    def _parts(self, zip_path):
+        # Convert a zipfile subpath into an egg-relative path part list.
+        # pseudo-fs path
+        fspath = self.zip_pre+zip_path
+        if fspath.startswith(self.egg_root+os.sep):
+            return fspath[len(self.egg_root)+1:].split(os.sep)
+        raise AssertionError(
+            "%s is not a subpath of %s" % (fspath, self.egg_root)
+        )
+
+    @property
+    def zipinfo(self):
+        return self._zip_manifests.load(self.loader.archive)
+
+    def get_resource_filename(self, manager, resource_name):
+        if not self.egg_name:
+            raise NotImplementedError(
+                "resource_filename() only supported for .egg, not .zip"
+            )
+        # no need to lock for extraction, since we use temp names
+        zip_path = self._resource_to_zip(resource_name)
+        eagers = self._get_eager_resources()
+        if '/'.join(self._parts(zip_path)) in eagers:
+            for name in eagers:
+                self._extract_resource(manager, self._eager_to_zip(name))
+        return self._extract_resource(manager, zip_path)
+
+    @staticmethod
+    def _get_date_and_size(zip_stat):
+        size = zip_stat.file_size
+        # ymdhms+wday, yday, dst
+        date_time = zip_stat.date_time + (0, 0, -1)
+        # 1980 offset already done
+        timestamp = time.mktime(date_time)
+        return timestamp, size
+
+    def _extract_resource(self, manager, zip_path):
+
+        if zip_path in self._index():
+            for name in self._index()[zip_path]:
+                last = self._extract_resource(
+                    manager, os.path.join(zip_path, name)
+                )
+            # return the extracted directory name
+            return os.path.dirname(last)
+
+        timestamp, size = self._get_date_and_size(self.zipinfo[zip_path])
+
+        if not WRITE_SUPPORT:
+            raise IOError('"os.rename" and "os.unlink" are not supported '
+                          'on this platform')
+        try:
+
+            real_path = manager.get_cache_path(
+                self.egg_name, self._parts(zip_path)
+            )
+
+            if self._is_current(real_path, zip_path):
+                return real_path
+
+            outf, tmpnam = _mkstemp(".$extract", dir=os.path.dirname(real_path))
+            os.write(outf, self.loader.get_data(zip_path))
+            os.close(outf)
+            utime(tmpnam, (timestamp, timestamp))
+            manager.postprocess(tmpnam, real_path)
+
+            try:
+                rename(tmpnam, real_path)
+
+            except os.error:
+                if os.path.isfile(real_path):
+                    if self._is_current(real_path, zip_path):
+                        # the file became current since it was checked above,
+                        #  so proceed.
+                        return real_path
+                    # Windows, del old file and retry
+                    elif os.name=='nt':
+                        unlink(real_path)
+                        rename(tmpnam, real_path)
+                        return real_path
+                raise
+
+        except os.error:
+            # report a user-friendly error
+            manager.extraction_error()
+
+        return real_path
+
+    def _is_current(self, file_path, zip_path):
+        """
+        Return True if the file_path is current for this zip_path
+        """
+        timestamp, size = self._get_date_and_size(self.zipinfo[zip_path])
+        if not os.path.isfile(file_path):
+            return False
+        stat = os.stat(file_path)
+        if stat.st_size!=size or stat.st_mtime!=timestamp:
+            return False
+        # check that the contents match
+        zip_contents = self.loader.get_data(zip_path)
+        with open(file_path, 'rb') as f:
+            file_contents = f.read()
+        return zip_contents == file_contents
+
+    def _get_eager_resources(self):
+        if self.eagers is None:
+            eagers = []
+            for name in ('native_libs.txt', 'eager_resources.txt'):
+                if self.has_metadata(name):
+                    eagers.extend(self.get_metadata_lines(name))
+            self.eagers = eagers
+        return self.eagers
+
+    def _index(self):
+        try:
+            return self._dirindex
+        except AttributeError:
+            ind = {}
+            for path in self.zipinfo:
+                parts = path.split(os.sep)
+                while parts:
+                    parent = os.sep.join(parts[:-1])
+                    if parent in ind:
+                        ind[parent].append(parts[-1])
+                        break
+                    else:
+                        ind[parent] = [parts.pop()]
+            self._dirindex = ind
+            return ind
+
+    def _has(self, fspath):
+        zip_path = self._zipinfo_name(fspath)
+        return zip_path in self.zipinfo or zip_path in self._index()
+
+    def _isdir(self, fspath):
+        return self._zipinfo_name(fspath) in self._index()
+
+    def _listdir(self, fspath):
+        return list(self._index().get(self._zipinfo_name(fspath), ()))
+
+    def _eager_to_zip(self, resource_name):
+        return self._zipinfo_name(self._fn(self.egg_root, resource_name))
+
+    def _resource_to_zip(self, resource_name):
+        return self._zipinfo_name(self._fn(self.module_path, resource_name))
+
+register_loader_type(zipimport.zipimporter, ZipProvider)
+
+
+class FileMetadata(EmptyProvider):
+    """Metadata handler for standalone PKG-INFO files
+
+    Usage::
+
+        metadata = FileMetadata("/path/to/PKG-INFO")
+
+    This provider rejects all data and metadata requests except for PKG-INFO,
+    which is treated as existing, and will be the contents of the file at
+    the provided location.
+    """
+
+    def __init__(self, path):
+        self.path = path
+
+    def has_metadata(self, name):
+        return name=='PKG-INFO'
+
+    def get_metadata(self, name):
+        if name=='PKG-INFO':
+            with open(self.path,'rU') as f:
+                metadata = f.read()
+            return metadata
+        raise KeyError("No metadata except PKG-INFO is available")
+
+    def get_metadata_lines(self, name):
+        return yield_lines(self.get_metadata(name))
+
+
+class PathMetadata(DefaultProvider):
+    """Metadata provider for egg directories
+
+    Usage::
+
+        # Development eggs:
+
+        egg_info = "/path/to/PackageName.egg-info"
+        base_dir = os.path.dirname(egg_info)
+        metadata = PathMetadata(base_dir, egg_info)
+        dist_name = os.path.splitext(os.path.basename(egg_info))[0]
+        dist = Distribution(basedir, project_name=dist_name, metadata=metadata)
+
+        # Unpacked egg directories:
+
+        egg_path = "/path/to/PackageName-ver-pyver-etc.egg"
+        metadata = PathMetadata(egg_path, os.path.join(egg_path,'EGG-INFO'))
+        dist = Distribution.from_filename(egg_path, metadata=metadata)
+    """
+
+    def __init__(self, path, egg_info):
+        self.module_path = path
+        self.egg_info = egg_info
+
+
+class EggMetadata(ZipProvider):
+    """Metadata provider for .egg files"""
+
+    def __init__(self, importer):
+        """Create a metadata provider from a zipimporter"""
+
+        self.zip_pre = importer.archive+os.sep
+        self.loader = importer
+        if importer.prefix:
+            self.module_path = os.path.join(importer.archive, importer.prefix)
+        else:
+            self.module_path = importer.archive
+        self._setup_prefix()
+
+_declare_state('dict', _distribution_finders = {})
+
+def register_finder(importer_type, distribution_finder):
+    """Register `distribution_finder` to find distributions in sys.path items
+
+    `importer_type` is the type or class of a PEP 302 "Importer" (sys.path item
+    handler), and `distribution_finder` is a callable that, passed a path
+    item and the importer instance, yields ``Distribution`` instances found on
+    that path item.  See ``pkg_resources.find_on_path`` for an example."""
+    _distribution_finders[importer_type] = distribution_finder
+
+
+def find_distributions(path_item, only=False):
+    """Yield distributions accessible via `path_item`"""
+    importer = get_importer(path_item)
+    finder = _find_adapter(_distribution_finders, importer)
+    return finder(importer, path_item, only)
+
+def find_eggs_in_zip(importer, path_item, only=False):
+    """
+    Find eggs in zip files; possibly multiple nested eggs.
+    """
+    if importer.archive.endswith('.whl'):
+        # wheels are not supported with this finder
+        # they don't have PKG-INFO metadata, and won't ever contain eggs
+        return
+    metadata = EggMetadata(importer)
+    if metadata.has_metadata('PKG-INFO'):
+        yield Distribution.from_filename(path_item, metadata=metadata)
+    if only:
+        # don't yield nested distros
+        return
+    for subitem in metadata.resource_listdir('/'):
+        if subitem.endswith('.egg'):
+            subpath = os.path.join(path_item, subitem)
+            for dist in find_eggs_in_zip(zipimport.zipimporter(subpath), subpath):
+                yield dist
+
+register_finder(zipimport.zipimporter, find_eggs_in_zip)
+
+def find_nothing(importer, path_item, only=False):
+    return ()
+register_finder(object, find_nothing)
+
+def find_on_path(importer, path_item, only=False):
+    """Yield distributions accessible on a sys.path directory"""
+    path_item = _normalize_cached(path_item)
+
+    if os.path.isdir(path_item) and os.access(path_item, os.R_OK):
+        if path_item.lower().endswith('.egg'):
+            # unpacked egg
+            yield Distribution.from_filename(
+                path_item, metadata=PathMetadata(
+                    path_item, os.path.join(path_item,'EGG-INFO')
+                )
+            )
+        else:
+            # scan for .egg and .egg-info in directory
+            for entry in os.listdir(path_item):
+                lower = entry.lower()
+                if lower.endswith('.egg-info') or lower.endswith('.dist-info'):
+                    fullpath = os.path.join(path_item, entry)
+                    if os.path.isdir(fullpath):
+                        # egg-info directory, allow getting metadata
+                        metadata = PathMetadata(path_item, fullpath)
+                    else:
+                        metadata = FileMetadata(fullpath)
+                    yield Distribution.from_location(
+                        path_item, entry, metadata, precedence=DEVELOP_DIST
+                    )
+                elif not only and lower.endswith('.egg'):
+                    dists = find_distributions(os.path.join(path_item, entry))
+                    for dist in dists:
+                        yield dist
+                elif not only and lower.endswith('.egg-link'):
+                    with open(os.path.join(path_item, entry)) as entry_file:
+                        entry_lines = entry_file.readlines()
+                    for line in entry_lines:
+                        if not line.strip():
+                            continue
+                        path = os.path.join(path_item, line.rstrip())
+                        dists = find_distributions(path)
+                        for item in dists:
+                            yield item
+                        break
+register_finder(pkgutil.ImpImporter, find_on_path)
+
+if importlib_machinery is not None:
+    register_finder(importlib_machinery.FileFinder, find_on_path)
+
+_declare_state('dict', _namespace_handlers={})
+_declare_state('dict', _namespace_packages={})
+
+
+def register_namespace_handler(importer_type, namespace_handler):
+    """Register `namespace_handler` to declare namespace packages
+
+    `importer_type` is the type or class of a PEP 302 "Importer" (sys.path item
+    handler), and `namespace_handler` is a callable like this::
+
+        def namespace_handler(importer, path_entry, moduleName, module):
+            # return a path_entry to use for child packages
+
+    Namespace handlers are only called if the importer object has already
+    agreed that it can handle the relevant path item, and they should only
+    return a subpath if the module __path__ does not already contain an
+    equivalent subpath.  For an example namespace handler, see
+    ``pkg_resources.file_ns_handler``.
+    """
+    _namespace_handlers[importer_type] = namespace_handler
+
+def _handle_ns(packageName, path_item):
+    """Ensure that named package includes a subpath of path_item (if needed)"""
+
+    importer = get_importer(path_item)
+    if importer is None:
+        return None
+    loader = importer.find_module(packageName)
+    if loader is None:
+        return None
+    module = sys.modules.get(packageName)
+    if module is None:
+        module = sys.modules[packageName] = types.ModuleType(packageName)
+        module.__path__ = []
+        _set_parent_ns(packageName)
+    elif not hasattr(module,'__path__'):
+        raise TypeError("Not a package:", packageName)
+    handler = _find_adapter(_namespace_handlers, importer)
+    subpath = handler(importer, path_item, packageName, module)
+    if subpath is not None:
+        path = module.__path__
+        path.append(subpath)
+        loader.load_module(packageName)
+        for path_item in path:
+            if path_item not in module.__path__:
+                module.__path__.append(path_item)
+    return subpath
+
+def declare_namespace(packageName):
+    """Declare that package 'packageName' is a namespace package"""
+
+    _imp.acquire_lock()
+    try:
+        if packageName in _namespace_packages:
+            return
+
+        path, parent = sys.path, None
+        if '.' in packageName:
+            parent = '.'.join(packageName.split('.')[:-1])
+            declare_namespace(parent)
+            if parent not in _namespace_packages:
+                __import__(parent)
+            try:
+                path = sys.modules[parent].__path__
+            except AttributeError:
+                raise TypeError("Not a package:", parent)
+
+        # Track what packages are namespaces, so when new path items are added,
+        # they can be updated
+        _namespace_packages.setdefault(parent,[]).append(packageName)
+        _namespace_packages.setdefault(packageName,[])
+
+        for path_item in path:
+            # Ensure all the parent's path items are reflected in the child,
+            # if they apply
+            _handle_ns(packageName, path_item)
+
+    finally:
+        _imp.release_lock()
+
+def fixup_namespace_packages(path_item, parent=None):
+    """Ensure that previously-declared namespace packages include path_item"""
+    _imp.acquire_lock()
+    try:
+        for package in _namespace_packages.get(parent,()):
+            subpath = _handle_ns(package, path_item)
+            if subpath:
+                fixup_namespace_packages(subpath, package)
+    finally:
+        _imp.release_lock()
+
+def file_ns_handler(importer, path_item, packageName, module):
+    """Compute an ns-package subpath for a filesystem or zipfile importer"""
+
+    subpath = os.path.join(path_item, packageName.split('.')[-1])
+    normalized = _normalize_cached(subpath)
+    for item in module.__path__:
+        if _normalize_cached(item)==normalized:
+            break
+    else:
+        # Only return the path if it's not already there
+        return subpath
+
+register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
+register_namespace_handler(zipimport.zipimporter, file_ns_handler)
+
+if importlib_machinery is not None:
+    register_namespace_handler(importlib_machinery.FileFinder, file_ns_handler)
+
+
+def null_ns_handler(importer, path_item, packageName, module):
+    return None
+
+register_namespace_handler(object, null_ns_handler)
+
+
+def normalize_path(filename):
+    """Normalize a file/dir name for comparison purposes"""
+    return os.path.normcase(os.path.realpath(filename))
+
+def _normalize_cached(filename, _cache={}):
+    try:
+        return _cache[filename]
+    except KeyError:
+        _cache[filename] = result = normalize_path(filename)
+        return result
+
+def _set_parent_ns(packageName):
+    parts = packageName.split('.')
+    name = parts.pop()
+    if parts:
+        parent = '.'.join(parts)
+        setattr(sys.modules[parent], name, sys.modules[packageName])
+
+
+def yield_lines(strs):
+    """Yield non-empty/non-comment lines of a string or sequence"""
+    if isinstance(strs, string_types):
+        for s in strs.splitlines():
+            s = s.strip()
+            # skip blank lines/comments
+            if s and not s.startswith('#'):
+                yield s
+    else:
+        for ss in strs:
+            for s in yield_lines(ss):
+                yield s
+
+# whitespace and comment
+LINE_END = re.compile(r"\s*(#.*)?$").match
+# line continuation
+CONTINUE = re.compile(r"\s*\\\s*(#.*)?$").match
+# Distribution or extra
+DISTRO = re.compile(r"\s*((\w|[-.])+)").match
+# ver. info
+VERSION = re.compile(r"\s*(<=?|>=?|===?|!=|~=)\s*((\w|[-.*_!+])+)").match
+# comma between items
+COMMA = re.compile(r"\s*,").match
+OBRACKET = re.compile(r"\s*\[").match
+CBRACKET = re.compile(r"\s*\]").match
+MODULE = re.compile(r"\w+(\.\w+)*$").match
+EGG_NAME = re.compile(
+    r"""
+    (?P<name>[^-]+) (
+        -(?P<ver>[^-]+) (
+            -py(?P<pyver>[^-]+) (
+                -(?P<plat>.+)
+            )?
+        )?
+    )?
+    """,
+    re.VERBOSE | re.IGNORECASE,
+).match
+
+
+class EntryPoint(object):
+    """Object representing an advertised importable object"""
+
+    def __init__(self, name, module_name, attrs=(), extras=(), dist=None):
+        if not MODULE(module_name):
+            raise ValueError("Invalid module name", module_name)
+        self.name = name
+        self.module_name = module_name
+        self.attrs = tuple(attrs)
+        self.extras = Requirement.parse(("x[%s]" % ','.join(extras))).extras
+        self.dist = dist
+
+    def __str__(self):
+        s = "%s = %s" % (self.name, self.module_name)
+        if self.attrs:
+            s += ':' + '.'.join(self.attrs)
+        if self.extras:
+            s += ' [%s]' % ','.join(self.extras)
+        return s
+
+    def __repr__(self):
+        return "EntryPoint.parse(%r)" % str(self)
+
+    def load(self, require=True, *args, **kwargs):
+        """
+        Require packages for this EntryPoint, then resolve it.
+        """
+        if not require or args or kwargs:
+            warnings.warn(
+                "Parameters to load are deprecated.  Call .resolve and "
+                ".require separately.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+        if require:
+            self.require(*args, **kwargs)
+        return self.resolve()
+
+    def resolve(self):
+        """
+        Resolve the entry point from its module and attrs.
+        """
+        module = __import__(self.module_name, fromlist=['__name__'], level=0)
+        try:
+            return functools.reduce(getattr, self.attrs, module)
+        except AttributeError as exc:
+            raise ImportError(str(exc))
+
+    def require(self, env=None, installer=None):
+        if self.extras and not self.dist:
+            raise UnknownExtra("Can't require() without a distribution", self)
+        reqs = self.dist.requires(self.extras)
+        items = working_set.resolve(reqs, env, installer)
+        list(map(working_set.add, items))
+
+    pattern = re.compile(
+        r'\s*'
+        r'(?P<name>.+?)\s*'
+        r'=\s*'
+        r'(?P<module>[\w.]+)\s*'
+        r'(:\s*(?P<attr>[\w.]+))?\s*'
+        r'(?P<extras>\[.*\])?\s*$'
+    )
+
+    @classmethod
+    def parse(cls, src, dist=None):
+        """Parse a single entry point from string `src`
+
+        Entry point syntax follows the form::
+
+            name = some.module:some.attr [extra1, extra2]
+
+        The entry name and module name are required, but the ``:attrs`` and
+        ``[extras]`` parts are optional
+        """
+        m = cls.pattern.match(src)
+        if not m:
+            msg = "EntryPoint must be in 'name=module:attrs [extras]' format"
+            raise ValueError(msg, src)
+        res = m.groupdict()
+        extras = cls._parse_extras(res['extras'])
+        attrs = res['attr'].split('.') if res['attr'] else ()
+        return cls(res['name'], res['module'], attrs, extras, dist)
+
+    @classmethod
+    def _parse_extras(cls, extras_spec):
+        if not extras_spec:
+            return ()
+        req = Requirement.parse('x' + extras_spec)
+        if req.specs:
+            raise ValueError()
+        return req.extras
+
+    @classmethod
+    def parse_group(cls, group, lines, dist=None):
+        """Parse an entry point group"""
+        if not MODULE(group):
+            raise ValueError("Invalid group name", group)
+        this = {}
+        for line in yield_lines(lines):
+            ep = cls.parse(line, dist)
+            if ep.name in this:
+                raise ValueError("Duplicate entry point", group, ep.name)
+            this[ep.name]=ep
+        return this
+
+    @classmethod
+    def parse_map(cls, data, dist=None):
+        """Parse a map of entry point groups"""
+        if isinstance(data, dict):
+            data = data.items()
+        else:
+            data = split_sections(data)
+        maps = {}
+        for group, lines in data:
+            if group is None:
+                if not lines:
+                    continue
+                raise ValueError("Entry points must be listed in groups")
+            group = group.strip()
+            if group in maps:
+                raise ValueError("Duplicate group name", group)
+            maps[group] = cls.parse_group(group, lines, dist)
+        return maps
+
+
+def _remove_md5_fragment(location):
+    if not location:
+        return ''
+    parsed = urlparse(location)
+    if parsed[-1].startswith('md5='):
+        return urlunparse(parsed[:-1] + ('',))
+    return location
+
+
+class Distribution(object):
+    """Wrap an actual or potential sys.path entry w/metadata"""
+    PKG_INFO = 'PKG-INFO'
+
+    def __init__(self, location=None, metadata=None, project_name=None,
+            version=None, py_version=PY_MAJOR, platform=None,
+            precedence=EGG_DIST):
+        self.project_name = safe_name(project_name or 'Unknown')
+        if version is not None:
+            self._version = safe_version(version)
+        self.py_version = py_version
+        self.platform = platform
+        self.location = location
+        self.precedence = precedence
+        self._provider = metadata or empty_provider
+
+    @classmethod
+    def from_location(cls, location, basename, metadata=None,**kw):
+        project_name, version, py_version, platform = [None]*4
+        basename, ext = os.path.splitext(basename)
+        if ext.lower() in _distributionImpl:
+            # .dist-info gets much metadata differently
+            match = EGG_NAME(basename)
+            if match:
+                project_name, version, py_version, platform = match.group(
+                    'name','ver','pyver','plat'
+                )
+            cls = _distributionImpl[ext.lower()]
+        return cls(
+            location, metadata, project_name=project_name, version=version,
+            py_version=py_version, platform=platform, **kw
+        )
+
+    @property
+    def hashcmp(self):
+        return (
+            self.parsed_version,
+            self.precedence,
+            self.key,
+            _remove_md5_fragment(self.location),
+            self.py_version or '',
+            self.platform or '',
+        )
+
+    def __hash__(self):
+        return hash(self.hashcmp)
+
+    def __lt__(self, other):
+        return self.hashcmp < other.hashcmp
+
+    def __le__(self, other):
+        return self.hashcmp <= other.hashcmp
+
+    def __gt__(self, other):
+        return self.hashcmp > other.hashcmp
+
+    def __ge__(self, other):
+        return self.hashcmp >= other.hashcmp
+
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            # It's not a Distribution, so they are not equal
+            return False
+        return self.hashcmp == other.hashcmp
+
+    def __ne__(self, other):
+        return not self == other
+
+    # These properties have to be lazy so that we don't have to load any
+    # metadata until/unless it's actually needed.  (i.e., some distributions
+    # may not know their name or version without loading PKG-INFO)
+
+    @property
+    def key(self):
+        try:
+            return self._key
+        except AttributeError:
+            self._key = key = self.project_name.lower()
+            return key
+
+    @property
+    def parsed_version(self):
+        if not hasattr(self, "_parsed_version"):
+            self._parsed_version = parse_version(self.version)
+
+        return self._parsed_version
+
+    def _warn_legacy_version(self):
+        LV = packaging.version.LegacyVersion
+        is_legacy = isinstance(self._parsed_version, LV)
+        if not is_legacy:
+            return
+
+        # While an empty version is technically a legacy version and
+        # is not a valid PEP 440 version, it's also unlikely to
+        # actually come from someone and instead it is more likely that
+        # it comes from setuptools attempting to parse a filename and
+        # including it in the list. So for that we'll gate this warning
+        # on if the version is anything at all or not.
+        if not self.version:
+            return
+
+        tmpl = textwrap.dedent("""
+            '{project_name} ({version})' is being parsed as a legacy,
+            non PEP 440,
+            version. You may find odd behavior and sort order.
+            In particular it will be sorted as less than 0.0. It
+            is recommended to migrate to PEP 440 compatible
+            versions.
+            """).strip().replace('\n', ' ')
+
+        warnings.warn(tmpl.format(**vars(self)), PEP440Warning)
+
+    @property
+    def version(self):
+        try:
+            return self._version
+        except AttributeError:
+            for line in self._get_metadata(self.PKG_INFO):
+                if line.lower().startswith('version:'):
+                    self._version = safe_version(line.split(':',1)[1].strip())
+                    return self._version
+            else:
+                tmpl = "Missing 'Version:' header and/or %s file"
+                raise ValueError(tmpl % self.PKG_INFO, self)
+
+    @property
+    def _dep_map(self):
+        try:
+            return self.__dep_map
+        except AttributeError:
+            dm = self.__dep_map = {None: []}
+            for name in 'requires.txt', 'depends.txt':
+                for extra, reqs in split_sections(self._get_metadata(name)):
+                    if extra:
+                        if ':' in extra:
+                            extra, marker = extra.split(':', 1)
+                            if invalid_marker(marker):
+                                # XXX warn
+                                reqs=[]
+                            elif not evaluate_marker(marker):
+                                reqs=[]
+                        extra = safe_extra(extra) or None
+                    dm.setdefault(extra,[]).extend(parse_requirements(reqs))
+            return dm
+
+    def requires(self, extras=()):
+        """List of Requirements needed for this distro if `extras` are used"""
+        dm = self._dep_map
+        deps = []
+        deps.extend(dm.get(None, ()))
+        for ext in extras:
+            try:
+                deps.extend(dm[safe_extra(ext)])
+            except KeyError:
+                raise UnknownExtra(
+                    "%s has no such extra feature %r" % (self, ext)
+                )
+        return deps
+
+    def _get_metadata(self, name):
+        if self.has_metadata(name):
+            for line in self.get_metadata_lines(name):
+                yield line
+
+    def activate(self, path=None):
+        """Ensure distribution is importable on `path` (default=sys.path)"""
+        if path is None:
+            path = sys.path
+        self.insert_on(path)
+        if path is sys.path:
+            fixup_namespace_packages(self.location)
+            for pkg in self._get_metadata('namespace_packages.txt'):
+                if pkg in sys.modules:
+                    declare_namespace(pkg)
+
+    def egg_name(self):
+        """Return what this distribution's standard .egg filename should be"""
+        filename = "%s-%s-py%s" % (
+            to_filename(self.project_name), to_filename(self.version),
+            self.py_version or PY_MAJOR
+        )
+
+        if self.platform:
+            filename += '-' + self.platform
+        return filename
+
+    def __repr__(self):
+        if self.location:
+            return "%s (%s)" % (self, self.location)
+        else:
+            return str(self)
+
+    def __str__(self):
+        try:
+            version = getattr(self, 'version', None)
+        except ValueError:
+            version = None
+        version = version or "[unknown version]"
+        return "%s %s" % (self.project_name, version)
+
+    def __getattr__(self, attr):
+        """Delegate all unrecognized public attributes to .metadata provider"""
+        if attr.startswith('_'):
+            raise AttributeError(attr)
+        return getattr(self._provider, attr)
+
+    @classmethod
+    def from_filename(cls, filename, metadata=None, **kw):
+        return cls.from_location(
+            _normalize_cached(filename), os.path.basename(filename), metadata,
+            **kw
+        )
+
+    def as_requirement(self):
+        """Return a ``Requirement`` that matches this distribution exactly"""
+        if isinstance(self.parsed_version, packaging.version.Version):
+            spec = "%s==%s" % (self.project_name, self.parsed_version)
+        else:
+            spec = "%s===%s" % (self.project_name, self.parsed_version)
+
+        return Requirement.parse(spec)
+
+    def load_entry_point(self, group, name):
+        """Return the `name` entry point of `group` or raise ImportError"""
+        ep = self.get_entry_info(group, name)
+        if ep is None:
+            raise ImportError("Entry point %r not found" % ((group, name),))
+        return ep.load()
+
+    def get_entry_map(self, group=None):
+        """Return the entry point map for `group`, or the full entry map"""
+        try:
+            ep_map = self._ep_map
+        except AttributeError:
+            ep_map = self._ep_map = EntryPoint.parse_map(
+                self._get_metadata('entry_points.txt'), self
+            )
+        if group is not None:
+            return ep_map.get(group,{})
+        return ep_map
+
+    def get_entry_info(self, group, name):
+        """Return the EntryPoint object for `group`+`name`, or ``None``"""
+        return self.get_entry_map(group).get(name)
+
+    def insert_on(self, path, loc = None):
+        """Insert self.location in path before its nearest parent directory"""
+
+        loc = loc or self.location
+        if not loc:
+            return
+
+        nloc = _normalize_cached(loc)
+        bdir = os.path.dirname(nloc)
+        npath= [(p and _normalize_cached(p) or p) for p in path]
+
+        for p, item in enumerate(npath):
+            if item == nloc:
+                break
+            elif item == bdir and self.precedence == EGG_DIST:
+                # if it's an .egg, give it precedence over its directory
+                if path is sys.path:
+                    self.check_version_conflict()
+                path.insert(p, loc)
+                npath.insert(p, nloc)
+                break
+        else:
+            if path is sys.path:
+                self.check_version_conflict()
+            path.append(loc)
+            return
+
+        # p is the spot where we found or inserted loc; now remove duplicates
+        while True:
+            try:
+                np = npath.index(nloc, p+1)
+            except ValueError:
+                break
+            else:
+                del npath[np], path[np]
+                # ha!
+                p = np
+
+        return
+
+    def check_version_conflict(self):
+        if self.key == 'setuptools':
+            # ignore the inevitable setuptools self-conflicts  :(
+            return
+
+        nsp = dict.fromkeys(self._get_metadata('namespace_packages.txt'))
+        loc = normalize_path(self.location)
+        for modname in self._get_metadata('top_level.txt'):
+            if (modname not in sys.modules or modname in nsp
+                    or modname in _namespace_packages):
+                continue
+            if modname in ('pkg_resources', 'setuptools', 'site'):
+                continue
+            fn = getattr(sys.modules[modname], '__file__', None)
+            if fn and (normalize_path(fn).startswith(loc) or
+                       fn.startswith(self.location)):
+                continue
+            issue_warning(
+                "Module %s was already imported from %s, but %s is being added"
+                " to sys.path" % (modname, fn, self.location),
+            )
+
+    def has_version(self):
+        try:
+            self.version
+        except ValueError:
+            issue_warning("Unbuilt egg for " + repr(self))
+            return False
+        return True
+
+    def clone(self,**kw):
+        """Copy this distribution, substituting in any changed keyword args"""
+        names = 'project_name version py_version platform location precedence'
+        for attr in names.split():
+            kw.setdefault(attr, getattr(self, attr, None))
+        kw.setdefault('metadata', self._provider)
+        return self.__class__(**kw)
+
+    @property
+    def extras(self):
+        return [dep for dep in self._dep_map if dep]
+
+
+class DistInfoDistribution(Distribution):
+    """Wrap an actual or potential sys.path entry w/metadata, .dist-info style"""
+    PKG_INFO = 'METADATA'
+    EQEQ = re.compile(r"([\(,])\s*(\d.*?)\s*([,\)])")
+
+    @property
+    def _parsed_pkg_info(self):
+        """Parse and cache metadata"""
+        try:
+            return self._pkg_info
+        except AttributeError:
+            metadata = self.get_metadata(self.PKG_INFO)
+            self._pkg_info = email.parser.Parser().parsestr(metadata)
+            return self._pkg_info
+
+    @property
+    def _dep_map(self):
+        try:
+            return self.__dep_map
+        except AttributeError:
+            self.__dep_map = self._compute_dependencies()
+            return self.__dep_map
+
+    def _preparse_requirement(self, requires_dist):
+        """Convert 'Foobar (1); baz' to ('Foobar ==1', 'baz')
+        Split environment marker, add == prefix to version specifiers as
+        necessary, and remove parenthesis.
+        """
+        parts = requires_dist.split(';', 1) + ['']
+        distvers = parts[0].strip()
+        mark = parts[1].strip()
+        distvers = re.sub(self.EQEQ, r"\1==\2\3", distvers)
+        distvers = distvers.replace('(', '').replace(')', '')
+        return (distvers, mark)
+
+    def _compute_dependencies(self):
+        """Recompute this distribution's dependencies."""
+        from _markerlib import compile as compile_marker
+        dm = self.__dep_map = {None: []}
+
+        reqs = []
+        # Including any condition expressions
+        for req in self._parsed_pkg_info.get_all('Requires-Dist') or []:
+            distvers, mark = self._preparse_requirement(req)
+            parsed = next(parse_requirements(distvers))
+            parsed.marker_fn = compile_marker(mark)
+            reqs.append(parsed)
+
+        def reqs_for_extra(extra):
+            for req in reqs:
+                if req.marker_fn(override={'extra':extra}):
+                    yield req
+
+        common = frozenset(reqs_for_extra(None))
+        dm[None].extend(common)
+
+        for extra in self._parsed_pkg_info.get_all('Provides-Extra') or []:
+            extra = safe_extra(extra.strip())
+            dm[extra] = list(frozenset(reqs_for_extra(extra)) - common)
+
+        return dm
+
+
+_distributionImpl = {
+    '.egg': Distribution,
+    '.egg-info': Distribution,
+    '.dist-info': DistInfoDistribution,
+    }
+
+
+def issue_warning(*args,**kw):
+    level = 1
+    g = globals()
+    try:
+        # find the first stack frame that is *not* code in
+        # the pkg_resources module, to use for the warning
+        while sys._getframe(level).f_globals is g:
+            level += 1
+    except ValueError:
+        pass
+    warnings.warn(stacklevel=level + 1, *args, **kw)
+
+
+class RequirementParseError(ValueError):
+    def __str__(self):
+        return ' '.join(self.args)
+
+
+def parse_requirements(strs):
+    """Yield ``Requirement`` objects for each specification in `strs`
+
+    `strs` must be a string, or a (possibly-nested) iterable thereof.
+    """
+    # create a steppable iterator, so we can handle \-continuations
+    lines = iter(yield_lines(strs))
+
+    def scan_list(ITEM, TERMINATOR, line, p, groups, item_name):
+
+        items = []
+
+        while not TERMINATOR(line, p):
+            if CONTINUE(line, p):
+                try:
+                    line = next(lines)
+                    p = 0
+                except StopIteration:
+                    msg = "\\ must not appear on the last nonblank line"
+                    raise RequirementParseError(msg)
+
+            match = ITEM(line, p)
+            if not match:
+                msg = "Expected " + item_name + " in"
+                raise RequirementParseError(msg, line, "at", line[p:])
+
+            items.append(match.group(*groups))
+            p = match.end()
+
+            match = COMMA(line, p)
+            if match:
+                # skip the comma
+                p = match.end()
+            elif not TERMINATOR(line, p):
+                msg = "Expected ',' or end-of-list in"
+                raise RequirementParseError(msg, line, "at", line[p:])
+
+        match = TERMINATOR(line, p)
+        # skip the terminator, if any
+        if match:
+            p = match.end()
+        return line, p, items
+
+    for line in lines:
+        match = DISTRO(line)
+        if not match:
+            raise RequirementParseError("Missing distribution spec", line)
+        project_name = match.group(1)
+        p = match.end()
+        extras = []
+
+        match = OBRACKET(line, p)
+        if match:
+            p = match.end()
+            line, p, extras = scan_list(
+                DISTRO, CBRACKET, line, p, (1,), "'extra' name"
+            )
+
+        line, p, specs = scan_list(VERSION, LINE_END, line, p, (1, 2),
+            "version spec")
+        specs = [(op, val) for op, val in specs]
+        yield Requirement(project_name, specs, extras)
+
+
+class Requirement:
+    def __init__(self, project_name, specs, extras):
+        """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
+        self.unsafe_name, project_name = project_name, safe_name(project_name)
+        self.project_name, self.key = project_name, project_name.lower()
+        self.specifier = packaging.specifiers.SpecifierSet(
+            ",".join(["".join([x, y]) for x, y in specs])
+        )
+        self.specs = specs
+        self.extras = tuple(map(safe_extra, extras))
+        self.hashCmp = (
+            self.key,
+            self.specifier,
+            frozenset(self.extras),
+        )
+        self.__hash = hash(self.hashCmp)
+
+    def __str__(self):
+        extras = ','.join(self.extras)
+        if extras:
+            extras = '[%s]' % extras
+        return '%s%s%s' % (self.project_name, extras, self.specifier)
+
+    def __eq__(self, other):
+        return (
+            isinstance(other, Requirement) and
+            self.hashCmp == other.hashCmp
+        )
+
+    def __ne__(self, other):
+        return not self == other
+
+    def __contains__(self, item):
+        if isinstance(item, Distribution):
+            if item.key != self.key:
+                return False
+
+            item = item.version
+
+        # Allow prereleases always in order to match the previous behavior of
+        # this method. In the future this should be smarter and follow PEP 440
+        # more accurately.
+        return self.specifier.contains(item, prereleases=True)
+
+    def __hash__(self):
+        return self.__hash
+
+    def __repr__(self): return "Requirement.parse(%r)" % str(self)
+
+    @staticmethod
+    def parse(s):
+        reqs = list(parse_requirements(s))
+        if reqs:
+            if len(reqs) == 1:
+                return reqs[0]
+            raise ValueError("Expected only one requirement", s)
+        raise ValueError("No requirements found", s)
+
+
+def _get_mro(cls):
+    """Get an mro for a type or classic class"""
+    if not isinstance(cls, type):
+        class cls(cls, object): pass
+        return cls.__mro__[1:]
+    return cls.__mro__
+
+def _find_adapter(registry, ob):
+    """Return an adapter factory for `ob` from `registry`"""
+    for t in _get_mro(getattr(ob, '__class__', type(ob))):
+        if t in registry:
+            return registry[t]
+
+
+def ensure_directory(path):
+    """Ensure that the parent directory of `path` exists"""
+    dirname = os.path.dirname(path)
+    if not os.path.isdir(dirname):
+        os.makedirs(dirname)
+
+
+def _bypass_ensure_directory(path):
+    """Sandbox-bypassing version of ensure_directory()"""
+    if not WRITE_SUPPORT:
+        raise IOError('"os.mkdir" not supported on this platform.')
+    dirname, filename = split(path)
+    if dirname and filename and not isdir(dirname):
+        _bypass_ensure_directory(dirname)
+        mkdir(dirname, 0o755)
+
+
+def split_sections(s):
+    """Split a string or iterable thereof into (section, content) pairs
+
+    Each ``section`` is a stripped version of the section header ("[section]")
+    and each ``content`` is a list of stripped lines excluding blank lines and
+    comment-only lines.  If there are any such lines before the first section
+    header, they're returned in a first ``section`` of ``None``.
+    """
+    section = None
+    content = []
+    for line in yield_lines(s):
+        if line.startswith("["):
+            if line.endswith("]"):
+                if section or content:
+                    yield section, content
+                section = line[1:-1].strip()
+                content = []
+            else:
+                raise ValueError("Invalid section heading", line)
+        else:
+            content.append(line)
+
+    # wrap up last segment
+    yield section, content
+
+def _mkstemp(*args,**kw):
+    old_open = os.open
+    try:
+        # temporarily bypass sandboxing
+        os.open = os_open
+        return tempfile.mkstemp(*args,**kw)
+    finally:
+        # and then put it back
+        os.open = old_open
+
+
+# Silence the PEP440Warning by default, so that end users don't get hit by it
+# randomly just because they use pkg_resources. We want to append the rule
+# because we want earlier uses of filterwarnings to take precedence over this
+# one.
+warnings.filterwarnings("ignore", category=PEP440Warning, append=True)
+
+
+# from jaraco.functools 1.3
+def _call_aside(f, *args, **kwargs):
+    f(*args, **kwargs)
+    return f
+
+
+@_call_aside
+def _initialize(g=globals()):
+    "Set up global resource manager (deliberately not state-saved)"
+    manager = ResourceManager()
+    g['_manager'] = manager
+    for name in dir(manager):
+        if not name.startswith('_'):
+            g[name] = getattr(manager, name)
+
+
+@_call_aside
+def _initialize_master_working_set():
+    """
+    Prepare the master working set and make the ``require()``
+    API available.
+
+    This function has explicit effects on the global state
+    of pkg_resources. It is intended to be invoked once at
+    the initialization of this module.
+
+    Invocation by other packages is unsupported and done
+    at their own risk.
+    """
+    working_set = WorkingSet._build_master()
+    _declare_state('object', working_set=working_set)
+
+    require = working_set.require
+    iter_entry_points = working_set.iter_entry_points
+    add_activation_listener = working_set.subscribe
+    run_script = working_set.run_script
+    # backward compatibility
+    run_main = run_script
+    # Activate all distributions already on sys.path, and ensure that
+    # all distributions added to the working set in the future (e.g. by
+    # calling ``require()``) will get activated as well.
+    add_activation_listener(lambda dist: dist.activate())
+    working_set.entries=[]
+    # match order
+    list(map(working_set.add_entry, sys.path))
+    globals().update(locals())
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..d819508
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..76bd830
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__about__.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__about__.py
new file mode 100644
index 0000000..eadb794
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__about__.py
@@ -0,0 +1,31 @@
+# Copyright 2014 Donald Stufft
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+__all__ = [
+    "__title__", "__summary__", "__uri__", "__version__", "__author__",
+    "__email__", "__license__", "__copyright__",
+]
+
+__title__ = "packaging"
+__summary__ = "Core utilities for Python packages"
+__uri__ = "https://github.com/pypa/packaging"
+
+__version__ = "15.3"
+
+__author__ = "Donald Stufft"
+__email__ = "donald@stufft.io"
+
+__license__ = "Apache License, Version 2.0"
+__copyright__ = "Copyright 2014 %s" % __author__
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__init__.py
new file mode 100644
index 0000000..c39a8ea
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__init__.py
@@ -0,0 +1,24 @@
+# Copyright 2014 Donald Stufft
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+from .__about__ import (
+    __author__, __copyright__, __email__, __license__, __summary__, __title__,
+    __uri__, __version__
+)
+
+__all__ = [
+    "__title__", "__summary__", "__uri__", "__version__", "__author__",
+    "__email__", "__license__", "__copyright__",
+]
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/__about__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/__about__.cpython-35.pyc
new file mode 100644
index 0000000..ef58c6a
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/__about__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..dd7a152
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/_compat.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/_compat.cpython-35.pyc
new file mode 100644
index 0000000..6cf9ca5
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/_compat.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/_structures.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/_structures.cpython-35.pyc
new file mode 100644
index 0000000..46f3ff1
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/_structures.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/specifiers.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/specifiers.cpython-35.pyc
new file mode 100644
index 0000000..988ed17
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/specifiers.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/version.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/version.cpython-35.pyc
new file mode 100644
index 0000000..a7485f8
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/__pycache__/version.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/_compat.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/_compat.py
new file mode 100644
index 0000000..5c396ce
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/_compat.py
@@ -0,0 +1,40 @@
+# Copyright 2014 Donald Stufft
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+import sys
+
+
+PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
+
+# flake8: noqa
+
+if PY3:
+    string_types = str,
+else:
+    string_types = basestring,
+
+
+def with_metaclass(meta, *bases):
+    """
+    Create a base class with a metaclass.
+    """
+    # This requires a bit of explanation: the basic idea is to make a dummy
+    # metaclass for one level of class instantiation that replaces itself with
+    # the actual metaclass.
+    class metaclass(meta):
+        def __new__(cls, name, this_bases, d):
+            return meta(name, bases, d)
+    return type.__new__(metaclass, 'temporary_class', (), {})
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/_structures.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/_structures.py
new file mode 100644
index 0000000..0ae9bb5
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/_structures.py
@@ -0,0 +1,78 @@
+# Copyright 2014 Donald Stufft
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+
+class Infinity(object):
+
+    def __repr__(self):
+        return "Infinity"
+
+    def __hash__(self):
+        return hash(repr(self))
+
+    def __lt__(self, other):
+        return False
+
+    def __le__(self, other):
+        return False
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__)
+
+    def __ne__(self, other):
+        return not isinstance(other, self.__class__)
+
+    def __gt__(self, other):
+        return True
+
+    def __ge__(self, other):
+        return True
+
+    def __neg__(self):
+        return NegativeInfinity
+
+Infinity = Infinity()
+
+
+class NegativeInfinity(object):
+
+    def __repr__(self):
+        return "-Infinity"
+
+    def __hash__(self):
+        return hash(repr(self))
+
+    def __lt__(self, other):
+        return True
+
+    def __le__(self, other):
+        return True
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__)
+
+    def __ne__(self, other):
+        return not isinstance(other, self.__class__)
+
+    def __gt__(self, other):
+        return False
+
+    def __ge__(self, other):
+        return False
+
+    def __neg__(self):
+        return Infinity
+
+NegativeInfinity = NegativeInfinity()
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/specifiers.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/specifiers.py
new file mode 100644
index 0000000..891664f
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/specifiers.py
@@ -0,0 +1,784 @@
+# Copyright 2014 Donald Stufft
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+import abc
+import functools
+import itertools
+import re
+
+from ._compat import string_types, with_metaclass
+from .version import Version, LegacyVersion, parse
+
+
+class InvalidSpecifier(ValueError):
+    """
+    An invalid specifier was found, users should refer to PEP 440.
+    """
+
+
+class BaseSpecifier(with_metaclass(abc.ABCMeta, object)):
+
+    @abc.abstractmethod
+    def __str__(self):
+        """
+        Returns the str representation of this Specifier like object. This
+        should be representative of the Specifier itself.
+        """
+
+    @abc.abstractmethod
+    def __hash__(self):
+        """
+        Returns a hash value for this Specifier like object.
+        """
+
+    @abc.abstractmethod
+    def __eq__(self, other):
+        """
+        Returns a boolean representing whether or not the two Specifier like
+        objects are equal.
+        """
+
+    @abc.abstractmethod
+    def __ne__(self, other):
+        """
+        Returns a boolean representing whether or not the two Specifier like
+        objects are not equal.
+        """
+
+    @abc.abstractproperty
+    def prereleases(self):
+        """
+        Returns whether or not pre-releases as a whole are allowed by this
+        specifier.
+        """
+
+    @prereleases.setter
+    def prereleases(self, value):
+        """
+        Sets whether or not pre-releases as a whole are allowed by this
+        specifier.
+        """
+
+    @abc.abstractmethod
+    def contains(self, item, prereleases=None):
+        """
+        Determines if the given item is contained within this specifier.
+        """
+
+    @abc.abstractmethod
+    def filter(self, iterable, prereleases=None):
+        """
+        Takes an iterable of items and filters them so that only items which
+        are contained within this specifier are allowed in it.
+        """
+
+
+class _IndividualSpecifier(BaseSpecifier):
+
+    _operators = {}
+
+    def __init__(self, spec="", prereleases=None):
+        match = self._regex.search(spec)
+        if not match:
+            raise InvalidSpecifier("Invalid specifier: '{0}'".format(spec))
+
+        self._spec = (
+            match.group("operator").strip(),
+            match.group("version").strip(),
+        )
+
+        # Store whether or not this Specifier should accept prereleases
+        self._prereleases = prereleases
+
+    def __repr__(self):
+        pre = (
+            ", prereleases={0!r}".format(self.prereleases)
+            if self._prereleases is not None
+            else ""
+        )
+
+        return "<{0}({1!r}{2})>".format(
+            self.__class__.__name__,
+            str(self),
+            pre,
+        )
+
+    def __str__(self):
+        return "{0}{1}".format(*self._spec)
+
+    def __hash__(self):
+        return hash(self._spec)
+
+    def __eq__(self, other):
+        if isinstance(other, string_types):
+            try:
+                other = self.__class__(other)
+            except InvalidSpecifier:
+                return NotImplemented
+        elif not isinstance(other, self.__class__):
+            return NotImplemented
+
+        return self._spec == other._spec
+
+    def __ne__(self, other):
+        if isinstance(other, string_types):
+            try:
+                other = self.__class__(other)
+            except InvalidSpecifier:
+                return NotImplemented
+        elif not isinstance(other, self.__class__):
+            return NotImplemented
+
+        return self._spec != other._spec
+
+    def _get_operator(self, op):
+        return getattr(self, "_compare_{0}".format(self._operators[op]))
+
+    def _coerce_version(self, version):
+        if not isinstance(version, (LegacyVersion, Version)):
+            version = parse(version)
+        return version
+
+    @property
+    def operator(self):
+        return self._spec[0]
+
+    @property
+    def version(self):
+        return self._spec[1]
+
+    @property
+    def prereleases(self):
+        return self._prereleases
+
+    @prereleases.setter
+    def prereleases(self, value):
+        self._prereleases = value
+
+    def __contains__(self, item):
+        return self.contains(item)
+
+    def contains(self, item, prereleases=None):
+        # Determine if prereleases are to be allowed or not.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # Normalize item to a Version or LegacyVersion, this allows us to have
+        # a shortcut for ``"2.0" in Specifier(">=2")
+        item = self._coerce_version(item)
+
+        # Determine if we should be supporting prereleases in this specifier
+        # or not, if we do not support prereleases than we can short circuit
+        # logic if this version is a prereleases.
+        if item.is_prerelease and not prereleases:
+            return False
+
+        # Actually do the comparison to determine if this item is contained
+        # within this Specifier or not.
+        return self._get_operator(self.operator)(item, self.version)
+
+    def filter(self, iterable, prereleases=None):
+        yielded = False
+        found_prereleases = []
+
+        kw = {"prereleases": prereleases if prereleases is not None else True}
+
+        # Attempt to iterate over all the values in the iterable and if any of
+        # them match, yield them.
+        for version in iterable:
+            parsed_version = self._coerce_version(version)
+
+            if self.contains(parsed_version, **kw):
+                # If our version is a prerelease, and we were not set to allow
+                # prereleases, then we'll store it for later incase nothing
+                # else matches this specifier.
+                if (parsed_version.is_prerelease
+                        and not (prereleases or self.prereleases)):
+                    found_prereleases.append(version)
+                # Either this is not a prerelease, or we should have been
+                # accepting prereleases from the begining.
+                else:
+                    yielded = True
+                    yield version
+
+        # Now that we've iterated over everything, determine if we've yielded
+        # any values, and if we have not and we have any prereleases stored up
+        # then we will go ahead and yield the prereleases.
+        if not yielded and found_prereleases:
+            for version in found_prereleases:
+                yield version
+
+
+class LegacySpecifier(_IndividualSpecifier):
+
+    _regex = re.compile(
+        r"""
+        ^
+        \s*
+        (?P<operator>(==|!=|<=|>=|<|>))
+        \s*
+        (?P<version>
+            [^\s]* # We just match everything, except for whitespace since this
+                   # is a "legacy" specifier and the version string can be just
+                   # about anything.
+        )
+        \s*
+        $
+        """,
+        re.VERBOSE | re.IGNORECASE,
+    )
+
+    _operators = {
+        "==": "equal",
+        "!=": "not_equal",
+        "<=": "less_than_equal",
+        ">=": "greater_than_equal",
+        "<": "less_than",
+        ">": "greater_than",
+    }
+
+    def _coerce_version(self, version):
+        if not isinstance(version, LegacyVersion):
+            version = LegacyVersion(str(version))
+        return version
+
+    def _compare_equal(self, prospective, spec):
+        return prospective == self._coerce_version(spec)
+
+    def _compare_not_equal(self, prospective, spec):
+        return prospective != self._coerce_version(spec)
+
+    def _compare_less_than_equal(self, prospective, spec):
+        return prospective <= self._coerce_version(spec)
+
+    def _compare_greater_than_equal(self, prospective, spec):
+        return prospective >= self._coerce_version(spec)
+
+    def _compare_less_than(self, prospective, spec):
+        return prospective < self._coerce_version(spec)
+
+    def _compare_greater_than(self, prospective, spec):
+        return prospective > self._coerce_version(spec)
+
+
+def _require_version_compare(fn):
+    @functools.wraps(fn)
+    def wrapped(self, prospective, spec):
+        if not isinstance(prospective, Version):
+            return False
+        return fn(self, prospective, spec)
+    return wrapped
+
+
+class Specifier(_IndividualSpecifier):
+
+    _regex = re.compile(
+        r"""
+        ^
+        \s*
+        (?P<operator>(~=|==|!=|<=|>=|<|>|===))
+        (?P<version>
+            (?:
+                # The identity operators allow for an escape hatch that will
+                # do an exact string match of the version you wish to install.
+                # This will not be parsed by PEP 440 and we cannot determine
+                # any semantic meaning from it. This operator is discouraged
+                # but included entirely as an escape hatch.
+                (?<====)  # Only match for the identity operator
+                \s*
+                [^\s]*    # We just match everything, except for whitespace
+                          # since we are only testing for strict identity.
+            )
+            |
+            (?:
+                # The (non)equality operators allow for wild card and local
+                # versions to be specified so we have to define these two
+                # operators separately to enable that.
+                (?<===|!=)            # Only match for equals and not equals
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)*   # release
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+
+                # You cannot use a wild card and a dev or local version
+                # together so group them with a | and make them optional.
+                (?:
+                    (?:[-_\.]?dev[-_\.]?[0-9]*)?         # dev release
+                    (?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)? # local
+                    |
+                    \.\*  # Wild card syntax of .*
+                )?
+            )
+            |
+            (?:
+                # The compatible operator requires at least two digits in the
+                # release segment.
+                (?<=~=)               # Only match for the compatible operator
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)+   # release  (We have a + instead of a *)
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
+            )
+            |
+            (?:
+                # All other operators only allow a sub set of what the
+                # (non)equality operators do. Specifically they do not allow
+                # local versions to be specified nor do they allow the prefix
+                # matching wild cards.
+                (?<!==|!=|~=)         # We have special cases for these
+                                      # operators so we want to make sure they
+                                      # don't match here.
+
+                \s*
+                v?
+                (?:[0-9]+!)?          # epoch
+                [0-9]+(?:\.[0-9]+)*   # release
+                (?:                   # pre release
+                    [-_\.]?
+                    (a|b|c|rc|alpha|beta|pre|preview)
+                    [-_\.]?
+                    [0-9]*
+                )?
+                (?:                                   # post release
+                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
+                )?
+                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
+            )
+        )
+        \s*
+        $
+        """,
+        re.VERBOSE | re.IGNORECASE,
+    )
+
+    _operators = {
+        "~=": "compatible",
+        "==": "equal",
+        "!=": "not_equal",
+        "<=": "less_than_equal",
+        ">=": "greater_than_equal",
+        "<": "less_than",
+        ">": "greater_than",
+        "===": "arbitrary",
+    }
+
+    @_require_version_compare
+    def _compare_compatible(self, prospective, spec):
+        # Compatible releases have an equivalent combination of >= and ==. That
+        # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to
+        # implement this in terms of the other specifiers instead of
+        # implementing it ourselves. The only thing we need to do is construct
+        # the other specifiers.
+
+        # We want everything but the last item in the version, but we want to
+        # ignore post and dev releases and we want to treat the pre-release as
+        # it's own separate segment.
+        prefix = ".".join(
+            list(
+                itertools.takewhile(
+                    lambda x: (not x.startswith("post")
+                               and not x.startswith("dev")),
+                    _version_split(spec),
+                )
+            )[:-1]
+        )
+
+        # Add the prefix notation to the end of our string
+        prefix += ".*"
+
+        return (self._get_operator(">=")(prospective, spec)
+                and self._get_operator("==")(prospective, prefix))
+
+    @_require_version_compare
+    def _compare_equal(self, prospective, spec):
+        # We need special logic to handle prefix matching
+        if spec.endswith(".*"):
+            # Split the spec out by dots, and pretend that there is an implicit
+            # dot in between a release segment and a pre-release segment.
+            spec = _version_split(spec[:-2])  # Remove the trailing .*
+
+            # Split the prospective version out by dots, and pretend that there
+            # is an implicit dot in between a release segment and a pre-release
+            # segment.
+            prospective = _version_split(str(prospective))
+
+            # Shorten the prospective version to be the same length as the spec
+            # so that we can determine if the specifier is a prefix of the
+            # prospective version or not.
+            prospective = prospective[:len(spec)]
+
+            # Pad out our two sides with zeros so that they both equal the same
+            # length.
+            spec, prospective = _pad_version(spec, prospective)
+        else:
+            # Convert our spec string into a Version
+            spec = Version(spec)
+
+            # If the specifier does not have a local segment, then we want to
+            # act as if the prospective version also does not have a local
+            # segment.
+            if not spec.local:
+                prospective = Version(prospective.public)
+
+        return prospective == spec
+
+    @_require_version_compare
+    def _compare_not_equal(self, prospective, spec):
+        return not self._compare_equal(prospective, spec)
+
+    @_require_version_compare
+    def _compare_less_than_equal(self, prospective, spec):
+        return prospective <= Version(spec)
+
+    @_require_version_compare
+    def _compare_greater_than_equal(self, prospective, spec):
+        return prospective >= Version(spec)
+
+    @_require_version_compare
+    def _compare_less_than(self, prospective, spec):
+        # Convert our spec to a Version instance, since we'll want to work with
+        # it as a version.
+        spec = Version(spec)
+
+        # Check to see if the prospective version is less than the spec
+        # version. If it's not we can short circuit and just return False now
+        # instead of doing extra unneeded work.
+        if not prospective < spec:
+            return False
+
+        # This special case is here so that, unless the specifier itself
+        # includes is a pre-release version, that we do not accept pre-release
+        # versions for the version mentioned in the specifier (e.g. <3.1 should
+        # not match 3.1.dev0, but should match 3.0.dev0).
+        if not spec.is_prerelease and prospective.is_prerelease:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # If we've gotten to here, it means that prospective version is both
+        # less than the spec version *and* it's not a pre-release of the same
+        # version in the spec.
+        return True
+
+    @_require_version_compare
+    def _compare_greater_than(self, prospective, spec):
+        # Convert our spec to a Version instance, since we'll want to work with
+        # it as a version.
+        spec = Version(spec)
+
+        # Check to see if the prospective version is greater than the spec
+        # version. If it's not we can short circuit and just return False now
+        # instead of doing extra unneeded work.
+        if not prospective > spec:
+            return False
+
+        # This special case is here so that, unless the specifier itself
+        # includes is a post-release version, that we do not accept
+        # post-release versions for the version mentioned in the specifier
+        # (e.g. >3.1 should not match 3.0.post0, but should match 3.2.post0).
+        if not spec.is_postrelease and prospective.is_postrelease:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # Ensure that we do not allow a local version of the version mentioned
+        # in the specifier, which is techincally greater than, to match.
+        if prospective.local is not None:
+            if Version(prospective.base_version) == Version(spec.base_version):
+                return False
+
+        # If we've gotten to here, it means that prospective version is both
+        # greater than the spec version *and* it's not a pre-release of the
+        # same version in the spec.
+        return True
+
+    def _compare_arbitrary(self, prospective, spec):
+        return str(prospective).lower() == str(spec).lower()
+
+    @property
+    def prereleases(self):
+        # If there is an explicit prereleases set for this, then we'll just
+        # blindly use that.
+        if self._prereleases is not None:
+            return self._prereleases
+
+        # Look at all of our specifiers and determine if they are inclusive
+        # operators, and if they are if they are including an explicit
+        # prerelease.
+        operator, version = self._spec
+        if operator in ["==", ">=", "<=", "~=", "==="]:
+            # The == specifier can include a trailing .*, if it does we
+            # want to remove before parsing.
+            if operator == "==" and version.endswith(".*"):
+                version = version[:-2]
+
+            # Parse the version, and if it is a pre-release than this
+            # specifier allows pre-releases.
+            if parse(version).is_prerelease:
+                return True
+
+        return False
+
+    @prereleases.setter
+    def prereleases(self, value):
+        self._prereleases = value
+
+
+_prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$")
+
+
+def _version_split(version):
+    result = []
+    for item in version.split("."):
+        match = _prefix_regex.search(item)
+        if match:
+            result.extend(match.groups())
+        else:
+            result.append(item)
+    return result
+
+
+def _pad_version(left, right):
+    left_split, right_split = [], []
+
+    # Get the release segment of our versions
+    left_split.append(list(itertools.takewhile(lambda x: x.isdigit(), left)))
+    right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right)))
+
+    # Get the rest of our versions
+    left_split.append(left[len(left_split):])
+    right_split.append(left[len(right_split):])
+
+    # Insert our padding
+    left_split.insert(
+        1,
+        ["0"] * max(0, len(right_split[0]) - len(left_split[0])),
+    )
+    right_split.insert(
+        1,
+        ["0"] * max(0, len(left_split[0]) - len(right_split[0])),
+    )
+
+    return (
+        list(itertools.chain(*left_split)),
+        list(itertools.chain(*right_split)),
+    )
+
+
+class SpecifierSet(BaseSpecifier):
+
+    def __init__(self, specifiers="", prereleases=None):
+        # Split on , to break each indidivual specifier into it's own item, and
+        # strip each item to remove leading/trailing whitespace.
+        specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
+
+        # Parsed each individual specifier, attempting first to make it a
+        # Specifier and falling back to a LegacySpecifier.
+        parsed = set()
+        for specifier in specifiers:
+            try:
+                parsed.add(Specifier(specifier))
+            except InvalidSpecifier:
+                parsed.add(LegacySpecifier(specifier))
+
+        # Turn our parsed specifiers into a frozen set and save them for later.
+        self._specs = frozenset(parsed)
+
+        # Store our prereleases value so we can use it later to determine if
+        # we accept prereleases or not.
+        self._prereleases = prereleases
+
+    def __repr__(self):
+        pre = (
+            ", prereleases={0!r}".format(self.prereleases)
+            if self._prereleases is not None
+            else ""
+        )
+
+        return "<SpecifierSet({0!r}{1})>".format(str(self), pre)
+
+    def __str__(self):
+        return ",".join(sorted(str(s) for s in self._specs))
+
+    def __hash__(self):
+        return hash(self._specs)
+
+    def __and__(self, other):
+        if isinstance(other, string_types):
+            other = SpecifierSet(other)
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        specifier = SpecifierSet()
+        specifier._specs = frozenset(self._specs | other._specs)
+
+        if self._prereleases is None and other._prereleases is not None:
+            specifier._prereleases = other._prereleases
+        elif self._prereleases is not None and other._prereleases is None:
+            specifier._prereleases = self._prereleases
+        elif self._prereleases == other._prereleases:
+            specifier._prereleases = self._prereleases
+        else:
+            raise ValueError(
+                "Cannot combine SpecifierSets with True and False prerelease "
+                "overrides."
+            )
+
+        return specifier
+
+    def __eq__(self, other):
+        if isinstance(other, string_types):
+            other = SpecifierSet(other)
+        elif isinstance(other, _IndividualSpecifier):
+            other = SpecifierSet(str(other))
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        return self._specs == other._specs
+
+    def __ne__(self, other):
+        if isinstance(other, string_types):
+            other = SpecifierSet(other)
+        elif isinstance(other, _IndividualSpecifier):
+            other = SpecifierSet(str(other))
+        elif not isinstance(other, SpecifierSet):
+            return NotImplemented
+
+        return self._specs != other._specs
+
+    def __len__(self):
+        return len(self._specs)
+
+    def __iter__(self):
+        return iter(self._specs)
+
+    @property
+    def prereleases(self):
+        # If we have been given an explicit prerelease modifier, then we'll
+        # pass that through here.
+        if self._prereleases is not None:
+            return self._prereleases
+
+        # If we don't have any specifiers, and we don't have a forced value,
+        # then we'll just return None since we don't know if this should have
+        # pre-releases or not.
+        if not self._specs:
+            return None
+
+        # Otherwise we'll see if any of the given specifiers accept
+        # prereleases, if any of them do we'll return True, otherwise False.
+        return any(s.prereleases for s in self._specs)
+
+    @prereleases.setter
+    def prereleases(self, value):
+        self._prereleases = value
+
+    def __contains__(self, item):
+        return self.contains(item)
+
+    def contains(self, item, prereleases=None):
+        # Ensure that our item is a Version or LegacyVersion instance.
+        if not isinstance(item, (LegacyVersion, Version)):
+            item = parse(item)
+
+        # Determine if we're forcing a prerelease or not, if we're not forcing
+        # one for this particular filter call, then we'll use whatever the
+        # SpecifierSet thinks for whether or not we should support prereleases.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # We can determine if we're going to allow pre-releases by looking to
+        # see if any of the underlying items supports them. If none of them do
+        # and this item is a pre-release then we do not allow it and we can
+        # short circuit that here.
+        # Note: This means that 1.0.dev1 would not be contained in something
+        #       like >=1.0.devabc however it would be in >=1.0.debabc,>0.0.dev0
+        if not prereleases and item.is_prerelease:
+            return False
+
+        # We simply dispatch to the underlying specs here to make sure that the
+        # given version is contained within all of them.
+        # Note: This use of all() here means that an empty set of specifiers
+        #       will always return True, this is an explicit design decision.
+        return all(
+            s.contains(item, prereleases=prereleases)
+            for s in self._specs
+        )
+
+    def filter(self, iterable, prereleases=None):
+        # Determine if we're forcing a prerelease or not, if we're not forcing
+        # one for this particular filter call, then we'll use whatever the
+        # SpecifierSet thinks for whether or not we should support prereleases.
+        if prereleases is None:
+            prereleases = self.prereleases
+
+        # If we have any specifiers, then we want to wrap our iterable in the
+        # filter method for each one, this will act as a logical AND amongst
+        # each specifier.
+        if self._specs:
+            for spec in self._specs:
+                iterable = spec.filter(iterable, prereleases=bool(prereleases))
+            return iterable
+        # If we do not have any specifiers, then we need to have a rough filter
+        # which will filter out any pre-releases, unless there are no final
+        # releases, and which will filter out LegacyVersion in general.
+        else:
+            filtered = []
+            found_prereleases = []
+
+            for item in iterable:
+                # Ensure that we some kind of Version class for this item.
+                if not isinstance(item, (LegacyVersion, Version)):
+                    parsed_version = parse(item)
+                else:
+                    parsed_version = item
+
+                # Filter out any item which is parsed as a LegacyVersion
+                if isinstance(parsed_version, LegacyVersion):
+                    continue
+
+                # Store any item which is a pre-release for later unless we've
+                # already found a final version or we are accepting prereleases
+                if parsed_version.is_prerelease and not prereleases:
+                    if not filtered:
+                        found_prereleases.append(item)
+                else:
+                    filtered.append(item)
+
+            # If we've found no items except for pre-releases, then we'll go
+            # ahead and use the pre-releases
+            if not filtered and found_prereleases and prereleases is None:
+                return found_prereleases
+
+            return filtered
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/version.py b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/version.py
new file mode 100644
index 0000000..4ba574b
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pkg_resources/_vendor/packaging/version.py
@@ -0,0 +1,403 @@
+# Copyright 2014 Donald Stufft
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import, division, print_function
+
+import collections
+import itertools
+import re
+
+from ._structures import Infinity
+
+
+__all__ = [
+    "parse", "Version", "LegacyVersion", "InvalidVersion", "VERSION_PATTERN"
+]
+
+
+_Version = collections.namedtuple(
+    "_Version",
+    ["epoch", "release", "dev", "pre", "post", "local"],
+)
+
+
+def parse(version):
+    """
+    Parse the given version string and return either a :class:`Version` object
+    or a :class:`LegacyVersion` object depending on if the given version is
+    a valid PEP 440 version or a legacy version.
+    """
+    try:
+        return Version(version)
+    except InvalidVersion:
+        return LegacyVersion(version)
+
+
+class InvalidVersion(ValueError):
+    """
+    An invalid version was found, users should refer to PEP 440.
+    """
+
+
+class _BaseVersion(object):
+
+    def __hash__(self):
+        return hash(self._key)
+
+    def __lt__(self, other):
+        return self._compare(other, lambda s, o: s < o)
+
+    def __le__(self, other):
+        return self._compare(other, lambda s, o: s <= o)
+
+    def __eq__(self, other):
+        return self._compare(other, lambda s, o: s == o)
+
+    def __ge__(self, other):
+        return self._compare(other, lambda s, o: s >= o)
+
+    def __gt__(self, other):
+        return self._compare(other, lambda s, o: s > o)
+
+    def __ne__(self, other):
+        return self._compare(other, lambda s, o: s != o)
+
+    def _compare(self, other, method):
+        if not isinstance(other, _BaseVersion):
+            return NotImplemented
+
+        return method(self._key, other._key)
+
+
+class LegacyVersion(_BaseVersion):
+
+    def __init__(self, version):
+        self._version = str(version)
+        self._key = _legacy_cmpkey(self._version)
+
+    def __str__(self):
+        return self._version
+
+    def __repr__(self):
+        return "<LegacyVersion({0})>".format(repr(str(self)))
+
+    @property
+    def public(self):
+        return self._version
+
+    @property
+    def base_version(self):
+        return self._version
+
+    @property
+    def local(self):
+        return None
+
+    @property
+    def is_prerelease(self):
+        return False
+
+    @property
+    def is_postrelease(self):
+        return False
+
+
+_legacy_version_component_re = re.compile(
+    r"(\d+ | [a-z]+ | \.| -)", re.VERBOSE,
+)
+
+_legacy_version_replacement_map = {
+    "pre": "c", "preview": "c", "-": "final-", "rc": "c", "dev": "@",
+}
+
+
+def _parse_version_parts(s):
+    for part in _legacy_version_component_re.split(s):
+        part = _legacy_version_replacement_map.get(part, part)
+
+        if not part or part == ".":
+            continue
+
+        if part[:1] in "0123456789":
+            # pad for numeric comparison
+            yield part.zfill(8)
+        else:
+            yield "*" + part
+
+    # ensure that alpha/beta/candidate are before final
+    yield "*final"
+
+
+def _legacy_cmpkey(version):
+    # We hardcode an epoch of -1 here. A PEP 440 version can only have a epoch
+    # greater than or equal to 0. This will effectively put the LegacyVersion,
+    # which uses the defacto standard originally implemented by setuptools,
+    # as before all PEP 440 versions.
+    epoch = -1
+
+    # This scheme is taken from pkg_resources.parse_version setuptools prior to
+    # it's adoption of the packaging library.
+    parts = []
+    for part in _parse_version_parts(version.lower()):
+        if part.startswith("*"):
+            # remove "-" before a prerelease tag
+            if part < "*final":
+                while parts and parts[-1] == "*final-":
+                    parts.pop()
+
+            # remove trailing zeros from each series of numeric parts
+            while parts and parts[-1] == "00000000":
+                parts.pop()
+
+        parts.append(part)
+    parts = tuple(parts)
+
+    return epoch, parts
+
+# Deliberately not anchored to the start and end of the string, to make it
+# easier for 3rd party code to reuse
+VERSION_PATTERN = r"""
+    v?
+    (?:
+        (?:(?P<epoch>[0-9]+)!)?                           # epoch
+        (?P<release>[0-9]+(?:\.[0-9]+)*)                  # release segment
+        (?P<pre>                                          # pre-release
+            [-_\.]?
+            (?P<pre_l>(a|b|c|rc|alpha|beta|pre|preview))
+            [-_\.]?
+            (?P<pre_n>[0-9]+)?
+        )?
+        (?P<post>                                         # post release
+            (?:-(?P<post_n1>[0-9]+))
+            |
+            (?:
+                [-_\.]?
+                (?P<post_l>post|rev|r)
+                [-_\.]?
+                (?P<post_n2>[0-9]+)?
+            )
+        )?
+        (?P<dev>                                          # dev release
+            [-_\.]?
+            (?P<dev_l>dev)
+            [-_\.]?
+            (?P<dev_n>[0-9]+)?
+        )?
+    )
+    (?:\+(?P<local>[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
+"""
+
+
+class Version(_BaseVersion):
+
+    _regex = re.compile(
+        r"^\s*" + VERSION_PATTERN + r"\s*$",
+        re.VERBOSE | re.IGNORECASE,
+    )
+
+    def __init__(self, version):
+        # Validate the version and parse it into pieces
+        match = self._regex.search(version)
+        if not match:
+            raise InvalidVersion("Invalid version: '{0}'".format(version))
+
+        # Store the parsed out pieces of the version
+        self._version = _Version(
+            epoch=int(match.group("epoch")) if match.group("epoch") else 0,
+            release=tuple(int(i) for i in match.group("release").split(".")),
+            pre=_parse_letter_version(
+                match.group("pre_l"),
+                match.group("pre_n"),
+            ),
+            post=_parse_letter_version(
+                match.group("post_l"),
+                match.group("post_n1") or match.group("post_n2"),
+            ),
+            dev=_parse_letter_version(
+                match.group("dev_l"),
+                match.group("dev_n"),
+            ),
+            local=_parse_local_version(match.group("local")),
+        )
+
+        # Generate a key which will be used for sorting
+        self._key = _cmpkey(
+            self._version.epoch,
+            self._version.release,
+            self._version.pre,
+            self._version.post,
+            self._version.dev,
+            self._version.local,
+        )
+
+    def __repr__(self):
+        return "<Version({0})>".format(repr(str(self)))
+
+    def __str__(self):
+        parts = []
+
+        # Epoch
+        if self._version.epoch != 0:
+            parts.append("{0}!".format(self._version.epoch))
+
+        # Release segment
+        parts.append(".".join(str(x) for x in self._version.release))
+
+        # Pre-release
+        if self._version.pre is not None:
+            parts.append("".join(str(x) for x in self._version.pre))
+
+        # Post-release
+        if self._version.post is not None:
+            parts.append(".post{0}".format(self._version.post[1]))
+
+        # Development release
+        if self._version.dev is not None:
+            parts.append(".dev{0}".format(self._version.dev[1]))
+
+        # Local version segment
+        if self._version.local is not None:
+            parts.append(
+                "+{0}".format(".".join(str(x) for x in self._version.local))
+            )
+
+        return "".join(parts)
+
+    @property
+    def public(self):
+        return str(self).split("+", 1)[0]
+
+    @property
+    def base_version(self):
+        parts = []
+
+        # Epoch
+        if self._version.epoch != 0:
+            parts.append("{0}!".format(self._version.epoch))
+
+        # Release segment
+        parts.append(".".join(str(x) for x in self._version.release))
+
+        return "".join(parts)
+
+    @property
+    def local(self):
+        version_string = str(self)
+        if "+" in version_string:
+            return version_string.split("+", 1)[1]
+
+    @property
+    def is_prerelease(self):
+        return bool(self._version.dev or self._version.pre)
+
+    @property
+    def is_postrelease(self):
+        return bool(self._version.post)
+
+
+def _parse_letter_version(letter, number):
+    if letter:
+        # We consider there to be an implicit 0 in a pre-release if there is
+        # not a numeral associated with it.
+        if number is None:
+            number = 0
+
+        # We normalize any letters to their lower case form
+        letter = letter.lower()
+
+        # We consider some words to be alternate spellings of other words and
+        # in those cases we want to normalize the spellings to our preferred
+        # spelling.
+        if letter == "alpha":
+            letter = "a"
+        elif letter == "beta":
+            letter = "b"
+        elif letter in ["c", "pre", "preview"]:
+            letter = "rc"
+        elif letter in ["rev", "r"]:
+            letter = "post"
+
+        return letter, int(number)
+    if not letter and number:
+        # We assume if we are given a number, but we are not given a letter
+        # then this is using the implicit post release syntax (e.g. 1.0-1)
+        letter = "post"
+
+        return letter, int(number)
+
+
+_local_version_seperators = re.compile(r"[\._-]")
+
+
+def _parse_local_version(local):
+    """
+    Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
+    """
+    if local is not None:
+        return tuple(
+            part.lower() if not part.isdigit() else int(part)
+            for part in _local_version_seperators.split(local)
+        )
+
+
+def _cmpkey(epoch, release, pre, post, dev, local):
+    # When we compare a release version, we want to compare it with all of the
+    # trailing zeros removed. So we'll use a reverse the list, drop all the now
+    # leading zeros until we come to something non zero, then take the rest
+    # re-reverse it back into the correct order and make it a tuple and use
+    # that for our sorting key.
+    release = tuple(
+        reversed(list(
+            itertools.dropwhile(
+                lambda x: x == 0,
+                reversed(release),
+            )
+        ))
+    )
+
+    # We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
+    # We'll do this by abusing the pre segment, but we _only_ want to do this
+    # if there is not a pre or a post segment. If we have one of those then
+    # the normal sorting rules will handle this case correctly.
+    if pre is None and post is None and dev is not None:
+        pre = -Infinity
+    # Versions without a pre-release (except as noted above) should sort after
+    # those with one.
+    elif pre is None:
+        pre = Infinity
+
+    # Versions without a post segment should sort before those with one.
+    if post is None:
+        post = -Infinity
+
+    # Versions without a development segment should sort after those with one.
+    if dev is None:
+        dev = Infinity
+
+    if local is None:
+        # Versions without a local segment should sort before those with one.
+        local = -Infinity
+    else:
+        # Versions with a local segment need that segment parsed to implement
+        # the sorting rules in PEP440.
+        # - Alpha numeric segments sort before numeric segments
+        # - Alpha numeric segments sort lexicographically
+        # - Numeric segments sort numerically
+        # - Shorter versions sort before longer versions when the prefixes
+        #   match exactly
+        local = tuple(
+            (i, "") if isinstance(i, int) else (-Infinity, i)
+            for i in local
+        )
+
+    return epoch, release, pre, post, dev, local
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__init__.py
new file mode 100644
index 0000000..1f04780
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__init__.py
@@ -0,0 +1 @@
+__version__ = '0.9.2'
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__main__.py b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__main__.py
new file mode 100644
index 0000000..a69e689
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__main__.py
@@ -0,0 +1,5 @@
+from pyflakes.api import main
+
+# python -m pyflakes (with Python >= 2.7)
+if __name__ == '__main__':
+    main(prog='pyflakes')
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..4daa3fb
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/checker.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/checker.cpython-35.pyc
new file mode 100644
index 0000000..e5c74ba
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/checker.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/messages.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/messages.cpython-35.pyc
new file mode 100644
index 0000000..43a156f
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/__pycache__/messages.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/api.py b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/api.py
new file mode 100644
index 0000000..3bc2330
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/api.py
@@ -0,0 +1,175 @@
+"""
+API for the command-line I{pyflakes} tool.
+"""
+from __future__ import with_statement
+
+import sys
+import os
+import _ast
+
+from pyflakes import checker, __version__
+from pyflakes import reporter as modReporter
+
+__all__ = ['check', 'checkPath', 'checkRecursive', 'iterSourceCode', 'main']
+
+
+def check(codeString, filename, reporter=None):
+    """
+    Check the Python source given by C{codeString} for flakes.
+
+    @param codeString: The Python source to check.
+    @type codeString: C{str}
+
+    @param filename: The name of the file the source came from, used to report
+        errors.
+    @type filename: C{str}
+
+    @param reporter: A L{Reporter} instance, where errors and warnings will be
+        reported.
+
+    @return: The number of warnings emitted.
+    @rtype: C{int}
+    """
+    if reporter is None:
+        reporter = modReporter._makeDefaultReporter()
+    # First, compile into an AST and handle syntax errors.
+    try:
+        tree = compile(codeString, filename, "exec", _ast.PyCF_ONLY_AST)
+    except SyntaxError:
+        value = sys.exc_info()[1]
+        msg = value.args[0]
+
+        (lineno, offset, text) = value.lineno, value.offset, value.text
+
+        # If there's an encoding problem with the file, the text is None.
+        if text is None:
+            # Avoid using msg, since for the only known case, it contains a
+            # bogus message that claims the encoding the file declared was
+            # unknown.
+            reporter.unexpectedError(filename, 'problem decoding source')
+        else:
+            reporter.syntaxError(filename, msg, lineno, offset, text)
+        return 1
+    except Exception:
+        reporter.unexpectedError(filename, 'problem decoding source')
+        return 1
+    # Okay, it's syntactically valid.  Now check it.
+    w = checker.Checker(tree, filename)
+    w.messages.sort(key=lambda m: m.lineno)
+    for warning in w.messages:
+        reporter.flake(warning)
+    return len(w.messages)
+
+
+def checkPath(filename, reporter=None):
+    """
+    Check the given path, printing out any warnings detected.
+
+    @param reporter: A L{Reporter} instance, where errors and warnings will be
+        reported.
+
+    @return: the number of warnings printed
+    """
+    if reporter is None:
+        reporter = modReporter._makeDefaultReporter()
+    try:
+        # in Python 2.6, compile() will choke on \r\n line endings. In later
+        # versions of python it's smarter, and we want binary mode to give
+        # compile() the best opportunity to do the right thing WRT text
+        # encodings.
+        if sys.version_info < (2, 7):
+            mode = 'rU'
+        else:
+            mode = 'rb'
+
+        with open(filename, mode) as f:
+            codestr = f.read()
+        if sys.version_info < (2, 7):
+            codestr += '\n'     # Work around for Python <= 2.6
+    except UnicodeError:
+        reporter.unexpectedError(filename, 'problem decoding source')
+        return 1
+    except IOError:
+        msg = sys.exc_info()[1]
+        reporter.unexpectedError(filename, msg.args[1])
+        return 1
+    return check(codestr, filename, reporter)
+
+
+def iterSourceCode(paths):
+    """
+    Iterate over all Python source files in C{paths}.
+
+    @param paths: A list of paths.  Directories will be recursed into and
+        any .py files found will be yielded.  Any non-directories will be
+        yielded as-is.
+    """
+    for path in paths:
+        if os.path.isdir(path):
+            for dirpath, dirnames, filenames in os.walk(path):
+                for filename in filenames:
+                    if filename.endswith('.py'):
+                        yield os.path.join(dirpath, filename)
+        else:
+            yield path
+
+
+def checkRecursive(paths, reporter):
+    """
+    Recursively check all source files in C{paths}.
+
+    @param paths: A list of paths to Python source files and directories
+        containing Python source files.
+    @param reporter: A L{Reporter} where all of the warnings and errors
+        will be reported to.
+    @return: The number of warnings found.
+    """
+    warnings = 0
+    for sourcePath in iterSourceCode(paths):
+        warnings += checkPath(sourcePath, reporter)
+    return warnings
+
+
+def _exitOnSignal(sigName, message):
+    """Handles a signal with sys.exit.
+
+    Some of these signals (SIGPIPE, for example) don't exist or are invalid on
+    Windows. So, ignore errors that might arise.
+    """
+    import signal
+
+    try:
+        sigNumber = getattr(signal, sigName)
+    except AttributeError:
+        # the signal constants defined in the signal module are defined by
+        # whether the C library supports them or not. So, SIGPIPE might not
+        # even be defined.
+        return
+
+    def handler(sig, f):
+        sys.exit(message)
+
+    try:
+        signal.signal(sigNumber, handler)
+    except ValueError:
+        # It's also possible the signal is defined, but then it's invalid. In
+        # this case, signal.signal raises ValueError.
+        pass
+
+
+def main(prog=None):
+    """Entry point for the script "pyflakes"."""
+    import optparse
+
+    # Handle "Keyboard Interrupt" and "Broken pipe" gracefully
+    _exitOnSignal('SIGINT', '... stopped')
+    _exitOnSignal('SIGPIPE', 1)
+
+    parser = optparse.OptionParser(prog=prog, version=__version__)
+    (__, args) = parser.parse_args()
+    reporter = modReporter._makeDefaultReporter()
+    if args:
+        warnings = checkRecursive(args, reporter)
+    else:
+        warnings = check(sys.stdin.read(), '<stdin>', reporter)
+    raise SystemExit(warnings > 0)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/checker.py b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/checker.py
new file mode 100644
index 0000000..e6e1942
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/checker.py
@@ -0,0 +1,925 @@
+"""
+Main module.
+
+Implement the central Checker class.
+Also, it models the Bindings and Scopes.
+"""
+import doctest
+import os
+import sys
+
+PY2 = sys.version_info < (3, 0)
+PY32 = sys.version_info < (3, 3)    # Python 2.5 to 3.2
+PY33 = sys.version_info < (3, 4)    # Python 2.5 to 3.3
+builtin_vars = dir(__import__('__builtin__' if PY2 else 'builtins'))
+
+try:
+    import ast
+except ImportError:     # Python 2.5
+    import _ast as ast
+
+    if 'decorator_list' not in ast.ClassDef._fields:
+        # Patch the missing attribute 'decorator_list'
+        ast.ClassDef.decorator_list = ()
+        ast.FunctionDef.decorator_list = property(lambda s: s.decorators)
+
+from pyflakes import messages
+
+
+if PY2:
+    def getNodeType(node_class):
+        # workaround str.upper() which is locale-dependent
+        return str(unicode(node_class.__name__).upper())
+else:
+    def getNodeType(node_class):
+        return node_class.__name__.upper()
+
+# Python >= 3.3 uses ast.Try instead of (ast.TryExcept + ast.TryFinally)
+if PY32:
+    def getAlternatives(n):
+        if isinstance(n, (ast.If, ast.TryFinally)):
+            return [n.body]
+        if isinstance(n, ast.TryExcept):
+            return [n.body + n.orelse] + [[hdl] for hdl in n.handlers]
+else:
+    def getAlternatives(n):
+        if isinstance(n, ast.If):
+            return [n.body]
+        if isinstance(n, ast.Try):
+            return [n.body + n.orelse] + [[hdl] for hdl in n.handlers]
+
+
+class _FieldsOrder(dict):
+    """Fix order of AST node fields."""
+
+    def _get_fields(self, node_class):
+        # handle iter before target, and generators before element
+        fields = node_class._fields
+        if 'iter' in fields:
+            key_first = 'iter'.find
+        elif 'generators' in fields:
+            key_first = 'generators'.find
+        else:
+            key_first = 'value'.find
+        return tuple(sorted(fields, key=key_first, reverse=True))
+
+    def __missing__(self, node_class):
+        self[node_class] = fields = self._get_fields(node_class)
+        return fields
+
+
+def iter_child_nodes(node, omit=None, _fields_order=_FieldsOrder()):
+    """
+    Yield all direct child nodes of *node*, that is, all fields that
+    are nodes and all items of fields that are lists of nodes.
+    """
+    for name in _fields_order[node.__class__]:
+        if name == omit:
+            continue
+        field = getattr(node, name, None)
+        if isinstance(field, ast.AST):
+            yield field
+        elif isinstance(field, list):
+            for item in field:
+                yield item
+
+
+class Binding(object):
+    """
+    Represents the binding of a value to a name.
+
+    The checker uses this to keep track of which names have been bound and
+    which names have not. See L{Assignment} for a special type of binding that
+    is checked with stricter rules.
+
+    @ivar used: pair of (L{Scope}, line-number) indicating the scope and
+                line number that this binding was last used
+    """
+
+    def __init__(self, name, source):
+        self.name = name
+        self.source = source
+        self.used = False
+
+    def __str__(self):
+        return self.name
+
+    def __repr__(self):
+        return '<%s object %r from line %r at 0x%x>' % (self.__class__.__name__,
+                                                        self.name,
+                                                        self.source.lineno,
+                                                        id(self))
+
+    def redefines(self, other):
+        return isinstance(other, Definition) and self.name == other.name
+
+
+class Definition(Binding):
+    """
+    A binding that defines a function or a class.
+    """
+
+
+class Importation(Definition):
+    """
+    A binding created by an import statement.
+
+    @ivar fullName: The complete name given to the import statement,
+        possibly including multiple dotted components.
+    @type fullName: C{str}
+    """
+
+    def __init__(self, name, source):
+        self.fullName = name
+        self.redefined = []
+        name = name.split('.')[0]
+        super(Importation, self).__init__(name, source)
+
+    def redefines(self, other):
+        if isinstance(other, Importation):
+            return self.fullName == other.fullName
+        return isinstance(other, Definition) and self.name == other.name
+
+
+class Argument(Binding):
+    """
+    Represents binding a name as an argument.
+    """
+
+
+class Assignment(Binding):
+    """
+    Represents binding a name with an explicit assignment.
+
+    The checker will raise warnings for any Assignment that isn't used. Also,
+    the checker does not consider assignments in tuple/list unpacking to be
+    Assignments, rather it treats them as simple Bindings.
+    """
+
+
+class FunctionDefinition(Definition):
+    pass
+
+
+class ClassDefinition(Definition):
+    pass
+
+
+class ExportBinding(Binding):
+    """
+    A binding created by an C{__all__} assignment.  If the names in the list
+    can be determined statically, they will be treated as names for export and
+    additional checking applied to them.
+
+    The only C{__all__} assignment that can be recognized is one which takes
+    the value of a literal list containing literal strings.  For example::
+
+        __all__ = ["foo", "bar"]
+
+    Names which are imported and not otherwise used but appear in the value of
+    C{__all__} will not have an unused import warning reported for them.
+    """
+
+    def __init__(self, name, source, scope):
+        if '__all__' in scope and isinstance(source, ast.AugAssign):
+            self.names = list(scope['__all__'].names)
+        else:
+            self.names = []
+        if isinstance(source.value, (ast.List, ast.Tuple)):
+            for node in source.value.elts:
+                if isinstance(node, ast.Str):
+                    self.names.append(node.s)
+        super(ExportBinding, self).__init__(name, source)
+
+
+class Scope(dict):
+    importStarred = False       # set to True when import * is found
+
+    def __repr__(self):
+        scope_cls = self.__class__.__name__
+        return '<%s at 0x%x %s>' % (scope_cls, id(self), dict.__repr__(self))
+
+
+class ClassScope(Scope):
+    pass
+
+
+class FunctionScope(Scope):
+    """
+    I represent a name scope for a function.
+
+    @ivar globals: Names declared 'global' in this function.
+    """
+    usesLocals = False
+    alwaysUsed = set(['__tracebackhide__',
+                      '__traceback_info__', '__traceback_supplement__'])
+
+    def __init__(self):
+        super(FunctionScope, self).__init__()
+        # Simplify: manage the special locals as globals
+        self.globals = self.alwaysUsed.copy()
+        self.returnValue = None     # First non-empty return
+        self.isGenerator = False    # Detect a generator
+
+    def unusedAssignments(self):
+        """
+        Return a generator for the assignments which have not been used.
+        """
+        for name, binding in self.items():
+            if (not binding.used and name not in self.globals
+                    and not self.usesLocals
+                    and isinstance(binding, Assignment)):
+                yield name, binding
+
+
+class GeneratorScope(Scope):
+    pass
+
+
+class ModuleScope(Scope):
+    pass
+
+
+# Globally defined names which are not attributes of the builtins module, or
+# are only present on some platforms.
+_MAGIC_GLOBALS = ['__file__', '__builtins__', 'WindowsError']
+
+
+def getNodeName(node):
+    # Returns node.id, or node.name, or None
+    if hasattr(node, 'id'):     # One of the many nodes with an id
+        return node.id
+    if hasattr(node, 'name'):   # a ExceptHandler node
+        return node.name
+
+
+class Checker(object):
+    """
+    I check the cleanliness and sanity of Python code.
+
+    @ivar _deferredFunctions: Tracking list used by L{deferFunction}.  Elements
+        of the list are two-tuples.  The first element is the callable passed
+        to L{deferFunction}.  The second element is a copy of the scope stack
+        at the time L{deferFunction} was called.
+
+    @ivar _deferredAssignments: Similar to C{_deferredFunctions}, but for
+        callables which are deferred assignment checks.
+    """
+
+    nodeDepth = 0
+    offset = None
+    traceTree = False
+
+    builtIns = set(builtin_vars).union(_MAGIC_GLOBALS)
+    _customBuiltIns = os.environ.get('PYFLAKES_BUILTINS')
+    if _customBuiltIns:
+        builtIns.update(_customBuiltIns.split(','))
+    del _customBuiltIns
+
+    def __init__(self, tree, filename='(none)', builtins=None,
+                 withDoctest='PYFLAKES_DOCTEST' in os.environ):
+        self._nodeHandlers = {}
+        self._deferredFunctions = []
+        self._deferredAssignments = []
+        self.deadScopes = []
+        self.messages = []
+        self.filename = filename
+        if builtins:
+            self.builtIns = self.builtIns.union(builtins)
+        self.withDoctest = withDoctest
+        self.scopeStack = [ModuleScope()]
+        self.exceptHandlers = [()]
+        self.futuresAllowed = True
+        self.root = tree
+        self.handleChildren(tree)
+        self.runDeferred(self._deferredFunctions)
+        # Set _deferredFunctions to None so that deferFunction will fail
+        # noisily if called after we've run through the deferred functions.
+        self._deferredFunctions = None
+        self.runDeferred(self._deferredAssignments)
+        # Set _deferredAssignments to None so that deferAssignment will fail
+        # noisily if called after we've run through the deferred assignments.
+        self._deferredAssignments = None
+        del self.scopeStack[1:]
+        self.popScope()
+        self.checkDeadScopes()
+
+    def deferFunction(self, callable):
+        """
+        Schedule a function handler to be called just before completion.
+
+        This is used for handling function bodies, which must be deferred
+        because code later in the file might modify the global scope. When
+        `callable` is called, the scope at the time this is called will be
+        restored, however it will contain any new bindings added to it.
+        """
+        self._deferredFunctions.append((callable, self.scopeStack[:], self.offset))
+
+    def deferAssignment(self, callable):
+        """
+        Schedule an assignment handler to be called just after deferred
+        function handlers.
+        """
+        self._deferredAssignments.append((callable, self.scopeStack[:], self.offset))
+
+    def runDeferred(self, deferred):
+        """
+        Run the callables in C{deferred} using their associated scope stack.
+        """
+        for handler, scope, offset in deferred:
+            self.scopeStack = scope
+            self.offset = offset
+            handler()
+
+    @property
+    def scope(self):
+        return self.scopeStack[-1]
+
+    def popScope(self):
+        self.deadScopes.append(self.scopeStack.pop())
+
+    def checkDeadScopes(self):
+        """
+        Look at scopes which have been fully examined and report names in them
+        which were imported but unused.
+        """
+        for scope in self.deadScopes:
+            if isinstance(scope.get('__all__'), ExportBinding):
+                all_names = set(scope['__all__'].names)
+                if not scope.importStarred and \
+                   os.path.basename(self.filename) != '__init__.py':
+                    # Look for possible mistakes in the export list
+                    undefined = all_names.difference(scope)
+                    for name in undefined:
+                        self.report(messages.UndefinedExport,
+                                    scope['__all__'].source, name)
+            else:
+                all_names = []
+
+            # Look for imported names that aren't used.
+            for value in scope.values():
+                if isinstance(value, Importation):
+                    used = value.used or value.name in all_names
+                    if not used:
+                        messg = messages.UnusedImport
+                        self.report(messg, value.source, value.name)
+                    for node in value.redefined:
+                        if isinstance(self.getParent(node), ast.For):
+                            messg = messages.ImportShadowedByLoopVar
+                        elif used:
+                            continue
+                        else:
+                            messg = messages.RedefinedWhileUnused
+                        self.report(messg, node, value.name, value.source)
+
+    def pushScope(self, scopeClass=FunctionScope):
+        self.scopeStack.append(scopeClass())
+
+    def report(self, messageClass, *args, **kwargs):
+        self.messages.append(messageClass(self.filename, *args, **kwargs))
+
+    def getParent(self, node):
+        # Lookup the first parent which is not Tuple, List or Starred
+        while True:
+            node = node.parent
+            if not hasattr(node, 'elts') and not hasattr(node, 'ctx'):
+                return node
+
+    def getCommonAncestor(self, lnode, rnode, stop):
+        if stop in (lnode, rnode) or not (hasattr(lnode, 'parent') and
+                                          hasattr(rnode, 'parent')):
+            return None
+        if lnode is rnode:
+            return lnode
+
+        if (lnode.depth > rnode.depth):
+            return self.getCommonAncestor(lnode.parent, rnode, stop)
+        if (lnode.depth < rnode.depth):
+            return self.getCommonAncestor(lnode, rnode.parent, stop)
+        return self.getCommonAncestor(lnode.parent, rnode.parent, stop)
+
+    def descendantOf(self, node, ancestors, stop):
+        for a in ancestors:
+            if self.getCommonAncestor(node, a, stop):
+                return True
+        return False
+
+    def differentForks(self, lnode, rnode):
+        """True, if lnode and rnode are located on different forks of IF/TRY"""
+        ancestor = self.getCommonAncestor(lnode, rnode, self.root)
+        parts = getAlternatives(ancestor)
+        if parts:
+            for items in parts:
+                if self.descendantOf(lnode, items, ancestor) ^ \
+                   self.descendantOf(rnode, items, ancestor):
+                    return True
+        return False
+
+    def addBinding(self, node, value):
+        """
+        Called when a binding is altered.
+
+        - `node` is the statement responsible for the change
+        - `value` is the new value, a Binding instance
+        """
+        # assert value.source in (node, node.parent):
+        for scope in self.scopeStack[::-1]:
+            if value.name in scope:
+                break
+        existing = scope.get(value.name)
+
+        if existing and not self.differentForks(node, existing.source):
+
+            parent_stmt = self.getParent(value.source)
+            if isinstance(existing, Importation) and isinstance(parent_stmt, ast.For):
+                self.report(messages.ImportShadowedByLoopVar,
+                            node, value.name, existing.source)
+
+            elif scope is self.scope:
+                if (isinstance(parent_stmt, ast.comprehension) and
+                        not isinstance(self.getParent(existing.source),
+                                       (ast.For, ast.comprehension))):
+                    self.report(messages.RedefinedInListComp,
+                                node, value.name, existing.source)
+                elif not existing.used and value.redefines(existing):
+                    self.report(messages.RedefinedWhileUnused,
+                                node, value.name, existing.source)
+
+            elif isinstance(existing, Importation) and value.redefines(existing):
+                existing.redefined.append(node)
+
+        if value.name in self.scope:
+            # then assume the rebound name is used as a global or within a loop
+            value.used = self.scope[value.name].used
+
+        self.scope[value.name] = value
+
+    def getNodeHandler(self, node_class):
+        try:
+            return self._nodeHandlers[node_class]
+        except KeyError:
+            nodeType = getNodeType(node_class)
+        self._nodeHandlers[node_class] = handler = getattr(self, nodeType)
+        return handler
+
+    def handleNodeLoad(self, node):
+        name = getNodeName(node)
+        if not name:
+            return
+        # try local scope
+        try:
+            self.scope[name].used = (self.scope, node)
+        except KeyError:
+            pass
+        else:
+            return
+
+        scopes = [scope for scope in self.scopeStack[:-1]
+                  if isinstance(scope, (FunctionScope, ModuleScope, GeneratorScope))]
+        if isinstance(self.scope, GeneratorScope) and scopes[-1] != self.scopeStack[-2]:
+            scopes.append(self.scopeStack[-2])
+
+        # try enclosing function scopes and global scope
+        importStarred = self.scope.importStarred
+        for scope in reversed(scopes):
+            importStarred = importStarred or scope.importStarred
+            try:
+                scope[name].used = (self.scope, node)
+            except KeyError:
+                pass
+            else:
+                return
+
+        # look in the built-ins
+        if importStarred or name in self.builtIns:
+            return
+        if name == '__path__' and os.path.basename(self.filename) == '__init__.py':
+            # the special name __path__ is valid only in packages
+            return
+
+        # protected with a NameError handler?
+        if 'NameError' not in self.exceptHandlers[-1]:
+            self.report(messages.UndefinedName, node, name)
+
+    def handleNodeStore(self, node):
+        name = getNodeName(node)
+        if not name:
+            return
+        # if the name hasn't already been defined in the current scope
+        if isinstance(self.scope, FunctionScope) and name not in self.scope:
+            # for each function or module scope above us
+            for scope in self.scopeStack[:-1]:
+                if not isinstance(scope, (FunctionScope, ModuleScope)):
+                    continue
+                # if the name was defined in that scope, and the name has
+                # been accessed already in the current scope, and hasn't
+                # been declared global
+                used = name in scope and scope[name].used
+                if used and used[0] is self.scope and name not in self.scope.globals:
+                    # then it's probably a mistake
+                    self.report(messages.UndefinedLocal,
+                                scope[name].used[1], name, scope[name].source)
+                    break
+
+        parent_stmt = self.getParent(node)
+        if isinstance(parent_stmt, (ast.For, ast.comprehension)) or (
+                parent_stmt != node.parent and
+                not self.isLiteralTupleUnpacking(parent_stmt)):
+            binding = Binding(name, node)
+        elif name == '__all__' and isinstance(self.scope, ModuleScope):
+            binding = ExportBinding(name, node.parent, self.scope)
+        else:
+            binding = Assignment(name, node)
+        self.addBinding(node, binding)
+
+    def handleNodeDelete(self, node):
+
+        def on_conditional_branch():
+            """
+            Return `True` if node is part of a conditional body.
+            """
+            current = getattr(node, 'parent', None)
+            while current:
+                if isinstance(current, (ast.If, ast.While, ast.IfExp)):
+                    return True
+                current = getattr(current, 'parent', None)
+            return False
+
+        name = getNodeName(node)
+        if not name:
+            return
+
+        if on_conditional_branch():
+            # We can not predict if this conditional branch is going to
+            # be executed.
+            return
+
+        if isinstance(self.scope, FunctionScope) and name in self.scope.globals:
+            self.scope.globals.remove(name)
+        else:
+            try:
+                del self.scope[name]
+            except KeyError:
+                self.report(messages.UndefinedName, node, name)
+
+    def handleChildren(self, tree, omit=None):
+        for node in iter_child_nodes(tree, omit=omit):
+            self.handleNode(node, tree)
+
+    def isLiteralTupleUnpacking(self, node):
+        if isinstance(node, ast.Assign):
+            for child in node.targets + [node.value]:
+                if not hasattr(child, 'elts'):
+                    return False
+            return True
+
+    def isDocstring(self, node):
+        """
+        Determine if the given node is a docstring, as long as it is at the
+        correct place in the node tree.
+        """
+        return isinstance(node, ast.Str) or (isinstance(node, ast.Expr) and
+                                             isinstance(node.value, ast.Str))
+
+    def getDocstring(self, node):
+        if isinstance(node, ast.Expr):
+            node = node.value
+        if not isinstance(node, ast.Str):
+            return (None, None)
+        # Computed incorrectly if the docstring has backslash
+        doctest_lineno = node.lineno - node.s.count('\n') - 1
+        return (node.s, doctest_lineno)
+
+    def handleNode(self, node, parent):
+        if node is None:
+            return
+        if self.offset and getattr(node, 'lineno', None) is not None:
+            node.lineno += self.offset[0]
+            node.col_offset += self.offset[1]
+        if self.traceTree:
+            print('  ' * self.nodeDepth + node.__class__.__name__)
+        if self.futuresAllowed and not (isinstance(node, ast.ImportFrom) or
+                                        self.isDocstring(node)):
+            self.futuresAllowed = False
+        self.nodeDepth += 1
+        node.depth = self.nodeDepth
+        node.parent = parent
+        try:
+            handler = self.getNodeHandler(node.__class__)
+            handler(node)
+        finally:
+            self.nodeDepth -= 1
+        if self.traceTree:
+            print('  ' * self.nodeDepth + 'end ' + node.__class__.__name__)
+
+    _getDoctestExamples = doctest.DocTestParser().get_examples
+
+    def handleDoctests(self, node):
+        try:
+            (docstring, node_lineno) = self.getDocstring(node.body[0])
+            examples = docstring and self._getDoctestExamples(docstring)
+        except (ValueError, IndexError):
+            # e.g. line 6 of the docstring for <string> has inconsistent
+            # leading whitespace: ...
+            return
+        if not examples:
+            return
+        node_offset = self.offset or (0, 0)
+        self.pushScope()
+        underscore_in_builtins = '_' in self.builtIns
+        if not underscore_in_builtins:
+            self.builtIns.add('_')
+        for example in examples:
+            try:
+                tree = compile(example.source, "<doctest>", "exec", ast.PyCF_ONLY_AST)
+            except SyntaxError:
+                e = sys.exc_info()[1]
+                position = (node_lineno + example.lineno + e.lineno,
+                            example.indent + 4 + (e.offset or 0))
+                self.report(messages.DoctestSyntaxError, node, position)
+            else:
+                self.offset = (node_offset[0] + node_lineno + example.lineno,
+                               node_offset[1] + example.indent + 4)
+                self.handleChildren(tree)
+                self.offset = node_offset
+        if not underscore_in_builtins:
+            self.builtIns.remove('_')
+        self.popScope()
+
+    def ignore(self, node):
+        pass
+
+    # "stmt" type nodes
+    DELETE = PRINT = FOR = ASYNCFOR = WHILE = IF = WITH = WITHITEM = \
+        ASYNCWITH = ASYNCWITHITEM = RAISE = TRYFINALLY = ASSERT = EXEC = \
+        EXPR = ASSIGN = handleChildren
+
+    CONTINUE = BREAK = PASS = ignore
+
+    # "expr" type nodes
+    BOOLOP = BINOP = UNARYOP = IFEXP = DICT = SET = \
+        COMPARE = CALL = REPR = ATTRIBUTE = SUBSCRIPT = LIST = TUPLE = \
+        STARRED = NAMECONSTANT = handleChildren
+
+    NUM = STR = BYTES = ELLIPSIS = ignore
+
+    # "slice" type nodes
+    SLICE = EXTSLICE = INDEX = handleChildren
+
+    # expression contexts are node instances too, though being constants
+    LOAD = STORE = DEL = AUGLOAD = AUGSTORE = PARAM = ignore
+
+    # same for operators
+    AND = OR = ADD = SUB = MULT = DIV = MOD = POW = LSHIFT = RSHIFT = \
+        BITOR = BITXOR = BITAND = FLOORDIV = INVERT = NOT = UADD = USUB = \
+        EQ = NOTEQ = LT = LTE = GT = GTE = IS = ISNOT = IN = NOTIN = ignore
+
+    # additional node types
+    COMPREHENSION = KEYWORD = handleChildren
+
+    def GLOBAL(self, node):
+        """
+        Keep track of globals declarations.
+        """
+        # In doctests, the global scope is an anonymous function at index 1.
+        global_scope_index = 1 if self.withDoctest else 0
+        global_scope = self.scopeStack[global_scope_index]
+
+        # Ignore 'global' statement in global scope.
+        if self.scope is not global_scope:
+
+            # One 'global' statement can bind multiple (comma-delimited) names.
+            for node_name in node.names:
+                node_value = Assignment(node_name, node)
+
+                # Remove UndefinedName messages already reported for this name.
+                self.messages = [
+                    m for m in self.messages if not
+                    isinstance(m, messages.UndefinedName) and not
+                    m.message_args[0] == node_name]
+
+                # Bind name to global scope if it doesn't exist already.
+                global_scope.setdefault(node_name, node_value)
+
+                # Bind name to non-global scopes, but as already "used".
+                node_value.used = (global_scope, node)
+                for scope in self.scopeStack[global_scope_index + 1:]:
+                    scope[node_name] = node_value
+
+    NONLOCAL = GLOBAL
+
+    def GENERATOREXP(self, node):
+        self.pushScope(GeneratorScope)
+        self.handleChildren(node)
+        self.popScope()
+
+    LISTCOMP = handleChildren if PY2 else GENERATOREXP
+
+    DICTCOMP = SETCOMP = GENERATOREXP
+
+    def NAME(self, node):
+        """
+        Handle occurrence of Name (which can be a load/store/delete access.)
+        """
+        # Locate the name in locals / function / globals scopes.
+        if isinstance(node.ctx, (ast.Load, ast.AugLoad)):
+            self.handleNodeLoad(node)
+            if (node.id == 'locals' and isinstance(self.scope, FunctionScope)
+                    and isinstance(node.parent, ast.Call)):
+                # we are doing locals() call in current scope
+                self.scope.usesLocals = True
+        elif isinstance(node.ctx, (ast.Store, ast.AugStore)):
+            self.handleNodeStore(node)
+        elif isinstance(node.ctx, ast.Del):
+            self.handleNodeDelete(node)
+        else:
+            # must be a Param context -- this only happens for names in function
+            # arguments, but these aren't dispatched through here
+            raise RuntimeError("Got impossible expression context: %r" % (node.ctx,))
+
+    def RETURN(self, node):
+        if isinstance(self.scope, ClassScope):
+            self.report(messages.ReturnOutsideFunction, node)
+            return
+
+        if (
+            node.value and
+            hasattr(self.scope, 'returnValue') and
+            not self.scope.returnValue
+        ):
+            self.scope.returnValue = node.value
+        self.handleNode(node.value, node)
+
+    def YIELD(self, node):
+        self.scope.isGenerator = True
+        self.handleNode(node.value, node)
+
+    AWAIT = YIELDFROM = YIELD
+
+    def FUNCTIONDEF(self, node):
+        for deco in node.decorator_list:
+            self.handleNode(deco, node)
+        self.LAMBDA(node)
+        self.addBinding(node, FunctionDefinition(node.name, node))
+        if self.withDoctest:
+            self.deferFunction(lambda: self.handleDoctests(node))
+
+    ASYNCFUNCTIONDEF = FUNCTIONDEF
+
+    def LAMBDA(self, node):
+        args = []
+        annotations = []
+
+        if PY2:
+            def addArgs(arglist):
+                for arg in arglist:
+                    if isinstance(arg, ast.Tuple):
+                        addArgs(arg.elts)
+                    else:
+                        args.append(arg.id)
+            addArgs(node.args.args)
+            defaults = node.args.defaults
+        else:
+            for arg in node.args.args + node.args.kwonlyargs:
+                args.append(arg.arg)
+                annotations.append(arg.annotation)
+            defaults = node.args.defaults + node.args.kw_defaults
+
+        # Only for Python3 FunctionDefs
+        is_py3_func = hasattr(node, 'returns')
+
+        for arg_name in ('vararg', 'kwarg'):
+            wildcard = getattr(node.args, arg_name)
+            if not wildcard:
+                continue
+            args.append(wildcard if PY33 else wildcard.arg)
+            if is_py3_func:
+                if PY33:  # Python 2.5 to 3.3
+                    argannotation = arg_name + 'annotation'
+                    annotations.append(getattr(node.args, argannotation))
+                else:     # Python >= 3.4
+                    annotations.append(wildcard.annotation)
+
+        if is_py3_func:
+            annotations.append(node.returns)
+
+        if len(set(args)) < len(args):
+            for (idx, arg) in enumerate(args):
+                if arg in args[:idx]:
+                    self.report(messages.DuplicateArgument, node, arg)
+
+        for child in annotations + defaults:
+            if child:
+                self.handleNode(child, node)
+
+        def runFunction():
+
+            self.pushScope()
+            for name in args:
+                self.addBinding(node, Argument(name, node))
+            if isinstance(node.body, list):
+                # case for FunctionDefs
+                for stmt in node.body:
+                    self.handleNode(stmt, node)
+            else:
+                # case for Lambdas
+                self.handleNode(node.body, node)
+
+            def checkUnusedAssignments():
+                """
+                Check to see if any assignments have not been used.
+                """
+                for name, binding in self.scope.unusedAssignments():
+                    self.report(messages.UnusedVariable, binding.source, name)
+            self.deferAssignment(checkUnusedAssignments)
+
+            if PY32:
+                def checkReturnWithArgumentInsideGenerator():
+                    """
+                    Check to see if there is any return statement with
+                    arguments but the function is a generator.
+                    """
+                    if self.scope.isGenerator and self.scope.returnValue:
+                        self.report(messages.ReturnWithArgsInsideGenerator,
+                                    self.scope.returnValue)
+                self.deferAssignment(checkReturnWithArgumentInsideGenerator)
+            self.popScope()
+
+        self.deferFunction(runFunction)
+
+    def CLASSDEF(self, node):
+        """
+        Check names used in a class definition, including its decorators, base
+        classes, and the body of its definition.  Additionally, add its name to
+        the current scope.
+        """
+        for deco in node.decorator_list:
+            self.handleNode(deco, node)
+        for baseNode in node.bases:
+            self.handleNode(baseNode, node)
+        if not PY2:
+            for keywordNode in node.keywords:
+                self.handleNode(keywordNode, node)
+        self.pushScope(ClassScope)
+        if self.withDoctest:
+            self.deferFunction(lambda: self.handleDoctests(node))
+        for stmt in node.body:
+            self.handleNode(stmt, node)
+        self.popScope()
+        self.addBinding(node, ClassDefinition(node.name, node))
+
+    def AUGASSIGN(self, node):
+        self.handleNodeLoad(node.target)
+        self.handleNode(node.value, node)
+        self.handleNode(node.target, node)
+
+    def IMPORT(self, node):
+        for alias in node.names:
+            name = alias.asname or alias.name
+            importation = Importation(name, node)
+            self.addBinding(node, importation)
+
+    def IMPORTFROM(self, node):
+        if node.module == '__future__':
+            if not self.futuresAllowed:
+                self.report(messages.LateFutureImport,
+                            node, [n.name for n in node.names])
+        else:
+            self.futuresAllowed = False
+
+        for alias in node.names:
+            if alias.name == '*':
+                self.scope.importStarred = True
+                self.report(messages.ImportStarUsed, node, node.module)
+                continue
+            name = alias.asname or alias.name
+            importation = Importation(name, node)
+            if node.module == '__future__':
+                importation.used = (self.scope, node)
+            self.addBinding(node, importation)
+
+    def TRY(self, node):
+        handler_names = []
+        # List the exception handlers
+        for handler in node.handlers:
+            if isinstance(handler.type, ast.Tuple):
+                for exc_type in handler.type.elts:
+                    handler_names.append(getNodeName(exc_type))
+            elif handler.type:
+                handler_names.append(getNodeName(handler.type))
+        # Memorize the except handlers and process the body
+        self.exceptHandlers.append(handler_names)
+        for child in node.body:
+            self.handleNode(child, node)
+        self.exceptHandlers.pop()
+        # Process the other nodes: "except:", "else:", "finally:"
+        self.handleChildren(node, omit='body')
+
+    TRYEXCEPT = TRY
+
+    def EXCEPTHANDLER(self, node):
+        # 3.x: in addition to handling children, we must handle the name of
+        # the exception, which is not a Name node, but a simple string.
+        if isinstance(node.name, str):
+            self.handleNodeStore(node)
+        self.handleChildren(node)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/messages.py b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/messages.py
new file mode 100644
index 0000000..8899b7b
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/messages.py
@@ -0,0 +1,134 @@
+"""
+Provide the class Message and its subclasses.
+"""
+
+
+class Message(object):
+    message = ''
+    message_args = ()
+
+    def __init__(self, filename, loc):
+        self.filename = filename
+        self.lineno = loc.lineno
+        self.col = getattr(loc, 'col_offset', 0)
+
+    def __str__(self):
+        return '%s:%s: %s' % (self.filename, self.lineno,
+                              self.message % self.message_args)
+
+
+class UnusedImport(Message):
+    message = '%r imported but unused'
+
+    def __init__(self, filename, loc, name):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name,)
+
+
+class RedefinedWhileUnused(Message):
+    message = 'redefinition of unused %r from line %r'
+
+    def __init__(self, filename, loc, name, orig_loc):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name, orig_loc.lineno)
+
+
+class RedefinedInListComp(Message):
+    message = 'list comprehension redefines %r from line %r'
+
+    def __init__(self, filename, loc, name, orig_loc):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name, orig_loc.lineno)
+
+
+class ImportShadowedByLoopVar(Message):
+    message = 'import %r from line %r shadowed by loop variable'
+
+    def __init__(self, filename, loc, name, orig_loc):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name, orig_loc.lineno)
+
+
+class ImportStarUsed(Message):
+    message = "'from %s import *' used; unable to detect undefined names"
+
+    def __init__(self, filename, loc, modname):
+        Message.__init__(self, filename, loc)
+        self.message_args = (modname,)
+
+
+class UndefinedName(Message):
+    message = 'undefined name %r'
+
+    def __init__(self, filename, loc, name):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name,)
+
+
+class DoctestSyntaxError(Message):
+    message = 'syntax error in doctest'
+
+    def __init__(self, filename, loc, position=None):
+        Message.__init__(self, filename, loc)
+        if position:
+            (self.lineno, self.col) = position
+        self.message_args = ()
+
+
+class UndefinedExport(Message):
+    message = 'undefined name %r in __all__'
+
+    def __init__(self, filename, loc, name):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name,)
+
+
+class UndefinedLocal(Message):
+    message = ('local variable %r (defined in enclosing scope on line %r) '
+               'referenced before assignment')
+
+    def __init__(self, filename, loc, name, orig_loc):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name, orig_loc.lineno)
+
+
+class DuplicateArgument(Message):
+    message = 'duplicate argument %r in function definition'
+
+    def __init__(self, filename, loc, name):
+        Message.__init__(self, filename, loc)
+        self.message_args = (name,)
+
+
+class LateFutureImport(Message):
+    message = 'future import(s) %r after other statements'
+
+    def __init__(self, filename, loc, names):
+        Message.__init__(self, filename, loc)
+        self.message_args = (names,)
+
+
+class UnusedVariable(Message):
+    """
+    Indicates that a variable has been explicity assigned to but not actually
+    used.
+    """
+    message = 'local variable %r is assigned to but never used'
+
+    def __init__(self, filename, loc, names):
+        Message.__init__(self, filename, loc)
+        self.message_args = (names,)
+
+
+class ReturnWithArgsInsideGenerator(Message):
+    """
+    Indicates a return statement with arguments inside a generator.
+    """
+    message = '\'return\' with argument inside generator'
+
+
+class ReturnOutsideFunction(Message):
+    """
+    Indicates a return statement outside of a function/method.
+    """
+    message = '\'return\' outside function'
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/reporter.py b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/reporter.py
new file mode 100644
index 0000000..ae645bd
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pyflakes/reporter.py
@@ -0,0 +1,81 @@
+"""
+Provide the Reporter class.
+"""
+
+import re
+import sys
+
+
+class Reporter(object):
+    """
+    Formats the results of pyflakes checks to users.
+    """
+
+    def __init__(self, warningStream, errorStream):
+        """
+        Construct a L{Reporter}.
+
+        @param warningStream: A file-like object where warnings will be
+            written to.  The stream's C{write} method must accept unicode.
+            C{sys.stdout} is a good value.
+        @param errorStream: A file-like object where error output will be
+            written to.  The stream's C{write} method must accept unicode.
+            C{sys.stderr} is a good value.
+        """
+        self._stdout = warningStream
+        self._stderr = errorStream
+
+    def unexpectedError(self, filename, msg):
+        """
+        An unexpected error occurred trying to process C{filename}.
+
+        @param filename: The path to a file that we could not process.
+        @ptype filename: C{unicode}
+        @param msg: A message explaining the problem.
+        @ptype msg: C{unicode}
+        """
+        self._stderr.write("%s: %s\n" % (filename, msg))
+
+    def syntaxError(self, filename, msg, lineno, offset, text):
+        """
+        There was a syntax errror in C{filename}.
+
+        @param filename: The path to the file with the syntax error.
+        @ptype filename: C{unicode}
+        @param msg: An explanation of the syntax error.
+        @ptype msg: C{unicode}
+        @param lineno: The line number where the syntax error occurred.
+        @ptype lineno: C{int}
+        @param offset: The column on which the syntax error occurred, or None.
+        @ptype offset: C{int}
+        @param text: The source code containing the syntax error.
+        @ptype text: C{unicode}
+        """
+        line = text.splitlines()[-1]
+        if offset is not None:
+            offset = offset - (len(text) - len(line))
+            self._stderr.write('%s:%d:%d: %s\n' %
+                               (filename, lineno, offset + 1, msg))
+        else:
+            self._stderr.write('%s:%d: %s\n' % (filename, lineno, msg))
+        self._stderr.write(line)
+        self._stderr.write('\n')
+        if offset is not None:
+            self._stderr.write(re.sub(r'\S', ' ', line[:offset]) +
+                               "^\n")
+
+    def flake(self, message):
+        """
+        pyflakes found something wrong with the code.
+
+        @param: A L{pyflakes.messages.Message}.
+        """
+        self._stdout.write(str(message))
+        self._stdout.write('\n')
+
+
+def _makeDefaultReporter():
+    """
+    Make a reporter that can be used when no reporter is specified.
+    """
+    return Reporter(sys.stdout, sys.stderr)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__init__.py
new file mode 100644
index 0000000..3fb8051
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__init__.py
@@ -0,0 +1,11 @@
+"""
+Code audit tool for python.
+
+:copyright: 2013 by Kirill Klenov.
+:license: BSD, see LICENSE for more details.
+"""
+
+__version__ = "7.0.6"
+__project__ = "pylama"
+__author__ = "Kirill Klenov <horneds@gmail.com>"
+__license__ = "GNU LGPL"
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/__main__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__main__.py
new file mode 100644
index 0000000..64994e7
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__main__.py
@@ -0,0 +1,6 @@
+"""Support the module execution."""
+
+from .main import shell
+
+if __name__ == '__main__':
+    shell()
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..b3cf4e9
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/async.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/async.cpython-35.pyc
new file mode 100644
index 0000000..77a0ca2
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/async.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/config.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/config.cpython-35.pyc
new file mode 100644
index 0000000..9de8350
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/config.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/core.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/core.cpython-35.pyc
new file mode 100644
index 0000000..bee9dbd
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/core.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/errors.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/errors.cpython-35.pyc
new file mode 100644
index 0000000..01d8e50
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/errors.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/main.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/main.cpython-35.pyc
new file mode 100644
index 0000000..bd814bc
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/__pycache__/main.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/async.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/async.py
new file mode 100644
index 0000000..12f929f
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/async.py
@@ -0,0 +1,76 @@
+""" Support for asyncronious checking. """
+
+import logging
+import threading
+
+from .core import run
+
+
+try:
+    import Queue
+except ImportError:
+    import queue as Queue
+
+
+try:
+    import multiprocessing
+
+    CPU_COUNT = multiprocessing.cpu_count()
+
+except (ImportError, NotImplementedError):
+    CPU_COUNT = 1
+
+LOGGER = logging.getLogger('pylama')
+
+
+class Worker(threading.Thread):
+
+    """ Get tasks from queue and run. """
+
+    def __init__(self, path_queue, result_queue):
+        """ Init worker. """
+        threading.Thread.__init__(self)
+        self.path_queue = path_queue
+        self.result_queue = result_queue
+
+    def run(self):
+        """ Run tasks from queue. """
+        while True:
+            path, params = self.path_queue.get()
+            errors = run(path, **params)
+            self.result_queue.put(errors)
+            self.path_queue.task_done()
+
+
+def check_async(paths, options, rootdir=None):
+    """ Check given paths asynchronously.
+
+    :return list: list of errors
+
+    """
+    LOGGER.info('Async code checking is enabled.')
+    path_queue = Queue.Queue()
+    result_queue = Queue.Queue()
+
+    for num in range(CPU_COUNT):
+        worker = Worker(path_queue, result_queue)
+        worker.setDaemon(True)
+        LOGGER.info('Start worker #%s', (num + 1))
+        worker.start()
+
+    for path in paths:
+        path_queue.put((path, dict(options=options, rootdir=rootdir)))
+
+    path_queue.join()
+
+    errors = []
+    while True:
+        try:
+            errors += result_queue.get(False)
+        except Queue.Empty:
+            break
+
+    return errors
+
+
+# pylama:ignore=W0212,D210,F0001
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/config.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/config.py
new file mode 100644
index 0000000..3df3882
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/config.py
@@ -0,0 +1,241 @@
+""" Parse arguments from command line and configuration files. """
+import fnmatch
+import os
+import sys
+import re
+
+import logging
+from argparse import ArgumentParser
+
+from . import __version__
+from .libs.inirama import Namespace
+from .lint.extensions import LINTERS
+
+#: A default checkers
+DEFAULT_LINTERS = 'pep8', 'pyflakes', 'mccabe'
+
+CURDIR = os.getcwd()
+CONFIG_FILES = 'pylama.ini', 'setup.cfg', 'tox.ini', 'pytest.ini'
+
+#: The skip pattern
+SKIP_PATTERN = re.compile(r'# *noqa\b', re.I).search
+
+# Parse a modelines
+MODELINE_RE = re.compile(r'^\s*#\s+(?:pylama:)\s*((?:[\w_]*=[^:\n\s]+:?)+)', re.I | re.M)
+
+# Setup a logger
+LOGGER = logging.getLogger('pylama')
+LOGGER.propagate = False
+STREAM = logging.StreamHandler(sys.stdout)
+LOGGER.addHandler(STREAM)
+
+
+class _Default(object):
+
+    def __init__(self, value=None):
+        self.value = value
+
+    def __str__(self):
+        return str(self.value)
+
+    def __repr__(self):
+        return "<_Default [%s]>" % self.value
+
+
+def split_csp_str(s):
+    """ Split commaseparated string.
+
+    :returns: list of splitted values
+
+    """
+    if isinstance(s, (list, tuple)):
+        return s
+    return list(set(i for i in s.strip().split(',') if i))
+
+
+def parse_linters(linters):
+    """ Initialize choosen linters.
+
+    :returns: list of inited linters
+
+    """
+    result = list()
+    for name in split_csp_str(linters):
+        linter = LINTERS.get(name)
+        if linter:
+            result.append((name, linter))
+        else:
+            logging.warn("Linter `%s` not found.", name)
+    return result
+
+
+PARSER = ArgumentParser(description="Code audit tool for python.")
+PARSER.add_argument(
+    "paths", nargs='*', default=_Default([CURDIR]),
+    help="Paths to files or directories for code check.")
+
+PARSER.add_argument(
+    "--verbose", "-v", action='store_true', help="Verbose mode.")
+
+PARSER.add_argument('--version', action='version',
+                    version='%(prog)s ' + __version__)
+
+PARSER.add_argument(
+    "--format", "-f", default=_Default('pep8'), choices=['pep8', 'pylint'],
+    help="Choose errors format (pep8, pylint).")
+
+PARSER.add_argument(
+    "--select", "-s", default=_Default(''), type=split_csp_str,
+    help="Select errors and warnings. (comma-separated list)")
+
+PARSER.add_argument(
+    "--sort", default=_Default(''), type=split_csp_str,
+    help="Sort result by error types. Ex. E,W,D")
+
+PARSER.add_argument(
+    "--linters", "-l", default=_Default(','.join(DEFAULT_LINTERS)),
+    type=parse_linters, help=(
+        "Select linters. (comma-separated). Choices are %s."
+        % ','.join(s for s in LINTERS.keys())
+    ))
+
+PARSER.add_argument(
+    "--ignore", "-i", default=_Default(''), type=split_csp_str,
+    help="Ignore errors and warnings. (comma-separated)")
+
+PARSER.add_argument(
+    "--skip", default=_Default(''),
+    type=lambda s: [re.compile(fnmatch.translate(p)) for p in s.split(',') if p],
+    help="Skip files by masks (comma-separated, Ex. */messages.py)")
+
+PARSER.add_argument("--report", "-r", help="Send report to file [REPORT]")
+PARSER.add_argument(
+    "--hook", action="store_true", help="Install Git (Mercurial) hook.")
+
+PARSER.add_argument(
+    "--async", action="store_true",
+    help="Enable async mode. Usefull for checking a lot of files. "
+    "Dont supported with pylint.")
+
+PARSER.add_argument(
+    "--options", "-o", default="",
+    help="Select configuration file. By default is '<CURDIR>/pylama.ini'")
+
+PARSER.add_argument(
+    "--force", "-F", action='store_true', default=_Default(False),
+    help="Force code checking (if linter doesnt allow)")
+
+PARSER.add_argument(
+    "--abspath", "-a", action='store_true', default=_Default(False),
+    help="Use absolute paths in output.")
+
+
+ACTIONS = dict((a.dest, a) for a in PARSER._actions)
+
+
+def parse_options(args=None, config=True, rootdir=CURDIR, **overrides): # noqa
+    """ Parse options from command line and configuration files.
+
+    :return argparse.Namespace:
+
+    """
+    if args is None:
+        args = []
+
+    # Parse args from command string
+    options = PARSER.parse_args(args)
+    options.file_params = dict()
+    options.linters_params = dict()
+
+    # Override options
+    for k, v in overrides.items():
+        passed_value = getattr(options, k, _Default())
+        if isinstance(passed_value, _Default):
+            setattr(options, k, _Default(v))
+
+    # Compile options from ini
+    if config:
+        cfg = get_config(str(options.options), rootdir=rootdir)
+        for k, v in cfg.default.items():
+            LOGGER.info('Find option %s (%s)', k, v)
+            passed_value = getattr(options, k, _Default())
+            if isinstance(passed_value, _Default):
+                if k == 'paths':
+                    v = v.split()
+                setattr(options, k, _Default(v))
+
+        # Parse file related options
+        for name, opts in cfg.sections.items():
+
+            if not name.startswith('pylama'):
+                continue
+
+            if name == cfg.default_section:
+                continue
+
+            name = name[7:]
+
+            if name in LINTERS:
+                options.linters_params[name] = dict(opts)
+                continue
+
+            mask = re.compile(fnmatch.translate(name))
+            options.file_params[mask] = dict(opts)
+
+    # Postprocess options
+    opts = dict(options.__dict__.items())
+    for name, value in opts.items():
+        if isinstance(value, _Default):
+            setattr(options, name, process_value(name, value.value))
+
+    if options.async and 'pylint' in options.linters:
+        LOGGER.warn('Cant parse code asynchronously while pylint is enabled.')
+        options.async = False
+
+    return options
+
+
+def process_value(name, value):
+    """ Compile option value. """
+    action = ACTIONS.get(name)
+    if not action:
+        return value
+
+    if callable(action.type):
+        return action.type(value)
+
+    if action.const:
+        return bool(int(value))
+
+    return value
+
+
+def get_config(ini_path=None, rootdir=CURDIR):
+    """ Load configuration from INI.
+
+    :return Namespace:
+
+    """
+    config = Namespace()
+    config.default_section = 'pylama'
+
+    if not ini_path:
+        for path in CONFIG_FILES:
+            path = os.path.join(rootdir, path)
+            if os.path.isfile(path) and os.access(path, os.R_OK):
+                config.read(path)
+    else:
+        config.read(ini_path)
+
+    return config
+
+
+def setup_logger(options):
+    """ Setup logger with options. """
+    LOGGER.setLevel(logging.INFO if options.verbose else logging.WARN)
+    if options.report:
+        LOGGER.removeHandler(STREAM)
+        LOGGER.addHandler(logging.FileHandler(options.report, mode='w'))
+    LOGGER.info('Try to read configuration from: ' + options.options)
+
+# pylama:ignore=W0212,D210,F0001
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/core.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/core.py
new file mode 100644
index 0000000..69d3c59
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/core.py
@@ -0,0 +1,200 @@
+""" Pylama's core functionality.
+
+Prepare params, check a modeline and run the checkers.
+
+"""
+import logging
+
+import os.path as op
+from .config import process_value, LOGGER, MODELINE_RE, SKIP_PATTERN, CURDIR
+from .errors import Error, remove_duplicates
+from .lint.extensions import LINTERS
+
+
+def run(path='', code=None, rootdir=CURDIR, options=None):
+    """ Run code checkers with given params.
+
+    :param path: (str) A file's path.
+    :param code: (str) A code source
+    :return errors: list of dictionaries with error's information
+
+    """
+    errors = []
+    fileconfig = dict()
+    linters = LINTERS
+    linters_params = dict()
+    lname = 'undefined'
+    params = dict()
+    path = op.relpath(path, rootdir)
+
+    if options:
+        linters = options.linters
+        linters_params = options.linters_params
+        for mask in options.file_params:
+            if mask.match(path):
+                fileconfig.update(options.file_params[mask])
+
+        if options.skip and any(p.match(path) for p in options.skip):
+            LOGGER.info('Skip checking for path: %s', path)
+            return []
+
+    try:
+        with CodeContext(code, path) as ctx:
+            code = ctx.code
+            params = prepare_params(parse_modeline(code), fileconfig, options)
+            LOGGER.debug('Checking params: %s', params)
+
+            if params.get('skip'):
+                return errors
+
+            for item in params.get('linters') or linters:
+
+                if not isinstance(item, tuple):
+                    item = (item, LINTERS.get(item))
+
+                lname, linter = item
+
+                if not linter:
+                    continue
+
+                lparams = linters_params.get(lname, dict())
+                LOGGER.info("Run %s %s", lname, lparams)
+
+                for er in linter.run(
+                        path, code=code, ignore=params.get("ignore", set()),
+                        select=params.get("select", set()), params=lparams):
+                    errors.append(Error(filename=path, linter=lname, **er))
+
+    except IOError as e:
+        LOGGER.debug("IOError %s", e)
+        errors.append(Error(text=str(e), filename=path, linter=lname))
+
+    except SyntaxError as e:
+        LOGGER.debug("SyntaxError %s", e)
+        errors.append(
+            Error(linter=lname, lnum=e.lineno, col=e.offset, text=e.args[0],
+                  filename=path))
+
+    except Exception as e: # noqa
+        import traceback
+        LOGGER.info(traceback.format_exc())
+
+    errors = filter_errors(errors, **params)
+
+    errors = list(remove_duplicates(errors))
+
+    if code and errors:
+        errors = filter_skiplines(code, errors)
+
+    key = lambda e: e.lnum
+    if options and options.sort:
+        sort = dict((v, n) for n, v in enumerate(options.sort, 1))
+        key = lambda e: (sort.get(e.type, 999), e.lnum)
+    return sorted(errors, key=key)
+
+
+def parse_modeline(code):
+    """ Parse params from file's modeline.
+
+    :return dict: Linter params.
+
+    """
+    seek = MODELINE_RE.search(code)
+    if seek:
+        return dict(v.split('=') for v in seek.group(1).split(':'))
+
+    return dict()
+
+
+def prepare_params(modeline, fileconfig, options):
+    """ Prepare and merge a params from modelines and configs.
+
+    :return dict:
+
+    """
+    params = dict(skip=False, ignore=[], select=[], linters=[])
+    if options:
+        params['ignore'] = list(options.ignore)
+        params['select'] = list(options.select)
+
+    for config in filter(None, [modeline, fileconfig]):
+        for key in ('ignore', 'select', 'linters'):
+            params[key] += process_value(key, config.get(key, []))
+        params['skip'] = bool(int(config.get('skip', False)))
+
+    params['ignore'] = set(params['ignore'])
+    params['select'] = set(params['select'])
+
+    return params
+
+
+def filter_errors(errors, select=None, ignore=None, **params):
+    """ Filter a erros by select and ignore options.
+
+    :return bool:
+
+    """
+    select = select or []
+    ignore = ignore or []
+
+    for e in errors:
+        for s in select:
+            if e.number.startswith(s):
+                yield e
+                break
+        else:
+            for s in ignore:
+                if e.number.startswith(s):
+                    break
+            else:
+                yield e
+
+
+def filter_skiplines(code, errors):
+    """ Filter lines by `noqa`.
+
+    :return list: A filtered errors
+
+    """
+    if not errors:
+        return errors
+
+    enums = set(er.lnum for er in errors)
+    removed = set([
+        num for num, l in enumerate(code.split('\n'), 1)
+        if num in enums and SKIP_PATTERN(l)
+    ])
+
+    if removed:
+        errors = [er for er in errors if er.lnum not in removed]
+
+    return errors
+
+
+class CodeContext(object):
+
+    """ Read file if code is None. """
+
+    def __init__(self, code, path):
+        """ Init context. """
+        self.code = code
+        self.path = path
+        self._file = None
+
+    def __enter__(self):
+        """ Open a file and read it. """
+        if self.code is None:
+            LOGGER.info("File is reading: %s", self.path)
+            self._file = open(self.path, 'rU')
+            self.code = self._file.read()
+        return self
+
+    def __exit__(self, t, value, traceback):
+        """ Close the file which was opened. """
+        if self._file is not None:
+            self._file.close()
+
+        if t and LOGGER.level == logging.DEBUG:
+            LOGGER.debug(traceback)
+
+# pylama:ignore=R0912,D210,F0001
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/errors.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/errors.py
new file mode 100644
index 0000000..7f6c0a1
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/errors.py
@@ -0,0 +1,97 @@
+""" Don't duplicate same errors from different linters. """
+
+from collections import defaultdict
+
+
+DUPLICATES = (
+
+    # multiple statements on one line
+    [('pep8', 'E701'), ('pylint', 'C0321')],
+
+    # unused variable
+    [('pylint', 'W0612'), ('pyflakes', 'W0612')],
+
+    # undefined variable
+    [('pylint', 'E0602'), ('pyflakes', 'E0602')],
+
+    # unused import
+    [('pylint', 'W0611'), ('pyflakes', 'W0611')],
+
+    # whitespace before ')'
+    [('pylint', 'C0326'), ('pep8', 'E202')],
+
+    # whitespace before '('
+    [('pylint', 'C0326'), ('pep8', 'E211')],
+
+    # multiple spaces after operator
+    [('pylint', 'C0326'), ('pep8', 'E222')],
+
+    # missing whitespace around operator
+    [('pylint', 'C0326'), ('pep8', 'E225')],
+
+    # unexpected spaces
+    [('pylint', 'C0326'), ('pep8', 'E251')],
+
+    # long lines
+    [('pylint', 'C0301'), ('pep8', 'E501')],
+
+    # statement ends with a semicolon
+    [('pylint', 'W0301'), ('pep8', 'E703')],
+
+    # multiple statements on one line
+    [('pylint', 'C0321'), ('pep8', 'E702')],
+
+    # bad indentation
+    [('pylint', 'W0311'), ('pep8', 'E111')],
+
+    # wildcart import
+    [('pylint', 'W00401'), ('pyflakes', 'W0401')],
+
+    # module docstring
+    [('pep257', 'D100'), ('pylint', 'C0111')],
+
+)
+
+DUPLICATES = dict((key, values) for values in DUPLICATES for key in values)
+
+
+def remove_duplicates(errors):
+    """ Filter duplicates from given error's list. """
+    passed = defaultdict(list)
+    for error in errors:
+        key = error.linter, error.number
+        if key in DUPLICATES:
+            if key in passed[error.lnum]:
+                continue
+            passed[error.lnum] = DUPLICATES[key]
+        yield error
+
+
+class Error(object):
+
+    """ Store an error's information. """
+
+    def __init__(self, linter="", col=1, lnum=1, type="E",
+                 text="unknown error", filename="", **kwargs):
+        """ Init error information with default values. """
+        text = ' '.join(str(text).strip().split('\n'))
+        if linter:
+            text = "%s [%s]" % (text, linter)
+        number = text.split(' ', 1)[0]
+        self._info = dict(linter=linter, col=col, lnum=lnum, type=type[:1],
+                          text=text, filename=filename, number=number)
+
+    def __getattr__(self, name):
+        return self._info[name]
+
+    def __getitem__(self, name):
+        return self._info[name]
+
+    def get(self, name, default=None):
+        """ Implement dictionary `get` method. """
+        return self._info.get(name, default)
+
+    def __repr__(self):
+        return "<Error: %s %s>" % (self.number, self.linter)
+
+# pylama:ignore=W0622,D,R0924
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/hook.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/hook.py
new file mode 100644
index 0000000..f65ef46
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/hook.py
@@ -0,0 +1,111 @@
+""" SCM hooks. Integration with git and mercurial. """
+
+from __future__ import absolute_import
+
+import sys
+from os import path as op, chmod
+from subprocess import Popen, PIPE
+
+from .main import LOGGER, process_paths
+from .config import parse_options, setup_logger
+
+
+try:
+    from configparser import ConfigParser  # noqa
+except ImportError:   # Python 2
+    from ConfigParser import ConfigParser
+
+
+def run(command):
+    """ Run a shell command.
+
+    :return str: Stdout
+
+    """
+    p = Popen(command.split(), stdout=PIPE, stderr=PIPE)
+    (stdout, stderr) = p.communicate()
+    return (p.returncode, [line.strip() for line in stdout.splitlines()],
+            [line.strip() for line in stderr.splitlines()])
+
+
+def git_hook():
+    """ Run pylama after git commit. """
+    _, files_modified, _ = run("git diff-index --cached --name-only HEAD")
+
+    options = parse_options()
+    setup_logger(options)
+    candidates = list(map(str, files_modified))
+    if candidates:
+        process_paths(options, candidates=candidates)
+
+
+def hg_hook(ui, repo, node=None, **kwargs):
+    """ Run pylama after mercurial commit. """
+    seen = set()
+    paths = []
+    if len(repo):
+        for rev in range(repo[node], len(repo)):
+            for file_ in repo[rev].files():
+                file_ = op.join(repo.root, file_)
+                if file_ in seen or not op.exists(file_):
+                    continue
+                seen.add(file_)
+                paths.append(file_)
+
+    options = parse_options()
+    setup_logger(options)
+    if paths:
+        process_paths(options, candidates=paths)
+
+
+def install_git(path):
+    """ Install hook in Git repository. """
+    hook = op.join(path, 'pre-commit')
+    with open(hook, 'w') as fd:
+        fd.write("""#!/usr/bin/env python
+import sys
+from pylama.hook import git_hook
+
+if __name__ == '__main__':
+    sys.exit(git_hook())
+""")
+    chmod(hook, 484)
+
+
+def install_hg(path):
+    """ Install hook in Mercurial repository. """
+    hook = op.join(path, 'hgrc')
+    if not op.isfile(hook):
+        open(hook, 'w+').close()
+
+    c = ConfigParser()
+    c.readfp(open(hook, 'r'))
+    if not c.has_section('hooks'):
+        c.add_section('hooks')
+
+    if not c.has_option('hooks', 'commit'):
+        c.set('hooks', 'commit', 'python:pylama.hooks.hg_hook')
+
+    if not c.has_option('hooks', 'qrefresh'):
+        c.set('hooks', 'qrefresh', 'python:pylama.hooks.hg_hook')
+
+    c.write(open(hook, 'w+'))
+
+
+def install_hook(path):
+    """ Auto definition of SCM and hook installation. """
+    git = op.join(path, '.git', 'hooks')
+    hg = op.join(path, '.hg')
+    if op.exists(git):
+        install_git(git)
+        LOGGER.warn('Git hook has been installed.')
+
+    elif op.exists(hg):
+        install_hg(hg)
+        LOGGER.warn('Mercurial hook has been installed.')
+
+    else:
+        LOGGER.error('VCS has not found. Check your path.')
+        sys.exit(1)
+
+# pylama:ignore=F0401,E1103,D210,F0001
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__init__.py
new file mode 100644
index 0000000..95fec13
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__init__.py
@@ -0,0 +1 @@
+""" Support libs. """
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..e093ab0
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__pycache__/inirama.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__pycache__/inirama.cpython-35.pyc
new file mode 100644
index 0000000..aaaecfc
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/__pycache__/inirama.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/importlib.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/importlib.py
new file mode 100644
index 0000000..ad31a1a
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/importlib.py
@@ -0,0 +1,38 @@
+"""Backport of importlib.import_module from 3.x."""
+# While not critical (and in no way guaranteed!), it would be nice to keep this
+# code compatible with Python 2.3.
+import sys
+
+def _resolve_name(name, package, level):
+    """Return the absolute name of the module to be imported."""
+    if not hasattr(package, 'rindex'):
+        raise ValueError("'package' not set to a string")
+    dot = len(package)
+    for x in xrange(level, 1, -1):
+        try:
+            dot = package.rindex('.', 0, dot)
+        except ValueError:
+            raise ValueError("attempted relative import beyond top-level "
+                              "package")
+    return "%s.%s" % (package[:dot], name)
+
+
+def import_module(name, package=None):
+    """Import a module.
+
+    The 'package' argument is required when performing a relative import. It
+    specifies the package to use as the anchor point from which to resolve the
+    relative import to an absolute import.
+
+    """
+    if name.startswith('.'):
+        if not package:
+            raise TypeError("relative imports require the 'package' argument")
+        level = 0
+        for character in name:
+            if character != '.':
+                break
+            level += 1
+        name = _resolve_name(name[level:], package, level)
+    __import__(name)
+    return sys.modules[name]
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/inirama.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/inirama.py
new file mode 100644
index 0000000..2437fd3
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/libs/inirama.py
@@ -0,0 +1,405 @@
+"""
+    Inirama is a python module that parses INI files.
+
+    .. _badges:
+    .. include:: ../README.rst
+        :start-after: .. _badges:
+        :end-before: .. _contents:
+
+    .. _description:
+    .. include:: ../README.rst
+        :start-after: .. _description:
+        :end-before: .. _badges:
+
+    :copyright: 2013 by Kirill Klenov.
+    :license: BSD, see LICENSE for more details.
+"""
+from __future__ import unicode_literals, print_function
+
+
+__version__ = "0.8.0"
+__project__ = "Inirama"
+__author__ = "Kirill Klenov <horneds@gmail.com>"
+__license__ = "BSD"
+
+
+import io
+import re
+import logging
+try:
+    from collections import OrderedDict
+except ImportError:
+    from UserDict import DictMixin
+
+    class OrderedDict(dict, DictMixin):
+
+        null = object()
+
+        def __init__(self, *args, **kwargs):
+            self.clear()
+            self.update(*args, **kwargs)
+
+        def clear(self):
+            self.__map = dict()
+            self.__order = list()
+            dict.clear(self)
+
+    def __setitem__(self, key, value):
+        if key not in self:
+            self.__map[key] = len(self.__order)
+            self.__order.append(key)
+        dict.__setitem__(self, key, value)
+
+    def __delitem__(self, key):
+        dict.__delitem__(self, key)
+        self.__map.pop(key)
+        self.__order = self.null
+
+    def __iter__(self):
+        for key in self.__order:
+            if key is not self.null:
+                yield key
+
+    def keys(self):
+        return list(self)
+
+    setdefault = DictMixin.setdefault
+    update = DictMixin.update
+    pop = DictMixin.pop
+    values = DictMixin.values
+    items = DictMixin.items
+    iterkeys = DictMixin.iterkeys
+    itervalues = DictMixin.itervalues
+    iteritems = DictMixin.iteritems
+
+
+NS_LOGGER = logging.getLogger('inirama')
+
+
+class Scanner(object):
+
+    """ Split a code string on tokens. """
+
+    def __init__(self, source, ignore=None, patterns=None):
+        """ Init Scanner instance.
+
+        :param patterns: List of token patterns [(token, regexp)]
+        :param ignore: List of ignored tokens
+
+        """
+        self.reset(source)
+        if patterns:
+            self.patterns = []
+            for k, r in patterns:
+                self.patterns.append((k, re.compile(r)))
+
+        if ignore:
+            self.ignore = ignore
+
+    def reset(self, source):
+        """ Reset scanner's state.
+
+        :param source: Source for parsing
+
+        """
+        self.tokens = []
+        self.source = source
+        self.pos = 0
+
+    def scan(self):
+        """ Scan source and grab tokens. """
+
+        self.pre_scan()
+
+        token = None
+        end = len(self.source)
+
+        while self.pos < end:
+
+            best_pat = None
+            best_pat_len = 0
+
+            # Check patterns
+            for p, regexp in self.patterns:
+                m = regexp.match(self.source, self.pos)
+                if m:
+                    best_pat = p
+                    best_pat_len = len(m.group(0))
+                    break
+
+            if best_pat is None:
+                raise SyntaxError(
+                    "SyntaxError[@char {0}: {1}]".format(
+                        self.pos, "Bad token."))
+
+            # Ignore patterns
+            if best_pat in self.ignore:
+                self.pos += best_pat_len
+                continue
+
+            # Create token
+            token = (
+                best_pat,
+                self.source[self.pos:self.pos + best_pat_len],
+                self.pos,
+                self.pos + best_pat_len,
+            )
+
+            self.pos = token[-1]
+            self.tokens.append(token)
+
+    def pre_scan(self):
+        """ Prepare source. """
+        pass
+
+    def __repr__(self):
+        """ Print the last 5 tokens that have been scanned in.
+
+        :return str:
+
+        """
+        return '<Scanner: ' + ','.join(
+            "{0}({2}:{3})".format(*t) for t in self.tokens[-5:]) + ">"
+
+
+class INIScanner(Scanner):
+
+    """ Get tokens for INI. """
+
+    patterns = [
+        ('SECTION', re.compile(r'\[[^]]+\]')),
+        ('IGNORE', re.compile(r'[ \r\t\n]+')),
+        ('COMMENT', re.compile(r'[;#].*')),
+        ('KEY_VALUE', re.compile(r'[^=\s]+\s*[:=].*')),
+        ('CONTINUATION', re.compile(r'.*'))
+    ]
+
+    ignore = ['IGNORE']
+
+    def pre_scan(self):
+        """ Prepare string for scaning. """
+        escape_re = re.compile(r'\\\n[\t ]+')
+        self.source = escape_re.sub('', self.source)
+
+
+undefined = object()
+
+
+class Section(OrderedDict):
+
+    """ Representation of INI section. """
+
+    def __init__(self, namespace, *args, **kwargs):
+        super(Section, self).__init__(*args, **kwargs)
+        self.namespace = namespace
+
+    def __setitem__(self, name, value):
+        value = str(value)
+        if value.isdigit():
+            value = int(value)
+
+        super(Section, self).__setitem__(name, value)
+
+
+class InterpolationSection(Section):
+
+    """ INI section with interpolation support. """
+
+    var_re = re.compile('{([^}]+)}')
+
+    def get(self, name, default=None):
+        """ Get item by name.
+
+        :return object: value or None if name not exists
+
+        """
+
+        if name in self:
+            return self[name]
+        return default
+
+    def __interpolate__(self, math):
+        try:
+            key = math.group(1).strip()
+            return self.namespace.default.get(key) or self[key]
+        except KeyError:
+            return ''
+
+    def __getitem__(self, name, raw=False):
+        value = super(InterpolationSection, self).__getitem__(name)
+        if not raw:
+            sample = undefined
+            while sample != value:
+                try:
+                    sample, value = value, self.var_re.sub(
+                        self.__interpolate__, value)
+                except RuntimeError:
+                    message = "Interpolation failed: {0}".format(name)
+                    NS_LOGGER.error(message)
+                    raise ValueError(message)
+        return value
+
+    def iteritems(self, raw=False):
+        """ Iterate self items. """
+
+        for key in self:
+            yield key, self.__getitem__(key, raw=raw)
+
+    items = iteritems
+
+
+class Namespace(object):
+
+    """ Default class for parsing INI.
+
+    :param **default_items: Default items for default section.
+
+    Usage
+    -----
+
+    ::
+
+        from inirama import Namespace
+
+        ns = Namespace()
+        ns.read('config.ini')
+
+        print ns['section']['key']
+
+        ns['other']['new'] = 'value'
+        ns.write('new_config.ini')
+
+    """
+
+    #: Name of default section (:attr:`~inirama.Namespace.default`)
+    default_section = 'DEFAULT'
+
+    #: Dont raise any exception on file reading erorrs
+    silent_read = True
+
+    #: Class for generating sections
+    section_type = Section
+
+    def __init__(self, **default_items):
+        self.sections = OrderedDict()
+        for k, v in default_items.items():
+            self[self.default_section][k] = v
+
+    @property
+    def default(self):
+        """ Return default section or empty dict.
+
+        :return :class:`inirama.Section`: section
+
+        """
+        return self.sections.get(self.default_section, dict())
+
+    def read(self, *files, **params):
+        """ Read and parse INI files.
+
+        :param *files: Files for reading
+        :param **params: Params for parsing
+
+        Set `update=False` for prevent values redefinition.
+
+        """
+        for f in files:
+            try:
+                with io.open(f, encoding='utf-8') as ff:
+                    NS_LOGGER.info('Read from `{0}`'.format(ff.name))
+                    self.parse(ff.read(), **params)
+            except (IOError, TypeError, SyntaxError, io.UnsupportedOperation):
+                if not self.silent_read:
+                    NS_LOGGER.error('Reading error `{0}`'.format(ff.name))
+                    raise
+
+    def write(self, f):
+        """ Write namespace as INI file.
+
+        :param f: File object or path to file.
+
+        """
+        if isinstance(f, str):
+            f = io.open(f, 'w', encoding='utf-8')
+
+        if not hasattr(f, 'read'):
+            raise AttributeError("Wrong type of file: {0}".format(type(f)))
+
+        NS_LOGGER.info('Write to `{0}`'.format(f.name))
+        for section in self.sections.keys():
+            f.write('[{0}]\n'.format(section))
+            for k, v in self[section].items():
+                f.write('{0:15}= {1}\n'.format(k, v))
+            f.write('\n')
+        f.close()
+
+    def parse(self, source, update=True, **params):
+        """ Parse INI source as string.
+
+        :param source: Source of INI
+        :param update: Replace alredy defined items
+
+        """
+        scanner = INIScanner(source)
+        scanner.scan()
+
+        section = self.default_section
+        name = None
+
+        for token in scanner.tokens:
+            if token[0] == 'KEY_VALUE':
+                name, value = re.split('[=:]', token[1], 1)
+                name, value = name.strip(), value.strip()
+                if not update and name in self[section]:
+                    continue
+                self[section][name] = value
+
+            elif token[0] == 'SECTION':
+                section = token[1].strip('[]')
+
+            elif token[0] == 'CONTINUATION':
+                if not name:
+                    raise SyntaxError(
+                        "SyntaxError[@char {0}: {1}]".format(
+                            token[2], "Bad continuation."))
+                self[section][name] += '\n' + token[1].strip()
+
+    def __getitem__(self, name):
+        """ Look name in self sections.
+
+        :return :class:`inirama.Section`: section
+
+        """
+        if name not in self.sections:
+            self.sections[name] = self.section_type(self)
+        return self.sections[name]
+
+    def __contains__(self, name):
+        return name in self.sections
+
+    def __repr__(self):
+        return "<Namespace: {0}>".format(self.sections)
+
+
+class InterpolationNamespace(Namespace):
+
+    """ That implements the interpolation feature.
+
+    ::
+
+        from inirama import InterpolationNamespace
+
+        ns = InterpolationNamespace()
+        ns.parse('''
+            [main]
+            test = value
+            foo = bar {test}
+            more_deep = wow {foo}
+        ''')
+        print ns['main']['more_deep']  # wow bar value
+
+    """
+
+    section_type = InterpolationSection
+
+# pylama:ignore=D,W02,E731,W0621
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__init__.py
new file mode 100644
index 0000000..bd8e8da
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__init__.py
@@ -0,0 +1,19 @@
+"""Custom module loader."""
+
+
+class Linter(object):
+
+    """Abstract class for linter plugin."""
+
+    @staticmethod
+    def allow(path):
+        """Check path is relevant for linter.
+
+        :return bool:
+        """
+        return path.endswith('.py')
+
+    @staticmethod
+    def run(path, **meta):
+        """Method 'run' should be defined."""
+        raise NotImplementedError(__doc__)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..8f6251c
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/extensions.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/extensions.cpython-35.pyc
new file mode 100644
index 0000000..821bb1b
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/extensions.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_mccabe.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_mccabe.cpython-35.pyc
new file mode 100644
index 0000000..048b405
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_mccabe.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pep257.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pep257.cpython-35.pyc
new file mode 100644
index 0000000..c96575e
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pep257.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pep8.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pep8.cpython-35.pyc
new file mode 100644
index 0000000..2c6d859
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pep8.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pyflakes.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pyflakes.cpython-35.pyc
new file mode 100644
index 0000000..ef85d02
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/__pycache__/pylama_pyflakes.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/extensions.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/extensions.py
new file mode 100644
index 0000000..bfd83d8
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/extensions.py
@@ -0,0 +1,39 @@
+"""Load extensions."""
+
+LINTERS = {}
+
+try:
+    from pylama.lint.pylama_mccabe import Linter
+    LINTERS['mccabe'] = Linter()
+except ImportError:
+    pass
+
+try:
+    from pylama.lint.pylama_pep257 import Linter
+    LINTERS['pep257'] = Linter()
+except ImportError:
+    pass
+
+try:
+    from pylama.lint.pylama_pep8 import Linter
+    LINTERS['pep8'] = Linter()
+except ImportError:
+    pass
+
+try:
+    from pylama.lint.pylama_pyflakes import Linter
+    LINTERS['pyflakes'] = Linter()
+except ImportError:
+    pass
+
+
+from pkg_resources import iter_entry_points
+
+for entry in iter_entry_points('pylama.linter'):
+    if entry.name not in LINTERS:
+        try:
+            LINTERS[entry.name] = entry.load()()
+        except ImportError:
+            pass
+
+#  pylama:ignore=E0611
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_mccabe.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_mccabe.py
new file mode 100644
index 0000000..fc19100
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_mccabe.py
@@ -0,0 +1,29 @@
+"""Code complexity checking."""
+from mccabe import McCabeChecker
+
+from pylama.lint import Linter as Abstract
+import ast
+
+
+class Linter(Abstract):
+
+    """Run complexity checking."""
+
+    @staticmethod
+    def run(path, code=None, params=None, **meta):
+        """MCCabe code checking.
+
+        :return list: List of errors.
+        """
+        try:
+            tree = compile(code, path, "exec", ast.PyCF_ONLY_AST)
+        except SyntaxError as exc:
+            return [{'lnum': exc.lineno, 'text': 'Invalid syntax: %s' % exc.text.strip()}]
+
+        McCabeChecker.max_complexity = int(params.get('complexity', 10))
+        return [
+            {'lnum': lineno, 'offset': offset, 'text': text, 'type': McCabeChecker._code}
+            for lineno, offset, text, _ in McCabeChecker(tree, path).run()
+        ]
+
+#  pylama:ignore=W0212
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pep257.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pep257.py
new file mode 100644
index 0000000..5e1f785
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pep257.py
@@ -0,0 +1,21 @@
+"""PEP257 support."""
+
+from pep257 import PEP257Checker
+
+from pylama.lint import Linter as Abstract
+
+
+class Linter(Abstract):
+
+    """Check PEP257 errors."""
+
+    @staticmethod
+    def run(path, code=None, **meta):
+        """PEP257 code checking.
+
+        :return list: List of errors.
+        """
+        return [
+            {'lnum': e.line, 'text': e.message, 'type': 'D'}
+            for e in PEP257Checker().check_source(code, path)
+        ]
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pep8.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pep8.py
new file mode 100644
index 0000000..30329d8
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pep8.py
@@ -0,0 +1,66 @@
+"""PEP8 support."""
+from pep8 import BaseReport, StyleGuide, get_parser
+
+from pylama.lint import Linter as Abstract
+
+
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
+
+
+class Linter(Abstract):
+
+    """PEP8 runner."""
+
+    @staticmethod
+    def run(path, code=None, params=None, **meta):
+        """Check code with PEP8.
+
+        :return list: List of errors.
+        """
+        parser = get_parser()
+        for option in parser.option_list:
+            if option.dest and option.dest in params:
+                value = params[option.dest]
+                if not isinstance(value, str):
+                    continue
+                params[option.dest] = option.convert_value(option, params[option.dest])
+        P8Style = StyleGuide(reporter=_PEP8Report, **params)
+        buf = StringIO(code)
+        return P8Style.input_file(path, lines=buf.readlines())
+
+
+class _PEP8Report(BaseReport):
+
+    def __init__(self, *args, **kwargs):
+        super(_PEP8Report, self).__init__(*args, **kwargs)
+        self.errors = []
+
+    def init_file(self, filename, lines, expected, line_offset):
+        """Prepare storage for errors."""
+        super(_PEP8Report, self).init_file(
+            filename, lines, expected, line_offset)
+        self.errors = []
+
+    def error(self, line_number, offset, text, check):
+        """Save errors."""
+        code = super(_PEP8Report, self).error(
+            line_number, offset, text, check)
+
+        if code:
+            self.errors.append(dict(
+                text=text,
+                type=code.replace('E', 'C'),
+                col=offset + 1,
+                lnum=line_number,
+            ))
+
+    def get_file_results(self):
+        """Get errors.
+
+        :return list: List of errors.
+
+        """
+        return self.errors
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pyflakes.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pyflakes.py
new file mode 100644
index 0000000..184d969
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pyflakes.py
@@ -0,0 +1,49 @@
+"""Pyflakes support."""
+
+from pyflakes import checker
+
+from pylama.lint import Linter as Abstract
+
+
+checker.messages.UnusedImport.message = "W0611 %r imported but unused"
+checker.messages.RedefinedWhileUnused.message = "W0404 redefinition of unused %r from line %r"
+checker.messages.RedefinedInListComp.message = "W0621 list comprehension redefines %r from line %r"
+checker.messages.ImportShadowedByLoopVar.message = "W0621 import %r from line %r shadowed by loop variable"
+checker.messages.ImportStarUsed.message = "W0401 'from %s import *' used; unable to detect undefined names"
+checker.messages.UndefinedName.message = "E0602 undefined name %r"
+checker.messages.DoctestSyntaxError.message = "W0511 syntax error in doctest"
+checker.messages.UndefinedExport.message = "E0603 undefined name %r in __all__"
+checker.messages.UndefinedLocal.message = "E0602 local variable %r (defined in enclosing scope on line %r) referenced before assignment"
+checker.messages.DuplicateArgument.message = "E1122 duplicate argument %r in function definition"
+checker.messages.LateFutureImport.message = "W0410 future import(s) %r after other statements"
+checker.messages.UnusedVariable.message = "W0612 local variable %r is assigned to but never used"
+checker.messages.ReturnWithArgsInsideGenerator.message = "E0106 'return' with argument inside generator"
+checker.messages.ReturnOutsideFunction.message = "E0104 'return' outside function"
+
+
+class Linter(Abstract):
+
+    """Pyflakes runner."""
+
+    @staticmethod
+    def run(path, code=None, params=None, **meta):
+        """Check code with pyflakes.
+
+        :return list: List of errors.
+        """
+        import _ast
+
+        builtins = params.get("builtins", "")
+
+        if builtins:
+            builtins = builtins.split(",")
+
+        tree = compile(code, path, "exec", _ast.PyCF_ONLY_AST)
+        w = checker.Checker(tree, path, builtins=builtins)
+        w.messages = sorted(w.messages, key=lambda m: m.lineno)
+        return [
+            {'lnum': m.lineno, 'text': m.message % m.message_args}
+            for m in sorted(w.messages, key=lambda m: m.lineno)
+        ]
+
+#  pylama:ignore=E501,C0301
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__init__.py
new file mode 100644
index 0000000..74e6bc2
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__init__.py
@@ -0,0 +1,12 @@
+""" Description. """
+
+# Module information
+# ==================
+
+
+__version__ = "2.1.1"
+__project__ = "pylama_pylint"
+__author__ = "horneds <horneds@gmail.com>"
+__license__ = "BSD"
+
+from .main import Linter  # noqa
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..3ddc788
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__pycache__/main.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__pycache__/main.cpython-35.pyc
new file mode 100644
index 0000000..e6b0a33
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/__pycache__/main.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/main.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/main.py
new file mode 100644
index 0000000..f50b664
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/main.py
@@ -0,0 +1,111 @@
+""" Pylint support. """
+from os import path as op, environ
+import logging
+
+from pylama.lint import Linter as BaseLinter
+
+CURDIR = op.abspath(op.dirname(__file__))
+
+from astroid import MANAGER
+from pylint.lint import Run
+from pylint.reporters import BaseReporter
+
+HOME_RCFILE = op.abspath(op.join(environ.get('HOME', ''), '.pylintrc'))
+LAMA_RCFILE = op.abspath(op.join(CURDIR, 'pylint.rc'))
+
+
+logger = logging.getLogger('pylama')
+
+
+class Linter(BaseLinter):
+
+    """ Check code with pylint. """
+
+    @staticmethod
+    def run(path, code, params=None, ignore=None, select=None, **meta):
+        """ Pylint code checking.
+
+        :return list: List of errors.
+
+        """
+        logger.debug('Start pylint')
+
+        MANAGER.astroid_cache.clear()
+
+        class Reporter(BaseReporter):
+
+            def __init__(self):
+                self.errors = []
+                super(Reporter, self).__init__()
+
+            def _display(self, layout):
+                pass
+
+            def add_message(self, msg_id, location, msg):
+                _, _, line, col = location[1:]
+                self.errors.append(dict(
+                    lnum=line,
+                    col=col,
+                    text="%s %s" % (msg_id, msg),
+                    type=msg_id[0]
+                ))
+
+        params = _Params(ignore=ignore, select=select, params=params)
+        logger.debug(params)
+
+        runner = Run(
+            [path] + params.to_attrs(), reporter=Reporter(), exit=False)
+
+        return runner.linter.reporter.errors
+
+
+class _Params(object):
+
+    """ Store pylint params. """
+
+    def __init__(self, select=None, ignore=None, params=None):
+
+        params = dict(params.items())
+        rcfile = params.get('rcfile', LAMA_RCFILE)
+        enable = params.get('enable', None)
+        disable = params.get('disable', None)
+
+        if op.exists(HOME_RCFILE):
+            rcfile = HOME_RCFILE
+
+        if select:
+            enable = select | set(enable.split(",") if enable else [])
+
+        if ignore:
+            disable = ignore | set(disable.split(",") if disable else [])
+
+        params.update(dict(
+            report=params.get('report', False), rcfile=rcfile,
+            enable=enable, disable=disable))
+
+        self.params = dict(
+            (name.replace('_', '-'), self.prepare_value(value))
+            for name, value in params.items() if value is not None)
+
+    @staticmethod
+    def prepare_value(value):
+        """ Prepare value to pylint. """
+        if isinstance(value, (list, tuple, set)):
+            return ",".join(value)
+
+        if isinstance(value, bool):
+            return "y" if value else "n"
+
+        return str(value)
+
+    def to_attrs(self):
+        """ Convert to argument list. """
+        return ["--%s=%s" % item for item in self.params.items()]
+
+    def __str__(self):
+        return " ".join(self.to_attrs())
+
+    def __repr__(self):
+        return "<Pylint %s>" % self
+
+# pylama:ignore=W0403
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/pylint.rc b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/pylint.rc
new file mode 100644
index 0000000..799c62f
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/lint/pylama_pylint/pylint.rc
@@ -0,0 +1,23 @@
+[MESSAGES CONTROL]
+# Disable the message(s) with the given id(s).
+# http://pylint-messages.wikidot.com/all-codes
+#
+# C0103: Invalid name "%s" (should match %s)
+# E1101: %s %r has no %r member
+# R0901: Too many ancestors (%s/%s)
+# R0902: Too many instance attributes (%s/%s)
+# R0903: Too few public methods (%s/%s)
+# R0904: Too many public methods (%s/%s)
+# R0913: Too many arguments (%s/%s)
+# R0915: Too many statements (%s/%s)
+# W0141: Used builtin function %r
+# W0142: Used * or ** magic
+# W0221: Arguments number differs from %s method
+# W0232: Class has no __init__ method
+# W0613: Unused argument %r
+# W0631: Using possibly undefined loop variable %r
+#
+disable = C0103,E1101,R0901,R0902,R0903,R0904,R0913,R0915,W0141,W0142,W0221,W0232,W0613,W0631
+
+[TYPECHECK]
+generated-members = REQUEST,acl_users,aq_parent,objects,DoesNotExist,_meta,status_code,content,context
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/main.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/main.py
new file mode 100644
index 0000000..2926ccd
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/main.py
@@ -0,0 +1,101 @@
+"""Pylama's shell support."""
+
+from __future__ import absolute_import, with_statement
+
+import sys
+from os import walk, path as op
+
+from .config import parse_options, CURDIR, setup_logger
+from .core import LOGGER, run
+from .async import check_async
+
+
+def check_path(options, rootdir=None, candidates=None, code=None):
+    """Check path.
+
+    :param rootdir: Root directory (for making relative file paths)
+    :param options: Parsed pylama options (from pylama.config.parse_options)
+
+    :returns: (list) Errors list
+
+    """
+    if not candidates:
+        candidates = []
+        for path_ in options.paths:
+            path = op.abspath(path_)
+            if op.isdir(path):
+                for root, _, files in walk(path):
+                    candidates += [op.relpath(op.join(root, f), CURDIR) for f in files]
+            else:
+                candidates.append(path)
+
+    if rootdir is None:
+        rootdir = path if op.isdir(path) else op.dirname(path)
+
+    paths = []
+    for path in candidates:
+
+        if not options.force and not any(l.allow(path) for _, l in options.linters):
+            continue
+
+        if not op.exists(path):
+            continue
+
+        paths.append(path)
+
+    if options.async:
+        return check_async(paths, options, rootdir)
+
+    errors = []
+    for path in paths:
+        errors += run(path=path, code=code, rootdir=rootdir, options=options)
+    return errors
+
+
+def shell(args=None, error=True):
+    """Endpoint for console.
+
+    Parse a command arguments, configuration files and run a checkers.
+
+    :return list: list of errors
+    :raise SystemExit:
+
+    """
+    if args is None:
+        args = sys.argv[1:]
+
+    options = parse_options(args)
+    setup_logger(options)
+    LOGGER.info(options)
+
+    # Install VSC hook
+    if options.hook:
+        from .hook import install_hook
+        return install_hook(options.path)
+
+    return process_paths(options, error=error)
+
+
+def process_paths(options, candidates=None, error=True):
+    """Process files and log errors."""
+    errors = check_path(options, rootdir=CURDIR, candidates=candidates)
+
+    pattern = "%(filename)s:%(lnum)s:%(col)s: %(text)s"
+    if options.format == 'pylint':
+        pattern = "%(filename)s:%(lnum)s: [%(type)s] %(text)s"
+
+    for er in errors:
+        if options.abspath:
+            er._info['filename'] = op.abspath(er.filename)
+        LOGGER.warning(pattern, er._info)
+
+    if error:
+        sys.exit(int(bool(errors)))
+
+    return errors
+
+
+if __name__ == '__main__':
+    shell()
+
+# pylama:ignore=F0001
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylama/pytest.py b/vim-plugins/bundle/python-mode/pymode/libs/pylama/pytest.py
new file mode 100644
index 0000000..eeaa58c
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylama/pytest.py
@@ -0,0 +1,87 @@
+""" py.test plugin for checking files with pylama. """
+from __future__ import absolute_import
+
+from os import path as op
+
+import py # noqa
+import pytest
+
+
+HISTKEY = "pylama/mtimes"
+
+
+def pytest_addoption(parser):
+    group = parser.getgroup("general")
+    group.addoption(
+        '--pylama', action='store_true',
+        help="perform some pylama code checks on .py files")
+
+
+def pytest_sessionstart(session):
+    config = session.config
+    if config.option.pylama and getattr(config, 'cache', None):
+        config._pylamamtimes = config.cache.get(HISTKEY, {})
+
+
+def pytest_sessionfinish(session):
+    config = session.config
+    if hasattr(config, "_pylamamtimes"):
+        config.cache.set(HISTKEY, config._pylamamtimes)
+
+
+def pytest_collect_file(path, parent):
+    config = parent.config
+    if config.option.pylama and path.ext == '.py':
+        return PylamaItem(path, parent)
+
+
+class PylamaError(Exception):
+    """ indicates an error during pylama checks. """
+
+
+class PylamaItem(pytest.Item, pytest.File):
+
+    def __init__(self, path, parent):
+        super(PylamaItem, self).__init__(path, parent)
+        self.add_marker("pep8")
+        self.cache = None
+        self._pylamamtimes = None
+
+    def setup(self):
+        if not getattr(self.config, 'cache', None):
+            return False
+
+        self.cache = True
+        self._pylamamtimes = self.fspath.mtime()
+        pylamamtimes = self.config._pylamamtimes
+        old = pylamamtimes.get(str(self.fspath), 0)
+        if old == self._pylamamtimes:
+            pytest.skip("file(s) previously passed Pylama checks")
+
+    def runtest(self):
+        errors = check_file(self.fspath)
+        if errors:
+            pattern = "%(filename)s:%(lnum)s:%(col)s: %(text)s"
+            out = "\n".join([pattern % e._info for e in errors])
+            raise PylamaError(out)
+
+        # update mtime only if test passed
+        # otherwise failures would not be re-run next time
+        if self.cache:
+            self.config._pylamamtimes[str(self.fspath)] = self._pylamamtimes
+
+    def repr_failure(self, excinfo):
+        if excinfo.errisinstance(PylamaError):
+            return excinfo.value.args[0]
+        return super(PylamaItem, self).repr_failure(excinfo)
+
+
+def check_file(path):
+    from pylama.main import parse_options, process_paths
+    from pylama.config import CURDIR
+
+    options = parse_options()
+    path = op.relpath(str(path), CURDIR)
+    return process_paths(options, candidates=[path], error=False)
+
+# pylama:ignore=D,E1002,W0212,F0001
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__init__.py
new file mode 100644
index 0000000..82e557d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__init__.py
@@ -0,0 +1,46 @@
+# Copyright (c) 2003-2012 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+import sys
+
+from .__pkginfo__ import version as __version__
+
+def run_pylint():
+    """run pylint"""
+    from pylint.lint import Run
+    Run(sys.argv[1:])
+
+def run_pylint_gui():
+    """run pylint-gui"""
+    try:
+        from pylint.gui import Run
+        Run(sys.argv[1:])
+    except ImportError:
+        sys.exit('tkinter is not available')
+
+def run_epylint():
+    """run pylint"""
+    from pylint.epylint import Run
+    Run()
+
+def run_pyreverse():
+    """run pyreverse"""
+    from pylint.pyreverse.main import Run
+    Run(sys.argv[1:])
+
+def run_symilar():
+    """run symilar"""
+    from pylint.checkers.similar import Run
+    Run(sys.argv[1:])
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/__main__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__main__.py
new file mode 100644
index 0000000..7716361
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__main__.py
@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+import pylint
+pylint.run_pylint()
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pkginfo__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pkginfo__.py
new file mode 100644
index 0000000..33ae5b6
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pkginfo__.py
@@ -0,0 +1,70 @@
+# pylint: disable=W0622,C0103
+# Copyright (c) 2003-2014 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""pylint packaging information"""
+from __future__ import absolute_import
+
+modname = distname = 'pylint'
+
+numversion = (1, 4, 4)
+version = '.'.join([str(num) for num in numversion])
+
+install_requires = ['logilab-common >= 0.53.0', 'astroid >= 1.3.6', 'six']
+
+license = 'GPL'
+description = "python code static checker"
+web = 'http://www.pylint.org'
+mailinglist = "mailto://code-quality@python.org"
+author = 'Logilab'
+author_email = 'python-projects@lists.logilab.org'
+
+classifiers = ['Development Status :: 4 - Beta',
+               'Environment :: Console',
+               'Intended Audience :: Developers',
+               'License :: OSI Approved :: GNU General Public License (GPL)',
+               'Operating System :: OS Independent',
+               'Programming Language :: Python',
+               'Programming Language :: Python :: 2',
+               'Programming Language :: Python :: 3',
+               'Topic :: Software Development :: Debuggers',
+               'Topic :: Software Development :: Quality Assurance',
+               'Topic :: Software Development :: Testing'
+              ]
+
+
+long_desc = """\
+ Pylint is a Python source code analyzer which looks for programming
+ errors, helps enforcing a coding standard and sniffs for some code
+ smells (as defined in Martin Fowler's Refactoring book)
+ .
+ Pylint can be seen as another PyChecker since nearly all tests you
+ can do with PyChecker can also be done with Pylint. However, Pylint
+ offers some more features, like checking length of lines of code,
+ checking if variable names are well-formed according to your coding
+ standard, or checking if declared interfaces are truly implemented,
+ and much more.
+ .
+ Additionally, it is possible to write plugins to add your own checks.
+ .
+ Pylint is shipped with "pylint-gui", "pyreverse" (UML diagram generator)
+ and "symilar" (an independent similarities checker)."""
+
+from os.path import join
+scripts = [join('bin', filename)
+           for filename in ('pylint', 'pylint-gui', "symilar", "epylint",
+                            "pyreverse")]
+
+include_dirs = [join('pylint', 'test')]
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..cad9fea
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/__pkginfo__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/__pkginfo__.cpython-35.pyc
new file mode 100644
index 0000000..f175889
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/__pkginfo__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/config.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/config.cpython-35.pyc
new file mode 100644
index 0000000..8c8004c
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/config.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/interfaces.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/interfaces.cpython-35.pyc
new file mode 100644
index 0000000..b92f212
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/interfaces.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/lint.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/lint.cpython-35.pyc
new file mode 100644
index 0000000..fe05ffe
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/lint.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/utils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/utils.cpython-35.pyc
new file mode 100644
index 0000000..c3570e5
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylint/__pycache__/utils.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/__init__.py
new file mode 100644
index 0000000..51adb4d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/__init__.py
@@ -0,0 +1,124 @@
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""utilities methods and classes for checkers
+
+Base id of standard checkers (used in msg and report ids):
+01: base
+02: classes
+03: format
+04: import
+05: misc
+06: variables
+07: exceptions
+08: similar
+09: design_analysis
+10: newstyle
+11: typecheck
+12: logging
+13: string_format
+14: string_constant
+15: stdlib
+16: python3
+17-50: not yet used: reserved for future internal checkers.
+51-99: perhaps used: reserved for external checkers
+
+The raw_metrics checker has no number associated since it doesn't emit any
+messages nor reports. XXX not true, emit a 07 report !
+
+"""
+
+import sys
+import tokenize
+import warnings
+
+from logilab.common.configuration import OptionsProviderMixIn
+
+from pylint.reporters import diff_string
+from pylint.utils import register_plugins
+from pylint.interfaces import UNDEFINED
+
+
+def table_lines_from_stats(stats, old_stats, columns):
+    """get values listed in <columns> from <stats> and <old_stats>,
+    and return a formated list of values, designed to be given to a
+    ureport.Table object
+    """
+    lines = []
+    for m_type in columns:
+        new = stats[m_type]
+        format = str # pylint: disable=redefined-builtin
+        if isinstance(new, float):
+            format = lambda num: '%.3f' % num
+        old = old_stats.get(m_type)
+        if old is not None:
+            diff_str = diff_string(old, new)
+            old = format(old)
+        else:
+            old, diff_str = 'NC', 'NC'
+        lines += (m_type.replace('_', ' '), format(new), old, diff_str)
+    return lines
+
+
+class BaseChecker(OptionsProviderMixIn):
+    """base class for checkers"""
+    # checker name (you may reuse an existing one)
+    name = None
+    # options level (0 will be displaying in --help, 1 in --long-help)
+    level = 1
+    # ordered list of options to control the ckecker behaviour
+    options = ()
+    # messages issued by this checker
+    msgs = {}
+    # reports issued by this checker
+    reports = ()
+    # mark this checker as enabled or not.
+    enabled = True
+
+    def __init__(self, linter=None):
+        """checker instances should have the linter as argument
+
+        linter is an object implementing ILinter
+        """
+        self.name = self.name.lower()
+        OptionsProviderMixIn.__init__(self)
+        self.linter = linter
+
+    def add_message(self, msg_id, line=None, node=None, args=None, confidence=UNDEFINED):
+        """add a message of a given type"""
+        self.linter.add_message(msg_id, line, node, args, confidence)
+
+    # dummy methods implementing the IChecker interface
+
+    def open(self):
+        """called before visiting project (i.e set of modules)"""
+
+    def close(self):
+        """called after visiting project (i.e set of modules)"""
+
+
+class BaseTokenChecker(BaseChecker):
+    """Base class for checkers that want to have access to the token stream."""
+
+    def process_tokens(self, tokens):
+        """Should be overridden by subclasses."""
+        raise NotImplementedError()
+
+
+def initialize(linter):
+    """initialize linter with checkers in this package """
+    register_plugins(linter, __path__[0])
+
+__all__ = ('BaseChecker', 'initialize')
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..61f53e0
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/base.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/base.py
new file mode 100644
index 0000000..6ce8825
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/base.py
@@ -0,0 +1,1236 @@
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# Copyright (c) 2009-2010 Arista Networks, Inc.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""basic checker for Python code"""
+
+import collections
+import itertools
+import sys
+import re
+
+import six
+from six.moves import zip  # pylint: disable=redefined-builtin
+
+from logilab.common.ureports import Table
+
+import astroid
+import astroid.bases
+from astroid import are_exclusive, InferenceError
+
+from pylint.interfaces import IAstroidChecker, INFERENCE, INFERENCE_FAILURE, HIGH
+from pylint.utils import EmptyReport
+from pylint.reporters import diff_string
+from pylint.checkers import BaseChecker
+from pylint.checkers.utils import (
+    check_messages,
+    clobber_in_except,
+    is_builtin_object,
+    is_inside_except,
+    overrides_a_method,
+    safe_infer,
+    get_argument_from_call,
+    has_known_bases,
+    NoSuchArgumentError,
+    is_import_error,
+    unimplemented_abstract_methods,
+    )
+
+
+# regex for class/function/variable/constant name
+CLASS_NAME_RGX = re.compile('[A-Z_][a-zA-Z0-9]+$')
+MOD_NAME_RGX = re.compile('(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$')
+CONST_NAME_RGX = re.compile('(([A-Z_][A-Z0-9_]*)|(__.*__))$')
+COMP_VAR_RGX = re.compile('[A-Za-z_][A-Za-z0-9_]*$')
+DEFAULT_NAME_RGX = re.compile('[a-z_][a-z0-9_]{2,30}$')
+CLASS_ATTRIBUTE_RGX = re.compile(r'([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$')
+# do not require a doc string on system methods
+NO_REQUIRED_DOC_RGX = re.compile('__.*__')
+REVERSED_METHODS = (('__getitem__', '__len__'),
+                    ('__reversed__', ))
+
+PY33 = sys.version_info >= (3, 3)
+PY3K = sys.version_info >= (3, 0)
+BAD_FUNCTIONS = ['map', 'filter']
+if sys.version_info < (3, 0):
+    BAD_FUNCTIONS.append('input')
+
+# Name categories that are always consistent with all naming conventions.
+EXEMPT_NAME_CATEGORIES = set(('exempt', 'ignore'))
+
+# A mapping from builtin-qname -> symbol, to be used when generating messages
+# about dangerous default values as arguments
+DEFAULT_ARGUMENT_SYMBOLS = dict(
+    zip(['.'.join([astroid.bases.BUILTINS, x]) for x in ('set', 'dict', 'list')],
+        ['set()', '{}', '[]'])
+)
+
+del re
+
+def _redefines_import(node):
+    """ Detect that the given node (AssName) is inside an
+    exception handler and redefines an import from the tryexcept body.
+    Returns True if the node redefines an import, False otherwise.
+    """
+    current = node
+    while current and not isinstance(current.parent, astroid.ExceptHandler):
+        current = current.parent
+    if not current or not is_import_error(current.parent):
+        return False
+    try_block = current.parent.parent
+    for import_node in try_block.nodes_of_class((astroid.From, astroid.Import)):
+        for name, alias in import_node.names:
+            if alias:
+                if alias == node.name:
+                    return True
+            elif name == node.name:
+                return True
+    return False
+
+def in_loop(node):
+    """return True if the node is inside a kind of for loop"""
+    parent = node.parent
+    while parent is not None:
+        if isinstance(parent, (astroid.For, astroid.ListComp, astroid.SetComp,
+                               astroid.DictComp, astroid.GenExpr)):
+            return True
+        parent = parent.parent
+    return False
+
+def in_nested_list(nested_list, obj):
+    """return true if the object is an element of <nested_list> or of a nested
+    list
+    """
+    for elmt in nested_list:
+        if isinstance(elmt, (list, tuple)):
+            if in_nested_list(elmt, obj):
+                return True
+        elif elmt == obj:
+            return True
+    return False
+
+def _loop_exits_early(loop):
+    """Returns true if a loop has a break statement in its body."""
+    loop_nodes = (astroid.For, astroid.While)
+    # Loop over body explicitly to avoid matching break statements
+    # in orelse.
+    for child in loop.body:
+        if isinstance(child, loop_nodes):
+            # break statement may be in orelse of child loop.
+            # pylint: disable=superfluous-parens
+            for orelse in (child.orelse or ()):
+                for _ in orelse.nodes_of_class(astroid.Break, skip_klass=loop_nodes):
+                    return True
+            continue
+        for _ in child.nodes_of_class(astroid.Break, skip_klass=loop_nodes):
+            return True
+    return False
+
+def _is_multi_naming_match(match, node_type, confidence):
+    return (match is not None and
+            match.lastgroup is not None and
+            match.lastgroup not in EXEMPT_NAME_CATEGORIES
+            and (node_type != 'method' or confidence != INFERENCE_FAILURE))
+
+
+if sys.version_info < (3, 0):
+    PROPERTY_CLASSES = set(('__builtin__.property', 'abc.abstractproperty'))
+else:
+    PROPERTY_CLASSES = set(('builtins.property', 'abc.abstractproperty'))
+
+
+def _determine_function_name_type(node):
+    """Determine the name type whose regex the a function's name should match.
+
+    :param node: A function node.
+    :returns: One of ('function', 'method', 'attr')
+    """
+    if not node.is_method():
+        return 'function'
+    if node.decorators:
+        decorators = node.decorators.nodes
+    else:
+        decorators = []
+    for decorator in decorators:
+        # If the function is a property (decorated with @property
+        # or @abc.abstractproperty), the name type is 'attr'.
+        if (isinstance(decorator, astroid.Name) or
+                (isinstance(decorator, astroid.Getattr) and
+                 decorator.attrname == 'abstractproperty')):
+            infered = safe_infer(decorator)
+            if infered and infered.qname() in PROPERTY_CLASSES:
+                return 'attr'
+        # If the function is decorated using the prop_method.{setter,getter}
+        # form, treat it like an attribute as well.
+        elif (isinstance(decorator, astroid.Getattr) and
+              decorator.attrname in ('setter', 'deleter')):
+            return 'attr'
+    return 'method'
+
+
+
+def _has_abstract_methods(node):
+    """
+    Determine if the given `node` has abstract methods.
+
+    The methods should be made abstract by decorating them
+    with `abc` decorators.
+    """
+    return len(unimplemented_abstract_methods(node)) > 0
+
+
+def report_by_type_stats(sect, stats, old_stats):
+    """make a report of
+
+    * percentage of different types documented
+    * percentage of different types with a bad name
+    """
+    # percentage of different types documented and/or with a bad name
+    nice_stats = {}
+    for node_type in ('module', 'class', 'method', 'function'):
+        try:
+            total = stats[node_type]
+        except KeyError:
+            raise EmptyReport()
+        nice_stats[node_type] = {}
+        if total != 0:
+            try:
+                documented = total - stats['undocumented_'+node_type]
+                percent = (documented * 100.) / total
+                nice_stats[node_type]['percent_documented'] = '%.2f' % percent
+            except KeyError:
+                nice_stats[node_type]['percent_documented'] = 'NC'
+            try:
+                percent = (stats['badname_'+node_type] * 100.) / total
+                nice_stats[node_type]['percent_badname'] = '%.2f' % percent
+            except KeyError:
+                nice_stats[node_type]['percent_badname'] = 'NC'
+    lines = ('type', 'number', 'old number', 'difference',
+             '%documented', '%badname')
+    for node_type in ('module', 'class', 'method', 'function'):
+        new = stats[node_type]
+        old = old_stats.get(node_type, None)
+        if old is not None:
+            diff_str = diff_string(old, new)
+        else:
+            old, diff_str = 'NC', 'NC'
+        lines += (node_type, str(new), str(old), diff_str,
+                  nice_stats[node_type].get('percent_documented', '0'),
+                  nice_stats[node_type].get('percent_badname', '0'))
+    sect.append(Table(children=lines, cols=6, rheaders=1))
+
+def redefined_by_decorator(node):
+    """return True if the object is a method redefined via decorator.
+
+    For example:
+        @property
+        def x(self): return self._x
+        @x.setter
+        def x(self, value): self._x = value
+    """
+    if node.decorators:
+        for decorator in node.decorators.nodes:
+            if (isinstance(decorator, astroid.Getattr) and
+                    getattr(decorator.expr, 'name', None) == node.name):
+                return True
+    return False
+
+class _BasicChecker(BaseChecker):
+    __implements__ = IAstroidChecker
+    name = 'basic'
+
+class BasicErrorChecker(_BasicChecker):
+    msgs = {
+        'E0100': ('__init__ method is a generator',
+                  'init-is-generator',
+                  'Used when the special class method __init__ is turned into a '
+                  'generator by a yield in its body.'),
+        'E0101': ('Explicit return in __init__',
+                  'return-in-init',
+                  'Used when the special class method __init__ has an explicit '
+                  'return value.'),
+        'E0102': ('%s already defined line %s',
+                  'function-redefined',
+                  'Used when a function / class / method is redefined.'),
+        'E0103': ('%r not properly in loop',
+                  'not-in-loop',
+                  'Used when break or continue keywords are used outside a loop.'),
+        'E0104': ('Return outside function',
+                  'return-outside-function',
+                  'Used when a "return" statement is found outside a function or '
+                  'method.'),
+        'E0105': ('Yield outside function',
+                  'yield-outside-function',
+                  'Used when a "yield" statement is found outside a function or '
+                  'method.'),
+        'E0106': ('Return with argument inside generator',
+                  'return-arg-in-generator',
+                  'Used when a "return" statement with an argument is found '
+                  'outside in a generator function or method (e.g. with some '
+                  '"yield" statements).',
+                  {'maxversion': (3, 3)}),
+        'E0107': ("Use of the non-existent %s operator",
+                  'nonexistent-operator',
+                  "Used when you attempt to use the C-style pre-increment or"
+                  "pre-decrement operator -- and ++, which doesn't exist in Python."),
+        'E0108': ('Duplicate argument name %s in function definition',
+                  'duplicate-argument-name',
+                  'Duplicate argument names in function definitions are syntax'
+                  ' errors.'),
+        'E0110': ('Abstract class %r with abstract methods instantiated',
+                  'abstract-class-instantiated',
+                  'Used when an abstract class with `abc.ABCMeta` as metaclass '
+                  'has abstract methods and is instantiated.'),
+        'W0120': ('Else clause on loop without a break statement',
+                  'useless-else-on-loop',
+                  'Loops should only have an else clause if they can exit early '
+                  'with a break statement, otherwise the statements under else '
+                  'should be on the same scope as the loop itself.'),
+        }
+
+    @check_messages('function-redefined')
+    def visit_class(self, node):
+        self._check_redefinition('class', node)
+
+    @check_messages('init-is-generator', 'return-in-init',
+                    'function-redefined', 'return-arg-in-generator',
+                    'duplicate-argument-name')
+    def visit_function(self, node):
+        if not redefined_by_decorator(node):
+            self._check_redefinition(node.is_method() and 'method' or 'function', node)
+        # checks for max returns, branch, return in __init__
+        returns = node.nodes_of_class(astroid.Return,
+                                      skip_klass=(astroid.Function, astroid.Class))
+        if node.is_method() and node.name == '__init__':
+            if node.is_generator():
+                self.add_message('init-is-generator', node=node)
+            else:
+                values = [r.value for r in returns]
+                # Are we returning anything but None from constructors
+                if [v for v in values
+                        if not (v is None or
+                                (isinstance(v, astroid.Const) and v.value is None) or
+                                (isinstance(v, astroid.Name)  and v.name == 'None')
+                               )]:
+                    self.add_message('return-in-init', node=node)
+        elif node.is_generator():
+            # make sure we don't mix non-None returns and yields
+            if not PY33:
+                for retnode in returns:
+                    if isinstance(retnode.value, astroid.Const) and \
+                           retnode.value.value is not None:
+                        self.add_message('return-arg-in-generator', node=node,
+                                         line=retnode.fromlineno)
+        # Check for duplicate names
+        args = set()
+        for name in node.argnames():
+            if name in args:
+                self.add_message('duplicate-argument-name', node=node, args=(name,))
+            else:
+                args.add(name)
+
+
+    @check_messages('return-outside-function')
+    def visit_return(self, node):
+        if not isinstance(node.frame(), astroid.Function):
+            self.add_message('return-outside-function', node=node)
+
+    @check_messages('yield-outside-function')
+    def visit_yield(self, node):
+        if not isinstance(node.frame(), (astroid.Function, astroid.Lambda)):
+            self.add_message('yield-outside-function', node=node)
+
+    @check_messages('not-in-loop')
+    def visit_continue(self, node):
+        self._check_in_loop(node, 'continue')
+
+    @check_messages('not-in-loop')
+    def visit_break(self, node):
+        self._check_in_loop(node, 'break')
+
+    @check_messages('useless-else-on-loop')
+    def visit_for(self, node):
+        self._check_else_on_loop(node)
+
+    @check_messages('useless-else-on-loop')
+    def visit_while(self, node):
+        self._check_else_on_loop(node)
+
+    @check_messages('nonexistent-operator')
+    def visit_unaryop(self, node):
+        """check use of the non-existent ++ and -- operator operator"""
+        if ((node.op in '+-') and
+                isinstance(node.operand, astroid.UnaryOp) and
+                (node.operand.op == node.op)):
+            self.add_message('nonexistent-operator', node=node, args=node.op*2)
+
+    @check_messages('abstract-class-instantiated')
+    def visit_callfunc(self, node):
+        """ Check instantiating abstract class with
+        abc.ABCMeta as metaclass.
+        """
+        try:
+            infered = next(node.func.infer())
+        except astroid.InferenceError:
+            return
+        if not isinstance(infered, astroid.Class):
+            return
+        # __init__ was called
+        metaclass = infered.metaclass()
+        abstract_methods = _has_abstract_methods(infered)
+        if metaclass is None:
+            # Python 3.4 has `abc.ABC`, which won't be detected
+            # by ClassNode.metaclass()
+            for ancestor in infered.ancestors():
+                if ancestor.qname() == 'abc.ABC' and abstract_methods:
+                    self.add_message('abstract-class-instantiated',
+                                     args=(infered.name, ),
+                                     node=node)
+                    break
+            return
+        if metaclass.qname() == 'abc.ABCMeta' and abstract_methods:
+            self.add_message('abstract-class-instantiated',
+                             args=(infered.name, ),
+                             node=node)
+
+    def _check_else_on_loop(self, node):
+        """Check that any loop with an else clause has a break statement."""
+        if node.orelse and not _loop_exits_early(node):
+            self.add_message('useless-else-on-loop', node=node,
+                             # This is not optimal, but the line previous
+                             # to the first statement in the else clause
+                             # will usually be the one that contains the else:.
+                             line=node.orelse[0].lineno - 1)
+
+    def _check_in_loop(self, node, node_name):
+        """check that a node is inside a for or while loop"""
+        _node = node.parent
+        while _node:
+            if isinstance(_node, (astroid.For, astroid.While)):
+                break
+            _node = _node.parent
+        else:
+            self.add_message('not-in-loop', node=node, args=node_name)
+
+    def _check_redefinition(self, redeftype, node):
+        """check for redefinition of a function / method / class name"""
+        defined_self = node.parent.frame()[node.name]
+        if defined_self is not node and not are_exclusive(node, defined_self):
+            self.add_message('function-redefined', node=node,
+                             args=(redeftype, defined_self.fromlineno))
+
+
+
+class BasicChecker(_BasicChecker):
+    """checks for :
+    * doc strings
+    * number of arguments, local variables, branches, returns and statements in
+functions, methods
+    * required module attributes
+    * dangerous default values as arguments
+    * redefinition of function / method / class
+    * uses of the global statement
+    """
+
+    __implements__ = IAstroidChecker
+
+    name = 'basic'
+    msgs = {
+        'W0101': ('Unreachable code',
+                  'unreachable',
+                  'Used when there is some code behind a "return" or "raise" '
+                  'statement, which will never be accessed.'),
+        'W0102': ('Dangerous default value %s as argument',
+                  'dangerous-default-value',
+                  'Used when a mutable value as list or dictionary is detected in '
+                  'a default value for an argument.'),
+        'W0104': ('Statement seems to have no effect',
+                  'pointless-statement',
+                  'Used when a statement doesn\'t have (or at least seems to) '
+                  'any effect.'),
+        'W0105': ('String statement has no effect',
+                  'pointless-string-statement',
+                  'Used when a string is used as a statement (which of course '
+                  'has no effect). This is a particular case of W0104 with its '
+                  'own message so you can easily disable it if you\'re using '
+                  'those strings as documentation, instead of comments.'),
+        'W0106': ('Expression "%s" is assigned to nothing',
+                  'expression-not-assigned',
+                  'Used when an expression that is not a function call is assigned '
+                  'to nothing. Probably something else was intended.'),
+        'W0108': ('Lambda may not be necessary',
+                  'unnecessary-lambda',
+                  'Used when the body of a lambda expression is a function call '
+                  'on the same argument list as the lambda itself; such lambda '
+                  'expressions are in all but a few cases replaceable with the '
+                  'function being called in the body of the lambda.'),
+        'W0109': ("Duplicate key %r in dictionary",
+                  'duplicate-key',
+                  'Used when a dictionary expression binds the same key multiple '
+                  'times.'),
+        'W0122': ('Use of exec',
+                  'exec-used',
+                  'Used when you use the "exec" statement (function for Python '
+                  '3), to discourage its usage. That doesn\'t '
+                  'mean you can not use it !'),
+        'W0123': ('Use of eval',
+                  'eval-used',
+                  'Used when you use the "eval" function, to discourage its '
+                  'usage. Consider using `ast.literal_eval` for safely evaluating '
+                  'strings containing Python expressions '
+                  'from untrusted sources. '),
+        'W0141': ('Used builtin function %r',
+                  'bad-builtin',
+                  'Used when a black listed builtin function is used (see the '
+                  'bad-function option). Usual black listed functions are the ones '
+                  'like map, or filter , where Python offers now some cleaner '
+                  'alternative like list comprehension.'),
+        'W0150': ("%s statement in finally block may swallow exception",
+                  'lost-exception',
+                  'Used when a break or a return statement is found inside the '
+                  'finally clause of a try...finally block: the exceptions raised '
+                  'in the try clause will be silently swallowed instead of being '
+                  're-raised.'),
+        'W0199': ('Assert called on a 2-uple. Did you mean \'assert x,y\'?',
+                  'assert-on-tuple',
+                  'A call of assert on a tuple will always evaluate to true if '
+                  'the tuple is not empty, and will always evaluate to false if '
+                  'it is.'),
+        'C0121': ('Missing required attribute "%s"', # W0103
+                  'missing-module-attribute',
+                  'Used when an attribute required for modules is missing.'),
+
+        'E0109': ('Missing argument to reversed()',
+                  'missing-reversed-argument',
+                  'Used when reversed() builtin didn\'t receive an argument.'),
+        'E0111': ('The first reversed() argument is not a sequence',
+                  'bad-reversed-sequence',
+                  'Used when the first argument to reversed() builtin '
+                  'isn\'t a sequence (does not implement __reversed__, '
+                  'nor __getitem__ and __len__'),
+
+    }
+
+    options = (('required-attributes',
+                {'default' : (), 'type' : 'csv',
+                 'metavar' : '<attributes>',
+                 'help' : 'Required attributes for module, separated by a '
+                          'comma'}
+               ),
+               ('bad-functions',
+                {'default' : BAD_FUNCTIONS,
+                 'type' :'csv', 'metavar' : '<builtin function names>',
+                 'help' : 'List of builtins function names that should not be '
+                          'used, separated by a comma'}
+               ),
+              )
+    reports = (('RP0101', 'Statistics by type', report_by_type_stats),)
+
+    def __init__(self, linter):
+        _BasicChecker.__init__(self, linter)
+        self.stats = None
+        self._tryfinallys = None
+
+    def open(self):
+        """initialize visit variables and statistics
+        """
+        self._tryfinallys = []
+        self.stats = self.linter.add_stats(module=0, function=0,
+                                           method=0, class_=0)
+
+    @check_messages('missing-module-attribute')
+    def visit_module(self, node):
+        """check module name, docstring and required arguments
+        """
+        self.stats['module'] += 1
+        for attr in self.config.required_attributes:
+            if attr not in node:
+                self.add_message('missing-module-attribute', node=node, args=attr)
+
+    def visit_class(self, node): # pylint: disable=unused-argument
+        """check module name, docstring and redefinition
+        increment branch counter
+        """
+        self.stats['class'] += 1
+
+    @check_messages('pointless-statement', 'pointless-string-statement',
+                    'expression-not-assigned')
+    def visit_discard(self, node):
+        """check for various kind of statements without effect"""
+        expr = node.value
+        if isinstance(expr, astroid.Const) and isinstance(expr.value,
+                                                          six.string_types):
+            # treat string statement in a separated message
+            # Handle PEP-257 attribute docstrings.
+            # An attribute docstring is defined as being a string right after
+            # an assignment at the module level, class level or __init__ level.
+            scope = expr.scope()
+            if isinstance(scope, (astroid.Class, astroid.Module, astroid.Function)):
+                if isinstance(scope, astroid.Function) and scope.name != '__init__':
+                    pass
+                else:
+                    sibling = expr.previous_sibling()
+                    if (sibling is not None and sibling.scope() is scope and
+                            isinstance(sibling, astroid.Assign)):
+                        return
+            self.add_message('pointless-string-statement', node=node)
+            return
+        # ignore if this is :
+        # * a direct function call
+        # * the unique child of a try/except body
+        # * a yield (which are wrapped by a discard node in _ast XXX)
+        # warn W0106 if we have any underlying function call (we can't predict
+        # side effects), else pointless-statement
+        if (isinstance(expr, (astroid.Yield, astroid.CallFunc)) or
+                (isinstance(node.parent, astroid.TryExcept) and
+                 node.parent.body == [node])):
+            return
+        if any(expr.nodes_of_class(astroid.CallFunc)):
+            self.add_message('expression-not-assigned', node=node,
+                             args=expr.as_string())
+        else:
+            self.add_message('pointless-statement', node=node)
+
+    @check_messages('unnecessary-lambda')
+    def visit_lambda(self, node):
+        """check whether or not the lambda is suspicious
+        """
+        # if the body of the lambda is a call expression with the same
+        # argument list as the lambda itself, then the lambda is
+        # possibly unnecessary and at least suspicious.
+        if node.args.defaults:
+            # If the arguments of the lambda include defaults, then a
+            # judgment cannot be made because there is no way to check
+            # that the defaults defined by the lambda are the same as
+            # the defaults defined by the function called in the body
+            # of the lambda.
+            return
+        call = node.body
+        if not isinstance(call, astroid.CallFunc):
+            # The body of the lambda must be a function call expression
+            # for the lambda to be unnecessary.
+            return
+        # XXX are lambda still different with astroid >= 0.18 ?
+        # *args and **kwargs need to be treated specially, since they
+        # are structured differently between the lambda and the function
+        # call (in the lambda they appear in the args.args list and are
+        # indicated as * and ** by two bits in the lambda's flags, but
+        # in the function call they are omitted from the args list and
+        # are indicated by separate attributes on the function call node).
+        ordinary_args = list(node.args.args)
+        if node.args.kwarg:
+            if (not call.kwargs
+                    or not isinstance(call.kwargs, astroid.Name)
+                    or node.args.kwarg != call.kwargs.name):
+                return
+        elif call.kwargs:
+            return
+        if node.args.vararg:
+            if (not call.starargs
+                    or not isinstance(call.starargs, astroid.Name)
+                    or node.args.vararg != call.starargs.name):
+                return
+        elif call.starargs:
+            return
+        # The "ordinary" arguments must be in a correspondence such that:
+        # ordinary_args[i].name == call.args[i].name.
+        if len(ordinary_args) != len(call.args):
+            return
+        for i in range(len(ordinary_args)):
+            if not isinstance(call.args[i], astroid.Name):
+                return
+            if node.args.args[i].name != call.args[i].name:
+                return
+        if (isinstance(node.body.func, astroid.Getattr) and
+                isinstance(node.body.func.expr, astroid.CallFunc)):
+            # Chained call, the intermediate call might
+            # return something else (but we don't check that, yet).
+            return
+        self.add_message('unnecessary-lambda', line=node.fromlineno, node=node)
+
+    @check_messages('dangerous-default-value')
+    def visit_function(self, node):
+        """check function name, docstring, arguments, redefinition,
+        variable names, max locals
+        """
+        self.stats[node.is_method() and 'method' or 'function'] += 1
+        self._check_dangerous_default(node)
+
+    def _check_dangerous_default(self, node):
+        # check for dangerous default values as arguments
+        is_iterable = lambda n: isinstance(n, (astroid.List,
+                                               astroid.Set,
+                                               astroid.Dict))
+        for default in node.args.defaults:
+            try:
+                value = next(default.infer())
+            except astroid.InferenceError:
+                continue
+
+            if (isinstance(value, astroid.Instance) and
+                    value.qname() in DEFAULT_ARGUMENT_SYMBOLS):
+
+                if value is default:
+                    msg = DEFAULT_ARGUMENT_SYMBOLS[value.qname()]
+                elif type(value) is astroid.Instance or is_iterable(value):
+                    # We are here in the following situation(s):
+                    #   * a dict/set/list/tuple call which wasn't inferred
+                    #     to a syntax node ({}, () etc.). This can happen
+                    #     when the arguments are invalid or unknown to
+                    #     the inference.
+                    #   * a variable from somewhere else, which turns out to be a list
+                    #     or a dict.
+                    if is_iterable(default):
+                        msg = value.pytype()
+                    elif isinstance(default, astroid.CallFunc):
+                        msg = '%s() (%s)' % (value.name, value.qname())
+                    else:
+                        msg = '%s (%s)' % (default.as_string(), value.qname())
+                else:
+                    # this argument is a name
+                    msg = '%s (%s)' % (default.as_string(),
+                                       DEFAULT_ARGUMENT_SYMBOLS[value.qname()])
+                self.add_message('dangerous-default-value',
+                                 node=node,
+                                 args=(msg, ))
+
+    @check_messages('unreachable', 'lost-exception')
+    def visit_return(self, node):
+        """1 - check is the node has a right sibling (if so, that's some
+        unreachable code)
+        2 - check is the node is inside the finally clause of a try...finally
+        block
+        """
+        self._check_unreachable(node)
+        # Is it inside final body of a try...finally bloc ?
+        self._check_not_in_finally(node, 'return', (astroid.Function,))
+
+    @check_messages('unreachable')
+    def visit_continue(self, node):
+        """check is the node has a right sibling (if so, that's some unreachable
+        code)
+        """
+        self._check_unreachable(node)
+
+    @check_messages('unreachable', 'lost-exception')
+    def visit_break(self, node):
+        """1 - check is the node has a right sibling (if so, that's some
+        unreachable code)
+        2 - check is the node is inside the finally clause of a try...finally
+        block
+        """
+        # 1 - Is it right sibling ?
+        self._check_unreachable(node)
+        # 2 - Is it inside final body of a try...finally bloc ?
+        self._check_not_in_finally(node, 'break', (astroid.For, astroid.While,))
+
+    @check_messages('unreachable')
+    def visit_raise(self, node):
+        """check if the node has a right sibling (if so, that's some unreachable
+        code)
+        """
+        self._check_unreachable(node)
+
+    @check_messages('exec-used')
+    def visit_exec(self, node):
+        """just print a warning on exec statements"""
+        self.add_message('exec-used', node=node)
+
+    @check_messages('bad-builtin', 'eval-used',
+                    'exec-used', 'missing-reversed-argument',
+                    'bad-reversed-sequence')
+    def visit_callfunc(self, node):
+        """visit a CallFunc node -> check if this is not a blacklisted builtin
+        call and check for * or ** use
+        """
+        if isinstance(node.func, astroid.Name):
+            name = node.func.name
+            # ignore the name if it's not a builtin (i.e. not defined in the
+            # locals nor globals scope)
+            if not (name in node.frame() or
+                    name in node.root()):
+                if name == 'exec':
+                    self.add_message('exec-used', node=node)
+                elif name == 'reversed':
+                    self._check_reversed(node)
+                elif name == 'eval':
+                    self.add_message('eval-used', node=node)
+                if name in self.config.bad_functions:
+                    self.add_message('bad-builtin', node=node, args=name)
+
+    @check_messages('assert-on-tuple')
+    def visit_assert(self, node):
+        """check the use of an assert statement on a tuple."""
+        if node.fail is None and isinstance(node.test, astroid.Tuple) and \
+                len(node.test.elts) == 2:
+            self.add_message('assert-on-tuple', node=node)
+
+    @check_messages('duplicate-key')
+    def visit_dict(self, node):
+        """check duplicate key in dictionary"""
+        keys = set()
+        for k, _ in node.items:
+            if isinstance(k, astroid.Const):
+                key = k.value
+                if key in keys:
+                    self.add_message('duplicate-key', node=node, args=key)
+                keys.add(key)
+
+    def visit_tryfinally(self, node):
+        """update try...finally flag"""
+        self._tryfinallys.append(node)
+
+    def leave_tryfinally(self, node): # pylint: disable=unused-argument
+        """update try...finally flag"""
+        self._tryfinallys.pop()
+
+    def _check_unreachable(self, node):
+        """check unreachable code"""
+        unreach_stmt = node.next_sibling()
+        if unreach_stmt is not None:
+            self.add_message('unreachable', node=unreach_stmt)
+
+    def _check_not_in_finally(self, node, node_name, breaker_classes=()):
+        """check that a node is not inside a finally clause of a
+        try...finally statement.
+        If we found before a try...finally bloc a parent which its type is
+        in breaker_classes, we skip the whole check."""
+        # if self._tryfinallys is empty, we're not a in try...finally bloc
+        if not self._tryfinallys:
+            return
+        # the node could be a grand-grand...-children of the try...finally
+        _parent = node.parent
+        _node = node
+        while _parent and not isinstance(_parent, breaker_classes):
+            if hasattr(_parent, 'finalbody') and _node in _parent.finalbody:
+                self.add_message('lost-exception', node=node, args=node_name)
+                return
+            _node = _parent
+            _parent = _node.parent
+
+    def _check_reversed(self, node):
+        """ check that the argument to `reversed` is a sequence """
+        try:
+            argument = safe_infer(get_argument_from_call(node, position=0))
+        except NoSuchArgumentError:
+            self.add_message('missing-reversed-argument', node=node)
+        else:
+            if argument is astroid.YES:
+                return
+            if argument is None:
+                # Nothing was infered.
+                # Try to see if we have iter().
+                if isinstance(node.args[0], astroid.CallFunc):
+                    try:
+                        func = next(node.args[0].func.infer())
+                    except InferenceError:
+                        return
+                    if (getattr(func, 'name', None) == 'iter' and
+                            is_builtin_object(func)):
+                        self.add_message('bad-reversed-sequence', node=node)
+                return
+
+            if isinstance(argument, astroid.Instance):
+                if (argument._proxied.name == 'dict' and
+                        is_builtin_object(argument._proxied)):
+                    self.add_message('bad-reversed-sequence', node=node)
+                    return
+                elif any(ancestor.name == 'dict' and is_builtin_object(ancestor)
+                         for ancestor in argument._proxied.ancestors()):
+                    # mappings aren't accepted by reversed()
+                    self.add_message('bad-reversed-sequence', node=node)
+                    return
+
+                for methods in REVERSED_METHODS:
+                    for meth in methods:
+                        try:
+                            argument.getattr(meth)
+                        except astroid.NotFoundError:
+                            break
+                    else:
+                        break
+                else:
+                    # Check if it is a .deque. It doesn't seem that
+                    # we can retrieve special methods
+                    # from C implemented constructs.
+                    if argument._proxied.qname().endswith(".deque"):
+                        return
+                    self.add_message('bad-reversed-sequence', node=node)
+            elif not isinstance(argument, (astroid.List, astroid.Tuple)):
+                # everything else is not a proper sequence for reversed()
+                self.add_message('bad-reversed-sequence', node=node)
+
+_NAME_TYPES = {
+    'module': (MOD_NAME_RGX, 'module'),
+    'const': (CONST_NAME_RGX, 'constant'),
+    'class': (CLASS_NAME_RGX, 'class'),
+    'function': (DEFAULT_NAME_RGX, 'function'),
+    'method': (DEFAULT_NAME_RGX, 'method'),
+    'attr': (DEFAULT_NAME_RGX, 'attribute'),
+    'argument': (DEFAULT_NAME_RGX, 'argument'),
+    'variable': (DEFAULT_NAME_RGX, 'variable'),
+    'class_attribute': (CLASS_ATTRIBUTE_RGX, 'class attribute'),
+    'inlinevar': (COMP_VAR_RGX, 'inline iteration'),
+}
+
+def _create_naming_options():
+    name_options = []
+    for name_type, (rgx, human_readable_name) in six.iteritems(_NAME_TYPES):
+        name_type = name_type.replace('_', '-')
+        name_options.append((
+            '%s-rgx' % (name_type,),
+            {'default': rgx, 'type': 'regexp', 'metavar': '<regexp>',
+             'help': 'Regular expression matching correct %s names' % (human_readable_name,)}))
+        name_options.append((
+            '%s-name-hint' % (name_type,),
+            {'default': rgx.pattern, 'type': 'string', 'metavar': '<string>',
+             'help': 'Naming hint for %s names' % (human_readable_name,)}))
+    return tuple(name_options)
+
+class NameChecker(_BasicChecker):
+    msgs = {
+        'C0102': ('Black listed name "%s"',
+                  'blacklisted-name',
+                  'Used when the name is listed in the black list (unauthorized '
+                  'names).'),
+        'C0103': ('Invalid %s name "%s"%s',
+                  'invalid-name',
+                  'Used when the name doesn\'t match the regular expression '
+                  'associated to its type (constant, variable, class...).'),
+    }
+
+    options = (('good-names',
+                {'default' : ('i', 'j', 'k', 'ex', 'Run', '_'),
+                 'type' :'csv', 'metavar' : '<names>',
+                 'help' : 'Good variable names which should always be accepted,'
+                          ' separated by a comma'}
+               ),
+               ('bad-names',
+                {'default' : ('foo', 'bar', 'baz', 'toto', 'tutu', 'tata'),
+                 'type' :'csv', 'metavar' : '<names>',
+                 'help' : 'Bad variable names which should always be refused, '
+                          'separated by a comma'}
+               ),
+               ('name-group',
+                {'default' : (),
+                 'type' :'csv', 'metavar' : '<name1:name2>',
+                 'help' : ('Colon-delimited sets of names that determine each'
+                           ' other\'s naming style when the name regexes'
+                           ' allow several styles.')}
+               ),
+               ('include-naming-hint',
+                {'default': False, 'type' : 'yn', 'metavar' : '<y_or_n>',
+                 'help': 'Include a hint for the correct naming format with invalid-name'}
+               ),
+              ) + _create_naming_options()
+
+
+    def __init__(self, linter):
+        _BasicChecker.__init__(self, linter)
+        self._name_category = {}
+        self._name_group = {}
+        self._bad_names = {}
+
+    def open(self):
+        self.stats = self.linter.add_stats(badname_module=0,
+                                           badname_class=0, badname_function=0,
+                                           badname_method=0, badname_attr=0,
+                                           badname_const=0,
+                                           badname_variable=0,
+                                           badname_inlinevar=0,
+                                           badname_argument=0,
+                                           badname_class_attribute=0)
+        for group in self.config.name_group:
+            for name_type in group.split(':'):
+                self._name_group[name_type] = 'group_%s' % (group,)
+
+    @check_messages('blacklisted-name', 'invalid-name')
+    def visit_module(self, node):
+        self._check_name('module', node.name.split('.')[-1], node)
+        self._bad_names = {}
+
+    def leave_module(self, node): # pylint: disable=unused-argument
+        for all_groups in six.itervalues(self._bad_names):
+            if len(all_groups) < 2:
+                continue
+            groups = collections.defaultdict(list)
+            min_warnings = sys.maxsize
+            for group in six.itervalues(all_groups):
+                groups[len(group)].append(group)
+                min_warnings = min(len(group), min_warnings)
+            if len(groups[min_warnings]) > 1:
+                by_line = sorted(groups[min_warnings],
+                                 key=lambda group: min(warning[0].lineno for warning in group))
+                warnings = itertools.chain(*by_line[1:])
+            else:
+                warnings = groups[min_warnings][0]
+            for args in warnings:
+                self._raise_name_warning(*args)
+
+    @check_messages('blacklisted-name', 'invalid-name')
+    def visit_class(self, node):
+        self._check_name('class', node.name, node)
+        for attr, anodes in six.iteritems(node.instance_attrs):
+            if not list(node.instance_attr_ancestors(attr)):
+                self._check_name('attr', attr, anodes[0])
+
+    @check_messages('blacklisted-name', 'invalid-name')
+    def visit_function(self, node):
+        # Do not emit any warnings if the method is just an implementation
+        # of a base class method.
+        confidence = HIGH
+        if node.is_method():
+            if overrides_a_method(node.parent.frame(), node.name):
+                return
+            confidence = (INFERENCE if has_known_bases(node.parent.frame())
+                          else INFERENCE_FAILURE)
+
+        self._check_name(_determine_function_name_type(node),
+                         node.name, node, confidence)
+        # Check argument names
+        args = node.args.args
+        if args is not None:
+            self._recursive_check_names(args, node)
+
+    @check_messages('blacklisted-name', 'invalid-name')
+    def visit_global(self, node):
+        for name in node.names:
+            self._check_name('const', name, node)
+
+    @check_messages('blacklisted-name', 'invalid-name')
+    def visit_assname(self, node):
+        """check module level assigned names"""
+        frame = node.frame()
+        ass_type = node.ass_type()
+        if isinstance(ass_type, astroid.Comprehension):
+            self._check_name('inlinevar', node.name, node)
+        elif isinstance(frame, astroid.Module):
+            if isinstance(ass_type, astroid.Assign) and not in_loop(ass_type):
+                if isinstance(safe_infer(ass_type.value), astroid.Class):
+                    self._check_name('class', node.name, node)
+                else:
+                    if not _redefines_import(node):
+                        # Don't emit if the name redefines an import
+                        # in an ImportError except handler.
+                        self._check_name('const', node.name, node)
+            elif isinstance(ass_type, astroid.ExceptHandler):
+                self._check_name('variable', node.name, node)
+        elif isinstance(frame, astroid.Function):
+            # global introduced variable aren't in the function locals
+            if node.name in frame and node.name not in frame.argnames():
+                if not _redefines_import(node):
+                    self._check_name('variable', node.name, node)
+        elif isinstance(frame, astroid.Class):
+            if not list(frame.local_attr_ancestors(node.name)):
+                self._check_name('class_attribute', node.name, node)
+
+    def _recursive_check_names(self, args, node):
+        """check names in a possibly recursive list <arg>"""
+        for arg in args:
+            if isinstance(arg, astroid.AssName):
+                self._check_name('argument', arg.name, node)
+            else:
+                self._recursive_check_names(arg.elts, node)
+
+    def _find_name_group(self, node_type):
+        return self._name_group.get(node_type, node_type)
+
+    def _raise_name_warning(self, node, node_type, name, confidence):
+        type_label = _NAME_TYPES[node_type][1]
+        hint = ''
+        if self.config.include_naming_hint:
+            hint = ' (hint: %s)' % (getattr(self.config, node_type + '_name_hint'))
+        self.add_message('invalid-name', node=node, args=(type_label, name, hint),
+                         confidence=confidence)
+        self.stats['badname_' + node_type] += 1
+
+    def _check_name(self, node_type, name, node, confidence=HIGH):
+        """check for a name using the type's regexp"""
+        if is_inside_except(node):
+            clobbering, _ = clobber_in_except(node)
+            if clobbering:
+                return
+        if name in self.config.good_names:
+            return
+        if name in self.config.bad_names:
+            self.stats['badname_' + node_type] += 1
+            self.add_message('blacklisted-name', node=node, args=name)
+            return
+        regexp = getattr(self.config, node_type + '_rgx')
+        match = regexp.match(name)
+
+        if _is_multi_naming_match(match, node_type, confidence):
+            name_group = self._find_name_group(node_type)
+            bad_name_group = self._bad_names.setdefault(name_group, {})
+            warnings = bad_name_group.setdefault(match.lastgroup, [])
+            warnings.append((node, node_type, name, confidence))
+
+        if match is None:
+            self._raise_name_warning(node, node_type, name, confidence)
+
+
+class DocStringChecker(_BasicChecker):
+    msgs = {
+        'C0111': ('Missing %s docstring', # W0131
+                  'missing-docstring',
+                  'Used when a module, function, class or method has no docstring.'
+                  'Some special methods like __init__ doesn\'t necessary require a '
+                  'docstring.'),
+        'C0112': ('Empty %s docstring', # W0132
+                  'empty-docstring',
+                  'Used when a module, function, class or method has an empty '
+                  'docstring (it would be too easy ;).'),
+        }
+    options = (('no-docstring-rgx',
+                {'default' : NO_REQUIRED_DOC_RGX,
+                 'type' : 'regexp', 'metavar' : '<regexp>',
+                 'help' : 'Regular expression which should only match '
+                          'function or class names that do not require a '
+                          'docstring.'}
+               ),
+               ('docstring-min-length',
+                {'default' : -1,
+                 'type' : 'int', 'metavar' : '<int>',
+                 'help': ('Minimum line length for functions/classes that'
+                          ' require docstrings, shorter ones are exempt.')}
+               ),
+              )
+
+
+    def open(self):
+        self.stats = self.linter.add_stats(undocumented_module=0,
+                                           undocumented_function=0,
+                                           undocumented_method=0,
+                                           undocumented_class=0)
+    @check_messages('missing-docstring', 'empty-docstring')
+    def visit_module(self, node):
+        self._check_docstring('module', node)
+
+    @check_messages('missing-docstring', 'empty-docstring')
+    def visit_class(self, node):
+        if self.config.no_docstring_rgx.match(node.name) is None:
+            self._check_docstring('class', node)
+
+    @check_messages('missing-docstring', 'empty-docstring')
+    def visit_function(self, node):
+        if self.config.no_docstring_rgx.match(node.name) is None:
+            ftype = node.is_method() and 'method' or 'function'
+            if isinstance(node.parent.frame(), astroid.Class):
+                overridden = False
+                confidence = (INFERENCE if has_known_bases(node.parent.frame())
+                              else INFERENCE_FAILURE)
+                # check if node is from a method overridden by its ancestor
+                for ancestor in node.parent.frame().ancestors():
+                    if node.name in ancestor and \
+                       isinstance(ancestor[node.name], astroid.Function):
+                        overridden = True
+                        break
+                self._check_docstring(ftype, node,
+                                      report_missing=not overridden,
+                                      confidence=confidence)
+            else:
+                self._check_docstring(ftype, node)
+
+    def _check_docstring(self, node_type, node, report_missing=True,
+                         confidence=HIGH):
+        """check the node has a non empty docstring"""
+        docstring = node.doc
+        if docstring is None:
+            if not report_missing:
+                return
+            if node.body:
+                lines = node.body[-1].lineno - node.body[0].lineno + 1
+            else:
+                lines = 0
+
+            if node_type == 'module' and not lines:
+                # If the module has no body, there's no reason
+                # to require a docstring.
+                return
+            max_lines = self.config.docstring_min_length
+
+            if node_type != 'module' and max_lines > -1 and lines < max_lines:
+                return
+            self.stats['undocumented_'+node_type] += 1
+            if (node.body and isinstance(node.body[0], astroid.Discard) and
+                    isinstance(node.body[0].value, astroid.CallFunc)):
+                # Most likely a string with a format call. Let's see.
+                func = safe_infer(node.body[0].value.func)
+                if (isinstance(func, astroid.BoundMethod)
+                        and isinstance(func.bound, astroid.Instance)):
+                    # Strings in Python 3, others in Python 2.
+                    if PY3K and func.bound.name == 'str':
+                        return
+                    elif func.bound.name in ('str', 'unicode', 'bytes'):
+                        return
+            self.add_message('missing-docstring', node=node, args=(node_type,),
+                             confidence=confidence)
+        elif not docstring.strip():
+            self.stats['undocumented_'+node_type] += 1
+            self.add_message('empty-docstring', node=node, args=(node_type,),
+                             confidence=confidence)
+
+
+class PassChecker(_BasicChecker):
+    """check if the pass statement is really necessary"""
+    msgs = {'W0107': ('Unnecessary pass statement',
+                      'unnecessary-pass',
+                      'Used when a "pass" statement that can be avoided is '
+                      'encountered.'),
+           }
+    @check_messages('unnecessary-pass')
+    def visit_pass(self, node):
+        if len(node.parent.child_sequence(node)) > 1:
+            self.add_message('unnecessary-pass', node=node)
+
+
+class LambdaForComprehensionChecker(_BasicChecker):
+    """check for using a lambda where a comprehension would do.
+
+    See <http://www.artima.com/weblogs/viewpost.jsp?thread=98196>
+    where GvR says comprehensions would be clearer.
+    """
+
+    msgs = {'W0110': ('map/filter on lambda could be replaced by comprehension',
+                      'deprecated-lambda',
+                      'Used when a lambda is the first argument to "map" or '
+                      '"filter". It could be clearer as a list '
+                      'comprehension or generator expression.',
+                      {'maxversion': (3, 0)}),
+           }
+
+    @check_messages('deprecated-lambda')
+    def visit_callfunc(self, node):
+        """visit a CallFunc node, check if map or filter are called with a
+        lambda
+        """
+        if not node.args:
+            return
+        if not isinstance(node.args[0], astroid.Lambda):
+            return
+        infered = safe_infer(node.func)
+        if (is_builtin_object(infered)
+                and infered.name in ['map', 'filter']):
+            self.add_message('deprecated-lambda', node=node)
+
+
+def register(linter):
+    """required method to auto register this checker"""
+    linter.register_checker(BasicErrorChecker(linter))
+    linter.register_checker(BasicChecker(linter))
+    linter.register_checker(NameChecker(linter))
+    linter.register_checker(DocStringChecker(linter))
+    linter.register_checker(PassChecker(linter))
+    linter.register_checker(LambdaForComprehensionChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/classes.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/classes.py
new file mode 100644
index 0000000..87e3bcf
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/classes.py
@@ -0,0 +1,982 @@
+# Copyright (c) 2003-2014 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""classes checker for Python code
+"""
+from __future__ import generators
+
+import sys
+from collections import defaultdict
+
+import astroid
+from astroid import YES, Instance, are_exclusive, AssAttr, Class
+from astroid.bases import Generator, BUILTINS
+from astroid.inference import InferenceContext
+
+from pylint.interfaces import IAstroidChecker
+from pylint.checkers import BaseChecker
+from pylint.checkers.utils import (
+    PYMETHODS, overrides_a_method, check_messages, is_attr_private,
+    is_attr_protected, node_frame_class, safe_infer, is_builtin_object,
+    decorated_with_property, unimplemented_abstract_methods)
+import six
+
+if sys.version_info >= (3, 0):
+    NEXT_METHOD = '__next__'
+else:
+    NEXT_METHOD = 'next'
+ITER_METHODS = ('__iter__', '__getitem__')
+
+def _called_in_methods(func, klass, methods):
+    """ Check if the func was called in any of the given methods,
+    belonging to the *klass*. Returns True if so, False otherwise.
+    """
+    if not isinstance(func, astroid.Function):
+        return False
+    for method in methods:
+        try:
+            infered = klass.getattr(method)
+        except astroid.NotFoundError:
+            continue
+        for infer_method in infered:
+            for callfunc in infer_method.nodes_of_class(astroid.CallFunc):
+                try:
+                    bound = next(callfunc.func.infer())
+                except (astroid.InferenceError, StopIteration):
+                    continue
+                if not isinstance(bound, astroid.BoundMethod):
+                    continue
+                func_obj = bound._proxied
+                if isinstance(func_obj, astroid.UnboundMethod):
+                    func_obj = func_obj._proxied
+                if func_obj.name == func.name:
+                    return True
+    return False
+
+def class_is_abstract(node):
+    """return true if the given class node should be considered as an abstract
+    class
+    """
+    for method in node.methods():
+        if method.parent.frame() is node:
+            if method.is_abstract(pass_is_abstract=False):
+                return True
+    return False
+
+def _is_attribute_property(name, klass):
+    """ Check if the given attribute *name* is a property
+    in the given *klass*.
+
+    It will look for `property` calls or for functions
+    with the given name, decorated by `property` or `property`
+    subclasses.
+    Returns ``True`` if the name is a property in the given klass,
+    ``False`` otherwise.
+    """
+
+    try:
+        attributes = klass.getattr(name)
+    except astroid.NotFoundError:
+        return False
+    property_name = "{0}.property".format(BUILTINS)
+    for attr in attributes:
+        try:
+            infered = next(attr.infer())
+        except astroid.InferenceError:
+            continue
+        if (isinstance(infered, astroid.Function) and
+                decorated_with_property(infered)):
+            return True
+        if infered.pytype() == property_name:
+            return True
+    return False
+
+
+MSGS = {
+    'F0202': ('Unable to check methods signature (%s / %s)',
+              'method-check-failed',
+              'Used when Pylint has been unable to check methods signature '
+              'compatibility for an unexpected reason. Please report this kind '
+              'if you don\'t make sense of it.'),
+
+    'E0202': ('An attribute defined in %s line %s hides this method',
+              'method-hidden',
+              'Used when a class defines a method which is hidden by an '
+              'instance attribute from an ancestor class or set by some '
+              'client code.'),
+    'E0203': ('Access to member %r before its definition line %s',
+              'access-member-before-definition',
+              'Used when an instance member is accessed before it\'s actually '
+              'assigned.'),
+    'W0201': ('Attribute %r defined outside __init__',
+              'attribute-defined-outside-init',
+              'Used when an instance attribute is defined outside the __init__ '
+              'method.'),
+
+    'W0212': ('Access to a protected member %s of a client class', # E0214
+              'protected-access',
+              'Used when a protected member (i.e. class member with a name '
+              'beginning with an underscore) is access outside the class or a '
+              'descendant of the class where it\'s defined.'),
+
+    'E0211': ('Method has no argument',
+              'no-method-argument',
+              'Used when a method which should have the bound instance as '
+              'first argument has no argument defined.'),
+    'E0213': ('Method should have "self" as first argument',
+              'no-self-argument',
+              'Used when a method has an attribute different the "self" as '
+              'first argument. This is considered as an error since this is '
+              'a so common convention that you shouldn\'t break it!'),
+    'C0202': ('Class method %s should have %s as first argument',
+              'bad-classmethod-argument',
+              'Used when a class method has a first argument named differently '
+              'than the value specified in valid-classmethod-first-arg option '
+              '(default to "cls"), recommended to easily differentiate them '
+              'from regular instance methods.'),
+    'C0203': ('Metaclass method %s should have %s as first argument',
+              'bad-mcs-method-argument',
+              'Used when a metaclass method has a first agument named '
+              'differently than the value specified in valid-classmethod-first'
+              '-arg option (default to "cls"), recommended to easily '
+              'differentiate them from regular instance methods.'),
+    'C0204': ('Metaclass class method %s should have %s as first argument',
+              'bad-mcs-classmethod-argument',
+              'Used when a metaclass class method has a first argument named '
+              'differently than the value specified in valid-metaclass-'
+              'classmethod-first-arg option (default to "mcs"), recommended to '
+              'easily differentiate them from regular instance methods.'),
+
+    'W0211': ('Static method with %r as first argument',
+              'bad-staticmethod-argument',
+              'Used when a static method has "self" or a value specified in '
+              'valid-classmethod-first-arg option or '
+              'valid-metaclass-classmethod-first-arg option as first argument.'
+             ),
+    'R0201': ('Method could be a function',
+              'no-self-use',
+              'Used when a method doesn\'t use its bound instance, and so could '
+              'be written as a function.'
+             ),
+
+    'E0221': ('Interface resolved to %s is not a class',
+              'interface-is-not-class',
+              'Used when a class claims to implement an interface which is not '
+              'a class.'),
+    'E0222': ('Missing method %r from %s interface',
+              'missing-interface-method',
+              'Used when a method declared in an interface is missing from a '
+              'class implementing this interface'),
+    'W0221': ('Arguments number differs from %s %r method',
+              'arguments-differ',
+              'Used when a method has a different number of arguments than in '
+              'the implemented interface or in an overridden method.'),
+    'W0222': ('Signature differs from %s %r method',
+              'signature-differs',
+              'Used when a method signature is different than in the '
+              'implemented interface or in an overridden method.'),
+    'W0223': ('Method %r is abstract in class %r but is not overridden',
+              'abstract-method',
+              'Used when an abstract method (i.e. raise NotImplementedError) is '
+              'not overridden in concrete class.'
+             ),
+    'F0220': ('failed to resolve interfaces implemented by %s (%s)',
+              'unresolved-interface',
+              'Used when a Pylint as failed to find interfaces implemented by '
+              ' a class'),
+
+
+    'W0231': ('__init__ method from base class %r is not called',
+              'super-init-not-called',
+              'Used when an ancestor class method has an __init__ method '
+              'which is not called by a derived class.'),
+    'W0232': ('Class has no __init__ method',
+              'no-init',
+              'Used when a class has no __init__ method, neither its parent '
+              'classes.'),
+    'W0233': ('__init__ method from a non direct base class %r is called',
+              'non-parent-init-called',
+              'Used when an __init__ method is called on a class which is not '
+              'in the direct ancestors for the analysed class.'),
+    'W0234': ('__iter__ returns non-iterator',
+              'non-iterator-returned',
+              'Used when an __iter__ method returns something which is not an '
+               'iterable (i.e. has no `%s` method)' % NEXT_METHOD),
+    'E0235': ('__exit__ must accept 3 arguments: type, value, traceback',
+              'bad-context-manager',
+              'Used when the __exit__ special method, belonging to a '
+              'context manager, does not accept 3 arguments '
+              '(type, value, traceback).'),
+    'E0236': ('Invalid object %r in __slots__, must contain '
+              'only non empty strings',
+              'invalid-slots-object',
+              'Used when an invalid (non-string) object occurs in __slots__.'),
+    'E0237': ('Assigning to attribute %r not defined in class slots',
+              'assigning-non-slot',
+              'Used when assigning to an attribute not defined '
+              'in the class slots.'),
+    'E0238': ('Invalid __slots__ object',
+              'invalid-slots',
+              'Used when an invalid __slots__ is found in class. '
+              'Only a string, an iterable or a sequence is permitted.'),
+    'E0239': ('Inheriting %r, which is not a class.',
+              'inherit-non-class',
+              'Used when a class inherits from something which is not a '
+              'class.'),
+
+
+    }
+
+
+class ClassChecker(BaseChecker):
+    """checks for :
+    * methods without self as first argument
+    * overridden methods signature
+    * access only to existent members via self
+    * attributes not defined in the __init__ method
+    * supported interfaces implementation
+    * unreachable code
+    """
+
+    __implements__ = (IAstroidChecker,)
+
+    # configuration section name
+    name = 'classes'
+    # messages
+    msgs = MSGS
+    priority = -2
+    # configuration options
+    options = (('ignore-iface-methods',
+                {'default' : (#zope interface
+                    'isImplementedBy', 'deferred', 'extends', 'names',
+                    'namesAndDescriptions', 'queryDescriptionFor', 'getBases',
+                    'getDescriptionFor', 'getDoc', 'getName', 'getTaggedValue',
+                    'getTaggedValueTags', 'isEqualOrExtendedBy', 'setTaggedValue',
+                    'isImplementedByInstancesOf',
+                    # twisted
+                    'adaptWith',
+                    # logilab.common interface
+                    'is_implemented_by'),
+                 'type' : 'csv',
+                 'metavar' : '<method names>',
+                 'help' : 'List of interface methods to ignore, \
+separated by a comma. This is used for instance to not check methods defines \
+in Zope\'s Interface base class.'}
+               ),
+               ('defining-attr-methods',
+                {'default' : ('__init__', '__new__', 'setUp'),
+                 'type' : 'csv',
+                 'metavar' : '<method names>',
+                 'help' : 'List of method names used to declare (i.e. assign) \
+instance attributes.'}
+               ),
+               ('valid-classmethod-first-arg',
+                {'default' : ('cls',),
+                 'type' : 'csv',
+                 'metavar' : '<argument names>',
+                 'help' : 'List of valid names for the first argument in \
+a class method.'}
+               ),
+               ('valid-metaclass-classmethod-first-arg',
+                {'default' : ('mcs',),
+                 'type' : 'csv',
+                 'metavar' : '<argument names>',
+                 'help' : 'List of valid names for the first argument in \
+a metaclass class method.'}
+               ),
+               ('exclude-protected',
+                {
+                    'default': (
+                        # namedtuple public API.
+                        '_asdict', '_fields', '_replace', '_source', '_make'),
+                    'type': 'csv',
+                    'metavar': '<protected access exclusions>',
+                    'help': ('List of member names, which should be excluded '
+                             'from the protected access warning.')}
+               ))
+
+    def __init__(self, linter=None):
+        BaseChecker.__init__(self, linter)
+        self._accessed = []
+        self._first_attrs = []
+        self._meth_could_be_func = None
+
+    def visit_class(self, node):
+        """init visit variable _accessed and check interfaces
+        """
+        self._accessed.append(defaultdict(list))
+        self._check_bases_classes(node)
+        self._check_interfaces(node)
+        # if not an interface, exception, metaclass
+        if node.type == 'class':
+            try:
+                node.local_attr('__init__')
+            except astroid.NotFoundError:
+                self.add_message('no-init', args=node, node=node)
+        self._check_slots(node)
+        self._check_proper_bases(node)
+
+    @check_messages('inherit-non-class')
+    def _check_proper_bases(self, node):
+        """
+        Detect that a class inherits something which is not
+        a class or a type.
+        """
+        for base in node.bases:
+            ancestor = safe_infer(base)
+            if ancestor in (YES, None):
+                continue
+            if (isinstance(ancestor, astroid.Instance) and
+                    ancestor.is_subtype_of('%s.type' % (BUILTINS,))):
+                continue
+            if not isinstance(ancestor, astroid.Class):
+                self.add_message('inherit-non-class',
+                                 args=base.as_string(), node=node)
+
+    @check_messages('access-member-before-definition',
+                    'attribute-defined-outside-init')
+    def leave_class(self, cnode):
+        """close a class node:
+        check that instance attributes are defined in __init__ and check
+        access to existent members
+        """
+        # check access to existent members on non metaclass classes
+        accessed = self._accessed.pop()
+        if cnode.type != 'metaclass':
+            self._check_accessed_members(cnode, accessed)
+        # checks attributes are defined in an allowed method such as __init__
+        if not self.linter.is_message_enabled('attribute-defined-outside-init'):
+            return
+        defining_methods = self.config.defining_attr_methods
+        current_module = cnode.root()
+        for attr, nodes in six.iteritems(cnode.instance_attrs):
+            # skip nodes which are not in the current module and it may screw up
+            # the output, while it's not worth it
+            nodes = [n for n in nodes if not
+                     isinstance(n.statement(), (astroid.Delete, astroid.AugAssign))
+                     and n.root() is current_module]
+            if not nodes:
+                continue # error detected by typechecking
+            # check if any method attr is defined in is a defining method
+            if any(node.frame().name in defining_methods
+                   for node in nodes):
+                continue
+
+            # check attribute is defined in a parent's __init__
+            for parent in cnode.instance_attr_ancestors(attr):
+                attr_defined = False
+                # check if any parent method attr is defined in is a defining method
+                for node in parent.instance_attrs[attr]:
+                    if node.frame().name in defining_methods:
+                        attr_defined = True
+                if attr_defined:
+                    # we're done :)
+                    break
+            else:
+                # check attribute is defined as a class attribute
+                try:
+                    cnode.local_attr(attr)
+                except astroid.NotFoundError:
+                    for node in nodes:
+                        if node.frame().name not in defining_methods:
+                            # If the attribute was set by a callfunc in any
+                            # of the defining methods, then don't emit
+                            # the warning.
+                            if _called_in_methods(node.frame(), cnode,
+                                                  defining_methods):
+                                continue
+                            self.add_message('attribute-defined-outside-init',
+                                             args=attr, node=node)
+
+    def visit_function(self, node):
+        """check method arguments, overriding"""
+        # ignore actual functions
+        if not node.is_method():
+            return
+        klass = node.parent.frame()
+        self._meth_could_be_func = True
+        # check first argument is self if this is actually a method
+        self._check_first_arg_for_type(node, klass.type == 'metaclass')
+        if node.name == '__init__':
+            self._check_init(node)
+            return
+        # check signature if the method overloads inherited method
+        for overridden in klass.local_attr_ancestors(node.name):
+            # get astroid for the searched method
+            try:
+                meth_node = overridden[node.name]
+            except KeyError:
+                # we have found the method but it's not in the local
+                # dictionary.
+                # This may happen with astroid build from living objects
+                continue
+            if not isinstance(meth_node, astroid.Function):
+                continue
+            self._check_signature(node, meth_node, 'overridden')
+            break
+        if node.decorators:
+            for decorator in node.decorators.nodes:
+                if isinstance(decorator, astroid.Getattr) and \
+                        decorator.attrname in ('getter', 'setter', 'deleter'):
+                    # attribute affectation will call this method, not hiding it
+                    return
+                if isinstance(decorator, astroid.Name) and decorator.name == 'property':
+                    # attribute affectation will either call a setter or raise
+                    # an attribute error, anyway not hiding the function
+                    return
+        # check if the method is hidden by an attribute
+        try:
+            overridden = klass.instance_attr(node.name)[0] # XXX
+            overridden_frame = overridden.frame()
+            if (isinstance(overridden_frame, astroid.Function)
+                    and overridden_frame.type == 'method'):
+                overridden_frame = overridden_frame.parent.frame()
+            if (isinstance(overridden_frame, Class)
+                    and klass.is_subtype_of(overridden_frame.qname())):
+                args = (overridden.root().name, overridden.fromlineno)
+                self.add_message('method-hidden', args=args, node=node)
+        except astroid.NotFoundError:
+            pass
+
+        # check non-iterators in __iter__
+        if node.name == '__iter__':
+            self._check_iter(node)
+        elif node.name == '__exit__':
+            self._check_exit(node)
+
+    def _check_slots(self, node):
+        if '__slots__' not in node.locals:
+            return
+        for slots in node.igetattr('__slots__'):
+            # check if __slots__ is a valid type
+            for meth in ITER_METHODS:
+                try:
+                    slots.getattr(meth)
+                    break
+                except astroid.NotFoundError:
+                    continue
+            else:
+                self.add_message('invalid-slots', node=node)
+                continue
+
+            if isinstance(slots, astroid.Const):
+                # a string, ignore the following checks
+                continue
+            if not hasattr(slots, 'itered'):
+                # we can't obtain the values, maybe a .deque?
+                continue
+
+            if isinstance(slots, astroid.Dict):
+                values = [item[0] for item in slots.items]
+            else:
+                values = slots.itered()
+            if values is YES:
+                return
+
+            for elt in values:
+                try:
+                    self._check_slots_elt(elt)
+                except astroid.InferenceError:
+                    continue
+
+    def _check_slots_elt(self, elt):
+        for infered in elt.infer():
+            if infered is YES:
+                continue
+            if (not isinstance(infered, astroid.Const) or
+                    not isinstance(infered.value, six.string_types)):
+                self.add_message('invalid-slots-object',
+                                 args=infered.as_string(),
+                                 node=elt)
+                continue
+            if not infered.value:
+                self.add_message('invalid-slots-object',
+                                 args=infered.as_string(),
+                                 node=elt)
+
+    def _check_iter(self, node):
+        try:
+            infered = node.infer_call_result(node)
+        except astroid.InferenceError:
+            return
+
+        for infered_node in infered:
+            if (infered_node is YES
+                    or isinstance(infered_node, Generator)):
+                continue
+            if isinstance(infered_node, astroid.Instance):
+                try:
+                    infered_node.local_attr(NEXT_METHOD)
+                except astroid.NotFoundError:
+                    self.add_message('non-iterator-returned',
+                                     node=node)
+                    break
+
+    def _check_exit(self, node):
+        positional = sum(1 for arg in node.args.args if arg.name != 'self')
+        if positional < 3 and not node.args.vararg:
+            self.add_message('bad-context-manager',
+                             node=node)
+        elif positional > 3:
+            self.add_message('bad-context-manager',
+                             node=node)
+
+    def leave_function(self, node):
+        """on method node, check if this method couldn't be a function
+
+        ignore class, static and abstract methods, initializer,
+        methods overridden from a parent class and any
+        kind of method defined in an interface for this warning
+        """
+        if node.is_method():
+            if node.args.args is not None:
+                self._first_attrs.pop()
+            if not self.linter.is_message_enabled('no-self-use'):
+                return
+            class_node = node.parent.frame()
+            if (self._meth_could_be_func and node.type == 'method'
+                    and not node.name in PYMETHODS
+                    and not (node.is_abstract() or
+                             overrides_a_method(class_node, node.name))
+                    and class_node.type != 'interface'):
+                self.add_message('no-self-use', node=node)
+
+    def visit_getattr(self, node):
+        """check if the getattr is an access to a class member
+        if so, register it. Also check for access to protected
+        class member from outside its class (but ignore __special__
+        methods)
+        """
+        attrname = node.attrname
+        # Check self
+        if self.is_first_attr(node):
+            self._accessed[-1][attrname].append(node)
+            return
+        if not self.linter.is_message_enabled('protected-access'):
+            return
+
+        self._check_protected_attribute_access(node)
+
+    def visit_assattr(self, node):
+        if isinstance(node.ass_type(), astroid.AugAssign) and self.is_first_attr(node):
+            self._accessed[-1][node.attrname].append(node)
+        self._check_in_slots(node)
+
+    def _check_in_slots(self, node):
+        """ Check that the given assattr node
+        is defined in the class slots.
+        """
+        infered = safe_infer(node.expr)
+        if infered and isinstance(infered, Instance):
+            klass = infered._proxied
+            if '__slots__' not in klass.locals or not klass.newstyle:
+                return
+
+            slots = klass.slots()
+            if slots is None:
+                return
+            # If any ancestor doesn't use slots, the slots
+            # defined for this class are superfluous.
+            if any('__slots__' not in ancestor.locals and
+                   ancestor.name != 'object'
+                   for ancestor in klass.ancestors()):
+                return
+
+            if not any(slot.value == node.attrname for slot in slots):
+                # If we have a '__dict__' in slots, then
+                # assigning any name is valid.
+                if not any(slot.value == '__dict__' for slot in slots):
+                    if _is_attribute_property(node.attrname, klass):
+                        # Properties circumvent the slots mechanism,
+                        # so we should not emit a warning for them.
+                        return
+                    self.add_message('assigning-non-slot',
+                                     args=(node.attrname, ), node=node)
+
+    @check_messages('protected-access')
+    def visit_assign(self, assign_node):
+        node = assign_node.targets[0]
+        if not isinstance(node, AssAttr):
+            return
+
+        if self.is_first_attr(node):
+            return
+
+        self._check_protected_attribute_access(node)
+
+    def _check_protected_attribute_access(self, node):
+        '''Given an attribute access node (set or get), check if attribute
+        access is legitimate. Call _check_first_attr with node before calling
+        this method. Valid cases are:
+        * self._attr in a method or cls._attr in a classmethod. Checked by
+        _check_first_attr.
+        * Klass._attr inside "Klass" class.
+        * Klass2._attr inside "Klass" class when Klass2 is a base class of
+            Klass.
+        '''
+        attrname = node.attrname
+
+        if (is_attr_protected(attrname) and
+                attrname not in self.config.exclude_protected):
+
+            klass = node_frame_class(node)
+
+            # XXX infer to be more safe and less dirty ??
+            # in classes, check we are not getting a parent method
+            # through the class object or through super
+            callee = node.expr.as_string()
+
+            # We are not in a class, no remaining valid case
+            if klass is None:
+                self.add_message('protected-access', node=node, args=attrname)
+                return
+
+            # If the expression begins with a call to super, that's ok.
+            if isinstance(node.expr, astroid.CallFunc) and \
+               isinstance(node.expr.func, astroid.Name) and \
+               node.expr.func.name == 'super':
+                return
+
+            # We are in a class, one remaining valid cases, Klass._attr inside
+            # Klass
+            if not (callee == klass.name or callee in klass.basenames):
+                # Detect property assignments in the body of the class.
+                # This is acceptable:
+                #
+                # class A:
+                #     b = property(lambda: self._b)
+
+                stmt = node.parent.statement()
+                try:
+                    if (isinstance(stmt, astroid.Assign) and
+                            (stmt in klass.body or klass.parent_of(stmt)) and
+                            isinstance(stmt.value, astroid.CallFunc) and
+                            isinstance(stmt.value.func, astroid.Name) and
+                            stmt.value.func.name == 'property' and
+                            is_builtin_object(next(stmt.value.func.infer(), None))):
+                        return
+                except astroid.InferenceError:
+                    pass
+                self.add_message('protected-access', node=node, args=attrname)
+
+    def visit_name(self, node):
+        """check if the name handle an access to a class member
+        if so, register it
+        """
+        if self._first_attrs and (node.name == self._first_attrs[-1] or
+                                  not self._first_attrs[-1]):
+            self._meth_could_be_func = False
+
+    def _check_accessed_members(self, node, accessed):
+        """check that accessed members are defined"""
+        # XXX refactor, probably much simpler now that E0201 is in type checker
+        for attr, nodes in six.iteritems(accessed):
+            # deactivate "except doesn't do anything", that's expected
+            # pylint: disable=W0704
+            try:
+                # is it a class attribute ?
+                node.local_attr(attr)
+                # yes, stop here
+                continue
+            except astroid.NotFoundError:
+                pass
+            # is it an instance attribute of a parent class ?
+            try:
+                next(node.instance_attr_ancestors(attr))
+                # yes, stop here
+                continue
+            except StopIteration:
+                pass
+            # is it an instance attribute ?
+            try:
+                defstmts = node.instance_attr(attr)
+            except astroid.NotFoundError:
+                pass
+            else:
+                # filter out augment assignment nodes
+                defstmts = [stmt for stmt in defstmts if stmt not in nodes]
+                if not defstmts:
+                    # only augment assignment for this node, no-member should be
+                    # triggered by the typecheck checker
+                    continue
+                # filter defstmts to only pick the first one when there are
+                # several assignments in the same scope
+                scope = defstmts[0].scope()
+                defstmts = [stmt for i, stmt in enumerate(defstmts)
+                            if i == 0 or stmt.scope() is not scope]
+                # if there are still more than one, don't attempt to be smarter
+                # than we can be
+                if len(defstmts) == 1:
+                    defstmt = defstmts[0]
+                    # check that if the node is accessed in the same method as
+                    # it's defined, it's accessed after the initial assignment
+                    frame = defstmt.frame()
+                    lno = defstmt.fromlineno
+                    for _node in nodes:
+                        if _node.frame() is frame and _node.fromlineno < lno \
+                           and not are_exclusive(_node.statement(), defstmt,
+                                                 ('AttributeError', 'Exception', 'BaseException')):
+                            self.add_message('access-member-before-definition',
+                                             node=_node, args=(attr, lno))
+
+    def _check_first_arg_for_type(self, node, metaclass=0):
+        """check the name of first argument, expect:
+
+        * 'self' for a regular method
+        * 'cls' for a class method or a metaclass regular method (actually
+          valid-classmethod-first-arg value)
+        * 'mcs' for a metaclass class method (actually
+          valid-metaclass-classmethod-first-arg)
+        * not one of the above for a static method
+        """
+        # don't care about functions with unknown argument (builtins)
+        if node.args.args is None:
+            return
+        first_arg = node.args.args and node.argnames()[0]
+        self._first_attrs.append(first_arg)
+        first = self._first_attrs[-1]
+        # static method
+        if node.type == 'staticmethod':
+            if (first_arg == 'self' or
+                    first_arg in self.config.valid_classmethod_first_arg or
+                    first_arg in self.config.valid_metaclass_classmethod_first_arg):
+                self.add_message('bad-staticmethod-argument', args=first, node=node)
+                return
+            self._first_attrs[-1] = None
+        # class / regular method with no args
+        elif not node.args.args:
+            self.add_message('no-method-argument', node=node)
+        # metaclass
+        elif metaclass:
+            # metaclass __new__ or classmethod
+            if node.type == 'classmethod':
+                self._check_first_arg_config(
+                    first,
+                    self.config.valid_metaclass_classmethod_first_arg, node,
+                    'bad-mcs-classmethod-argument', node.name)
+            # metaclass regular method
+            else:
+                self._check_first_arg_config(
+                    first,
+                    self.config.valid_classmethod_first_arg, node,
+                    'bad-mcs-method-argument',
+                    node.name)
+        # regular class
+        else:
+            # class method
+            if node.type == 'classmethod':
+                self._check_first_arg_config(
+                    first,
+                    self.config.valid_classmethod_first_arg, node,
+                    'bad-classmethod-argument',
+                    node.name)
+            # regular method without self as argument
+            elif first != 'self':
+                self.add_message('no-self-argument', node=node)
+
+    def _check_first_arg_config(self, first, config, node, message,
+                                method_name):
+        if first not in config:
+            if len(config) == 1:
+                valid = repr(config[0])
+            else:
+                valid = ', '.join(repr(v) for v in config[:-1])
+                valid = '%s or %r' % (valid, config[-1])
+            self.add_message(message, args=(method_name, valid), node=node)
+
+    def _check_bases_classes(self, node):
+        """check that the given class node implements abstract methods from
+        base classes
+        """
+        def is_abstract(method):
+            return method.is_abstract(pass_is_abstract=False)
+
+        # check if this class abstract
+        if class_is_abstract(node):
+            return
+
+        methods = sorted(
+            unimplemented_abstract_methods(node, is_abstract).items(),
+            key=lambda item: item[0],
+        )
+        for name, method in methods:
+            owner = method.parent.frame()
+            if owner is node:
+                continue
+            # owner is not this class, it must be a parent class
+            # check that the ancestor's method is not abstract
+            if name in node.locals:
+                # it is redefined as an attribute or with a descriptor
+                continue
+            self.add_message('abstract-method', node=node,
+                             args=(name, owner.name))
+
+    def _check_interfaces(self, node):
+        """check that the given class node really implements declared
+        interfaces
+        """
+        e0221_hack = [False]
+        def iface_handler(obj):
+            """filter interface objects, it should be classes"""
+            if not isinstance(obj, astroid.Class):
+                e0221_hack[0] = True
+                self.add_message('interface-is-not-class', node=node,
+                                 args=(obj.as_string(),))
+                return False
+            return True
+        ignore_iface_methods = self.config.ignore_iface_methods
+        try:
+            for iface in node.interfaces(handler_func=iface_handler):
+                for imethod in iface.methods():
+                    name = imethod.name
+                    if name.startswith('_') or name in ignore_iface_methods:
+                        # don't check method beginning with an underscore,
+                        # usually belonging to the interface implementation
+                        continue
+                    # get class method astroid
+                    try:
+                        method = node_method(node, name)
+                    except astroid.NotFoundError:
+                        self.add_message('missing-interface-method',
+                                         args=(name, iface.name),
+                                         node=node)
+                        continue
+                    # ignore inherited methods
+                    if method.parent.frame() is not node:
+                        continue
+                    # check signature
+                    self._check_signature(method, imethod,
+                                          '%s interface' % iface.name)
+        except astroid.InferenceError:
+            if e0221_hack[0]:
+                return
+            implements = Instance(node).getattr('__implements__')[0]
+            assignment = implements.parent
+            assert isinstance(assignment, astroid.Assign)
+            # assignment.expr can be a Name or a Tuple or whatever.
+            # Use as_string() for the message
+            # FIXME: in case of multiple interfaces, find which one could not
+            #        be resolved
+            self.add_message('unresolved-interface', node=implements,
+                             args=(node.name, assignment.value.as_string()))
+
+    def _check_init(self, node):
+        """check that the __init__ method call super or ancestors'__init__
+        method
+        """
+        if (not self.linter.is_message_enabled('super-init-not-called') and
+                not self.linter.is_message_enabled('non-parent-init-called')):
+            return
+        klass_node = node.parent.frame()
+        to_call = _ancestors_to_call(klass_node)
+        not_called_yet = dict(to_call)
+        for stmt in node.nodes_of_class(astroid.CallFunc):
+            expr = stmt.func
+            if not isinstance(expr, astroid.Getattr) \
+                   or expr.attrname != '__init__':
+                continue
+            # skip the test if using super
+            if isinstance(expr.expr, astroid.CallFunc) and \
+                   isinstance(expr.expr.func, astroid.Name) and \
+               expr.expr.func.name == 'super':
+                return
+            try:
+                for klass in expr.expr.infer():
+                    if klass is YES:
+                        continue
+                    # The infered klass can be super(), which was
+                    # assigned to a variable and the `__init__`
+                    # was called later.
+                    #
+                    # base = super()
+                    # base.__init__(...)
+
+                    if (isinstance(klass, astroid.Instance) and
+                            isinstance(klass._proxied, astroid.Class) and
+                            is_builtin_object(klass._proxied) and
+                            klass._proxied.name == 'super'):
+                        return
+                    try:
+                        del not_called_yet[klass]
+                    except KeyError:
+                        if klass not in to_call:
+                            self.add_message('non-parent-init-called',
+                                             node=expr, args=klass.name)
+            except astroid.InferenceError:
+                continue
+        for klass, method in six.iteritems(not_called_yet):
+            if klass.name == 'object' or method.parent.name == 'object':
+                continue
+            self.add_message('super-init-not-called', args=klass.name, node=node)
+
+    def _check_signature(self, method1, refmethod, class_type):
+        """check that the signature of the two given methods match
+
+        class_type is in 'class', 'interface'
+        """
+        if not (isinstance(method1, astroid.Function)
+                and isinstance(refmethod, astroid.Function)):
+            self.add_message('method-check-failed',
+                             args=(method1, refmethod), node=method1)
+            return
+        # don't care about functions with unknown argument (builtins)
+        if method1.args.args is None or refmethod.args.args is None:
+            return
+        # if we use *args, **kwargs, skip the below checks
+        if method1.args.vararg or method1.args.kwarg:
+            return
+        if is_attr_private(method1.name):
+            return
+        if len(method1.args.args) != len(refmethod.args.args):
+            self.add_message('arguments-differ',
+                             args=(class_type, method1.name),
+                             node=method1)
+        elif len(method1.args.defaults) < len(refmethod.args.defaults):
+            self.add_message('signature-differs',
+                             args=(class_type, method1.name),
+                             node=method1)
+
+    def is_first_attr(self, node):
+        """Check that attribute lookup name use first attribute variable name
+        (self for method, cls for classmethod and mcs for metaclass).
+        """
+        return self._first_attrs and isinstance(node.expr, astroid.Name) and \
+                   node.expr.name == self._first_attrs[-1]
+
+def _ancestors_to_call(klass_node, method='__init__'):
+    """return a dictionary where keys are the list of base classes providing
+    the queried method, and so that should/may be called from the method node
+    """
+    to_call = {}
+    for base_node in klass_node.ancestors(recurs=False):
+        try:
+            to_call[base_node] = next(base_node.igetattr(method))
+        except astroid.InferenceError:
+            continue
+    return to_call
+
+
+def node_method(node, method_name):
+    """get astroid for <method_name> on the given class node, ensuring it
+    is a Function node
+    """
+    for n in node.local_attr(method_name):
+        if isinstance(n, astroid.Function):
+            return n
+    raise astroid.NotFoundError(method_name)
+
+def register(linter):
+    """required method to auto register this checker """
+    linter.register_checker(ClassChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/design_analysis.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/design_analysis.py
new file mode 100644
index 0000000..9ff10bf
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/design_analysis.py
@@ -0,0 +1,331 @@
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""check for signs of poor design"""
+
+import re
+from collections import defaultdict
+
+from astroid import If, InferenceError
+
+from pylint.interfaces import IAstroidChecker
+from pylint.checkers import BaseChecker
+from pylint.checkers.utils import check_messages
+
+# regexp for ignored argument name
+IGNORED_ARGUMENT_NAMES = re.compile('_.*')
+
+
+MSGS = {
+    'R0901': ('Too many ancestors (%s/%s)',
+              'too-many-ancestors',
+              'Used when class has too many parent classes, try to reduce \
+              this to get a simpler (and so easier to use) class.'),
+    'R0902': ('Too many instance attributes (%s/%s)',
+              'too-many-instance-attributes',
+              'Used when class has too many instance attributes, try to reduce \
+              this to get a simpler (and so easier to use) class.'),
+    'R0903': ('Too few public methods (%s/%s)',
+              'too-few-public-methods',
+              'Used when class has too few public methods, so be sure it\'s \
+              really worth it.'),
+    'R0904': ('Too many public methods (%s/%s)',
+              'too-many-public-methods',
+              'Used when class has too many public methods, try to reduce \
+              this to get a simpler (and so easier to use) class.'),
+
+    'R0911': ('Too many return statements (%s/%s)',
+              'too-many-return-statements',
+              'Used when a function or method has too many return statement, \
+              making it hard to follow.'),
+    'R0912': ('Too many branches (%s/%s)',
+              'too-many-branches',
+              'Used when a function or method has too many branches, \
+              making it hard to follow.'),
+    'R0913': ('Too many arguments (%s/%s)',
+              'too-many-arguments',
+              'Used when a function or method takes too many arguments.'),
+    'R0914': ('Too many local variables (%s/%s)',
+              'too-many-locals',
+              'Used when a function or method has too many local variables.'),
+    'R0915': ('Too many statements (%s/%s)',
+              'too-many-statements',
+              'Used when a function or method has too many statements. You \
+              should then split it in smaller functions / methods.'),
+    'R0923': ('Interface not implemented',
+              'interface-not-implemented',
+              'Used when an interface class is not implemented anywhere.'),
+    }
+
+
+class MisdesignChecker(BaseChecker):
+    """checks for sign of poor/misdesign:
+    * number of methods, attributes, local variables...
+    * size, complexity of functions, methods
+    """
+
+    __implements__ = (IAstroidChecker,)
+
+    # configuration section name
+    name = 'design'
+    # messages
+    msgs = MSGS
+    priority = -2
+    # configuration options
+    options = (('max-args',
+                {'default' : 5, 'type' : 'int', 'metavar' : '<int>',
+                 'help': 'Maximum number of arguments for function / method'}
+               ),
+               ('ignored-argument-names',
+                {'default' : IGNORED_ARGUMENT_NAMES,
+                 'type' :'regexp', 'metavar' : '<regexp>',
+                 'help' : 'Argument names that match this expression will be '
+                          'ignored. Default to name with leading underscore'}
+               ),
+               ('max-locals',
+                {'default' : 15, 'type' : 'int', 'metavar' : '<int>',
+                 'help': 'Maximum number of locals for function / method body'}
+               ),
+               ('max-returns',
+                {'default' : 6, 'type' : 'int', 'metavar' : '<int>',
+                 'help': 'Maximum number of return / yield for function / '
+                         'method body'}
+               ),
+               ('max-branches',
+                {'default' : 12, 'type' : 'int', 'metavar' : '<int>',
+                 'help': 'Maximum number of branch for function / method body'}
+               ),
+               ('max-statements',
+                {'default' : 50, 'type' : 'int', 'metavar' : '<int>',
+                 'help': 'Maximum number of statements in function / method '
+                         'body'}
+               ),
+               ('max-parents',
+                {'default' : 7,
+                 'type' : 'int',
+                 'metavar' : '<num>',
+                 'help' : 'Maximum number of parents for a class (see R0901).'}
+               ),
+               ('max-attributes',
+                {'default' : 7,
+                 'type' : 'int',
+                 'metavar' : '<num>',
+                 'help' : 'Maximum number of attributes for a class \
+(see R0902).'}
+               ),
+               ('min-public-methods',
+                {'default' : 2,
+                 'type' : 'int',
+                 'metavar' : '<num>',
+                 'help' : 'Minimum number of public methods for a class \
+(see R0903).'}
+               ),
+               ('max-public-methods',
+                {'default' : 20,
+                 'type' : 'int',
+                 'metavar' : '<num>',
+                 'help' : 'Maximum number of public methods for a class \
+(see R0904).'}
+               ),
+              )
+
+    def __init__(self, linter=None):
+        BaseChecker.__init__(self, linter)
+        self.stats = None
+        self._returns = None
+        self._branches = None
+        self._used_ifaces = None
+        self._ifaces = None
+        self._stmts = 0
+
+    def open(self):
+        """initialize visit variables"""
+        self.stats = self.linter.add_stats()
+        self._returns = []
+        self._branches = defaultdict(int)
+        self._used_ifaces = {}
+        self._ifaces = []
+
+    def close(self):
+        """check that interface classes are used"""
+        for iface in self._ifaces:
+            if not iface in self._used_ifaces:
+                self.add_message('interface-not-implemented', node=iface)
+
+    @check_messages('too-many-ancestors', 'too-many-instance-attributes',
+                    'too-few-public-methods', 'too-many-public-methods',
+                    'interface-not-implemented')
+    def visit_class(self, node):
+        """check size of inheritance hierarchy and number of instance attributes
+        """
+        # Is the total inheritance hierarchy is 7 or less?
+        nb_parents = len(list(node.ancestors()))
+        if nb_parents > self.config.max_parents:
+            self.add_message('too-many-ancestors', node=node,
+                             args=(nb_parents, self.config.max_parents))
+        # Does the class contain less than 20 attributes for
+        # non-GUI classes (40 for GUI)?
+        # FIXME detect gui classes
+        if len(node.instance_attrs) > self.config.max_attributes:
+            self.add_message('too-many-instance-attributes', node=node,
+                             args=(len(node.instance_attrs),
+                                   self.config.max_attributes))
+        # update interface classes structures
+        if node.type == 'interface' and node.name != 'Interface':
+            self._ifaces.append(node)
+            for parent in node.ancestors(False):
+                if parent.name == 'Interface':
+                    continue
+                self._used_ifaces[parent] = 1
+        try:
+            for iface in node.interfaces():
+                self._used_ifaces[iface] = 1
+        except InferenceError:
+            # XXX log ?
+            pass
+
+    @check_messages('too-few-public-methods', 'too-many-public-methods')
+    def leave_class(self, node):
+        """check number of public methods"""
+        my_methods = sum(1 for method in node.mymethods()
+                         if not method.name.startswith('_'))
+        all_methods = sum(1 for method in node.methods()
+                          if not method.name.startswith('_'))
+
+        # Does the class contain less than n public methods ?
+        # This checks only the methods defined in the current class,
+        # since the user might not have control over the classes
+        # from the ancestors. It avoids some false positives
+        # for classes such as unittest.TestCase, which provides
+        # a lot of assert methods. It doesn't make sense to warn
+        # when the user subclasses TestCase to add his own tests.
+        if my_methods > self.config.max_public_methods:
+            self.add_message('too-many-public-methods', node=node,
+                             args=(my_methods,
+                                   self.config.max_public_methods))
+        # stop here for exception, metaclass and interface classes
+        if node.type != 'class':
+            return
+
+        # Does the class contain more than n public methods ?
+        # This checks all the methods defined by ancestors and
+        # by the current class.
+        if all_methods < self.config.min_public_methods:
+            self.add_message('too-few-public-methods', node=node,
+                             args=(all_methods,
+                                   self.config.min_public_methods))
+
+    @check_messages('too-many-return-statements', 'too-many-branches',
+                    'too-many-arguments', 'too-many-locals',
+                    'too-many-statements')
+    def visit_function(self, node):
+        """check function name, docstring, arguments, redefinition,
+        variable names, max locals
+        """
+        # init branch and returns counters
+        self._returns.append(0)
+        # check number of arguments
+        args = node.args.args
+        if args is not None:
+            ignored_args_num = len(
+                [arg for arg in args
+                 if self.config.ignored_argument_names.match(arg.name)])
+            argnum = len(args) - ignored_args_num
+            if  argnum > self.config.max_args:
+                self.add_message('too-many-arguments', node=node,
+                                 args=(len(args), self.config.max_args))
+        else:
+            ignored_args_num = 0
+        # check number of local variables
+        locnum = len(node.locals) - ignored_args_num
+        if locnum > self.config.max_locals:
+            self.add_message('too-many-locals', node=node,
+                             args=(locnum, self.config.max_locals))
+        # init statements counter
+        self._stmts = 1
+
+    @check_messages('too-many-return-statements', 'too-many-branches',
+                    'too-many-arguments', 'too-many-locals',
+                    'too-many-statements')
+    def leave_function(self, node):
+        """most of the work is done here on close:
+        checks for max returns, branch, return in __init__
+        """
+        returns = self._returns.pop()
+        if returns > self.config.max_returns:
+            self.add_message('too-many-return-statements', node=node,
+                             args=(returns, self.config.max_returns))
+        branches = self._branches[node]
+        if branches > self.config.max_branches:
+            self.add_message('too-many-branches', node=node,
+                             args=(branches, self.config.max_branches))
+        # check number of statements
+        if self._stmts > self.config.max_statements:
+            self.add_message('too-many-statements', node=node,
+                             args=(self._stmts, self.config.max_statements))
+
+    def visit_return(self, _):
+        """count number of returns"""
+        if not self._returns:
+            return # return outside function, reported by the base checker
+        self._returns[-1] += 1
+
+    def visit_default(self, node):
+        """default visit method -> increments the statements counter if
+        necessary
+        """
+        if node.is_statement:
+            self._stmts += 1
+
+    def visit_tryexcept(self, node):
+        """increments the branches counter"""
+        branches = len(node.handlers)
+        if node.orelse:
+            branches += 1
+        self._inc_branch(node, branches)
+        self._stmts += branches
+
+    def visit_tryfinally(self, node):
+        """increments the branches counter"""
+        self._inc_branch(node, 2)
+        self._stmts += 2
+
+    def visit_if(self, node):
+        """increments the branches counter"""
+        branches = 1
+        # don't double count If nodes coming from some 'elif'
+        if node.orelse and (len(node.orelse) > 1 or
+                            not isinstance(node.orelse[0], If)):
+            branches += 1
+        self._inc_branch(node, branches)
+        self._stmts += branches
+
+    def visit_while(self, node):
+        """increments the branches counter"""
+        branches = 1
+        if node.orelse:
+            branches += 1
+        self._inc_branch(node, branches)
+
+    visit_for = visit_while
+
+    def _inc_branch(self, node, branchesnum=1):
+        """increments the branches counter"""
+        self._branches[node.scope()] += branchesnum
+
+
+def register(linter):
+    """required method to auto register this checker """
+    linter.register_checker(MisdesignChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/exceptions.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/exceptions.py
new file mode 100644
index 0000000..88a8f22
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/exceptions.py
@@ -0,0 +1,332 @@
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""exceptions handling (raising, catching, exceptions classes) checker
+"""
+import sys
+
+import astroid
+from astroid import YES, Instance, unpack_infer, List, Tuple
+from logilab.common.compat import builtins
+
+from pylint.checkers import BaseChecker
+from pylint.checkers.utils import (
+    is_empty,
+    is_raising,
+    check_messages,
+    inherit_from_std_ex,
+    EXCEPTIONS_MODULE,
+    has_known_bases,
+    safe_infer)
+from pylint.interfaces import IAstroidChecker, INFERENCE, INFERENCE_FAILURE
+
+
+def _annotated_unpack_infer(stmt, context=None):
+    """
+    Recursively generate nodes inferred by the given statement.
+    If the inferred value is a list or a tuple, recurse on the elements.
+    Returns an iterator which yields tuples in the format
+    ('original node', 'infered node').
+    """
+    if isinstance(stmt, (List, Tuple)):
+        for elt in stmt.elts:
+            inferred = safe_infer(elt)
+            if inferred and inferred is not YES:
+                yield elt, inferred
+        return
+    for infered in stmt.infer(context):
+        if infered is YES:
+            continue
+        yield stmt, infered
+
+
+PY3K = sys.version_info >= (3, 0)
+OVERGENERAL_EXCEPTIONS = ('Exception',)
+BUILTINS_NAME = builtins.__name__
+MSGS = {
+    'E0701': ('Bad except clauses order (%s)',
+              'bad-except-order',
+              'Used when except clauses are not in the correct order (from the '
+              'more specific to the more generic). If you don\'t fix the order, '
+              'some exceptions may not be catched by the most specific handler.'),
+    'E0702': ('Raising %s while only classes or instances are allowed',
+              'raising-bad-type',
+              'Used when something which is neither a class, an instance or a \
+              string is raised (i.e. a `TypeError` will be raised).'),
+    'E0703': ('Exception context set to something which is not an '
+              'exception, nor None',
+              'bad-exception-context',
+              'Used when using the syntax "raise ... from ...", '
+              'where the exception context is not an exception, '
+              'nor None.',
+              {'minversion': (3, 0)}),
+    'E0710': ('Raising a new style class which doesn\'t inherit from BaseException',
+              'raising-non-exception',
+              'Used when a new style class which doesn\'t inherit from \
+               BaseException is raised.'),
+    'E0711': ('NotImplemented raised - should raise NotImplementedError',
+              'notimplemented-raised',
+              'Used when NotImplemented is raised instead of \
+              NotImplementedError'),
+    'E0712': ('Catching an exception which doesn\'t inherit from BaseException: %s',
+              'catching-non-exception',
+              'Used when a class which doesn\'t inherit from \
+               BaseException is used as an exception in an except clause.'),
+    'W0702': ('No exception type(s) specified',
+              'bare-except',
+              'Used when an except clause doesn\'t specify exceptions type to \
+              catch.'),
+    'W0703': ('Catching too general exception %s',
+              'broad-except',
+              'Used when an except catches a too general exception, \
+              possibly burying unrelated errors.'),
+    'W0704': ('Except doesn\'t do anything',
+              'pointless-except',
+              'Used when an except clause does nothing but "pass" and there is\
+              no "else" clause.'),
+    'W0710': ('Exception doesn\'t inherit from standard "Exception" class',
+              'nonstandard-exception',
+              'Used when a custom exception class is raised but doesn\'t \
+              inherit from the builtin "Exception" class.',
+              {'maxversion': (3, 0)}),
+    'W0711': ('Exception to catch is the result of a binary "%s" operation',
+              'binary-op-exception',
+              'Used when the exception to catch is of the form \
+              "except A or B:".  If intending to catch multiple, \
+              rewrite as "except (A, B):"'),
+    }
+
+
+class ExceptionsChecker(BaseChecker):
+    """checks for
+    * excepts without exception filter
+    * type of raise argument : string, Exceptions, other values
+    """
+
+    __implements__ = IAstroidChecker
+
+    name = 'exceptions'
+    msgs = MSGS
+    priority = -4
+    options = (('overgeneral-exceptions',
+                {'default' : OVERGENERAL_EXCEPTIONS,
+                 'type' :'csv', 'metavar' : '<comma-separated class names>',
+                 'help' : 'Exceptions that will emit a warning '
+                          'when being caught. Defaults to "%s"' % (
+                              ', '.join(OVERGENERAL_EXCEPTIONS),)}
+               ),
+              )
+
+    @check_messages('nonstandard-exception',
+                    'raising-bad-type', 'raising-non-exception',
+                    'notimplemented-raised', 'bad-exception-context')
+    def visit_raise(self, node):
+        """visit raise possibly inferring value"""
+        # ignore empty raise
+        if node.exc is None:
+            return
+        if PY3K and node.cause:
+            self._check_bad_exception_context(node)
+
+        expr = node.exc
+        if self._check_raise_value(node, expr):
+            return
+        else:
+            try:
+                value = next(unpack_infer(expr))
+            except astroid.InferenceError:
+                return
+            self._check_raise_value(node, value)
+
+    def _check_bad_exception_context(self, node):
+        """Verify that the exception context is properly set.
+
+        An exception context can be only `None` or an exception.
+        """
+        cause = safe_infer(node.cause)
+        if cause in (YES, None):
+            return
+        if isinstance(cause, astroid.Const):
+            if cause.value is not None:
+                self.add_message('bad-exception-context',
+                                 node=node)
+        elif (not isinstance(cause, astroid.Class) and
+              not inherit_from_std_ex(cause)):
+            self.add_message('bad-exception-context',
+                             node=node)
+
+    def _check_raise_value(self, node, expr):
+        """check for bad values, string exception and class inheritance
+        """
+        value_found = True
+        if isinstance(expr, astroid.Const):
+            value = expr.value
+            if not isinstance(value, str):
+                # raising-string will be emitted from python3 porting checker.
+                self.add_message('raising-bad-type', node=node,
+                                 args=value.__class__.__name__)
+        elif ((isinstance(expr, astroid.Name) and
+               expr.name in ('None', 'True', 'False')) or
+              isinstance(expr, (astroid.List, astroid.Dict, astroid.Tuple,
+                                astroid.Module, astroid.Function))):
+            emit = True
+            if not PY3K and isinstance(expr, astroid.Tuple):
+                # On Python 2, using the following is not an error:
+                #    raise (ZeroDivisionError, None)
+                #    raise (ZeroDivisionError, )
+                # What's left to do is to check that the first
+                # argument is indeed an exception.
+                # Verifying the other arguments is not
+                # the scope of this check.
+                first = expr.elts[0]
+                inferred = safe_infer(first)
+                if isinstance(inferred, Instance):
+                    # pylint: disable=protected-access
+                    inferred = inferred._proxied
+                if (inferred is YES or
+                        isinstance(inferred, astroid.Class)
+                        and inherit_from_std_ex(inferred)):
+                    emit = False
+            if emit:
+                self.add_message('raising-bad-type',
+                                 node=node,
+                                 args=expr.name)
+        elif ((isinstance(expr, astroid.Name) and expr.name == 'NotImplemented')
+              or (isinstance(expr, astroid.CallFunc) and
+                  isinstance(expr.func, astroid.Name) and
+                  expr.func.name == 'NotImplemented')):
+            self.add_message('notimplemented-raised', node=node)
+        elif isinstance(expr, (Instance, astroid.Class)):
+            if isinstance(expr, Instance):
+                # pylint: disable=protected-access
+                expr = expr._proxied
+            if (isinstance(expr, astroid.Class) and
+                    not inherit_from_std_ex(expr)):
+                if expr.newstyle:
+                    self.add_message('raising-non-exception', node=node)
+                else:
+                    if has_known_bases(expr):
+                        confidence = INFERENCE
+                    else:
+                        confidence = INFERENCE_FAILURE
+                    self.add_message(
+                        'nonstandard-exception', node=node,
+                        confidence=confidence)
+            else:
+                value_found = False
+        else:
+            value_found = False
+        return value_found
+
+    def _check_catching_non_exception(self, handler, exc, part):
+        if isinstance(exc, astroid.Tuple):
+            # Check if it is a tuple of exceptions.
+            inferred = [safe_infer(elt) for elt in exc.elts]
+            if any(node is astroid.YES for node in inferred):
+                # Don't emit if we don't know every component.
+                return
+            if all(node and inherit_from_std_ex(node)
+                   for node in inferred):
+                return
+
+        if not isinstance(exc, astroid.Class):
+            # Don't emit the warning if the infered stmt
+            # is None, but the exception handler is something else,
+            # maybe it was redefined.
+            if (isinstance(exc, astroid.Const) and
+                    exc.value is None):
+                if ((isinstance(handler.type, astroid.Const) and
+                     handler.type.value is None) or
+                        handler.type.parent_of(exc)):
+                    # If the exception handler catches None or
+                    # the exception component, which is None, is
+                    # defined by the entire exception handler, then
+                    # emit a warning.
+                    self.add_message('catching-non-exception',
+                                     node=handler.type,
+                                     args=(part.as_string(), ))
+            else:
+                self.add_message('catching-non-exception',
+                                 node=handler.type,
+                                 args=(part.as_string(), ))
+            return
+        if (not inherit_from_std_ex(exc) and
+                exc.root().name != BUILTINS_NAME):
+            if has_known_bases(exc):
+                self.add_message('catching-non-exception',
+                                 node=handler.type,
+                                 args=(exc.name, ))
+
+    @check_messages('bare-except', 'broad-except', 'pointless-except',
+                    'binary-op-exception', 'bad-except-order',
+                    'catching-non-exception')
+    def visit_tryexcept(self, node):
+        """check for empty except"""
+        exceptions_classes = []
+        nb_handlers = len(node.handlers)
+        for index, handler in enumerate(node.handlers):
+            # single except doing nothing but "pass" without else clause
+            if is_empty(handler.body) and not node.orelse:
+                self.add_message('pointless-except',
+                                 node=handler.type or handler.body[0])
+            if handler.type is None:
+                if not is_raising(handler.body):
+                    self.add_message('bare-except', node=handler)
+                # check if a "except:" is followed by some other
+                # except
+                if index < (nb_handlers - 1):
+                    msg = 'empty except clause should always appear last'
+                    self.add_message('bad-except-order', node=node, args=msg)
+
+            elif isinstance(handler.type, astroid.BoolOp):
+                self.add_message('binary-op-exception',
+                                 node=handler, args=handler.type.op)
+            else:
+                try:
+                    excs = list(_annotated_unpack_infer(handler.type))
+                except astroid.InferenceError:
+                    continue
+                for part, exc in excs:
+                    if exc is YES:
+                        continue
+                    if (isinstance(exc, astroid.Instance)
+                            and inherit_from_std_ex(exc)):
+                        # pylint: disable=protected-access
+                        exc = exc._proxied
+
+                    self._check_catching_non_exception(handler, exc, part)
+
+                    if not isinstance(exc, astroid.Class):
+                        continue
+
+                    exc_ancestors = [anc for anc in exc.ancestors()
+                                     if isinstance(anc, astroid.Class)]
+                    for previous_exc in exceptions_classes:
+                        if previous_exc in exc_ancestors:
+                            msg = '%s is an ancestor class of %s' % (
+                                previous_exc.name, exc.name)
+                            self.add_message('bad-except-order',
+                                             node=handler.type, args=msg)
+                    if (exc.name in self.config.overgeneral_exceptions
+                            and exc.root().name == EXCEPTIONS_MODULE
+                            and not is_raising(handler.body)):
+                        self.add_message('broad-except',
+                                         args=exc.name, node=handler.type)
+
+                exceptions_classes += [exc for _, exc in excs]
+
+
+def register(linter):
+    """required method to auto register this checker"""
+    linter.register_checker(ExceptionsChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/format.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/format.py
new file mode 100644
index 0000000..8c496ac
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/format.py
@@ -0,0 +1,968 @@
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""Python code format's checker.
+
+By default try to follow Guido's style guide :
+
+http://www.python.org/doc/essays/styleguide.html
+
+Some parts of the process_token method is based from The Tab Nanny std module.
+"""
+
+import keyword
+import sys
+import tokenize
+from functools import reduce # pylint: disable=redefined-builtin
+
+import six
+from six.moves import zip, map, filter # pylint: disable=redefined-builtin
+
+from astroid import nodes
+
+from pylint.interfaces import ITokenChecker, IAstroidChecker, IRawChecker
+from pylint.checkers import BaseTokenChecker
+from pylint.checkers.utils import check_messages
+from pylint.utils import WarningScope, OPTION_RGX
+
+_CONTINUATION_BLOCK_OPENERS = ['elif', 'except', 'for', 'if', 'while', 'def', 'class']
+_KEYWORD_TOKENS = ['assert', 'del', 'elif', 'except', 'for', 'if', 'in', 'not',
+                   'raise', 'return', 'while', 'yield']
+if sys.version_info < (3, 0):
+    _KEYWORD_TOKENS.append('print')
+
+_SPACED_OPERATORS = ['==', '<', '>', '!=', '<>', '<=', '>=',
+                     '+=', '-=', '*=', '**=', '/=', '//=', '&=', '|=', '^=',
+                     '%=', '>>=', '<<=']
+_OPENING_BRACKETS = ['(', '[', '{']
+_CLOSING_BRACKETS = [')', ']', '}']
+_TAB_LENGTH = 8
+
+_EOL = frozenset([tokenize.NEWLINE, tokenize.NL, tokenize.COMMENT])
+_JUNK_TOKENS = (tokenize.COMMENT, tokenize.NL)
+
+# Whitespace checking policy constants
+_MUST = 0
+_MUST_NOT = 1
+_IGNORE = 2
+
+# Whitespace checking config constants
+_DICT_SEPARATOR = 'dict-separator'
+_TRAILING_COMMA = 'trailing-comma'
+_NO_SPACE_CHECK_CHOICES = [_TRAILING_COMMA, _DICT_SEPARATOR]
+
+MSGS = {
+    'C0301': ('Line too long (%s/%s)',
+              'line-too-long',
+              'Used when a line is longer than a given number of characters.'),
+    'C0302': ('Too many lines in module (%s/%s)', # was W0302
+              'too-many-lines',
+              'Used when a module has too much lines, reducing its readability.'
+             ),
+    'C0303': ('Trailing whitespace',
+              'trailing-whitespace',
+              'Used when there is whitespace between the end of a line and the '
+              'newline.'),
+    'C0304': ('Final newline missing',
+              'missing-final-newline',
+              'Used when the last line in a file is missing a newline.'),
+    'W0311': ('Bad indentation. Found %s %s, expected %s',
+              'bad-indentation',
+              'Used when an unexpected number of indentation\'s tabulations or '
+              'spaces has been found.'),
+    'C0330': ('Wrong %s indentation%s.\n%s%s',
+              'bad-continuation',
+              'TODO'),
+    'W0312': ('Found indentation with %ss instead of %ss',
+              'mixed-indentation',
+              'Used when there are some mixed tabs and spaces in a module.'),
+    'W0301': ('Unnecessary semicolon', # was W0106
+              'unnecessary-semicolon',
+              'Used when a statement is ended by a semi-colon (";"), which \
+              isn\'t necessary (that\'s python, not C ;).'),
+    'C0321': ('More than one statement on a single line',
+              'multiple-statements',
+              'Used when more than on statement are found on the same line.',
+              {'scope': WarningScope.NODE}),
+    'C0325' : ('Unnecessary parens after %r keyword',
+               'superfluous-parens',
+               'Used when a single item in parentheses follows an if, for, or '
+               'other keyword.'),
+    'C0326': ('%s space %s %s %s\n%s',
+              'bad-whitespace',
+              ('Used when a wrong number of spaces is used around an operator, '
+               'bracket or block opener.'),
+              {'old_names': [('C0323', 'no-space-after-operator'),
+                             ('C0324', 'no-space-after-comma'),
+                             ('C0322', 'no-space-before-operator')]}),
+    'W0332': ('Use of "l" as long integer identifier',
+              'lowercase-l-suffix',
+              'Used when a lower case "l" is used to mark a long integer. You '
+              'should use a upper case "L" since the letter "l" looks too much '
+              'like the digit "1"',
+              {'maxversion': (3, 0)}),
+    'C0327': ('Mixed line endings LF and CRLF',
+              'mixed-line-endings',
+              'Used when there are mixed (LF and CRLF) newline signs in a file.'),
+    'C0328': ('Unexpected line ending format. There is \'%s\' while it should be \'%s\'.',
+              'unexpected-line-ending-format',
+              'Used when there is different newline than expected.'),
+    }
+
+
+def _underline_token(token):
+    length = token[3][1] - token[2][1]
+    offset = token[2][1]
+    return token[4] + (' ' * offset) + ('^' * length)
+
+
+def _column_distance(token1, token2):
+    if token1 == token2:
+        return 0
+    if token2[3] < token1[3]:
+        token1, token2 = token2, token1
+    if token1[3][0] != token2[2][0]:
+        return None
+    return token2[2][1] - token1[3][1]
+
+
+def _last_token_on_line_is(tokens, line_end, token):
+    return (line_end > 0 and tokens.token(line_end-1) == token or
+            line_end > 1 and tokens.token(line_end-2) == token
+            and tokens.type(line_end-1) == tokenize.COMMENT)
+
+
+def _token_followed_by_eol(tokens, position):
+    return (tokens.type(position+1) == tokenize.NL or
+            tokens.type(position+1) == tokenize.COMMENT and
+            tokens.type(position+2) == tokenize.NL)
+
+
+def _get_indent_length(line):
+    """Return the length of the indentation on the given token's line."""
+    result = 0
+    for char in line:
+        if char == ' ':
+            result += 1
+        elif char == '\t':
+            result += _TAB_LENGTH
+        else:
+            break
+    return result
+
+
+def _get_indent_hint_line(bar_positions, bad_position):
+    """Return a line with |s for each of the positions in the given lists."""
+    if not bar_positions:
+        return ''
+    markers = [(pos, '|') for pos in bar_positions]
+    markers.append((bad_position, '^'))
+    markers.sort()
+    line = [' '] * (markers[-1][0] + 1)
+    for position, marker in markers:
+        line[position] = marker
+    return ''.join(line)
+
+
+class _ContinuedIndent(object):
+    __slots__ = ('valid_outdent_offsets',
+                 'valid_continuation_offsets',
+                 'context_type',
+                 'token',
+                 'position')
+
+    def __init__(self,
+                 context_type,
+                 token,
+                 position,
+                 valid_outdent_offsets,
+                 valid_continuation_offsets):
+        self.valid_outdent_offsets = valid_outdent_offsets
+        self.valid_continuation_offsets = valid_continuation_offsets
+        self.context_type = context_type
+        self.position = position
+        self.token = token
+
+
+# The contexts for hanging indents.
+# A hanging indented dictionary value after :
+HANGING_DICT_VALUE = 'dict-value'
+# Hanging indentation in an expression.
+HANGING = 'hanging'
+# Hanging indentation in a block header.
+HANGING_BLOCK = 'hanging-block'
+# Continued indentation inside an expression.
+CONTINUED = 'continued'
+# Continued indentation in a block header.
+CONTINUED_BLOCK = 'continued-block'
+
+SINGLE_LINE = 'single'
+WITH_BODY = 'multi'
+
+_CONTINUATION_MSG_PARTS = {
+    HANGING_DICT_VALUE: ('hanging', ' in dict value'),
+    HANGING: ('hanging', ''),
+    HANGING_BLOCK: ('hanging', ' before block'),
+    CONTINUED: ('continued', ''),
+    CONTINUED_BLOCK: ('continued', ' before block'),
+}
+
+
+def _Offsets(*args):
+    """Valid indentation offsets for a continued line."""
+    return dict((a, None) for a in args)
+
+
+def _BeforeBlockOffsets(single, with_body):
+    """Valid alternative indent offsets for continued lines before blocks.
+
+    :param single: Valid offset for statements on a single logical line.
+    :param with_body: Valid offset for statements on several lines.
+    """
+    return {single: SINGLE_LINE, with_body: WITH_BODY}
+
+
+class TokenWrapper(object):
+    """A wrapper for readable access to token information."""
+
+    def __init__(self, tokens):
+        self._tokens = tokens
+
+    def token(self, idx):
+        return self._tokens[idx][1]
+
+    def type(self, idx):
+        return self._tokens[idx][0]
+
+    def start_line(self, idx):
+        return self._tokens[idx][2][0]
+
+    def start_col(self, idx):
+        return self._tokens[idx][2][1]
+
+    def line(self, idx):
+        return self._tokens[idx][4]
+
+
+class ContinuedLineState(object):
+    """Tracker for continued indentation inside a logical line."""
+
+    def __init__(self, tokens, config):
+        self._line_start = -1
+        self._cont_stack = []
+        self._is_block_opener = False
+        self.retained_warnings = []
+        self._config = config
+        self._tokens = TokenWrapper(tokens)
+
+    @property
+    def has_content(self):
+        return bool(self._cont_stack)
+
+    @property
+    def _block_indent_size(self):
+        return len(self._config.indent_string.replace('\t', ' ' * _TAB_LENGTH))
+
+    @property
+    def _continuation_size(self):
+        return self._config.indent_after_paren
+
+    def handle_line_start(self, pos):
+        """Record the first non-junk token at the start of a line."""
+        if self._line_start > -1:
+            return
+        self._is_block_opener = self._tokens.token(pos) in _CONTINUATION_BLOCK_OPENERS
+        self._line_start = pos
+
+    def next_physical_line(self):
+        """Prepares the tracker for a new physical line (NL)."""
+        self._line_start = -1
+        self._is_block_opener = False
+
+    def next_logical_line(self):
+        """Prepares the tracker for a new logical line (NEWLINE).
+
+        A new logical line only starts with block indentation.
+        """
+        self.next_physical_line()
+        self.retained_warnings = []
+        self._cont_stack = []
+
+    def add_block_warning(self, token_position, state, valid_offsets):
+        self.retained_warnings.append((token_position, state, valid_offsets))
+
+    def get_valid_offsets(self, idx):
+        """Returns the valid offsets for the token at the given position."""
+        # The closing brace on a dict or the 'for' in a dict comprehension may
+        # reset two indent levels because the dict value is ended implicitly
+        stack_top = -1
+        if self._tokens.token(idx) in ('}', 'for') and self._cont_stack[-1].token == ':':
+            stack_top = -2
+        indent = self._cont_stack[stack_top]
+        if self._tokens.token(idx) in _CLOSING_BRACKETS:
+            valid_offsets = indent.valid_outdent_offsets
+        else:
+            valid_offsets = indent.valid_continuation_offsets
+        return indent, valid_offsets.copy()
+
+    def _hanging_indent_after_bracket(self, bracket, position):
+        """Extracts indentation information for a hanging indent."""
+        indentation = _get_indent_length(self._tokens.line(position))
+        if self._is_block_opener and self._continuation_size == self._block_indent_size:
+            return _ContinuedIndent(
+                HANGING_BLOCK,
+                bracket,
+                position,
+                _Offsets(indentation + self._continuation_size, indentation),
+                _BeforeBlockOffsets(indentation + self._continuation_size,
+                                    indentation + self._continuation_size * 2))
+        elif bracket == ':':
+            # If the dict key was on the same line as the open brace, the new
+            # correct indent should be relative to the key instead of the
+            # current indent level
+            paren_align = self._cont_stack[-1].valid_outdent_offsets
+            next_align = self._cont_stack[-1].valid_continuation_offsets.copy()
+            next_align_keys = list(next_align.keys())
+            next_align[next_align_keys[0] + self._continuation_size] = True
+            # Note that the continuation of
+            # d = {
+            #       'a': 'b'
+            #            'c'
+            # }
+            # is handled by the special-casing for hanging continued string indents.
+            return _ContinuedIndent(HANGING_DICT_VALUE, bracket, position, paren_align, next_align)
+        else:
+            return _ContinuedIndent(
+                HANGING,
+                bracket,
+                position,
+                _Offsets(indentation, indentation + self._continuation_size),
+                _Offsets(indentation + self._continuation_size))
+
+    def _continuation_inside_bracket(self, bracket, pos):
+        """Extracts indentation information for a continued indent."""
+        indentation = _get_indent_length(self._tokens.line(pos))
+        token_start = self._tokens.start_col(pos)
+        next_token_start = self._tokens.start_col(pos + 1)
+        if self._is_block_opener and next_token_start - indentation == self._block_indent_size:
+            return _ContinuedIndent(
+                CONTINUED_BLOCK,
+                bracket,
+                pos,
+                _Offsets(token_start),
+                _BeforeBlockOffsets(next_token_start, next_token_start + self._continuation_size))
+        else:
+            return _ContinuedIndent(
+                CONTINUED,
+                bracket,
+                pos,
+                _Offsets(token_start),
+                _Offsets(next_token_start))
+
+    def pop_token(self):
+        self._cont_stack.pop()
+
+    def push_token(self, token, position):
+        """Pushes a new token for continued indentation on the stack.
+
+        Tokens that can modify continued indentation offsets are:
+          * opening brackets
+          * 'lambda'
+          * : inside dictionaries
+
+        push_token relies on the caller to filter out those
+        interesting tokens.
+
+        :param token: The concrete token
+        :param position: The position of the token in the stream.
+        """
+        if _token_followed_by_eol(self._tokens, position):
+            self._cont_stack.append(
+                self._hanging_indent_after_bracket(token, position))
+        else:
+            self._cont_stack.append(
+                self._continuation_inside_bracket(token, position))
+
+
+class FormatChecker(BaseTokenChecker):
+    """checks for :
+    * unauthorized constructions
+    * strict indentation
+    * line length
+    """
+
+    __implements__ = (ITokenChecker, IAstroidChecker, IRawChecker)
+
+    # configuration section name
+    name = 'format'
+    # messages
+    msgs = MSGS
+    # configuration options
+    # for available dict keys/values see the optik parser 'add_option' method
+    options = (('max-line-length',
+                {'default' : 100, 'type' : "int", 'metavar' : '<int>',
+                 'help' : 'Maximum number of characters on a single line.'}),
+               ('ignore-long-lines',
+                {'type': 'regexp', 'metavar': '<regexp>',
+                 'default': r'^\s*(# )?<?https?://\S+>?$',
+                 'help': ('Regexp for a line that is allowed to be longer than '
+                          'the limit.')}),
+               ('single-line-if-stmt',
+                {'default': False, 'type' : 'yn', 'metavar' : '<y_or_n>',
+                 'help' : ('Allow the body of an if to be on the same '
+                           'line as the test if there is no else.')}),
+               ('no-space-check',
+                {'default': ','.join(_NO_SPACE_CHECK_CHOICES),
+                 'type': 'multiple_choice',
+                 'choices': _NO_SPACE_CHECK_CHOICES,
+                 'help': ('List of optional constructs for which whitespace '
+                          'checking is disabled')}),
+               ('max-module-lines',
+                {'default' : 1000, 'type' : 'int', 'metavar' : '<int>',
+                 'help': 'Maximum number of lines in a module'}
+               ),
+               ('indent-string',
+                {'default' : '    ', 'type' : "string", 'metavar' : '<string>',
+                 'help' : 'String used as indentation unit. This is usually '
+                          '"    " (4 spaces) or "\\t" (1 tab).'}),
+               ('indent-after-paren',
+                {'type': 'int', 'metavar': '<int>', 'default': 4,
+                 'help': 'Number of spaces of indent required inside a hanging '
+                         ' or continued line.'}),
+               ('expected-line-ending-format',
+                {'type': 'choice', 'metavar': '<empty or LF or CRLF>', 'default': '',
+                 'choices': ['', 'LF', 'CRLF'],
+                 'help': ('Expected format of line ending, '
+                          'e.g. empty (any line ending), LF or CRLF.')}),
+              )
+
+    def __init__(self, linter=None):
+        BaseTokenChecker.__init__(self, linter)
+        self._lines = None
+        self._visited_lines = None
+        self._bracket_stack = [None]
+
+    def _pop_token(self):
+        self._bracket_stack.pop()
+        self._current_line.pop_token()
+
+    def _push_token(self, token, idx):
+        self._bracket_stack.append(token)
+        self._current_line.push_token(token, idx)
+
+    def new_line(self, tokens, line_end, line_start):
+        """a new line has been encountered, process it if necessary"""
+        if _last_token_on_line_is(tokens, line_end, ';'):
+            self.add_message('unnecessary-semicolon', line=tokens.start_line(line_end))
+
+        line_num = tokens.start_line(line_start)
+        line = tokens.line(line_start)
+        if tokens.type(line_start) not in _JUNK_TOKENS:
+            self._lines[line_num] = line.split('\n')[0]
+        self.check_lines(line, line_num)
+
+    def process_module(self, module):
+        self._keywords_with_parens = set()
+        if 'print_function' in module.future_imports:
+            self._keywords_with_parens.add('print')
+
+    def _check_keyword_parentheses(self, tokens, start):
+        """Check that there are not unnecessary parens after a keyword.
+
+        Parens are unnecessary if there is exactly one balanced outer pair on a
+        line, and it is followed by a colon, and contains no commas (i.e. is not a
+        tuple).
+
+        Args:
+        tokens: list of Tokens; the entire list of Tokens.
+        start: int; the position of the keyword in the token list.
+        """
+        # If the next token is not a paren, we're fine.
+        if self._inside_brackets(':') and tokens[start][1] == 'for':
+            self._pop_token()
+        if tokens[start+1][1] != '(':
+            return
+
+        found_and_or = False
+        depth = 0
+        keyword_token = tokens[start][1]
+        line_num = tokens[start][2][0]
+
+        for i in range(start, len(tokens) - 1):
+            token = tokens[i]
+
+            # If we hit a newline, then assume any parens were for continuation.
+            if token[0] == tokenize.NL:
+                return
+
+            if token[1] == '(':
+                depth += 1
+            elif token[1] == ')':
+                depth -= 1
+                if not depth:
+                    # ')' can't happen after if (foo), since it would be a syntax error.
+                    if (tokens[i+1][1] in (':', ')', ']', '}', 'in') or
+                            tokens[i+1][0] in (tokenize.NEWLINE,
+                                               tokenize.ENDMARKER,
+                                               tokenize.COMMENT)):
+                        # The empty tuple () is always accepted.
+                        if i == start + 2:
+                            return
+                        if keyword_token == 'not':
+                            if not found_and_or:
+                                self.add_message('superfluous-parens', line=line_num,
+                                                 args=keyword_token)
+                        elif keyword_token in ('return', 'yield'):
+                            self.add_message('superfluous-parens', line=line_num,
+                                             args=keyword_token)
+                        elif keyword_token not in self._keywords_with_parens:
+                            if not (tokens[i+1][1] == 'in' and found_and_or):
+                                self.add_message('superfluous-parens', line=line_num,
+                                                 args=keyword_token)
+                    return
+            elif depth == 1:
+                # This is a tuple, which is always acceptable.
+                if token[1] == ',':
+                    return
+                # 'and' and 'or' are the only boolean operators with lower precedence
+                # than 'not', so parens are only required when they are found.
+                elif token[1] in ('and', 'or'):
+                    found_and_or = True
+                # A yield inside an expression must always be in parentheses,
+                # quit early without error.
+                elif token[1] == 'yield':
+                    return
+                # A generator expression always has a 'for' token in it, and
+                # the 'for' token is only legal inside parens when it is in a
+                # generator expression.  The parens are necessary here, so bail
+                # without an error.
+                elif token[1] == 'for':
+                    return
+
+    def _opening_bracket(self, tokens, i):
+        self._push_token(tokens[i][1], i)
+        # Special case: ignore slices
+        if tokens[i][1] == '[' and tokens[i+1][1] == ':':
+            return
+
+        if (i > 0 and (tokens[i-1][0] == tokenize.NAME and
+                       not (keyword.iskeyword(tokens[i-1][1]))
+                       or tokens[i-1][1] in _CLOSING_BRACKETS)):
+            self._check_space(tokens, i, (_MUST_NOT, _MUST_NOT))
+        else:
+            self._check_space(tokens, i, (_IGNORE, _MUST_NOT))
+
+    def _closing_bracket(self, tokens, i):
+        if self._inside_brackets(':'):
+            self._pop_token()
+        self._pop_token()
+        # Special case: ignore slices
+        if tokens[i-1][1] == ':' and tokens[i][1] == ']':
+            return
+        policy_before = _MUST_NOT
+        if tokens[i][1] in _CLOSING_BRACKETS and tokens[i-1][1] == ',':
+            if _TRAILING_COMMA in self.config.no_space_check:
+                policy_before = _IGNORE
+
+        self._check_space(tokens, i, (policy_before, _IGNORE))
+
+    def _check_equals_spacing(self, tokens, i):
+        """Check the spacing of a single equals sign."""
+        if self._inside_brackets('(') or self._inside_brackets('lambda'):
+            self._check_space(tokens, i, (_MUST_NOT, _MUST_NOT))
+        else:
+            self._check_space(tokens, i, (_MUST, _MUST))
+
+    def _open_lambda(self, tokens, i): # pylint:disable=unused-argument
+        self._push_token('lambda', i)
+
+    def _handle_colon(self, tokens, i):
+        # Special case: ignore slices
+        if self._inside_brackets('['):
+            return
+        if (self._inside_brackets('{') and
+                _DICT_SEPARATOR in self.config.no_space_check):
+            policy = (_IGNORE, _IGNORE)
+        else:
+            policy = (_MUST_NOT, _MUST)
+        self._check_space(tokens, i, policy)
+
+        if self._inside_brackets('lambda'):
+            self._pop_token()
+        elif self._inside_brackets('{'):
+            self._push_token(':', i)
+
+    def _handle_comma(self, tokens, i):
+        # Only require a following whitespace if this is
+        # not a hanging comma before a closing bracket.
+        if tokens[i+1][1] in _CLOSING_BRACKETS:
+            self._check_space(tokens, i, (_MUST_NOT, _IGNORE))
+        else:
+            self._check_space(tokens, i, (_MUST_NOT, _MUST))
+        if self._inside_brackets(':'):
+            self._pop_token()
+
+    def _check_surrounded_by_space(self, tokens, i):
+        """Check that a binary operator is surrounded by exactly one space."""
+        self._check_space(tokens, i, (_MUST, _MUST))
+
+    def _check_space(self, tokens, i, policies):
+        def _policy_string(policy):
+            if policy == _MUST:
+                return 'Exactly one', 'required'
+            else:
+                return 'No', 'allowed'
+
+        def _name_construct(token):
+            if token[1] == ',':
+                return 'comma'
+            elif token[1] == ':':
+                return ':'
+            elif token[1] in '()[]{}':
+                return 'bracket'
+            elif token[1] in ('<', '>', '<=', '>=', '!=', '=='):
+                return 'comparison'
+            else:
+                if self._inside_brackets('('):
+                    return 'keyword argument assignment'
+                else:
+                    return 'assignment'
+
+        good_space = [True, True]
+        token = tokens[i]
+        pairs = [(tokens[i-1], token), (token, tokens[i+1])]
+
+        for other_idx, (policy, token_pair) in enumerate(zip(policies, pairs)):
+            if token_pair[other_idx][0] in _EOL or policy == _IGNORE:
+                continue
+
+            distance = _column_distance(*token_pair)
+            if distance is None:
+                continue
+            good_space[other_idx] = (
+                (policy == _MUST and distance == 1) or
+                (policy == _MUST_NOT and distance == 0))
+
+        warnings = []
+        if not any(good_space) and policies[0] == policies[1]:
+            warnings.append((policies[0], 'around'))
+        else:
+            for ok, policy, position in zip(good_space, policies, ('before', 'after')):
+                if not ok:
+                    warnings.append((policy, position))
+        for policy, position in warnings:
+            construct = _name_construct(token)
+            count, state = _policy_string(policy)
+            self.add_message('bad-whitespace', line=token[2][0],
+                             args=(count, state, position, construct,
+                                   _underline_token(token)))
+
+    def _inside_brackets(self, left):
+        return self._bracket_stack[-1] == left
+
+    def _prepare_token_dispatcher(self):
+        raw = [
+            (_KEYWORD_TOKENS,
+             self._check_keyword_parentheses),
+
+            (_OPENING_BRACKETS, self._opening_bracket),
+
+            (_CLOSING_BRACKETS, self._closing_bracket),
+
+            (['='], self._check_equals_spacing),
+
+            (_SPACED_OPERATORS, self._check_surrounded_by_space),
+
+            ([','], self._handle_comma),
+
+            ([':'], self._handle_colon),
+
+            (['lambda'], self._open_lambda),
+
+            ]
+
+        dispatch = {}
+        for tokens, handler in raw:
+            for token in tokens:
+                dispatch[token] = handler
+        return dispatch
+
+    def process_tokens(self, tokens):
+        """process tokens and search for :
+
+         _ non strict indentation (i.e. not always using the <indent> parameter as
+           indent unit)
+         _ too long lines (i.e. longer than <max_chars>)
+         _ optionally bad construct (if given, bad_construct must be a compiled
+           regular expression).
+        """
+        self._bracket_stack = [None]
+        indents = [0]
+        check_equal = False
+        line_num = 0
+        self._lines = {}
+        self._visited_lines = {}
+        token_handlers = self._prepare_token_dispatcher()
+        self._last_line_ending = None
+
+        self._current_line = ContinuedLineState(tokens, self.config)
+        for idx, (tok_type, token, start, _, line) in enumerate(tokens):
+            if start[0] != line_num:
+                line_num = start[0]
+                # A tokenizer oddity: if an indented line contains a multi-line
+                # docstring, the line member of the INDENT token does not contain
+                # the full line; therefore we check the next token on the line.
+                if tok_type == tokenize.INDENT:
+                    self.new_line(TokenWrapper(tokens), idx-1, idx+1)
+                else:
+                    self.new_line(TokenWrapper(tokens), idx-1, idx)
+
+            if tok_type == tokenize.NEWLINE:
+                # a program statement, or ENDMARKER, will eventually follow,
+                # after some (possibly empty) run of tokens of the form
+                #     (NL | COMMENT)* (INDENT | DEDENT+)?
+                # If an INDENT appears, setting check_equal is wrong, and will
+                # be undone when we see the INDENT.
+                check_equal = True
+                self._process_retained_warnings(TokenWrapper(tokens), idx)
+                self._current_line.next_logical_line()
+                self._check_line_ending(token, line_num)
+            elif tok_type == tokenize.INDENT:
+                check_equal = False
+                self.check_indent_level(token, indents[-1]+1, line_num)
+                indents.append(indents[-1]+1)
+            elif tok_type == tokenize.DEDENT:
+                # there's nothing we need to check here!  what's important is
+                # that when the run of DEDENTs ends, the indentation of the
+                # program statement (or ENDMARKER) that triggered the run is
+                # equal to what's left at the top of the indents stack
+                check_equal = True
+                if len(indents) > 1:
+                    del indents[-1]
+            elif tok_type == tokenize.NL:
+                self._check_continued_indentation(TokenWrapper(tokens), idx+1)
+                self._current_line.next_physical_line()
+            elif tok_type != tokenize.COMMENT:
+                self._current_line.handle_line_start(idx)
+                # This is the first concrete token following a NEWLINE, so it
+                # must be the first token of the next program statement, or an
+                # ENDMARKER; the "line" argument exposes the leading whitespace
+                # for this statement; in the case of ENDMARKER, line is an empty
+                # string, so will properly match the empty string with which the
+                # "indents" stack was seeded
+                if check_equal:
+                    check_equal = False
+                    self.check_indent_level(line, indents[-1], line_num)
+
+            if tok_type == tokenize.NUMBER and token.endswith('l'):
+                self.add_message('lowercase-l-suffix', line=line_num)
+
+            try:
+                handler = token_handlers[token]
+            except KeyError:
+                pass
+            else:
+                handler(tokens, idx)
+
+        line_num -= 1 # to be ok with "wc -l"
+        if line_num > self.config.max_module_lines:
+            # Get the line where the too-many-lines (or its message id)
+            # was disabled or default to 1.
+            symbol = self.linter.msgs_store.check_message_id('too-many-lines')
+            names = (symbol.msgid, 'too-many-lines')
+            line = next(filter(None,
+                               map(self.linter._pragma_lineno.get, names)), 1)
+            self.add_message('too-many-lines',
+                             args=(line_num, self.config.max_module_lines),
+                             line=line)
+
+    def _check_line_ending(self, line_ending, line_num):
+        # check if line endings are mixed
+        if self._last_line_ending is not None:
+            if line_ending != self._last_line_ending:
+                self.add_message('mixed-line-endings', line=line_num)
+
+        self._last_line_ending = line_ending
+
+        # check if line ending is as expected
+        expected = self.config.expected_line_ending_format
+        if expected:
+            # reduce multiple \n\n\n\n to one \n
+            line_ending = reduce(lambda x, y: x + y if x != y else x, line_ending, "")
+            line_ending = 'LF' if line_ending == '\n' else 'CRLF'
+            if line_ending != expected:
+                self.add_message('unexpected-line-ending-format', args=(line_ending, expected),
+                                 line=line_num)
+
+
+    def _process_retained_warnings(self, tokens, current_pos):
+        single_line_block_stmt = not _last_token_on_line_is(tokens, current_pos, ':')
+
+        for indent_pos, state, offsets in self._current_line.retained_warnings:
+            block_type = offsets[tokens.start_col(indent_pos)]
+            hints = dict((k, v) for k, v in six.iteritems(offsets)
+                         if v != block_type)
+            if single_line_block_stmt and block_type == WITH_BODY:
+                self._add_continuation_message(state, hints, tokens, indent_pos)
+            elif not single_line_block_stmt and block_type == SINGLE_LINE:
+                self._add_continuation_message(state, hints, tokens, indent_pos)
+
+    def _check_continued_indentation(self, tokens, next_idx):
+        def same_token_around_nl(token_type):
+            return (tokens.type(next_idx) == token_type and
+                    tokens.type(next_idx-2) == token_type)
+
+        # Do not issue any warnings if the next line is empty.
+        if not self._current_line.has_content or tokens.type(next_idx) == tokenize.NL:
+            return
+
+        state, valid_offsets = self._current_line.get_valid_offsets(next_idx)
+        # Special handling for hanging comments and strings. If the last line ended
+        # with a comment (string) and the new line contains only a comment, the line
+        # may also be indented to the start of the previous token.
+        if same_token_around_nl(tokenize.COMMENT) or same_token_around_nl(tokenize.STRING):
+            valid_offsets[tokens.start_col(next_idx-2)] = True
+
+        # We can only decide if the indentation of a continued line before opening
+        # a new block is valid once we know of the body of the block is on the
+        # same line as the block opener. Since the token processing is single-pass,
+        # emitting those warnings is delayed until the block opener is processed.
+        if (state.context_type in (HANGING_BLOCK, CONTINUED_BLOCK)
+                and tokens.start_col(next_idx) in valid_offsets):
+            self._current_line.add_block_warning(next_idx, state, valid_offsets)
+        elif tokens.start_col(next_idx) not in valid_offsets:
+            self._add_continuation_message(state, valid_offsets, tokens, next_idx)
+
+    def _add_continuation_message(self, state, offsets, tokens, position):
+        readable_type, readable_position = _CONTINUATION_MSG_PARTS[state.context_type]
+        hint_line = _get_indent_hint_line(offsets, tokens.start_col(position))
+        self.add_message(
+            'bad-continuation',
+            line=tokens.start_line(position),
+            args=(readable_type, readable_position, tokens.line(position), hint_line))
+
+    @check_messages('multiple-statements')
+    def visit_default(self, node):
+        """check the node line number and check it if not yet done"""
+        if not node.is_statement:
+            return
+        if not node.root().pure_python:
+            return # XXX block visit of child nodes
+        prev_sibl = node.previous_sibling()
+        if prev_sibl is not None:
+            prev_line = prev_sibl.fromlineno
+        else:
+            # The line on which a finally: occurs in a try/finally
+            # is not directly represented in the AST. We infer it
+            # by taking the last line of the body and adding 1, which
+            # should be the line of finally:
+            if (isinstance(node.parent, nodes.TryFinally)
+                    and node in node.parent.finalbody):
+                prev_line = node.parent.body[0].tolineno + 1
+            else:
+                prev_line = node.parent.statement().fromlineno
+        line = node.fromlineno
+        assert line, node
+        if prev_line == line and self._visited_lines.get(line) != 2:
+            self._check_multi_statement_line(node, line)
+            return
+        if line in self._visited_lines:
+            return
+        try:
+            tolineno = node.blockstart_tolineno
+        except AttributeError:
+            tolineno = node.tolineno
+        assert tolineno, node
+        lines = []
+        for line in range(line, tolineno + 1):
+            self._visited_lines[line] = 1
+            try:
+                lines.append(self._lines[line].rstrip())
+            except KeyError:
+                lines.append('')
+
+    def _check_multi_statement_line(self, node, line):
+        """Check for lines containing multiple statements."""
+        # Do not warn about multiple nested context managers
+        # in with statements.
+        if isinstance(node, nodes.With):
+            return
+        # For try... except... finally..., the two nodes
+        # appear to be on the same line due to how the AST is built.
+        if (isinstance(node, nodes.TryExcept) and
+                isinstance(node.parent, nodes.TryFinally)):
+            return
+        if (isinstance(node.parent, nodes.If) and not node.parent.orelse
+                and self.config.single_line_if_stmt):
+            return
+        self.add_message('multiple-statements', node=node)
+        self._visited_lines[line] = 2
+
+    def check_lines(self, lines, i):
+        """check lines have less than a maximum number of characters
+        """
+        max_chars = self.config.max_line_length
+        ignore_long_line = self.config.ignore_long_lines
+
+        for line in lines.splitlines(True):
+            if not line.endswith('\n'):
+                self.add_message('missing-final-newline', line=i)
+            else:
+                stripped_line = line.rstrip()
+                if line[len(stripped_line):] not in ('\n', '\r\n'):
+                    self.add_message('trailing-whitespace', line=i)
+                # Don't count excess whitespace in the line length.
+                line = stripped_line
+            mobj = OPTION_RGX.search(line)
+            if mobj and mobj.group(1).split('=', 1)[0].strip() == 'disable':
+                line = line.split('#')[0].rstrip()
+
+            if len(line) > max_chars and not ignore_long_line.search(line):
+                self.add_message('line-too-long', line=i, args=(len(line), max_chars))
+            i += 1
+
+    def check_indent_level(self, string, expected, line_num):
+        """return the indent level of the string
+        """
+        indent = self.config.indent_string
+        if indent == '\\t': # \t is not interpreted in the configuration file
+            indent = '\t'
+        level = 0
+        unit_size = len(indent)
+        while string[:unit_size] == indent:
+            string = string[unit_size:]
+            level += 1
+        suppl = ''
+        while string and string[0] in ' \t':
+            if string[0] != indent[0]:
+                if string[0] == '\t':
+                    args = ('tab', 'space')
+                else:
+                    args = ('space', 'tab')
+                self.add_message('mixed-indentation', args=args, line=line_num)
+                return level
+            suppl += string[0]
+            string = string[1:]
+        if level != expected or suppl:
+            i_type = 'spaces'
+            if indent[0] == '\t':
+                i_type = 'tabs'
+            self.add_message('bad-indentation', line=line_num,
+                             args=(level * unit_size + len(suppl), i_type,
+                                   expected * unit_size))
+
+
+def register(linter):
+    """required method to auto register this checker """
+    linter.register_checker(FormatChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/imports.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/imports.py
new file mode 100644
index 0000000..1969eeb
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/imports.py
@@ -0,0 +1,413 @@
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""imports checkers for Python code"""
+
+import sys
+from collections import defaultdict
+
+import six
+from six.moves import map # pylint: disable=redefined-builtin
+
+from logilab.common.graph import get_cycles, DotBackend
+from logilab.common.ureports import VerbatimText, Paragraph
+
+import astroid
+from astroid import are_exclusive
+from astroid.modutils import get_module_part, is_standard_module
+
+from pylint.interfaces import IAstroidChecker
+from pylint.utils import EmptyReport
+from pylint.checkers import BaseChecker
+from pylint.checkers.utils import check_messages, is_import_error
+
+def _except_import_error(node):
+    """
+    Check if the try-except node has an ImportError handler.
+    Return True if an ImportError handler was infered, False otherwise.
+    """
+    if not isinstance(node, astroid.TryExcept):
+        return
+    return any(map(is_import_error, node.handlers))
+
+def get_first_import(node, context, name, base, level):
+    """return the node where [base.]<name> is imported or None if not found
+    """
+    fullname = '%s.%s' % (base, name) if base else name
+
+    first = None
+    found = False
+    for first in context.body:
+        if first is node:
+            continue
+        if first.scope() is node.scope() and first.fromlineno > node.fromlineno:
+            continue
+        if isinstance(first, astroid.Import):
+            if any(fullname == iname[0] for iname in first.names):
+                found = True
+                break
+        elif isinstance(first, astroid.From):
+            if level == first.level and any(
+                    fullname == '%s.%s' % (first.modname, iname[0])
+                    for iname in first.names):
+                found = True
+                break
+    if found and not are_exclusive(first, node):
+        return first
+
+# utilities to represents import dependencies as tree and dot graph ###########
+
+def make_tree_defs(mod_files_list):
+    """get a list of 2-uple (module, list_of_files_which_import_this_module),
+    it will return a dictionary to represent this as a tree
+    """
+    tree_defs = {}
+    for mod, files in mod_files_list:
+        node = (tree_defs, ())
+        for prefix in mod.split('.'):
+            node = node[0].setdefault(prefix, [{}, []])
+        node[1] += files
+    return tree_defs
+
+def repr_tree_defs(data, indent_str=None):
+    """return a string which represents imports as a tree"""
+    lines = []
+    nodes = data.items()
+    for i, (mod, (sub, files)) in enumerate(sorted(nodes, key=lambda x: x[0])):
+        if not files:
+            files = ''
+        else:
+            files = '(%s)' % ','.join(files)
+        if indent_str is None:
+            lines.append('%s %s' % (mod, files))
+            sub_indent_str = '  '
+        else:
+            lines.append(r'%s\-%s %s' % (indent_str, mod, files))
+            if i == len(nodes)-1:
+                sub_indent_str = '%s  ' % indent_str
+            else:
+                sub_indent_str = '%s| ' % indent_str
+        if sub:
+            lines.append(repr_tree_defs(sub, sub_indent_str))
+    return '\n'.join(lines)
+
+
+def dependencies_graph(filename, dep_info):
+    """write dependencies as a dot (graphviz) file
+    """
+    done = {}
+    printer = DotBackend(filename[:-4], rankdir='LR')
+    printer.emit('URL="." node[shape="box"]')
+    for modname, dependencies in sorted(six.iteritems(dep_info)):
+        done[modname] = 1
+        printer.emit_node(modname)
+        for modname in dependencies:
+            if modname not in done:
+                done[modname] = 1
+                printer.emit_node(modname)
+    for depmodname, dependencies in sorted(six.iteritems(dep_info)):
+        for modname in dependencies:
+            printer.emit_edge(modname, depmodname)
+    printer.generate(filename)
+
+
+def make_graph(filename, dep_info, sect, gtype):
+    """generate a dependencies graph and add some information about it in the
+    report's section
+    """
+    dependencies_graph(filename, dep_info)
+    sect.append(Paragraph('%simports graph has been written to %s'
+                          % (gtype, filename)))
+
+
+# the import checker itself ###################################################
+
+MSGS = {
+    'F0401': ('Unable to import %s',
+              'import-error',
+              'Used when pylint has been unable to import a module.'),
+    'R0401': ('Cyclic import (%s)',
+              'cyclic-import',
+              'Used when a cyclic import between two or more modules is \
+              detected.'),
+
+    'W0401': ('Wildcard import %s',
+              'wildcard-import',
+              'Used when `from module import *` is detected.'),
+    'W0402': ('Uses of a deprecated module %r',
+              'deprecated-module',
+              'Used a module marked as deprecated is imported.'),
+    'W0403': ('Relative import %r, should be %r',
+              'relative-import',
+              'Used when an import relative to the package directory is '
+              'detected.',
+              {'maxversion': (3, 0)}),
+    'W0404': ('Reimport %r (imported line %s)',
+              'reimported',
+              'Used when a module is reimported multiple times.'),
+    'W0406': ('Module import itself',
+              'import-self',
+              'Used when a module is importing itself.'),
+
+    'W0410': ('__future__ import is not the first non docstring statement',
+              'misplaced-future',
+              'Python 2.5 and greater require __future__ import to be the \
+              first non docstring statement in the module.',
+              {'maxversion': (3, 0)}),
+    }
+
+class ImportsChecker(BaseChecker):
+    """checks for
+    * external modules dependencies
+    * relative / wildcard imports
+    * cyclic imports
+    * uses of deprecated modules
+    """
+
+    __implements__ = IAstroidChecker
+
+    name = 'imports'
+    msgs = MSGS
+    priority = -2
+
+    if sys.version_info < (3,):
+        deprecated_modules = ('regsub', 'TERMIOS', 'Bastion', 'rexec')
+    else:
+        deprecated_modules = ('stringprep', 'optparse')
+    options = (('deprecated-modules',
+                {'default' : deprecated_modules,
+                 'type' : 'csv',
+                 'metavar' : '<modules>',
+                 'help' : 'Deprecated modules which should not be used, \
+separated by a comma'}
+               ),
+               ('import-graph',
+                {'default' : '',
+                 'type' : 'string',
+                 'metavar' : '<file.dot>',
+                 'help' : 'Create a graph of every (i.e. internal and \
+external) dependencies in the given file (report RP0402 must not be disabled)'}
+               ),
+               ('ext-import-graph',
+                {'default' : '',
+                 'type' : 'string',
+                 'metavar' : '<file.dot>',
+                 'help' : 'Create a graph of external dependencies in the \
+given file (report RP0402 must not be disabled)'}
+               ),
+               ('int-import-graph',
+                {'default' : '',
+                 'type' : 'string',
+                 'metavar' : '<file.dot>',
+                 'help' : 'Create a graph of internal dependencies in the \
+given file (report RP0402 must not be disabled)'}
+               ),
+              )
+
+    def __init__(self, linter=None):
+        BaseChecker.__init__(self, linter)
+        self.stats = None
+        self.import_graph = None
+        self.__int_dep_info = self.__ext_dep_info = None
+        self.reports = (('RP0401', 'External dependencies',
+                         self.report_external_dependencies),
+                        ('RP0402', 'Modules dependencies graph',
+                         self.report_dependencies_graph),
+                       )
+
+    def open(self):
+        """called before visiting project (i.e set of modules)"""
+        self.linter.add_stats(dependencies={})
+        self.linter.add_stats(cycles=[])
+        self.stats = self.linter.stats
+        self.import_graph = defaultdict(set)
+
+    def close(self):
+        """called before visiting project (i.e set of modules)"""
+        # don't try to compute cycles if the associated message is disabled
+        if self.linter.is_message_enabled('cyclic-import'):
+            vertices = list(self.import_graph)
+            for cycle in get_cycles(self.import_graph, vertices=vertices):
+                self.add_message('cyclic-import', args=' -> '.join(cycle))
+
+    def visit_import(self, node):
+        """triggered when an import statement is seen"""
+        modnode = node.root()
+        for name, _ in node.names:
+            importedmodnode = self.get_imported_module(node, name)
+            if importedmodnode is None:
+                continue
+            self._check_relative_import(modnode, node, importedmodnode, name)
+            self._add_imported_module(node, importedmodnode.name)
+            self._check_deprecated_module(node, name)
+            self._check_reimport(node, name)
+
+    # TODO This appears to be the list of all messages of the checker...
+    # @check_messages('W0410', 'W0401', 'W0403', 'W0402', 'W0404', 'W0406', 'F0401')
+    @check_messages(*(MSGS.keys()))
+    def visit_from(self, node):
+        """triggered when a from statement is seen"""
+        basename = node.modname
+        if basename == '__future__':
+            # check if this is the first non-docstring statement in the module
+            prev = node.previous_sibling()
+            if prev:
+                # consecutive future statements are possible
+                if not (isinstance(prev, astroid.From)
+                        and prev.modname == '__future__'):
+                    self.add_message('misplaced-future', node=node)
+            return
+        for name, _ in node.names:
+            if name == '*':
+                self.add_message('wildcard-import', args=basename, node=node)
+        modnode = node.root()
+        importedmodnode = self.get_imported_module(node, basename)
+        if importedmodnode is None:
+            return
+        self._check_relative_import(modnode, node, importedmodnode, basename)
+        self._check_deprecated_module(node, basename)
+        for name, _ in node.names:
+            if name != '*':
+                self._add_imported_module(node, '%s.%s' % (importedmodnode.name, name))
+                self._check_reimport(node, name, basename, node.level)
+
+    def get_imported_module(self, importnode, modname):
+        try:
+            return importnode.do_import_module(modname)
+        except astroid.InferenceError as ex:
+            if str(ex) != modname:
+                args = '%r (%s)' % (modname, ex)
+            else:
+                args = repr(modname)
+            if not _except_import_error(importnode.parent):
+                self.add_message("import-error", args=args, node=importnode)
+
+    def _check_relative_import(self, modnode, importnode, importedmodnode,
+                               importedasname):
+        """check relative import. node is either an Import or From node, modname
+        the imported module name.
+        """
+        if not self.linter.is_message_enabled('relative-import'):
+            return
+        if importedmodnode.file is None:
+            return False # built-in module
+        if modnode is importedmodnode:
+            return False # module importing itself
+        if modnode.absolute_import_activated() or getattr(importnode, 'level', None):
+            return False
+        if importedmodnode.name != importedasname:
+            # this must be a relative import...
+            self.add_message('relative-import',
+                             args=(importedasname, importedmodnode.name),
+                             node=importnode)
+
+    def _add_imported_module(self, node, importedmodname):
+        """notify an imported module, used to analyze dependencies"""
+        try:
+            importedmodname = get_module_part(importedmodname)
+        except ImportError:
+            pass
+        context_name = node.root().name
+        if context_name == importedmodname:
+            # module importing itself !
+            self.add_message('import-self', node=node)
+        elif not is_standard_module(importedmodname):
+            # handle dependencies
+            importedmodnames = self.stats['dependencies'].setdefault(
+                importedmodname, set())
+            if not context_name in importedmodnames:
+                importedmodnames.add(context_name)
+            # update import graph
+            mgraph = self.import_graph[context_name]
+            if importedmodname not in mgraph:
+                mgraph.add(importedmodname)
+
+    def _check_deprecated_module(self, node, mod_path):
+        """check if the module is deprecated"""
+        for mod_name in self.config.deprecated_modules:
+            if mod_path == mod_name or mod_path.startswith(mod_name + '.'):
+                self.add_message('deprecated-module', node=node, args=mod_path)
+
+    def _check_reimport(self, node, name, basename=None, level=None):
+        """check if the import is necessary (i.e. not already done)"""
+        if not self.linter.is_message_enabled('reimported'):
+            return
+        frame = node.frame()
+        root = node.root()
+        contexts = [(frame, level)]
+        if root is not frame:
+            contexts.append((root, None))
+        for context, level in contexts:
+            first = get_first_import(node, context, name, basename, level)
+            if first is not None:
+                self.add_message('reimported', node=node,
+                                 args=(name, first.fromlineno))
+
+
+    def report_external_dependencies(self, sect, _, dummy):
+        """return a verbatim layout for displaying dependencies"""
+        dep_info = make_tree_defs(six.iteritems(self._external_dependencies_info()))
+        if not dep_info:
+            raise EmptyReport()
+        tree_str = repr_tree_defs(dep_info)
+        sect.append(VerbatimText(tree_str))
+
+    def report_dependencies_graph(self, sect, _, dummy):
+        """write dependencies as a dot (graphviz) file"""
+        dep_info = self.stats['dependencies']
+        if not dep_info or not (self.config.import_graph
+                                or self.config.ext_import_graph
+                                or self.config.int_import_graph):
+            raise EmptyReport()
+        filename = self.config.import_graph
+        if filename:
+            make_graph(filename, dep_info, sect, '')
+        filename = self.config.ext_import_graph
+        if filename:
+            make_graph(filename, self._external_dependencies_info(),
+                       sect, 'external ')
+        filename = self.config.int_import_graph
+        if filename:
+            make_graph(filename, self._internal_dependencies_info(),
+                       sect, 'internal ')
+
+    def _external_dependencies_info(self):
+        """return cached external dependencies information or build and
+        cache them
+        """
+        if self.__ext_dep_info is None:
+            package = self.linter.current_name
+            self.__ext_dep_info = result = {}
+            for importee, importers in six.iteritems(self.stats['dependencies']):
+                if not importee.startswith(package):
+                    result[importee] = importers
+        return self.__ext_dep_info
+
+    def _internal_dependencies_info(self):
+        """return cached internal dependencies information or build and
+        cache them
+        """
+        if self.__int_dep_info is None:
+            package = self.linter.current_name
+            self.__int_dep_info = result = {}
+            for importee, importers in six.iteritems(self.stats['dependencies']):
+                if importee.startswith(package):
+                    result[importee] = importers
+        return self.__int_dep_info
+
+
+def register(linter):
+    """required method to auto register this checker """
+    linter.register_checker(ImportsChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/logging.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/logging.py
new file mode 100644
index 0000000..897c1c7
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/logging.py
@@ -0,0 +1,256 @@
+# Copyright (c) 2009-2010 Google, Inc.
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""checker for use of Python logging
+"""
+
+import astroid
+from pylint import checkers
+from pylint import interfaces
+from pylint.checkers import utils
+from pylint.checkers.utils import check_messages
+
+import six
+
+
+MSGS = {
+    'W1201': ('Specify string format arguments as logging function parameters',
+              'logging-not-lazy',
+              'Used when a logging statement has a call form of '
+              '"logging.<logging method>(format_string % (format_args...))". '
+              'Such calls should leave string interpolation to the logging '
+              'method itself and be written '
+              '"logging.<logging method>(format_string, format_args...)" '
+              'so that the program may avoid incurring the cost of the '
+              'interpolation in those cases in which no message will be '
+              'logged. For more, see '
+              'http://www.python.org/dev/peps/pep-0282/.'),
+    'W1202': ('Use % formatting in logging functions but pass the % '
+              'parameters as arguments',
+              'logging-format-interpolation',
+              'Used when a logging statement has a call form of '
+              '"logging.<logging method>(format_string.format(format_args...))"'
+              '. Such calls should use % formatting instead, but leave '
+              'interpolation to the logging function by passing the parameters '
+              'as arguments.'),
+    'E1200': ('Unsupported logging format character %r (%#02x) at index %d',
+              'logging-unsupported-format',
+              'Used when an unsupported format character is used in a logging\
+              statement format string.'),
+    'E1201': ('Logging format string ends in middle of conversion specifier',
+              'logging-format-truncated',
+              'Used when a logging statement format string terminates before\
+              the end of a conversion specifier.'),
+    'E1205': ('Too many arguments for logging format string',
+              'logging-too-many-args',
+              'Used when a logging format string is given too few arguments.'),
+    'E1206': ('Not enough arguments for logging format string',
+              'logging-too-few-args',
+              'Used when a logging format string is given too many arguments'),
+    }
+
+
+CHECKED_CONVENIENCE_FUNCTIONS = set([
+    'critical', 'debug', 'error', 'exception', 'fatal', 'info', 'warn',
+    'warning'])
+
+def is_method_call(callfunc_node, types=(), methods=()):
+    """Determines if a CallFunc node represents a method call.
+
+    Args:
+      callfunc_node: The CallFunc AST node to check.
+      types: Optional sequence of caller type names to restrict check.
+      methods: Optional sequence of method names to restrict check.
+
+    Returns:
+      True, if the node represents a method call for the given type and
+      method names, False otherwise.
+    """
+    if not isinstance(callfunc_node, astroid.CallFunc):
+        return False
+    func = utils.safe_infer(callfunc_node.func)
+    return (isinstance(func, astroid.BoundMethod)
+            and isinstance(func.bound, astroid.Instance)
+            and (func.bound.name in types if types else True)
+            and (func.name in methods if methods else True))
+
+
+
+class LoggingChecker(checkers.BaseChecker):
+    """Checks use of the logging module."""
+
+    __implements__ = interfaces.IAstroidChecker
+    name = 'logging'
+    msgs = MSGS
+
+    options = (('logging-modules',
+                {'default': ('logging',),
+                 'type': 'csv',
+                 'metavar': '<comma separated list>',
+                 'help': 'Logging modules to check that the string format '
+                         'arguments are in logging function parameter format'}
+               ),
+              )
+
+    def visit_module(self, node): # pylint: disable=unused-argument
+        """Clears any state left in this checker from last module checked."""
+        # The code being checked can just as easily "import logging as foo",
+        # so it is necessary to process the imports and store in this field
+        # what name the logging module is actually given.
+        self._logging_names = set()
+        logging_mods = self.config.logging_modules
+
+        self._logging_modules = set(logging_mods)
+        self._from_imports = {}
+        for logging_mod in logging_mods:
+            parts = logging_mod.rsplit('.', 1)
+            if len(parts) > 1:
+                self._from_imports[parts[0]] = parts[1]
+
+    def visit_from(self, node):
+        """Checks to see if a module uses a non-Python logging module."""
+        try:
+            logging_name = self._from_imports[node.modname]
+            for module, as_name in node.names:
+                if module == logging_name:
+                    self._logging_names.add(as_name or module)
+        except KeyError:
+            pass
+
+    def visit_import(self, node):
+        """Checks to see if this module uses Python's built-in logging."""
+        for module, as_name in node.names:
+            if module in self._logging_modules:
+                self._logging_names.add(as_name or module)
+
+    @check_messages(*(MSGS.keys()))
+    def visit_callfunc(self, node):
+        """Checks calls to logging methods."""
+        def is_logging_name():
+            return (isinstance(node.func, astroid.Getattr) and
+                    isinstance(node.func.expr, astroid.Name) and
+                    node.func.expr.name in self._logging_names)
+
+        def is_logger_class():
+            try:
+                for inferred in node.func.infer():
+                    if isinstance(inferred, astroid.BoundMethod):
+                        parent = inferred._proxied.parent
+                        if (isinstance(parent, astroid.Class) and
+                                (parent.qname() == 'logging.Logger' or
+                                 any(ancestor.qname() == 'logging.Logger'
+                                     for ancestor in parent.ancestors()))):
+                            return True, inferred._proxied.name
+            except astroid.exceptions.InferenceError:
+                pass
+            return False, None
+
+        if is_logging_name():
+            name = node.func.attrname
+        else:
+            result, name = is_logger_class()
+            if not result:
+                return
+        self._check_log_method(node, name)
+
+    def _check_log_method(self, node, name):
+        """Checks calls to logging.log(level, format, *format_args)."""
+        if name == 'log':
+            if node.starargs or node.kwargs or len(node.args) < 2:
+                # Either a malformed call, star args, or double-star args. Beyond
+                # the scope of this checker.
+                return
+            format_pos = 1
+        elif name in CHECKED_CONVENIENCE_FUNCTIONS:
+            if node.starargs or node.kwargs or not node.args:
+                # Either no args, star args, or double-star args. Beyond the
+                # scope of this checker.
+                return
+            format_pos = 0
+        else:
+            return
+
+        if isinstance(node.args[format_pos], astroid.BinOp) and node.args[format_pos].op == '%':
+            self.add_message('logging-not-lazy', node=node)
+        elif isinstance(node.args[format_pos], astroid.CallFunc):
+            self._check_call_func(node.args[format_pos])
+        elif isinstance(node.args[format_pos], astroid.Const):
+            self._check_format_string(node, format_pos)
+
+    def _check_call_func(self, callfunc_node):
+        """Checks that function call is not format_string.format().
+
+        Args:
+          callfunc_node: CallFunc AST node to be checked.
+        """
+        if is_method_call(callfunc_node, ('str', 'unicode'), ('format',)):
+            self.add_message('logging-format-interpolation', node=callfunc_node)
+
+    def _check_format_string(self, node, format_arg):
+        """Checks that format string tokens match the supplied arguments.
+
+        Args:
+          node: AST node to be checked.
+          format_arg: Index of the format string in the node arguments.
+        """
+        num_args = _count_supplied_tokens(node.args[format_arg + 1:])
+        if not num_args:
+            # If no args were supplied, then all format strings are valid -
+            # don't check any further.
+            return
+        format_string = node.args[format_arg].value
+        if not isinstance(format_string, six.string_types):
+            # If the log format is constant non-string (e.g. logging.debug(5)),
+            # ensure there are no arguments.
+            required_num_args = 0
+        else:
+            try:
+                keyword_args, required_num_args = \
+                    utils.parse_format_string(format_string)
+                if keyword_args:
+                    # Keyword checking on logging strings is complicated by
+                    # special keywords - out of scope.
+                    return
+            except utils.UnsupportedFormatCharacter as ex:
+                char = format_string[ex.index]
+                self.add_message('logging-unsupported-format', node=node,
+                                 args=(char, ord(char), ex.index))
+                return
+            except utils.IncompleteFormatString:
+                self.add_message('logging-format-truncated', node=node)
+                return
+        if num_args > required_num_args:
+            self.add_message('logging-too-many-args', node=node)
+        elif num_args < required_num_args:
+            self.add_message('logging-too-few-args', node=node)
+
+
+def _count_supplied_tokens(args):
+    """Counts the number of tokens in an args list.
+
+    The Python log functions allow for special keyword arguments: func,
+    exc_info and extra. To handle these cases correctly, we only count
+    arguments that aren't keywords.
+
+    Args:
+      args: List of AST nodes that are arguments for a log format string.
+
+    Returns:
+      Number of AST nodes that aren't keywords.
+    """
+    return sum(1 for arg in args if not isinstance(arg, astroid.Keyword))
+
+
+def register(linter):
+    """Required method to auto-register this checker."""
+    linter.register_checker(LoggingChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/misc.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/misc.py
new file mode 100644
index 0000000..7fbe70b
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/misc.py
@@ -0,0 +1,104 @@
+# pylint: disable=W0511
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+""" Copyright (c) 2000-2010 LOGILAB S.A. (Paris, FRANCE).
+ http://www.logilab.fr/ -- mailto:contact@logilab.fr
+
+Check source code is ascii only or has an encoding declaration (PEP 263)
+"""
+
+import re
+
+from pylint.interfaces import IRawChecker
+from pylint.checkers import BaseChecker
+import six
+
+
+MSGS = {
+    'W0511': ('%s',
+              'fixme',
+              'Used when a warning note as FIXME or XXX is detected.'),
+    'W0512': ('Cannot decode using encoding "%s", unexpected byte at position %d',
+              'invalid-encoded-data',
+              'Used when a source line cannot be decoded using the specified '
+              'source file encoding.',
+              {'maxversion': (3, 0)}),
+}
+
+
+class EncodingChecker(BaseChecker):
+
+    """checks for:
+    * warning notes in the code like FIXME, XXX
+    * encoding issues.
+    """
+    __implements__ = IRawChecker
+
+    # configuration section name
+    name = 'miscellaneous'
+    msgs = MSGS
+
+    options = (('notes',
+                {'type': 'csv', 'metavar': '<comma separated values>',
+                 'default': ('FIXME', 'XXX', 'TODO'),
+                 'help': ('List of note tags to take in consideration, '
+                          'separated by a comma.')}),)
+
+    def _check_note(self, notes, lineno, line):
+        # First, simply check if the notes are in the line at all. This is an
+        # optimisation to prevent using the regular expression on every line,
+        # but rather only on lines which may actually contain one of the notes.
+        # This prevents a pathological problem with lines that are hundreds
+        # of thousands of characters long.
+        for note in self.config.notes:
+            if note in line:
+                break
+        else:
+            return
+
+        match = notes.search(line)
+        if not match:
+            return
+        self.add_message('fixme', args=line[match.start(1):-1], line=lineno)
+
+    def _check_encoding(self, lineno, line, file_encoding):
+        try:
+            return six.text_type(line, file_encoding)
+        except UnicodeDecodeError as ex:
+            self.add_message('invalid-encoded-data', line=lineno,
+                             args=(file_encoding, ex.args[2]))
+
+    def process_module(self, module):
+        """inspect the source file to find encoding problem or fixmes like
+        notes
+        """
+        if self.config.notes:
+            notes = re.compile(
+                r'.*?#\s*(%s)(:*\s*.+)' % "|".join(self.config.notes))
+        else:
+            notes = None
+        if module.file_encoding:
+            encoding = module.file_encoding
+        else:
+            encoding = 'ascii'
+
+        with module.stream() as stream:
+            for lineno, line in enumerate(stream):
+                line = self._check_encoding(lineno + 1, line, encoding)
+                if line is not None and notes:
+                    self._check_note(notes, lineno + 1, line)
+
+
+def register(linter):
+    """required method to auto register this checker"""
+    linter.register_checker(EncodingChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/newstyle.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/newstyle.py
new file mode 100644
index 0000000..f74e7f1
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/newstyle.py
@@ -0,0 +1,172 @@
+# Copyright (c) 2005-2014 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""check for new / old style related problems
+"""
+import sys
+
+import astroid
+
+from pylint.interfaces import IAstroidChecker, INFERENCE, INFERENCE_FAILURE, HIGH
+from pylint.checkers import BaseChecker
+from pylint.checkers.utils import (
+    check_messages,
+    has_known_bases,
+    node_frame_class,
+)
+
+MSGS = {
+    'E1001': ('Use of __slots__ on an old style class',
+              'slots-on-old-class',
+              'Used when an old style class uses the __slots__ attribute.',
+              {'maxversion': (3, 0)}),
+    'E1002': ('Use of super on an old style class',
+              'super-on-old-class',
+              'Used when an old style class uses the super builtin.',
+              {'maxversion': (3, 0)}),
+    'E1003': ('Bad first argument %r given to super()',
+              'bad-super-call',
+              'Used when another argument than the current class is given as \
+              first argument of the super builtin.'),
+    'E1004': ('Missing argument to super()',
+              'missing-super-argument',
+              'Used when the super builtin didn\'t receive an \
+               argument.',
+              {'maxversion': (3, 0)}),
+    'W1001': ('Use of "property" on an old style class',
+              'property-on-old-class',
+              'Used when Pylint detect the use of the builtin "property" \
+              on an old style class while this is relying on new style \
+              classes features.',
+              {'maxversion': (3, 0)}),
+    'C1001': ('Old-style class defined.',
+              'old-style-class',
+              'Used when a class is defined that does not inherit from another'
+              'class and does not inherit explicitly from "object".',
+              {'maxversion': (3, 0)})
+    }
+
+
+class NewStyleConflictChecker(BaseChecker):
+    """checks for usage of new style capabilities on old style classes and
+    other new/old styles conflicts problems
+    * use of property, __slots__, super
+    * "super" usage
+    """
+
+    __implements__ = (IAstroidChecker,)
+
+    # configuration section name
+    name = 'newstyle'
+    # messages
+    msgs = MSGS
+    priority = -2
+    # configuration options
+    options = ()
+
+    @check_messages('slots-on-old-class', 'old-style-class')
+    def visit_class(self, node):
+        """ Check __slots__ in old style classes and old
+        style class definition.
+        """
+        if '__slots__' in node and not node.newstyle:
+            confidence = (INFERENCE if has_known_bases(node)
+                          else INFERENCE_FAILURE)
+            self.add_message('slots-on-old-class', node=node,
+                             confidence=confidence)
+        # The node type could be class, exception, metaclass, or
+        # interface.  Presumably, the non-class-type nodes would always
+        # have an explicit base class anyway.
+        if not node.bases and node.type == 'class' and not node.metaclass():
+            # We use confidence HIGH here because this message should only ever
+            # be emitted for classes at the root of the inheritance hierarchyself.
+            self.add_message('old-style-class', node=node, confidence=HIGH)
+
+    @check_messages('property-on-old-class')
+    def visit_callfunc(self, node):
+        """check property usage"""
+        parent = node.parent.frame()
+        if (isinstance(parent, astroid.Class) and
+                not parent.newstyle and
+                isinstance(node.func, astroid.Name)):
+            confidence = (INFERENCE if has_known_bases(parent)
+                          else INFERENCE_FAILURE)
+            name = node.func.name
+            if name == 'property':
+                self.add_message('property-on-old-class', node=node,
+                                 confidence=confidence)
+
+    @check_messages('super-on-old-class', 'bad-super-call', 'missing-super-argument')
+    def visit_function(self, node):
+        """check use of super"""
+        # ignore actual functions or method within a new style class
+        if not node.is_method():
+            return
+        klass = node.parent.frame()
+        for stmt in node.nodes_of_class(astroid.CallFunc):
+            if node_frame_class(stmt) != node_frame_class(node):
+                # Don't look down in other scopes.
+                continue
+            expr = stmt.func
+            if not isinstance(expr, astroid.Getattr):
+                continue
+            call = expr.expr
+            # skip the test if using super
+            if isinstance(call, astroid.CallFunc) and \
+               isinstance(call.func, astroid.Name) and \
+               call.func.name == 'super':
+                confidence = (INFERENCE if has_known_bases(klass)
+                              else INFERENCE_FAILURE)
+                if not klass.newstyle:
+                    # super should not be used on an old style class
+                    self.add_message('super-on-old-class', node=node,
+                                     confidence=confidence)
+                else:
+                    # super first arg should be the class
+                    if not call.args and sys.version_info[0] == 3:
+                        # unless Python 3
+                        continue
+
+                    try:
+                        supcls = (call.args and next(call.args[0].infer())
+                                  or None)
+                    except astroid.InferenceError:
+                        continue
+
+                    if supcls is None:
+                        self.add_message('missing-super-argument', node=call,
+                                         confidence=confidence)
+                        continue
+
+                    if klass is not supcls:
+                        name = None
+                        # if supcls is not YES, then supcls was infered
+                        # and use its name. Otherwise, try to look
+                        # for call.args[0].name
+                        if supcls is not astroid.YES:
+                            name = supcls.name
+                        else:
+                            if hasattr(call.args[0], 'name'):
+                                name = call.args[0].name
+                        if name is not None:
+                            self.add_message('bad-super-call',
+                                             node=call,
+                                             args=(name, ),
+                                             confidence=confidence)
+
+
+def register(linter):
+    """required method to auto register this checker """
+    linter.register_checker(NewStyleConflictChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/python3.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/python3.py
new file mode 100644
index 0000000..837cbef
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/python3.py
@@ -0,0 +1,581 @@
+# Copyright 2014 Google Inc.
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""Check Python 2 code for Python 2/3 source-compatible issues."""
+from __future__ import absolute_import, print_function
+
+import re
+import tokenize
+
+import astroid
+from astroid import bases
+from pylint import checkers, interfaces
+from pylint.utils import WarningScope
+from pylint.checkers import utils
+
+
+_ZERO = re.compile("^0+$")
+
+def _is_old_octal(literal):
+    if _ZERO.match(literal):
+        return False
+    if re.match('0\d+', literal):
+        try:
+            int(literal, 8)
+        except ValueError:
+            return False
+        return True
+
+def _check_dict_node(node):
+    inferred_types = set()
+    try:
+        inferred = node.infer()
+        for inferred_node in inferred:
+            inferred_types.add(inferred_node)
+    except (astroid.InferenceError, astroid.UnresolvableName):
+        pass
+    return (not inferred_types
+            or any(isinstance(x, astroid.Dict) for x in inferred_types))
+
+def _is_builtin(node):
+    return getattr(node, 'name', None) in ('__builtin__', 'builtins')
+
+_accepts_iterator = {'iter', 'list', 'tuple', 'sorted', 'set', 'sum', 'any',
+                     'all', 'enumerate', 'dict'}
+
+def _in_iterating_context(node):
+    """Check if the node is being used as an iterator.
+
+    Definition is taken from lib2to3.fixer_util.in_special_context().
+    """
+    parent = node.parent
+    # Since a call can't be the loop variant we only need to know if the node's
+    # parent is a 'for' loop to know it's being used as the iterator for the
+    # loop.
+    if isinstance(parent, astroid.For):
+        return True
+    # Need to make sure the use of the node is in the iterator part of the
+    # comprehension.
+    elif isinstance(parent, astroid.Comprehension):
+        if parent.iter == node:
+            return True
+    # Various built-ins can take in an iterable or list and lead to the same
+    # value.
+    elif isinstance(parent, astroid.CallFunc):
+        if isinstance(parent.func, astroid.Name):
+            parent_scope = parent.func.lookup(parent.func.name)[0]
+            if _is_builtin(parent_scope) and parent.func.name in _accepts_iterator:
+                return True
+        elif isinstance(parent.func, astroid.Getattr):
+            if parent.func.attrname == 'join':
+                return True
+    # If the call is in an unpacking, there's no need to warn,
+    # since it can be considered iterating.
+    elif (isinstance(parent, astroid.Assign) and
+          isinstance(parent.targets[0], (astroid.List, astroid.Tuple))):
+        if len(parent.targets[0].elts) > 1:
+            return True
+    return False
+
+
+class Python3Checker(checkers.BaseChecker):
+
+    __implements__ = interfaces.IAstroidChecker
+    enabled = False
+    name = 'python3'
+
+    msgs = {
+        # Errors for what will syntactically break in Python 3, warnings for
+        # everything else.
+        'E1601': ('print statement used',
+                  'print-statement',
+                  'Used when a print statement is used '
+                  '(`print` is a function in Python 3)',
+                  {'maxversion': (3, 0)}),
+        'E1602': ('Parameter unpacking specified',
+                  'parameter-unpacking',
+                  'Used when parameter unpacking is specified for a function'
+                  "(Python 3 doesn't allow it)",
+                  {'maxversion': (3, 0)}),
+        'E1603': ('Implicit unpacking of exceptions is not supported '
+                  'in Python 3',
+                  'unpacking-in-except',
+                  'Python3 will not allow implicit unpacking of '
+                  'exceptions in except clauses. '
+                  'See http://www.python.org/dev/peps/pep-3110/',
+                  {'maxversion': (3, 0),
+                   'old_names': [('W0712', 'unpacking-in-except')]}),
+        'E1604': ('Use raise ErrorClass(args) instead of '
+                  'raise ErrorClass, args.',
+                  'old-raise-syntax',
+                  "Used when the alternate raise syntax "
+                  "'raise foo, bar' is used "
+                  "instead of 'raise foo(bar)'.",
+                  {'maxversion': (3, 0),
+                   'old_names': [('W0121', 'old-raise-syntax')]}),
+        'E1605': ('Use of the `` operator',
+                  'backtick',
+                  'Used when the deprecated "``" (backtick) operator is used '
+                  'instead  of the str() function.',
+                  {'scope': WarningScope.NODE,
+                   'maxversion': (3, 0),
+                   'old_names': [('W0333', 'backtick')]}),
+        'W1601': ('apply built-in referenced',
+                  'apply-builtin',
+                  'Used when the apply built-in function is referenced '
+                  '(missing from Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1602': ('basestring built-in referenced',
+                  'basestring-builtin',
+                  'Used when the basestring built-in function is referenced '
+                  '(missing from Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1603': ('buffer built-in referenced',
+                  'buffer-builtin',
+                  'Used when the buffer built-in function is referenced '
+                  '(missing from Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1604': ('cmp built-in referenced',
+                  'cmp-builtin',
+                  'Used when the cmp built-in function is referenced '
+                  '(missing from Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1605': ('coerce built-in referenced',
+                  'coerce-builtin',
+                  'Used when the coerce built-in function is referenced '
+                  '(missing from Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1606': ('execfile built-in referenced',
+                  'execfile-builtin',
+                  'Used when the execfile built-in function is referenced '
+                  '(missing from Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1607': ('file built-in referenced',
+                  'file-builtin',
+                  'Used when the file built-in function is referenced '
+                  '(missing from Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1608': ('long built-in referenced',
+                  'long-builtin',
+                  'Used when the long built-in function is referenced '
+                  '(missing from Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1609': ('raw_input built-in referenced',
+                  'raw_input-builtin',
+                  'Used when the raw_input built-in function is referenced '
+                  '(missing from Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1610': ('reduce built-in referenced',
+                  'reduce-builtin',
+                  'Used when the reduce built-in function is referenced '
+                  '(missing from Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1611': ('StandardError built-in referenced',
+                  'standarderror-builtin',
+                  'Used when the StandardError built-in function is referenced '
+                  '(missing from Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1612': ('unicode built-in referenced',
+                  'unicode-builtin',
+                  'Used when the unicode built-in function is referenced '
+                  '(missing from Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1613': ('xrange built-in referenced',
+                  'xrange-builtin',
+                  'Used when the xrange built-in function is referenced '
+                  '(missing from Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1614': ('__coerce__ method defined',
+                  'coerce-method',
+                  'Used when a __coerce__ method is defined '
+                  '(method is not used by Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1615': ('__delslice__ method defined',
+                  'delslice-method',
+                  'Used when a __delslice__ method is defined '
+                  '(method is not used by Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1616': ('__getslice__ method defined',
+                  'getslice-method',
+                  'Used when a __getslice__ method is defined '
+                  '(method is not used by Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1617': ('__setslice__ method defined',
+                  'setslice-method',
+                  'Used when a __setslice__ method is defined '
+                  '(method is not used by Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1618': ('import missing `from __future__ import absolute_import`',
+                  'no-absolute-import',
+                  'Used when an import is not accompanied by '
+                  '``from __future__ import absolute_import`` '
+                  '(default behaviour in Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1619': ('division w/o __future__ statement',
+                  'old-division',
+                  'Used for non-floor division w/o a float literal or '
+                  '``from __future__ import division`` '
+                  '(Python 3 returns a float for int division unconditionally)',
+                  {'maxversion': (3, 0)}),
+        'W1620': ('Calling a dict.iter*() method',
+                  'dict-iter-method',
+                  'Used for calls to dict.iterkeys(), itervalues() or iteritems() '
+                  '(Python 3 lacks these methods)',
+                  {'maxversion': (3, 0)}),
+        'W1621': ('Calling a dict.view*() method',
+                  'dict-view-method',
+                  'Used for calls to dict.viewkeys(), viewvalues() or viewitems() '
+                  '(Python 3 lacks these methods)',
+                  {'maxversion': (3, 0)}),
+        'W1622': ('Called a next() method on an object',
+                  'next-method-called',
+                  "Used when an object's next() method is called "
+                  '(Python 3 uses the next() built-in function)',
+                  {'maxversion': (3, 0)}),
+        'W1623': ("Assigning to a class' __metaclass__ attribute",
+                  'metaclass-assignment',
+                  "Used when a metaclass is specified by assigning to __metaclass__ "
+                  '(Python 3 specifies the metaclass as a class statement argument)',
+                  {'maxversion': (3, 0)}),
+        'W1624': ('Indexing exceptions will not work on Python 3',
+                  'indexing-exception',
+                  'Indexing exceptions will not work on Python 3. Use '
+                  '`exception.args[index]` instead.',
+                  {'maxversion': (3, 0),
+                   'old_names': [('W0713', 'indexing-exception')]}),
+        'W1625': ('Raising a string exception',
+                  'raising-string',
+                  'Used when a string exception is raised. This will not '
+                  'work on Python 3.',
+                  {'maxversion': (3, 0),
+                   'old_names': [('W0701', 'raising-string')]}),
+        'W1626': ('reload built-in referenced',
+                  'reload-builtin',
+                  'Used when the reload built-in function is referenced '
+                  '(missing from Python 3). You can use instead imp.reload '
+                  'or importlib.reload.',
+                  {'maxversion': (3, 0)}),
+        'W1627': ('__oct__ method defined',
+                  'oct-method',
+                  'Used when a __oct__ method is defined '
+                  '(method is not used by Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1628': ('__hex__ method defined',
+                  'hex-method',
+                  'Used when a __hex__ method is defined '
+                  '(method is not used by Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1629': ('__nonzero__ method defined',
+                  'nonzero-method',
+                  'Used when a __nonzero__ method is defined '
+                  '(method is not used by Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1630': ('__cmp__ method defined',
+                  'cmp-method',
+                  'Used when a __cmp__ method is defined '
+                  '(method is not used by Python 3)',
+                  {'maxversion': (3, 0)}),
+        # 'W1631': replaced by W1636
+        'W1632': ('input built-in referenced',
+                  'input-builtin',
+                  'Used when the input built-in is referenced '
+                  '(backwards-incompatible semantics in Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1633': ('round built-in referenced',
+                  'round-builtin',
+                  'Used when the round built-in is referenced '
+                  '(backwards-incompatible semantics in Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1634': ('intern built-in referenced',
+                  'intern-builtin',
+                  'Used when the intern built-in is referenced '
+                  '(Moved to sys.intern in Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1635': ('unichr built-in referenced',
+                  'unichr-builtin',
+                  'Used when the unichr built-in is referenced '
+                  '(Use chr in Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1636': ('map built-in referenced when not iterating',
+                  'map-builtin-not-iterating',
+                  'Used when the map built-in is referenced in a non-iterating '
+                  'context (returns an iterator in Python 3)',
+                  {'maxversion': (3, 0),
+                   'old_names': [('W1631', 'implicit-map-evaluation')]}),
+        'W1637': ('zip built-in referenced when not iterating',
+                  'zip-builtin-not-iterating',
+                  'Used when the zip built-in is referenced in a non-iterating '
+                  'context (returns an iterator in Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1638': ('range built-in referenced when not iterating',
+                  'range-builtin-not-iterating',
+                  'Used when the range built-in is referenced in a non-iterating '
+                  'context (returns an iterator in Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1639': ('filter built-in referenced when not iterating',
+                  'filter-builtin-not-iterating',
+                  'Used when the filter built-in is referenced in a non-iterating '
+                  'context (returns an iterator in Python 3)',
+                  {'maxversion': (3, 0)}),
+        'W1640': ('Using the cmp argument for list.sort / sorted',
+                  'using-cmp-argument',
+                  'Using the cmp argument for list.sort or the sorted '
+                  'builtin should be avoided, since it was removed in '
+                  'Python 3. Using either `key` or `functools.cmp_to_key` '
+                  'should be preferred.',
+                  {'maxversion': (3, 0)}),
+    }
+
+    _bad_builtins = frozenset([
+        'apply',
+        'basestring',
+        'buffer',
+        'cmp',
+        'coerce',
+        'execfile',
+        'file',
+        'input',  # Not missing, but incompatible semantics
+        'intern',
+        'long',
+        'raw_input',
+        'reduce',
+        'round',  # Not missing, but incompatible semantics
+        'StandardError',
+        'unichr',
+        'unicode',
+        'xrange',
+        'reload',
+    ])
+
+    _unused_magic_methods = frozenset([
+        '__coerce__',
+        '__delslice__',
+        '__getslice__',
+        '__setslice__',
+        '__oct__',
+        '__hex__',
+        '__nonzero__',
+        '__cmp__',
+    ])
+
+    def __init__(self, *args, **kwargs):
+        self._future_division = False
+        self._future_absolute_import = False
+        super(Python3Checker, self).__init__(*args, **kwargs)
+
+    def visit_module(self, node): # pylint: disable=unused-argument
+        """Clear checker state after previous module."""
+        self._future_division = False
+        self._future_absolute_import = False
+
+    def visit_function(self, node):
+        if node.is_method() and node.name in self._unused_magic_methods:
+            method_name = node.name
+            if node.name.startswith('__'):
+                method_name = node.name[2:-2]
+            self.add_message(method_name + '-method', node=node)
+
+    @utils.check_messages('parameter-unpacking')
+    def visit_arguments(self, node):
+        for arg in node.args:
+            if isinstance(arg, astroid.Tuple):
+                self.add_message('parameter-unpacking', node=arg)
+
+    def visit_name(self, node):
+        """Detect when a "bad" built-in is referenced."""
+        found_node = node.lookup(node.name)[0]
+        if _is_builtin(found_node):
+            if node.name in self._bad_builtins:
+                message = node.name.lower() + '-builtin'
+                self.add_message(message, node=node)
+
+    @utils.check_messages('print-statement')
+    def visit_print(self, node):
+        self.add_message('print-statement', node=node)
+
+    @utils.check_messages('no-absolute-import')
+    def visit_from(self, node):
+        if node.modname == '__future__':
+            for name, _ in node.names:
+                if name == 'division':
+                    self._future_division = True
+                elif name == 'absolute_import':
+                    self._future_absolute_import = True
+        elif not self._future_absolute_import:
+            self.add_message('no-absolute-import', node=node)
+
+    @utils.check_messages('no-absolute-import')
+    def visit_import(self, node):
+        if not self._future_absolute_import:
+            self.add_message('no-absolute-import', node=node)
+
+    @utils.check_messages('metaclass-assignment')
+    def visit_class(self, node):
+        if '__metaclass__' in node.locals:
+            self.add_message('metaclass-assignment', node=node)
+
+    @utils.check_messages('old-division')
+    def visit_binop(self, node):
+        if not self._future_division and node.op == '/':
+            for arg in (node.left, node.right):
+                if isinstance(arg, astroid.Const) and isinstance(arg.value, float):
+                    break
+            else:
+                self.add_message('old-division', node=node)
+
+    def _check_cmp_argument(self, node):
+        # Check that the `cmp` argument is used
+        args = []
+        if (isinstance(node.func, astroid.Getattr)
+                and node.func.attrname == 'sort'):
+            inferred = utils.safe_infer(node.func.expr)
+            if not inferred:
+                return
+
+            builtins_list = "{}.list".format(bases.BUILTINS)
+            if (isinstance(inferred, astroid.List)
+                    or inferred.qname() == builtins_list):
+                args = node.args
+
+        elif (isinstance(node.func, astroid.Name)
+                and node.func.name == 'sorted'):
+            inferred = utils.safe_infer(node.func)
+            if not inferred:
+                return
+
+            builtins_sorted = "{}.sorted".format(bases.BUILTINS)
+            if inferred.qname() == builtins_sorted:
+                args = node.args
+
+        for arg in args:
+            if isinstance(arg, astroid.Keyword) and arg.arg == 'cmp':
+                self.add_message('using-cmp-argument', node=node)
+                return
+
+    def visit_callfunc(self, node):
+        self._check_cmp_argument(node)
+
+        if isinstance(node.func, astroid.Getattr):
+            if any([node.args, node.starargs, node.kwargs]):
+                return
+            if node.func.attrname == 'next':
+                self.add_message('next-method-called', node=node)
+            else:
+                if _check_dict_node(node.func.expr):
+                    if node.func.attrname in ('iterkeys', 'itervalues', 'iteritems'):
+                        self.add_message('dict-iter-method', node=node)
+                    elif node.func.attrname in ('viewkeys', 'viewvalues', 'viewitems'):
+                        self.add_message('dict-view-method', node=node)
+        elif isinstance(node.func, astroid.Name):
+            found_node = node.func.lookup(node.func.name)[0]
+            if _is_builtin(found_node):
+                if node.func.name in ('filter', 'map', 'range', 'zip'):
+                    if not _in_iterating_context(node):
+                        checker = '{}-builtin-not-iterating'.format(node.func.name)
+                        self.add_message(checker, node=node)
+
+
+    @utils.check_messages('indexing-exception')
+    def visit_subscript(self, node):
+        """ Look for indexing exceptions. """
+        try:
+            for infered in node.value.infer():
+                if not isinstance(infered, astroid.Instance):
+                    continue
+                if utils.inherit_from_std_ex(infered):
+                    self.add_message('indexing-exception', node=node)
+        except astroid.InferenceError:
+            return
+
+    @utils.check_messages('unpacking-in-except')
+    def visit_excepthandler(self, node):
+        """Visit an except handler block and check for exception unpacking."""
+        if isinstance(node.name, (astroid.Tuple, astroid.List)):
+            self.add_message('unpacking-in-except', node=node)
+
+    @utils.check_messages('backtick')
+    def visit_backquote(self, node):
+        self.add_message('backtick', node=node)
+
+    @utils.check_messages('raising-string', 'old-raise-syntax')
+    def visit_raise(self, node):
+        """Visit a raise statement and check for raising
+        strings or old-raise-syntax.
+        """
+        if (node.exc is not None and
+                node.inst is not None and
+                node.tback is None):
+            self.add_message('old-raise-syntax', node=node)
+
+        # Ignore empty raise.
+        if node.exc is None:
+            return
+        expr = node.exc
+        if self._check_raise_value(node, expr):
+            return
+        else:
+            try:
+                value = next(astroid.unpack_infer(expr))
+            except astroid.InferenceError:
+                return
+            self._check_raise_value(node, value)
+
+    def _check_raise_value(self, node, expr):
+        if isinstance(expr, astroid.Const):
+            value = expr.value
+            if isinstance(value, str):
+                self.add_message('raising-string', node=node)
+                return True
+
+
+class Python3TokenChecker(checkers.BaseTokenChecker):
+    __implements__ = interfaces.ITokenChecker
+    name = 'python3'
+    enabled = False
+
+    msgs = {
+        'E1606': ('Use of long suffix',
+                  'long-suffix',
+                  'Used when "l" or "L" is used to mark a long integer. '
+                  'This will not work in Python 3, since `int` and `long` '
+                  'types have merged.',
+                  {'maxversion': (3, 0)}),
+        'E1607': ('Use of the <> operator',
+                  'old-ne-operator',
+                  'Used when the deprecated "<>" operator is used instead '
+                  'of "!=". This is removed in Python 3.',
+                  {'maxversion': (3, 0),
+                   'old_names': [('W0331', 'old-ne-operator')]}),
+        'E1608': ('Use of old octal literal',
+                  'old-octal-literal',
+                  'Usen when encountering the old octal syntax, '
+                  'removed in Python 3. To use the new syntax, '
+                  'prepend 0o on the number.',
+                  {'maxversion': (3, 0)}),
+    }
+
+    def process_tokens(self, tokens):
+        for idx, (tok_type, token, start, _, _) in enumerate(tokens):
+            if tok_type == tokenize.NUMBER:
+                if token.lower().endswith('l'):
+                    # This has a different semantic than lowercase-l-suffix.
+                    self.add_message('long-suffix', line=start[0])
+                elif _is_old_octal(token):
+                    self.add_message('old-octal-literal', line=start[0])
+            if tokens[idx][1] == '<>':
+                self.add_message('old-ne-operator', line=tokens[idx][2][0])
+
+
+def register(linter):
+    linter.register_checker(Python3Checker(linter))
+    linter.register_checker(Python3TokenChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/raw_metrics.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/raw_metrics.py
new file mode 100644
index 0000000..71fecf6
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/raw_metrics.py
@@ -0,0 +1,129 @@
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+""" Copyright (c) 2003-2010 LOGILAB S.A. (Paris, FRANCE).
+ http://www.logilab.fr/ -- mailto:contact@logilab.fr
+
+Raw metrics checker
+"""
+
+import tokenize
+
+# pylint now requires pylint >= 2.2, so this is no longer necessary
+#if not hasattr(tokenize, 'NL'):
+#    raise ValueError("tokenize.NL doesn't exist -- tokenize module too old")
+
+from logilab.common.ureports import Table
+
+from pylint.interfaces import ITokenChecker
+from pylint.utils import EmptyReport
+from pylint.checkers import BaseTokenChecker
+from pylint.reporters import diff_string
+
+def report_raw_stats(sect, stats, old_stats):
+    """calculate percentage of code / doc / comment / empty
+    """
+    total_lines = stats['total_lines']
+    if not total_lines:
+        raise EmptyReport()
+    sect.description = '%s lines have been analyzed' % total_lines
+    lines = ('type', 'number', '%', 'previous', 'difference')
+    for node_type in ('code', 'docstring', 'comment', 'empty'):
+        key = node_type + '_lines'
+        total = stats[key]
+        percent = float(total * 100) / total_lines
+        old = old_stats.get(key, None)
+        if old is not None:
+            diff_str = diff_string(old, total)
+        else:
+            old, diff_str = 'NC', 'NC'
+        lines += (node_type, str(total), '%.2f' % percent,
+                  str(old), diff_str)
+    sect.append(Table(children=lines, cols=5, rheaders=1))
+
+
+class RawMetricsChecker(BaseTokenChecker):
+    """does not check anything but gives some raw metrics :
+    * total number of lines
+    * total number of code lines
+    * total number of docstring lines
+    * total number of comments lines
+    * total number of empty lines
+    """
+
+    __implements__ = (ITokenChecker,)
+
+    # configuration section name
+    name = 'metrics'
+    # configuration options
+    options = ()
+    # messages
+    msgs = {}
+    # reports
+    reports = (('RP0701', 'Raw metrics', report_raw_stats),)
+
+    def __init__(self, linter):
+        BaseTokenChecker.__init__(self, linter)
+        self.stats = None
+
+    def open(self):
+        """init statistics"""
+        self.stats = self.linter.add_stats(total_lines=0, code_lines=0,
+                                           empty_lines=0, docstring_lines=0,
+                                           comment_lines=0)
+
+    def process_tokens(self, tokens):
+        """update stats"""
+        i = 0
+        tokens = list(tokens)
+        while i < len(tokens):
+            i, lines_number, line_type = get_type(tokens, i)
+            self.stats['total_lines'] += lines_number
+            self.stats[line_type] += lines_number
+
+
+JUNK = (tokenize.NL, tokenize.INDENT, tokenize.NEWLINE, tokenize.ENDMARKER)
+
+def get_type(tokens, start_index):
+    """return the line type : docstring, comment, code, empty"""
+    i = start_index
+    tok_type = tokens[i][0]
+    start = tokens[i][2]
+    pos = start
+    line_type = None
+    while i < len(tokens) and tokens[i][2][0] == start[0]:
+        tok_type = tokens[i][0]
+        pos = tokens[i][3]
+        if line_type is None:
+            if tok_type == tokenize.STRING:
+                line_type = 'docstring_lines'
+            elif tok_type == tokenize.COMMENT:
+                line_type = 'comment_lines'
+            elif tok_type in JUNK:
+                pass
+            else:
+                line_type = 'code_lines'
+        i += 1
+    if line_type is None:
+        line_type = 'empty_lines'
+    elif i < len(tokens) and tok_type == tokenize.NEWLINE:
+        i += 1
+    return i, pos[0] - start[0] + 1, line_type
+
+
+def register(linter):
+    """ required method to auto register this checker """
+    linter.register_checker(RawMetricsChecker(linter))
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/similar.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/similar.py
new file mode 100644
index 0000000..9542077
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/similar.py
@@ -0,0 +1,372 @@
+# pylint: disable=W0622
+# Copyright (c) 2004-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""a similarities / code duplication command line tool and pylint checker
+"""
+from __future__ import print_function
+import sys
+from collections import defaultdict
+
+from logilab.common.ureports import Table
+
+from pylint.interfaces import IRawChecker
+from pylint.checkers import BaseChecker, table_lines_from_stats
+
+import six
+from six.moves import zip
+
+
+class Similar(object):
+    """finds copy-pasted lines of code in a project"""
+
+    def __init__(self, min_lines=4, ignore_comments=False,
+                 ignore_docstrings=False, ignore_imports=False):
+        self.min_lines = min_lines
+        self.ignore_comments = ignore_comments
+        self.ignore_docstrings = ignore_docstrings
+        self.ignore_imports = ignore_imports
+        self.linesets = []
+
+    def append_stream(self, streamid, stream, encoding=None):
+        """append a file to search for similarities"""
+        if encoding is None:
+            readlines = stream.readlines
+        else:
+            readlines = lambda: [line.decode(encoding) for line in stream]
+        try:
+            self.linesets.append(LineSet(streamid,
+                                         readlines(),
+                                         self.ignore_comments,
+                                         self.ignore_docstrings,
+                                         self.ignore_imports))
+        except UnicodeDecodeError:
+            pass
+
+    def run(self):
+        """start looking for similarities and display results on stdout"""
+        self._display_sims(self._compute_sims())
+
+    def _compute_sims(self):
+        """compute similarities in appended files"""
+        no_duplicates = defaultdict(list)
+        for num, lineset1, idx1, lineset2, idx2 in self._iter_sims():
+            duplicate = no_duplicates[num]
+            for couples in duplicate:
+                if (lineset1, idx1) in couples or (lineset2, idx2) in couples:
+                    couples.add((lineset1, idx1))
+                    couples.add((lineset2, idx2))
+                    break
+            else:
+                duplicate.append(set([(lineset1, idx1), (lineset2, idx2)]))
+        sims = []
+        for num, ensembles in six.iteritems(no_duplicates):
+            for couples in ensembles:
+                sims.append((num, couples))
+        sims.sort()
+        sims.reverse()
+        return sims
+
+    def _display_sims(self, sims):
+        """display computed similarities on stdout"""
+        nb_lignes_dupliquees = 0
+        for num, couples in sims:
+            print()
+            print(num, "similar lines in", len(couples), "files")
+            couples = sorted(couples)
+            for lineset, idx in couples:
+                print("==%s:%s" % (lineset.name, idx))
+            # pylint: disable=W0631
+            for line in lineset._real_lines[idx:idx+num]:
+                print("  ", line.rstrip())
+            nb_lignes_dupliquees += num * (len(couples)-1)
+        nb_total_lignes = sum([len(lineset) for lineset in self.linesets])
+        print("TOTAL lines=%s duplicates=%s percent=%.2f" \
+            % (nb_total_lignes, nb_lignes_dupliquees,
+               nb_lignes_dupliquees*100. / nb_total_lignes))
+
+    def _find_common(self, lineset1, lineset2):
+        """find similarities in the two given linesets"""
+        lines1 = lineset1.enumerate_stripped
+        lines2 = lineset2.enumerate_stripped
+        find = lineset2.find
+        index1 = 0
+        min_lines = self.min_lines
+        while index1 < len(lineset1):
+            skip = 1
+            num = 0
+            for index2 in find(lineset1[index1]):
+                non_blank = 0
+                for num, ((_, line1), (_, line2)) in enumerate(
+                        zip(lines1(index1), lines2(index2))):
+                    if line1 != line2:
+                        if non_blank > min_lines:
+                            yield num, lineset1, index1, lineset2, index2
+                        skip = max(skip, num)
+                        break
+                    if line1:
+                        non_blank += 1
+                else:
+                    # we may have reach the end
+                    num += 1
+                    if non_blank > min_lines:
+                        yield num, lineset1, index1, lineset2, index2
+                    skip = max(skip, num)
+            index1 += skip
+
+    def _iter_sims(self):
+        """iterate on similarities among all files, by making a cartesian
+        product
+        """
+        for idx, lineset in enumerate(self.linesets[:-1]):
+            for lineset2 in self.linesets[idx+1:]:
+                for sim in self._find_common(lineset, lineset2):
+                    yield sim
+
+def stripped_lines(lines, ignore_comments, ignore_docstrings, ignore_imports):
+    """return lines with leading/trailing whitespace and any ignored code
+    features removed
+    """
+
+    strippedlines = []
+    docstring = None
+    for line in lines:
+        line = line.strip()
+        if ignore_docstrings:
+            if not docstring and \
+                   (line.startswith('"""') or line.startswith("'''")):
+                docstring = line[:3]
+                line = line[3:]
+            if docstring:
+                if line.endswith(docstring):
+                    docstring = None
+                line = ''
+        if ignore_imports:
+            if line.startswith("import ") or line.startswith("from "):
+                line = ''
+        if ignore_comments:
+            # XXX should use regex in checkers/format to avoid cutting
+            # at a "#" in a string
+            line = line.split('#', 1)[0].strip()
+        strippedlines.append(line)
+    return strippedlines
+
+
+class LineSet(object):
+    """Holds and indexes all the lines of a single source file"""
+    def __init__(self, name, lines, ignore_comments=False,
+                 ignore_docstrings=False, ignore_imports=False):
+        self.name = name
+        self._real_lines = lines
+        self._stripped_lines = stripped_lines(lines, ignore_comments,
+                                              ignore_docstrings,
+                                              ignore_imports)
+        self._index = self._mk_index()
+
+    def __str__(self):
+        return '<Lineset for %s>' % self.name
+
+    def __len__(self):
+        return len(self._real_lines)
+
+    def __getitem__(self, index):
+        return self._stripped_lines[index]
+
+    def __lt__(self, other):
+        return self.name < other.name
+
+    def __hash__(self):
+        return id(self)
+
+    def enumerate_stripped(self, start_at=0):
+        """return an iterator on stripped lines, starting from a given index
+        if specified, else 0
+        """
+        idx = start_at
+        if start_at:
+            lines = self._stripped_lines[start_at:]
+        else:
+            lines = self._stripped_lines
+        for line in lines:
+            #if line:
+            yield idx, line
+            idx += 1
+
+    def find(self, stripped_line):
+        """return positions of the given stripped line in this set"""
+        return self._index.get(stripped_line, ())
+
+    def _mk_index(self):
+        """create the index for this set"""
+        index = defaultdict(list)
+        for line_no, line in enumerate(self._stripped_lines):
+            if line:
+                index[line].append(line_no)
+        return index
+
+
+MSGS = {'R0801': ('Similar lines in %s files\n%s',
+                  'duplicate-code',
+                  'Indicates that a set of similar lines has been detected \
+                  among multiple file. This usually means that the code should \
+                  be refactored to avoid this duplication.')}
+
+def report_similarities(sect, stats, old_stats):
+    """make a layout with some stats about duplication"""
+    lines = ['', 'now', 'previous', 'difference']
+    lines += table_lines_from_stats(stats, old_stats,
+                                    ('nb_duplicated_lines',
+                                     'percent_duplicated_lines'))
+    sect.append(Table(children=lines, cols=4, rheaders=1, cheaders=1))
+
+
+# wrapper to get a pylint checker from the similar class
+class SimilarChecker(BaseChecker, Similar):
+    """checks for similarities and duplicated code. This computation may be
+    memory / CPU intensive, so you should disable it if you experiment some
+    problems.
+    """
+
+    __implements__ = (IRawChecker,)
+    # configuration section name
+    name = 'similarities'
+    # messages
+    msgs = MSGS
+    # configuration options
+    # for available dict keys/values see the optik parser 'add_option' method
+    options = (('min-similarity-lines',
+                {'default' : 4, 'type' : "int", 'metavar' : '<int>',
+                 'help' : 'Minimum lines number of a similarity.'}),
+               ('ignore-comments',
+                {'default' : True, 'type' : 'yn', 'metavar' : '<y or n>',
+                 'help': 'Ignore comments when computing similarities.'}
+               ),
+               ('ignore-docstrings',
+                {'default' : True, 'type' : 'yn', 'metavar' : '<y or n>',
+                 'help': 'Ignore docstrings when computing similarities.'}
+               ),
+               ('ignore-imports',
+                {'default' : False, 'type' : 'yn', 'metavar' : '<y or n>',
+                 'help': 'Ignore imports when computing similarities.'}
+               ),
+              )
+    # reports
+    reports = (('RP0801', 'Duplication', report_similarities),)
+
+    def __init__(self, linter=None):
+        BaseChecker.__init__(self, linter)
+        Similar.__init__(self, min_lines=4,
+                         ignore_comments=True, ignore_docstrings=True)
+        self.stats = None
+
+    def set_option(self, optname, value, action=None, optdict=None):
+        """method called to set an option (registered in the options list)
+
+        overridden to report options setting to Similar
+        """
+        BaseChecker.set_option(self, optname, value, action, optdict)
+        if optname == 'min-similarity-lines':
+            self.min_lines = self.config.min_similarity_lines
+        elif optname == 'ignore-comments':
+            self.ignore_comments = self.config.ignore_comments
+        elif optname == 'ignore-docstrings':
+            self.ignore_docstrings = self.config.ignore_docstrings
+        elif optname == 'ignore-imports':
+            self.ignore_imports = self.config.ignore_imports
+
+    def open(self):
+        """init the checkers: reset linesets and statistics information"""
+        self.linesets = []
+        self.stats = self.linter.add_stats(nb_duplicated_lines=0,
+                                           percent_duplicated_lines=0)
+
+    def process_module(self, node):
+        """process a module
+
+        the module's content is accessible via the stream object
+
+        stream must implement the readlines method
+        """
+        with node.stream() as stream:
+            self.append_stream(self.linter.current_name,
+                               stream,
+                               node.file_encoding)
+
+    def close(self):
+        """compute and display similarities on closing (i.e. end of parsing)"""
+        total = sum([len(lineset) for lineset in self.linesets])
+        duplicated = 0
+        stats = self.stats
+        for num, couples in self._compute_sims():
+            msg = []
+            for lineset, idx in couples:
+                msg.append("==%s:%s" % (lineset.name, idx))
+            msg.sort()
+            # pylint: disable=W0631
+            for line in lineset._real_lines[idx:idx+num]:
+                msg.append(line.rstrip())
+            self.add_message('R0801', args=(len(couples), '\n'.join(msg)))
+            duplicated += num * (len(couples) - 1)
+        stats['nb_duplicated_lines'] = duplicated
+        stats['percent_duplicated_lines'] = total and duplicated * 100. / total
+
+
+def register(linter):
+    """required method to auto register this checker """
+    linter.register_checker(SimilarChecker(linter))
+
+def usage(status=0):
+    """display command line usage information"""
+    print("finds copy pasted blocks in a set of files")
+    print()
+    print('Usage: symilar [-d|--duplicates min_duplicated_lines] \
+[-i|--ignore-comments] [--ignore-docstrings] [--ignore-imports] file1...')
+    sys.exit(status)
+
+def Run(argv=None):
+    """standalone command line access point"""
+    if argv is None:
+        argv = sys.argv[1:]
+    from getopt import getopt
+    s_opts = 'hdi'
+    l_opts = ('help', 'duplicates=', 'ignore-comments', 'ignore-imports',
+              'ignore-docstrings')
+    min_lines = 4
+    ignore_comments = False
+    ignore_docstrings = False
+    ignore_imports = False
+    opts, args = getopt(argv, s_opts, l_opts)
+    for opt, val in opts:
+        if opt in ('-d', '--duplicates'):
+            min_lines = int(val)
+        elif opt in ('-h', '--help'):
+            usage()
+        elif opt in ('-i', '--ignore-comments'):
+            ignore_comments = True
+        elif opt in ('--ignore-docstrings',):
+            ignore_docstrings = True
+        elif opt in ('--ignore-imports',):
+            ignore_imports = True
+    if not args:
+        usage(1)
+    sim = Similar(min_lines, ignore_comments, ignore_docstrings, ignore_imports)
+    for filename in args:
+        with open(filename) as stream:
+            sim.append_stream(filename, stream)
+    sim.run()
+    sys.exit(0)
+
+if __name__ == '__main__':
+    Run()
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/spelling.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/spelling.py
new file mode 100644
index 0000000..f6edd5d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/spelling.py
@@ -0,0 +1,250 @@
+# Copyright 2014 Michal Nowikowski.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""Checker for spelling errors in comments and docstrings.
+"""
+
+import sys
+import tokenize
+import string
+import re
+
+if sys.version_info[0] >= 3:
+    maketrans = str.maketrans
+else:
+    maketrans = string.maketrans
+
+from pylint.interfaces import ITokenChecker, IAstroidChecker
+from pylint.checkers import BaseTokenChecker
+from pylint.checkers.utils import check_messages
+
+try:
+    import enchant
+except ImportError:
+    enchant = None
+
+if enchant is not None:
+    br = enchant.Broker()
+    dicts = br.list_dicts()
+    dict_choices = [''] + [d[0] for d in dicts]
+    dicts = ["%s (%s)" % (d[0], d[1].name) for d in dicts]
+    dicts = ", ".join(dicts)
+    instr = ""
+else:
+    dicts = "none"
+    dict_choices = ['']
+    instr = " To make it working install python-enchant package."
+
+table = maketrans("", "")
+
+class SpellingChecker(BaseTokenChecker):
+    """Check spelling in comments and docstrings"""
+    __implements__ = (ITokenChecker, IAstroidChecker)
+    name = 'spelling'
+    msgs = {
+        'C0401': ('Wrong spelling of a word \'%s\' in a comment:\n%s\n'
+                  '%s\nDid you mean: \'%s\'?',
+                  'wrong-spelling-in-comment',
+                  'Used when a word in comment is not spelled correctly.'),
+        'C0402': ('Wrong spelling of a word \'%s\' in a docstring:\n%s\n'
+                  '%s\nDid you mean: \'%s\'?',
+                  'wrong-spelling-in-docstring',
+                  'Used when a word in docstring is not spelled correctly.'),
+        'C0403': ('Invalid characters %r in a docstring',
+                  'invalid-characters-in-docstring',
+                  'Used when a word in docstring cannot be checked by enchant.'),
+        }
+    options = (('spelling-dict',
+                {'default' : '', 'type' : 'choice', 'metavar' : '<dict name>',
+                 'choices': dict_choices,
+                 'help' : 'Spelling dictionary name. '
+                          'Available dictionaries: %s.%s' % (dicts, instr)}),
+               ('spelling-ignore-words',
+                {'default' : '',
+                 'type' : 'string',
+                 'metavar' : '<comma separated words>',
+                 'help' : 'List of comma separated words that '
+                          'should not be checked.'}),
+               ('spelling-private-dict-file',
+                {'default' : '',
+                 'type' : 'string',
+                 'metavar' : '<path to file>',
+                 'help' : 'A path to a file that contains private '
+                          'dictionary; one word per line.'}),
+               ('spelling-store-unknown-words',
+                {'default' : 'n', 'type' : 'yn', 'metavar' : '<y_or_n>',
+                 'help' : 'Tells whether to store unknown words to '
+                          'indicated private dictionary in '
+                          '--spelling-private-dict-file option instead of '
+                          'raising a message.'}),
+              )
+
+    def open(self):
+        self.initialized = False
+        self.private_dict_file = None
+
+        if enchant is None:
+            return
+        dict_name = self.config.spelling_dict
+        if not dict_name:
+            return
+
+        self.ignore_list = [w.strip() for w in self.config.spelling_ignore_words.split(",")]
+        # "param" appears in docstring in param description and
+        # "pylint" appears in comments in pylint pragmas.
+        self.ignore_list.extend(["param", "pylint"])
+
+        if self.config.spelling_private_dict_file:
+            self.spelling_dict = enchant.DictWithPWL(
+                dict_name, self.config.spelling_private_dict_file)
+            self.private_dict_file = open(
+                self.config.spelling_private_dict_file, "a")
+        else:
+            self.spelling_dict = enchant.Dict(dict_name)
+
+        if self.config.spelling_store_unknown_words:
+            self.unknown_words = set()
+
+        # Prepare regex for stripping punctuation signs from text.
+        # ' and _ are treated in a special way.
+        puncts = string.punctuation.replace("'", "").replace("_", "")
+        self.punctuation_regex = re.compile('[%s]' % re.escape(puncts))
+        self.initialized = True
+
+    def close(self):
+        if self.private_dict_file:
+            self.private_dict_file.close()
+
+    def _check_spelling(self, msgid, line, line_num):
+        line2 = line.strip()
+        # Replace ['afadf with afadf (but preserve don't)
+        line2 = re.sub("'([^a-zA-Z]|$)", " ", line2)
+        # Replace afadf'] with afadf (but preserve don't)
+        line2 = re.sub("([^a-zA-Z]|^)'", " ", line2)
+        # Replace punctuation signs with space e.g. and/or -> and or
+        line2 = self.punctuation_regex.sub(' ', line2)
+
+        words = []
+        for word in line2.split():
+            # Skip words with digits.
+            if len(re.findall(r"\d", word)) > 0:
+                continue
+
+            # Skip words with mixed big and small letters,
+            # they are probaly class names.
+            if (len(re.findall("[A-Z]", word)) > 0 and
+                    len(re.findall("[a-z]", word)) > 0 and
+                    len(word) > 2):
+                continue
+
+            # Skip words with _ - they are probably function parameter names.
+            if word.count('_') > 0:
+                continue
+
+            words.append(word)
+
+        # Go through words and check them.
+        for word in words:
+            # Skip words from ignore list.
+            if word in self.ignore_list:
+                continue
+
+            orig_word = word
+            word = word.lower()
+
+            # Strip starting u' from unicode literals and r' from raw strings.
+            if (word.startswith("u'") or
+                    word.startswith('u"') or
+                    word.startswith("r'") or
+                    word.startswith('r"')) and len(word) > 2:
+                word = word[2:]
+
+            # If it is a known word, then continue.
+            try:
+                if self.spelling_dict.check(word):
+                    continue
+            except enchant.errors.Error:
+                # this can only happen in docstrings, not comments
+                self.add_message('invalid-characters-in-docstring',
+                                 line=line_num, args=(word,))
+                continue
+
+            # Store word to private dict or raise a message.
+            if self.config.spelling_store_unknown_words:
+                if word not in self.unknown_words:
+                    self.private_dict_file.write("%s\n" % word)
+                    self.unknown_words.add(word)
+            else:
+                # Present up to 4 suggestions.
+                # TODO: add support for customising this.
+                suggestions = self.spelling_dict.suggest(word)[:4]
+
+                m = re.search(r"(\W|^)(%s)(\W|$)" % word, line.lower())
+                if m:
+                    # Start position of second group in regex.
+                    col = m.regs[2][0]
+                else:
+                    col = line.lower().index(word)
+                indicator = (" " * col) + ("^" * len(word))
+
+                self.add_message(msgid, line=line_num,
+                                 args=(orig_word, line,
+                                       indicator,
+                                       "' or '".join(suggestions)))
+
+    def process_tokens(self, tokens):
+        if not self.initialized:
+            return
+
+        # Process tokens and look for comments.
+        for (tok_type, token, (start_row, _), _, _) in tokens:
+            if tok_type == tokenize.COMMENT:
+                self._check_spelling('wrong-spelling-in-comment',
+                                     token, start_row)
+
+    @check_messages('wrong-spelling-in-docstring')
+    def visit_module(self, node):
+        if not self.initialized:
+            return
+        self._check_docstring(node)
+
+    @check_messages('wrong-spelling-in-docstring')
+    def visit_class(self, node):
+        if not self.initialized:
+            return
+        self._check_docstring(node)
+
+    @check_messages('wrong-spelling-in-docstring')
+    def visit_function(self, node):
+        if not self.initialized:
+            return
+        self._check_docstring(node)
+
+    def _check_docstring(self, node):
+        """check the node has any spelling errors"""
+        docstring = node.doc
+        if not docstring:
+            return
+
+        start_line = node.lineno + 1
+
+        # Go through lines of docstring
+        for idx, line in enumerate(docstring.splitlines()):
+            self._check_spelling('wrong-spelling-in-docstring',
+                                 line, start_line + idx)
+
+
+def register(linter):
+    """required method to auto register this checker """
+    linter.register_checker(SpellingChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/stdlib.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/stdlib.py
new file mode 100644
index 0000000..a3a6106
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/stdlib.py
@@ -0,0 +1,216 @@
+# Copyright 2012 Google Inc.
+#
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""Checkers for various standard library functions."""
+
+import six
+import sys
+
+import astroid
+from astroid.bases import Instance
+
+from pylint.interfaces import IAstroidChecker
+from pylint.checkers import BaseChecker
+from pylint.checkers import utils
+
+
+TYPECHECK_COMPARISON_OPERATORS = frozenset(('is', 'is not', '==', '!=', 'in', 'not in'))
+LITERAL_NODE_TYPES = (astroid.Const, astroid.Dict, astroid.List, astroid.Set)
+
+if sys.version_info >= (3, 0):
+    OPEN_MODULE = '_io'
+    TYPE_QNAME = 'builtins.type'
+else:
+    OPEN_MODULE = '__builtin__'
+    TYPE_QNAME = '__builtin__.type'
+
+
+def _check_mode_str(mode):
+    # check type
+    if not isinstance(mode, six.string_types):
+        return False
+    # check syntax
+    modes = set(mode)
+    _mode = "rwatb+U"
+    creating = False
+    if six.PY3:
+        _mode += "x"
+        creating = "x" in modes
+    if modes - set(_mode) or len(mode) > len(modes):
+        return False
+    # check logic
+    reading = "r" in modes
+    writing = "w" in modes
+    appending = "a" in modes
+    text = "t" in modes
+    binary = "b" in modes
+    if "U" in modes:
+        if writing or appending or creating and six.PY3:
+            return False
+        reading = True
+        if not six.PY3:
+            binary = True
+    if text and binary:
+        return False
+    total = reading + writing + appending + (creating if six.PY3 else 0)
+    if total > 1:
+        return False
+    if not (reading or writing or appending or creating and six.PY3):
+        return False
+    # other 2.x constraints
+    if not six.PY3:
+        if "U" in mode:
+            mode = mode.replace("U", "")
+            if "r" not in mode:
+                mode = "r" + mode
+        return mode[0] in ("r", "w", "a", "U")
+    return True
+
+
+def _is_one_arg_pos_call(call):
+    """Is this a call with exactly 1 argument,
+    where that argument is positional?
+    """
+    return (isinstance(call, astroid.CallFunc)
+            and len(call.args) == 1
+            and not isinstance(call.args[0], astroid.Keyword))
+
+
+class StdlibChecker(BaseChecker):
+    __implements__ = (IAstroidChecker,)
+    name = 'stdlib'
+
+    msgs = {
+        'W1501': ('"%s" is not a valid mode for open.',
+                  'bad-open-mode',
+                  'Python supports: r, w, a[, x] modes with b, +, '
+                  'and U (only with r) options. '
+                  'See http://docs.python.org/2/library/functions.html#open'),
+        'W1502': ('Using datetime.time in a boolean context.',
+                  'boolean-datetime',
+                  'Using datetime.time in a boolean context can hide '
+                  'subtle bugs when the time they represent matches '
+                  'midnight UTC. This behaviour was fixed in Python 3.5. '
+                  'See http://bugs.python.org/issue13936 for reference.',
+                  {'maxversion': (3, 5)}),
+        'W1503': ('Redundant use of %s with constant '
+                  'value %r',
+                  'redundant-unittest-assert',
+                  'The first argument of assertTrue and assertFalse is '
+                  'a condition. If a constant is passed as parameter, that '
+                  'condition will be always true. In this case a warning '
+                  'should be emitted.'),
+        'W1504': ('Using type() instead of isinstance() for a typecheck.',
+                  'unidiomatic-typecheck',
+                  'The idiomatic way to perform an explicit typecheck in '
+                  'Python is to use isinstance(x, Y) rather than '
+                  'type(x) == Y, type(x) is Y. Though there are unusual '
+                  'situations where these give different results.')
+    }
+
+    @utils.check_messages('bad-open-mode', 'redundant-unittest-assert')
+    def visit_callfunc(self, node):
+        """Visit a CallFunc node."""
+        if hasattr(node, 'func'):
+            infer = utils.safe_infer(node.func)
+            if infer:
+                if infer.root().name == OPEN_MODULE:
+                    if getattr(node.func, 'name', None) in ('open', 'file'):
+                        self._check_open_mode(node)
+                if infer.root().name == 'unittest.case':
+                    self._check_redundant_assert(node, infer)
+
+    @utils.check_messages('boolean-datetime')
+    def visit_unaryop(self, node):
+        if node.op == 'not':
+            self._check_datetime(node.operand)
+
+    @utils.check_messages('boolean-datetime')
+    def visit_if(self, node):
+        self._check_datetime(node.test)
+
+    @utils.check_messages('boolean-datetime')
+    def visit_ifexp(self, node):
+        self._check_datetime(node.test)
+
+    @utils.check_messages('boolean-datetime')
+    def visit_boolop(self, node):
+        for value in node.values:
+            self._check_datetime(value)
+
+    @utils.check_messages('unidiomatic-typecheck')
+    def visit_compare(self, node):
+        operator, right = node.ops[0]
+        if operator in TYPECHECK_COMPARISON_OPERATORS:
+            left = node.left
+            if _is_one_arg_pos_call(left):
+                self._check_type_x_is_y(node, left, operator, right)
+
+    def _check_redundant_assert(self, node, infer):
+        if (isinstance(infer, astroid.BoundMethod) and
+                node.args and isinstance(node.args[0], astroid.Const) and
+                infer.name in ['assertTrue', 'assertFalse']):
+            self.add_message('redundant-unittest-assert',
+                             args=(infer.name, node.args[0].value, ),
+                             node=node)
+
+    def _check_datetime(self, node):
+        """ Check that a datetime was infered.
+        If so, emit boolean-datetime warning.
+        """
+        try:
+            infered = next(node.infer())
+        except astroid.InferenceError:
+            return
+        if (isinstance(infered, Instance) and
+                infered.qname() == 'datetime.time'):
+            self.add_message('boolean-datetime', node=node)
+
+    def _check_open_mode(self, node):
+        """Check that the mode argument of an open or file call is valid."""
+        try:
+            mode_arg = utils.get_argument_from_call(node, position=1,
+                                                    keyword='mode')
+        except utils.NoSuchArgumentError:
+            return
+        if mode_arg:
+            mode_arg = utils.safe_infer(mode_arg)
+            if (isinstance(mode_arg, astroid.Const)
+                    and not _check_mode_str(mode_arg.value)):
+                self.add_message('bad-open-mode', node=node,
+                                 args=mode_arg.value)
+
+    def _check_type_x_is_y(self, node, left, operator, right):
+        """Check for expressions like type(x) == Y."""
+        left_func = utils.safe_infer(left.func)
+        if not (isinstance(left_func, astroid.Class)
+                and left_func.qname() == TYPE_QNAME):
+            return
+
+        if operator in ('is', 'is not') and _is_one_arg_pos_call(right):
+            right_func = utils.safe_infer(right.func)
+            if (isinstance(right_func, astroid.Class)
+                    and right_func.qname() == TYPE_QNAME):
+                # type(x) == type(a)
+                right_arg = utils.safe_infer(right.args[0])
+                if not isinstance(right_arg, LITERAL_NODE_TYPES):
+                    # not e.g. type(x) == type([])
+                    return
+        self.add_message('unidiomatic-typecheck', node=node)
+
+
+def register(linter):
+    """required method to auto register this checker """
+    linter.register_checker(StdlibChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/strings.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/strings.py
new file mode 100644
index 0000000..8892c2c
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/strings.py
@@ -0,0 +1,615 @@
+# Copyright (c) 2009-2010 Arista Networks, Inc. - James Lingard
+# Copyright (c) 2004-2013 LOGILAB S.A. (Paris, FRANCE).
+# Copyright 2012 Google Inc.
+#
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""Checker for string formatting operations.
+"""
+
+import sys
+import tokenize
+import string
+import numbers
+
+import astroid
+
+from pylint.interfaces import ITokenChecker, IAstroidChecker, IRawChecker
+from pylint.checkers import BaseChecker, BaseTokenChecker
+from pylint.checkers import utils
+from pylint.checkers.utils import check_messages
+
+import six
+
+
+_PY3K = sys.version_info[:2] >= (3, 0)
+_PY27 = sys.version_info[:2] == (2, 7)
+
+MSGS = {
+    'E1300': ("Unsupported format character %r (%#02x) at index %d",
+              "bad-format-character",
+              "Used when a unsupported format character is used in a format\
+              string."),
+    'E1301': ("Format string ends in middle of conversion specifier",
+              "truncated-format-string",
+              "Used when a format string terminates before the end of a \
+              conversion specifier."),
+    'E1302': ("Mixing named and unnamed conversion specifiers in format string",
+              "mixed-format-string",
+              "Used when a format string contains both named (e.g. '%(foo)d') \
+              and unnamed (e.g. '%d') conversion specifiers.  This is also \
+              used when a named conversion specifier contains * for the \
+              minimum field width and/or precision."),
+    'E1303': ("Expected mapping for format string, not %s",
+              "format-needs-mapping",
+              "Used when a format string that uses named conversion specifiers \
+              is used with an argument that is not a mapping."),
+    'W1300': ("Format string dictionary key should be a string, not %s",
+              "bad-format-string-key",
+              "Used when a format string that uses named conversion specifiers \
+              is used with a dictionary whose keys are not all strings."),
+    'W1301': ("Unused key %r in format string dictionary",
+              "unused-format-string-key",
+              "Used when a format string that uses named conversion specifiers \
+              is used with a dictionary that conWtains keys not required by the \
+              format string."),
+    'E1304': ("Missing key %r in format string dictionary",
+              "missing-format-string-key",
+              "Used when a format string that uses named conversion specifiers \
+              is used with a dictionary that doesn't contain all the keys \
+              required by the format string."),
+    'E1305': ("Too many arguments for format string",
+              "too-many-format-args",
+              "Used when a format string that uses unnamed conversion \
+              specifiers is given too many arguments."),
+    'E1306': ("Not enough arguments for format string",
+              "too-few-format-args",
+              "Used when a format string that uses unnamed conversion \
+              specifiers is given too few arguments"),
+
+    'W1302': ("Invalid format string",
+              "bad-format-string",
+              "Used when a PEP 3101 format string is invalid.",
+              {'minversion': (2, 7)}),
+    'W1303': ("Missing keyword argument %r for format string",
+              "missing-format-argument-key",
+              "Used when a PEP 3101 format string that uses named fields "
+              "doesn't receive one or more required keywords.",
+              {'minversion': (2, 7)}),
+    'W1304': ("Unused format argument %r",
+              "unused-format-string-argument",
+              "Used when a PEP 3101 format string that uses named "
+              "fields is used with an argument that "
+              "is not required by the format string.",
+              {'minversion': (2, 7)}),
+    'W1305': ("Format string contains both automatic field numbering "
+              "and manual field specification",
+              "format-combined-specification",
+              "Usen when a PEP 3101 format string contains both automatic "
+              "field numbering (e.g. '{}') and manual field "
+              "specification (e.g. '{0}').",
+              {'minversion': (2, 7)}),
+    'W1306': ("Missing format attribute %r in format specifier %r",
+              "missing-format-attribute",
+              "Used when a PEP 3101 format string uses an "
+              "attribute specifier ({0.length}), but the argument "
+              "passed for formatting doesn't have that attribute.",
+              {'minversion': (2, 7)}),
+    'W1307': ("Using invalid lookup key %r in format specifier %r",
+              "invalid-format-index",
+              "Used when a PEP 3101 format string uses a lookup specifier "
+              "({a[1]}), but the argument passed for formatting "
+              "doesn't contain or doesn't have that key as an attribute.",
+              {'minversion': (2, 7)})
+    }
+
+OTHER_NODES = (astroid.Const, astroid.List, astroid.Backquote,
+               astroid.Lambda, astroid.Function,
+               astroid.ListComp, astroid.SetComp, astroid.GenExpr)
+
+if _PY3K:
+    import _string
+
+    def split_format_field_names(format_string):
+        return _string.formatter_field_name_split(format_string)
+else:
+    def _field_iterator_convertor(iterator):
+        for is_attr, key in iterator:
+            if isinstance(key, numbers.Number):
+                yield is_attr, int(key)
+            else:
+                yield is_attr, key
+
+    def split_format_field_names(format_string):
+        keyname, fielditerator = format_string._formatter_field_name_split()
+        # it will return longs, instead of ints, which will complicate
+        # the output
+        return keyname, _field_iterator_convertor(fielditerator)
+
+
+def collect_string_fields(format_string):
+    """ Given a format string, return an iterator
+    of all the valid format fields. It handles nested fields
+    as well.
+    """
+
+    formatter = string.Formatter()
+    try:
+        parseiterator = formatter.parse(format_string)
+        for result in parseiterator:
+            if all(item is None for item in result[1:]):
+                # not a replacement format
+                continue
+            name = result[1]
+            nested = result[2]
+            yield name
+            if nested:
+                for field in collect_string_fields(nested):
+                    yield field
+    except ValueError:
+        # probably the format string is invalid
+        # should we check the argument of the ValueError?
+        raise utils.IncompleteFormatString(format_string)
+
+def parse_format_method_string(format_string):
+    """
+    Parses a PEP 3101 format string, returning a tuple of
+    (keys, num_args, manual_pos_arg),
+    where keys is the set of mapping keys in the format string, num_args
+    is the number of arguments required by the format string and
+    manual_pos_arg is the number of arguments passed with the position.
+    """
+    keys = []
+    num_args = 0
+    manual_pos_arg = set()
+    for name in collect_string_fields(format_string):
+        if name and str(name).isdigit():
+            manual_pos_arg.add(str(name))
+        elif name:
+            keyname, fielditerator = split_format_field_names(name)
+            if isinstance(keyname, numbers.Number):
+                # In Python 2 it will return long which will lead
+                # to different output between 2 and 3
+                manual_pos_arg.add(str(keyname))
+                keyname = int(keyname)
+            keys.append((keyname, list(fielditerator)))
+        else:
+            num_args += 1
+    return keys, num_args, len(manual_pos_arg)
+
+def get_args(callfunc):
+    """ Get the arguments from the given `CallFunc` node.
+    Return a tuple, where the first element is the
+    number of positional arguments and the second element
+    is the keyword arguments in a dict.
+    """
+    positional = 0
+    named = {}
+
+    for arg in callfunc.args:
+        if isinstance(arg, astroid.Keyword):
+            named[arg.arg] = utils.safe_infer(arg.value)
+        else:
+            positional += 1
+    return positional, named
+
+def get_access_path(key, parts):
+    """ Given a list of format specifiers, returns
+    the final access path (e.g. a.b.c[0][1]).
+    """
+    path = []
+    for is_attribute, specifier in parts:
+        if is_attribute:
+            path.append(".{}".format(specifier))
+        else:
+            path.append("[{!r}]".format(specifier))
+    return str(key) + "".join(path)
+
+
+class StringFormatChecker(BaseChecker):
+    """Checks string formatting operations to ensure that the format string
+    is valid and the arguments match the format string.
+    """
+
+    __implements__ = (IAstroidChecker,)
+    name = 'string'
+    msgs = MSGS
+
+    @check_messages(*(MSGS.keys()))
+    def visit_binop(self, node):
+        if node.op != '%':
+            return
+        left = node.left
+        args = node.right
+
+        if not (isinstance(left, astroid.Const)
+                and isinstance(left.value, six.string_types)):
+            return
+        format_string = left.value
+        try:
+            required_keys, required_num_args = \
+                utils.parse_format_string(format_string)
+        except utils.UnsupportedFormatCharacter as e:
+            c = format_string[e.index]
+            self.add_message('bad-format-character',
+                             node=node, args=(c, ord(c), e.index))
+            return
+        except utils.IncompleteFormatString:
+            self.add_message('truncated-format-string', node=node)
+            return
+        if required_keys and required_num_args:
+            # The format string uses both named and unnamed format
+            # specifiers.
+            self.add_message('mixed-format-string', node=node)
+        elif required_keys:
+            # The format string uses only named format specifiers.
+            # Check that the RHS of the % operator is a mapping object
+            # that contains precisely the set of keys required by the
+            # format string.
+            if isinstance(args, astroid.Dict):
+                keys = set()
+                unknown_keys = False
+                for k, _ in args.items:
+                    if isinstance(k, astroid.Const):
+                        key = k.value
+                        if isinstance(key, six.string_types):
+                            keys.add(key)
+                        else:
+                            self.add_message('bad-format-string-key',
+                                             node=node, args=key)
+                    else:
+                        # One of the keys was something other than a
+                        # constant.  Since we can't tell what it is,
+                        # supress checks for missing keys in the
+                        # dictionary.
+                        unknown_keys = True
+                if not unknown_keys:
+                    for key in required_keys:
+                        if key not in keys:
+                            self.add_message('missing-format-string-key',
+                                             node=node, args=key)
+                for key in keys:
+                    if key not in required_keys:
+                        self.add_message('unused-format-string-key',
+                                         node=node, args=key)
+            elif isinstance(args, OTHER_NODES + (astroid.Tuple,)):
+                type_name = type(args).__name__
+                self.add_message('format-needs-mapping',
+                                 node=node, args=type_name)
+            # else:
+                # The RHS of the format specifier is a name or
+                # expression.  It may be a mapping object, so
+                # there's nothing we can check.
+        else:
+            # The format string uses only unnamed format specifiers.
+            # Check that the number of arguments passed to the RHS of
+            # the % operator matches the number required by the format
+            # string.
+            if isinstance(args, astroid.Tuple):
+                num_args = len(args.elts)
+            elif isinstance(args, OTHER_NODES + (astroid.Dict, astroid.DictComp)):
+                num_args = 1
+            else:
+                # The RHS of the format specifier is a name or
+                # expression.  It could be a tuple of unknown size, so
+                # there's nothing we can check.
+                num_args = None
+            if num_args is not None:
+                if num_args > required_num_args:
+                    self.add_message('too-many-format-args', node=node)
+                elif num_args < required_num_args:
+                    self.add_message('too-few-format-args', node=node)
+
+
+class StringMethodsChecker(BaseChecker):
+    __implements__ = (IAstroidChecker,)
+    name = 'string'
+    msgs = {
+        'E1310': ("Suspicious argument in %s.%s call",
+                  "bad-str-strip-call",
+                  "The argument to a str.{l,r,}strip call contains a"
+                  " duplicate character, "),
+        }
+
+    @check_messages(*(MSGS.keys()))
+    def visit_callfunc(self, node):
+        func = utils.safe_infer(node.func)
+        if (isinstance(func, astroid.BoundMethod)
+                and isinstance(func.bound, astroid.Instance)
+                and func.bound.name in ('str', 'unicode', 'bytes')):
+            if func.name in ('strip', 'lstrip', 'rstrip') and node.args:
+                arg = utils.safe_infer(node.args[0])
+                if not isinstance(arg, astroid.Const):
+                    return
+                if len(arg.value) != len(set(arg.value)):
+                    self.add_message('bad-str-strip-call', node=node,
+                                     args=(func.bound.name, func.name))
+            elif func.name == 'format':
+                if _PY27 or _PY3K:
+                    self._check_new_format(node, func)
+
+    def _check_new_format(self, node, func):
+        """ Check the new string formatting. """
+        # TODO: skip (for now) format nodes which don't have
+        #       an explicit string on the left side of the format operation.
+        #       We do this because our inference engine can't properly handle
+        #       redefinitions of the original string.
+        #       For more details, see issue 287.
+        #
+        # Note that there may not be any left side at all, if the format method
+        # has been assigned to another variable. See issue 351. For example:
+        #
+        #    fmt = 'some string {}'.format
+        #    fmt('arg')
+        if (isinstance(node.func, astroid.Getattr)
+                and not isinstance(node.func.expr, astroid.Const)):
+            return
+        try:
+            strnode = next(func.bound.infer())
+        except astroid.InferenceError:
+            return
+        if not isinstance(strnode, astroid.Const):
+            return
+        if node.starargs or node.kwargs:
+            # TODO: Don't complicate the logic, skip these for now.
+            return
+        try:
+            positional, named = get_args(node)
+        except astroid.InferenceError:
+            return
+        try:
+            fields, num_args, manual_pos = parse_format_method_string(strnode.value)
+        except utils.IncompleteFormatString:
+            self.add_message('bad-format-string', node=node)
+            return
+
+        named_fields = set(field[0] for field in fields
+                           if isinstance(field[0], six.string_types))
+        if num_args and manual_pos:
+            self.add_message('format-combined-specification',
+                             node=node)
+            return
+
+        check_args = False
+        # Consider "{[0]} {[1]}" as num_args.
+        num_args += sum(1 for field in named_fields
+                        if field == '')
+        if named_fields:
+            for field in named_fields:
+                if field not in named and field:
+                    self.add_message('missing-format-argument-key',
+                                     node=node,
+                                     args=(field, ))
+            for field in named:
+                if field not in named_fields:
+                    self.add_message('unused-format-string-argument',
+                                     node=node,
+                                     args=(field, ))
+            # num_args can be 0 if manual_pos is not.
+            num_args = num_args or manual_pos
+            if positional or num_args:
+                empty = any(True for field in named_fields
+                            if field == '')
+                if named or empty:
+                    # Verify the required number of positional arguments
+                    # only if the .format got at least one keyword argument.
+                    # This means that the format strings accepts both
+                    # positional and named fields and we should warn
+                    # when one of the them is missing or is extra.
+                    check_args = True
+        else:
+            check_args = True
+        if check_args:
+            # num_args can be 0 if manual_pos is not.
+            num_args = num_args or manual_pos
+            if positional > num_args:
+                self.add_message('too-many-format-args', node=node)
+            elif positional < num_args:
+                self.add_message('too-few-format-args', node=node)
+
+        self._check_new_format_specifiers(node, fields, named)
+
+    def _check_new_format_specifiers(self, node, fields, named):
+        """
+        Check attribute and index access in the format
+        string ("{0.a}" and "{0[a]}").
+        """
+        for key, specifiers in fields:
+            # Obtain the argument. If it can't be obtained
+            # or infered, skip this check.
+            if key == '':
+                # {[0]} will have an unnamed argument, defaulting
+                # to 0. It will not be present in `named`, so use the value
+                # 0 for it.
+                key = 0
+            if isinstance(key, numbers.Number):
+                try:
+                    argname = utils.get_argument_from_call(node, key)
+                except utils.NoSuchArgumentError:
+                    continue
+            else:
+                if key not in named:
+                    continue
+                argname = named[key]
+            if argname in (astroid.YES, None):
+                continue
+            try:
+                argument = next(argname.infer())
+            except astroid.InferenceError:
+                continue
+            if not specifiers or argument is astroid.YES:
+                # No need to check this key if it doesn't
+                # use attribute / item access
+                continue
+            if argument.parent and isinstance(argument.parent, astroid.Arguments):
+                # Ignore any object coming from an argument,
+                # because we can't infer its value properly.
+                continue
+            previous = argument
+            parsed = []
+            for is_attribute, specifier in specifiers:
+                if previous is astroid.YES:
+                    break
+                parsed.append((is_attribute, specifier))
+                if is_attribute:
+                    try:
+                        previous = previous.getattr(specifier)[0]
+                    except astroid.NotFoundError:
+                        if (hasattr(previous, 'has_dynamic_getattr') and
+                                previous.has_dynamic_getattr()):
+                            # Don't warn if the object has a custom __getattr__
+                            break
+                        path = get_access_path(key, parsed)
+                        self.add_message('missing-format-attribute',
+                                         args=(specifier, path),
+                                         node=node)
+                        break
+                else:
+                    warn_error = False
+                    if hasattr(previous, 'getitem'):
+                        try:
+                            previous = previous.getitem(specifier)
+                        except (IndexError, TypeError):
+                            warn_error = True
+                    else:
+                        try:
+                            # Lookup __getitem__ in the current node,
+                            # but skip further checks, because we can't
+                            # retrieve the looked object
+                            previous.getattr('__getitem__')
+                            break
+                        except astroid.NotFoundError:
+                            warn_error = True
+                    if warn_error:
+                        path = get_access_path(key, parsed)
+                        self.add_message('invalid-format-index',
+                                         args=(specifier, path),
+                                         node=node)
+                        break
+
+                try:
+                    previous = next(previous.infer())
+                except astroid.InferenceError:
+                    # can't check further if we can't infer it
+                    break
+
+
+
+class StringConstantChecker(BaseTokenChecker):
+    """Check string literals"""
+    __implements__ = (ITokenChecker, IRawChecker)
+    name = 'string_constant'
+    msgs = {
+        'W1401': ('Anomalous backslash in string: \'%s\'. '
+                  'String constant might be missing an r prefix.',
+                  'anomalous-backslash-in-string',
+                  'Used when a backslash is in a literal string but not as an '
+                  'escape.'),
+        'W1402': ('Anomalous Unicode escape in byte string: \'%s\'. '
+                  'String constant might be missing an r or u prefix.',
+                  'anomalous-unicode-escape-in-string',
+                  'Used when an escape like \\u is encountered in a byte '
+                  'string where it has no effect.'),
+        }
+
+    # Characters that have a special meaning after a backslash in either
+    # Unicode or byte strings.
+    ESCAPE_CHARACTERS = 'abfnrtvx\n\r\t\\\'\"01234567'
+
+    # TODO(mbp): Octal characters are quite an edge case today; people may
+    # prefer a separate warning where they occur.  \0 should be allowed.
+
+    # Characters that have a special meaning after a backslash but only in
+    # Unicode strings.
+    UNICODE_ESCAPE_CHARACTERS = 'uUN'
+
+    def process_module(self, module):
+        self._unicode_literals = 'unicode_literals' in module.future_imports
+
+    def process_tokens(self, tokens):
+        for (tok_type, token, (start_row, _), _, _) in tokens:
+            if tok_type == tokenize.STRING:
+                # 'token' is the whole un-parsed token; we can look at the start
+                # of it to see whether it's a raw or unicode string etc.
+                self.process_string_token(token, start_row)
+
+    def process_string_token(self, token, start_row):
+        for i, c in enumerate(token):
+            if c in '\'\"':
+                quote_char = c
+                break
+        # pylint: disable=undefined-loop-variable
+        prefix = token[:i].lower() #  markers like u, b, r.
+        after_prefix = token[i:]
+        if after_prefix[:3] == after_prefix[-3:] == 3 * quote_char:
+            string_body = after_prefix[3:-3]
+        else:
+            string_body = after_prefix[1:-1]  # Chop off quotes
+        # No special checks on raw strings at the moment.
+        if 'r' not in prefix:
+            self.process_non_raw_string_token(prefix, string_body, start_row)
+
+    def process_non_raw_string_token(self, prefix, string_body, start_row):
+        """check for bad escapes in a non-raw string.
+
+        prefix: lowercase string of eg 'ur' string prefix markers.
+        string_body: the un-parsed body of the string, not including the quote
+        marks.
+        start_row: integer line number in the source.
+        """
+        # Walk through the string; if we see a backslash then escape the next
+        # character, and skip over it.  If we see a non-escaped character,
+        # alert, and continue.
+        #
+        # Accept a backslash when it escapes a backslash, or a quote, or
+        # end-of-line, or one of the letters that introduce a special escape
+        # sequence <http://docs.python.org/reference/lexical_analysis.html>
+        #
+        # TODO(mbp): Maybe give a separate warning about the rarely-used
+        # \a \b \v \f?
+        #
+        # TODO(mbp): We could give the column of the problem character, but
+        # add_message doesn't seem to have a way to pass it through at present.
+        i = 0
+        while True:
+            i = string_body.find('\\', i)
+            if i == -1:
+                break
+            # There must be a next character; having a backslash at the end
+            # of the string would be a SyntaxError.
+            next_char = string_body[i+1]
+            match = string_body[i:i+2]
+            if next_char in self.UNICODE_ESCAPE_CHARACTERS:
+                if 'u' in prefix:
+                    pass
+                elif (_PY3K or self._unicode_literals) and 'b' not in prefix:
+                    pass  # unicode by default
+                else:
+                    self.add_message('anomalous-unicode-escape-in-string',
+                                     line=start_row, args=(match, ))
+            elif next_char not in self.ESCAPE_CHARACTERS:
+                self.add_message('anomalous-backslash-in-string',
+                                 line=start_row, args=(match, ))
+            # Whether it was a valid escape or not, backslash followed by
+            # another character can always be consumed whole: the second
+            # character can never be the start of a new backslash escape.
+            i += 2
+
+
+
+def register(linter):
+    """required method to auto register this checker """
+    linter.register_checker(StringFormatChecker(linter))
+    linter.register_checker(StringMethodsChecker(linter))
+    linter.register_checker(StringConstantChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/typecheck.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/typecheck.py
new file mode 100644
index 0000000..9f074ae
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/typecheck.py
@@ -0,0 +1,627 @@
+# Copyright (c) 2006-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""try to find more bugs in the code using astroid inference capabilities
+"""
+
+import re
+import shlex
+
+import astroid
+from astroid import InferenceError, NotFoundError, YES, Instance
+from astroid.bases import BUILTINS
+
+from pylint.interfaces import IAstroidChecker, INFERENCE, INFERENCE_FAILURE
+from pylint.checkers import BaseChecker
+from pylint.checkers.utils import (
+    safe_infer, is_super,
+    check_messages, decorated_with_property)
+
+MSGS = {
+    'E1101': ('%s %r has no %r member',
+              'no-member',
+              'Used when a variable is accessed for an unexistent member.',
+              {'old_names': [('E1103', 'maybe-no-member')]}),
+    'E1102': ('%s is not callable',
+              'not-callable',
+              'Used when an object being called has been inferred to a non \
+              callable object'),
+    'E1111': ('Assigning to function call which doesn\'t return',
+              'assignment-from-no-return',
+              'Used when an assignment is done on a function call but the \
+              inferred function doesn\'t return anything.'),
+    'W1111': ('Assigning to function call which only returns None',
+              'assignment-from-none',
+              'Used when an assignment is done on a function call but the \
+              inferred function returns nothing but None.'),
+
+    'E1120': ('No value for argument %s in %s call',
+              'no-value-for-parameter',
+              'Used when a function call passes too few arguments.'),
+    'E1121': ('Too many positional arguments for %s call',
+              'too-many-function-args',
+              'Used when a function call passes too many positional \
+              arguments.'),
+    'E1123': ('Unexpected keyword argument %r in %s call',
+              'unexpected-keyword-arg',
+              'Used when a function call passes a keyword argument that \
+              doesn\'t correspond to one of the function\'s parameter names.'),
+    'E1124': ('Argument %r passed by position and keyword in %s call',
+              'redundant-keyword-arg',
+              'Used when a function call would result in assigning multiple \
+              values to a function parameter, one value from a positional \
+              argument and one from a keyword argument.'),
+    'E1125': ('Missing mandatory keyword argument %r in %s call',
+              'missing-kwoa',
+              ('Used when a function call does not pass a mandatory'
+               ' keyword-only argument.'),
+              {'minversion': (3, 0)}),
+    'E1126': ('Sequence index is not an int, slice, or instance with __index__',
+              'invalid-sequence-index',
+              'Used when a sequence type is indexed with an invalid type. '
+              'Valid types are ints, slices, and objects with an __index__ '
+              'method.'),
+    'E1127': ('Slice index is not an int, None, or instance with __index__',
+              'invalid-slice-index',
+              'Used when a slice index is not an integer, None, or an object \
+               with an __index__ method.'),
+    }
+
+# builtin sequence types in Python 2 and 3.
+SEQUENCE_TYPES = set(['str', 'unicode', 'list', 'tuple', 'bytearray',
+                      'xrange', 'range', 'bytes', 'memoryview'])
+
+def _determine_callable(callable_obj):
+    # Ordering is important, since BoundMethod is a subclass of UnboundMethod,
+    # and Function inherits Lambda.
+    if isinstance(callable_obj, astroid.BoundMethod):
+        # Bound methods have an extra implicit 'self' argument.
+        return callable_obj, 1, callable_obj.type
+    elif isinstance(callable_obj, astroid.UnboundMethod):
+        return callable_obj, 0, 'unbound method'
+    elif isinstance(callable_obj, astroid.Function):
+        return callable_obj, 0, callable_obj.type
+    elif isinstance(callable_obj, astroid.Lambda):
+        return callable_obj, 0, 'lambda'
+    elif isinstance(callable_obj, astroid.Class):
+        # Class instantiation, lookup __new__ instead.
+        # If we only find object.__new__, we can safely check __init__
+        # instead.
+        try:
+            # Use the last definition of __new__.
+            new = callable_obj.local_attr('__new__')[-1]
+        except astroid.NotFoundError:
+            new = None
+
+        if not new or new.parent.scope().name == 'object':
+            try:
+                # Use the last definition of __init__.
+                callable_obj = callable_obj.local_attr('__init__')[-1]
+            except astroid.NotFoundError:
+                # do nothing, covered by no-init.
+                raise ValueError
+        else:
+            callable_obj = new
+
+        if not isinstance(callable_obj, astroid.Function):
+            raise ValueError
+        # both have an extra implicit 'cls'/'self' argument.
+        return callable_obj, 1, 'constructor'
+    else:
+        raise ValueError
+
+class TypeChecker(BaseChecker):
+    """try to find bugs in the code using type inference
+    """
+
+    __implements__ = (IAstroidChecker,)
+
+    # configuration section name
+    name = 'typecheck'
+    # messages
+    msgs = MSGS
+    priority = -1
+    # configuration options
+    options = (('ignore-mixin-members',
+                {'default' : True, 'type' : 'yn', 'metavar': '<y_or_n>',
+                 'help' : 'Tells whether missing members accessed in mixin \
+class should be ignored. A mixin class is detected if its name ends with \
+"mixin" (case insensitive).'}
+               ),
+               ('ignored-modules',
+                {'default': (),
+                 'type': 'csv',
+                 'metavar': '<module names>',
+                 'help': 'List of module names for which member attributes \
+should not be checked (useful for modules/projects where namespaces are \
+manipulated during runtime and thus existing member attributes cannot be \
+deduced by static analysis'},
+               ),
+               ('ignored-classes',
+                {'default' : ('SQLObject',),
+                 'type' : 'csv',
+                 'metavar' : '<members names>',
+                 'help' : 'List of classes names for which member attributes \
+should not be checked (useful for classes with attributes dynamically set).'}
+               ),
+
+               ('zope',
+                {'default' : False, 'type' : 'yn', 'metavar': '<y_or_n>',
+                 'help' : 'When zope mode is activated, add a predefined set \
+of Zope acquired attributes to generated-members.'}
+               ),
+               ('generated-members',
+                {'default' : ('REQUEST', 'acl_users', 'aq_parent'),
+                 'type' : 'string',
+                 'metavar' : '<members names>',
+                 'help' : 'List of members which are set dynamically and \
+missed by pylint inference system, and so shouldn\'t trigger E0201 when \
+accessed. Python regular expressions are accepted.'}
+               ),
+              )
+
+    def open(self):
+        # do this in open since config not fully initialized in __init__
+        self.generated_members = list(self.config.generated_members)
+        if self.config.zope:
+            self.generated_members.extend(('REQUEST', 'acl_users', 'aq_parent'))
+
+    def visit_assattr(self, node):
+        if isinstance(node.ass_type(), astroid.AugAssign):
+            self.visit_getattr(node)
+
+    def visit_delattr(self, node):
+        self.visit_getattr(node)
+
+    @check_messages('no-member')
+    def visit_getattr(self, node):
+        """check that the accessed attribute exists
+
+        to avoid to much false positives for now, we'll consider the code as
+        correct if a single of the inferred nodes has the accessed attribute.
+
+        function/method, super call and metaclasses are ignored
+        """
+        # generated_members may containt regular expressions
+        # (surrounded by quote `"` and followed by a comma `,`)
+        # REQUEST,aq_parent,"[a-zA-Z]+_set{1,2}"' =>
+        # ('REQUEST', 'aq_parent', '[a-zA-Z]+_set{1,2}')
+        if isinstance(self.config.generated_members, str):
+            gen = shlex.shlex(self.config.generated_members)
+            gen.whitespace += ','
+            gen.wordchars += '[]-+'
+            self.config.generated_members = tuple(tok.strip('"') for tok in gen)
+        for pattern in self.config.generated_members:
+            # attribute is marked as generated, stop here
+            if re.match(pattern, node.attrname):
+                return
+        try:
+            infered = list(node.expr.infer())
+        except InferenceError:
+            return
+        # list of (node, nodename) which are missing the attribute
+        missingattr = set()
+        ignoremim = self.config.ignore_mixin_members
+        inference_failure = False
+        for owner in infered:
+            # skip yes object
+            if owner is YES:
+                inference_failure = True
+                continue
+            # skip None anyway
+            if isinstance(owner, astroid.Const) and owner.value is None:
+                continue
+            # XXX "super" / metaclass call
+            if is_super(owner) or getattr(owner, 'type', None) == 'metaclass':
+                continue
+            name = getattr(owner, 'name', 'None')
+            if name in self.config.ignored_classes:
+                continue
+            if ignoremim and name[-5:].lower() == 'mixin':
+                continue
+            try:
+                if not [n for n in owner.getattr(node.attrname)
+                        if not isinstance(n.statement(), astroid.AugAssign)]:
+                    missingattr.add((owner, name))
+                    continue
+            except AttributeError:
+                # XXX method / function
+                continue
+            except NotFoundError:
+                if isinstance(owner, astroid.Function) and owner.decorators:
+                    continue
+                if isinstance(owner, Instance) and owner.has_dynamic_getattr():
+                    continue
+                # explicit skipping of module member access
+                if owner.root().name in self.config.ignored_modules:
+                    continue
+                if isinstance(owner, astroid.Class):
+                    # Look up in the metaclass only if the owner is itself
+                    # a class.
+                    # TODO: getattr doesn't return by default members
+                    # from the metaclass, because handling various cases
+                    # of methods accessible from the metaclass itself
+                    # and/or subclasses only is too complicated for little to
+                    # no benefit.
+                    metaclass = owner.metaclass()
+                    try:
+                        if metaclass and metaclass.getattr(node.attrname):
+                            continue
+                    except NotFoundError:
+                        pass
+                missingattr.add((owner, name))
+                continue
+            # stop on the first found
+            break
+        else:
+            # we have not found any node with the attributes, display the
+            # message for infered nodes
+            done = set()
+            for owner, name in missingattr:
+                if isinstance(owner, Instance):
+                    actual = owner._proxied
+                else:
+                    actual = owner
+                if actual in done:
+                    continue
+                done.add(actual)
+                confidence = INFERENCE if not inference_failure else INFERENCE_FAILURE
+                self.add_message('no-member', node=node,
+                                 args=(owner.display_type(), name,
+                                       node.attrname),
+                                 confidence=confidence)
+
+    @check_messages('assignment-from-no-return', 'assignment-from-none')
+    def visit_assign(self, node):
+        """check that if assigning to a function call, the function is
+        possibly returning something valuable
+        """
+        if not isinstance(node.value, astroid.CallFunc):
+            return
+        function_node = safe_infer(node.value.func)
+        # skip class, generator and incomplete function definition
+        if not (isinstance(function_node, astroid.Function) and
+                function_node.root().fully_defined()):
+            return
+        if function_node.is_generator() \
+               or function_node.is_abstract(pass_is_abstract=False):
+            return
+        returns = list(function_node.nodes_of_class(astroid.Return,
+                                                    skip_klass=astroid.Function))
+        if len(returns) == 0:
+            self.add_message('assignment-from-no-return', node=node)
+        else:
+            for rnode in returns:
+                if not (isinstance(rnode.value, astroid.Const)
+                        and rnode.value.value is None
+                        or rnode.value is None):
+                    break
+            else:
+                self.add_message('assignment-from-none', node=node)
+
+    def _check_uninferable_callfunc(self, node):
+        """
+        Check that the given uninferable CallFunc node does not
+        call an actual function.
+        """
+        if not isinstance(node.func, astroid.Getattr):
+            return
+
+        # Look for properties. First, obtain
+        # the lhs of the Getattr node and search the attribute
+        # there. If that attribute is a property or a subclass of properties,
+        # then most likely it's not callable.
+
+        # TODO: since astroid doesn't understand descriptors very well
+        # we will not handle them here, right now.
+
+        expr = node.func.expr
+        klass = safe_infer(expr)
+        if (klass is None or klass is astroid.YES or
+                not isinstance(klass, astroid.Instance)):
+            return
+
+        try:
+            attrs = klass._proxied.getattr(node.func.attrname)
+        except astroid.NotFoundError:
+            return
+
+        for attr in attrs:
+            if attr is astroid.YES:
+                continue
+            if not isinstance(attr, astroid.Function):
+                continue
+
+            # Decorated, see if it is decorated with a property.
+            # Also, check the returns and see if they are callable.
+            if decorated_with_property(attr):
+                if all(return_node.callable()
+                       for return_node in attr.infer_call_result(node)):
+                    continue
+                else:
+                    self.add_message('not-callable', node=node,
+                                     args=node.func.as_string())
+                    break
+
+    @check_messages(*(list(MSGS.keys())))
+    def visit_callfunc(self, node):
+        """check that called functions/methods are inferred to callable objects,
+        and that the arguments passed to the function match the parameters in
+        the inferred function's definition
+        """
+        # Build the set of keyword arguments, checking for duplicate keywords,
+        # and count the positional arguments.
+        keyword_args = set()
+        num_positional_args = 0
+        for arg in node.args:
+            if isinstance(arg, astroid.Keyword):
+                keyword_args.add(arg.arg)
+            else:
+                num_positional_args += 1
+
+        called = safe_infer(node.func)
+        # only function, generator and object defining __call__ are allowed
+        if called is not None and not called.callable():
+            self.add_message('not-callable', node=node,
+                             args=node.func.as_string())
+
+        self._check_uninferable_callfunc(node)
+
+        try:
+            called, implicit_args, callable_name = _determine_callable(called)
+        except ValueError:
+            # Any error occurred during determining the function type, most of
+            # those errors are handled by different warnings.
+            return
+        num_positional_args += implicit_args
+        if called.args.args is None:
+            # Built-in functions have no argument information.
+            return
+
+        if len(called.argnames()) != len(set(called.argnames())):
+            # Duplicate parameter name (see E9801).  We can't really make sense
+            # of the function call in this case, so just return.
+            return
+
+        # Analyze the list of formal parameters.
+        num_mandatory_parameters = len(called.args.args) - len(called.args.defaults)
+        parameters = []
+        parameter_name_to_index = {}
+        for i, arg in enumerate(called.args.args):
+            if isinstance(arg, astroid.Tuple):
+                name = None
+                # Don't store any parameter names within the tuple, since those
+                # are not assignable from keyword arguments.
+            else:
+                if isinstance(arg, astroid.Keyword):
+                    name = arg.arg
+                else:
+                    assert isinstance(arg, astroid.AssName)
+                    # This occurs with:
+                    #    def f( (a), (b) ): pass
+                    name = arg.name
+                parameter_name_to_index[name] = i
+            if i >= num_mandatory_parameters:
+                defval = called.args.defaults[i - num_mandatory_parameters]
+            else:
+                defval = None
+            parameters.append([(name, defval), False])
+
+        kwparams = {}
+        for i, arg in enumerate(called.args.kwonlyargs):
+            if isinstance(arg, astroid.Keyword):
+                name = arg.arg
+            else:
+                assert isinstance(arg, astroid.AssName)
+                name = arg.name
+            kwparams[name] = [called.args.kw_defaults[i], False]
+
+        # Match the supplied arguments against the function parameters.
+
+        # 1. Match the positional arguments.
+        for i in range(num_positional_args):
+            if i < len(parameters):
+                parameters[i][1] = True
+            elif called.args.vararg is not None:
+                # The remaining positional arguments get assigned to the *args
+                # parameter.
+                break
+            else:
+                # Too many positional arguments.
+                self.add_message('too-many-function-args',
+                                 node=node, args=(callable_name,))
+                break
+
+        # 2. Match the keyword arguments.
+        for keyword in keyword_args:
+            if keyword in parameter_name_to_index:
+                i = parameter_name_to_index[keyword]
+                if parameters[i][1]:
+                    # Duplicate definition of function parameter.
+                    self.add_message('redundant-keyword-arg',
+                                     node=node, args=(keyword, callable_name))
+                else:
+                    parameters[i][1] = True
+            elif keyword in kwparams:
+                if kwparams[keyword][1]:  # XXX is that even possible?
+                    # Duplicate definition of function parameter.
+                    self.add_message('redundant-keyword-arg', node=node,
+                                     args=(keyword, callable_name))
+                else:
+                    kwparams[keyword][1] = True
+            elif called.args.kwarg is not None:
+                # The keyword argument gets assigned to the **kwargs parameter.
+                pass
+            else:
+                # Unexpected keyword argument.
+                self.add_message('unexpected-keyword-arg', node=node,
+                                 args=(keyword, callable_name))
+
+        # 3. Match the *args, if any.  Note that Python actually processes
+        #    *args _before_ any keyword arguments, but we wait until after
+        #    looking at the keyword arguments so as to make a more conservative
+        #    guess at how many values are in the *args sequence.
+        if node.starargs is not None:
+            for i in range(num_positional_args, len(parameters)):
+                [(name, defval), assigned] = parameters[i]
+                # Assume that *args provides just enough values for all
+                # non-default parameters after the last parameter assigned by
+                # the positional arguments but before the first parameter
+                # assigned by the keyword arguments.  This is the best we can
+                # get without generating any false positives.
+                if (defval is not None) or assigned:
+                    break
+                parameters[i][1] = True
+
+        # 4. Match the **kwargs, if any.
+        if node.kwargs is not None:
+            for i, [(name, defval), assigned] in enumerate(parameters):
+                # Assume that *kwargs provides values for all remaining
+                # unassigned named parameters.
+                if name is not None:
+                    parameters[i][1] = True
+                else:
+                    # **kwargs can't assign to tuples.
+                    pass
+
+        # Check that any parameters without a default have been assigned
+        # values.
+        for [(name, defval), assigned] in parameters:
+            if (defval is None) and not assigned:
+                if name is None:
+                    display_name = '<tuple>'
+                else:
+                    display_name = repr(name)
+                self.add_message('no-value-for-parameter', node=node,
+                                 args=(display_name, callable_name))
+
+        for name in kwparams:
+            defval, assigned = kwparams[name]
+            if defval is None and not assigned:
+                self.add_message('missing-kwoa', node=node,
+                                 args=(name, callable_name))
+
+    @check_messages('invalid-sequence-index')
+    def visit_extslice(self, node):
+        # Check extended slice objects as if they were used as a sequence
+        # index to check if the object being sliced can support them
+        return self.visit_index(node)
+
+    @check_messages('invalid-sequence-index')
+    def visit_index(self, node):
+        if not node.parent or not hasattr(node.parent, "value"):
+            return
+
+        # Look for index operations where the parent is a sequence type.
+        # If the types can be determined, only allow indices to be int,
+        # slice or instances with __index__.
+
+        parent_type = safe_infer(node.parent.value)
+        if not isinstance(parent_type, (astroid.Class, astroid.Instance)):
+            return
+
+        # Determine what method on the parent this index will use
+        # The parent of this node will be a Subscript, and the parent of that
+        # node determines if the Subscript is a get, set, or delete operation.
+        operation = node.parent.parent
+        if isinstance(operation, astroid.Assign):
+            methodname = '__setitem__'
+        elif isinstance(operation, astroid.Delete):
+            methodname = '__delitem__'
+        else:
+            methodname = '__getitem__'
+
+        # Check if this instance's __getitem__, __setitem__, or __delitem__, as
+        # appropriate to the statement, is implemented in a builtin sequence
+        # type. This way we catch subclasses of sequence types but skip classes
+        # that override __getitem__ and which may allow non-integer indices.
+        try:
+            methods = parent_type.getattr(methodname)
+            if methods is astroid.YES:
+                return
+            itemmethod = methods[0]
+        except (astroid.NotFoundError, IndexError):
+            return
+
+        if not isinstance(itemmethod, astroid.Function):
+            return
+        if itemmethod.root().name != BUILTINS:
+            return
+        if not itemmethod.parent:
+            return
+        if itemmethod.parent.name not in SEQUENCE_TYPES:
+            return
+
+        # For ExtSlice objects coming from visit_extslice, no further
+        # inference is necessary, since if we got this far the ExtSlice
+        # is an error.
+        if isinstance(node, astroid.ExtSlice):
+            index_type = node
+        else:
+            index_type = safe_infer(node)
+        if index_type is None or index_type is astroid.YES:
+            return
+
+        # Constants must be of type int
+        if isinstance(index_type, astroid.Const):
+            if isinstance(index_type.value, int):
+                return
+        # Instance values must be int, slice, or have an __index__ method
+        elif isinstance(index_type, astroid.Instance):
+            if index_type.pytype() in (BUILTINS + '.int', BUILTINS + '.slice'):
+                return
+            try:
+                index_type.getattr('__index__')
+                return
+            except astroid.NotFoundError:
+                pass
+
+        # Anything else is an error
+        self.add_message('invalid-sequence-index', node=node)
+
+    @check_messages('invalid-slice-index')
+    def visit_slice(self, node):
+        # Check the type of each part of the slice
+        for index in (node.lower, node.upper, node.step):
+            if index is None:
+                continue
+
+            index_type = safe_infer(index)
+            if index_type is None or index_type is astroid.YES:
+                continue
+
+            # Constants must of type int or None
+            if isinstance(index_type, astroid.Const):
+                if isinstance(index_type.value, (int, type(None))):
+                    continue
+            # Instance values must be of type int, None or an object
+            # with __index__
+            elif isinstance(index_type, astroid.Instance):
+                if index_type.pytype() in (BUILTINS + '.int',
+                                           BUILTINS + '.NoneType'):
+                    continue
+
+                try:
+                    index_type.getattr('__index__')
+                    return
+                except astroid.NotFoundError:
+                    pass
+
+            # Anything else is an error
+            self.add_message('invalid-slice-index', node=node)
+
+def register(linter):
+    """required method to auto register this checker """
+    linter.register_checker(TypeChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/utils.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/utils.py
new file mode 100644
index 0000000..2cb01d5
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/utils.py
@@ -0,0 +1,564 @@
+# pylint: disable=W0611
+#
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""some functions that may be useful for various checkers
+"""
+
+import re
+import sys
+import string
+
+import astroid
+from astroid import scoped_nodes
+from logilab.common.compat import builtins
+
+BUILTINS_NAME = builtins.__name__
+COMP_NODE_TYPES = astroid.ListComp, astroid.SetComp, astroid.DictComp, astroid.GenExpr
+PY3K = sys.version_info[0] == 3
+
+if not PY3K:
+    EXCEPTIONS_MODULE = "exceptions"
+else:
+    EXCEPTIONS_MODULE = "builtins"
+ABC_METHODS = set(('abc.abstractproperty', 'abc.abstractmethod',
+                   'abc.abstractclassmethod', 'abc.abstractstaticmethod'))
+
+
+class NoSuchArgumentError(Exception):
+    pass
+
+def is_inside_except(node):
+    """Returns true if node is inside the name of an except handler."""
+    current = node
+    while current and not isinstance(current.parent, astroid.ExceptHandler):
+        current = current.parent
+
+    return current and current is current.parent.name
+
+
+def get_all_elements(node):
+    """Recursively returns all atoms in nested lists and tuples."""
+    if isinstance(node, (astroid.Tuple, astroid.List)):
+        for child in node.elts:
+            for e in get_all_elements(child):
+                yield e
+    else:
+        yield node
+
+
+def clobber_in_except(node):
+    """Checks if an assignment node in an except handler clobbers an existing
+    variable.
+
+    Returns (True, args for W0623) if assignment clobbers an existing variable,
+    (False, None) otherwise.
+    """
+    if isinstance(node, astroid.AssAttr):
+        return (True, (node.attrname, 'object %r' % (node.expr.as_string(),)))
+    elif isinstance(node, astroid.AssName):
+        name = node.name
+        if is_builtin(name):
+            return (True, (name, 'builtins'))
+        else:
+            stmts = node.lookup(name)[1]
+            if (stmts and not isinstance(stmts[0].ass_type(),
+                                         (astroid.Assign, astroid.AugAssign,
+                                          astroid.ExceptHandler))):
+                return (True, (name, 'outer scope (line %s)' % stmts[0].fromlineno))
+    return (False, None)
+
+
+def safe_infer(node):
+    """return the inferred value for the given node.
+    Return None if inference failed or if there is some ambiguity (more than
+    one node has been inferred)
+    """
+    try:
+        inferit = node.infer()
+        value = next(inferit)
+    except astroid.InferenceError:
+        return
+    try:
+        next(inferit)
+        return # None if there is ambiguity on the inferred node
+    except astroid.InferenceError:
+        return # there is some kind of ambiguity
+    except StopIteration:
+        return value
+
+def is_super(node):
+    """return True if the node is referencing the "super" builtin function
+    """
+    if getattr(node, 'name', None) == 'super' and \
+           node.root().name == BUILTINS_NAME:
+        return True
+    return False
+
+def is_error(node):
+    """return true if the function does nothing but raising an exception"""
+    for child_node in node.get_children():
+        if isinstance(child_node, astroid.Raise):
+            return True
+        return False
+
+def is_raising(body):
+    """return true if the given statement node raise an exception"""
+    for node in body:
+        if isinstance(node, astroid.Raise):
+            return True
+    return False
+
+def is_empty(body):
+    """return true if the given node does nothing but 'pass'"""
+    return len(body) == 1 and isinstance(body[0], astroid.Pass)
+
+builtins = builtins.__dict__.copy()
+SPECIAL_BUILTINS = ('__builtins__',) # '__path__', '__file__')
+
+def is_builtin_object(node):
+    """Returns True if the given node is an object from the __builtin__ module."""
+    return node and node.root().name == BUILTINS_NAME
+
+def is_builtin(name): # was is_native_builtin
+    """return true if <name> could be considered as a builtin defined by python
+    """
+    if name in builtins:
+        return True
+    if name in SPECIAL_BUILTINS:
+        return True
+    return False
+
+def is_defined_before(var_node):
+    """return True if the variable node is defined by a parent node (list,
+    set, dict, or generator comprehension, lambda) or in a previous sibling
+    node on the same line (statement_defining ; statement_using)
+    """
+    varname = var_node.name
+    _node = var_node.parent
+    while _node:
+        if isinstance(_node, COMP_NODE_TYPES):
+            for ass_node in _node.nodes_of_class(astroid.AssName):
+                if ass_node.name == varname:
+                    return True
+        elif isinstance(_node, astroid.For):
+            for ass_node in _node.target.nodes_of_class(astroid.AssName):
+                if ass_node.name == varname:
+                    return True
+        elif isinstance(_node, astroid.With):
+            for expr, ids in _node.items:
+                if expr.parent_of(var_node):
+                    break
+                if (ids and
+                        isinstance(ids, astroid.AssName) and
+                        ids.name == varname):
+                    return True
+        elif isinstance(_node, (astroid.Lambda, astroid.Function)):
+            if _node.args.is_argument(varname):
+                return True
+            if getattr(_node, 'name', None) == varname:
+                return True
+            break
+        elif isinstance(_node, astroid.ExceptHandler):
+            if isinstance(_node.name, astroid.AssName):
+                ass_node = _node.name
+                if ass_node.name == varname:
+                    return True
+        _node = _node.parent
+    # possibly multiple statements on the same line using semi colon separator
+    stmt = var_node.statement()
+    _node = stmt.previous_sibling()
+    lineno = stmt.fromlineno
+    while _node and _node.fromlineno == lineno:
+        for ass_node in _node.nodes_of_class(astroid.AssName):
+            if ass_node.name == varname:
+                return True
+        for imp_node in _node.nodes_of_class((astroid.From, astroid.Import)):
+            if varname in [name[1] or name[0] for name in imp_node.names]:
+                return True
+        _node = _node.previous_sibling()
+    return False
+
+def is_func_default(node):
+    """return true if the given Name node is used in function default argument's
+    value
+    """
+    parent = node.scope()
+    if isinstance(parent, astroid.Function):
+        for default_node in parent.args.defaults:
+            for default_name_node in default_node.nodes_of_class(astroid.Name):
+                if default_name_node is node:
+                    return True
+    return False
+
+def is_func_decorator(node):
+    """return true if the name is used in function decorator"""
+    parent = node.parent
+    while parent is not None:
+        if isinstance(parent, astroid.Decorators):
+            return True
+        if (parent.is_statement or
+                isinstance(parent, astroid.Lambda) or
+                isinstance(parent, (scoped_nodes.ComprehensionScope,
+                                    scoped_nodes.ListComp))):
+            break
+        parent = parent.parent
+    return False
+
+def is_ancestor_name(frame, node):
+    """return True if `frame` is a astroid.Class node with `node` in the
+    subtree of its bases attribute
+    """
+    try:
+        bases = frame.bases
+    except AttributeError:
+        return False
+    for base in bases:
+        if node in base.nodes_of_class(astroid.Name):
+            return True
+    return False
+
+def assign_parent(node):
+    """return the higher parent which is not an AssName, Tuple or List node
+    """
+    while node and isinstance(node, (astroid.AssName,
+                                     astroid.Tuple,
+                                     astroid.List)):
+        node = node.parent
+    return node
+
+def overrides_an_abstract_method(class_node, name):
+    """return True if pnode is a parent of node"""
+    for ancestor in class_node.ancestors():
+        if name in ancestor and isinstance(ancestor[name], astroid.Function) and \
+               ancestor[name].is_abstract(pass_is_abstract=False):
+            return True
+    return False
+
+def overrides_a_method(class_node, name):
+    """return True if <name> is a method overridden from an ancestor"""
+    for ancestor in class_node.ancestors():
+        if name in ancestor and isinstance(ancestor[name], astroid.Function):
+            return True
+    return False
+
+PYMETHODS = set(('__new__', '__init__', '__del__', '__hash__',
+                 '__str__', '__repr__',
+                 '__len__', '__iter__',
+                 '__delete__', '__get__', '__set__',
+                 '__getitem__', '__setitem__', '__delitem__', '__contains__',
+                 '__getattribute__', '__getattr__', '__setattr__', '__delattr__',
+                 '__call__',
+                 '__enter__', '__exit__',
+                 '__cmp__', '__ge__', '__gt__', '__le__', '__lt__', '__eq__',
+                 '__nonzero__', '__neg__', '__invert__',
+                 '__mul__', '__imul__', '__rmul__',
+                 '__div__', '__idiv__', '__rdiv__',
+                 '__add__', '__iadd__', '__radd__',
+                 '__sub__', '__isub__', '__rsub__',
+                 '__pow__', '__ipow__', '__rpow__',
+                 '__mod__', '__imod__', '__rmod__',
+                 '__and__', '__iand__', '__rand__',
+                 '__or__', '__ior__', '__ror__',
+                 '__xor__', '__ixor__', '__rxor__',
+                 # XXX To be continued
+                ))
+
+def check_messages(*messages):
+    """decorator to store messages that are handled by a checker method"""
+
+    def store_messages(func):
+        func.checks_msgs = messages
+        return func
+    return store_messages
+
+class IncompleteFormatString(Exception):
+    """A format string ended in the middle of a format specifier."""
+    pass
+
+class UnsupportedFormatCharacter(Exception):
+    """A format character in a format string is not one of the supported
+    format characters."""
+    def __init__(self, index):
+        Exception.__init__(self, index)
+        self.index = index
+
+def parse_format_string(format_string):
+    """Parses a format string, returning a tuple of (keys, num_args), where keys
+    is the set of mapping keys in the format string, and num_args is the number
+    of arguments required by the format string.  Raises
+    IncompleteFormatString or UnsupportedFormatCharacter if a
+    parse error occurs."""
+    keys = set()
+    num_args = 0
+    def next_char(i):
+        i += 1
+        if i == len(format_string):
+            raise IncompleteFormatString
+        return (i, format_string[i])
+    i = 0
+    while i < len(format_string):
+        char = format_string[i]
+        if char == '%':
+            i, char = next_char(i)
+            # Parse the mapping key (optional).
+            key = None
+            if char == '(':
+                depth = 1
+                i, char = next_char(i)
+                key_start = i
+                while depth != 0:
+                    if char == '(':
+                        depth += 1
+                    elif char == ')':
+                        depth -= 1
+                    i, char = next_char(i)
+                key_end = i - 1
+                key = format_string[key_start:key_end]
+
+            # Parse the conversion flags (optional).
+            while char in '#0- +':
+                i, char = next_char(i)
+            # Parse the minimum field width (optional).
+            if char == '*':
+                num_args += 1
+                i, char = next_char(i)
+            else:
+                while char in string.digits:
+                    i, char = next_char(i)
+            # Parse the precision (optional).
+            if char == '.':
+                i, char = next_char(i)
+                if char == '*':
+                    num_args += 1
+                    i, char = next_char(i)
+                else:
+                    while char in string.digits:
+                        i, char = next_char(i)
+            # Parse the length modifier (optional).
+            if char in 'hlL':
+                i, char = next_char(i)
+            # Parse the conversion type (mandatory).
+            if PY3K:
+                flags = 'diouxXeEfFgGcrs%a'
+            else:
+                flags = 'diouxXeEfFgGcrs%'
+            if char not in flags:
+                raise UnsupportedFormatCharacter(i)
+            if key:
+                keys.add(key)
+            elif char != '%':
+                num_args += 1
+        i += 1
+    return keys, num_args
+
+
+def is_attr_protected(attrname):
+    """return True if attribute name is protected (start with _ and some other
+    details), False otherwise.
+    """
+    return attrname[0] == '_' and not attrname == '_' and not (
+        attrname.startswith('__') and attrname.endswith('__'))
+
+def node_frame_class(node):
+    """return klass node for a method node (or a staticmethod or a
+    classmethod), return null otherwise
+    """
+    klass = node.frame()
+
+    while klass is not None and not isinstance(klass, astroid.Class):
+        if klass.parent is None:
+            klass = None
+        else:
+            klass = klass.parent.frame()
+
+    return klass
+
+def is_super_call(expr):
+    """return True if expression node is a function call and if function name
+    is super. Check before that you're in a method.
+    """
+    return (isinstance(expr, astroid.CallFunc) and
+            isinstance(expr.func, astroid.Name) and
+            expr.func.name == 'super')
+
+def is_attr_private(attrname):
+    """Check that attribute name is private (at least two leading underscores,
+    at most one trailing underscore)
+    """
+    regex = re.compile('^_{2,}.*[^_]+_?$')
+    return regex.match(attrname)
+
+def get_argument_from_call(callfunc_node, position=None, keyword=None):
+    """Returns the specified argument from a function call.
+
+    :param callfunc_node: Node representing a function call to check.
+    :param int position: position of the argument.
+    :param str keyword: the keyword of the argument.
+
+    :returns: The node representing the argument, None if the argument is not found.
+    :raises ValueError: if both position and keyword are None.
+    :raises NoSuchArgumentError: if no argument at the provided position or with
+    the provided keyword.
+    """
+    if position is None and keyword is None:
+        raise ValueError('Must specify at least one of: position or keyword.')
+    try:
+        if position is not None and not isinstance(callfunc_node.args[position], astroid.Keyword):
+            return callfunc_node.args[position]
+    except IndexError as error:
+        raise NoSuchArgumentError(error)
+    if keyword:
+        for arg in callfunc_node.args:
+            if isinstance(arg, astroid.Keyword) and arg.arg == keyword:
+                return arg.value
+    raise NoSuchArgumentError
+
+def inherit_from_std_ex(node):
+    """
+    Return true if the given class node is subclass of
+    exceptions.Exception.
+    """
+    if node.name in ('Exception', 'BaseException') \
+            and node.root().name == EXCEPTIONS_MODULE:
+        return True
+    return any(inherit_from_std_ex(parent)
+               for parent in node.ancestors(recurs=False))
+
+def is_import_error(handler):
+    """
+    Check if the given exception handler catches
+    ImportError.
+
+    :param handler: A node, representing an ExceptHandler node.
+    :returns: True if the handler catches ImportError, False otherwise.
+    """
+    names = None
+    if isinstance(handler.type, astroid.Tuple):
+        names = [name for name in handler.type.elts
+                 if isinstance(name, astroid.Name)]
+    elif isinstance(handler.type, astroid.Name):
+        names = [handler.type]
+    else:
+        # Don't try to infer that.
+        return
+    for name in names:
+        try:
+            for infered in name.infer():
+                if (isinstance(infered, astroid.Class) and
+                        inherit_from_std_ex(infered) and
+                        infered.name == 'ImportError'):
+                    return True
+        except astroid.InferenceError:
+            continue
+
+def has_known_bases(klass):
+    """Returns true if all base classes of a class could be inferred."""
+    try:
+        return klass._all_bases_known
+    except AttributeError:
+        pass
+    for base in klass.bases:
+        result = safe_infer(base)
+        # TODO: check for A->B->A->B pattern in class structure too?
+        if (not isinstance(result, astroid.Class) or
+                result is klass or
+                not has_known_bases(result)):
+            klass._all_bases_known = False
+            return False
+    klass._all_bases_known = True
+    return True
+
+def decorated_with_property(node):
+    """ Detect if the given function node is decorated with a property. """
+    if not node.decorators:
+        return False
+    for decorator in node.decorators.nodes:
+        if not isinstance(decorator, astroid.Name):
+            continue
+        try:
+            for infered in decorator.infer():
+                if isinstance(infered, astroid.Class):
+                    if (infered.root().name == BUILTINS_NAME and
+                            infered.name == 'property'):
+                        return True
+                    for ancestor in infered.ancestors():
+                        if (ancestor.name == 'property' and
+                                ancestor.root().name == BUILTINS_NAME):
+                            return True
+        except astroid.InferenceError:
+            pass
+
+
+def decorated_with_abc(func):
+    """Determine if the `func` node is decorated with `abc` decorators."""
+    if func.decorators:
+        for node in func.decorators.nodes:
+            try:
+                infered = next(node.infer())
+            except astroid.InferenceError:
+                continue
+            if infered and infered.qname() in ABC_METHODS:
+                return True
+
+
+def unimplemented_abstract_methods(node, is_abstract_cb=decorated_with_abc):
+    """
+    Get the unimplemented abstract methods for the given *node*.
+
+    A method can be considered abstract if the callback *is_abstract_cb*
+    returns a ``True`` value. The check defaults to verifying that
+    a method is decorated with abstract methods.
+    The function will work only for new-style classes. For old-style
+    classes, it will simply return an empty dictionary.
+    For the rest of them, it will return a dictionary of abstract method
+    names and their inferred objects.
+    """
+    visited = {}
+    try:
+        mro = reversed(node.mro())
+    except NotImplementedError:
+        # Old style class, it will not have a mro.
+        return {}
+    except astroid.ResolveError:
+        # Probably inconsistent hierarchy, don'try
+        # to figure this out here.
+        return {}
+    for ancestor in mro:
+        for obj in ancestor.values():
+            infered = obj
+            if isinstance(obj, astroid.AssName):
+                infered = safe_infer(obj)
+                if not infered:
+                    continue
+                if not isinstance(infered, astroid.Function):
+                    if obj.name in visited:
+                        del visited[obj.name]
+            if isinstance(infered, astroid.Function):
+                # It's critical to use the original name,
+                # since after inferring, an object can be something
+                # else than expected, as in the case of the
+                # following assignment.
+                #
+                # class A:
+                #     def keys(self): pass
+                #     __iter__ = keys
+                abstract = is_abstract_cb(infered)
+                if abstract:
+                    visited[obj.name] = infered
+                elif not abstract and obj.name in visited:
+                    del visited[obj.name]
+    return visited
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/variables.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/variables.py
new file mode 100644
index 0000000..8f6f957
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/checkers/variables.py
@@ -0,0 +1,1069 @@
+# Copyright (c) 2003-2014 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""variables checkers for Python code
+"""
+import os
+import sys
+import re
+from copy import copy
+
+import astroid
+from astroid import are_exclusive, builtin_lookup
+from astroid import modutils
+
+from pylint.interfaces import IAstroidChecker, INFERENCE, INFERENCE_FAILURE, HIGH
+from pylint.utils import get_global_option
+from pylint.checkers import BaseChecker
+from pylint.checkers.utils import (
+    PYMETHODS, is_ancestor_name, is_builtin,
+    is_defined_before, is_error, is_func_default, is_func_decorator,
+    assign_parent, check_messages, is_inside_except, clobber_in_except,
+    get_all_elements, has_known_bases)
+import six
+
+SPECIAL_OBJ = re.compile("^_{2}[a-z]+_{2}$")
+
+PY3K = sys.version_info >= (3, 0)
+
+def in_for_else_branch(parent, stmt):
+    """Returns True if stmt in inside the else branch for a parent For stmt."""
+    return (isinstance(parent, astroid.For) and
+            any(else_stmt.parent_of(stmt) for else_stmt in parent.orelse))
+
+def overridden_method(klass, name):
+    """get overridden method if any"""
+    try:
+        parent = next(klass.local_attr_ancestors(name))
+    except (StopIteration, KeyError):
+        return None
+    try:
+        meth_node = parent[name]
+    except KeyError:
+        # We have found an ancestor defining <name> but it's not in the local
+        # dictionary. This may happen with astroid built from living objects.
+        return None
+    if isinstance(meth_node, astroid.Function):
+        return meth_node
+    return None
+
+def _get_unpacking_extra_info(node, infered):
+    """return extra information to add to the message for unpacking-non-sequence
+    and unbalanced-tuple-unpacking errors
+    """
+    more = ''
+    infered_module = infered.root().name
+    if node.root().name == infered_module:
+        if node.lineno == infered.lineno:
+            more = ' %s' % infered.as_string()
+        elif infered.lineno:
+            more = ' defined at line %s' % infered.lineno
+    elif infered.lineno:
+        more = ' defined at line %s of %s' % (infered.lineno, infered_module)
+    return more
+
+def _detect_global_scope(node, frame, defframe):
+    """ Detect that the given frames shares a global
+    scope.
+
+    Two frames shares a global scope when neither
+    of them are hidden under a function scope, as well
+    as any of parent scope of them, until the root scope.
+    In this case, depending from something defined later on
+    will not work, because it is still undefined.
+
+    Example:
+        class A:
+            # B has the same global scope as `C`, leading to a NameError.
+            class B(C): ...
+        class C: ...
+
+    """
+    def_scope = scope = None
+    if frame and frame.parent:
+        scope = frame.parent.scope()
+    if defframe and defframe.parent:
+        def_scope = defframe.parent.scope()
+    if isinstance(frame, astroid.Function):
+        # If the parent of the current node is a
+        # function, then it can be under its scope
+        # (defined in, which doesn't concern us) or
+        # the `->` part of annotations. The same goes
+        # for annotations of function arguments, they'll have
+        # their parent the Arguments node.
+        if not isinstance(node.parent,
+                          (astroid.Function, astroid.Arguments)):
+            return False
+    elif any(not isinstance(f, (astroid.Class, astroid.Module))
+             for f in (frame, defframe)):
+        # Not interested in other frames, since they are already
+        # not in a global scope.
+        return False
+
+    break_scopes = []
+    for s in (scope, def_scope):
+        # Look for parent scopes. If there is anything different
+        # than a module or a class scope, then they frames don't
+        # share a global scope.
+        parent_scope = s
+        while parent_scope:
+            if not isinstance(parent_scope, (astroid.Class, astroid.Module)):
+                break_scopes.append(parent_scope)
+                break
+            if parent_scope.parent:
+                parent_scope = parent_scope.parent.scope()
+            else:
+                break
+    if break_scopes and len(set(break_scopes)) != 1:
+        # Store different scopes than expected.
+        # If the stored scopes are, in fact, the very same, then it means
+        # that the two frames (frame and defframe) shares the same scope,
+        # and we could apply our lineno analysis over them.
+        # For instance, this works when they are inside a function, the node
+        # that uses a definition and the definition itself.
+        return False
+    # At this point, we are certain that frame and defframe shares a scope
+    # and the definition of the first depends on the second.
+    return frame.lineno < defframe.lineno
+
+def _fix_dot_imports(not_consumed):
+    """ Try to fix imports with multiple dots, by returning a dictionary
+    with the import names expanded. The function unflattens root imports,
+    like 'xml' (when we have both 'xml.etree' and 'xml.sax'), to 'xml.etree'
+    and 'xml.sax' respectively.
+    """
+    # TODO: this should be improved in issue astroid #46
+    names = {}
+    for name, stmts in six.iteritems(not_consumed):
+        if any(isinstance(stmt, astroid.AssName)
+               and isinstance(stmt.ass_type(), astroid.AugAssign)
+               for stmt in stmts):
+            continue
+        for stmt in stmts:
+            if not isinstance(stmt, (astroid.From, astroid.Import)):
+                continue
+            for imports in stmt.names:
+                second_name = None
+                if imports[0] == "*":
+                    # In case of wildcard imports,
+                    # pick the name from inside the imported module.
+                    second_name = name
+                else:
+                    if imports[0].find(".") > -1 or name in imports:
+                        # Most likely something like 'xml.etree',
+                        # which will appear in the .locals as 'xml'.
+                        # Only pick the name if it wasn't consumed.
+                        second_name = imports[0]
+                if second_name and second_name not in names:
+                    names[second_name] = stmt
+    return sorted(names.items(), key=lambda a: a[1].fromlineno)
+
+def _find_frame_imports(name, frame):
+    """
+    Detect imports in the frame, with the required
+    *name*. Such imports can be considered assignments.
+    Returns True if an import for the given name was found.
+    """
+    imports = frame.nodes_of_class((astroid.Import, astroid.From))
+    for import_node in imports:
+        for import_name, import_alias in import_node.names:
+            # If the import uses an alias, check only that.
+            # Otherwise, check only the import name.
+            if import_alias:
+                if import_alias == name:
+                    return True
+            elif import_name and import_name == name:
+                return True
+
+
+MSGS = {
+    'E0601': ('Using variable %r before assignment',
+              'used-before-assignment',
+              'Used when a local variable is accessed before it\'s \
+              assignment.'),
+    'E0602': ('Undefined variable %r',
+              'undefined-variable',
+              'Used when an undefined variable is accessed.'),
+    'E0603': ('Undefined variable name %r in __all__',
+              'undefined-all-variable',
+              'Used when an undefined variable name is referenced in __all__.'),
+    'E0604': ('Invalid object %r in __all__, must contain only strings',
+              'invalid-all-object',
+              'Used when an invalid (non-string) object occurs in __all__.'),
+    'E0611': ('No name %r in module %r',
+              'no-name-in-module',
+              'Used when a name cannot be found in a module.'),
+
+    'W0601': ('Global variable %r undefined at the module level',
+              'global-variable-undefined',
+              'Used when a variable is defined through the "global" statement \
+              but the variable is not defined in the module scope.'),
+    'W0602': ('Using global for %r but no assignment is done',
+              'global-variable-not-assigned',
+              'Used when a variable is defined through the "global" statement \
+              but no assignment to this variable is done.'),
+    'W0603': ('Using the global statement', # W0121
+              'global-statement',
+              'Used when you use the "global" statement to update a global \
+              variable. Pylint just try to discourage this \
+              usage. That doesn\'t mean you can not use it !'),
+    'W0604': ('Using the global statement at the module level', # W0103
+              'global-at-module-level',
+              'Used when you use the "global" statement at the module level \
+              since it has no effect'),
+    'W0611': ('Unused %s',
+              'unused-import',
+              'Used when an imported module or variable is not used.'),
+    'W0612': ('Unused variable %r',
+              'unused-variable',
+              'Used when a variable is defined but not used.'),
+    'W0613': ('Unused argument %r',
+              'unused-argument',
+              'Used when a function or method argument is not used.'),
+    'W0614': ('Unused import %s from wildcard import',
+              'unused-wildcard-import',
+              'Used when an imported module or variable is not used from a \
+              \'from X import *\' style import.'),
+
+    'W0621': ('Redefining name %r from outer scope (line %s)',
+              'redefined-outer-name',
+              'Used when a variable\'s name hide a name defined in the outer \
+              scope.'),
+    'W0622': ('Redefining built-in %r',
+              'redefined-builtin',
+              'Used when a variable or function override a built-in.'),
+    'W0623': ('Redefining name %r from %s in exception handler',
+              'redefine-in-handler',
+              'Used when an exception handler assigns the exception \
+               to an existing name'),
+
+    'W0631': ('Using possibly undefined loop variable %r',
+              'undefined-loop-variable',
+              'Used when an loop variable (i.e. defined by a for loop or \
+              a list comprehension or a generator expression) is used outside \
+              the loop.'),
+
+    'W0632': ('Possible unbalanced tuple unpacking with '
+              'sequence%s: '
+              'left side has %d label(s), right side has %d value(s)',
+              'unbalanced-tuple-unpacking',
+              'Used when there is an unbalanced tuple unpacking in assignment'),
+
+    'W0633': ('Attempting to unpack a non-sequence%s',
+              'unpacking-non-sequence',
+              'Used when something which is not '
+              'a sequence is used in an unpack assignment'),
+
+    'W0640': ('Cell variable %s defined in loop',
+              'cell-var-from-loop',
+              'A variable used in a closure is defined in a loop. '
+              'This will result in all closures using the same value for '
+              'the closed-over variable.'),
+
+    }
+
+class VariablesChecker(BaseChecker):
+    """checks for
+    * unused variables / imports
+    * undefined variables
+    * redefinition of variable from builtins or from an outer scope
+    * use of variable before assignment
+    * __all__ consistency
+    """
+
+    __implements__ = IAstroidChecker
+
+    name = 'variables'
+    msgs = MSGS
+    priority = -1
+    options = (("init-import",
+                {'default': 0, 'type' : 'yn', 'metavar' : '<y_or_n>',
+                 'help' : 'Tells whether we should check for unused import in \
+__init__ files.'}),
+               ("dummy-variables-rgx",
+                {'default': ('_$|dummy'),
+                 'type' :'regexp', 'metavar' : '<regexp>',
+                 'help' : 'A regular expression matching the name of dummy \
+variables (i.e. expectedly not used).'}),
+               ("additional-builtins",
+                {'default': (), 'type' : 'csv',
+                 'metavar' : '<comma separated list>',
+                 'help' : 'List of additional names supposed to be defined in \
+builtins. Remember that you should avoid to define new builtins when possible.'
+                }),
+               ("callbacks",
+                {'default' : ('cb_', '_cb'), 'type' : 'csv',
+                 'metavar' : '<callbacks>',
+                 'help' : 'List of strings which can identify a callback '
+                          'function by name. A callback name must start or '
+                          'end with one of those strings.'}
+               )
+              )
+    def __init__(self, linter=None):
+        BaseChecker.__init__(self, linter)
+        self._to_consume = None
+        self._checking_mod_attr = None
+
+    def visit_module(self, node):
+        """visit module : update consumption analysis variable
+        checks globals doesn't overrides builtins
+        """
+        self._to_consume = [(copy(node.locals), {}, 'module')]
+        for name, stmts in six.iteritems(node.locals):
+            if is_builtin(name) and not is_inside_except(stmts[0]):
+                # do not print Redefining builtin for additional builtins
+                self.add_message('redefined-builtin', args=name, node=stmts[0])
+
+    @check_messages('unused-import', 'unused-wildcard-import',
+                    'redefined-builtin', 'undefined-all-variable',
+                    'invalid-all-object')
+    def leave_module(self, node):
+        """leave module: check globals
+        """
+        assert len(self._to_consume) == 1
+        not_consumed = self._to_consume.pop()[0]
+        # attempt to check for __all__ if defined
+        if '__all__' in node.locals:
+            assigned = next(node.igetattr('__all__'))
+            if assigned is not astroid.YES:
+                for elt in getattr(assigned, 'elts', ()):
+                    try:
+                        elt_name = next(elt.infer())
+                    except astroid.InferenceError:
+                        continue
+
+                    if not isinstance(elt_name, astroid.Const) \
+                             or not isinstance(elt_name.value, six.string_types):
+                        self.add_message('invalid-all-object',
+                                         args=elt.as_string(), node=elt)
+                        continue
+                    elt_name = elt_name.value
+                    # If elt is in not_consumed, remove it from not_consumed
+                    if elt_name in not_consumed:
+                        del not_consumed[elt_name]
+                        continue
+                    if elt_name not in node.locals:
+                        if not node.package:
+                            self.add_message('undefined-all-variable',
+                                             args=elt_name,
+                                             node=elt)
+                        else:
+                            basename = os.path.splitext(node.file)[0]
+                            if os.path.basename(basename) == '__init__':
+                                name = node.name + "." + elt_name
+                                try:
+                                    modutils.file_from_modpath(name.split("."))
+                                except ImportError:
+                                    self.add_message('undefined-all-variable',
+                                                     args=elt_name,
+                                                     node=elt)
+                                except SyntaxError:
+                                    # don't yield an syntax-error warning,
+                                    # because it will be later yielded
+                                    # when the file will be checked
+                                    pass
+        # don't check unused imports in __init__ files
+        if not self.config.init_import and node.package:
+            return
+
+        self._check_imports(not_consumed)
+
+    def _check_imports(self, not_consumed):
+        local_names = _fix_dot_imports(not_consumed)
+        checked = set()
+        for name, stmt in local_names:
+            for imports in stmt.names:
+                real_name = imported_name = imports[0]
+                if imported_name == "*":
+                    real_name = name
+                as_name = imports[1]
+                if real_name in checked:
+                    continue
+                if name not in (real_name, as_name):
+                    continue
+                checked.add(real_name)
+
+                if (isinstance(stmt, astroid.Import) or
+                        (isinstance(stmt, astroid.From) and
+                         not stmt.modname)):
+                    if (isinstance(stmt, astroid.From) and
+                            SPECIAL_OBJ.search(imported_name)):
+                        # Filter special objects (__doc__, __all__) etc.,
+                        # because they can be imported for exporting.
+                        continue
+                    if as_name is None:
+                        msg = "import %s" % imported_name
+                    else:
+                        msg = "%s imported as %s" % (imported_name, as_name)
+                    self.add_message('unused-import', args=msg, node=stmt)
+                elif isinstance(stmt, astroid.From) and stmt.modname != '__future__':
+                    if SPECIAL_OBJ.search(imported_name):
+                        # Filter special objects (__doc__, __all__) etc.,
+                        # because they can be imported for exporting.
+                        continue
+                    if imported_name == '*':
+                        self.add_message('unused-wildcard-import',
+                                         args=name, node=stmt)
+                    else:
+                        if as_name is None:
+                            msg = "%s imported from %s" % (imported_name, stmt.modname)
+                        else:
+                            fields = (imported_name, stmt.modname, as_name)
+                            msg = "%s imported from %s as %s" % fields
+                        self.add_message('unused-import', args=msg, node=stmt)
+        del self._to_consume
+
+    def visit_class(self, node):
+        """visit class: update consumption analysis variable
+        """
+        self._to_consume.append((copy(node.locals), {}, 'class'))
+
+    def leave_class(self, _):
+        """leave class: update consumption analysis variable
+        """
+        # do not check for not used locals here (no sense)
+        self._to_consume.pop()
+
+    def visit_lambda(self, node):
+        """visit lambda: update consumption analysis variable
+        """
+        self._to_consume.append((copy(node.locals), {}, 'lambda'))
+
+    def leave_lambda(self, _):
+        """leave lambda: update consumption analysis variable
+        """
+        # do not check for not used locals here
+        self._to_consume.pop()
+
+    def visit_genexpr(self, node):
+        """visit genexpr: update consumption analysis variable
+        """
+        self._to_consume.append((copy(node.locals), {}, 'comprehension'))
+
+    def leave_genexpr(self, _):
+        """leave genexpr: update consumption analysis variable
+        """
+        # do not check for not used locals here
+        self._to_consume.pop()
+
+    def visit_dictcomp(self, node):
+        """visit dictcomp: update consumption analysis variable
+        """
+        self._to_consume.append((copy(node.locals), {}, 'comprehension'))
+
+    def leave_dictcomp(self, _):
+        """leave dictcomp: update consumption analysis variable
+        """
+        # do not check for not used locals here
+        self._to_consume.pop()
+
+    def visit_setcomp(self, node):
+        """visit setcomp: update consumption analysis variable
+        """
+        self._to_consume.append((copy(node.locals), {}, 'comprehension'))
+
+    def leave_setcomp(self, _):
+        """leave setcomp: update consumption analysis variable
+        """
+        # do not check for not used locals here
+        self._to_consume.pop()
+
+    def visit_function(self, node):
+        """visit function: update consumption analysis variable and check locals
+        """
+        self._to_consume.append((copy(node.locals), {}, 'function'))
+        if not (self.linter.is_message_enabled('redefined-outer-name') or
+                self.linter.is_message_enabled('redefined-builtin')):
+            return
+        globs = node.root().globals
+        for name, stmt in node.items():
+            if is_inside_except(stmt):
+                continue
+            if name in globs and not isinstance(stmt, astroid.Global):
+                line = globs[name][0].fromlineno
+                dummy_rgx = self.config.dummy_variables_rgx
+                if not dummy_rgx.match(name):
+                    self.add_message('redefined-outer-name', args=(name, line), node=stmt)
+            elif is_builtin(name):
+                # do not print Redefining builtin for additional builtins
+                self.add_message('redefined-builtin', args=name, node=stmt)
+
+    def leave_function(self, node):
+        """leave function: check function's locals are consumed"""
+        not_consumed = self._to_consume.pop()[0]
+        if not (self.linter.is_message_enabled('unused-variable') or
+                self.linter.is_message_enabled('unused-argument')):
+            return
+        # don't check arguments of function which are only raising an exception
+        if is_error(node):
+            return
+        # don't check arguments of abstract methods or within an interface
+        is_method = node.is_method()
+        klass = node.parent.frame()
+        if is_method and (klass.type == 'interface' or node.is_abstract()):
+            return
+        if is_method and isinstance(klass, astroid.Class):
+            confidence = INFERENCE if has_known_bases(klass) else INFERENCE_FAILURE
+        else:
+            confidence = HIGH
+        authorized_rgx = self.config.dummy_variables_rgx
+        called_overridden = False
+        argnames = node.argnames()
+        global_names = set()
+        nonlocal_names = set()
+        for global_stmt in node.nodes_of_class(astroid.Global):
+            global_names.update(set(global_stmt.names))
+        for nonlocal_stmt in node.nodes_of_class(astroid.Nonlocal):
+            nonlocal_names.update(set(nonlocal_stmt.names))
+
+        for name, stmts in six.iteritems(not_consumed):
+            # ignore some special names specified by user configuration
+            if authorized_rgx.match(name):
+                continue
+            # ignore names imported by the global statement
+            # FIXME: should only ignore them if it's assigned latter
+            stmt = stmts[0]
+            if isinstance(stmt, astroid.Global):
+                continue
+            if isinstance(stmt, (astroid.Import, astroid.From)):
+                # Detect imports, assigned to global statements.
+                if global_names:
+                    skip = False
+                    for import_name, import_alias in stmt.names:
+                        # If the import uses an alias, check only that.
+                        # Otherwise, check only the import name.
+                        if import_alias:
+                            if import_alias in global_names:
+                                skip = True
+                                break
+                        elif import_name in global_names:
+                            skip = True
+                            break
+                    if skip:
+                        continue
+
+            # care about functions with unknown argument (builtins)
+            if name in argnames:
+                if is_method:
+                    # don't warn for the first argument of a (non static) method
+                    if node.type != 'staticmethod' and name == argnames[0]:
+                        continue
+                    # don't warn for argument of an overridden method
+                    if not called_overridden:
+                        overridden = overridden_method(klass, node.name)
+                        called_overridden = True
+                    if overridden is not None and name in overridden.argnames():
+                        continue
+                    if node.name in PYMETHODS and node.name not in ('__init__', '__new__'):
+                        continue
+                # don't check callback arguments
+                if any(node.name.startswith(cb) or node.name.endswith(cb)
+                       for cb in self.config.callbacks):
+                    continue
+                self.add_message('unused-argument', args=name, node=stmt,
+                                 confidence=confidence)
+            else:
+                if stmt.parent and isinstance(stmt.parent, astroid.Assign):
+                    if name in nonlocal_names:
+                        continue
+                self.add_message('unused-variable', args=name, node=stmt)
+
+    @check_messages('global-variable-undefined', 'global-variable-not-assigned', 'global-statement',
+                    'global-at-module-level', 'redefined-builtin')
+    def visit_global(self, node):
+        """check names imported exists in the global scope"""
+        frame = node.frame()
+        if isinstance(frame, astroid.Module):
+            self.add_message('global-at-module-level', node=node)
+            return
+        module = frame.root()
+        default_message = True
+        for name in node.names:
+            try:
+                assign_nodes = module.getattr(name)
+            except astroid.NotFoundError:
+                # unassigned global, skip
+                assign_nodes = []
+            for anode in assign_nodes:
+                if anode.parent is None:
+                    # node returned for builtin attribute such as __file__,
+                    # __doc__, etc...
+                    continue
+                if anode.frame() is frame:
+                    # same scope level assignment
+                    break
+            else:
+                if not _find_frame_imports(name, frame):
+                    self.add_message('global-variable-not-assigned',
+                                     args=name, node=node)
+                default_message = False
+            if not assign_nodes:
+                continue
+            for anode in assign_nodes:
+                if anode.parent is None:
+                    self.add_message('redefined-builtin', args=name, node=node)
+                    break
+                if anode.frame() is module:
+                    # module level assignment
+                    break
+            else:
+                # global undefined at the module scope
+                self.add_message('global-variable-undefined', args=name, node=node)
+                default_message = False
+        if default_message:
+            self.add_message('global-statement', node=node)
+
+    def _check_late_binding_closure(self, node, assignment_node):
+        def _is_direct_lambda_call():
+            return (isinstance(node_scope.parent, astroid.CallFunc)
+                    and node_scope.parent.func is node_scope)
+
+        node_scope = node.scope()
+        if not isinstance(node_scope, (astroid.Lambda, astroid.Function)):
+            return
+        if isinstance(node.parent, astroid.Arguments):
+            return
+
+        if isinstance(assignment_node, astroid.Comprehension):
+            if assignment_node.parent.parent_of(node.scope()):
+                self.add_message('cell-var-from-loop', node=node, args=node.name)
+        else:
+            assign_scope = assignment_node.scope()
+            maybe_for = assignment_node
+            while not isinstance(maybe_for, astroid.For):
+                if maybe_for is assign_scope:
+                    break
+                maybe_for = maybe_for.parent
+            else:
+                if (maybe_for.parent_of(node_scope)
+                        and not _is_direct_lambda_call()
+                        and not isinstance(node_scope.statement(), astroid.Return)):
+                    self.add_message('cell-var-from-loop', node=node, args=node.name)
+
+    def _loopvar_name(self, node, name):
+        # filter variables according to node's scope
+        # XXX used to filter parents but don't remember why, and removing this
+        # fixes a W0631 false positive reported by Paul Hachmann on 2008/12 on
+        # python-projects (added to func_use_for_or_listcomp_var test)
+        #astmts = [stmt for stmt in node.lookup(name)[1]
+        #          if hasattr(stmt, 'ass_type')] and
+        #          not stmt.statement().parent_of(node)]
+        if not self.linter.is_message_enabled('undefined-loop-variable'):
+            return
+        astmts = [stmt for stmt in node.lookup(name)[1]
+                  if hasattr(stmt, 'ass_type')]
+        # filter variables according their respective scope test is_statement
+        # and parent to avoid #74747. This is not a total fix, which would
+        # introduce a mechanism similar to special attribute lookup in
+        # modules. Also, in order to get correct inference in this case, the
+        # scope lookup rules would need to be changed to return the initial
+        # assignment (which does not exist in code per se) as well as any later
+        # modifications.
+        if not astmts or (astmts[0].is_statement or astmts[0].parent) \
+             and astmts[0].statement().parent_of(node):
+            _astmts = []
+        else:
+            _astmts = astmts[:1]
+        for i, stmt in enumerate(astmts[1:]):
+            if (astmts[i].statement().parent_of(stmt)
+                    and not in_for_else_branch(astmts[i].statement(), stmt)):
+                continue
+            _astmts.append(stmt)
+        astmts = _astmts
+        if len(astmts) == 1:
+            ass = astmts[0].ass_type()
+            if isinstance(ass, (astroid.For, astroid.Comprehension, astroid.GenExpr)) \
+                   and not ass.statement() is node.statement():
+                self.add_message('undefined-loop-variable', args=name, node=node)
+
+    @check_messages('redefine-in-handler')
+    def visit_excepthandler(self, node):
+        for name in get_all_elements(node.name):
+            clobbering, args = clobber_in_except(name)
+            if clobbering:
+                self.add_message('redefine-in-handler', args=args, node=name)
+
+    def visit_assname(self, node):
+        if isinstance(node.ass_type(), astroid.AugAssign):
+            self.visit_name(node)
+
+    def visit_delname(self, node):
+        self.visit_name(node)
+
+    @check_messages(*(MSGS.keys()))
+    def visit_name(self, node):
+        """check that a name is defined if the current scope and doesn't
+        redefine a built-in
+        """
+        stmt = node.statement()
+        if stmt.fromlineno is None:
+            # name node from a astroid built from live code, skip
+            assert not stmt.root().file.endswith('.py')
+            return
+        name = node.name
+        frame = stmt.scope()
+        # if the name node is used as a function default argument's value or as
+        # a decorator, then start from the parent frame of the function instead
+        # of the function frame - and thus open an inner class scope
+        if (is_func_default(node) or is_func_decorator(node)
+                or is_ancestor_name(frame, node)):
+            start_index = len(self._to_consume) - 2
+        else:
+            start_index = len(self._to_consume) - 1
+        # iterates through parent scopes, from the inner to the outer
+        base_scope_type = self._to_consume[start_index][-1]
+        for i in range(start_index, -1, -1):
+            to_consume, consumed, scope_type = self._to_consume[i]
+            # if the current scope is a class scope but it's not the inner
+            # scope, ignore it. This prevents to access this scope instead of
+            # the globals one in function members when there are some common
+            # names. The only exception is when the starting scope is a
+            # comprehension and its direct outer scope is a class
+            if scope_type == 'class' and i != start_index and not (
+                    base_scope_type == 'comprehension' and i == start_index-1):
+                # Detect if we are in a local class scope, as an assignment.
+                # For example, the following is fair game.
+                #
+                # class A:
+                #    b = 1
+                #    c = lambda b=b: b * b
+                #
+                # class B:
+                #    tp = 1
+                #    def func(self, arg: tp):
+                #        ...
+
+                in_annotation = (
+                    PY3K and isinstance(frame, astroid.Function)
+                    and node.statement() is frame and
+                    (node in frame.args.annotations
+                     or node is frame.args.varargannotation
+                     or node is frame.args.kwargannotation))
+                if in_annotation:
+                    frame_locals = frame.parent.scope().locals
+                else:
+                    frame_locals = frame.locals
+                if not ((isinstance(frame, astroid.Class) or in_annotation)
+                        and name in frame_locals):
+                    continue
+            # the name has already been consumed, only check it's not a loop
+            # variable used outside the loop
+            if name in consumed:
+                defnode = assign_parent(consumed[name][0])
+                self._check_late_binding_closure(node, defnode)
+                self._loopvar_name(node, name)
+                break
+            # mark the name as consumed if it's defined in this scope
+            # (i.e. no KeyError is raised by "to_consume[name]")
+            try:
+                consumed[name] = to_consume[name]
+            except KeyError:
+                continue
+            # checks for use before assignment
+            defnode = assign_parent(to_consume[name][0])
+            if defnode is not None:
+                self._check_late_binding_closure(node, defnode)
+                defstmt = defnode.statement()
+                defframe = defstmt.frame()
+                maybee0601 = True
+                if not frame is defframe:
+                    maybee0601 = _detect_global_scope(node, frame, defframe)
+                elif defframe.parent is None:
+                    # we are at the module level, check the name is not
+                    # defined in builtins
+                    if name in defframe.scope_attrs or builtin_lookup(name)[1]:
+                        maybee0601 = False
+                else:
+                    # we are in a local scope, check the name is not
+                    # defined in global or builtin scope
+                    if defframe.root().lookup(name)[1]:
+                        maybee0601 = False
+                    else:
+                        # check if we have a nonlocal
+                        if name in defframe.locals:
+                            maybee0601 = not any(isinstance(child, astroid.Nonlocal)
+                                                 and name in child.names
+                                                 for child in defframe.get_children())
+
+                # Handle a couple of class scoping issues.
+                annotation_return = False
+                # The class reuses itself in the class scope.
+                recursive_klass = (frame is defframe and
+                                   defframe.parent_of(node) and
+                                   isinstance(defframe, astroid.Class) and
+                                   node.name == defframe.name)
+                if (self._to_consume[-1][-1] == 'lambda' and
+                        isinstance(frame, astroid.Class)
+                        and name in frame.locals):
+                    maybee0601 = True
+                elif (isinstance(defframe, astroid.Class) and
+                      isinstance(frame, astroid.Function)):
+                    # Special rule for function return annotations,
+                    # which uses the same name as the class where
+                    # the function lives.
+                    if (PY3K and node is frame.returns and
+                            defframe.parent_of(frame.returns)):
+                        maybee0601 = annotation_return = True
+
+                    if (maybee0601 and defframe.name in defframe.locals and
+                            defframe.locals[name][0].lineno < frame.lineno):
+                        # Detect class assignments with the same
+                        # name as the class. In this case, no warning
+                        # should be raised.
+                        maybee0601 = False
+                elif recursive_klass:
+                    maybee0601 = True
+                else:
+                    maybee0601 = maybee0601 and stmt.fromlineno <= defstmt.fromlineno
+
+                if (maybee0601
+                        and not is_defined_before(node)
+                        and not are_exclusive(stmt, defstmt, ('NameError',
+                                                              'Exception',
+                                                              'BaseException'))):
+                    if recursive_klass or (defstmt is stmt and
+                                           isinstance(node, (astroid.DelName,
+                                                             astroid.AssName))):
+                        self.add_message('undefined-variable', args=name, node=node)
+                    elif annotation_return:
+                        self.add_message('undefined-variable', args=name, node=node)
+                    elif self._to_consume[-1][-1] != 'lambda':
+                        # E0601 may *not* occurs in lambda scope.
+                        self.add_message('used-before-assignment', args=name, node=node)
+                    elif self._to_consume[-1][-1] == 'lambda':
+                        # E0601 can occur in class-level scope in lambdas, as in
+                        # the following example:
+                        #   class A:
+                        #      x = lambda attr: f + attr
+                        #      f = 42
+                        if isinstance(frame, astroid.Class) and name in frame.locals:
+                            if isinstance(node.parent, astroid.Arguments):
+                                # Doing the following is fine:
+                                #   class A:
+                                #      x = 42
+                                #      y = lambda attr=x: attr
+                                if stmt.fromlineno <= defstmt.fromlineno:
+                                    self.add_message('used-before-assignment',
+                                                     args=name, node=node)
+                            else:
+                                self.add_message('undefined-variable',
+                                                 args=name, node=node)
+
+            if isinstance(node, astroid.AssName): # Aug AssName
+                del consumed[name]
+            else:
+                del to_consume[name]
+            # check it's not a loop variable used outside the loop
+            self._loopvar_name(node, name)
+            break
+        else:
+            # we have not found the name, if it isn't a builtin, that's an
+            # undefined name !
+            if not (name in astroid.Module.scope_attrs or is_builtin(name)
+                    or name in self.config.additional_builtins):
+                self.add_message('undefined-variable', args=name, node=node)
+
+    @check_messages('no-name-in-module')
+    def visit_import(self, node):
+        """check modules attribute accesses"""
+        for name, _ in node.names:
+            parts = name.split('.')
+            try:
+                module = next(node.infer_name_module(parts[0]))
+            except astroid.ResolveError:
+                continue
+            self._check_module_attrs(node, module, parts[1:])
+
+    @check_messages('no-name-in-module')
+    def visit_from(self, node):
+        """check modules attribute accesses"""
+        name_parts = node.modname.split('.')
+        level = getattr(node, 'level', None)
+        try:
+            module = node.root().import_module(name_parts[0], level=level)
+        except Exception: # pylint: disable=broad-except
+            return
+        module = self._check_module_attrs(node, module, name_parts[1:])
+        if not module:
+            return
+        for name, _ in node.names:
+            if name == '*':
+                continue
+            self._check_module_attrs(node, module, name.split('.'))
+
+    @check_messages('unbalanced-tuple-unpacking', 'unpacking-non-sequence')
+    def visit_assign(self, node):
+        """Check unbalanced tuple unpacking for assignments
+        and unpacking non-sequences.
+        """
+        if not isinstance(node.targets[0], (astroid.Tuple, astroid.List)):
+            return
+
+        targets = node.targets[0].itered()
+        try:
+            for infered in node.value.infer():
+                self._check_unpacking(infered, node, targets)
+        except astroid.InferenceError:
+            return
+
+    def _check_unpacking(self, infered, node, targets):
+        """ Check for unbalanced tuple unpacking
+        and unpacking non sequences.
+        """
+        if infered is astroid.YES:
+            return
+        if (isinstance(infered.parent, astroid.Arguments) and
+                isinstance(node.value, astroid.Name) and
+                node.value.name == infered.parent.vararg):
+            # Variable-length argument, we can't determine the length.
+            return
+        if isinstance(infered, (astroid.Tuple, astroid.List)):
+            # attempt to check unpacking is properly balanced
+            values = infered.itered()
+            if len(targets) != len(values):
+                # Check if we have starred nodes.
+                if any(isinstance(target, astroid.Starred)
+                       for target in targets):
+                    return
+                self.add_message('unbalanced-tuple-unpacking', node=node,
+                                 args=(_get_unpacking_extra_info(node, infered),
+                                       len(targets),
+                                       len(values)))
+        # attempt to check unpacking may be possible (ie RHS is iterable)
+        elif isinstance(infered, astroid.Instance):
+            for meth in ('__iter__', '__getitem__'):
+                try:
+                    infered.getattr(meth)
+                    break
+                except astroid.NotFoundError:
+                    continue
+            else:
+                self.add_message('unpacking-non-sequence', node=node,
+                                 args=(_get_unpacking_extra_info(node, infered),))
+        else:
+            self.add_message('unpacking-non-sequence', node=node,
+                             args=(_get_unpacking_extra_info(node, infered),))
+
+
+    def _check_module_attrs(self, node, module, module_names):
+        """check that module_names (list of string) are accessible through the
+        given module
+        if the latest access name corresponds to a module, return it
+        """
+        assert isinstance(module, astroid.Module), module
+        ignored_modules = get_global_option(self, 'ignored-modules',
+                                            default=[])
+        while module_names:
+            name = module_names.pop(0)
+            if name == '__dict__':
+                module = None
+                break
+            try:
+                module = next(module.getattr(name)[0].infer())
+                if module is astroid.YES:
+                    return None
+            except astroid.NotFoundError:
+                if module.name in ignored_modules:
+                    return None
+                self.add_message('no-name-in-module',
+                                 args=(name, module.name), node=node)
+                return None
+            except astroid.InferenceError:
+                return None
+        if module_names:
+            # FIXME: other message if name is not the latest part of
+            # module_names ?
+            modname = module and module.name or '__dict__'
+            self.add_message('no-name-in-module', node=node,
+                             args=('.'.join(module_names), modname))
+            return None
+        if isinstance(module, astroid.Module):
+            return module
+        return None
+
+
+class VariablesChecker3k(VariablesChecker):
+    '''Modified variables checker for 3k'''
+    # listcomp have now also their scope
+
+    def visit_listcomp(self, node):
+        """visit dictcomp: update consumption analysis variable
+        """
+        self._to_consume.append((copy(node.locals), {}, 'comprehension'))
+
+    def leave_listcomp(self, _):
+        """leave dictcomp: update consumption analysis variable
+        """
+        # do not check for not used locals here
+        self._to_consume.pop()
+
+    def leave_module(self, node):
+        """ Update consumption analysis variable
+        for metaclasses.
+        """
+        module_locals = self._to_consume[0][0]
+        module_imports = self._to_consume[0][1]
+        consumed = {}
+
+        for klass in node.nodes_of_class(astroid.Class):
+            found = metaclass = name = None
+            if not klass._metaclass:
+                # Skip if this class doesn't use
+                # explictly a metaclass, but inherits it from ancestors
+                continue
+
+            metaclass = klass.metaclass()
+
+            # Look the name in the already found locals.
+            # If it's not found there, look in the module locals
+            # and in the imported modules.
+            if isinstance(klass._metaclass, astroid.Name):
+                name = klass._metaclass.name
+            elif metaclass:
+                # if it uses a `metaclass=module.Class`
+                name = metaclass.root().name
+
+            if name:
+                found = consumed.setdefault(
+                    name, module_locals.get(name, module_imports.get(name)))
+
+            if found is None and not metaclass:
+                name = None
+                if isinstance(klass._metaclass, astroid.Name):
+                    name = klass._metaclass.name
+                elif isinstance(klass._metaclass, astroid.Getattr):
+                    name = klass._metaclass.as_string()
+
+                if name is not None:
+                    if not (name in astroid.Module.scope_attrs or
+                            is_builtin(name) or
+                            name in self.config.additional_builtins or
+                            name in node.locals):
+                        self.add_message('undefined-variable',
+                                         node=klass,
+                                         args=(name, ))
+        # Pop the consumed items, in order to
+        # avoid having unused-import false positives
+        for name in consumed:
+            module_locals.pop(name, None)
+        super(VariablesChecker3k, self).leave_module(node)
+
+if sys.version_info >= (3, 0):
+    VariablesChecker = VariablesChecker3k
+
+
+def register(linter):
+    """required method to auto register this checker"""
+    linter.register_checker(VariablesChecker(linter))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/config.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/config.py
new file mode 100644
index 0000000..ebfe578
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/config.py
@@ -0,0 +1,157 @@
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""utilities for Pylint configuration :
+
+* pylintrc
+* pylint.d (PYLINTHOME)
+"""
+from __future__ import with_statement
+from __future__ import print_function
+
+import pickle
+import os
+import sys
+from os.path import exists, isfile, join, expanduser, abspath, dirname
+
+# pylint home is used to save old runs results ################################
+
+USER_HOME = expanduser('~')
+if 'PYLINTHOME' in os.environ:
+    PYLINT_HOME = os.environ['PYLINTHOME']
+    if USER_HOME == '~':
+        USER_HOME = dirname(PYLINT_HOME)
+elif USER_HOME == '~':
+    PYLINT_HOME = ".pylint.d"
+else:
+    PYLINT_HOME = join(USER_HOME, '.pylint.d')
+
+def get_pdata_path(base_name, recurs):
+    """return the path of the file which should contain old search data for the
+    given base_name with the given options values
+    """
+    base_name = base_name.replace(os.sep, '_')
+    return join(PYLINT_HOME, "%s%s%s"%(base_name, recurs, '.stats'))
+
+def load_results(base):
+    """try to unpickle and return data from file if it exists and is not
+    corrupted
+
+    return an empty dictionary if it doesn't exists
+    """
+    data_file = get_pdata_path(base, 1)
+    try:
+        with open(data_file, _PICK_LOAD) as stream:
+            return pickle.load(stream)
+    except Exception: # pylint: disable=broad-except
+        return {}
+
+if sys.version_info < (3, 0):
+    _PICK_DUMP, _PICK_LOAD = 'w', 'r'
+else:
+    _PICK_DUMP, _PICK_LOAD = 'wb', 'rb'
+
+def save_results(results, base):
+    """pickle results"""
+    if not exists(PYLINT_HOME):
+        try:
+            os.mkdir(PYLINT_HOME)
+        except OSError:
+            print('Unable to create directory %s' % PYLINT_HOME, file=sys.stderr)
+    data_file = get_pdata_path(base, 1)
+    try:
+        with open(data_file, _PICK_DUMP) as stream:
+            pickle.dump(results, stream)
+    except (IOError, OSError) as ex:
+        print('Unable to create file %s: %s' % (data_file, ex), file=sys.stderr)
+
+# location of the configuration file ##########################################
+
+
+def find_pylintrc():
+    """search the pylint rc file and return its path if it find it, else None
+    """
+    # is there a pylint rc file in the current directory ?
+    if exists('pylintrc'):
+        return abspath('pylintrc')
+    if isfile('__init__.py'):
+        curdir = abspath(os.getcwd())
+        while isfile(join(curdir, '__init__.py')):
+            curdir = abspath(join(curdir, '..'))
+            if isfile(join(curdir, 'pylintrc')):
+                return join(curdir, 'pylintrc')
+    if 'PYLINTRC' in os.environ and exists(os.environ['PYLINTRC']):
+        pylintrc = os.environ['PYLINTRC']
+    else:
+        user_home = expanduser('~')
+        if user_home == '~' or user_home == '/root':
+            pylintrc = ".pylintrc"
+        else:
+            pylintrc = join(user_home, '.pylintrc')
+            if not isfile(pylintrc):
+                pylintrc = join(user_home, '.config', 'pylintrc')
+    if not isfile(pylintrc):
+        if isfile('/etc/pylintrc'):
+            pylintrc = '/etc/pylintrc'
+        else:
+            pylintrc = None
+    return pylintrc
+
+PYLINTRC = find_pylintrc()
+
+ENV_HELP = '''
+The following environment variables are used:                                   
+    * PYLINTHOME                                                                
+    Path to the directory where the persistent for the run will be stored. If 
+not found, it defaults to ~/.pylint.d/ or .pylint.d (in the current working 
+directory).                                                                     
+    * PYLINTRC                                                                  
+    Path to the configuration file. See the documentation for the method used
+to search for configuration file.
+''' % globals()
+
+# evaluation messages #########################################################
+
+def get_note_message(note):
+    """return a message according to note
+    note is a float < 10  (10 is the highest note)
+    """
+    assert note <= 10, "Note is %.2f. Either you cheated, or pylint's \
+broken!" % note
+    if note < 0:
+        msg = 'You have to do something quick !'
+    elif note < 1:
+        msg = 'Hey! This is really dreadful. Or maybe pylint is buggy?'
+    elif note < 2:
+        msg = "Come on! You can't be proud of this code"
+    elif note < 3:
+        msg = 'Hum... Needs work.'
+    elif note < 4:
+        msg = 'Wouldn\'t you be a bit lazy?'
+    elif note < 5:
+        msg = 'A little more work would make it acceptable.'
+    elif note < 6:
+        msg = 'Just the bare minimum. Give it a bit more polish. '
+    elif note < 7:
+        msg = 'This is okay-ish, but I\'m sure you can do better.'
+    elif note < 8:
+        msg = 'If you commit now, people should not be making nasty \
+comments about you on c.l.py'
+    elif note < 9:
+        msg = 'That\'s pretty good. Good work mate.'
+    elif note < 10:
+        msg = 'So close to being perfect...'
+    else:
+        msg = 'Wow ! Now this deserves our uttermost respect.\nPlease send \
+your code to python-projects@logilab.org'
+    return msg
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/epylint.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/epylint.py
new file mode 100644
index 0000000..3d73ecd
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/epylint.py
@@ -0,0 +1,177 @@
+# -*- coding: utf-8; mode: python; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4
+# -*- vim:fenc=utf-8:ft=python:et:sw=4:ts=4:sts=4
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""Emacs and Flymake compatible Pylint.
+
+This script is for integration with emacs and is compatible with flymake mode.
+
+epylint walks out of python packages before invoking pylint. This avoids
+reporting import errors that occur when a module within a package uses the
+absolute import path to get another module within this package.
+
+For example:
+    - Suppose a package is structured as
+
+        a/__init__.py
+        a/b/x.py
+        a/c/y.py
+
+   - Then if y.py imports x as "from a.b import x" the following produces pylint
+     errors
+
+       cd a/c; pylint y.py
+
+   - The following obviously doesn't
+
+       pylint a/c/y.py
+
+   - As this script will be invoked by emacs within the directory of the file
+     we are checking we need to go out of it to avoid these false positives.
+
+
+You may also use py_run to run pylint with desired options and get back (or not)
+its output.
+"""
+from __future__ import print_function
+
+import sys, os
+import os.path as osp
+from subprocess import Popen, PIPE
+
+def _get_env():
+    '''Extracts the environment PYTHONPATH and appends the current sys.path to
+    those.'''
+    env = dict(os.environ)
+    env['PYTHONPATH'] = os.pathsep.join(sys.path)
+    return env
+
+def lint(filename, options=None):
+    """Pylint the given file.
+
+    When run from emacs we will be in the directory of a file, and passed its
+    filename.  If this file is part of a package and is trying to import other
+    modules from within its own package or another package rooted in a directory
+    below it, pylint will classify it as a failed import.
+
+    To get around this, we traverse down the directory tree to find the root of
+    the package this module is in.  We then invoke pylint from this directory.
+
+    Finally, we must correct the filenames in the output generated by pylint so
+    Emacs doesn't become confused (it will expect just the original filename,
+    while pylint may extend it with extra directories if we've traversed down
+    the tree)
+    """
+    # traverse downwards until we are out of a python package
+    full_path = osp.abspath(filename)
+    parent_path = osp.dirname(full_path)
+    child_path = osp.basename(full_path)
+
+    while parent_path != "/" and osp.exists(osp.join(parent_path, '__init__.py')):
+        child_path = osp.join(osp.basename(parent_path), child_path)
+        parent_path = osp.dirname(parent_path)
+
+    # Start pylint
+    # Ensure we use the python and pylint associated with the running epylint
+    from pylint import lint as lint_mod
+    lint_path = lint_mod.__file__
+    options = options or ['--disable=C,R,I']
+    cmd = [sys.executable, lint_path] + options + [
+        '--msg-template', '{path}:{line}: {category} ({msg_id}, {symbol}, {obj}) {msg}',
+        '-r', 'n', child_path]
+    process = Popen(cmd, stdout=PIPE, cwd=parent_path, env=_get_env(),
+                    universal_newlines=True)
+
+    for line in process.stdout:
+        # remove pylintrc warning
+        if line.startswith("No config file found"):
+            continue
+
+        # modify the file name thats output to reverse the path traversal we made
+        parts = line.split(":")
+        if parts and parts[0] == child_path:
+            line = ":".join([filename] + parts[1:])
+        print(line, end=' ')
+
+    process.wait()
+    return process.returncode
+
+
+def py_run(command_options='', return_std=False, stdout=None, stderr=None,
+           script='epylint'):
+    """Run pylint from python
+
+    ``command_options`` is a string containing ``pylint`` command line options;
+    ``return_std`` (boolean) indicates return of created standard output
+    and error (see below);
+    ``stdout`` and ``stderr`` are 'file-like' objects in which standard output
+    could be written.
+
+    Calling agent is responsible for stdout/err management (creation, close).
+    Default standard output and error are those from sys,
+    or standalone ones (``subprocess.PIPE``) are used
+    if they are not set and ``return_std``.
+
+    If ``return_std`` is set to ``True``, this function returns a 2-uple
+    containing standard output and error related to created process,
+    as follows: ``(stdout, stderr)``.
+
+    A trivial usage could be as follows:
+        >>> py_run( '--version')
+        No config file found, using default configuration
+        pylint 0.18.1,
+            ...
+
+    To silently run Pylint on a module, and get its standard output and error:
+        >>> (pylint_stdout, pylint_stderr) = py_run( 'module_name.py', True)
+    """
+    # Create command line to call pylint
+    if os.name == 'nt':
+        script += '.bat'
+    command_line = script + ' ' + command_options
+    # Providing standard output and/or error if not set
+    if stdout is None:
+        if return_std:
+            stdout = PIPE
+        else:
+            stdout = sys.stdout
+    if stderr is None:
+        if return_std:
+            stderr = PIPE
+        else:
+            stderr = sys.stderr
+    # Call pylint in a subprocess
+    p = Popen(command_line, shell=True, stdout=stdout, stderr=stderr,
+              env=_get_env(), universal_newlines=True)
+    p.wait()
+    # Return standard output and error
+    if return_std:
+        return (p.stdout, p.stderr)
+
+
+def Run():
+    if len(sys.argv) == 1:
+        print("Usage: %s <filename> [options]" % sys.argv[0])
+        sys.exit(1)
+    elif not osp.exists(sys.argv[1]):
+        print("%s does not exist" % sys.argv[1])
+        sys.exit(1)
+    else:
+        sys.exit(lint(sys.argv[1], sys.argv[2:]))
+
+
+if __name__ == '__main__':
+    Run()
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/gui.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/gui.py
new file mode 100644
index 0000000..8327e0e
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/gui.py
@@ -0,0 +1,531 @@
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""Tkinker gui for pylint"""
+from __future__ import print_function
+
+import os
+import sys
+import re
+from threading import Thread
+
+import six
+
+from six.moves.tkinter import (
+    Tk, Frame, Listbox, Entry, Label, Button, Scrollbar,
+    Checkbutton, Radiobutton, IntVar, StringVar, PanedWindow,
+    TOP, LEFT, RIGHT, BOTTOM, END, X, Y, BOTH, SUNKEN, W,
+    HORIZONTAL, DISABLED, NORMAL, W,
+)
+from six.moves.tkinter_tkfiledialog import (
+    askopenfilename, askdirectory,
+)
+
+import pylint.lint
+from pylint.reporters.guireporter import GUIReporter
+
+HOME = os.path.expanduser('~/')
+HISTORY = '.pylint-gui-history'
+COLORS = {'(I)':'green',
+          '(C)':'blue', '(R)':'darkblue',
+          '(W)':'black', '(E)':'darkred',
+          '(F)':'red'}
+
+
+def convert_to_string(msg):
+    """make a string representation of a message"""
+    module_object = msg.module
+    if msg.obj:
+        module_object += ".%s" % msg.obj
+    return "(%s) %s [%d]: %s" % (msg.C, module_object, msg.line, msg.msg)
+
+class BasicStream(object):
+    '''
+    used in gui reporter instead of writing to stdout, it is written to
+    this stream and saved in contents
+    '''
+    def __init__(self, gui):
+        """init"""
+        self.curline = ""
+        self.gui = gui
+        self.contents = []
+        self.outdict = {}
+        self.currout = None
+        self.next_title = None
+
+    def write(self, text):
+        """write text to the stream"""
+        if re.match('^--+$', text.strip()) or re.match('^==+$', text.strip()):
+            if self.currout:
+                self.outdict[self.currout].remove(self.next_title)
+                self.outdict[self.currout].pop()
+            self.currout = self.next_title
+            self.outdict[self.currout] = ['']
+
+        if text.strip():
+            self.next_title = text.strip()
+
+        if text.startswith(os.linesep):
+            self.contents.append('')
+            if self.currout:
+                self.outdict[self.currout].append('')
+        self.contents[-1] += text.strip(os.linesep)
+        if self.currout:
+            self.outdict[self.currout][-1] += text.strip(os.linesep)
+        if text.endswith(os.linesep) and text.strip():
+            self.contents.append('')
+            if self.currout:
+                self.outdict[self.currout].append('')
+
+    def fix_contents(self):
+        """finalize what the contents of the dict should look like before output"""
+        for item in self.outdict:
+            num_empty = self.outdict[item].count('')
+            for _ in range(num_empty):
+                self.outdict[item].remove('')
+            if self.outdict[item]:
+                self.outdict[item].pop(0)
+
+    def output_contents(self):
+        """output contents of dict to the gui, and set the rating"""
+        self.fix_contents()
+        self.gui.tabs = self.outdict
+        try:
+            self.gui.rating.set(self.outdict['Global evaluation'][0])
+        except KeyError:
+            self.gui.rating.set('Error')
+        self.gui.refresh_results_window()
+
+        #reset stream variables for next run
+        self.contents = []
+        self.outdict = {}
+        self.currout = None
+        self.next_title = None
+
+
+class LintGui(object):
+    """Build and control a window to interact with pylint"""
+
+    def __init__(self, root=None):
+        """init"""
+        self.root = root or Tk()
+        self.root.title('Pylint')
+        #reporter
+        self.reporter = None
+        #message queue for output from reporter
+        self.msg_queue = six.moves.queue.Queue()
+        self.msgs = []
+        self.visible_msgs = []
+        self.filenames = []
+        self.rating = StringVar()
+        self.tabs = {}
+        self.report_stream = BasicStream(self)
+        #gui objects
+        self.lb_messages = None
+        self.showhistory = None
+        self.results = None
+        self.btnRun = None
+        self.information_box = None
+        self.convention_box = None
+        self.refactor_box = None
+        self.warning_box = None
+        self.error_box = None
+        self.fatal_box = None
+        self.txtModule = None
+        self.status = None
+        self.msg_type_dict = None
+        self.init_gui()
+
+    def init_gui(self):
+        """init helper"""
+
+        window = PanedWindow(self.root, orient="vertical")
+        window.pack(side=TOP, fill=BOTH, expand=True)
+
+        top_pane = Frame(window)
+        window.add(top_pane)
+        mid_pane = Frame(window)
+        window.add(mid_pane)
+        bottom_pane = Frame(window)
+        window.add(bottom_pane)
+
+        #setting up frames
+        top_frame = Frame(top_pane)
+        mid_frame = Frame(top_pane)
+        history_frame = Frame(top_pane)
+        radio_frame = Frame(mid_pane)
+        rating_frame = Frame(mid_pane)
+        res_frame = Frame(mid_pane)
+        check_frame = Frame(bottom_pane)
+        msg_frame = Frame(bottom_pane)
+        btn_frame = Frame(bottom_pane)
+        top_frame.pack(side=TOP, fill=X)
+        mid_frame.pack(side=TOP, fill=X)
+        history_frame.pack(side=TOP, fill=BOTH, expand=True)
+        radio_frame.pack(side=TOP, fill=X)
+        rating_frame.pack(side=TOP, fill=X)
+        res_frame.pack(side=TOP, fill=BOTH, expand=True)
+        check_frame.pack(side=TOP, fill=X)
+        msg_frame.pack(side=TOP, fill=BOTH, expand=True)
+        btn_frame.pack(side=TOP, fill=X)
+
+        # Binding F5 application-wide to run lint
+        self.root.bind('<F5>', self.run_lint)
+
+        #Message ListBox
+        rightscrollbar = Scrollbar(msg_frame)
+        rightscrollbar.pack(side=RIGHT, fill=Y)
+        bottomscrollbar = Scrollbar(msg_frame, orient=HORIZONTAL)
+        bottomscrollbar.pack(side=BOTTOM, fill=X)
+        self.lb_messages = Listbox(
+            msg_frame,
+            yscrollcommand=rightscrollbar.set,
+            xscrollcommand=bottomscrollbar.set,
+            bg="white")
+        self.lb_messages.bind("<Double-Button-1>", self.show_sourcefile)
+        self.lb_messages.pack(expand=True, fill=BOTH)
+        rightscrollbar.config(command=self.lb_messages.yview)
+        bottomscrollbar.config(command=self.lb_messages.xview)
+
+        #History ListBoxes
+        rightscrollbar2 = Scrollbar(history_frame)
+        rightscrollbar2.pack(side=RIGHT, fill=Y)
+        bottomscrollbar2 = Scrollbar(history_frame, orient=HORIZONTAL)
+        bottomscrollbar2.pack(side=BOTTOM, fill=X)
+        self.showhistory = Listbox(
+            history_frame,
+            yscrollcommand=rightscrollbar2.set,
+            xscrollcommand=bottomscrollbar2.set,
+            bg="white")
+        self.showhistory.pack(expand=True, fill=BOTH)
+        rightscrollbar2.config(command=self.showhistory.yview)
+        bottomscrollbar2.config(command=self.showhistory.xview)
+        self.showhistory.bind('<Double-Button-1>', self.select_recent_file)
+        self.set_history_window()
+
+        #status bar
+        self.status = Label(self.root, text="", bd=1, relief=SUNKEN, anchor=W)
+        self.status.pack(side=BOTTOM, fill=X)
+
+        #labelbl_ratingls
+        lbl_rating_label = Label(rating_frame, text='Rating:')
+        lbl_rating_label.pack(side=LEFT)
+        lbl_rating = Label(rating_frame, textvariable=self.rating)
+        lbl_rating.pack(side=LEFT)
+        Label(mid_frame, text='Recently Used:').pack(side=LEFT)
+        Label(top_frame, text='Module or package').pack(side=LEFT)
+
+        #file textbox
+        self.txt_module = Entry(top_frame, background='white')
+        self.txt_module.bind('<Return>', self.run_lint)
+        self.txt_module.pack(side=LEFT, expand=True, fill=X)
+
+        #results box
+        rightscrollbar = Scrollbar(res_frame)
+        rightscrollbar.pack(side=RIGHT, fill=Y)
+        bottomscrollbar = Scrollbar(res_frame, orient=HORIZONTAL)
+        bottomscrollbar.pack(side=BOTTOM, fill=X)
+        self.results = Listbox(
+            res_frame,
+            yscrollcommand=rightscrollbar.set,
+            xscrollcommand=bottomscrollbar.set,
+            bg="white", font="Courier")
+        self.results.pack(expand=True, fill=BOTH, side=BOTTOM)
+        rightscrollbar.config(command=self.results.yview)
+        bottomscrollbar.config(command=self.results.xview)
+
+        #buttons
+        Button(top_frame, text='Open', command=self.file_open).pack(side=LEFT)
+        Button(top_frame, text='Open Package',
+               command=(lambda: self.file_open(package=True))).pack(side=LEFT)
+
+        self.btnRun = Button(top_frame, text='Run', command=self.run_lint)
+        self.btnRun.pack(side=LEFT)
+        Button(btn_frame, text='Quit', command=self.quit).pack(side=BOTTOM)
+
+        #radio buttons
+        self.information_box = IntVar()
+        self.convention_box = IntVar()
+        self.refactor_box = IntVar()
+        self.warning_box = IntVar()
+        self.error_box = IntVar()
+        self.fatal_box = IntVar()
+        i = Checkbutton(check_frame, text="Information", fg=COLORS['(I)'],
+                        variable=self.information_box, command=self.refresh_msg_window)
+        c = Checkbutton(check_frame, text="Convention", fg=COLORS['(C)'],
+                        variable=self.convention_box, command=self.refresh_msg_window)
+        r = Checkbutton(check_frame, text="Refactor", fg=COLORS['(R)'],
+                        variable=self.refactor_box, command=self.refresh_msg_window)
+        w = Checkbutton(check_frame, text="Warning", fg=COLORS['(W)'],
+                        variable=self.warning_box, command=self.refresh_msg_window)
+        e = Checkbutton(check_frame, text="Error", fg=COLORS['(E)'],
+                        variable=self.error_box, command=self.refresh_msg_window)
+        f = Checkbutton(check_frame, text="Fatal", fg=COLORS['(F)'],
+                        variable=self.fatal_box, command=self.refresh_msg_window)
+        i.select()
+        c.select()
+        r.select()
+        w.select()
+        e.select()
+        f.select()
+        i.pack(side=LEFT)
+        c.pack(side=LEFT)
+        r.pack(side=LEFT)
+        w.pack(side=LEFT)
+        e.pack(side=LEFT)
+        f.pack(side=LEFT)
+
+        #check boxes
+        self.box = StringVar()
+        # XXX should be generated
+        report = Radiobutton(
+            radio_frame, text="Report", variable=self.box,
+            value="Report", command=self.refresh_results_window)
+        raw_met = Radiobutton(
+            radio_frame, text="Raw metrics", variable=self.box,
+            value="Raw metrics", command=self.refresh_results_window)
+        dup = Radiobutton(
+            radio_frame, text="Duplication", variable=self.box,
+            value="Duplication", command=self.refresh_results_window)
+        ext = Radiobutton(
+            radio_frame, text="External dependencies",
+            variable=self.box, value="External dependencies",
+            command=self.refresh_results_window)
+        stat = Radiobutton(
+            radio_frame, text="Statistics by type",
+            variable=self.box, value="Statistics by type",
+            command=self.refresh_results_window)
+        msg_cat = Radiobutton(
+            radio_frame, text="Messages by category",
+            variable=self.box, value="Messages by category",
+            command=self.refresh_results_window)
+        msg = Radiobutton(
+            radio_frame, text="Messages", variable=self.box,
+            value="Messages", command=self.refresh_results_window)
+        source_file = Radiobutton(
+            radio_frame, text="Source File", variable=self.box,
+            value="Source File", command=self.refresh_results_window)
+        report.select()
+        report.grid(column=0, row=0, sticky=W)
+        raw_met.grid(column=1, row=0, sticky=W)
+        dup.grid(column=2, row=0, sticky=W)
+        msg.grid(column=3, row=0, sticky=W)
+        stat.grid(column=0, row=1, sticky=W)
+        msg_cat.grid(column=1, row=1, sticky=W)
+        ext.grid(column=2, row=1, sticky=W)
+        source_file.grid(column=3, row=1, sticky=W)
+
+        #dictionary for check boxes and associated error term
+        self.msg_type_dict = {
+            'I': lambda: self.information_box.get() == 1,
+            'C': lambda: self.convention_box.get() == 1,
+            'R': lambda: self.refactor_box.get() == 1,
+            'E': lambda: self.error_box.get() == 1,
+            'W': lambda: self.warning_box.get() == 1,
+            'F': lambda: self.fatal_box.get() == 1
+        }
+        self.txt_module.focus_set()
+
+
+    def select_recent_file(self, event): # pylint: disable=unused-argument
+        """adds the selected file in the history listbox to the Module box"""
+        if not self.showhistory.size():
+            return
+
+        selected = self.showhistory.curselection()
+        item = self.showhistory.get(selected)
+        #update module
+        self.txt_module.delete(0, END)
+        self.txt_module.insert(0, item)
+
+    def refresh_msg_window(self):
+        """refresh the message window with current output"""
+        #clear the window
+        self.lb_messages.delete(0, END)
+        self.visible_msgs = []
+        for msg in self.msgs:
+            if self.msg_type_dict.get(msg.C)():
+                self.visible_msgs.append(msg)
+                msg_str = convert_to_string(msg)
+                self.lb_messages.insert(END, msg_str)
+                fg_color = COLORS.get(msg_str[:3], 'black')
+                self.lb_messages.itemconfigure(END, fg=fg_color)
+
+    def refresh_results_window(self):
+        """refresh the results window with current output"""
+        #clear the window
+        self.results.delete(0, END)
+        try:
+            for res in self.tabs[self.box.get()]:
+                self.results.insert(END, res)
+        except KeyError:
+            pass
+
+    def process_incoming(self):
+        """process the incoming messages from running pylint"""
+        while self.msg_queue.qsize():
+            try:
+                msg = self.msg_queue.get(0)
+                if msg == "DONE":
+                    self.report_stream.output_contents()
+                    return False
+
+                #adding message to list of msgs
+                self.msgs.append(msg)
+
+                #displaying msg if message type is selected in check box
+                if self.msg_type_dict.get(msg.C)():
+                    self.visible_msgs.append(msg)
+                    msg_str = convert_to_string(msg)
+                    self.lb_messages.insert(END, msg_str)
+                    fg_color = COLORS.get(msg_str[:3], 'black')
+                    self.lb_messages.itemconfigure(END, fg=fg_color)
+
+            except six.moves.queue.Empty:
+                pass
+        return True
+
+    def periodic_call(self):
+        """determine when to unlock the run button"""
+        if self.process_incoming():
+            self.root.after(100, self.periodic_call)
+        else:
+            #enabling button so it can be run again
+            self.btnRun.config(state=NORMAL)
+
+    def mainloop(self):
+        """launch the mainloop of the application"""
+        self.root.mainloop()
+
+    def quit(self, _=None):
+        """quit the application"""
+        self.root.quit()
+
+    def halt(self): # pylint: disable=no-self-use
+        """program halt placeholder"""
+        return
+
+    def file_open(self, package=False, _=None):
+        """launch a file browser"""
+        if not package:
+            filename = askopenfilename(parent=self.root,
+                                       filetypes=[('pythonfiles', '*.py'),
+                                                  ('allfiles', '*')],
+                                       title='Select Module')
+        else:
+            filename = askdirectory(title="Select A Folder", mustexist=1)
+
+        if filename == ():
+            return
+
+        self.txt_module.delete(0, END)
+        self.txt_module.insert(0, filename)
+
+    def update_filenames(self):
+        """update the list of recent filenames"""
+        filename = self.txt_module.get()
+        if not filename:
+            filename = os.getcwd()
+        if filename+'\n' in self.filenames:
+            index = self.filenames.index(filename+'\n')
+            self.filenames.pop(index)
+
+        #ensure only 10 most recent are stored
+        if len(self.filenames) == 10:
+            self.filenames.pop()
+        self.filenames.insert(0, filename+'\n')
+
+    def set_history_window(self):
+        """update the history window with info from the history file"""
+        #clear the window
+        self.showhistory.delete(0, END)
+        # keep the last 10 most recent files
+        try:
+            view_history = open(HOME+HISTORY, 'r')
+            for hist in view_history.readlines():
+                if not hist in self.filenames:
+                    self.filenames.append(hist)
+                self.showhistory.insert(END, hist.split('\n')[0])
+            view_history.close()
+        except IOError:
+            # do nothing since history file will be created later
+            return
+
+    def run_lint(self, _=None):
+        """launches pylint"""
+        self.update_filenames()
+        self.root.configure(cursor='watch')
+        self.reporter = GUIReporter(self, output=self.report_stream)
+        module = self.txt_module.get()
+        if not module:
+            module = os.getcwd()
+
+        #cleaning up msgs and windows
+        self.msgs = []
+        self.visible_msgs = []
+        self.lb_messages.delete(0, END)
+        self.tabs = {}
+        self.results.delete(0, END)
+        self.btnRun.config(state=DISABLED)
+
+        #setting up a worker thread to run pylint
+        worker = Thread(target=lint_thread, args=(module, self.reporter, self,))
+        self.periodic_call()
+        worker.start()
+
+        # Overwrite the .pylint-gui-history file with all the new recently added files
+        # in order from filenames but only save last 10 files
+        write_history = open(HOME+HISTORY, 'w')
+        write_history.writelines(self.filenames)
+        write_history.close()
+        self.set_history_window()
+
+        self.root.configure(cursor='')
+
+    def show_sourcefile(self, event=None):  # pylint: disable=unused-argument
+        selected = self.lb_messages.curselection()
+        if not selected:
+            return
+
+        msg = self.visible_msgs[int(selected[0])]
+        scroll = msg.line - 3
+        if scroll < 0:
+            scroll = 0
+
+        self.tabs["Source File"] = open(msg.path, "r").readlines()
+        self.box.set("Source File")
+        self.refresh_results_window()
+        self.results.yview(scroll)
+        self.results.select_set(msg.line - 1)
+
+
+def lint_thread(module, reporter, gui):
+    """thread for pylint"""
+    gui.status.text = "processing module(s)"
+    pylint.lint.Run(args=[module], reporter=reporter, exit=False)
+    gui.msg_queue.put("DONE")
+
+
+def Run(args):
+    """launch pylint gui from args"""
+    if args:
+        print('USAGE: pylint-gui\n launch a simple pylint gui using Tk')
+        sys.exit(1)
+    gui = LintGui()
+    gui.mainloop()
+    sys.exit(0)
+
+if __name__ == '__main__':
+    Run(sys.argv[1:])
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/interfaces.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/interfaces.py
new file mode 100644
index 0000000..64f5a95
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/interfaces.py
@@ -0,0 +1,84 @@
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""Interfaces for Pylint objects"""
+from collections import namedtuple
+
+from logilab.common.interface import Interface
+
+Confidence = namedtuple('Confidence', ['name', 'description'])
+# Warning Certainties
+HIGH = Confidence('HIGH', 'No false positive possible.')
+INFERENCE = Confidence('INFERENCE', 'Warning based on inference result.')
+INFERENCE_FAILURE = Confidence('INFERENCE_FAILURE',
+                               'Warning based on inference with failures.')
+UNDEFINED = Confidence('UNDEFINED',
+                       'Warning without any associated confidence level.')
+
+CONFIDENCE_LEVELS = [HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED]
+
+
+class IChecker(Interface):
+    """This is an base interface, not designed to be used elsewhere than for
+    sub interfaces definition.
+    """
+
+    def open(self):
+        """called before visiting project (i.e set of modules)"""
+
+    def close(self):
+        """called after visiting project (i.e set of modules)"""
+
+
+class IRawChecker(IChecker):
+    """interface for checker which need to parse the raw file
+    """
+
+    def process_module(self, astroid):
+        """ process a module
+
+        the module's content is accessible via astroid.stream
+        """
+
+
+class ITokenChecker(IChecker):
+    """Interface for checkers that need access to the token list."""
+    def process_tokens(self, tokens):
+        """Process a module.
+
+        tokens is a list of all source code tokens in the file.
+        """
+
+
+class IAstroidChecker(IChecker):
+    """ interface for checker which prefers receive events according to
+    statement type
+    """
+
+
+class IReporter(Interface):
+    """ reporter collect messages and display results encapsulated in a layout
+    """
+    def add_message(self, msg_id, location, msg):
+        """add a message of a given type
+
+        msg_id is a message identifier
+        location is a 3-uple (module, object, line)
+        msg is the actual message
+        """
+
+    def display_results(self, layout):
+        """display results encapsulated in the layout tree
+        """
+
+
+__all__ = ('IRawChecker', 'IAstroidChecker', 'ITokenChecker', 'IReporter')
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/lint.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/lint.py
new file mode 100644
index 0000000..01fc2f5
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/lint.py
@@ -0,0 +1,1397 @@
+# Copyright (c) 2003-2014 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+""" %prog [options] module_or_package
+
+  Check that a module satisfies a coding standard (and more !).
+
+    %prog --help
+
+  Display this help message and exit.
+
+    %prog --help-msg <msg-id>[,<msg-id>]
+
+  Display help messages about given message identifiers and exit.
+"""
+from __future__ import print_function
+
+import collections
+import contextlib
+import itertools
+import operator
+import os
+try:
+    import multiprocessing
+except ImportError:
+    multiprocessing = None
+import sys
+import tokenize
+import warnings
+
+import astroid
+from astroid.__pkginfo__ import version as astroid_version
+from astroid import modutils
+from logilab.common import configuration
+from logilab.common import optik_ext
+from logilab.common import interface
+from logilab.common import textutils
+from logilab.common import ureports
+from logilab.common import __version__ as common_version
+import six
+
+from pylint import checkers
+from pylint import interfaces
+from pylint import reporters
+from pylint import utils
+from pylint import config
+from pylint.__pkginfo__ import version
+
+
+MANAGER = astroid.MANAGER
+INCLUDE_IDS_HELP = ("Deprecated. It was used to include message\'s "
+                    "id in output. Use --msg-template instead.")
+SYMBOLS_HELP = ("Deprecated. It was used to include symbolic ids of "
+                "messages in output. Use --msg-template instead.")
+
+def _get_new_args(message):
+    location = (
+        message.abspath,
+        message.path,
+        message.module,
+        message.obj,
+        message.line,
+        message.column,
+    )
+    return (
+        message.msg_id,
+        message.symbol,
+        location,
+        message.msg,
+        message.confidence,
+    )
+
+def _get_python_path(filepath):
+    dirname = os.path.realpath(os.path.expanduser(filepath))
+    if not os.path.isdir(dirname):
+        dirname = os.path.dirname(dirname)
+    while True:
+        if not os.path.exists(os.path.join(dirname, "__init__.py")):
+            return dirname
+        old_dirname = dirname
+        dirname = os.path.dirname(dirname)
+        if old_dirname == dirname:
+            return os.getcwd()
+
+
+def _merge_stats(stats):
+    merged = {}
+    for stat in stats:
+        for key, item in six.iteritems(stat):
+            if key not in merged:
+                merged[key] = item
+            else:
+                if isinstance(item, dict):
+                    merged[key].update(item)
+                else:
+                    merged[key] = merged[key] + item
+    return merged
+
+
+@contextlib.contextmanager
+def _patch_sysmodules():
+    # Context manager that permits running pylint, on Windows, with -m switch
+    # and with --jobs, as in 'python -2 -m pylint .. --jobs'.
+    # For more details why this is needed,
+    # see Python issue http://bugs.python.org/issue10845.
+
+    mock_main = __name__ != '__main__' # -m switch
+    if mock_main:
+        sys.modules['__main__'] = sys.modules[__name__]
+
+    try:
+        yield
+    finally:
+        if mock_main:
+            sys.modules.pop('__main__')
+
+
+# Python Linter class #########################################################
+
+MSGS = {
+    'F0001': ('%s',
+              'fatal',
+              'Used when an error occurred preventing the analysis of a \
+              module (unable to find it for instance).'),
+    'F0002': ('%s: %s',
+              'astroid-error',
+              'Used when an unexpected error occurred while building the '
+              'Astroid  representation. This is usually accompanied by a '
+              'traceback. Please report such errors !'),
+    'F0003': ('ignored builtin module %s',
+              'ignored-builtin-module',
+              'Used to indicate that the user asked to analyze a builtin '
+              'module which has been skipped.'),
+    'F0010': ('error while code parsing: %s',
+              'parse-error',
+              'Used when an exception occured while building the Astroid '
+              'representation which could be handled by astroid.'),
+
+    'I0001': ('Unable to run raw checkers on built-in module %s',
+              'raw-checker-failed',
+              'Used to inform that a built-in module has not been checked '
+              'using the raw checkers.'),
+
+    'I0010': ('Unable to consider inline option %r',
+              'bad-inline-option',
+              'Used when an inline option is either badly formatted or can\'t '
+              'be used inside modules.'),
+
+    'I0011': ('Locally disabling %s (%s)',
+              'locally-disabled',
+              'Used when an inline option disables a message or a messages '
+              'category.'),
+    'I0012': ('Locally enabling %s (%s)',
+              'locally-enabled',
+              'Used when an inline option enables a message or a messages '
+              'category.'),
+    'I0013': ('Ignoring entire file',
+              'file-ignored',
+              'Used to inform that the file will not be checked'),
+    'I0020': ('Suppressed %s (from line %d)',
+              'suppressed-message',
+              'A message was triggered on a line, but suppressed explicitly '
+              'by a disable= comment in the file. This message is not '
+              'generated for messages that are ignored due to configuration '
+              'settings.'),
+    'I0021': ('Useless suppression of %s',
+              'useless-suppression',
+              'Reported when a message is explicitly disabled for a line or '
+              'a block of code, but never triggered.'),
+    'I0022': ('Pragma "%s" is deprecated, use "%s" instead',
+              'deprecated-pragma',
+              'Some inline pylint options have been renamed or reworked, '
+              'only the most recent form should be used. '
+              'NOTE:skip-all is only available with pylint >= 0.26',
+              {'old_names': [('I0014', 'deprecated-disable-all')]}),
+
+    'E0001': ('%s',
+              'syntax-error',
+              'Used when a syntax error is raised for a module.'),
+
+    'E0011': ('Unrecognized file option %r',
+              'unrecognized-inline-option',
+              'Used when an unknown inline option is encountered.'),
+    'E0012': ('Bad option value %r',
+              'bad-option-value',
+              'Used when a bad value for an inline option is encountered.'),
+    }
+
+
+def _deprecated_option(shortname, opt_type, help_msg):
+    def _warn_deprecated(option, optname, *args): # pylint: disable=unused-argument
+        sys.stderr.write('Warning: option %s is deprecated and ignored.\n' % (optname,))
+    return {'short': shortname, 'help': help_msg, 'hide': True,
+            'type': opt_type, 'action': 'callback', 'callback': _warn_deprecated}
+
+
+if multiprocessing is not None:
+    class ChildLinter(multiprocessing.Process): # pylint: disable=no-member
+        def run(self):
+            tasks_queue, results_queue, self._config = self._args # pylint: disable=no-member
+
+            self._config["jobs"] = 1  # Child does not parallelize any further.
+            self._python3_porting_mode = self._config.pop(
+                'python3_porting_mode', None)
+
+            # Run linter for received files/modules.
+            for file_or_module in iter(tasks_queue.get, 'STOP'):
+                result = self._run_linter(file_or_module[0])
+                try:
+                    results_queue.put(result)
+                except Exception as ex:
+                    print("internal error with sending report for module %s" %
+                          file_or_module, file=sys.stderr)
+                    print(ex, file=sys.stderr)
+                    results_queue.put({})
+
+        def _run_linter(self, file_or_module):
+            linter = PyLinter()
+
+            # Register standard checkers.
+            linter.load_default_plugins()
+            # Load command line plugins.
+            # TODO linter.load_plugin_modules(self._plugins)
+
+            linter.load_configuration(**self._config)
+            linter.set_reporter(reporters.CollectingReporter())
+
+            # Enable the Python 3 checker mode. This option is
+            # passed down from the parent linter up to here, since
+            # the Python 3 porting flag belongs to the Run class,
+            # instead of the Linter class.
+            if self._python3_porting_mode:
+                linter.python3_porting_mode()
+
+            # Run the checks.
+            linter.check(file_or_module)
+
+            msgs = [_get_new_args(m) for m in linter.reporter.messages]
+            return (file_or_module, linter.file_state.base_name, linter.current_name,
+                    msgs, linter.stats, linter.msg_status)
+
+
+class PyLinter(configuration.OptionsManagerMixIn,
+               utils.MessagesHandlerMixIn,
+               utils.ReportsHandlerMixIn,
+               checkers.BaseTokenChecker):
+    """lint Python modules using external checkers.
+
+    This is the main checker controlling the other ones and the reports
+    generation. It is itself both a raw checker and an astroid checker in order
+    to:
+    * handle message activation / deactivation at the module level
+    * handle some basic but necessary stats'data (number of classes, methods...)
+
+    IDE plugins developpers: you may have to call
+    `astroid.builder.MANAGER.astroid_cache.clear()` accross run if you want
+    to ensure the latest code version is actually checked.
+    """
+
+    __implements__ = (interfaces.ITokenChecker, )
+
+    name = 'master'
+    priority = 0
+    level = 0
+    msgs = MSGS
+
+    @staticmethod
+    def make_options():
+        return (('ignore',
+                 {'type' : 'csv', 'metavar' : '<file>[,<file>...]',
+                  'dest' : 'black_list', 'default' : ('CVS',),
+                  'help' : 'Add files or directories to the blacklist. '
+                           'They should be base names, not paths.'}),
+                ('persistent',
+                 {'default': True, 'type' : 'yn', 'metavar' : '<y_or_n>',
+                  'level': 1,
+                  'help' : 'Pickle collected data for later comparisons.'}),
+
+                ('load-plugins',
+                 {'type' : 'csv', 'metavar' : '<modules>', 'default' : (),
+                  'level': 1,
+                  'help' : 'List of plugins (as comma separated values of '
+                           'python modules names) to load, usually to register '
+                           'additional checkers.'}),
+
+                ('output-format',
+                 {'default': 'text', 'type': 'string', 'metavar' : '<format>',
+                  'short': 'f',
+                  'group': 'Reports',
+                  'help' : 'Set the output format. Available formats are text,'
+                           ' parseable, colorized, msvs (visual studio) and html. You '
+                           'can also give a reporter class, eg mypackage.mymodule.'
+                           'MyReporterClass.'}),
+
+                ('files-output',
+                 {'default': 0, 'type' : 'yn', 'metavar' : '<y_or_n>',
+                  'group': 'Reports', 'level': 1,
+                  'help' : 'Put messages in a separate file for each module / '
+                           'package specified on the command line instead of printing '
+                           'them on stdout. Reports (if any) will be written in a file '
+                           'name "pylint_global.[txt|html]".'}),
+
+                ('reports',
+                 {'default': 1, 'type' : 'yn', 'metavar' : '<y_or_n>',
+                  'short': 'r',
+                  'group': 'Reports',
+                  'help' : 'Tells whether to display a full report or only the '
+                           'messages'}),
+
+                ('evaluation',
+                 {'type' : 'string', 'metavar' : '<python_expression>',
+                  'group': 'Reports', 'level': 1,
+                  'default': '10.0 - ((float(5 * error + warning + refactor + '
+                             'convention) / statement) * 10)',
+                  'help' : 'Python expression which should return a note less '
+                           'than 10 (10 is the highest note). You have access '
+                           'to the variables errors warning, statement which '
+                           'respectively contain the number of errors / '
+                           'warnings messages and the total number of '
+                           'statements analyzed. This is used by the global '
+                           'evaluation report (RP0004).'}),
+
+                ('comment',
+                 {'default': 0, 'type' : 'yn', 'metavar' : '<y_or_n>',
+                  'group': 'Reports', 'level': 1,
+                  'help' : 'Add a comment according to your evaluation note. '
+                           'This is used by the global evaluation report (RP0004).'}),
+
+                ('confidence',
+                 {'type' : 'multiple_choice', 'metavar': '<levels>',
+                  'default': '',
+                  'choices': [c.name for c in interfaces.CONFIDENCE_LEVELS],
+                  'group': 'Messages control',
+                  'help' : 'Only show warnings with the listed confidence levels.'
+                           ' Leave empty to show all. Valid levels: %s' % (
+                               ', '.join(c.name for c in interfaces.CONFIDENCE_LEVELS),)}),
+
+                ('enable',
+                 {'type' : 'csv', 'metavar': '<msg ids>',
+                  'short': 'e',
+                  'group': 'Messages control',
+                  'help' : 'Enable the message, report, category or checker with the '
+                           'given id(s). You can either give multiple identifier '
+                           'separated by comma (,) or put this option multiple time. '
+                           'See also the "--disable" option for examples. '}),
+
+                ('disable',
+                 {'type' : 'csv', 'metavar': '<msg ids>',
+                  'short': 'd',
+                  'group': 'Messages control',
+                  'help' : 'Disable the message, report, category or checker '
+                           'with the given id(s). You can either give multiple identifiers'
+                           ' separated by comma (,) or put this option multiple times '
+                           '(only on the command line, not in the configuration file '
+                           'where it should appear only once).'
+                           'You can also use "--disable=all" to disable everything first '
+                           'and then reenable specific checks. For example, if you want '
+                           'to run only the similarities checker, you can use '
+                           '"--disable=all --enable=similarities". '
+                           'If you want to run only the classes checker, but have no '
+                           'Warning level messages displayed, use'
+                           '"--disable=all --enable=classes --disable=W"'}),
+
+                ('msg-template',
+                 {'type' : 'string', 'metavar': '<template>',
+                  'group': 'Reports',
+                  'help' : ('Template used to display messages. '
+                            'This is a python new-style format string '
+                            'used to format the message information. '
+                            'See doc for all details')
+                 }),
+
+                ('include-ids', _deprecated_option('i', 'yn',
+                                                   INCLUDE_IDS_HELP)),
+                ('symbols', _deprecated_option('s', 'yn', SYMBOLS_HELP)),
+
+                ('jobs',
+                 {'type' : 'int', 'metavar': '<n-processes>',
+                  'short': 'j',
+                  'default': 1,
+                  'help' : '''Use multiple processes to speed up Pylint.''',
+                 }),
+
+                ('unsafe-load-any-extension',
+                 {'type': 'yn', 'metavar': '<yn>', 'default': False, 'hide': True,
+                  'help': ('Allow loading of arbitrary C extensions. Extensions'
+                           ' are imported into the active Python interpreter and'
+                           ' may run arbitrary code.')}),
+
+                ('extension-pkg-whitelist',
+                  {'type': 'csv', 'metavar': '<pkg[,pkg]>', 'default': [],
+                   'help': ('A comma-separated list of package or module names'
+                            ' from where C extensions may be loaded. Extensions are'
+                            ' loading into the active Python interpreter and may run'
+                            ' arbitrary code')}
+                  ),
+
+                ('optimize-ast',
+                  {'type': 'yn', 'metavar': '<yn>', 'default': False,
+                   'help': ('Allow optimization of some AST trees. This will '
+                            'activate a peephole AST optimizer, which will '
+                            'apply various small optimizations. For instance, '
+                            'it can be used to obtain the result of joining '
+                            'multiple strings with the addition operator. '
+                            'Joining a lot of strings can lead to a maximum '
+                            'recursion error in Pylint and this flag can prevent '
+                            'that. It has one side effect, the resulting AST '
+                            'will be different than the one from reality.')}
+                ),
+               )
+
+    option_groups = (
+        ('Messages control', 'Options controling analysis messages'),
+        ('Reports', 'Options related to output formating and reporting'),
+        )
+
+    def __init__(self, options=(), reporter=None, option_groups=(),
+                 pylintrc=None):
+        # some stuff has to be done before ancestors initialization...
+        #
+        # messages store / checkers / reporter / astroid manager
+        self.msgs_store = utils.MessagesStore()
+        self.reporter = None
+        self._reporter_name = None
+        self._reporters = {}
+        self._checkers = collections.defaultdict(list)
+        self._pragma_lineno = {}
+        self._ignore_file = False
+        # visit variables
+        self.file_state = utils.FileState()
+        self.current_name = None
+        self.current_file = None
+        self.stats = None
+        # init options
+        self._external_opts = options
+        self.options = options + PyLinter.make_options()
+        self.option_groups = option_groups + PyLinter.option_groups
+        self._options_methods = {
+            'enable': self.enable,
+            'disable': self.disable}
+        self._bw_options_methods = {'disable-msg': self.disable,
+                                    'enable-msg': self.enable}
+        full_version = '%%prog %s, \nastroid %s, common %s\nPython %s' % (
+            version, astroid_version, common_version, sys.version)
+        configuration.OptionsManagerMixIn.__init__(
+            self, usage=__doc__,
+            version=full_version,
+            config_file=pylintrc or config.PYLINTRC)
+        utils.MessagesHandlerMixIn.__init__(self)
+        utils.ReportsHandlerMixIn.__init__(self)
+        checkers.BaseTokenChecker.__init__(self)
+        # provided reports
+        self.reports = (('RP0001', 'Messages by category',
+                         report_total_messages_stats),
+                        ('RP0002', '% errors / warnings by module',
+                         report_messages_by_module_stats),
+                        ('RP0003', 'Messages',
+                         report_messages_stats),
+                        ('RP0004', 'Global evaluation',
+                         self.report_evaluation),
+                       )
+        self.register_checker(self)
+        self._dynamic_plugins = set()
+        self._python3_porting_mode = False
+        self._error_mode = False
+        self.load_provider_defaults()
+        if reporter:
+            self.set_reporter(reporter)
+
+    def load_default_plugins(self):
+        checkers.initialize(self)
+        reporters.initialize(self)
+        # Make sure to load the default reporter, because
+        # the option has been set before the plugins had been loaded.
+        if not self.reporter:
+            self._load_reporter()
+
+    def load_plugin_modules(self, modnames):
+        """take a list of module names which are pylint plugins and load
+        and register them
+        """
+        for modname in modnames:
+            if modname in self._dynamic_plugins:
+                continue
+            self._dynamic_plugins.add(modname)
+            module = modutils.load_module_from_name(modname)
+            module.register(self)
+
+    def _load_reporter(self):
+        name = self._reporter_name.lower()
+        if name in self._reporters:
+            self.set_reporter(self._reporters[name]())
+        else:
+            qname = self._reporter_name
+            module = modutils.load_module_from_name(
+                modutils.get_module_part(qname))
+            class_name = qname.split('.')[-1]
+            reporter_class = getattr(module, class_name)
+            self.set_reporter(reporter_class())
+
+    def set_reporter(self, reporter):
+        """set the reporter used to display messages and reports"""
+        self.reporter = reporter
+        reporter.linter = self
+
+    def set_option(self, optname, value, action=None, optdict=None):
+        """overridden from configuration.OptionsProviderMixin to handle some
+        special options
+        """
+        if optname in self._options_methods or \
+                optname in self._bw_options_methods:
+            if value:
+                try:
+                    meth = self._options_methods[optname]
+                except KeyError:
+                    meth = self._bw_options_methods[optname]
+                    warnings.warn('%s is deprecated, replace it by %s' % (
+                                  optname, optname.split('-')[0]),
+                                  DeprecationWarning)
+                value = optik_ext.check_csv(None, optname, value)
+                if isinstance(value, (list, tuple)):
+                    for _id in value:
+                        meth(_id, ignore_unknown=True)
+                else:
+                    meth(value)
+                return # no need to call set_option, disable/enable methods do it
+        elif optname == 'output-format':
+            self._reporter_name = value
+            # If the reporters are already available, load
+            # the reporter class.
+            if self._reporters:
+                self._load_reporter()
+
+        try:
+            checkers.BaseTokenChecker.set_option(self, optname,
+                                                 value, action, optdict)
+        except configuration.UnsupportedAction:
+            print('option %s can\'t be read from config file' % \
+                  optname, file=sys.stderr)
+
+    def register_reporter(self, reporter_class):
+        self._reporters[reporter_class.name] = reporter_class
+
+    def report_order(self):
+        reports = sorted(self._reports, key=lambda x: getattr(x, 'name', ''))
+        try:
+            # Remove the current reporter and add it
+            # at the end of the list.
+            reports.pop(reports.index(self))
+        except ValueError:
+            pass
+        else:
+            reports.append(self)
+        return reports
+
+    # checkers manipulation methods ############################################
+
+    def register_checker(self, checker):
+        """register a new checker
+
+        checker is an object implementing IRawChecker or / and IAstroidChecker
+        """
+        assert checker.priority <= 0, 'checker priority can\'t be >= 0'
+        self._checkers[checker.name].append(checker)
+        for r_id, r_title, r_cb in checker.reports:
+            self.register_report(r_id, r_title, r_cb, checker)
+        self.register_options_provider(checker)
+        if hasattr(checker, 'msgs'):
+            self.msgs_store.register_messages(checker)
+        checker.load_defaults()
+
+        # Register the checker, but disable all of its messages.
+        # TODO(cpopa): we should have a better API for this.
+        if not getattr(checker, 'enabled', True):
+            self.disable(checker.name)
+
+    def disable_noerror_messages(self):
+        for msgcat, msgids in six.iteritems(self.msgs_store._msgs_by_category):
+            if msgcat == 'E':
+                for msgid in msgids:
+                    self.enable(msgid)
+            else:
+                for msgid in msgids:
+                    self.disable(msgid)
+
+    def disable_reporters(self):
+        """disable all reporters"""
+        for reporters in six.itervalues(self._reports):
+            for report_id, _, _ in reporters:
+                self.disable_report(report_id)
+
+    def error_mode(self):
+        """error mode: enable only errors; no reports, no persistent"""
+        self._error_mode = True
+        self.disable_noerror_messages()
+        self.disable('miscellaneous')
+        if self._python3_porting_mode:
+            self.disable('all')
+            for msg_id in self._checker_messages('python3'):
+                if msg_id.startswith('E'):
+                    self.enable(msg_id)
+        else:
+            self.disable('python3')
+        self.set_option('reports', False)
+        self.set_option('persistent', False)
+
+    def python3_porting_mode(self):
+        """Disable all other checkers and enable Python 3 warnings."""
+        self.disable('all')
+        self.enable('python3')
+        if self._error_mode:
+            # The error mode was activated, using the -E flag.
+            # So we'll need to enable only the errors from the
+            # Python 3 porting checker.
+            for msg_id in self._checker_messages('python3'):
+                if msg_id.startswith('E'):
+                    self.enable(msg_id)
+                else:
+                    self.disable(msg_id)
+        self._python3_porting_mode = True
+
+    # block level option handling #############################################
+    #
+    # see func_block_disable_msg.py test case for expected behaviour
+
+    def process_tokens(self, tokens):
+        """process tokens from the current module to search for module/block
+        level options
+        """
+        control_pragmas = {'disable', 'enable'}
+        for (tok_type, content, start, _, _) in tokens:
+            if tok_type != tokenize.COMMENT:
+                continue
+            match = utils.OPTION_RGX.search(content)
+            if match is None:
+                continue
+            if match.group(1).strip() == "disable-all" or \
+                    match.group(1).strip() == 'skip-file':
+                if match.group(1).strip() == "disable-all":
+                    self.add_message('deprecated-pragma', line=start[0],
+                                     args=('disable-all', 'skip-file'))
+                self.add_message('file-ignored', line=start[0])
+                self._ignore_file = True
+                return
+            try:
+                opt, value = match.group(1).split('=', 1)
+            except ValueError:
+                self.add_message('bad-inline-option', args=match.group(1).strip(),
+                                 line=start[0])
+                continue
+            opt = opt.strip()
+            if opt in self._options_methods or opt in self._bw_options_methods:
+                try:
+                    meth = self._options_methods[opt]
+                except KeyError:
+                    meth = self._bw_options_methods[opt]
+                    # found a "(dis|en)able-msg" pragma deprecated suppresssion
+                    self.add_message('deprecated-pragma', line=start[0],
+                                     args=(opt, opt.replace('-msg', '')))
+                for msgid in textutils.splitstrip(value):
+                    # Add the line where a control pragma was encountered.
+                    if opt in control_pragmas:
+                        self._pragma_lineno[msgid] = start[0]
+
+                    try:
+                        if (opt, msgid) == ('disable', 'all'):
+                            self.add_message('deprecated-pragma', line=start[0],
+                                             args=('disable=all', 'skip-file'))
+                            self.add_message('file-ignored', line=start[0])
+                            self._ignore_file = True
+                            return
+                        meth(msgid, 'module', start[0])
+                    except utils.UnknownMessage:
+                        self.add_message('bad-option-value', args=msgid, line=start[0])
+            else:
+                self.add_message('unrecognized-inline-option', args=opt, line=start[0])
+
+
+    # code checking methods ###################################################
+
+    def get_checkers(self):
+        """return all available checkers as a list"""
+        return [self] + [c for checkers in six.itervalues(self._checkers)
+                         for c in checkers if c is not self]
+
+    def prepare_checkers(self):
+        """return checkers needed for activated messages and reports"""
+        if not self.config.reports:
+            self.disable_reporters()
+        # get needed checkers
+        neededcheckers = [self]
+        for checker in self.get_checkers()[1:]:
+            # fatal errors should not trigger enable / disabling a checker
+            messages = set(msg for msg in checker.msgs
+                           if msg[0] != 'F' and self.is_message_enabled(msg))
+            if (messages or
+                    any(self.report_is_enabled(r[0]) for r in checker.reports)):
+                neededcheckers.append(checker)
+        # Sort checkers by priority
+        neededcheckers = sorted(neededcheckers,
+                                key=operator.attrgetter('priority'),
+                                reverse=True)
+        return neededcheckers
+
+    def should_analyze_file(self, modname, path): # pylint: disable=unused-argument, no-self-use
+        """Returns whether or not a module should be checked.
+
+        This implementation returns True for all python source file, indicating
+        that all files should be linted.
+
+        Subclasses may override this method to indicate that modules satisfying
+        certain conditions should not be linted.
+
+        :param str modname: The name of the module to be checked.
+        :param str path: The full path to the source code of the module.
+        :returns: True if the module should be checked.
+        :rtype: bool
+        """
+        return path.endswith('.py')
+
+    def check(self, files_or_modules):
+        """main checking entry: check a list of files or modules from their
+        name.
+        """
+        # initialize msgs_state now that all messages have been registered into
+        # the store
+        for msg in self.msgs_store.messages:
+            if not msg.may_be_emitted():
+                self._msgs_state[msg.msgid] = False
+
+        if not isinstance(files_or_modules, (list, tuple)):
+            files_or_modules = (files_or_modules,)
+
+        if self.config.jobs == 1:
+            self._do_check(files_or_modules)
+        else:
+            with _patch_sysmodules():
+                self._parallel_check(files_or_modules)
+
+
+    def _parallel_task(self, files_or_modules):
+        # Prepare configuration for child linters.
+        filter_options = {'symbols', 'include-ids', 'long-help'}
+        filter_options.update([opt_name for opt_name, _ in self._external_opts])
+        config = {}
+        for opt_providers in six.itervalues(self._all_options):
+            for optname, optdict, val in opt_providers.options_and_values():
+                if optname not in filter_options:
+                    config[optname] = configuration.format_option_value(optdict, val)
+        config['python3_porting_mode'] = self._python3_porting_mode
+
+        childs = []
+        manager = multiprocessing.Manager()  # pylint: disable=no-member
+        tasks_queue = manager.Queue()  # pylint: disable=no-member
+        results_queue = manager.Queue()  # pylint: disable=no-member
+
+        for _ in range(self.config.jobs):
+            cl = ChildLinter(args=(tasks_queue, results_queue, config))
+            cl.start()  # pylint: disable=no-member
+            childs.append(cl)
+
+        # send files to child linters
+        for files_or_module in files_or_modules:
+            tasks_queue.put([files_or_module])
+
+        # collect results from child linters
+        failed = False
+        for _ in files_or_modules:
+            try:
+                result = results_queue.get()
+            except Exception as ex:
+                print("internal error while receiving results from child linter",
+                      file=sys.stderr)
+                print(ex, file=sys.stderr)
+                failed = True
+                break
+            yield result
+
+        # Stop child linters and wait for their completion.
+        for _ in range(self.config.jobs):
+            tasks_queue.put('STOP')
+        for cl in childs:
+            cl.join()
+
+        if failed:
+            print("Error occured, stopping the linter.", file=sys.stderr)
+            sys.exit(32)
+
+    def _parallel_check(self, files_or_modules):
+        # Reset stats.
+        self.open()
+
+        all_stats = []
+        for result in self._parallel_task(files_or_modules):
+            (
+                file_or_module,
+                self.file_state.base_name,
+                module,
+                messages,
+                stats,
+                msg_status
+            ) = result
+
+            if file_or_module == files_or_modules[-1]:
+                last_module = module
+
+            for msg in messages:
+                msg = utils.Message(*msg)
+                self.set_current_module(module)
+                self.reporter.handle_message(msg)
+
+            all_stats.append(stats)
+            self.msg_status |= msg_status
+
+        self.stats = _merge_stats(itertools.chain(all_stats, [self.stats]))
+        self.current_name = last_module
+
+        # Insert stats data to local checkers.
+        for checker in self.get_checkers():
+            if checker is not self:
+                checker.stats = self.stats
+
+    def _do_check(self, files_or_modules):
+        walker = utils.PyLintASTWalker(self)
+        checkers = self.prepare_checkers()
+        tokencheckers = [c for c in checkers
+                         if interface.implements(c, interfaces.ITokenChecker)
+                         and c is not self]
+        rawcheckers = [c for c in checkers
+                       if interface.implements(c, interfaces.IRawChecker)]
+        # notify global begin
+        for checker in checkers:
+            checker.open()
+            if interface.implements(checker, interfaces.IAstroidChecker):
+                walker.add_checker(checker)
+        # build ast and check modules or packages
+        for descr in self.expand_files(files_or_modules):
+            modname, filepath = descr['name'], descr['path']
+            if not descr['isarg'] and not self.should_analyze_file(modname, filepath):
+                continue
+            if self.config.files_output:
+                reportfile = 'pylint_%s.%s' % (modname, self.reporter.extension)
+                self.reporter.set_output(open(reportfile, 'w'))
+            self.set_current_module(modname, filepath)
+            # get the module representation
+            ast_node = self.get_ast(filepath, modname)
+            if ast_node is None:
+                continue
+            # XXX to be correct we need to keep module_msgs_state for every
+            # analyzed module (the problem stands with localized messages which
+            # are only detected in the .close step)
+            self.file_state = utils.FileState(descr['basename'])
+            self._ignore_file = False
+            # fix the current file (if the source file was not available or
+            # if it's actually a c extension)
+            self.current_file = ast_node.file # pylint: disable=maybe-no-member
+            self.check_astroid_module(ast_node, walker, rawcheckers, tokencheckers)
+            # warn about spurious inline messages handling
+            spurious_messages = self.file_state.iter_spurious_suppression_messages(self.msgs_store)
+            for msgid, line, args in spurious_messages:
+                self.add_message(msgid, line, None, args)
+        # notify global end
+        self.stats['statement'] = walker.nbstatements
+        checkers.reverse()
+        for checker in checkers:
+            checker.close()
+
+    def expand_files(self, modules):
+        """get modules and errors from a list of modules and handle errors
+        """
+        result, errors = utils.expand_modules(modules, self.config.black_list)
+        for error in errors:
+            message = modname = error["mod"]
+            key = error["key"]
+            self.set_current_module(modname)
+            if key == "fatal":
+                message = str(error["ex"]).replace(os.getcwd() + os.sep, '')
+            self.add_message(key, args=message)
+        return result
+
+    def set_current_module(self, modname, filepath=None):
+        """set the name of the currently analyzed module and
+        init statistics for it
+        """
+        if not modname and filepath is None:
+            return
+        self.reporter.on_set_current_module(modname, filepath)
+        self.current_name = modname
+        self.current_file = filepath or modname
+        self.stats['by_module'][modname] = {}
+        self.stats['by_module'][modname]['statement'] = 0
+        for msg_cat in six.itervalues(utils.MSG_TYPES):
+            self.stats['by_module'][modname][msg_cat] = 0
+
+    def get_ast(self, filepath, modname):
+        """return a ast(roid) representation for a module"""
+        try:
+            return MANAGER.ast_from_file(filepath, modname, source=True)
+        except SyntaxError as ex:
+            self.add_message('syntax-error', line=ex.lineno, args=ex.msg)
+        except astroid.AstroidBuildingException as ex:
+            self.add_message('parse-error', args=ex)
+        except Exception as ex: # pylint: disable=broad-except
+            import traceback
+            traceback.print_exc()
+            self.add_message('astroid-error', args=(ex.__class__, ex))
+
+    def check_astroid_module(self, ast_node, walker,
+                             rawcheckers, tokencheckers):
+        """Check a module from its astroid representation."""
+        try:
+            tokens = utils.tokenize_module(ast_node)
+        except tokenize.TokenError as ex:
+            self.add_message('syntax-error', line=ex.args[1][0], args=ex.args[0])
+            return
+
+        if not ast_node.pure_python:
+            self.add_message('raw-checker-failed', args=ast_node.name)
+        else:
+            #assert astroid.file.endswith('.py')
+            # invoke ITokenChecker interface on self to fetch module/block
+            # level options
+            self.process_tokens(tokens)
+            if self._ignore_file:
+                return False
+            # walk ast to collect line numbers
+            self.file_state.collect_block_lines(self.msgs_store, ast_node)
+            # run raw and tokens checkers
+            for checker in rawcheckers:
+                checker.process_module(ast_node)
+            for checker in tokencheckers:
+                checker.process_tokens(tokens)
+        # generate events to astroid checkers
+        walker.walk(ast_node)
+        return True
+
+    # IAstroidChecker interface #################################################
+
+    def open(self):
+        """initialize counters"""
+        self.stats = {'by_module' : {},
+                      'by_msg' : {},
+                     }
+        MANAGER.optimize_ast = self.config.optimize_ast
+        MANAGER.always_load_extensions = self.config.unsafe_load_any_extension
+        MANAGER.extension_package_whitelist.update(
+            self.config.extension_pkg_whitelist)
+        for msg_cat in six.itervalues(utils.MSG_TYPES):
+            self.stats[msg_cat] = 0
+
+    def generate_reports(self):
+        """close the whole package /module, it's time to make reports !
+
+        if persistent run, pickle results for later comparison
+        """
+        if self.file_state.base_name is not None:
+            # load previous results if any
+            previous_stats = config.load_results(self.file_state.base_name)
+            # XXX code below needs refactoring to be more reporter agnostic
+            self.reporter.on_close(self.stats, previous_stats)
+            if self.config.reports:
+                sect = self.make_reports(self.stats, previous_stats)
+                if self.config.files_output:
+                    filename = 'pylint_global.' + self.reporter.extension
+                    self.reporter.set_output(open(filename, 'w'))
+            else:
+                sect = ureports.Section()
+            if self.config.reports or self.config.output_format == 'html':
+                self.reporter.display_results(sect)
+            # save results if persistent run
+            if self.config.persistent:
+                config.save_results(self.stats, self.file_state.base_name)
+        else:
+            if self.config.output_format == 'html':
+                # No output will be emitted for the html
+                # reporter if the file doesn't exist, so emit
+                # the results here.
+                self.reporter.display_results(ureports.Section())
+            self.reporter.on_close(self.stats, {})
+
+    # specific reports ########################################################
+
+    def report_evaluation(self, sect, stats, previous_stats):
+        """make the global evaluation report"""
+        # check with at least check 1 statements (usually 0 when there is a
+        # syntax error preventing pylint from further processing)
+        if stats['statement'] == 0:
+            raise utils.EmptyReport()
+        # get a global note for the code
+        evaluation = self.config.evaluation
+        try:
+            note = eval(evaluation, {}, self.stats) # pylint: disable=eval-used
+        except Exception as ex: # pylint: disable=broad-except
+            msg = 'An exception occurred while rating: %s' % ex
+        else:
+            stats['global_note'] = note
+            msg = 'Your code has been rated at %.2f/10' % note
+            pnote = previous_stats.get('global_note')
+            if pnote is not None:
+                msg += ' (previous run: %.2f/10, %+.2f)' % (pnote, note - pnote)
+            if self.config.comment:
+                msg = '%s\n%s' % (msg, config.get_note_message(note))
+        sect.append(ureports.Text(msg))
+
+# some reporting functions ####################################################
+
+def report_total_messages_stats(sect, stats, previous_stats):
+    """make total errors / warnings report"""
+    lines = ['type', 'number', 'previous', 'difference']
+    lines += checkers.table_lines_from_stats(stats, previous_stats,
+                                             ('convention', 'refactor',
+                                              'warning', 'error'))
+    sect.append(ureports.Table(children=lines, cols=4, rheaders=1))
+
+def report_messages_stats(sect, stats, _):
+    """make messages type report"""
+    if not stats['by_msg']:
+        # don't print this report when we didn't detected any errors
+        raise utils.EmptyReport()
+    in_order = sorted([(value, msg_id)
+                       for msg_id, value in six.iteritems(stats['by_msg'])
+                       if not msg_id.startswith('I')])
+    in_order.reverse()
+    lines = ('message id', 'occurrences')
+    for value, msg_id in in_order:
+        lines += (msg_id, str(value))
+    sect.append(ureports.Table(children=lines, cols=2, rheaders=1))
+
+def report_messages_by_module_stats(sect, stats, _):
+    """make errors / warnings by modules report"""
+    if len(stats['by_module']) == 1:
+        # don't print this report when we are analysing a single module
+        raise utils.EmptyReport()
+    by_mod = collections.defaultdict(dict)
+    for m_type in ('fatal', 'error', 'warning', 'refactor', 'convention'):
+        total = stats[m_type]
+        for module in six.iterkeys(stats['by_module']):
+            mod_total = stats['by_module'][module][m_type]
+            if total == 0:
+                percent = 0
+            else:
+                percent = float((mod_total)*100) / total
+            by_mod[module][m_type] = percent
+    sorted_result = []
+    for module, mod_info in six.iteritems(by_mod):
+        sorted_result.append((mod_info['error'],
+                              mod_info['warning'],
+                              mod_info['refactor'],
+                              mod_info['convention'],
+                              module))
+    sorted_result.sort()
+    sorted_result.reverse()
+    lines = ['module', 'error', 'warning', 'refactor', 'convention']
+    for line in sorted_result:
+        # Don't report clean modules.
+        if all(entry == 0 for entry in line[:-1]):
+            continue
+        lines.append(line[-1])
+        for val in line[:-1]:
+            lines.append('%.2f' % val)
+    if len(lines) == 5:
+        raise utils.EmptyReport()
+    sect.append(ureports.Table(children=lines, cols=5, rheaders=1))
+
+
+# utilities ###################################################################
+
+
+class ArgumentPreprocessingError(Exception):
+    """Raised if an error occurs during argument preprocessing."""
+
+
+def preprocess_options(args, search_for):
+    """look for some options (keys of <search_for>) which have to be processed
+    before others
+
+    values of <search_for> are callback functions to call when the option is
+    found
+    """
+    i = 0
+    while i < len(args):
+        arg = args[i]
+        if arg.startswith('--'):
+            try:
+                option, val = arg[2:].split('=', 1)
+            except ValueError:
+                option, val = arg[2:], None
+            try:
+                cb, takearg = search_for[option]
+            except KeyError:
+                i += 1
+            else:
+                del args[i]
+                if takearg and val is None:
+                    if i >= len(args) or args[i].startswith('-'):
+                        msg = 'Option %s expects a value' % option
+                        raise ArgumentPreprocessingError(msg)
+                    val = args[i]
+                    del args[i]
+                elif not takearg and val is not None:
+                    msg = "Option %s doesn't expects a value" % option
+                    raise ArgumentPreprocessingError(msg)
+                cb(option, val)
+        else:
+            i += 1
+
+
+@contextlib.contextmanager
+def fix_import_path(args):
+    """Prepare sys.path for running the linter checks.
+
+    Within this context, each of the given arguments is importable.
+    Paths are added to sys.path in corresponding order to the arguments.
+    We avoid adding duplicate directories to sys.path.
+    `sys.path` is reset to its original value upon exitign this context.
+    """
+    orig = list(sys.path)
+    changes = []
+    for arg in args:
+        path = _get_python_path(arg)
+        if path in changes:
+            continue
+        else:
+            changes.append(path)
+    sys.path[:] = changes + sys.path
+    try:
+        yield
+    finally:
+        sys.path[:] = orig
+
+
+class Run(object):
+    """helper class to use as main for pylint :
+
+    run(*sys.argv[1:])
+    """
+    LinterClass = PyLinter
+    option_groups = (
+        ('Commands', 'Options which are actually commands. Options in this \
+group are mutually exclusive.'),
+        )
+
+    def __init__(self, args, reporter=None, exit=True):
+        self._rcfile = None
+        self._plugins = []
+        try:
+            preprocess_options(args, {
+                # option: (callback, takearg)
+                'init-hook':   (cb_init_hook, True),
+                'rcfile':       (self.cb_set_rcfile, True),
+                'load-plugins': (self.cb_add_plugins, True),
+                })
+        except ArgumentPreprocessingError as ex:
+            print(ex, file=sys.stderr)
+            sys.exit(32)
+
+        self.linter = linter = self.LinterClass((
+            ('rcfile',
+             {'action' : 'callback', 'callback' : lambda *args: 1,
+              'type': 'string', 'metavar': '<file>',
+              'help' : 'Specify a configuration file.'}),
+
+            ('init-hook',
+             {'action' : 'callback', 'callback' : lambda *args: 1,
+              'type' : 'string', 'metavar': '<code>',
+              'level': 1,
+              'help' : 'Python code to execute, usually for sys.path '
+                       'manipulation such as pygtk.require().'}),
+
+            ('help-msg',
+             {'action' : 'callback', 'type' : 'string', 'metavar': '<msg-id>',
+              'callback' : self.cb_help_message,
+              'group': 'Commands',
+              'help' : 'Display a help message for the given message id and '
+                       'exit. The value may be a comma separated list of message ids.'}),
+
+            ('list-msgs',
+             {'action' : 'callback', 'metavar': '<msg-id>',
+              'callback' : self.cb_list_messages,
+              'group': 'Commands', 'level': 1,
+              'help' : "Generate pylint's messages."}),
+
+            ('list-conf-levels',
+             {'action' : 'callback',
+              'callback' : cb_list_confidence_levels,
+              'group': 'Commands', 'level': 1,
+              'help' : "Generate pylint's messages."}),
+
+            ('full-documentation',
+             {'action' : 'callback', 'metavar': '<msg-id>',
+              'callback' : self.cb_full_documentation,
+              'group': 'Commands', 'level': 1,
+              'help' : "Generate pylint's full documentation."}),
+
+            ('generate-rcfile',
+             {'action' : 'callback', 'callback' : self.cb_generate_config,
+              'group': 'Commands',
+              'help' : 'Generate a sample configuration file according to '
+                       'the current configuration. You can put other options '
+                       'before this one to get them in the generated '
+                       'configuration.'}),
+
+            ('generate-man',
+             {'action' : 'callback', 'callback' : self.cb_generate_manpage,
+              'group': 'Commands',
+              'help' : "Generate pylint's man page.", 'hide': True}),
+
+            ('errors-only',
+             {'action' : 'callback', 'callback' : self.cb_error_mode,
+              'short': 'E',
+              'help' : 'In error mode, checkers without error messages are '
+                       'disabled and for others, only the ERROR messages are '
+                       'displayed, and no reports are done by default'''}),
+
+            ('py3k',
+             {'action' : 'callback', 'callback' : self.cb_python3_porting_mode,
+              'help' : 'In Python 3 porting mode, all checkers will be '
+                       'disabled and only messages emitted by the porting '
+                       'checker will be displayed'}),
+
+            ('profile',
+             {'type' : 'yn', 'metavar' : '<y_or_n>',
+              'default': False, 'hide': True,
+              'help' : 'Profiled execution.'}),
+
+            ), option_groups=self.option_groups, pylintrc=self._rcfile)
+        # register standard checkers
+        linter.load_default_plugins()
+        # load command line plugins
+        linter.load_plugin_modules(self._plugins)
+        # add some help section
+        linter.add_help_section('Environment variables', config.ENV_HELP, level=1)
+        # pylint: disable=bad-continuation
+        linter.add_help_section('Output',
+'Using the default text output, the message format is :                          \n'
+'                                                                                \n'
+'        MESSAGE_TYPE: LINE_NUM:[OBJECT:] MESSAGE                                \n'
+'                                                                                \n'
+'There are 5 kind of message types :                                             \n'
+'    * (C) convention, for programming standard violation                        \n'
+'    * (R) refactor, for bad code smell                                          \n'
+'    * (W) warning, for python specific problems                                 \n'
+'    * (E) error, for probable bugs in the code                                  \n'
+'    * (F) fatal, if an error occurred which prevented pylint from doing further\n'
+'processing.\n'
+                                , level=1)
+        linter.add_help_section('Output status code',
+'Pylint should leave with following status code:                                 \n'
+'    * 0 if everything went fine                                                 \n'
+'    * 1 if a fatal message was issued                                           \n'
+'    * 2 if an error message was issued                                          \n'
+'    * 4 if a warning message was issued                                         \n'
+'    * 8 if a refactor message was issued                                        \n'
+'    * 16 if a convention message was issued                                     \n'
+'    * 32 on usage error                                                         \n'
+'                                                                                \n'
+'status 1 to 16 will be bit-ORed so you can know which different categories has\n'
+'been issued by analysing pylint output status code\n',
+                                level=1)
+        # read configuration
+        linter.disable('pointless-except')
+        linter.disable('suppressed-message')
+        linter.disable('useless-suppression')
+        linter.read_config_file()
+        config_parser = linter.cfgfile_parser
+        # run init hook, if present, before loading plugins
+        if config_parser.has_option('MASTER', 'init-hook'):
+            cb_init_hook('init-hook',
+                         textutils.unquote(config_parser.get('MASTER',
+                                                             'init-hook')))
+        # is there some additional plugins in the file configuration, in
+        if config_parser.has_option('MASTER', 'load-plugins'):
+            plugins = textutils.splitstrip(
+                config_parser.get('MASTER', 'load-plugins'))
+            linter.load_plugin_modules(plugins)
+        # now we can load file config and command line, plugins (which can
+        # provide options) have been registered
+        linter.load_config_file()
+        if reporter:
+            # if a custom reporter is provided as argument, it may be overridden
+            # by file parameters, so re-set it here, but before command line
+            # parsing so it's still overrideable by command line option
+            linter.set_reporter(reporter)
+        try:
+            args = linter.load_command_line_configuration(args)
+        except SystemExit as exc:
+            if exc.code == 2: # bad options
+                exc.code = 32
+            raise
+        if not args:
+            print(linter.help())
+            sys.exit(32)
+
+        if linter.config.jobs < 0:
+            print("Jobs number (%d) should be greater than 0"
+                  % linter.config.jobs, file=sys.stderr)
+            sys.exit(32)
+        if linter.config.jobs > 1 or linter.config.jobs == 0:
+            if multiprocessing is None:
+                print("Multiprocessing library is missing, "
+                      "fallback to single process", file=sys.stderr)
+                linter.set_option("jobs", 1)
+            else:
+                if linter.config.jobs == 0:
+                    linter.config.jobs = multiprocessing.cpu_count()
+
+        # insert current working directory to the python path to have a correct
+        # behaviour
+        with fix_import_path(args):
+            if self.linter.config.profile:
+                print('** profiled run', file=sys.stderr)
+                import cProfile, pstats
+                cProfile.runctx('linter.check(%r)' % args, globals(), locals(),
+                                'stones.prof')
+                data = pstats.Stats('stones.prof')
+                data.strip_dirs()
+                data.sort_stats('time', 'calls')
+                data.print_stats(30)
+            else:
+                linter.check(args)
+            linter.generate_reports()
+        if exit:
+            sys.exit(self.linter.msg_status)
+
+    def cb_set_rcfile(self, name, value):
+        """callback for option preprocessing (i.e. before option parsing)"""
+        self._rcfile = value
+
+    def cb_add_plugins(self, name, value):
+        """callback for option preprocessing (i.e. before option parsing)"""
+        self._plugins.extend(textutils.splitstrip(value))
+
+    def cb_error_mode(self, *args, **kwargs):
+        """error mode:
+        * disable all but error messages
+        * disable the 'miscellaneous' checker which can be safely deactivated in
+          debug
+        * disable reports
+        * do not save execution information
+        """
+        self.linter.error_mode()
+
+    def cb_generate_config(self, *args, **kwargs):
+        """optik callback for sample config file generation"""
+        self.linter.generate_config(skipsections=('COMMANDS',))
+        sys.exit(0)
+
+    def cb_generate_manpage(self, *args, **kwargs):
+        """optik callback for sample config file generation"""
+        from pylint import __pkginfo__
+        self.linter.generate_manpage(__pkginfo__)
+        sys.exit(0)
+
+    def cb_help_message(self, option, optname, value, parser):
+        """optik callback for printing some help about a particular message"""
+        self.linter.msgs_store.help_message(textutils.splitstrip(value))
+        sys.exit(0)
+
+    def cb_full_documentation(self, option, optname, value, parser):
+        """optik callback for printing full documentation"""
+        self.linter.print_full_documentation()
+        sys.exit(0)
+
+    def cb_list_messages(self, option, optname, value, parser): # FIXME
+        """optik callback for printing available messages"""
+        self.linter.msgs_store.list_messages()
+        sys.exit(0)
+
+    def cb_python3_porting_mode(self, *args, **kwargs):
+        """Activate only the python3 porting checker."""
+        self.linter.python3_porting_mode()
+
+
+def cb_list_confidence_levels(option, optname, value, parser):
+    for level in interfaces.CONFIDENCE_LEVELS:
+        print('%-18s: %s' % level)
+    sys.exit(0)
+
+def cb_init_hook(optname, value):
+    """exec arbitrary code to set sys.path for instance"""
+    exec(value) # pylint: disable=exec-used
+
+
+if __name__ == '__main__':
+    Run(sys.argv[1:])
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/__init__.py
new file mode 100644
index 0000000..8c32ad9
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/__init__.py
@@ -0,0 +1,5 @@
+"""
+pyreverse.extensions
+"""
+
+__revision__ = "$Id $"
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/diadefslib.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/diadefslib.py
new file mode 100644
index 0000000..e0dc8cf
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/diadefslib.py
@@ -0,0 +1,233 @@
+# Copyright (c) 2000-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""handle diagram generation options for class diagram or default diagrams
+"""
+
+from logilab.common.compat import builtins
+
+import astroid
+from astroid.utils import LocalsVisitor
+
+from pylint.pyreverse.diagrams import PackageDiagram, ClassDiagram
+
+BUILTINS_NAME = builtins.__name__
+
+# diagram generators ##########################################################
+
+class DiaDefGenerator(object):
+    """handle diagram generation options"""
+
+    def __init__(self, linker, handler):
+        """common Diagram Handler initialization"""
+        self.config = handler.config
+        self._set_default_options()
+        self.linker = linker
+        self.classdiagram = None # defined by subclasses
+
+    def get_title(self, node):
+        """get title for objects"""
+        title = node.name
+        if self.module_names:
+            title = '%s.%s' % (node.root().name, title)
+        return title
+
+    def _set_option(self, option):
+        """activate some options if not explicitly deactivated"""
+        # if we have a class diagram, we want more information by default;
+        # so if the option is None, we return True
+        if option is None:
+            if self.config.classes:
+                return True
+            else:
+                return False
+        return option
+
+    def _set_default_options(self):
+        """set different default options with _default dictionary"""
+        self.module_names = self._set_option(self.config.module_names)
+        all_ancestors = self._set_option(self.config.all_ancestors)
+        all_associated = self._set_option(self.config.all_associated)
+        anc_level, ass_level = (0, 0)
+        if  all_ancestors:
+            anc_level = -1
+        if all_associated:
+            ass_level = -1
+        if self.config.show_ancestors is not None:
+            anc_level = self.config.show_ancestors
+        if self.config.show_associated is not None:
+            ass_level = self.config.show_associated
+        self.anc_level, self.ass_level = anc_level, ass_level
+
+    def _get_levels(self):
+        """help function for search levels"""
+        return self.anc_level, self.ass_level
+
+    def show_node(self, node):
+        """true if builtins and not show_builtins"""
+        if self.config.show_builtin:
+            return True
+        return node.root().name != BUILTINS_NAME
+
+    def add_class(self, node):
+        """visit one class and add it to diagram"""
+        self.linker.visit(node)
+        self.classdiagram.add_object(self.get_title(node), node)
+
+    def get_ancestors(self, node, level):
+        """return ancestor nodes of a class node"""
+        if level == 0:
+            return
+        for ancestor in node.ancestors(recurs=False):
+            if not self.show_node(ancestor):
+                continue
+            yield ancestor
+
+    def get_associated(self, klass_node, level):
+        """return associated nodes of a class node"""
+        if level == 0:
+            return
+        for ass_nodes in list(klass_node.instance_attrs_type.values()) + \
+                         list(klass_node.locals_type.values()):
+            for ass_node in ass_nodes:
+                if isinstance(ass_node, astroid.Instance):
+                    ass_node = ass_node._proxied
+                if not (isinstance(ass_node, astroid.Class)
+                        and self.show_node(ass_node)):
+                    continue
+                yield ass_node
+
+    def extract_classes(self, klass_node, anc_level, ass_level):
+        """extract recursively classes related to klass_node"""
+        if self.classdiagram.has_node(klass_node) or not self.show_node(klass_node):
+            return
+        self.add_class(klass_node)
+
+        for ancestor in self.get_ancestors(klass_node, anc_level):
+            self.extract_classes(ancestor, anc_level-1, ass_level)
+
+        for ass_node in self.get_associated(klass_node, ass_level):
+            self.extract_classes(ass_node, anc_level, ass_level-1)
+
+
+class DefaultDiadefGenerator(LocalsVisitor, DiaDefGenerator):
+    """generate minimum diagram definition for the project :
+
+    * a package diagram including project's modules
+    * a class diagram including project's classes
+    """
+
+    def __init__(self, linker, handler):
+        DiaDefGenerator.__init__(self, linker, handler)
+        LocalsVisitor.__init__(self)
+
+    def visit_project(self, node):
+        """visit an astroid.Project node
+
+        create a diagram definition for packages
+        """
+        mode = self.config.mode
+        if len(node.modules) > 1:
+            self.pkgdiagram = PackageDiagram('packages %s' % node.name, mode)
+        else:
+            self.pkgdiagram = None
+        self.classdiagram = ClassDiagram('classes %s' % node.name, mode)
+
+    def leave_project(self, node): # pylint: disable=unused-argument
+        """leave the astroid.Project node
+
+        return the generated diagram definition
+        """
+        if self.pkgdiagram:
+            return self.pkgdiagram, self.classdiagram
+        return self.classdiagram,
+
+    def visit_module(self, node):
+        """visit an astroid.Module node
+
+        add this class to the package diagram definition
+        """
+        if self.pkgdiagram:
+            self.linker.visit(node)
+            self.pkgdiagram.add_object(node.name, node)
+
+    def visit_class(self, node):
+        """visit an astroid.Class node
+
+        add this class to the class diagram definition
+        """
+        anc_level, ass_level = self._get_levels()
+        self.extract_classes(node, anc_level, ass_level)
+
+    def visit_from(self, node):
+        """visit astroid.From  and catch modules for package diagram
+        """
+        if self.pkgdiagram:
+            self.pkgdiagram.add_from_depend(node, node.modname)
+
+
+class ClassDiadefGenerator(DiaDefGenerator):
+    """generate a class diagram definition including all classes related to a
+    given class
+    """
+
+    def __init__(self, linker, handler):
+        DiaDefGenerator.__init__(self, linker, handler)
+
+    def class_diagram(self, project, klass):
+        """return a class diagram definition for the given klass and its
+        related klasses
+        """
+
+        self.classdiagram = ClassDiagram(klass, self.config.mode)
+        if len(project.modules) > 1:
+            module, klass = klass.rsplit('.', 1)
+            module = project.get_module(module)
+        else:
+            module = project.modules[0]
+            klass = klass.split('.')[-1]
+        klass = next(module.ilookup(klass))
+
+        anc_level, ass_level = self._get_levels()
+        self.extract_classes(klass, anc_level, ass_level)
+        return self.classdiagram
+
+# diagram handler #############################################################
+
+class DiadefsHandler(object):
+    """handle diagram definitions :
+
+    get it from user (i.e. xml files) or generate them
+    """
+
+    def __init__(self, config):
+        self.config = config
+
+    def get_diadefs(self, project, linker):
+        """get the diagrams configuration data
+        :param linker: astroid.inspector.Linker(IdGeneratorMixIn, LocalsVisitor)
+        :param project: astroid.manager.Project
+        """
+
+        #  read and interpret diagram definitions (Diadefs)
+        diagrams = []
+        generator = ClassDiadefGenerator(linker, self)
+        for klass in self.config.classes:
+            diagrams.append(generator.class_diagram(project, klass))
+        if not diagrams:
+            diagrams = DefaultDiadefGenerator(linker, self).visit(project)
+        for diagram in diagrams:
+            diagram.extract_relationships()
+        return  diagrams
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/diagrams.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/diagrams.py
new file mode 100644
index 0000000..f0d7a92
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/diagrams.py
@@ -0,0 +1,247 @@
+# Copyright (c) 2004-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""diagram objects
+"""
+
+import astroid
+from pylint.pyreverse.utils import is_interface, FilterMixIn
+
+class Figure(object):
+    """base class for counter handling"""
+
+class Relationship(Figure):
+    """a relation ship from an object in the diagram to another
+    """
+    def __init__(self, from_object, to_object, relation_type, name=None):
+        Figure.__init__(self)
+        self.from_object = from_object
+        self.to_object = to_object
+        self.type = relation_type
+        self.name = name
+
+
+class DiagramEntity(Figure):
+    """a diagram object, i.e. a label associated to an astroid node
+    """
+    def __init__(self, title='No name', node=None):
+        Figure.__init__(self)
+        self.title = title
+        self.node = node
+
+class ClassDiagram(Figure, FilterMixIn):
+    """main class diagram handling
+    """
+    TYPE = 'class'
+    def __init__(self, title, mode):
+        FilterMixIn.__init__(self, mode)
+        Figure.__init__(self)
+        self.title = title
+        self.objects = []
+        self.relationships = {}
+        self._nodes = {}
+        self.depends = []
+
+    def get_relationships(self, role):
+        # sorted to get predictable (hence testable) results
+        return sorted(self.relationships.get(role, ()),
+                      key=lambda x: (x.from_object.fig_id, x.to_object.fig_id))
+
+    def add_relationship(self, from_object, to_object,
+                         relation_type, name=None):
+        """create a relation ship
+        """
+        rel = Relationship(from_object, to_object, relation_type, name)
+        self.relationships.setdefault(relation_type, []).append(rel)
+
+    def get_relationship(self, from_object, relation_type):
+        """return a relation ship or None
+        """
+        for rel in self.relationships.get(relation_type, ()):
+            if rel.from_object is from_object:
+                return rel
+        raise KeyError(relation_type)
+
+    def get_attrs(self, node):
+        """return visible attributes, possibly with class name"""
+        attrs = []
+        for node_name, ass_nodes in list(node.instance_attrs_type.items()) + \
+                                list(node.locals_type.items()):
+            if not self.show_attr(node_name):
+                continue
+            names = self.class_names(ass_nodes)
+            if names:
+                node_name = "%s : %s" % (node_name, ", ".join(names))
+            attrs.append(node_name)
+        return sorted(attrs)
+
+    def get_methods(self, node):
+        """return visible methods"""
+        methods = [
+            m for m in node.values()
+            if isinstance(m, astroid.Function) and self.show_attr(m.name)
+        ]
+        return sorted(methods, key=lambda n: n.name)
+
+    def add_object(self, title, node):
+        """create a diagram object
+        """
+        assert node not in self._nodes
+        ent = DiagramEntity(title, node)
+        self._nodes[node] = ent
+        self.objects.append(ent)
+
+    def class_names(self, nodes):
+        """return class names if needed in diagram"""
+        names = []
+        for ass_node in nodes:
+            if isinstance(ass_node, astroid.Instance):
+                ass_node = ass_node._proxied
+            if isinstance(ass_node, astroid.Class) \
+                and hasattr(ass_node, "name") and not self.has_node(ass_node):
+                if ass_node.name not in names:
+                    ass_name = ass_node.name
+                    names.append(ass_name)
+        return names
+
+    def nodes(self):
+        """return the list of underlying nodes
+        """
+        return self._nodes.keys()
+
+    def has_node(self, node):
+        """return true if the given node is included in the diagram
+        """
+        return node in self._nodes
+
+    def object_from_node(self, node):
+        """return the diagram object mapped to node
+        """
+        return self._nodes[node]
+
+    def classes(self):
+        """return all class nodes in the diagram"""
+        return [o for o in self.objects if isinstance(o.node, astroid.Class)]
+
+    def classe(self, name):
+        """return a class by its name, raise KeyError if not found
+        """
+        for klass in self.classes():
+            if klass.node.name == name:
+                return klass
+        raise KeyError(name)
+
+    def extract_relationships(self):
+        """extract relation ships between nodes in the diagram
+        """
+        for obj in self.classes():
+            node = obj.node
+            obj.attrs = self.get_attrs(node)
+            obj.methods = self.get_methods(node)
+            # shape
+            if is_interface(node):
+                obj.shape = 'interface'
+            else:
+                obj.shape = 'class'
+            # inheritance link
+            for par_node in node.ancestors(recurs=False):
+                try:
+                    par_obj = self.object_from_node(par_node)
+                    self.add_relationship(obj, par_obj, 'specialization')
+                except KeyError:
+                    continue
+            # implements link
+            for impl_node in node.implements:
+                try:
+                    impl_obj = self.object_from_node(impl_node)
+                    self.add_relationship(obj, impl_obj, 'implements')
+                except KeyError:
+                    continue
+            # associations link
+            for name, values in list(node.instance_attrs_type.items()) + \
+                                list(node.locals_type.items()):
+                for value in values:
+                    if value is astroid.YES:
+                        continue
+                    if isinstance(value, astroid.Instance):
+                        value = value._proxied
+                    try:
+                        ass_obj = self.object_from_node(value)
+                        self.add_relationship(ass_obj, obj, 'association', name)
+                    except KeyError:
+                        continue
+
+
+class PackageDiagram(ClassDiagram):
+    """package diagram handling
+    """
+    TYPE = 'package'
+
+    def modules(self):
+        """return all module nodes in the diagram"""
+        return [o for o in self.objects if isinstance(o.node, astroid.Module)]
+
+    def module(self, name):
+        """return a module by its name, raise KeyError if not found
+        """
+        for mod in self.modules():
+            if mod.node.name == name:
+                return mod
+        raise KeyError(name)
+
+    def get_module(self, name, node):
+        """return a module by its name, looking also for relative imports;
+        raise KeyError if not found
+        """
+        for mod in self.modules():
+            mod_name = mod.node.name
+            if mod_name == name:
+                return mod
+            #search for fullname of relative import modules
+            package = node.root().name
+            if mod_name == "%s.%s" % (package, name):
+                return mod
+            if mod_name == "%s.%s" % (package.rsplit('.', 1)[0], name):
+                return mod
+        raise KeyError(name)
+
+    def add_from_depend(self, node, from_module):
+        """add dependencies created by from-imports
+        """
+        mod_name = node.root().name
+        obj = self.module(mod_name)
+        if from_module not in obj.node.depends:
+            obj.node.depends.append(from_module)
+
+    def extract_relationships(self):
+        """extract relation ships between nodes in the diagram
+        """
+        ClassDiagram.extract_relationships(self)
+        for obj in self.classes():
+            # ownership
+            try:
+                mod = self.object_from_node(obj.node.root())
+                self.add_relationship(obj, mod, 'ownership')
+            except KeyError:
+                continue
+        for obj in self.modules():
+            obj.shape = 'package'
+            # dependencies
+            for dep_name in obj.node.depends:
+                try:
+                    dep = self.get_module(dep_name, obj.node)
+                except KeyError:
+                    continue
+                self.add_relationship(obj, dep, 'depends')
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/main.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/main.py
new file mode 100644
index 0000000..408c172
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/main.py
@@ -0,0 +1,124 @@
+# # Copyright (c) 2000-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""
+  %prog [options] <packages>
+
+  create UML diagrams for classes and modules in <packages>
+"""
+from __future__ import print_function
+
+import sys, os
+from logilab.common.configuration import ConfigurationMixIn
+from astroid.manager import AstroidManager
+from astroid.inspector import Linker
+
+from pylint.pyreverse.diadefslib import DiadefsHandler
+from pylint.pyreverse import writer
+from pylint.pyreverse.utils import insert_default_options
+
+OPTIONS = (
+    ("filter-mode",
+     dict(short='f', default='PUB_ONLY', dest='mode', type='string',
+          action='store', metavar='<mode>',
+          help="""filter attributes and functions according to
+    <mode>. Correct modes are :
+                            'PUB_ONLY' filter all non public attributes
+                                [DEFAULT], equivalent to PRIVATE+SPECIAL_A
+                            'ALL' no filter
+                            'SPECIAL' filter Python special functions
+                                except constructor
+                            'OTHER' filter protected and private
+                                attributes""")),
+
+    ("class",
+     dict(short='c', action="append", metavar="<class>", dest="classes", default=[],
+          help="create a class diagram with all classes related to <class>;\
+ this uses by default the options -ASmy")),
+
+    ("show-ancestors",
+     dict(short="a", action="store", metavar='<ancestor>', type='int',
+          help='show <ancestor> generations of ancestor classes not in <projects>')),
+    ("all-ancestors",
+     dict(short="A", default=None,
+          help="show all ancestors off all classes in <projects>")),
+    ("show-associated",
+     dict(short='s', action="store", metavar='<ass_level>', type='int',
+          help='show <ass_level> levels of associated classes not in <projects>')),
+    ("all-associated",
+     dict(short='S', default=None,
+          help='show recursively all associated off all associated classes')),
+    ("show-builtin",
+     dict(short="b", action="store_true", default=False,
+          help='include builtin objects in representation of classes')),
+
+    ("module-names",
+     dict(short="m", default=None, type='yn', metavar='[yn]',
+          help='include module name in representation of classes')),
+    # TODO : generate dependencies like in pylint
+    # ("package-dependencies",
+    # dict(short="M", action="store", metavar='<package_depth>', type='int',
+    #     help='show <package_depth> module dependencies beyond modules in \
+    # <projects> (for the package diagram)')),
+    ("only-classnames",
+     dict(short='k', action="store_true", default=False,
+          help="don't show attributes and methods in the class boxes; \
+this disables -f values")),
+    ("output", dict(short="o", dest="output_format", action="store",
+                    default="dot", metavar="<format>",
+                    help="create a *.<format> output file if format available.")),
+)
+# FIXME : quiet mode
+#( ('quiet',
+                #dict(help='run quietly', action='store_true', short='q')), )
+
+class Run(ConfigurationMixIn):
+    """base class providing common behaviour for pyreverse commands"""
+
+    options = OPTIONS
+
+    def __init__(self, args):
+        ConfigurationMixIn.__init__(self, usage=__doc__)
+        insert_default_options()
+        self.manager = AstroidManager()
+        self.register_options_provider(self.manager)
+        args = self.load_command_line_configuration()
+        sys.exit(self.run(args))
+
+    def run(self, args):
+        """checking arguments and run project"""
+        if not args:
+            print(self.help())
+            return 1
+        # insert current working directory to the python path to recognize
+        # dependencies to local modules even if cwd is not in the PYTHONPATH
+        sys.path.insert(0, os.getcwd())
+        try:
+            project = self.manager.project_from_files(args)
+            linker = Linker(project, tag=True)
+            handler = DiadefsHandler(self.config)
+            diadefs = handler.get_diadefs(project, linker)
+        finally:
+            sys.path.pop(0)
+
+        if self.config.output_format == "vcg":
+            writer.VCGWriter(self.config).write(diadefs)
+        else:
+            writer.DotWriter(self.config).write(diadefs)
+        return 0
+
+
+if __name__ == '__main__':
+    Run(sys.argv[1:])
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/utils.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/utils.py
new file mode 100644
index 0000000..5d6d133
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/utils.py
@@ -0,0 +1,132 @@
+# Copyright (c) 2002-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""
+generic classes/functions for pyreverse core/extensions
+"""
+from __future__ import print_function
+
+import sys
+import re
+import os
+
+########### pyreverse option utils ##############################
+
+
+RCFILE = '.pyreverserc'
+
+def get_default_options():
+    """
+    Read config file and return list of options
+    """
+    options = []
+    home = os.environ.get('HOME', '')
+    if home:
+        rcfile = os.path.join(home, RCFILE)
+        try:
+            options = open(rcfile).read().split()
+        except IOError:
+            pass # ignore if no config file found
+    return options
+
+def insert_default_options():
+    """insert default options to sys.argv
+    """
+    options = get_default_options()
+    options.reverse()
+    for arg in options:
+        sys.argv.insert(1, arg)
+
+
+
+# astroid utilities ###########################################################
+
+SPECIAL = re.compile('^__[A-Za-z0-9]+[A-Za-z0-9_]*__$')
+PRIVATE = re.compile('^__[_A-Za-z0-9]*[A-Za-z0-9]+_?$')
+PROTECTED = re.compile('^_[_A-Za-z0-9]*$')
+
+def get_visibility(name):
+    """return the visibility from a name: public, protected, private or special
+    """
+    if SPECIAL.match(name):
+        visibility = 'special'
+    elif PRIVATE.match(name):
+        visibility = 'private'
+    elif PROTECTED.match(name):
+        visibility = 'protected'
+
+    else:
+        visibility = 'public'
+    return visibility
+
+ABSTRACT = re.compile('^.*Abstract.*')
+FINAL = re.compile('^[A-Z_]*$')
+
+def is_abstract(node):
+    """return true if the given class node correspond to an abstract class
+    definition
+    """
+    return ABSTRACT.match(node.name)
+
+def is_final(node):
+    """return true if the given class/function node correspond to final
+    definition
+    """
+    return FINAL.match(node.name)
+
+def is_interface(node):
+    # bw compat
+    return node.type == 'interface'
+
+def is_exception(node):
+    # bw compat
+    return node.type == 'exception'
+
+
+# Helpers #####################################################################
+
+_CONSTRUCTOR = 1
+_SPECIAL = 2
+_PROTECTED = 4
+_PRIVATE = 8
+MODES = {
+    'ALL'       : 0,
+    'PUB_ONLY'  : _SPECIAL + _PROTECTED + _PRIVATE,
+    'SPECIAL'   : _SPECIAL,
+    'OTHER'     : _PROTECTED + _PRIVATE,
+}
+VIS_MOD = {'special': _SPECIAL, 'protected': _PROTECTED,
+           'private': _PRIVATE, 'public': 0}
+
+class FilterMixIn(object):
+    """filter nodes according to a mode and nodes' visibility
+    """
+    def __init__(self, mode):
+        "init filter modes"
+        __mode = 0
+        for nummod in mode.split('+'):
+            try:
+                __mode += MODES[nummod]
+            except KeyError as ex:
+                print('Unknown filter mode %s' % ex, file=sys.stderr)
+        self.__mode = __mode
+
+
+    def show_attr(self, node):
+        """return true if the node should be treated
+        """
+        visibility = get_visibility(getattr(node, 'name', node))
+        return not self.__mode & VIS_MOD[visibility]
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/writer.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/writer.py
new file mode 100644
index 0000000..8628a8c
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/pyreverse/writer.py
@@ -0,0 +1,199 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2008-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""Utilities for creating VCG and Dot diagrams"""
+
+from logilab.common.vcgutils import VCGPrinter
+from logilab.common.graph import DotBackend
+
+from pylint.pyreverse.utils import is_exception
+
+class DiagramWriter(object):
+    """base class for writing project diagrams
+    """
+    def __init__(self, config, styles):
+        self.config = config
+        self.pkg_edges, self.inh_edges, self.imp_edges, self.ass_edges = styles
+        self.printer = None # defined in set_printer
+
+    def write(self, diadefs):
+        """write files for <project> according to <diadefs>
+        """
+        for diagram in diadefs:
+            basename = diagram.title.strip().replace(' ', '_')
+            file_name = '%s.%s' % (basename, self.config.output_format)
+            self.set_printer(file_name, basename)
+            if diagram.TYPE == 'class':
+                self.write_classes(diagram)
+            else:
+                self.write_packages(diagram)
+            self.close_graph()
+
+    def write_packages(self, diagram):
+        """write a package diagram"""
+        # sorted to get predictable (hence testable) results
+        for i, obj in enumerate(sorted(diagram.modules(), key=lambda x: x.title)):
+            self.printer.emit_node(i, label=self.get_title(obj), shape='box')
+            obj.fig_id = i
+        # package dependencies
+        for rel in diagram.get_relationships('depends'):
+            self.printer.emit_edge(rel.from_object.fig_id, rel.to_object.fig_id,
+                                   **self.pkg_edges)
+
+    def write_classes(self, diagram):
+        """write a class diagram"""
+        # sorted to get predictable (hence testable) results
+        for i, obj in enumerate(sorted(diagram.objects, key=lambda x: x.title)):
+            self.printer.emit_node(i, **self.get_values(obj))
+            obj.fig_id = i
+        # inheritance links
+        for rel in diagram.get_relationships('specialization'):
+            self.printer.emit_edge(rel.from_object.fig_id, rel.to_object.fig_id,
+                                   **self.inh_edges)
+        # implementation links
+        for rel in diagram.get_relationships('implements'):
+            self.printer.emit_edge(rel.from_object.fig_id, rel.to_object.fig_id,
+                                   **self.imp_edges)
+        # generate associations
+        for rel in diagram.get_relationships('association'):
+            self.printer.emit_edge(rel.from_object.fig_id, rel.to_object.fig_id,
+                                   label=rel.name, **self.ass_edges)
+
+    def set_printer(self, file_name, basename):
+        """set printer"""
+        raise NotImplementedError
+
+    def get_title(self, obj):
+        """get project title"""
+        raise NotImplementedError
+
+    def get_values(self, obj):
+        """get label and shape for classes."""
+        raise NotImplementedError
+
+    def close_graph(self):
+        """finalize the graph"""
+        raise NotImplementedError
+
+
+class DotWriter(DiagramWriter):
+    """write dot graphs from a diagram definition and a project
+    """
+
+    def __init__(self, config):
+        styles = [dict(arrowtail='none', arrowhead="open"),
+                  dict(arrowtail='none', arrowhead='empty'),
+                  dict(arrowtail='node', arrowhead='empty', style='dashed'),
+                  dict(fontcolor='green', arrowtail='none',
+                       arrowhead='diamond', style='solid'),
+                 ]
+        DiagramWriter.__init__(self, config, styles)
+
+    def set_printer(self, file_name, basename):
+        """initialize DotWriter and add options for layout.
+        """
+        layout = dict(rankdir="BT")
+        self.printer = DotBackend(basename, additionnal_param=layout)
+        self.file_name = file_name
+
+    def get_title(self, obj):
+        """get project title"""
+        return obj.title
+
+    def get_values(self, obj):
+        """get label and shape for classes.
+
+        The label contains all attributes and methods
+        """
+        label = obj.title
+        if obj.shape == 'interface':
+            label = u'«interface»\\n%s' % label
+        if not self.config.only_classnames:
+            label = r'%s|%s\l|' % (label, r'\l'.join(obj.attrs))
+            for func in obj.methods:
+                label = r'%s%s()\l' % (label, func.name)
+            label = '{%s}' % label
+        if is_exception(obj.node):
+            return dict(fontcolor='red', label=label, shape='record')
+        return dict(label=label, shape='record')
+
+    def close_graph(self):
+        """print the dot graph into <file_name>"""
+        self.printer.generate(self.file_name)
+
+
+class VCGWriter(DiagramWriter):
+    """write vcg graphs from a diagram definition and a project
+    """
+    def __init__(self, config):
+        styles = [dict(arrowstyle='solid', backarrowstyle='none',
+                       backarrowsize=0),
+                  dict(arrowstyle='solid', backarrowstyle='none',
+                       backarrowsize=10),
+                  dict(arrowstyle='solid', backarrowstyle='none',
+                       linestyle='dotted', backarrowsize=10),
+                  dict(arrowstyle='solid', backarrowstyle='none',
+                       textcolor='green'),
+                 ]
+        DiagramWriter.__init__(self, config, styles)
+
+    def set_printer(self, file_name, basename):
+        """initialize VCGWriter for a UML graph"""
+        self.graph_file = open(file_name, 'w+')
+        self.printer = VCGPrinter(self.graph_file)
+        self.printer.open_graph(title=basename, layoutalgorithm='dfs',
+                                late_edge_labels='yes', port_sharing='no',
+                                manhattan_edges='yes')
+        self.printer.emit_node = self.printer.node
+        self.printer.emit_edge = self.printer.edge
+
+    def get_title(self, obj):
+        """get project title in vcg format"""
+        return r'\fb%s\fn' % obj.title
+
+    def get_values(self, obj):
+        """get label and shape for classes.
+
+        The label contains all attributes and methods
+        """
+        if is_exception(obj.node):
+            label = r'\fb\f09%s\fn' % obj.title
+        else:
+            label = r'\fb%s\fn' % obj.title
+        if obj.shape == 'interface':
+            shape = 'ellipse'
+        else:
+            shape = 'box'
+        if not self.config.only_classnames:
+            attrs = obj.attrs
+            methods = [func.name for func in obj.methods]
+            # box width for UML like diagram
+            maxlen = max(len(name) for name in [obj.title] + methods + attrs)
+            line = '_' * (maxlen + 2)
+            label = r'%s\n\f%s' % (label, line)
+            for attr in attrs:
+                label = r'%s\n\f08%s' % (label, attr)
+            if attrs:
+                label = r'%s\n\f%s' % (label, line)
+            for func in methods:
+                label = r'%s\n\f10%s()' % (label, func)
+        return dict(label=label, shape=shape)
+
+    def close_graph(self):
+        """close graph and file"""
+        self.printer.close_graph()
+        self.graph_file.close()
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/__init__.py
new file mode 100644
index 0000000..ea3281f
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/__init__.py
@@ -0,0 +1,133 @@
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""utilities methods and classes for reporters"""
+from __future__ import print_function
+
+import sys
+import locale
+import os
+
+
+from pylint import utils
+
+CMPS = ['=', '-', '+']
+
+# py3k has no more cmp builtin
+if sys.version_info >= (3, 0):
+    def cmp(a, b): # pylint: disable=redefined-builtin
+        return (a > b) - (a < b)
+
+def diff_string(old, new):
+    """given a old and new int value, return a string representing the
+    difference
+    """
+    diff = abs(old - new)
+    diff_str = "%s%s" % (CMPS[cmp(old, new)], diff and ('%.2f' % diff) or '')
+    return diff_str
+
+
+class BaseReporter(object):
+    """base class for reporters
+
+    symbols: show short symbolic names for messages.
+    """
+
+    extension = ''
+
+    def __init__(self, output=None):
+        self.linter = None
+        # self.include_ids = None # Deprecated
+        # self.symbols = None # Deprecated
+        self.section = 0
+        self.out = None
+        self.out_encoding = None
+        self.encode = None
+        self.set_output(output)
+        # Build the path prefix to strip to get relative paths
+        self.path_strip_prefix = os.getcwd() + os.sep
+
+    def handle_message(self, msg):
+        """Handle a new message triggered on the current file.
+
+        Invokes the legacy add_message API by default."""
+        self.add_message(
+            msg.msg_id, (msg.abspath, msg.module, msg.obj, msg.line, msg.column),
+            msg.msg)
+
+    def add_message(self, msg_id, location, msg):
+        """Deprecated, do not use."""
+        raise NotImplementedError
+
+    def set_output(self, output=None):
+        """set output stream"""
+        self.out = output or sys.stdout
+        # py3k streams handle their encoding :
+        if sys.version_info >= (3, 0):
+            self.encode = lambda x: x
+            return
+
+        def encode(string):
+            if not isinstance(string, unicode):
+                return string
+            encoding = (getattr(self.out, 'encoding', None) or
+                        locale.getdefaultlocale()[1] or
+                        sys.getdefaultencoding())
+            # errors=replace, we don't want to crash when attempting to show
+            # source code line that can't be encoded with the current locale
+            # settings
+            return string.encode(encoding, 'replace')
+        self.encode = encode
+
+    def writeln(self, string=''):
+        """write a line in the output buffer"""
+        print(self.encode(string), file=self.out)
+
+    def display_results(self, layout):
+        """display results encapsulated in the layout tree"""
+        self.section = 0
+        if hasattr(layout, 'report_id'):
+            layout.children[0].children[0].data += ' (%s)' % layout.report_id
+        self._display(layout)
+
+    def _display(self, layout):
+        """display the layout"""
+        raise NotImplementedError()
+
+    # Event callbacks
+
+    def on_set_current_module(self, module, filepath):
+        """starting analyzis of a module"""
+        pass
+
+    def on_close(self, stats, previous_stats):
+        """global end of analyzis"""
+        pass
+
+
+class CollectingReporter(BaseReporter):
+    """collects messages"""
+
+    name = 'collector'
+
+    def __init__(self):
+        BaseReporter.__init__(self)
+        self.messages = []
+
+    def handle_message(self, msg):
+        self.messages.append(msg)
+
+
+def initialize(linter):
+    """initialize linter with reporters in this package """
+    utils.register_plugins(linter, __path__[0])
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..c732a8f
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/guireporter.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/guireporter.py
new file mode 100644
index 0000000..4ad4ebb
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/guireporter.py
@@ -0,0 +1,27 @@
+""" reporter used by gui.py """
+
+import sys
+
+from pylint.interfaces import IReporter
+from pylint.reporters import BaseReporter
+from logilab.common.ureports import TextWriter
+
+
+class GUIReporter(BaseReporter):
+    """saves messages"""
+
+    __implements__ = IReporter
+    extension = ''
+
+    def __init__(self, gui, output=sys.stdout):
+        """init"""
+        BaseReporter.__init__(self, output)
+        self.gui = gui
+
+    def handle_message(self, msg):
+        """manage message of different type and in the context of path"""
+        self.gui.msg_queue.put(msg)
+
+    def _display(self, layout):
+        """launch layouts display"""
+        TextWriter().format(layout, self.out)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/html.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/html.py
new file mode 100644
index 0000000..1e050d3
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/html.py
@@ -0,0 +1,101 @@
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""HTML reporter"""
+
+import itertools
+import string
+import sys
+
+from logilab.common.ureports import HTMLWriter, Section, Table
+
+from pylint.interfaces import IReporter
+from pylint.reporters import BaseReporter
+
+
+class HTMLReporter(BaseReporter):
+    """report messages and layouts in HTML"""
+
+    __implements__ = IReporter
+    name = 'html'
+    extension = 'html'
+
+    def __init__(self, output=sys.stdout):
+        BaseReporter.__init__(self, output)
+        self.msgs = []
+        # Add placeholders for title and parsed messages
+        self.header = None
+        self.msgargs = []
+
+    @staticmethod
+    def _parse_msg_template(msg_template):
+        formatter = string.Formatter()
+        parsed = formatter.parse(msg_template)
+        for item in parsed:
+            if item[1]:
+                yield item[1]
+
+    def _parse_template(self):
+        """Helper function to parse the message template"""
+        self.header = []
+        if self.linter.config.msg_template:
+            msg_template = self.linter.config.msg_template
+        else:
+            msg_template = '{category}{module}{obj}{line}{column}{msg}'
+
+        _header, _msgs = itertools.tee(self._parse_msg_template(msg_template))
+        self.header = list(_header)
+        self.msgargs = list(_msgs)
+
+    def handle_message(self, msg):
+        """manage message of different type and in the context of path"""
+
+        # It would be better to do this in init, but currently we do not
+        # have access to the linter (as it is setup in lint.set_reporter()
+        # Therefore we try to parse just the once.
+        if self.header is None:
+            self._parse_template()
+
+        # We want to add the lines given by the template
+        self.msgs += [str(getattr(msg, field)) for field in self.msgargs]
+
+    def set_output(self, output=None):
+        """set output stream
+
+        messages buffered for old output is processed first"""
+        if self.out and self.msgs:
+            self._display(Section())
+        BaseReporter.set_output(self, output)
+
+    def _display(self, layout):
+        """launch layouts display
+
+        overridden from BaseReporter to add insert the messages section
+        (in add_message, message is not displayed, just collected so it
+        can be displayed in an html table)
+        """
+        if self.msgs:
+            # add stored messages to the layout
+            msgs = self.header
+            cols = len(self.header)
+            msgs += self.msgs
+            sect = Section('Messages')
+            layout.append(sect)
+            sect.append(Table(cols=cols, children=msgs, rheaders=1))
+            self.msgs = []
+        HTMLWriter().format(layout, self.out)
+
+
+def register(linter):
+    """Register the reporter classes with the linter."""
+    linter.register_reporter(HTMLReporter)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/json.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/json.py
new file mode 100644
index 0000000..7dba52b
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/json.py
@@ -0,0 +1,58 @@
+# Copyright (c) 2003-2014 LOGILAB S.A. (Paris, FRANCE).
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""JSON reporter"""
+from __future__ import absolute_import, print_function
+
+import json
+import sys
+from cgi import escape
+
+from pylint.interfaces import IReporter
+from pylint.reporters import BaseReporter
+
+
+class JSONReporter(BaseReporter):
+    """Report messages and layouts in JSON."""
+
+    __implements__ = IReporter
+    name = 'json'
+    extension = 'json'
+
+    def __init__(self, output=sys.stdout):
+        BaseReporter.__init__(self, output)
+        self.messages = []
+
+    def handle_message(self, message):
+        """Manage message of different type and in the context of path."""
+
+        self.messages.append({
+            'type': message.category,
+            'module': message.module,
+            'obj': message.obj,
+            'line': message.line,
+            'column': message.column,
+            'path': message.path,
+            'symbol': message.symbol,
+            'message': escape(message.msg or ''),
+        })
+
+    def _display(self, layout):
+        """Launch layouts display"""
+        if self.messages:
+            print(json.dumps(self.messages, indent=4), file=self.out)
+
+
+def register(linter):
+    """Register the reporter classes with the linter."""
+    linter.register_reporter(JSONReporter)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/text.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/text.py
new file mode 100644
index 0000000..53c4a8d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/reporters/text.py
@@ -0,0 +1,146 @@
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""Plain text reporters:
+
+:text: the default one grouping messages by module
+:colorized: an ANSI colorized text reporter
+"""
+from __future__ import print_function
+
+import warnings
+
+from logilab.common.ureports import TextWriter
+from logilab.common.textutils import colorize_ansi
+
+from pylint.interfaces import IReporter
+from pylint.reporters import BaseReporter
+import six
+
+TITLE_UNDERLINES = ['', '=', '-', '.']
+
+
+class TextReporter(BaseReporter):
+    """reports messages and layouts in plain text"""
+
+    __implements__ = IReporter
+    name = 'text'
+    extension = 'txt'
+    line_format = '{C}:{line:3d},{column:2d}: {msg} ({symbol})'
+
+    def __init__(self, output=None):
+        BaseReporter.__init__(self, output)
+        self._modules = set()
+        self._template = None
+
+    def on_set_current_module(self, module, filepath):
+        self._template = six.text_type(self.linter.config.msg_template or self.line_format)
+
+    def write_message(self, msg):
+        """Convenience method to write a formated message with class default template"""
+        self.writeln(msg.format(self._template))
+
+    def handle_message(self, msg):
+        """manage message of different type and in the context of path"""
+        if msg.module not in self._modules:
+            if msg.module:
+                self.writeln('************* Module %s' % msg.module)
+                self._modules.add(msg.module)
+            else:
+                self.writeln('************* ')
+        self.write_message(msg)
+
+    def _display(self, layout):
+        """launch layouts display"""
+        print(file=self.out)
+        TextWriter().format(layout, self.out)
+
+
+class ParseableTextReporter(TextReporter):
+    """a reporter very similar to TextReporter, but display messages in a form
+    recognized by most text editors :
+
+    <filename>:<linenum>:<msg>
+    """
+    name = 'parseable'
+    line_format = '{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}'
+
+    def __init__(self, output=None):
+        warnings.warn('%s output format is deprecated. This is equivalent '
+                      'to --msg-template=%s' % (self.name, self.line_format),
+                      DeprecationWarning)
+        TextReporter.__init__(self, output)
+
+
+class VSTextReporter(ParseableTextReporter):
+    """Visual studio text reporter"""
+    name = 'msvs'
+    line_format = '{path}({line}): [{msg_id}({symbol}){obj}] {msg}'
+
+
+class ColorizedTextReporter(TextReporter):
+    """Simple TextReporter that colorizes text output"""
+
+    name = 'colorized'
+    COLOR_MAPPING = {
+        "I" : ("green", None),
+        'C' : (None, "bold"),
+        'R' : ("magenta", "bold, italic"),
+        'W' : ("blue", None),
+        'E' : ("red", "bold"),
+        'F' : ("red", "bold, underline"),
+        'S' : ("yellow", "inverse"), # S stands for module Separator
+    }
+
+    def __init__(self, output=None, color_mapping=None):
+        TextReporter.__init__(self, output)
+        self.color_mapping = color_mapping or \
+                             dict(ColorizedTextReporter.COLOR_MAPPING)
+
+    def _get_decoration(self, msg_id):
+        """Returns the tuple color, style associated with msg_id as defined
+        in self.color_mapping
+        """
+        try:
+            return self.color_mapping[msg_id[0]]
+        except KeyError:
+            return None, None
+
+    def handle_message(self, msg):
+        """manage message of different types, and colorize output
+        using ansi escape codes
+        """
+        if msg.module not in self._modules:
+            color, style = self._get_decoration('S')
+            if msg.module:
+                modsep = colorize_ansi('************* Module %s' % msg.module,
+                                       color, style)
+            else:
+                modsep = colorize_ansi('************* %s' % msg.module,
+                                       color, style)
+            self.writeln(modsep)
+            self._modules.add(msg.module)
+        color, style = self._get_decoration(msg.C)
+
+        msg = msg._replace(
+            **{attr: colorize_ansi(getattr(msg, attr), color, style)
+               for attr in ('msg', 'symbol', 'category', 'C')})
+        self.write_message(msg)
+
+
+def register(linter):
+    """Register the reporter classes with the linter."""
+    linter.register_reporter(TextReporter)
+    linter.register_reporter(ParseableTextReporter)
+    linter.register_reporter(VSTextReporter)
+    linter.register_reporter(ColorizedTextReporter)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/testutils.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/testutils.py
new file mode 100644
index 0000000..2ea440d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/testutils.py
@@ -0,0 +1,412 @@
+# Copyright (c) 2003-2013 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""functional/non regression tests for pylint"""
+from __future__ import print_function
+
+import collections
+import contextlib
+import functools
+import os
+import sys
+import re
+import unittest
+import tempfile
+import tokenize
+
+from glob import glob
+from os import linesep, getcwd, sep
+from os.path import abspath, basename, dirname, isdir, join, splitext
+
+from astroid import test_utils
+
+from pylint import checkers
+from pylint.utils import PyLintASTWalker
+from pylint.reporters import BaseReporter
+from pylint.interfaces import IReporter
+from pylint.lint import PyLinter
+
+import six
+from six.moves import StringIO
+
+
+# Utils
+
+SYS_VERS_STR = '%d%d%d' % sys.version_info[:3]
+TITLE_UNDERLINES = ['', '=', '-', '.']
+PREFIX = abspath(dirname(__file__))
+PY3K = sys.version_info[0] == 3
+
+def fix_path():
+    sys.path.insert(0, PREFIX)
+
+def get_tests_info(input_dir, msg_dir, prefix, suffix):
+    """get python input examples and output messages
+
+    We use following conventions for input files and messages:
+    for different inputs:
+        test for python  >= x.y    ->  input   =  <name>_pyxy.py
+        test for python  <  x.y    ->  input   =  <name>_py_xy.py
+    for one input and different messages:
+        message for python >=  x.y ->  message =  <name>_pyxy.txt
+        lower versions             ->  message with highest num
+    """
+    result = []
+    for fname in glob(join(input_dir, prefix + '*' + suffix)):
+        infile = basename(fname)
+        fbase = splitext(infile)[0]
+        # filter input files :
+        pyrestr = fbase.rsplit('_py', 1)[-1] # like _26 or 26
+        if pyrestr.isdigit(): # '24', '25'...
+            if SYS_VERS_STR < pyrestr:
+                continue
+        if pyrestr.startswith('_') and  pyrestr[1:].isdigit():
+            # skip test for higher python versions
+            if SYS_VERS_STR >= pyrestr[1:]:
+                continue
+        messages = glob(join(msg_dir, fbase + '*.txt'))
+        # the last one will be without ext, i.e. for all or upper versions:
+        if messages:
+            for outfile in sorted(messages, reverse=True):
+                py_rest = outfile.rsplit('_py', 1)[-1][:-4]
+                if py_rest.isdigit() and SYS_VERS_STR >= py_rest:
+                    break
+        else:
+            # This will provide an error message indicating the missing filename.
+            outfile = join(msg_dir, fbase + '.txt')
+        result.append((infile, outfile))
+    return result
+
+
+class TestReporter(BaseReporter):
+    """reporter storing plain text messages"""
+
+    __implements__ = IReporter
+
+    def __init__(self): # pylint: disable=super-init-not-called
+
+        self.message_ids = {}
+        self.reset()
+        self.path_strip_prefix = getcwd() + sep
+
+    def reset(self):
+        self.out = StringIO()
+        self.messages = []
+
+    def add_message(self, msg_id, location, msg):
+        """manage message of different type and in the context of path """
+        _, _, obj, line, _ = location
+        self.message_ids[msg_id] = 1
+        if obj:
+            obj = ':%s' % obj
+        sigle = msg_id[0]
+        if PY3K and linesep != '\n':
+            # 2to3 writes os.linesep instead of using
+            # the previosly used line separators
+            msg = msg.replace('\r\n', '\n')
+        self.messages.append('%s:%3s%s: %s' % (sigle, line, obj, msg))
+
+    def finalize(self):
+        self.messages.sort()
+        for msg in self.messages:
+            print(msg, file=self.out)
+        result = self.out.getvalue()
+        self.reset()
+        return result
+
+    def display_results(self, layout):
+        """ignore layouts"""
+
+
+class Message(collections.namedtuple('Message',
+                                     ['msg_id', 'line', 'node', 'args'])):
+    def __new__(cls, msg_id, line=None, node=None, args=None):
+        return tuple.__new__(cls, (msg_id, line, node, args))
+
+
+class UnittestLinter(object):
+    """A fake linter class to capture checker messages."""
+    # pylint: disable=unused-argument, no-self-use
+
+    def __init__(self):
+        self._messages = []
+        self.stats = {}
+
+    def release_messages(self):
+        try:
+            return self._messages
+        finally:
+            self._messages = []
+
+    def add_message(self, msg_id, line=None, node=None, args=None,
+                    confidence=None):
+        self._messages.append(Message(msg_id, line, node, args))
+
+    def is_message_enabled(self, *unused_args):
+        return True
+
+    def add_stats(self, **kwargs):
+        for name, value in six.iteritems(kwargs):
+            self.stats[name] = value
+        return self.stats
+
+    @property
+    def options_providers(self):
+        return linter.options_providers
+
+def set_config(**kwargs):
+    """Decorator for setting config values on a checker."""
+    def _Wrapper(fun):
+        @functools.wraps(fun)
+        def _Forward(self):
+            for key, value in six.iteritems(kwargs):
+                setattr(self.checker.config, key, value)
+            if isinstance(self, CheckerTestCase):
+                # reopen checker in case, it may be interested in configuration change
+                self.checker.open()
+            fun(self)
+
+        return _Forward
+    return _Wrapper
+
+
+class CheckerTestCase(unittest.TestCase):
+    """A base testcase class for unittesting individual checker classes."""
+    CHECKER_CLASS = None
+    CONFIG = {}
+
+    def setUp(self):
+        self.linter = UnittestLinter()
+        self.checker = self.CHECKER_CLASS(self.linter) # pylint: disable=not-callable
+        for key, value in six.iteritems(self.CONFIG):
+            setattr(self.checker.config, key, value)
+        self.checker.open()
+
+    @contextlib.contextmanager
+    def assertNoMessages(self):
+        """Assert that no messages are added by the given method."""
+        with self.assertAddsMessages():
+            yield
+
+    @contextlib.contextmanager
+    def assertAddsMessages(self, *messages):
+        """Assert that exactly the given method adds the given messages.
+
+        The list of messages must exactly match *all* the messages added by the
+        method. Additionally, we check to see whether the args in each message can
+        actually be substituted into the message string.
+        """
+        yield
+        got = self.linter.release_messages()
+        msg = ('Expected messages did not match actual.\n'
+               'Expected:\n%s\nGot:\n%s' % ('\n'.join(repr(m) for m in messages),
+                                            '\n'.join(repr(m) for m in got)))
+        self.assertEqual(list(messages), got, msg)
+
+    def walk(self, node):
+        """recursive walk on the given node"""
+        walker = PyLintASTWalker(linter)
+        walker.add_checker(self.checker)
+        walker.walk(node)
+
+
+# Init
+test_reporter = TestReporter()
+linter = PyLinter()
+linter.set_reporter(test_reporter)
+linter.config.persistent = 0
+checkers.initialize(linter)
+linter.global_set_option('required-attributes', ('__revision__',))
+
+if linesep != '\n':
+    LINE_RGX = re.compile(linesep)
+    def ulines(string):
+        return LINE_RGX.sub('\n', string)
+else:
+    def ulines(string):
+        return string
+
+INFO_TEST_RGX = re.compile(r'^func_i\d\d\d\d$')
+
+def exception_str(self, ex): # pylint: disable=unused-argument
+    """function used to replace default __str__ method of exception instances"""
+    return 'in %s\n:: %s' % (ex.file, ', '.join(ex.args))
+
+# Test classes
+
+class LintTestUsingModule(unittest.TestCase):
+    INPUT_DIR = None
+    DEFAULT_PACKAGE = 'input'
+    package = DEFAULT_PACKAGE
+    linter = linter
+    module = None
+    depends = None
+    output = None
+    _TEST_TYPE = 'module'
+    maxDiff = None
+
+    def shortDescription(self):
+        values = {'mode' : self._TEST_TYPE,
+                  'input': self.module,
+                  'pkg':   self.package,
+                  'cls':   self.__class__.__name__}
+
+        if self.package == self.DEFAULT_PACKAGE:
+            msg = '%(mode)s test of input file "%(input)s" (%(cls)s)'
+        else:
+            msg = '%(mode)s test of input file "%(input)s" in "%(pkg)s" (%(cls)s)'
+        return msg % values
+
+    def test_functionality(self):
+        tocheck = [self.package+'.'+self.module]
+        if self.depends:
+            tocheck += [self.package+'.%s' % name.replace('.py', '')
+                        for name, _ in self.depends]
+        self._test(tocheck)
+
+    def _check_result(self, got):
+        self.assertMultiLineEqual(self._get_expected().strip()+'\n',
+                                  got.strip()+'\n')
+
+    def _test(self, tocheck):
+        if INFO_TEST_RGX.match(self.module):
+            self.linter.enable('I')
+        else:
+            self.linter.disable('I')
+        try:
+            self.linter.check(tocheck)
+        except Exception as ex:
+            # need finalization to restore a correct state
+            self.linter.reporter.finalize()
+            ex.file = tocheck
+            print(ex)
+            ex.__str__ = exception_str
+            raise
+        self._check_result(self.linter.reporter.finalize())
+
+    def _has_output(self):
+        return not self.module.startswith('func_noerror_')
+
+    def _get_expected(self):
+        if self._has_output() and self.output:
+            with open(self.output, 'U') as fobj:
+                return fobj.read().strip() + '\n'
+        else:
+            return ''
+
+class LintTestUsingFile(LintTestUsingModule):
+
+    _TEST_TYPE = 'file'
+
+    def test_functionality(self):
+        importable = join(self.INPUT_DIR, self.module)
+        # python also prefers packages over simple modules.
+        if not isdir(importable):
+            importable += '.py'
+        tocheck = [importable]
+        if self.depends:
+            tocheck += [join(self.INPUT_DIR, name) for name, _file in self.depends]
+        self._test(tocheck)
+
+class LintTestUpdate(LintTestUsingModule):
+
+    _TEST_TYPE = 'update'
+
+    def _check_result(self, got):
+        if self._has_output():
+            try:
+                expected = self._get_expected()
+            except IOError:
+                expected = ''
+            if got != expected:
+                with open(self.output, 'w') as fobj:
+                    fobj.write(got)
+
+# Callback
+
+def cb_test_gen(base_class):
+    def call(input_dir, msg_dir, module_file, messages_file, dependencies):
+        # pylint: disable=no-init
+        class LintTC(base_class):
+            module = module_file.replace('.py', '')
+            output = messages_file
+            depends = dependencies or None
+            INPUT_DIR = input_dir
+            MSG_DIR = msg_dir
+        return LintTC
+    return call
+
+# Main function
+
+def make_tests(input_dir, msg_dir, filter_rgx, callbacks):
+    """generate tests classes from test info
+
+    return the list of generated test classes
+    """
+    if filter_rgx:
+        is_to_run = re.compile(filter_rgx).search
+    else:
+        is_to_run = lambda x: 1
+    tests = []
+    for module_file, messages_file in (
+            get_tests_info(input_dir, msg_dir, 'func_', '')
+    ):
+        if not is_to_run(module_file) or module_file.endswith('.pyc'):
+            continue
+        base = module_file.replace('func_', '').replace('.py', '')
+
+        dependencies = get_tests_info(input_dir, msg_dir, base, '.py')
+
+        for callback in callbacks:
+            test = callback(input_dir, msg_dir, module_file, messages_file,
+                            dependencies)
+            if test:
+                tests.append(test)
+    return tests
+
+def tokenize_str(code):
+    return list(tokenize.generate_tokens(StringIO(code).readline))
+
+@contextlib.contextmanager
+def create_tempfile(content=None):
+    """Create a new temporary file.
+
+    If *content* parameter is given, then it will be written
+    in the temporary file, before passing it back.
+    This is a context manager and should be used with a *with* statement.
+    """
+    # Can't use tempfile.NamedTemporaryFile here
+    # because on Windows the file must be closed before writing to it,
+    # see http://bugs.python.org/issue14243
+    fd, tmp = tempfile.mkstemp()
+    if content:
+        if sys.version_info >= (3, 0):
+            # erff
+            os.write(fd, bytes(content, 'ascii'))
+        else:
+            os.write(fd, content)
+    try:
+        yield tmp
+    finally:
+        os.close(fd)
+        os.remove(tmp)
+
+@contextlib.contextmanager
+def create_file_backed_module(code):
+    """Create an astroid module for the given code, backed by a real file."""
+    with create_tempfile() as temp:
+        module = test_utils.build_module(code)
+        module.file = temp
+        yield module
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/pylint/utils.py b/vim-plugins/bundle/python-mode/pymode/libs/pylint/utils.py
new file mode 100644
index 0000000..6c5b975
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/pylint/utils.py
@@ -0,0 +1,924 @@
+# Copyright (c) 2003-2014 LOGILAB S.A. (Paris, FRANCE).
+# http://www.logilab.fr/ -- mailto:contact@logilab.fr
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+"""some various utilities and helper classes, most of them used in the
+main pylint class
+"""
+from __future__ import print_function
+
+import collections
+import os
+import re
+import sys
+import tokenize
+import warnings
+from os.path import dirname, basename, splitext, exists, isdir, join, normpath
+
+import six
+from six.moves import zip  # pylint: disable=redefined-builtin
+
+from logilab.common.interface import implements
+from logilab.common.textutils import normalize_text
+from logilab.common.configuration import rest_format_section
+from logilab.common.ureports import Section
+
+from astroid import nodes, Module
+from astroid.modutils import modpath_from_file, get_module_files, \
+    file_from_modpath, load_module_from_file
+
+from pylint.interfaces import IRawChecker, ITokenChecker, UNDEFINED
+
+
+class UnknownMessage(Exception):
+    """raised when a unregistered message id is encountered"""
+
+class EmptyReport(Exception):
+    """raised when a report is empty and so should not be displayed"""
+
+
+MSG_TYPES = {
+    'I' : 'info',
+    'C' : 'convention',
+    'R' : 'refactor',
+    'W' : 'warning',
+    'E' : 'error',
+    'F' : 'fatal'
+    }
+MSG_TYPES_LONG = {v: k for k, v in six.iteritems(MSG_TYPES)}
+
+MSG_TYPES_STATUS = {
+    'I' : 0,
+    'C' : 16,
+    'R' : 8,
+    'W' : 4,
+    'E' : 2,
+    'F' : 1
+    }
+
+_MSG_ORDER = 'EWRCIF'
+MSG_STATE_SCOPE_CONFIG = 0
+MSG_STATE_SCOPE_MODULE = 1
+MSG_STATE_CONFIDENCE = 2
+
+OPTION_RGX = re.compile(r'\s*#.*\bpylint:(.*)')
+
+# The line/node distinction does not apply to fatal errors and reports.
+_SCOPE_EXEMPT = 'FR'
+
+class WarningScope(object):
+    LINE = 'line-based-msg'
+    NODE = 'node-based-msg'
+
+_MsgBase = collections.namedtuple(
+    '_MsgBase',
+    ['msg_id', 'symbol', 'msg', 'C', 'category', 'confidence',
+     'abspath', 'path', 'module', 'obj', 'line', 'column'])
+
+
+class Message(_MsgBase):
+    """This class represent a message to be issued by the reporters"""
+    def __new__(cls, msg_id, symbol, location, msg, confidence):
+        return _MsgBase.__new__(
+            cls, msg_id, symbol, msg, msg_id[0], MSG_TYPES[msg_id[0]],
+            confidence, *location)
+
+    def format(self, template):
+        """Format the message according to the given template.
+
+        The template format is the one of the format method :
+        cf. http://docs.python.org/2/library/string.html#formatstrings
+        """
+        # For some reason, _asdict on derived namedtuples does not work with
+        # Python 3.4. Needs some investigation.
+        return template.format(**dict(zip(self._fields, self)))
+
+
+def get_module_and_frameid(node):
+    """return the module name and the frame id in the module"""
+    frame = node.frame()
+    module, obj = '', []
+    while frame:
+        if isinstance(frame, Module):
+            module = frame.name
+        else:
+            obj.append(getattr(frame, 'name', '<lambda>'))
+        try:
+            frame = frame.parent.frame()
+        except AttributeError:
+            frame = None
+    obj.reverse()
+    return module, '.'.join(obj)
+
+def category_id(cid):
+    cid = cid.upper()
+    if cid in MSG_TYPES:
+        return cid
+    return MSG_TYPES_LONG.get(cid)
+
+
+def _decoding_readline(stream, module):
+    return lambda: stream.readline().decode(module.file_encoding,
+                                           'replace')
+
+
+def tokenize_module(module):
+    with module.stream() as stream:
+        readline = stream.readline
+        if sys.version_info < (3, 0):
+            if module.file_encoding is not None:
+                readline = _decoding_readline(stream, module)
+            return list(tokenize.generate_tokens(readline))
+        return list(tokenize.tokenize(readline))
+
+def build_message_def(checker, msgid, msg_tuple):
+    if implements(checker, (IRawChecker, ITokenChecker)):
+        default_scope = WarningScope.LINE
+    else:
+        default_scope = WarningScope.NODE
+    options = {}
+    if len(msg_tuple) > 3:
+        (msg, symbol, descr, options) = msg_tuple
+    elif len(msg_tuple) > 2:
+        (msg, symbol, descr) = msg_tuple[:3]
+    else:
+        # messages should have a symbol, but for backward compatibility
+        # they may not.
+        (msg, descr) = msg_tuple
+        warnings.warn("[pylint 0.26] description of message %s doesn't include "
+                      "a symbolic name" % msgid, DeprecationWarning)
+        symbol = None
+    options.setdefault('scope', default_scope)
+    return MessageDefinition(checker, msgid, msg, descr, symbol, **options)
+
+
+class MessageDefinition(object):
+    def __init__(self, checker, msgid, msg, descr, symbol, scope,
+                 minversion=None, maxversion=None, old_names=None):
+        self.checker = checker
+        assert len(msgid) == 5, 'Invalid message id %s' % msgid
+        assert msgid[0] in MSG_TYPES, \
+               'Bad message type %s in %r' % (msgid[0], msgid)
+        self.msgid = msgid
+        self.msg = msg
+        self.descr = descr
+        self.symbol = symbol
+        self.scope = scope
+        self.minversion = minversion
+        self.maxversion = maxversion
+        self.old_names = old_names or []
+
+    def may_be_emitted(self):
+        """return True if message may be emitted using the current interpreter"""
+        if self.minversion is not None and self.minversion > sys.version_info:
+            return False
+        if self.maxversion is not None and self.maxversion <= sys.version_info:
+            return False
+        return True
+
+    def format_help(self, checkerref=False):
+        """return the help string for the given message id"""
+        desc = self.descr
+        if checkerref:
+            desc += ' This message belongs to the %s checker.' % \
+                   self.checker.name
+        title = self.msg
+        if self.symbol:
+            msgid = '%s (%s)' % (self.symbol, self.msgid)
+        else:
+            msgid = self.msgid
+        if self.minversion or self.maxversion:
+            restr = []
+            if self.minversion:
+                restr.append('< %s' % '.'.join([str(n) for n in self.minversion]))
+            if self.maxversion:
+                restr.append('>= %s' % '.'.join([str(n) for n in self.maxversion]))
+            restr = ' or '.join(restr)
+            if checkerref:
+                desc += " It can't be emitted when using Python %s." % restr
+            else:
+                desc += " This message can't be emitted when using Python %s." % restr
+        desc = normalize_text(' '.join(desc.split()), indent='  ')
+        if title != '%s':
+            title = title.splitlines()[0]
+            return ':%s: *%s*\n%s' % (msgid, title, desc)
+        return ':%s:\n%s' % (msgid, desc)
+
+
+class MessagesHandlerMixIn(object):
+    """a mix-in class containing all the messages related methods for the main
+    lint class
+    """
+
+    def __init__(self):
+        self._msgs_state = {}
+        self.msg_status = 0
+
+    def _checker_messages(self, checker):
+        for checker in self._checkers[checker.lower()]:
+            for msgid in checker.msgs:
+                yield msgid
+
+    def disable(self, msgid, scope='package', line=None, ignore_unknown=False):
+        """don't output message of the given id"""
+        assert scope in ('package', 'module')
+        # handle disable=all by disabling all categories
+        if msgid == 'all':
+            for msgid in MSG_TYPES:
+                self.disable(msgid, scope, line)
+            return
+        # msgid is a category?
+        catid = category_id(msgid)
+        if catid is not None:
+            for _msgid in self.msgs_store._msgs_by_category.get(catid):
+                self.disable(_msgid, scope, line)
+            return
+        # msgid is a checker name?
+        if msgid.lower() in self._checkers:
+            msgs_store = self.msgs_store
+            for checker in self._checkers[msgid.lower()]:
+                for _msgid in checker.msgs:
+                    if _msgid in msgs_store._alternative_names:
+                        self.disable(_msgid, scope, line)
+            return
+        # msgid is report id?
+        if msgid.lower().startswith('rp'):
+            self.disable_report(msgid)
+            return
+
+        try:
+            # msgid is a symbolic or numeric msgid.
+            msg = self.msgs_store.check_message_id(msgid)
+        except UnknownMessage:
+            if ignore_unknown:
+                return
+            raise
+
+        if scope == 'module':
+            self.file_state.set_msg_status(msg, line, False)
+            if msg.symbol != 'locally-disabled':
+                self.add_message('locally-disabled', line=line,
+                                 args=(msg.symbol, msg.msgid))
+
+        else:
+            msgs = self._msgs_state
+            msgs[msg.msgid] = False
+            # sync configuration object
+            self.config.disable = [mid for mid, val in six.iteritems(msgs)
+                                   if not val]
+
+    def enable(self, msgid, scope='package', line=None, ignore_unknown=False):
+        """reenable message of the given id"""
+        assert scope in ('package', 'module')
+        catid = category_id(msgid)
+        # msgid is a category?
+        if catid is not None:
+            for msgid in self.msgs_store._msgs_by_category.get(catid):
+                self.enable(msgid, scope, line)
+            return
+        # msgid is a checker name?
+        if msgid.lower() in self._checkers:
+            for checker in self._checkers[msgid.lower()]:
+                for msgid_ in checker.msgs:
+                    self.enable(msgid_, scope, line)
+            return
+        # msgid is report id?
+        if msgid.lower().startswith('rp'):
+            self.enable_report(msgid)
+            return
+
+        try:
+            # msgid is a symbolic or numeric msgid.
+            msg = self.msgs_store.check_message_id(msgid)
+        except UnknownMessage:
+            if ignore_unknown:
+                return
+            raise
+
+        if scope == 'module':
+            self.file_state.set_msg_status(msg, line, True)
+            self.add_message('locally-enabled', line=line, args=(msg.symbol, msg.msgid))
+        else:
+            msgs = self._msgs_state
+            msgs[msg.msgid] = True
+            # sync configuration object
+            self.config.enable = [mid for mid, val in six.iteritems(msgs) if val]
+
+    def get_message_state_scope(self, msgid, line=None, confidence=UNDEFINED):
+        """Returns the scope at which a message was enabled/disabled."""
+        if self.config.confidence and confidence.name not in self.config.confidence:
+            return MSG_STATE_CONFIDENCE
+        try:
+            if line in self.file_state._module_msgs_state[msgid]:
+                return MSG_STATE_SCOPE_MODULE
+        except (KeyError, TypeError):
+            return MSG_STATE_SCOPE_CONFIG
+
+    def is_message_enabled(self, msg_descr, line=None, confidence=None):
+        """return true if the message associated to the given message id is
+        enabled
+
+        msgid may be either a numeric or symbolic message id.
+        """
+        if self.config.confidence and confidence:
+            if confidence.name not in self.config.confidence:
+                return False
+        try:
+            msgid = self.msgs_store.check_message_id(msg_descr).msgid
+        except UnknownMessage:
+            # The linter checks for messages that are not registered
+            # due to version mismatch, just treat them as message IDs
+            # for now.
+            msgid = msg_descr
+        if line is None:
+            return self._msgs_state.get(msgid, True)
+        try:
+            return self.file_state._module_msgs_state[msgid][line]
+        except KeyError:
+            return self._msgs_state.get(msgid, True)
+
+    def add_message(self, msg_descr, line=None, node=None, args=None, confidence=UNDEFINED):
+        """Adds a message given by ID or name.
+
+        If provided, the message string is expanded using args
+
+        AST checkers should must the node argument (but may optionally
+        provide line if the line number is different), raw and token checkers
+        must provide the line argument.
+        """
+        msg_info = self.msgs_store.check_message_id(msg_descr)
+        msgid = msg_info.msgid
+        # backward compatibility, message may not have a symbol
+        symbol = msg_info.symbol or msgid
+        # Fatal messages and reports are special, the node/scope distinction
+        # does not apply to them.
+        if msgid[0] not in _SCOPE_EXEMPT:
+            if msg_info.scope == WarningScope.LINE:
+                assert node is None and line is not None, (
+                    'Message %s must only provide line, got line=%s, node=%s' % (msgid, line, node))
+            elif msg_info.scope == WarningScope.NODE:
+                # Node-based warnings may provide an override line.
+                assert node is not None, 'Message %s must provide Node, got None'
+
+        if line is None and node is not None:
+            line = node.fromlineno
+        if hasattr(node, 'col_offset'):
+            col_offset = node.col_offset # XXX measured in bytes for utf-8, divide by two for chars?
+        else:
+            col_offset = None
+        # should this message be displayed
+        if not self.is_message_enabled(msgid, line, confidence):
+            self.file_state.handle_ignored_message(
+                self.get_message_state_scope(msgid, line, confidence),
+                msgid, line, node, args, confidence)
+            return
+        # update stats
+        msg_cat = MSG_TYPES[msgid[0]]
+        self.msg_status |= MSG_TYPES_STATUS[msgid[0]]
+        self.stats[msg_cat] += 1
+        self.stats['by_module'][self.current_name][msg_cat] += 1
+        try:
+            self.stats['by_msg'][symbol] += 1
+        except KeyError:
+            self.stats['by_msg'][symbol] = 1
+        # expand message ?
+        msg = msg_info.msg
+        if args:
+            msg %= args
+        # get module and object
+        if node is None:
+            module, obj = self.current_name, ''
+            abspath = self.current_file
+        else:
+            module, obj = get_module_and_frameid(node)
+            abspath = node.root().file
+        path = abspath.replace(self.reporter.path_strip_prefix, '')
+        # add the message
+        self.reporter.handle_message(
+            Message(msgid, symbol,
+                    (abspath, path, module, obj, line or 1, col_offset or 0), msg, confidence))
+
+    def print_full_documentation(self):
+        """output a full documentation in ReST format"""
+        print("Pylint global options and switches")
+        print("----------------------------------")
+        print("")
+        print("Pylint provides global options and switches.")
+        print("")
+
+        by_checker = {}
+        for checker in self.get_checkers():
+            if checker.name == 'master':
+                if checker.options:
+                    for section, options in checker.options_by_section():
+                        if section is None:
+                            title = 'General options'
+                        else:
+                            title = '%s options' % section.capitalize()
+                        print(title)
+                        print('~' * len(title))
+                        rest_format_section(sys.stdout, None, options)
+                        print("")
+            else:
+                try:
+                    by_checker[checker.name][0] += checker.options_and_values()
+                    by_checker[checker.name][1].update(checker.msgs)
+                    by_checker[checker.name][2] += checker.reports
+                except KeyError:
+                    by_checker[checker.name] = [list(checker.options_and_values()),
+                                                dict(checker.msgs),
+                                                list(checker.reports)]
+
+        print("Pylint checkers' options and switches")
+        print("-------------------------------------")
+        print("")
+        print("Pylint checkers can provide three set of features:")
+        print("")
+        print("* options that control their execution,")
+        print("* messages that they can raise,")
+        print("* reports that they can generate.")
+        print("")
+        print("Below is a list of all checkers and their features.")
+        print("")
+
+        for checker, (options, msgs, reports) in six.iteritems(by_checker):
+            title = '%s checker' % (checker.replace("_", " ").title())
+            print(title)
+            print('~' * len(title))
+            print("")
+            print("Verbatim name of the checker is ``%s``." % checker)
+            print("")
+            if options:
+                title = 'Options'
+                print(title)
+                print('^' * len(title))
+                rest_format_section(sys.stdout, None, options)
+                print("")
+            if msgs:
+                title = 'Messages'
+                print(title)
+                print('~' * len(title))
+                for msgid, msg in sorted(six.iteritems(msgs),
+                                         key=lambda kv: (_MSG_ORDER.index(kv[0][0]), kv[1])):
+                    msg = build_message_def(checker, msgid, msg)
+                    print(msg.format_help(checkerref=False))
+                print("")
+            if reports:
+                title = 'Reports'
+                print(title)
+                print('~' * len(title))
+                for report in reports:
+                    print(':%s: %s' % report[:2])
+                print("")
+            print("")
+
+
+class FileState(object):
+    """Hold internal state specific to the currently analyzed file"""
+
+    def __init__(self, modname=None):
+        self.base_name = modname
+        self._module_msgs_state = {}
+        self._raw_module_msgs_state = {}
+        self._ignored_msgs = collections.defaultdict(set)
+        self._suppression_mapping = {}
+
+    def collect_block_lines(self, msgs_store, module_node):
+        """Walk the AST to collect block level options line numbers."""
+        for msg, lines in six.iteritems(self._module_msgs_state):
+            self._raw_module_msgs_state[msg] = lines.copy()
+        orig_state = self._module_msgs_state.copy()
+        self._module_msgs_state = {}
+        self._suppression_mapping = {}
+        self._collect_block_lines(msgs_store, module_node, orig_state)
+
+    def _collect_block_lines(self, msgs_store, node, msg_state):
+        """Recursivly walk (depth first) AST to collect block level options line
+        numbers.
+        """
+        for child in node.get_children():
+            self._collect_block_lines(msgs_store, child, msg_state)
+        first = node.fromlineno
+        last = node.tolineno
+        # first child line number used to distinguish between disable
+        # which are the first child of scoped node with those defined later.
+        # For instance in the code below:
+        #
+        # 1.   def meth8(self):
+        # 2.        """test late disabling"""
+        # 3.        # pylint: disable=E1102
+        # 4.        print self.blip
+        # 5.        # pylint: disable=E1101
+        # 6.        print self.bla
+        #
+        # E1102 should be disabled from line 1 to 6 while E1101 from line 5 to 6
+        #
+        # this is necessary to disable locally messages applying to class /
+        # function using their fromlineno
+        if isinstance(node, (nodes.Module, nodes.Class, nodes.Function)) and node.body:
+            firstchildlineno = node.body[0].fromlineno
+        else:
+            firstchildlineno = last
+        for msgid, lines in six.iteritems(msg_state):
+            for lineno, state in list(lines.items()):
+                original_lineno = lineno
+                if first <= lineno <= last:
+                    # Set state for all lines for this block, if the
+                    # warning is applied to nodes.
+                    if  msgs_store.check_message_id(msgid).scope == WarningScope.NODE:
+                        if lineno > firstchildlineno:
+                            state = True
+                        first_, last_ = node.block_range(lineno)
+                    else:
+                        first_ = lineno
+                        last_ = last
+                    for line in range(first_, last_+1):
+                        # do not override existing entries
+                        if not line in self._module_msgs_state.get(msgid, ()):
+                            if line in lines: # state change in the same block
+                                state = lines[line]
+                                original_lineno = line
+                            if not state:
+                                self._suppression_mapping[(msgid, line)] = original_lineno
+                            try:
+                                self._module_msgs_state[msgid][line] = state
+                            except KeyError:
+                                self._module_msgs_state[msgid] = {line: state}
+                    del lines[lineno]
+
+    def set_msg_status(self, msg, line, status):
+        """Set status (enabled/disable) for a given message at a given line"""
+        assert line > 0
+        try:
+            self._module_msgs_state[msg.msgid][line] = status
+        except KeyError:
+            self._module_msgs_state[msg.msgid] = {line: status}
+
+    def handle_ignored_message(self, state_scope, msgid, line,
+                               node, args, confidence): # pylint: disable=unused-argument
+        """Report an ignored message.
+
+        state_scope is either MSG_STATE_SCOPE_MODULE or MSG_STATE_SCOPE_CONFIG,
+        depending on whether the message was disabled locally in the module,
+        or globally. The other arguments are the same as for add_message.
+        """
+        if state_scope == MSG_STATE_SCOPE_MODULE:
+            try:
+                orig_line = self._suppression_mapping[(msgid, line)]
+                self._ignored_msgs[(msgid, orig_line)].add(line)
+            except KeyError:
+                pass
+
+    def iter_spurious_suppression_messages(self, msgs_store):
+        for warning, lines in six.iteritems(self._raw_module_msgs_state):
+            for line, enable in six.iteritems(lines):
+                if not enable and (warning, line) not in self._ignored_msgs:
+                    yield 'useless-suppression', line, \
+                        (msgs_store.get_msg_display_string(warning),)
+        # don't use iteritems here, _ignored_msgs may be modified by add_message
+        for (warning, from_), lines in list(self._ignored_msgs.items()):
+            for line in lines:
+                yield 'suppressed-message', line, \
+                    (msgs_store.get_msg_display_string(warning), from_)
+
+
+class MessagesStore(object):
+    """The messages store knows information about every possible message but has
+    no particular state during analysis.
+    """
+
+    def __init__(self):
+        # Primary registry for all active messages (i.e. all messages
+        # that can be emitted by pylint for the underlying Python
+        # version). It contains the 1:1 mapping from symbolic names
+        # to message definition objects.
+        self._messages = {}
+        # Maps alternative names (numeric IDs, deprecated names) to
+        # message definitions. May contain several names for each definition
+        # object.
+        self._alternative_names = {}
+        self._msgs_by_category = collections.defaultdict(list)
+
+    @property
+    def messages(self):
+        """The list of all active messages."""
+        return six.itervalues(self._messages)
+
+    def add_renamed_message(self, old_id, old_symbol, new_symbol):
+        """Register the old ID and symbol for a warning that was renamed.
+
+        This allows users to keep using the old ID/symbol in suppressions.
+        """
+        msg = self.check_message_id(new_symbol)
+        msg.old_names.append((old_id, old_symbol))
+        self._alternative_names[old_id] = msg
+        self._alternative_names[old_symbol] = msg
+
+    def register_messages(self, checker):
+        """register a dictionary of messages
+
+        Keys are message ids, values are a 2-uple with the message type and the
+        message itself
+
+        message ids should be a string of len 4, where the two first characters
+        are the checker id and the two last the message id in this checker
+        """
+        chkid = None
+        for msgid, msg_tuple in six.iteritems(checker.msgs):
+            msg = build_message_def(checker, msgid, msg_tuple)
+            assert msg.symbol not in self._messages, \
+                    'Message symbol %r is already defined' % msg.symbol
+            # avoid duplicate / malformed ids
+            assert msg.msgid not in self._alternative_names, \
+                   'Message id %r is already defined' % msgid
+            assert chkid is None or chkid == msg.msgid[1:3], \
+                   'Inconsistent checker part in message id %r' % msgid
+            chkid = msg.msgid[1:3]
+            self._messages[msg.symbol] = msg
+            self._alternative_names[msg.msgid] = msg
+            for old_id, old_symbol in msg.old_names:
+                self._alternative_names[old_id] = msg
+                self._alternative_names[old_symbol] = msg
+            self._msgs_by_category[msg.msgid[0]].append(msg.msgid)
+
+    def check_message_id(self, msgid):
+        """returns the Message object for this message.
+
+        msgid may be either a numeric or symbolic id.
+
+        Raises UnknownMessage if the message id is not defined.
+        """
+        if msgid[1:].isdigit():
+            msgid = msgid.upper()
+        for source in (self._alternative_names, self._messages):
+            try:
+                return source[msgid]
+            except KeyError:
+                pass
+        raise UnknownMessage('No such message id %s' % msgid)
+
+    def get_msg_display_string(self, msgid):
+        """Generates a user-consumable representation of a message.
+
+        Can be just the message ID or the ID and the symbol.
+        """
+        return repr(self.check_message_id(msgid).symbol)
+
+    def help_message(self, msgids):
+        """display help messages for the given message identifiers"""
+        for msgid in msgids:
+            try:
+                print(self.check_message_id(msgid).format_help(checkerref=True))
+                print("")
+            except UnknownMessage as ex:
+                print(ex)
+                print("")
+                continue
+
+    def list_messages(self):
+        """output full messages list documentation in ReST format"""
+        msgs = sorted(six.itervalues(self._messages), key=lambda msg: msg.msgid)
+        for msg in msgs:
+            if not msg.may_be_emitted():
+                continue
+            print(msg.format_help(checkerref=False))
+        print("")
+
+
+class ReportsHandlerMixIn(object):
+    """a mix-in class containing all the reports and stats manipulation
+    related methods for the main lint class
+    """
+    def __init__(self):
+        self._reports = collections.defaultdict(list)
+        self._reports_state = {}
+
+    def report_order(self):
+        """ Return a list of reports, sorted in the order
+        in which they must be called.
+        """
+        return list(self._reports)
+
+    def register_report(self, reportid, r_title, r_cb, checker):
+        """register a report
+
+        reportid is the unique identifier for the report
+        r_title the report's title
+        r_cb the method to call to make the report
+        checker is the checker defining the report
+        """
+        reportid = reportid.upper()
+        self._reports[checker].append((reportid, r_title, r_cb))
+
+    def enable_report(self, reportid):
+        """disable the report of the given id"""
+        reportid = reportid.upper()
+        self._reports_state[reportid] = True
+
+    def disable_report(self, reportid):
+        """disable the report of the given id"""
+        reportid = reportid.upper()
+        self._reports_state[reportid] = False
+
+    def report_is_enabled(self, reportid):
+        """return true if the report associated to the given identifier is
+        enabled
+        """
+        return self._reports_state.get(reportid, True)
+
+    def make_reports(self, stats, old_stats):
+        """render registered reports"""
+        sect = Section('Report',
+                       '%s statements analysed.'% (self.stats['statement']))
+        for checker in self.report_order():
+            for reportid, r_title, r_cb in self._reports[checker]:
+                if not self.report_is_enabled(reportid):
+                    continue
+                report_sect = Section(r_title)
+                try:
+                    r_cb(report_sect, stats, old_stats)
+                except EmptyReport:
+                    continue
+                report_sect.report_id = reportid
+                sect.append(report_sect)
+        return sect
+
+    def add_stats(self, **kwargs):
+        """add some stats entries to the statistic dictionary
+        raise an AssertionError if there is a key conflict
+        """
+        for key, value in six.iteritems(kwargs):
+            if key[-1] == '_':
+                key = key[:-1]
+            assert key not in self.stats
+            self.stats[key] = value
+        return self.stats
+
+
+def expand_modules(files_or_modules, black_list):
+    """take a list of files/modules/packages and return the list of tuple
+    (file, module name) which have to be actually checked
+    """
+    result = []
+    errors = []
+    for something in files_or_modules:
+        if exists(something):
+            # this is a file or a directory
+            try:
+                modname = '.'.join(modpath_from_file(something))
+            except ImportError:
+                modname = splitext(basename(something))[0]
+            if isdir(something):
+                filepath = join(something, '__init__.py')
+            else:
+                filepath = something
+        else:
+            # suppose it's a module or package
+            modname = something
+            try:
+                filepath = file_from_modpath(modname.split('.'))
+                if filepath is None:
+                    errors.append({'key' : 'ignored-builtin-module', 'mod': modname})
+                    continue
+            except (ImportError, SyntaxError) as ex:
+                # FIXME p3k : the SyntaxError is a Python bug and should be
+                # removed as soon as possible http://bugs.python.org/issue10588
+                errors.append({'key': 'fatal', 'mod': modname, 'ex': ex})
+                continue
+        filepath = normpath(filepath)
+        result.append({'path': filepath, 'name': modname, 'isarg': True,
+                       'basepath': filepath, 'basename': modname})
+        if not (modname.endswith('.__init__') or modname == '__init__') \
+                and '__init__.py' in filepath:
+            for subfilepath in get_module_files(dirname(filepath), black_list):
+                if filepath == subfilepath:
+                    continue
+                submodname = '.'.join(modpath_from_file(subfilepath))
+                result.append({'path': subfilepath, 'name': submodname,
+                               'isarg': False,
+                               'basepath': filepath, 'basename': modname})
+    return result, errors
+
+
+class PyLintASTWalker(object):
+
+    def __init__(self, linter):
+        # callbacks per node types
+        self.nbstatements = 1
+        self.visit_events = collections.defaultdict(list)
+        self.leave_events = collections.defaultdict(list)
+        self.linter = linter
+
+    def _is_method_enabled(self, method):
+        if not hasattr(method, 'checks_msgs'):
+            return True
+        for msg_desc in method.checks_msgs:
+            if self.linter.is_message_enabled(msg_desc):
+                return True
+        return False
+
+    def add_checker(self, checker):
+        """walk to the checker's dir and collect visit and leave methods"""
+        # XXX : should be possible to merge needed_checkers and add_checker
+        vcids = set()
+        lcids = set()
+        visits = self.visit_events
+        leaves = self.leave_events
+        for member in dir(checker):
+            cid = member[6:]
+            if cid == 'default':
+                continue
+            if member.startswith('visit_'):
+                v_meth = getattr(checker, member)
+                # don't use visit_methods with no activated message:
+                if self._is_method_enabled(v_meth):
+                    visits[cid].append(v_meth)
+                    vcids.add(cid)
+            elif member.startswith('leave_'):
+                l_meth = getattr(checker, member)
+                # don't use leave_methods with no activated message:
+                if self._is_method_enabled(l_meth):
+                    leaves[cid].append(l_meth)
+                    lcids.add(cid)
+        visit_default = getattr(checker, 'visit_default', None)
+        if visit_default:
+            for cls in nodes.ALL_NODE_CLASSES:
+                cid = cls.__name__.lower()
+                if cid not in vcids:
+                    visits[cid].append(visit_default)
+        # for now we have no "leave_default" method in Pylint
+
+    def walk(self, astroid):
+        """call visit events of astroid checkers for the given node, recurse on
+        its children, then leave events.
+        """
+        cid = astroid.__class__.__name__.lower()
+        if astroid.is_statement:
+            self.nbstatements += 1
+        # generate events for this node on each checker
+        for cb in self.visit_events.get(cid, ()):
+            cb(astroid)
+        # recurse on children
+        for child in astroid.get_children():
+            self.walk(child)
+        for cb in self.leave_events.get(cid, ()):
+            cb(astroid)
+
+
+PY_EXTS = ('.py', '.pyc', '.pyo', '.pyw', '.so', '.dll')
+
+def register_plugins(linter, directory):
+    """load all module and package in the given directory, looking for a
+    'register' function in each one, used to register pylint checkers
+    """
+    imported = {}
+    for filename in os.listdir(directory):
+        base, extension = splitext(filename)
+        if base in imported or base == '__pycache__':
+            continue
+        if extension in PY_EXTS and base != '__init__' or (
+                not extension and isdir(join(directory, base))):
+            try:
+                module = load_module_from_file(join(directory, filename))
+            except ValueError:
+                # empty module name (usually emacs auto-save files)
+                continue
+            except ImportError as exc:
+                print("Problem importing module %s: %s" % (filename, exc),
+                      file=sys.stderr)
+            else:
+                if hasattr(module, 'register'):
+                    module.register(linter)
+                    imported[base] = 1
+
+def get_global_option(checker, option, default=None):
+    """ Retrieve an option defined by the given *checker* or
+    by all known option providers.
+
+    It will look in the list of all options providers
+    until the given *option* will be found.
+    If the option wasn't found, the *default* value will be returned.
+    """
+    # First, try in the given checker's config.
+    # After that, look in the options providers.
+
+    try:
+        return getattr(checker.config, option.replace("-", "_"))
+    except AttributeError:
+        pass
+    for provider in checker.linter.options_providers:
+        for options in provider.options:
+            if options[0] == option:
+                return getattr(provider.config, option.replace("-", "_"))
+    return default
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/__init__.py
new file mode 100644
index 0000000..624b627
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/__init__.py
@@ -0,0 +1,18 @@
+"""rope, a python refactoring library"""
+
+INFO = __doc__
+VERSION = '0.10.3'
+COPYRIGHT = """\
+Copyright (C) 2014-2015 Matej Cepl
+Copyright (C) 2006-2012 Ali Gholami Rudi
+Copyright (C) 2009-2012 Anton Gritsay
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of GNU General Public License as published by the
+Free Software Foundation; either version 2 of the license, or (at your
+opinion) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details."""
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..948ccfd
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__init__.py
new file mode 100644
index 0000000..ff5f8c6
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__init__.py
@@ -0,0 +1,8 @@
+"""Base rope package
+
+This package contains rope core modules that are used by other modules
+and packages.
+
+"""
+
+__all__ = ['project', 'libutils', 'exceptions']
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..d35d72c
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/arguments.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/arguments.cpython-35.pyc
new file mode 100644
index 0000000..80a0a57
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/arguments.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/ast.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/ast.cpython-35.pyc
new file mode 100644
index 0000000..2beb100
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/ast.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/astutils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/astutils.cpython-35.pyc
new file mode 100644
index 0000000..cde94b9
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/astutils.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/builtins.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/builtins.cpython-35.pyc
new file mode 100644
index 0000000..7c8d16d
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/builtins.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/change.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/change.cpython-35.pyc
new file mode 100644
index 0000000..2d61207
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/change.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/codeanalyze.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/codeanalyze.cpython-35.pyc
new file mode 100644
index 0000000..f9cff41
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/codeanalyze.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/default_config.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/default_config.cpython-35.pyc
new file mode 100644
index 0000000..785594e
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/default_config.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/evaluate.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/evaluate.cpython-35.pyc
new file mode 100644
index 0000000..b564156
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/evaluate.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/exceptions.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/exceptions.cpython-35.pyc
new file mode 100644
index 0000000..5905cad
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/exceptions.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/fscommands.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/fscommands.cpython-35.pyc
new file mode 100644
index 0000000..a2c3dd3
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/fscommands.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/history.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/history.cpython-35.pyc
new file mode 100644
index 0000000..ed8d0ec
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/history.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/libutils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/libutils.cpython-35.pyc
new file mode 100644
index 0000000..7bfa965
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/libutils.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/prefs.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/prefs.cpython-35.pyc
new file mode 100644
index 0000000..6367dbe
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/prefs.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/project.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/project.cpython-35.pyc
new file mode 100644
index 0000000..816dd00
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/project.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pycore.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pycore.cpython-35.pyc
new file mode 100644
index 0000000..95db5b8
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pycore.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pynames.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pynames.cpython-35.pyc
new file mode 100644
index 0000000..246aa92
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pynames.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pynamesdef.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pynamesdef.cpython-35.pyc
new file mode 100644
index 0000000..0f95591
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pynamesdef.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyobjects.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyobjects.cpython-35.pyc
new file mode 100644
index 0000000..f815408
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyobjects.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyobjectsdef.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyobjectsdef.cpython-35.pyc
new file mode 100644
index 0000000..292e6d4
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyobjectsdef.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyscopes.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyscopes.cpython-35.pyc
new file mode 100644
index 0000000..7086716
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/pyscopes.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/resourceobserver.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/resourceobserver.cpython-35.pyc
new file mode 100644
index 0000000..4a3c5ed
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/resourceobserver.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/resources.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/resources.cpython-35.pyc
new file mode 100644
index 0000000..86444d5
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/resources.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/simplify.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/simplify.cpython-35.pyc
new file mode 100644
index 0000000..f02e598
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/simplify.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/stdmods.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/stdmods.cpython-35.pyc
new file mode 100644
index 0000000..812afd5
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/stdmods.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/taskhandle.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/taskhandle.cpython-35.pyc
new file mode 100644
index 0000000..5b73e94
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/taskhandle.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/worder.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/worder.cpython-35.pyc
new file mode 100644
index 0000000..cb55f9b
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/__pycache__/worder.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/arguments.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/arguments.py
new file mode 100644
index 0000000..7ba4364
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/arguments.py
@@ -0,0 +1,111 @@
+import rope.base.evaluate
+from rope.base import ast
+
+
+class Arguments(object):
+    """A class for evaluating parameters passed to a function
+
+    You can use the `create_arguments` factory.  It handles implicit
+    first arguments.
+
+    """
+
+    def __init__(self, args, scope):
+        self.args = args
+        self.scope = scope
+        self.instance = None
+
+    def get_arguments(self, parameters):
+        result = []
+        for pyname in self.get_pynames(parameters):
+            if pyname is None:
+                result.append(None)
+            else:
+                result.append(pyname.get_object())
+        return result
+
+    def get_pynames(self, parameters):
+        result = [None] * max(len(parameters), len(self.args))
+        for index, arg in enumerate(self.args):
+            if isinstance(arg, ast.keyword) and arg.arg in parameters:
+                result[parameters.index(arg.arg)] = self._evaluate(arg.value)
+            else:
+                result[index] = self._evaluate(arg)
+        return result
+
+    def get_instance_pyname(self):
+        if self.args:
+            return self._evaluate(self.args[0])
+
+    def _evaluate(self, ast_node):
+        return rope.base.evaluate.eval_node(self.scope, ast_node)
+
+
+def create_arguments(primary, pyfunction, call_node, scope):
+    """A factory for creating `Arguments`"""
+    args = list(call_node.args)
+    args.extend(call_node.keywords)
+    called = call_node.func
+    # XXX: Handle constructors
+    if _is_method_call(primary, pyfunction) and \
+       isinstance(called, ast.Attribute):
+        args.insert(0, called.value)
+    return Arguments(args, scope)
+
+
+class ObjectArguments(object):
+
+    def __init__(self, pynames):
+        self.pynames = pynames
+
+    def get_arguments(self, parameters):
+        result = []
+        for pyname in self.pynames:
+            if pyname is None:
+                result.append(None)
+            else:
+                result.append(pyname.get_object())
+        return result
+
+    def get_pynames(self, parameters):
+        return self.pynames
+
+    def get_instance_pyname(self):
+        return self.pynames[0]
+
+
+class MixedArguments(object):
+
+    def __init__(self, pyname, arguments, scope):
+        """`argumens` is an instance of `Arguments`"""
+        self.pyname = pyname
+        self.args = arguments
+
+    def get_pynames(self, parameters):
+        return [self.pyname] + self.args.get_pynames(parameters[1:])
+
+    def get_arguments(self, parameters):
+        result = []
+        for pyname in self.get_pynames(parameters):
+            if pyname is None:
+                result.append(None)
+            else:
+                result.append(pyname.get_object())
+        return result
+
+    def get_instance_pyname(self):
+        return self.pyname
+
+
+def _is_method_call(primary, pyfunction):
+    if primary is None:
+        return False
+    pyobject = primary.get_object()
+    if isinstance(pyobject.get_type(), rope.base.pyobjects.PyClass) and \
+       isinstance(pyfunction, rope.base.pyobjects.PyFunction) and \
+       isinstance(pyfunction.parent, rope.base.pyobjects.PyClass):
+        return True
+    if isinstance(pyobject.get_type(), rope.base.pyobjects.AbstractClass) and \
+       isinstance(pyfunction, rope.base.builtins.BuiltinFunction):
+        return True
+    return False
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/ast.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/ast.py
new file mode 100644
index 0000000..d43c83c
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/ast.py
@@ -0,0 +1,76 @@
+import _ast
+from _ast import *
+
+from rope.base import fscommands
+
+try:
+    unicode
+except NameError:
+    unicode = str
+
+
+def parse(source, filename='<string>'):
+    # NOTE: the raw string should be given to `compile` function
+    if isinstance(source, unicode):
+        source = fscommands.unicode_to_file_data(source)
+    if b'\r' in source:
+        source = source.replace(b'\r\n', b'\n').replace(b'\r', b'\n')
+    if not source.endswith(b'\n'):
+        source += b'\n'
+    try:
+        return compile(source, filename, 'exec', _ast.PyCF_ONLY_AST)
+    except (TypeError, ValueError) as e:
+        error = SyntaxError()
+        error.lineno = 1
+        error.filename = filename
+        error.msg = str(e)
+        raise error
+
+
+def walk(node, walker):
+    """Walk the syntax tree"""
+    method_name = '_' + node.__class__.__name__
+    method = getattr(walker, method_name, None)
+    if method is not None:
+        if isinstance(node, _ast.ImportFrom) and node.module is None:
+            # In python < 2.7 ``node.module == ''`` for relative imports
+            # but for python 2.7 it is None. Generalizing it to ''.
+            node.module = ''
+        return method(node)
+    for child in get_child_nodes(node):
+        walk(child, walker)
+
+
+def get_child_nodes(node):
+    if isinstance(node, _ast.Module):
+        return node.body
+    result = []
+    if node._fields is not None:
+        for name in node._fields:
+            child = getattr(node, name)
+            if isinstance(child, list):
+                for entry in child:
+                    if isinstance(entry, _ast.AST):
+                        result.append(entry)
+            if isinstance(child, _ast.AST):
+                result.append(child)
+    return result
+
+
+def call_for_nodes(node, callback, recursive=False):
+    """If callback returns `True` the child nodes are skipped"""
+    result = callback(node)
+    if recursive and not result:
+        for child in get_child_nodes(node):
+            call_for_nodes(child, callback, recursive)
+
+
+def get_children(node):
+    result = []
+    if node._fields is not None:
+        for name in node._fields:
+            if name in ['lineno', 'col_offset']:
+                continue
+            child = getattr(node, name)
+            result.append(child)
+    return result
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/astutils.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/astutils.py
new file mode 100644
index 0000000..6c0b3d7
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/astutils.py
@@ -0,0 +1,64 @@
+from rope.base import ast
+
+
+def get_name_levels(node):
+    """Return a list of ``(name, level)`` tuples for assigned names
+
+    The `level` is `None` for simple assignments and is a list of
+    numbers for tuple assignments for example in::
+
+      a, (b, c) = x
+
+    The levels for for `a` is ``[0]``, for `b` is ``[1, 0]`` and for
+    `c` is ``[1, 1]``.
+
+    """
+    visitor = _NodeNameCollector()
+    ast.walk(node, visitor)
+    return visitor.names
+
+
+class _NodeNameCollector(object):
+
+    def __init__(self, levels=None):
+        self.names = []
+        self.levels = levels
+        self.index = 0
+
+    def _add_node(self, node):
+        new_levels = []
+        if self.levels is not None:
+            new_levels = list(self.levels)
+            new_levels.append(self.index)
+        self.index += 1
+        self._added(node, new_levels)
+
+    def _added(self, node, levels):
+        if hasattr(node, 'id'):
+            self.names.append((node.id, levels))
+
+    def _Name(self, node):
+        self._add_node(node)
+
+    def _ExceptHandler(self, node):
+        self.names.append((node.name, []))
+
+    def _Tuple(self, node):
+        new_levels = []
+        if self.levels is not None:
+            new_levels = list(self.levels)
+            new_levels.append(self.index)
+        self.index += 1
+        visitor = _NodeNameCollector(new_levels)
+        for child in ast.get_child_nodes(node):
+            ast.walk(child, visitor)
+        self.names.extend(visitor.names)
+
+    def _Subscript(self, node):
+        self._add_node(node)
+
+    def _Attribute(self, node):
+        self._add_node(node)
+
+    def _Slice(self, node):
+        self._add_node(node)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/builtins.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/builtins.py
new file mode 100644
index 0000000..bc42f72
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/builtins.py
@@ -0,0 +1,809 @@
+"""This module trys to support builtin types and functions."""
+import inspect
+try:
+    raw_input
+except NameError:
+    raw_input = input
+
+import rope.base.evaluate
+from rope.base.utils import pycompat
+from rope.base import pynames, pyobjects, arguments, utils
+
+
+class BuiltinModule(pyobjects.AbstractModule):
+
+    def __init__(self, name, pycore=None, initial={}):
+        super(BuiltinModule, self).__init__()
+        self.name = name
+        self.pycore = pycore
+        self.initial = initial
+
+    parent = None
+
+    def get_attributes(self):
+        return self.attributes
+
+    def get_doc(self):
+        if self.module:
+            return self.module.__doc__
+
+    def get_name(self):
+        return self.name.split('.')[-1]
+
+    @property
+    @utils.saveit
+    def attributes(self):
+        result = _object_attributes(self.module, self)
+        result.update(self.initial)
+        if self.pycore is not None:
+            submodules = self.pycore._builtin_submodules(self.name)
+            for name, module in submodules.items():
+                result[name] = rope.base.builtins.BuiltinName(module)
+        return result
+
+    @property
+    @utils.saveit
+    def module(self):
+        try:
+            result = __import__(self.name)
+            for token in self.name.split('.')[1:]:
+                result = getattr(result, token, None)
+            return result
+        except ImportError:
+            return
+
+
+class _BuiltinElement(object):
+
+    def __init__(self, builtin, parent=None):
+        self.builtin = builtin
+        self._parent = parent
+
+    def get_doc(self):
+        if self.builtin:
+            return getattr(self.builtin, '__doc__', None)
+
+    def get_name(self):
+        if self.builtin:
+            return getattr(self.builtin, '__name__', None)
+
+    @property
+    def parent(self):
+        if self._parent is None:
+            return builtins
+        return self._parent
+
+
+class BuiltinClass(_BuiltinElement, pyobjects.AbstractClass):
+
+    def __init__(self, builtin, attributes, parent=None):
+        _BuiltinElement.__init__(self, builtin, parent)
+        pyobjects.AbstractClass.__init__(self)
+        self.initial = attributes
+
+    @utils.saveit
+    def get_attributes(self):
+        result = _object_attributes(self.builtin, self)
+        result.update(self.initial)
+        return result
+
+
+class BuiltinFunction(_BuiltinElement, pyobjects.AbstractFunction):
+
+    def __init__(self, returned=None, function=None, builtin=None,
+                 argnames=[], parent=None):
+        _BuiltinElement.__init__(self, builtin, parent)
+        pyobjects.AbstractFunction.__init__(self)
+        self.argnames = argnames
+        self.returned = returned
+        self.function = function
+
+    def get_returned_object(self, args):
+        if self.function is not None:
+            return self.function(_CallContext(self.argnames, args))
+        else:
+            return self.returned
+
+    def get_param_names(self, special_args=True):
+        return self.argnames
+
+
+class BuiltinUnknown(_BuiltinElement, pyobjects.PyObject):
+
+    def __init__(self, builtin):
+        super(BuiltinUnknown, self).__init__(pyobjects.get_unknown())
+        self.builtin = builtin
+        self.type = pyobjects.get_unknown()
+
+    def get_name(self):
+        return getattr(type(self.builtin), '__name__', None)
+
+    @utils.saveit
+    def get_attributes(self):
+        return _object_attributes(self.builtin, self)
+
+
+def _object_attributes(obj, parent):
+    attributes = {}
+    for name in dir(obj):
+        if name == 'None':
+            continue
+        try:
+            child = getattr(obj, name)
+        except AttributeError:
+            # descriptors are allowed to raise AttributeError
+            # even if they are in dir()
+            continue
+        pyobject = None
+        if inspect.isclass(child):
+            pyobject = BuiltinClass(child, {}, parent=parent)
+        elif inspect.isroutine(child):
+            pyobject = BuiltinFunction(builtin=child, parent=parent)
+        else:
+            pyobject = BuiltinUnknown(builtin=child)
+        attributes[name] = BuiltinName(pyobject)
+    return attributes
+
+
+def _create_builtin_type_getter(cls):
+    def _get_builtin(*args):
+        if not hasattr(cls, '_generated'):
+            cls._generated = {}
+        if args not in cls._generated:
+            cls._generated[args] = cls(*args)
+        return cls._generated[args]
+    return _get_builtin
+
+
+def _create_builtin_getter(cls):
+    type_getter = _create_builtin_type_getter(cls)
+
+    def _get_builtin(*args):
+        return pyobjects.PyObject(type_getter(*args))
+    return _get_builtin
+
+
+class _CallContext(object):
+
+    def __init__(self, argnames, args):
+        self.argnames = argnames
+        self.args = args
+
+    def _get_scope_and_pyname(self, pyname):
+        if pyname is not None and isinstance(pyname, pynames.AssignedName):
+            pymodule, lineno = pyname.get_definition_location()
+            if pymodule is None:
+                return None, None
+            if lineno is None:
+                lineno = 1
+            scope = pymodule.get_scope().get_inner_scope_for_line(lineno)
+            name = None
+            while name is None and scope is not None:
+                for current in scope.get_names():
+                    if scope[current] is pyname:
+                        name = current
+                        break
+                else:
+                    scope = scope.parent
+            return scope, name
+        return None, None
+
+    def get_argument(self, name):
+        if self.args:
+            args = self.args.get_arguments(self.argnames)
+            return args[self.argnames.index(name)]
+
+    def get_pyname(self, name):
+        if self.args:
+            args = self.args.get_pynames(self.argnames)
+            if name in self.argnames:
+                return args[self.argnames.index(name)]
+
+    def get_arguments(self, argnames):
+        if self.args:
+            return self.args.get_arguments(argnames)
+
+    def get_pynames(self, argnames):
+        if self.args:
+            return self.args.get_pynames(argnames)
+
+    def get_per_name(self):
+        if self.args is None:
+            return None
+        pyname = self.args.get_instance_pyname()
+        scope, name = self._get_scope_and_pyname(pyname)
+        if name is not None:
+            pymodule = pyname.get_definition_location()[0]
+            return pymodule.pycore.object_info.get_per_name(scope, name)
+        return None
+
+    def save_per_name(self, value):
+        if self.args is None:
+            return None
+        pyname = self.args.get_instance_pyname()
+        scope, name = self._get_scope_and_pyname(pyname)
+        if name is not None:
+            pymodule = pyname.get_definition_location()[0]
+            pymodule.pycore.object_info.save_per_name(scope, name, value)
+
+
+class _AttributeCollector(object):
+
+    def __init__(self, type):
+        self.attributes = {}
+        self.type = type
+
+    def __call__(self, name, returned=None, function=None,
+                 argnames=['self'], check_existence=True):
+        try:
+            builtin = getattr(self.type, name)
+        except AttributeError:
+            if check_existence:
+                raise
+            builtin = None
+        self.attributes[name] = BuiltinName(
+            BuiltinFunction(returned=returned, function=function,
+                            argnames=argnames, builtin=builtin))
+
+    def __setitem__(self, name, value):
+        self.attributes[name] = value
+
+
+class List(BuiltinClass):
+
+    def __init__(self, holding=None):
+        self.holding = holding
+        collector = _AttributeCollector(list)
+
+        collector('__iter__', function=self._iterator_get)
+        collector('__new__', function=self._new_list)
+
+        # Adding methods
+        collector('append', function=self._list_add,
+                  argnames=['self', 'value'])
+        collector('__setitem__', function=self._list_add,
+                  argnames=['self', 'index', 'value'])
+        collector('insert', function=self._list_add,
+                  argnames=['self', 'index', 'value'])
+        collector('extend', function=self._self_set,
+                  argnames=['self', 'iterable'])
+
+        # Getting methods
+        collector('__getitem__', function=self._list_get)
+        collector('pop', function=self._list_get)
+        try:
+            collector('__getslice__', function=self._list_get)
+        except AttributeError:
+            pass
+
+        super(List, self).__init__(list, collector.attributes)
+
+    def _new_list(self, args):
+        return _create_builtin(args, get_list)
+
+    def _list_add(self, context):
+        if self.holding is not None:
+            return
+        holding = context.get_argument('value')
+        if holding is not None and holding != pyobjects.get_unknown():
+            context.save_per_name(holding)
+
+    def _self_set(self, context):
+        if self.holding is not None:
+            return
+        iterable = context.get_pyname('iterable')
+        holding = _infer_sequence_for_pyname(iterable)
+        if holding is not None and holding != pyobjects.get_unknown():
+            context.save_per_name(holding)
+
+    def _list_get(self, context):
+        if self.holding is not None:
+            args = context.get_arguments(['self', 'key'])
+            if (len(args) > 1 and args[1] is not None and
+                    args[1].get_type() == builtins['slice'].get_object()):
+                return get_list(self.holding)
+            return self.holding
+        return context.get_per_name()
+
+    def _iterator_get(self, context):
+        return get_iterator(self._list_get(context))
+
+    def _self_get(self, context):
+        return get_list(self._list_get(context))
+
+
+get_list = _create_builtin_getter(List)
+get_list_type = _create_builtin_type_getter(List)
+
+
+class Dict(BuiltinClass):
+
+    def __init__(self, keys=None, values=None):
+        self.keys = keys
+        self.values = values
+        collector = _AttributeCollector(dict)
+        collector('__new__', function=self._new_dict)
+        collector('__setitem__', function=self._dict_add)
+        collector('popitem', function=self._item_get)
+        collector('pop', function=self._value_get)
+        collector('get', function=self._key_get)
+        collector('keys', function=self._key_list)
+        collector('values', function=self._value_list)
+        collector('items', function=self._item_list)
+        collector('copy', function=self._self_get)
+        collector('__getitem__', function=self._value_get)
+        collector('__iter__', function=self._key_iter)
+        collector('update', function=self._self_set)
+        super(Dict, self).__init__(dict, collector.attributes)
+
+    def _new_dict(self, args):
+        def do_create(holding=None):
+            if holding is None:
+                return get_dict()
+            type = holding.get_type()
+            if isinstance(type, Tuple) and \
+                    len(type.get_holding_objects()) == 2:
+                return get_dict(*type.get_holding_objects())
+        return _create_builtin(args, do_create)
+
+    def _dict_add(self, context):
+        if self.keys is not None:
+            return
+        key, value = context.get_arguments(['self', 'key', 'value'])[1:]
+        if key is not None and key != pyobjects.get_unknown():
+            context.save_per_name(get_tuple(key, value))
+
+    def _item_get(self, context):
+        if self.keys is not None:
+            return get_tuple(self.keys, self.values)
+        item = context.get_per_name()
+        if item is None or not isinstance(item.get_type(), Tuple):
+            return get_tuple(self.keys, self.values)
+        return item
+
+    def _value_get(self, context):
+        item = self._item_get(context).get_type()
+        return item.get_holding_objects()[1]
+
+    def _key_get(self, context):
+        item = self._item_get(context).get_type()
+        return item.get_holding_objects()[0]
+
+    def _value_list(self, context):
+        return get_list(self._value_get(context))
+
+    def _key_list(self, context):
+        return get_list(self._key_get(context))
+
+    def _item_list(self, context):
+        return get_list(self._item_get(context))
+
+    def _value_iter(self, context):
+        return get_iterator(self._value_get(context))
+
+    def _key_iter(self, context):
+        return get_iterator(self._key_get(context))
+
+    def _item_iter(self, context):
+        return get_iterator(self._item_get(context))
+
+    def _self_get(self, context):
+        item = self._item_get(context).get_type()
+        key, value = item.get_holding_objects()[:2]
+        return get_dict(key, value)
+
+    def _self_set(self, context):
+        if self.keys is not None:
+            return
+        new_dict = context.get_pynames(['self', 'd'])[1]
+        if new_dict and isinstance(new_dict.get_object().get_type(), Dict):
+            args = arguments.ObjectArguments([new_dict])
+            items = new_dict.get_object()['popitem'].\
+                get_object().get_returned_object(args)
+            context.save_per_name(items)
+        else:
+            holding = _infer_sequence_for_pyname(new_dict)
+            if holding is not None and isinstance(holding.get_type(), Tuple):
+                context.save_per_name(holding)
+
+
+get_dict = _create_builtin_getter(Dict)
+get_dict_type = _create_builtin_type_getter(Dict)
+
+
+class Tuple(BuiltinClass):
+
+    def __init__(self, *objects):
+        self.objects = objects
+        first = None
+        if objects:
+            first = objects[0]
+        attributes = {
+            '__getitem__': BuiltinName(BuiltinFunction(first)),  # TODO: add slice support
+            '__getslice__':
+            BuiltinName(BuiltinFunction(pyobjects.PyObject(self))),
+            '__new__': BuiltinName(BuiltinFunction(function=self._new_tuple)),
+            '__iter__': BuiltinName(BuiltinFunction(get_iterator(first)))}
+        super(Tuple, self).__init__(tuple, attributes)
+
+    def get_holding_objects(self):
+        return self.objects
+
+    def _new_tuple(self, args):
+        return _create_builtin(args, get_tuple)
+
+
+get_tuple = _create_builtin_getter(Tuple)
+get_tuple_type = _create_builtin_type_getter(Tuple)
+
+
+class Set(BuiltinClass):
+
+    def __init__(self, holding=None):
+        self.holding = holding
+        collector = _AttributeCollector(set)
+        collector('__new__', function=self._new_set)
+
+        self_methods = ['copy', 'difference', 'intersection',
+                        'symmetric_difference', 'union']
+        for method in self_methods:
+            collector(method, function=self._self_get)
+        collector('add', function=self._set_add)
+        collector('update', function=self._self_set)
+        collector('update', function=self._self_set)
+        collector('symmetric_difference_update', function=self._self_set)
+        collector('difference_update', function=self._self_set)
+
+        collector('pop', function=self._set_get)
+        collector('__iter__', function=self._iterator_get)
+        super(Set, self).__init__(set, collector.attributes)
+
+    def _new_set(self, args):
+        return _create_builtin(args, get_set)
+
+    def _set_add(self, context):
+        if self.holding is not None:
+            return
+        holding = context.get_arguments(['self', 'value'])[1]
+        if holding is not None and holding != pyobjects.get_unknown():
+            context.save_per_name(holding)
+
+    def _self_set(self, context):
+        if self.holding is not None:
+            return
+        iterable = context.get_pyname('iterable')
+        holding = _infer_sequence_for_pyname(iterable)
+        if holding is not None and holding != pyobjects.get_unknown():
+            context.save_per_name(holding)
+
+    def _set_get(self, context):
+        if self.holding is not None:
+            return self.holding
+        return context.get_per_name()
+
+    def _iterator_get(self, context):
+        return get_iterator(self._set_get(context))
+
+    def _self_get(self, context):
+        return get_list(self._set_get(context))
+
+
+get_set = _create_builtin_getter(Set)
+get_set_type = _create_builtin_type_getter(Set)
+
+
+class Str(BuiltinClass):
+
+    def __init__(self):
+        self_object = pyobjects.PyObject(self)
+        collector = _AttributeCollector(str)
+        collector('__iter__', get_iterator(self_object), check_existence=False)
+
+        self_methods = ['__getitem__', 'capitalize', 'center',
+                        'encode', 'expandtabs', 'join', 'ljust',
+                        'lower', 'lstrip', 'replace', 'rjust', 'rstrip',
+                        'strip', 'swapcase', 'title', 'translate', 'upper',
+                        'zfill']
+        for method in self_methods:
+            collector(method, self_object)
+
+        py2_self_methods = ["__getslice__", "decode"]
+        for method in py2_self_methods:
+            try:
+                collector(method, self_object)
+            except AttributeError:
+                pass
+
+        for method in ['rsplit', 'split', 'splitlines']:
+            collector(method, get_list(self_object))
+
+        super(Str, self).__init__(str, collector.attributes)
+
+    def get_doc(self):
+        return str.__doc__
+
+
+get_str = _create_builtin_getter(Str)
+get_str_type = _create_builtin_type_getter(Str)
+
+
+class BuiltinName(pynames.PyName):
+
+    def __init__(self, pyobject):
+        self.pyobject = pyobject
+
+    def get_object(self):
+        return self.pyobject
+
+    def get_definition_location(self):
+        return (None, None)
+
+
+class Iterator(pyobjects.AbstractClass):
+
+    def __init__(self, holding=None):
+        super(Iterator, self).__init__()
+        self.holding = holding
+        self.attributes = {
+            'next': BuiltinName(BuiltinFunction(self.holding)),
+            '__iter__': BuiltinName(BuiltinFunction(self))}
+
+    def get_attributes(self):
+        return self.attributes
+
+    def get_returned_object(self, args):
+        return self.holding
+
+get_iterator = _create_builtin_getter(Iterator)
+
+
+class Generator(pyobjects.AbstractClass):
+
+    def __init__(self, holding=None):
+        super(Generator, self).__init__()
+        self.holding = holding
+        self.attributes = {
+            'next': BuiltinName(BuiltinFunction(self.holding)),
+            '__iter__': BuiltinName(BuiltinFunction(
+                get_iterator(self.holding))),
+            'close': BuiltinName(BuiltinFunction()),
+            'send': BuiltinName(BuiltinFunction()),
+            'throw': BuiltinName(BuiltinFunction())}
+
+    def get_attributes(self):
+        return self.attributes
+
+    def get_returned_object(self, args):
+        return self.holding
+
+get_generator = _create_builtin_getter(Generator)
+
+
+class File(BuiltinClass):
+
+    def __init__(self):
+        str_object = get_str()
+        str_list = get_list(get_str())
+        attributes = {}
+
+        def add(name, returned=None, function=None):
+            builtin = getattr(open, name, None)
+            attributes[name] = BuiltinName(
+                BuiltinFunction(returned=returned, function=function,
+                                builtin=builtin))
+        add('__iter__', get_iterator(str_object))
+        for method in ['next', 'read', 'readline', 'readlines']:
+            add(method, str_list)
+        for method in ['close', 'flush', 'lineno', 'isatty', 'seek', 'tell',
+                       'truncate', 'write', 'writelines']:
+            add(method)
+        super(File, self).__init__(open, attributes)
+
+
+get_file = _create_builtin_getter(File)
+get_file_type = _create_builtin_type_getter(File)
+
+
+class Property(BuiltinClass):
+
+    def __init__(self, fget=None, fset=None, fdel=None, fdoc=None):
+        self._fget = fget
+        self._fdoc = fdoc
+        attributes = {
+            'fget': BuiltinName(BuiltinFunction()),
+            'fset': BuiltinName(pynames.UnboundName()),
+            'fdel': BuiltinName(pynames.UnboundName()),
+            '__new__': BuiltinName(
+                BuiltinFunction(function=_property_function))}
+        super(Property, self).__init__(property, attributes)
+
+    def get_property_object(self, args):
+        if isinstance(self._fget, pyobjects.AbstractFunction):
+            return self._fget.get_returned_object(args)
+
+
+def _property_function(args):
+    parameters = args.get_arguments(['fget', 'fset', 'fdel', 'fdoc'])
+    return pyobjects.PyObject(Property(parameters[0]))
+
+
+class Lambda(pyobjects.AbstractFunction):
+
+    def __init__(self, node, scope):
+        super(Lambda, self).__init__()
+        self.node = node
+        self.arguments = node.args
+        self.scope = scope
+
+    def get_returned_object(self, args):
+        result = rope.base.evaluate.eval_node(self.scope, self.node.body)
+        if result is not None:
+            return result.get_object()
+        else:
+            return pyobjects.get_unknown()
+
+    def get_module(self):
+        return self.parent.get_module()
+
+    def get_scope(self):
+        return self.scope
+
+    def get_kind(self):
+        return 'lambda'
+
+    def get_ast(self):
+        return self.node
+
+    def get_attributes(self):
+        return {}
+
+    def get_name(self):
+        return 'lambda'
+
+    def get_param_names(self, special_args=True):
+        result = [pycompat.get_ast_arg_arg(node) for node in self.arguments.args
+                  if isinstance(node, pycompat.ast_arg_type)]
+        if self.arguments.vararg:
+            result.append('*' + pycompat.get_ast_arg_arg(self.arguments.vararg))
+        if self.arguments.kwarg:
+            result.append('**' + pycompat.get_ast_arg_arg(self.arguments.kwarg))
+        return result
+
+    @property
+    def parent(self):
+        return self.scope.pyobject
+
+
+class BuiltinObject(BuiltinClass):
+
+    def __init__(self):
+        super(BuiltinObject, self).__init__(object, {})
+
+
+class BuiltinType(BuiltinClass):
+
+    def __init__(self):
+        super(BuiltinType, self).__init__(type, {})
+
+
+def _infer_sequence_for_pyname(pyname):
+    if pyname is None:
+        return None
+    seq = pyname.get_object()
+    args = arguments.ObjectArguments([pyname])
+    if '__iter__' in seq:
+        obj = seq['__iter__'].get_object()
+        if not isinstance(obj, pyobjects.AbstractFunction):
+            return None
+        iter = obj.get_returned_object(args)
+        if iter is not None and 'next' in iter:
+            holding = iter['next'].get_object().\
+                get_returned_object(args)
+            return holding
+
+
+def _create_builtin(args, creator):
+    passed = args.get_pynames(['sequence'])[0]
+    if passed is None:
+        holding = None
+    else:
+        holding = _infer_sequence_for_pyname(passed)
+    if holding is not None:
+        return creator(holding)
+    else:
+        return creator()
+
+
+def _range_function(args):
+    return get_list()
+
+
+def _reversed_function(args):
+    return _create_builtin(args, get_iterator)
+
+
+def _sorted_function(args):
+    return _create_builtin(args, get_list)
+
+
+def _super_function(args):
+    passed_class, passed_self = args.get_arguments(['type', 'self'])
+    if passed_self is None:
+        return passed_class
+    else:
+        #pyclass = passed_self.get_type()
+        pyclass = passed_class
+        if isinstance(pyclass, pyobjects.AbstractClass):
+            supers = pyclass.get_superclasses()
+            if supers:
+                return pyobjects.PyObject(supers[0])
+        return passed_self
+
+
+def _zip_function(args):
+    args = args.get_pynames(['sequence'])
+    objects = []
+    for seq in args:
+        if seq is None:
+            holding = None
+        else:
+            holding = _infer_sequence_for_pyname(seq)
+        objects.append(holding)
+    tuple = get_tuple(*objects)
+    return get_list(tuple)
+
+
+def _enumerate_function(args):
+    passed = args.get_pynames(['sequence'])[0]
+    if passed is None:
+        holding = None
+    else:
+        holding = _infer_sequence_for_pyname(passed)
+    tuple = get_tuple(None, holding)
+    return get_iterator(tuple)
+
+
+def _iter_function(args):
+    passed = args.get_pynames(['sequence'])[0]
+    if passed is None:
+        holding = None
+    else:
+        holding = _infer_sequence_for_pyname(passed)
+    return get_iterator(holding)
+
+
+def _input_function(args):
+    return get_str()
+
+
+_initial_builtins = {
+    'list': BuiltinName(get_list_type()),
+    'dict': BuiltinName(get_dict_type()),
+    'tuple': BuiltinName(get_tuple_type()),
+    'set': BuiltinName(get_set_type()),
+    'str': BuiltinName(get_str_type()),
+    'file': BuiltinName(get_file_type()),
+    'open': BuiltinName(get_file_type()),
+    'unicode': BuiltinName(get_str_type()),
+    'range': BuiltinName(BuiltinFunction(function=_range_function,
+                         builtin=range)),
+    'reversed': BuiltinName(BuiltinFunction(function=_reversed_function,
+                            builtin=reversed)),
+    'sorted': BuiltinName(BuiltinFunction(function=_sorted_function,
+                          builtin=sorted)),
+    'super': BuiltinName(BuiltinFunction(function=_super_function,
+                         builtin=super)),
+    'property': BuiltinName(BuiltinFunction(function=_property_function,
+                            builtin=property)),
+    'zip': BuiltinName(BuiltinFunction(function=_zip_function, builtin=zip)),
+    'enumerate': BuiltinName(BuiltinFunction(function=_enumerate_function,
+                             builtin=enumerate)),
+    'object': BuiltinName(BuiltinObject()),
+    'type': BuiltinName(BuiltinType()),
+    'iter': BuiltinName(BuiltinFunction(function=_iter_function,
+                        builtin=iter)),
+    'raw_input': BuiltinName(BuiltinFunction(function=_input_function,
+                             builtin=raw_input)),
+}
+
+builtins = BuiltinModule(pycompat.builtins.__name__, initial=_initial_builtins)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/change.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/change.py
new file mode 100644
index 0000000..fe2ebf4
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/change.py
@@ -0,0 +1,450 @@
+import datetime
+import difflib
+import os
+import time
+
+import rope.base.fscommands
+from rope.base import taskhandle, exceptions, utils
+
+
+class Change(object):
+    """The base class for changes
+
+    Rope refactorings return `Change` objects.  They can be previewed,
+    committed or undone.
+    """
+
+    def do(self, job_set=None):
+        """Perform the change
+
+        .. note:: Do use this directly.  Use `Project.do()` instead.
+        """
+
+    def undo(self, job_set=None):
+        """Perform the change
+
+        .. note:: Do use this directly.  Use `History.undo()` instead.
+        """
+
+    def get_description(self):
+        """Return the description of this change
+
+        This can be used for previewing the changes.
+        """
+        return str(self)
+
+    def get_changed_resources(self):
+        """Return the list of resources that will be changed"""
+        return []
+
+    @property
+    @utils.saveit
+    def _operations(self):
+        return _ResourceOperations(self.resource.project)
+
+
+class ChangeSet(Change):
+    """A collection of `Change` objects
+
+    This class holds a collection of changes.  This class provides
+    these fields:
+
+    * `changes`: the list of changes
+    * `description`: the goal of these changes
+    """
+
+    def __init__(self, description, timestamp=None):
+        self.changes = []
+        self.description = description
+        self.time = timestamp
+
+    def do(self, job_set=taskhandle.NullJobSet()):
+        try:
+            done = []
+            for change in self.changes:
+                change.do(job_set)
+                done.append(change)
+            self.time = time.time()
+        except Exception:
+            for change in done:
+                change.undo()
+            raise
+
+    def undo(self, job_set=taskhandle.NullJobSet()):
+        try:
+            done = []
+            for change in reversed(self.changes):
+                change.undo(job_set)
+                done.append(change)
+        except Exception:
+            for change in done:
+                change.do()
+            raise
+
+    def add_change(self, change):
+        self.changes.append(change)
+
+    def get_description(self):
+        result = [str(self) + ':\n\n\n']
+        for change in self.changes:
+            result.append(change.get_description())
+            result.append('\n')
+        return ''.join(result)
+
+    def __str__(self):
+        if self.time is not None:
+            date = datetime.datetime.fromtimestamp(self.time)
+            if date.date() == datetime.date.today():
+                string_date = 'today'
+            elif date.date() == (datetime.date.today() -
+                                 datetime.timedelta(1)):
+                string_date = 'yesterday'
+            elif date.year == datetime.date.today().year:
+                string_date = date.strftime('%b %d')
+            else:
+                string_date = date.strftime('%d %b, %Y')
+            string_time = date.strftime('%H:%M:%S')
+            string_time = '%s %s ' % (string_date, string_time)
+            return self.description + ' - ' + string_time
+        return self.description
+
+    def get_changed_resources(self):
+        result = set()
+        for change in self.changes:
+            result.update(change.get_changed_resources())
+        return result
+
+
+def _handle_job_set(function):
+    """A decorator for handling `taskhandle.JobSet`\s
+
+    A decorator for handling `taskhandle.JobSet`\s for `do` and `undo`
+    methods of `Change`\s.
+    """
+    def call(self, job_set=taskhandle.NullJobSet()):
+        job_set.started_job(str(self))
+        function(self)
+        job_set.finished_job()
+    return call
+
+
+class ChangeContents(Change):
+    """A class to change the contents of a file
+
+    Fields:
+
+    * `resource`: The `rope.base.resources.File` to change
+    * `new_contents`: What to write in the file
+    """
+
+    def __init__(self, resource, new_contents, old_contents=None):
+        self.resource = resource
+        # IDEA: Only saving diffs; possible problems when undo/redoing
+        self.new_contents = new_contents
+        self.old_contents = old_contents
+
+    @_handle_job_set
+    def do(self):
+        if self.old_contents is None:
+            self.old_contents = self.resource.read()
+        self._operations.write_file(self.resource, self.new_contents)
+
+    @_handle_job_set
+    def undo(self):
+        if self.old_contents is None:
+            raise exceptions.HistoryError(
+                'Undoing a change that is not performed yet!')
+        self._operations.write_file(self.resource, self.old_contents)
+
+    def __str__(self):
+        return 'Change <%s>' % self.resource.path
+
+    def get_description(self):
+        new = self.new_contents
+        old = self.old_contents
+        if old is None:
+            if self.resource.exists():
+                old = self.resource.read()
+            else:
+                old = ''
+        result = difflib.unified_diff(
+            old.splitlines(True), new.splitlines(True),
+            'a/' + self.resource.path, 'b/' + self.resource.path)
+        return ''.join(list(result))
+
+    def get_changed_resources(self):
+        return [self.resource]
+
+
+class MoveResource(Change):
+    """Move a resource to a new location
+
+    Fields:
+
+    * `resource`: The `rope.base.resources.Resource` to move
+    * `new_resource`: The destination for move; It is the moved
+      resource not the folder containing that resource.
+    """
+
+    def __init__(self, resource, new_location, exact=False):
+        self.project = resource.project
+        self.resource = resource
+        if not exact:
+            new_location = _get_destination_for_move(resource, new_location)
+        if resource.is_folder():
+            self.new_resource = self.project.get_folder(new_location)
+        else:
+            self.new_resource = self.project.get_file(new_location)
+
+    @_handle_job_set
+    def do(self):
+        self._operations.move(self.resource, self.new_resource)
+
+    @_handle_job_set
+    def undo(self):
+        self._operations.move(self.new_resource, self.resource)
+
+    def __str__(self):
+        return 'Move <%s>' % self.resource.path
+
+    def get_description(self):
+        return 'rename from %s\nrename to %s' % (self.resource.path,
+                                                 self.new_resource.path)
+
+    def get_changed_resources(self):
+        return [self.resource, self.new_resource]
+
+
+class CreateResource(Change):
+    """A class to create a resource
+
+    Fields:
+
+    * `resource`: The resource to create
+    """
+
+    def __init__(self, resource):
+        self.resource = resource
+
+    @_handle_job_set
+    def do(self):
+        self._operations.create(self.resource)
+
+    @_handle_job_set
+    def undo(self):
+        self._operations.remove(self.resource)
+
+    def __str__(self):
+        return 'Create Resource <%s>' % (self.resource.path)
+
+    def get_description(self):
+        return 'new file %s' % (self.resource.path)
+
+    def get_changed_resources(self):
+        return [self.resource]
+
+    def _get_child_path(self, parent, name):
+        if parent.path == '':
+            return name
+        else:
+            return parent.path + '/' + name
+
+
+class CreateFolder(CreateResource):
+    """A class to create a folder
+
+    See docs for `CreateResource`.
+    """
+
+    def __init__(self, parent, name):
+        resource = parent.project.get_folder(
+            self._get_child_path(parent, name))
+        super(CreateFolder, self).__init__(resource)
+
+
+class CreateFile(CreateResource):
+    """A class to create a file
+
+    See docs for `CreateResource`.
+    """
+
+    def __init__(self, parent, name):
+        resource = parent.project.get_file(self._get_child_path(parent, name))
+        super(CreateFile, self).__init__(resource)
+
+
+class RemoveResource(Change):
+    """A class to remove a resource
+
+    Fields:
+
+    * `resource`: The resource to be removed
+    """
+
+    def __init__(self, resource):
+        self.resource = resource
+
+    @_handle_job_set
+    def do(self):
+        self._operations.remove(self.resource)
+
+    # TODO: Undoing remove operations
+    @_handle_job_set
+    def undo(self):
+        raise NotImplementedError(
+            'Undoing `RemoveResource` is not implemented yet.')
+
+    def __str__(self):
+        return 'Remove <%s>' % (self.resource.path)
+
+    def get_changed_resources(self):
+        return [self.resource]
+
+
+def count_changes(change):
+    """Counts the number of basic changes a `Change` will make"""
+    if isinstance(change, ChangeSet):
+        result = 0
+        for child in change.changes:
+            result += count_changes(child)
+        return result
+    return 1
+
+
+def create_job_set(task_handle, change):
+    return task_handle.create_jobset(str(change), count_changes(change))
+
+
+class _ResourceOperations(object):
+
+    def __init__(self, project):
+        self.project = project
+        self.fscommands = project.fscommands
+        self.direct_commands = rope.base.fscommands.FileSystemCommands()
+
+    def _get_fscommands(self, resource):
+        if self.project.is_ignored(resource):
+            return self.direct_commands
+        return self.fscommands
+
+    def write_file(self, resource, contents):
+        data = rope.base.fscommands.unicode_to_file_data(contents)
+        fscommands = self._get_fscommands(resource)
+        fscommands.write(resource.real_path, data)
+        for observer in list(self.project.observers):
+            observer.resource_changed(resource)
+
+    def move(self, resource, new_resource):
+        fscommands = self._get_fscommands(resource)
+        fscommands.move(resource.real_path, new_resource.real_path)
+        for observer in list(self.project.observers):
+            observer.resource_moved(resource, new_resource)
+
+    def create(self, resource):
+        if resource.is_folder():
+            self._create_resource(resource.path, kind='folder')
+        else:
+            self._create_resource(resource.path)
+        for observer in list(self.project.observers):
+            observer.resource_created(resource)
+
+    def remove(self, resource):
+        fscommands = self._get_fscommands(resource)
+        fscommands.remove(resource.real_path)
+        for observer in list(self.project.observers):
+            observer.resource_removed(resource)
+
+    def _create_resource(self, file_name, kind='file'):
+        resource_path = self.project._get_resource_path(file_name)
+        if os.path.exists(resource_path):
+            raise exceptions.RopeError('Resource <%s> already exists'
+                                       % resource_path)
+        resource = self.project.get_file(file_name)
+        if not resource.parent.exists():
+            raise exceptions.ResourceNotFoundError(
+                'Parent folder of <%s> does not exist' % resource.path)
+        fscommands = self._get_fscommands(resource)
+        try:
+            if kind == 'file':
+                fscommands.create_file(resource_path)
+            else:
+                fscommands.create_folder(resource_path)
+        except IOError as e:
+            raise exceptions.RopeError(e)
+
+
+def _get_destination_for_move(resource, destination):
+    dest_path = resource.project._get_resource_path(destination)
+    if os.path.isdir(dest_path):
+        if destination != '':
+            return destination + '/' + resource.name
+        else:
+            return resource.name
+    return destination
+
+
+class ChangeToData(object):
+
+    def convertChangeSet(self, change):
+        description = change.description
+        changes = []
+        for child in change.changes:
+            changes.append(self(child))
+        return (description, changes, change.time)
+
+    def convertChangeContents(self, change):
+        return (change.resource.path, change.new_contents, change.old_contents)
+
+    def convertMoveResource(self, change):
+        return (change.resource.path, change.new_resource.path)
+
+    def convertCreateResource(self, change):
+        return (change.resource.path, change.resource.is_folder())
+
+    def convertRemoveResource(self, change):
+        return (change.resource.path, change.resource.is_folder())
+
+    def __call__(self, change):
+        change_type = type(change)
+        if change_type in (CreateFolder, CreateFile):
+            change_type = CreateResource
+        method = getattr(self, 'convert' + change_type.__name__)
+        return (change_type.__name__, method(change))
+
+
+class DataToChange(object):
+
+    def __init__(self, project):
+        self.project = project
+
+    def makeChangeSet(self, description, changes, time=None):
+        result = ChangeSet(description, time)
+        for child in changes:
+            result.add_change(self(child))
+        return result
+
+    def makeChangeContents(self, path, new_contents, old_contents):
+        resource = self.project.get_file(path)
+        return ChangeContents(resource, new_contents, old_contents)
+
+    def makeMoveResource(self, old_path, new_path):
+        resource = self.project.get_file(old_path)
+        return MoveResource(resource, new_path, exact=True)
+
+    def makeCreateResource(self, path, is_folder):
+        if is_folder:
+            resource = self.project.get_folder(path)
+        else:
+            resource = self.project.get_file(path)
+        return CreateResource(resource)
+
+    def makeRemoveResource(self, path, is_folder):
+        if is_folder:
+            resource = self.project.get_folder(path)
+        else:
+            resource = self.project.get_file(path)
+        return RemoveResource(resource)
+
+    def __call__(self, data):
+        method = getattr(self, 'make' + data[0])
+        return method(*data[1])
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/codeanalyze.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/codeanalyze.py
new file mode 100644
index 0000000..1704e9a
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/codeanalyze.py
@@ -0,0 +1,362 @@
+import bisect
+import re
+import token
+import tokenize
+
+
+class ChangeCollector(object):
+
+    def __init__(self, text):
+        self.text = text
+        self.changes = []
+
+    def add_change(self, start, end, new_text=None):
+        if new_text is None:
+            new_text = self.text[start:end]
+        self.changes.append((start, end, new_text))
+
+    def get_changed(self):
+        if not self.changes:
+            return None
+
+        self.changes.sort(key=lambda x: x[:2])
+        pieces = []
+        last_changed = 0
+        for change in self.changes:
+            start, end, text = change
+            pieces.append(self.text[last_changed:start] + text)
+            last_changed = end
+        if last_changed < len(self.text):
+            pieces.append(self.text[last_changed:])
+        result = ''.join(pieces)
+        if result != self.text:
+            return result
+
+
+class SourceLinesAdapter(object):
+    """Adapts source to Lines interface
+
+    Note: The creation of this class is expensive.
+    """
+
+    def __init__(self, source_code):
+        self.code = source_code
+        self.starts = None
+        self._initialize_line_starts()
+
+    def _initialize_line_starts(self):
+        self.starts = []
+        self.starts.append(0)
+        try:
+            i = 0
+            while True:
+                i = self.code.index('\n', i) + 1
+                self.starts.append(i)
+        except ValueError:
+            pass
+        self.starts.append(len(self.code) + 1)
+
+    def get_line(self, lineno):
+        return self.code[self.starts[lineno - 1]:
+                         self.starts[lineno] - 1]
+
+    def length(self):
+        return len(self.starts) - 1
+
+    def get_line_number(self, offset):
+        return bisect.bisect(self.starts, offset)
+
+    def get_line_start(self, lineno):
+        return self.starts[lineno - 1]
+
+    def get_line_end(self, lineno):
+        return self.starts[lineno] - 1
+
+
+class ArrayLinesAdapter(object):
+
+    def __init__(self, lines):
+        self.lines = lines
+
+    def get_line(self, line_number):
+        return self.lines[line_number - 1]
+
+    def length(self):
+        return len(self.lines)
+
+
+class LinesToReadline(object):
+
+    def __init__(self, lines, start):
+        self.lines = lines
+        self.current = start
+
+    def readline(self):
+        if self.current <= self.lines.length():
+            self.current += 1
+            return self.lines.get_line(self.current - 1) + '\n'
+        return ''
+
+    def __call__(self):
+        return self.readline()
+
+
+class _CustomGenerator(object):
+
+    def __init__(self, lines):
+        self.lines = lines
+        self.in_string = ''
+        self.open_count = 0
+        self.continuation = False
+
+    def __call__(self):
+        size = self.lines.length()
+        result = []
+        i = 1
+        while i <= size:
+            while i <= size and not self.lines.get_line(i).strip():
+                i += 1
+            if i <= size:
+                start = i
+                while True:
+                    line = self.lines.get_line(i)
+                    self._analyze_line(line)
+                    if not (self.continuation or self.open_count or
+                            self.in_string) or i == size:
+                        break
+                    i += 1
+                result.append((start, i))
+                i += 1
+        return result
+
+    # Matches all backslashes before the token, to detect escaped quotes
+    _main_tokens = re.compile(r'(\\*)((\'\'\'|"""|\'|")|#|\[|\]|\{|\}|\(|\))')
+
+    def _analyze_line(self, line):
+        token = None
+        for match in self._main_tokens.finditer(line):
+            prefix = match.group(1)
+            token = match.group(2)
+            # Skip any tokens which are escaped
+            if len(prefix) % 2 == 1:
+                continue
+            if token in ["'''", '"""', "'", '"']:
+                if not self.in_string:
+                    self.in_string = token
+                elif self.in_string == token:
+                    self.in_string = ''
+            if self.in_string:
+                continue
+            if token == '#':
+                break
+            if token in '([{':
+                self.open_count += 1
+            elif token in ')]}':
+                self.open_count -= 1
+        if line and token != '#' and line.endswith('\\'):
+            self.continuation = True
+        else:
+            self.continuation = False
+
+
+def custom_generator(lines):
+    return _CustomGenerator(lines)()
+
+
+class LogicalLineFinder(object):
+
+    def __init__(self, lines):
+        self.lines = lines
+
+    def logical_line_in(self, line_number):
+        indents = count_line_indents(self.lines.get_line(line_number))
+        tries = 0
+        while True:
+            block_start = get_block_start(self.lines, line_number, indents)
+            try:
+                return self._block_logical_line(block_start, line_number)
+            except IndentationError as e:
+                tries += 1
+                if tries == 5:
+                    raise e
+                lineno = e.lineno + block_start - 1
+                indents = count_line_indents(self.lines.get_line(lineno))
+
+    def generate_starts(self, start_line=1, end_line=None):
+        for start, end in self.generate_regions(start_line, end_line):
+            yield start
+
+    def generate_regions(self, start_line=1, end_line=None):
+        # XXX: `block_start` should be at a better position!
+        block_start = 1
+        readline = LinesToReadline(self.lines, block_start)
+        try:
+            for start, end in self._logical_lines(readline):
+                real_start = start + block_start - 1
+                real_start = self._first_non_blank(real_start)
+                if end_line is not None and real_start >= end_line:
+                    break
+                real_end = end + block_start - 1
+                if real_start >= start_line:
+                    yield (real_start, real_end)
+        except tokenize.TokenError:
+            pass
+
+    def _block_logical_line(self, block_start, line_number):
+        readline = LinesToReadline(self.lines, block_start)
+        shifted = line_number - block_start + 1
+        region = self._calculate_logical(readline, shifted)
+        start = self._first_non_blank(region[0] + block_start - 1)
+        if region[1] is None:
+            end = self.lines.length()
+        else:
+            end = region[1] + block_start - 1
+        return start, end
+
+    def _calculate_logical(self, readline, line_number):
+        last_end = 1
+        try:
+            for start, end in self._logical_lines(readline):
+                if line_number <= end:
+                    return (start, end)
+                last_end = end + 1
+        except tokenize.TokenError as e:
+            current = e.args[1][0]
+            return (last_end, max(last_end, current - 1))
+        return (last_end, None)
+
+    def _logical_lines(self, readline):
+        last_end = 1
+        for current_token in tokenize.generate_tokens(readline):
+            current = current_token[2][0]
+            if current_token[0] == token.NEWLINE:
+                yield (last_end, current)
+                last_end = current + 1
+
+    def _first_non_blank(self, line_number):
+        current = line_number
+        while current < self.lines.length():
+            line = self.lines.get_line(current).strip()
+            if line and not line.startswith('#'):
+                return current
+            current += 1
+        return current
+
+
+def tokenizer_generator(lines):
+    return LogicalLineFinder(lines).generate_regions()
+
+
+class CachingLogicalLineFinder(object):
+
+    def __init__(self, lines, generate=custom_generator):
+        self.lines = lines
+        self._generate = generate
+
+    _starts = None
+
+    @property
+    def starts(self):
+        if self._starts is None:
+            self._init_logicals()
+        return self._starts
+
+    _ends = None
+
+    @property
+    def ends(self):
+        if self._ends is None:
+            self._init_logicals()
+        return self._ends
+
+    def _init_logicals(self):
+        """Should initialize _starts and _ends attributes"""
+        size = self.lines.length() + 1
+        self._starts = [None] * size
+        self._ends = [None] * size
+        for start, end in self._generate(self.lines):
+            self._starts[start] = True
+            self._ends[end] = True
+
+    def logical_line_in(self, line_number):
+        start = line_number
+        while start > 0 and not self.starts[start]:
+            start -= 1
+        if start == 0:
+            try:
+                start = self.starts.index(True, line_number)
+            except ValueError:
+                return (line_number, line_number)
+        return (start, self.ends.index(True, start))
+
+    def generate_starts(self, start_line=1, end_line=None):
+        if end_line is None:
+            end_line = self.lines.length()
+        for index in range(start_line, end_line):
+            if self.starts[index]:
+                yield index
+
+
+def get_block_start(lines, lineno, maximum_indents=80):
+    """Approximate block start"""
+    pattern = get_block_start_patterns()
+    for i in range(lineno, 0, -1):
+        match = pattern.search(lines.get_line(i))
+        if match is not None and \
+           count_line_indents(lines.get_line(i)) <= maximum_indents:
+            striped = match.string.lstrip()
+            # Maybe we're in a list comprehension or generator expression
+            if i > 1 and striped.startswith('if') or striped.startswith('for'):
+                bracs = 0
+                for j in range(i, min(i + 5, lines.length() + 1)):
+                    for c in lines.get_line(j):
+                        if c == '#':
+                            break
+                        if c in '[(':
+                            bracs += 1
+                        if c in ')]':
+                            bracs -= 1
+                            if bracs < 0:
+                                break
+                    if bracs < 0:
+                        break
+                if bracs < 0:
+                    continue
+            return i
+    return 1
+
+
+_block_start_pattern = None
+
+
+def get_block_start_patterns():
+    global _block_start_pattern
+    if not _block_start_pattern:
+        pattern = '^\\s*(((def|class|if|elif|except|for|while|with)\\s)|'\
+                  '((try|else|finally|except)\\s*:))'
+        _block_start_pattern = re.compile(pattern, re.M)
+    return _block_start_pattern
+
+
+def count_line_indents(line):
+    indents = 0
+    for char in line:
+        if char == ' ':
+            indents += 1
+        elif char == '\t':
+            indents += 8
+        else:
+            return indents
+    return 0
+
+
+def get_string_pattern():
+    start = r'(\b[uU]?[rR]?)?'
+    longstr = r'%s"""(\\.|"(?!"")|\\\n|[^"\\])*"""' % start
+    shortstr = r'%s"(\\.|\\\n|[^"\\])*"' % start
+    return '|'.join([longstr, longstr.replace('"', "'"),
+                     shortstr, shortstr.replace('"', "'")])
+
+
+def get_comment_pattern():
+    return r'#[^\n]*'
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/default_config.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/default_config.py
new file mode 100644
index 0000000..45e1fb4
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/default_config.py
@@ -0,0 +1,103 @@
+# The default ``config.py``
+# flake8: noqa
+
+
+def set_prefs(prefs):
+    """This function is called before opening the project"""
+
+    # Specify which files and folders to ignore in the project.
+    # Changes to ignored resources are not added to the history and
+    # VCSs.  Also they are not returned in `Project.get_files()`.
+    # Note that ``?`` and ``*`` match all characters but slashes.
+    # '*.pyc': matches 'test.pyc' and 'pkg/test.pyc'
+    # 'mod*.pyc': matches 'test/mod1.pyc' but not 'mod/1.pyc'
+    # '.svn': matches 'pkg/.svn' and all of its children
+    # 'build/*.o': matches 'build/lib.o' but not 'build/sub/lib.o'
+    # 'build//*.o': matches 'build/lib.o' and 'build/sub/lib.o'
+    prefs['ignored_resources'] = [
+        '*.pyc', '*~', '.ropeproject', '.hg', '.svn', '_svn',
+        '.git', '.tox', '.env', 'env', 'venv', 'node_modules',
+        'bower_components'
+    ]
+
+    # Specifies which files should be considered python files.  It is
+    # useful when you have scripts inside your project.  Only files
+    # ending with ``.py`` are considered to be python files by
+    # default.
+    #prefs['python_files'] = ['*.py']
+
+    # Custom source folders:  By default rope searches the project
+    # for finding source folders (folders that should be searched
+    # for finding modules).  You can add paths to that list.  Note
+    # that rope guesses project source folders correctly most of the
+    # time; use this if you have any problems.
+    # The folders should be relative to project root and use '/' for
+    # separating folders regardless of the platform rope is running on.
+    # 'src/my_source_folder' for instance.
+    #prefs.add('source_folders', 'src')
+
+    # You can extend python path for looking up modules
+    #prefs.add('python_path', '~/python/')
+
+    # Should rope save object information or not.
+    prefs['save_objectdb'] = True
+    prefs['compress_objectdb'] = False
+
+    # If `True`, rope analyzes each module when it is being saved.
+    prefs['automatic_soa'] = True
+    # The depth of calls to follow in static object analysis
+    prefs['soa_followed_calls'] = 0
+
+    # If `False` when running modules or unit tests "dynamic object
+    # analysis" is turned off.  This makes them much faster.
+    prefs['perform_doa'] = True
+
+    # Rope can check the validity of its object DB when running.
+    prefs['validate_objectdb'] = True
+
+    # How many undos to hold?
+    prefs['max_history_items'] = 32
+
+    # Shows whether to save history across sessions.
+    prefs['save_history'] = True
+    prefs['compress_history'] = False
+
+    # Set the number spaces used for indenting.  According to
+    # :PEP:`8`, it is best to use 4 spaces.  Since most of rope's
+    # unit-tests use 4 spaces it is more reliable, too.
+    prefs['indent_size'] = 4
+
+    # Builtin and c-extension modules that are allowed to be imported
+    # and inspected by rope.
+    prefs['extension_modules'] = []
+
+    # Add all standard c-extensions to extension_modules list.
+    prefs['import_dynload_stdmods'] = True
+
+    # If `True` modules with syntax errors are considered to be empty.
+    # The default value is `False`; When `False` syntax errors raise
+    # `rope.base.exceptions.ModuleSyntaxError` exception.
+    prefs['ignore_syntax_errors'] = False
+
+    # If `True`, rope ignores unresolvable imports.  Otherwise, they
+    # appear in the importing namespace.
+    prefs['ignore_bad_imports'] = False
+
+    # If `True`, rope will insert new module imports as
+    # `from <package> import <module>` by default.
+    prefs['prefer_module_from_imports'] = False
+
+    # If `True`, rope will transform a comma list of imports into
+    # multiple separate import statements when organizing
+    # imports.
+    prefs['split_imports'] = False
+
+    # If `True`, rope will sort imports alphabetically by module name
+    # instead of alphabetically by import statement, with from imports
+    # after normal imports.
+    prefs['sort_imports_alphabetically'] = False
+
+
+def project_opened(project):
+    """This function is called after opening the project"""
+    # Do whatever you like here!
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/evaluate.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/evaluate.py
new file mode 100644
index 0000000..f432392
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/evaluate.py
@@ -0,0 +1,332 @@
+import rope.base.builtins
+import rope.base.pynames
+import rope.base.pyobjects
+from rope.base import ast, astutils, exceptions, pyobjects, arguments, worder
+from rope.base.utils import pycompat
+
+
+BadIdentifierError = exceptions.BadIdentifierError
+
+
+def eval_location(pymodule, offset):
+    """Find the pyname at the offset"""
+    return eval_location2(pymodule, offset)[1]
+
+
+def eval_location2(pymodule, offset):
+    """Find the primary and pyname at offset"""
+    pyname_finder = ScopeNameFinder(pymodule)
+    return pyname_finder.get_primary_and_pyname_at(offset)
+
+
+def eval_node(scope, node):
+    """Evaluate a `ast.AST` node and return a PyName
+
+    Return `None` if the expression cannot be evaluated.
+    """
+    return eval_node2(scope, node)[1]
+
+
+def eval_node2(scope, node):
+    evaluator = StatementEvaluator(scope)
+    ast.walk(node, evaluator)
+    return evaluator.old_result, evaluator.result
+
+
+def eval_str(holding_scope, name):
+    return eval_str2(holding_scope, name)[1]
+
+
+def eval_str2(holding_scope, name):
+    try:
+        # parenthesizing for handling cases like 'a_var.\nattr'
+        node = ast.parse('(%s)' % name)
+    except SyntaxError:
+        raise BadIdentifierError(
+            'Not a resolvable python identifier selected.')
+    return eval_node2(holding_scope, node)
+
+
+class ScopeNameFinder(object):
+
+    def __init__(self, pymodule):
+        self.module_scope = pymodule.get_scope()
+        self.lines = pymodule.lines
+        self.worder = worder.Worder(pymodule.source_code, True)
+
+    def _is_defined_in_class_body(self, holding_scope, offset, lineno):
+        if lineno == holding_scope.get_start() and \
+           holding_scope.parent is not None and \
+           holding_scope.parent.get_kind() == 'Class' and \
+           self.worder.is_a_class_or_function_name_in_header(offset):
+            return True
+        if lineno != holding_scope.get_start() and \
+           holding_scope.get_kind() == 'Class' and \
+           self.worder.is_name_assigned_in_class_body(offset):
+            return True
+        return False
+
+    def _is_function_name_in_function_header(self, scope, offset, lineno):
+        if scope.get_start() <= lineno <= scope.get_body_start() and \
+           scope.get_kind() == 'Function' and \
+           self.worder.is_a_class_or_function_name_in_header(offset):
+            return True
+        return False
+
+    def get_pyname_at(self, offset):
+        return self.get_primary_and_pyname_at(offset)[1]
+
+    def get_primary_and_pyname_at(self, offset):
+        lineno = self.lines.get_line_number(offset)
+        holding_scope = self.module_scope.get_inner_scope_for_line(lineno)
+        # function keyword parameter
+        if self.worder.is_function_keyword_parameter(offset):
+            keyword_name = self.worder.get_word_at(offset)
+            pyobject = self.get_enclosing_function(offset)
+            if isinstance(pyobject, pyobjects.PyFunction):
+                return (None,
+                        pyobject.get_parameters().get(keyword_name, None))
+        # class body
+        if self._is_defined_in_class_body(holding_scope, offset, lineno):
+            class_scope = holding_scope
+            if lineno == holding_scope.get_start():
+                class_scope = holding_scope.parent
+            name = self.worder.get_primary_at(offset).strip()
+            try:
+                return (None, class_scope.pyobject[name])
+            except rope.base.exceptions.AttributeNotFoundError:
+                return (None, None)
+        # function header
+        if self._is_function_name_in_function_header(holding_scope,
+                                                     offset, lineno):
+            name = self.worder.get_primary_at(offset).strip()
+            return (None, holding_scope.parent[name])
+        # from statement module
+        if self.worder.is_from_statement_module(offset):
+            module = self.worder.get_primary_at(offset)
+            module_pyname = self._find_module(module)
+            return (None, module_pyname)
+        if self.worder.is_from_aliased(offset):
+            name = self.worder.get_from_aliased(offset)
+        else:
+            name = self.worder.get_primary_at(offset)
+        return eval_str2(holding_scope, name)
+
+    def get_enclosing_function(self, offset):
+        function_parens = self.worder.find_parens_start_from_inside(offset)
+        try:
+            function_pyname = self.get_pyname_at(function_parens - 1)
+        except BadIdentifierError:
+            function_pyname = None
+        if function_pyname is not None:
+            pyobject = function_pyname.get_object()
+            if isinstance(pyobject, pyobjects.AbstractFunction):
+                return pyobject
+            elif isinstance(pyobject, pyobjects.AbstractClass) and \
+                    '__init__' in pyobject:
+                return pyobject['__init__'].get_object()
+            elif '__call__' in pyobject:
+                return pyobject['__call__'].get_object()
+        return None
+
+    def _find_module(self, module_name):
+        dots = 0
+        while module_name[dots] == '.':
+            dots += 1
+        return rope.base.pynames.ImportedModule(
+            self.module_scope.pyobject, module_name[dots:], dots)
+
+
+class StatementEvaluator(object):
+
+    def __init__(self, scope):
+        self.scope = scope
+        self.result = None
+        self.old_result = None
+
+    def _Name(self, node):
+        self.result = self.scope.lookup(node.id)
+
+    def _Attribute(self, node):
+        pyname = eval_node(self.scope, node.value)
+        if pyname is None:
+            pyname = rope.base.pynames.UnboundName()
+        self.old_result = pyname
+        if pyname.get_object() != rope.base.pyobjects.get_unknown():
+            try:
+                self.result = pyname.get_object()[node.attr]
+            except exceptions.AttributeNotFoundError:
+                self.result = None
+
+    def _Call(self, node):
+        primary, pyobject = self._get_primary_and_object_for_node(node.func)
+        if pyobject is None:
+            return
+
+        def _get_returned(pyobject):
+            args = arguments.create_arguments(primary, pyobject,
+                                              node, self.scope)
+            return pyobject.get_returned_object(args)
+        if isinstance(pyobject, rope.base.pyobjects.AbstractClass):
+            result = None
+            if '__new__' in pyobject:
+                new_function = pyobject['__new__'].get_object()
+                result = _get_returned(new_function)
+            if result is None or \
+               result == rope.base.pyobjects.get_unknown():
+                result = rope.base.pyobjects.PyObject(pyobject)
+            self.result = rope.base.pynames.UnboundName(pyobject=result)
+            return
+
+        pyfunction = None
+        if isinstance(pyobject, rope.base.pyobjects.AbstractFunction):
+            pyfunction = pyobject
+        elif '__call__' in pyobject:
+            pyfunction = pyobject['__call__'].get_object()
+        if pyfunction is not None:
+            self.result = rope.base.pynames.UnboundName(
+                pyobject=_get_returned(pyfunction))
+
+    def _Str(self, node):
+        self.result = rope.base.pynames.UnboundName(
+            pyobject=rope.base.builtins.get_str())
+
+    def _Num(self, node):
+        type_name = type(node.n).__name__
+        self.result = self._get_builtin_name(type_name)
+
+    def _get_builtin_name(self, type_name):
+        pytype = rope.base.builtins.builtins[type_name].get_object()
+        return rope.base.pynames.UnboundName(
+            rope.base.pyobjects.PyObject(pytype))
+
+    def _BinOp(self, node):
+        self.result = rope.base.pynames.UnboundName(
+            self._get_object_for_node(node.left))
+
+    def _BoolOp(self, node):
+        pyobject = self._get_object_for_node(node.values[0])
+        if pyobject is None:
+            pyobject = self._get_object_for_node(node.values[1])
+        self.result = rope.base.pynames.UnboundName(pyobject)
+
+    def _Repr(self, node):
+        self.result = self._get_builtin_name('str')
+
+    def _UnaryOp(self, node):
+        self.result = rope.base.pynames.UnboundName(
+            self._get_object_for_node(node.operand))
+
+    def _Compare(self, node):
+        self.result = self._get_builtin_name('bool')
+
+    def _Dict(self, node):
+        keys = None
+        values = None
+        if node.keys:
+            keys = self._get_object_for_node(node.keys[0])
+            values = self._get_object_for_node(node.values[0])
+        self.result = rope.base.pynames.UnboundName(
+            pyobject=rope.base.builtins.get_dict(keys, values))
+
+    def _List(self, node):
+        holding = None
+        if node.elts:
+            holding = self._get_object_for_node(node.elts[0])
+        self.result = rope.base.pynames.UnboundName(
+            pyobject=rope.base.builtins.get_list(holding))
+
+    def _ListComp(self, node):
+        pyobject = self._what_does_comprehension_hold(node)
+        self.result = rope.base.pynames.UnboundName(
+            pyobject=rope.base.builtins.get_list(pyobject))
+
+    def _GeneratorExp(self, node):
+        pyobject = self._what_does_comprehension_hold(node)
+        self.result = rope.base.pynames.UnboundName(
+            pyobject=rope.base.builtins.get_iterator(pyobject))
+
+    def _what_does_comprehension_hold(self, node):
+        scope = self._make_comprehension_scope(node)
+        pyname = eval_node(scope, node.elt)
+        return pyname.get_object() if pyname is not None else None
+
+    def _make_comprehension_scope(self, node):
+        scope = self.scope
+        module = scope.pyobject.get_module()
+        names = {}
+        for comp in node.generators:
+            new_names = _get_evaluated_names(comp.target, comp.iter, module,
+                                             '.__iter__().next()', node.lineno)
+            names.update(new_names)
+        return rope.base.pyscopes.TemporaryScope(scope.pycore, scope, names)
+
+    def _Tuple(self, node):
+        objects = []
+        if len(node.elts) < 4:
+            for stmt in node.elts:
+                pyobject = self._get_object_for_node(stmt)
+                objects.append(pyobject)
+        else:
+            objects.append(self._get_object_for_node(node.elts[0]))
+        self.result = rope.base.pynames.UnboundName(
+            pyobject=rope.base.builtins.get_tuple(*objects))
+
+    def _get_object_for_node(self, stmt):
+        pyname = eval_node(self.scope, stmt)
+        pyobject = None
+        if pyname is not None:
+            pyobject = pyname.get_object()
+        return pyobject
+
+    def _get_primary_and_object_for_node(self, stmt):
+        primary, pyname = eval_node2(self.scope, stmt)
+        pyobject = None
+        if pyname is not None:
+            pyobject = pyname.get_object()
+        return primary, pyobject
+
+    def _Subscript(self, node):
+        if isinstance(node.slice, ast.Index):
+            self._call_function(node.value, '__getitem__',
+                                [node.slice.value])
+        elif isinstance(node.slice, ast.Slice):
+            self._call_function(node.value, '__getitem__',
+                                [node.slice])
+
+    def _Slice(self, node):
+        self.result = self._get_builtin_name('slice')
+
+    def _call_function(self, node, function_name, other_args=None):
+        pyname = eval_node(self.scope, node)
+        if pyname is not None:
+            pyobject = pyname.get_object()
+        else:
+            return
+        if function_name in pyobject:
+            called = pyobject[function_name].get_object()
+            if not called or \
+                    not isinstance(called, pyobjects.AbstractFunction):
+                return
+            args = [node]
+            if other_args:
+                args += other_args
+            arguments_ = arguments.Arguments(args, self.scope)
+            self.result = rope.base.pynames.UnboundName(
+                pyobject=called.get_returned_object(arguments_))
+
+    def _Lambda(self, node):
+        self.result = rope.base.pynames.UnboundName(
+            pyobject=rope.base.builtins.Lambda(node, self.scope))
+
+
+def _get_evaluated_names(targets, assigned, module, evaluation, lineno):
+    result = {}
+    for name, levels in astutils.get_name_levels(targets):
+        assignment = rope.base.pynames.AssignmentValue(assigned, levels,
+                                                       evaluation)
+        # XXX: this module should not access `rope.base.pynamesdef`!
+        pyname = rope.base.pynamesdef.AssignedName(lineno, module)
+        pyname.assignments.append(assignment)
+        result[name] = pyname
+    return result
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/exceptions.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/exceptions.py
new file mode 100644
index 0000000..d161c89
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/exceptions.py
@@ -0,0 +1,61 @@
+class RopeError(Exception):
+    """Base exception for rope"""
+
+
+class ResourceNotFoundError(RopeError):
+    """Resource not found exception"""
+
+
+class RefactoringError(RopeError):
+    """Errors for performing a refactoring"""
+
+
+class InterruptedTaskError(RopeError):
+    """The task has been interrupted"""
+
+
+class HistoryError(RopeError):
+    """Errors for history undo/redo operations"""
+
+
+class ModuleNotFoundError(RopeError):
+    """Module not found exception"""
+
+
+class AttributeNotFoundError(RopeError):
+    """Attribute not found exception"""
+
+
+class NameNotFoundError(RopeError):
+    """Name not found exception"""
+
+
+class BadIdentifierError(RopeError):
+    """The name cannot be resolved"""
+
+
+class ModuleSyntaxError(RopeError):
+    """Module has syntax errors
+
+    The `filename` and `lineno` fields indicate where the error has
+    occurred.
+
+    """
+
+    def __init__(self, filename, lineno, message):
+        self.filename = filename
+        self.lineno = lineno
+        self.message_ = message
+        super(ModuleSyntaxError, self).__init__(
+            'Syntax error in file <%s> line <%s>: %s' %
+            (filename, lineno, message))
+
+
+class ModuleDecodeError(RopeError):
+    """Cannot decode module"""
+
+    def __init__(self, filename, message):
+        self.filename = filename
+        self.message_ = message
+        super(ModuleDecodeError, self).__init__(
+            'Cannot decode file <%s>: %s' % (filename, message))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/fscommands.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/fscommands.py
new file mode 100644
index 0000000..3564ed9
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/fscommands.py
@@ -0,0 +1,288 @@
+"""Project file system commands.
+
+This modules implements file system operations used by rope.  Different
+version control systems can be supported by implementing the interface
+provided by `FileSystemCommands` class.  See `SubversionCommands` and
+`MercurialCommands` for example.
+
+"""
+import os
+import shutil
+import subprocess
+
+import rope.base.utils.pycompat as pycompat
+
+try:
+    unicode
+except NameError:
+    unicode = str
+
+def create_fscommands(root):
+    dirlist = os.listdir(root)
+    commands = {'.hg': MercurialCommands,
+                '.svn': SubversionCommands,
+                '.git': GITCommands,
+                '_svn': SubversionCommands,
+                '_darcs': DarcsCommands}
+    for key in commands:
+        if key in dirlist:
+            try:
+                return commands[key](root)
+            except (ImportError, OSError):
+                pass
+    return FileSystemCommands()
+
+
+class FileSystemCommands(object):
+
+    def create_file(self, path):
+        open(path, 'w').close()
+
+    def create_folder(self, path):
+        os.mkdir(path)
+
+    def move(self, path, new_location):
+        shutil.move(path, new_location)
+
+    def remove(self, path):
+        if os.path.isfile(path):
+            os.remove(path)
+        else:
+            shutil.rmtree(path)
+
+    def write(self, path, data):
+        file_ = open(path, 'wb')
+        try:
+            file_.write(data)
+        finally:
+            file_.close()
+
+
+class SubversionCommands(object):
+
+    def __init__(self, *args):
+        self.normal_actions = FileSystemCommands()
+        import pysvn
+        self.client = pysvn.Client()
+
+    def create_file(self, path):
+        self.normal_actions.create_file(path)
+        self.client.add(path, force=True)
+
+    def create_folder(self, path):
+        self.normal_actions.create_folder(path)
+        self.client.add(path, force=True)
+
+    def move(self, path, new_location):
+        self.client.move(path, new_location, force=True)
+
+    def remove(self, path):
+        self.client.remove(path, force=True)
+
+    def write(self, path, data):
+        self.normal_actions.write(path, data)
+
+
+class MercurialCommands(object):
+
+    def __init__(self, root):
+        self.hg = self._import_mercurial()
+        self.normal_actions = FileSystemCommands()
+        try:
+            self.ui = self.hg.ui.ui(
+                verbose=False, debug=False, quiet=True,
+                interactive=False, traceback=False, report_untrusted=False)
+        except:
+            self.ui = self.hg.ui.ui()
+            self.ui.setconfig('ui', 'interactive', 'no')
+            self.ui.setconfig('ui', 'debug', 'no')
+            self.ui.setconfig('ui', 'traceback', 'no')
+            self.ui.setconfig('ui', 'verbose', 'no')
+            self.ui.setconfig('ui', 'report_untrusted', 'no')
+            self.ui.setconfig('ui', 'quiet', 'yes')
+
+        self.repo = self.hg.hg.repository(self.ui, root)
+
+    def _import_mercurial(self):
+        import mercurial.commands
+        import mercurial.hg
+        import mercurial.ui
+        return mercurial
+
+    def create_file(self, path):
+        self.normal_actions.create_file(path)
+        self.hg.commands.add(self.ui, self.repo, path)
+
+    def create_folder(self, path):
+        self.normal_actions.create_folder(path)
+
+    def move(self, path, new_location):
+        self.hg.commands.rename(self.ui, self.repo, path,
+                                new_location, after=False)
+
+    def remove(self, path):
+        self.hg.commands.remove(self.ui, self.repo, path)
+
+    def write(self, path, data):
+        self.normal_actions.write(path, data)
+
+
+class GITCommands(object):
+
+    def __init__(self, root):
+        self.root = root
+        self._do(['version'])
+        self.normal_actions = FileSystemCommands()
+
+    def create_file(self, path):
+        self.normal_actions.create_file(path)
+        self._do(['add', self._in_dir(path)])
+
+    def create_folder(self, path):
+        self.normal_actions.create_folder(path)
+
+    def move(self, path, new_location):
+        self._do(['mv', self._in_dir(path), self._in_dir(new_location)])
+
+    def remove(self, path):
+        self._do(['rm', self._in_dir(path)])
+
+    def write(self, path, data):
+        # XXX: should we use ``git add``?
+        self.normal_actions.write(path, data)
+
+    def _do(self, args):
+        _execute(['git'] + args, cwd=self.root)
+
+    def _in_dir(self, path):
+        if path.startswith(self.root):
+            return path[len(self.root) + 1:]
+        return self.root
+
+
+class DarcsCommands(object):
+
+    def __init__(self, root):
+        self.root = root
+        self.normal_actions = FileSystemCommands()
+
+    def create_file(self, path):
+        self.normal_actions.create_file(path)
+        self._do(['add', path])
+
+    def create_folder(self, path):
+        self.normal_actions.create_folder(path)
+        self._do(['add', path])
+
+    def move(self, path, new_location):
+        self._do(['mv', path, new_location])
+
+    def remove(self, path):
+        self.normal_actions.remove(path)
+
+    def write(self, path, data):
+        self.normal_actions.write(path, data)
+
+    def _do(self, args):
+        _execute(['darcs'] + args, cwd=self.root)
+
+
+def _execute(args, cwd=None):
+    process = subprocess.Popen(args, cwd=cwd, stdout=subprocess.PIPE)
+    process.wait()
+    return process.returncode
+
+
+def unicode_to_file_data(contents, encoding=None):
+    if not isinstance(contents, unicode):
+        return contents
+    if encoding is None:
+        encoding = read_str_coding(contents)
+    if encoding is not None:
+        return contents.encode(encoding)
+    try:
+        return contents.encode()
+    except UnicodeEncodeError:
+        return contents.encode('utf-8')
+
+
+def file_data_to_unicode(data, encoding=None):
+    result = _decode_data(data, encoding)
+    if '\r' in result:
+        result = result.replace('\r\n', '\n').replace('\r', '\n')
+    return result
+
+
+def _decode_data(data, encoding):
+    if isinstance(data, unicode):
+        return data
+    if encoding is None:
+        encoding = read_str_coding(data)
+    if encoding is None:
+        # there is no encoding tip, we need to guess.
+        # PEP263 says that "encoding not explicitly defined" means it is ascii,
+        # but we will use utf8 instead since utf8 fully covers ascii and btw is
+        # the only non-latin sane encoding.
+        encoding = 'utf-8'
+    try:
+        return data.decode(encoding)
+    except (UnicodeError, LookupError):
+        # fallback to latin1: it should never fail
+        return data.decode('latin1')
+
+
+def read_file_coding(path):
+    file = open(path, 'b')
+    count = 0
+    result = []
+    while True:
+        current = file.read(10)
+        if not current:
+            break
+        count += current.count('\n')
+        result.append(current)
+    file.close()
+    return _find_coding(''.join(result))
+
+
+def read_str_coding(source):
+    if type(source) == bytes:
+        newline = b'\n'
+    else:
+        newline = '\n'
+    #try:
+    #    source = source.decode("utf-8")
+    #except AttributeError:
+    #    pass
+    try:
+        first = source.index(newline) + 1
+        second = source.index(newline, first) + 1
+    except ValueError:
+        second = len(source)
+    return _find_coding(source[:second])
+
+
+def _find_coding(text):
+    if isinstance(text, pycompat.str):
+        text = text.encode('utf-8')
+    coding = b'coding'
+    to_chr = chr if pycompat.PY3 else lambda x: x
+    try:
+        start = text.index(coding) + len(coding)
+        if text[start] not in b'=:':
+            return
+        start += 1
+        while start < len(text) and to_chr(text[start]).isspace():
+            start += 1
+        end = start
+        while end < len(text):
+            c = text[end]
+            if not to_chr(c).isalnum() and c not in b'-_':
+                break
+            end += 1
+        result = text[start:end]
+        if isinstance(result, bytes):
+            result = result.decode('utf-8')
+        return result
+    except ValueError:
+        pass
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/history.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/history.py
new file mode 100644
index 0000000..d3c523d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/history.py
@@ -0,0 +1,235 @@
+from rope.base import exceptions, change, taskhandle
+
+
+class History(object):
+    """A class that holds project history"""
+
+    def __init__(self, project, maxundos=None):
+        self.project = project
+        self._undo_list = []
+        self._redo_list = []
+        self._maxundos = maxundos
+        self._load_history()
+        self.project.data_files.add_write_hook(self.write)
+        self.current_change = None
+
+    def _load_history(self):
+        if self.save:
+            result = self.project.data_files.read_data(
+                'history', compress=self.compress, import_=True)
+            if result is not None:
+                to_change = change.DataToChange(self.project)
+                for data in result[0]:
+                    self._undo_list.append(to_change(data))
+                for data in result[1]:
+                    self._redo_list.append(to_change(data))
+
+    def do(self, changes, task_handle=taskhandle.NullTaskHandle()):
+        """Perform the change and add it to the `self.undo_list`
+
+        Note that uninteresting changes (changes to ignored files)
+        will not be appended to `self.undo_list`.
+
+        """
+        try:
+            self.current_change = changes
+            changes.do(change.create_job_set(task_handle, changes))
+        finally:
+            self.current_change = None
+        if self._is_change_interesting(changes):
+            self.undo_list.append(changes)
+            self._remove_extra_items()
+        del self.redo_list[:]
+
+    def _remove_extra_items(self):
+        if len(self.undo_list) > self.max_undos:
+            del self.undo_list[0:len(self.undo_list) - self.max_undos]
+
+    def _is_change_interesting(self, changes):
+        for resource in changes.get_changed_resources():
+            if not self.project.is_ignored(resource):
+                return True
+        return False
+
+    def undo(self, change=None, drop=False,
+             task_handle=taskhandle.NullTaskHandle()):
+        """Redo done changes from the history
+
+        When `change` is `None`, the last done change will be undone.
+        If change is not `None` it should be an item from
+        `self.undo_list`; this change and all changes that depend on
+        it will be undone.  In both cases the list of undone changes
+        will be returned.
+
+        If `drop` is `True`, the undone change will not be appended to
+        the redo list.
+
+        """
+        if not self._undo_list:
+            raise exceptions.HistoryError('Undo list is empty')
+        if change is None:
+            change = self.undo_list[-1]
+        dependencies = self._find_dependencies(self.undo_list, change)
+        self._move_front(self.undo_list, dependencies)
+        self._perform_undos(len(dependencies), task_handle)
+        result = self.redo_list[-len(dependencies):]
+        if drop:
+            del self.redo_list[-len(dependencies):]
+        return result
+
+    def redo(self, change=None, task_handle=taskhandle.NullTaskHandle()):
+        """Redo undone changes from the history
+
+        When `change` is `None`, the last undone change will be
+        redone.  If change is not `None` it should be an item from
+        `self.redo_list`; this change and all changes that depend on
+        it will be redone.  In both cases the list of redone changes
+        will be returned.
+
+        """
+        if not self.redo_list:
+            raise exceptions.HistoryError('Redo list is empty')
+        if change is None:
+            change = self.redo_list[-1]
+        dependencies = self._find_dependencies(self.redo_list, change)
+        self._move_front(self.redo_list, dependencies)
+        self._perform_redos(len(dependencies), task_handle)
+        return self.undo_list[-len(dependencies):]
+
+    def _move_front(self, change_list, changes):
+        for change in changes:
+            change_list.remove(change)
+            change_list.append(change)
+
+    def _find_dependencies(self, change_list, change):
+        index = change_list.index(change)
+        return _FindChangeDependencies(change_list[index:])()
+
+    def _perform_undos(self, count, task_handle):
+        for i in range(count):
+            self.current_change = self.undo_list[-1]
+            try:
+                job_set = change.create_job_set(task_handle,
+                                                self.current_change)
+                self.current_change.undo(job_set)
+            finally:
+                self.current_change = None
+            self.redo_list.append(self.undo_list.pop())
+
+    def _perform_redos(self, count, task_handle):
+        for i in range(count):
+            self.current_change = self.redo_list[-1]
+            try:
+                job_set = change.create_job_set(task_handle,
+                                                self.current_change)
+                self.current_change.do(job_set)
+            finally:
+                self.current_change = None
+            self.undo_list.append(self.redo_list.pop())
+
+    def contents_before_current_change(self, file):
+        if self.current_change is None:
+            return None
+        result = self._search_for_change_contents([self.current_change], file)
+        if result is not None:
+            return result
+        if file.exists() and not file.is_folder():
+            return file.read()
+        else:
+            return None
+
+    def _search_for_change_contents(self, change_list, file):
+        for change_ in reversed(change_list):
+            if isinstance(change_, change.ChangeSet):
+                result = self._search_for_change_contents(change_.changes,
+                                                          file)
+                if result is not None:
+                    return result
+            if isinstance(change_, change.ChangeContents) and \
+               change_.resource == file:
+                return change_.old_contents
+
+    def write(self):
+        if self.save:
+            data = []
+            to_data = change.ChangeToData()
+            self._remove_extra_items()
+            data.append([to_data(change_) for change_ in self.undo_list])
+            data.append([to_data(change_) for change_ in self.redo_list])
+            self.project.data_files.write_data('history', data,
+                                               compress=self.compress)
+
+    def get_file_undo_list(self, resource):
+        result = []
+        for change in self.undo_list:
+            if resource in change.get_changed_resources():
+                result.append(change)
+        return result
+
+    def __str__(self):
+        return 'History holds %s changes in memory' % \
+               (len(self.undo_list) + len(self.redo_list))
+
+    undo_list = property(lambda self: self._undo_list)
+    redo_list = property(lambda self: self._redo_list)
+
+    @property
+    def tobe_undone(self):
+        """The last done change if available, `None` otherwise"""
+        if self.undo_list:
+            return self.undo_list[-1]
+
+    @property
+    def tobe_redone(self):
+        """The last undone change if available, `None` otherwise"""
+        if self.redo_list:
+            return self.redo_list[-1]
+
+    @property
+    def max_undos(self):
+        if self._maxundos is None:
+            return self.project.prefs.get('max_history_items', 100)
+        else:
+            return self._maxundos
+
+    @property
+    def save(self):
+        return self.project.prefs.get('save_history', False)
+
+    @property
+    def compress(self):
+        return self.project.prefs.get('compress_history', False)
+
+    def clear(self):
+        """Forget all undo and redo information"""
+        del self.undo_list[:]
+        del self.redo_list[:]
+
+
+class _FindChangeDependencies(object):
+
+    def __init__(self, change_list):
+        self.change = change_list[0]
+        self.change_list = change_list
+        self.changed_resources = set(self.change.get_changed_resources())
+
+    def __call__(self):
+        result = [self.change]
+        for change in self.change_list[1:]:
+            if self._depends_on(change, result):
+                result.append(change)
+                self.changed_resources.update(change.get_changed_resources())
+        return result
+
+    def _depends_on(self, changes, result):
+        for resource in changes.get_changed_resources():
+            if resource is None:
+                continue
+            if resource in self.changed_resources:
+                return True
+            for changed in self.changed_resources:
+                if resource.is_folder() and resource.contains(changed):
+                    return True
+                if changed.is_folder() and changed.contains(resource):
+                    return True
+        return False
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/libutils.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/libutils.py
new file mode 100644
index 0000000..4037f18
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/libutils.py
@@ -0,0 +1,122 @@
+"""A few useful functions for using rope as a library"""
+import os.path
+
+import rope.base.project
+import rope.base.pycore
+from rope.base import pyobjectsdef
+from rope.base import utils
+from rope.base import taskhandle
+
+
+def path_to_resource(project, path, type=None):
+    """Get the resource at path
+
+    You only need to specify `type` if `path` does not exist.  It can
+    be either 'file' or 'folder'.  If the type is `None` it is assumed
+    that the resource already exists.
+
+    Note that this function uses `Project.get_resource()`,
+    `Project.get_file()`, and `Project.get_folder()` methods.
+
+    """
+    project_path = path_relative_to_project_root(project, path)
+    if project_path is None:
+        project_path = rope.base.project._realpath(path)
+        project = rope.base.project.get_no_project()
+    if type is None:
+        return project.get_resource(project_path)
+    if type == 'file':
+        return project.get_file(project_path)
+    if type == 'folder':
+        return project.get_folder(project_path)
+    return None
+
+
+def path_relative_to_project_root(project, path):
+    return relative(project.address, path)
+
+@utils.deprecated()
+def relative(root, path):
+    root = rope.base.project._realpath(root).replace(os.path.sep, '/')
+    path = rope.base.project._realpath(path).replace(os.path.sep, '/')
+    if path == root:
+        return ''
+    if path.startswith(root + '/'):
+        return path[len(root) + 1:]
+
+
+def report_change(project, path, old_content):
+    """Report that the contents of file at `path` was changed
+
+    The new contents of file is retrieved by reading the file.
+
+    """
+    resource = path_to_resource(project, path)
+    if resource is None:
+        return
+    for observer in list(project.observers):
+        observer.resource_changed(resource)
+    if project.pycore.automatic_soa:
+        rope.base.pycore.perform_soa_on_changed_scopes(project, resource,
+                                                       old_content)
+
+
+def analyze_module(project, resource):
+    """Perform static object analysis on a python file in the project
+
+    Note that this might be really time consuming.
+    """
+    project.pycore.analyze_module(resource)
+
+
+def analyze_modules(project, task_handle=taskhandle.NullTaskHandle()):
+    """Perform static object analysis on all python files in the project
+
+    Note that this might be really time consuming.
+    """
+    resources = project.get_python_files()
+    job_set = task_handle.create_jobset('Analyzing Modules', len(resources))
+    for resource in resources:
+        job_set.started_job(resource.path)
+        analyze_module(project, resource)
+        job_set.finished_job()
+
+
+def get_string_module(project, code, resource=None, force_errors=False):
+    """Returns a `PyObject` object for the given code
+
+    If `force_errors` is `True`, `exceptions.ModuleSyntaxError` is
+    raised if module has syntax errors.  This overrides
+    ``ignore_syntax_errors`` project config.
+
+    """
+    return pyobjectsdef.PyModule(project.pycore, code, resource,
+                                 force_errors=force_errors)
+
+
+def get_string_scope(project, code, resource=None):
+    """Returns a `Scope` object for the given code"""
+    return get_string_module(project, code, resource).get_scope()
+
+
+def is_python_file(project, resource):
+    return project.pycore.is_python_file(resource)
+
+
+def modname(resource):
+    if resource.is_folder():
+        module_name = resource.name
+        source_folder = resource.parent
+    elif resource.name == '__init__.py':
+        module_name = resource.parent.name
+        source_folder = resource.parent.parent
+    else:
+        module_name = resource.name[:-3]
+        source_folder = resource.parent
+
+    while source_folder != source_folder.parent and \
+            source_folder.has_child('__init__.py'):
+        module_name = source_folder.name + '.' + module_name
+        source_folder = source_folder.parent
+
+    return module_name
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__init__.py
new file mode 100644
index 0000000..0b1a152
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__init__.py
@@ -0,0 +1,38 @@
+"""Rope object analysis and inference package
+
+Rope makes some simplifying assumptions about a python program.  It
+assumes that a program only performs assignments and function calls.
+Tracking assignments is simple and `PyName` objects handle that.  The
+main problem is function calls.  Rope uses these two approaches for
+obtaining call information:
+
+* Static object analysis: `rope.base.pycore.PyCore.analyze_module()`
+
+  It can analyze modules to obtain information about functions.  This
+  is done by analyzing function calls in a module or scope.  Currently
+  SOA analyzes the scopes that are changed while saving or when the
+  user asks to analyze a module.  That is mainly because static
+  analysis is time-consuming.
+
+* Dynamic object analysis: `rope.base.pycore.PyCore.run_module()`
+
+  When you run a module or your testsuite, when DOA is enabled, it
+  collects information about parameters passed to and objects returned
+  from functions.  The main problem with this approach is that it is
+  quite slow; Not when looking up the information but when collecting
+  them.
+
+An instance of `rope.base.oi.objectinfo.ObjectInfoManager` can be used
+for accessing these information.  It saves the data in a
+`rope.base.oi.objectdb.ObjectDB` internally.
+
+Now if our objectdb does not know anything about a function and we
+need the value returned by it, static object inference, SOI, comes
+into play.  It analyzes function body and tries to infer the object
+that is returned from it (we usually need the returned value for the
+given parameter objects).
+
+Rope might collect and store information for other `PyName`\s, too.
+For instance rope stores the object builtin containers hold.
+
+"""
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..588d491
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/doa.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/doa.cpython-35.pyc
new file mode 100644
index 0000000..6d510c1
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/doa.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/docstrings.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/docstrings.cpython-35.pyc
new file mode 100644
index 0000000..d649dea
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/docstrings.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/memorydb.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/memorydb.cpython-35.pyc
new file mode 100644
index 0000000..1f3426c
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/memorydb.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/objectdb.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/objectdb.cpython-35.pyc
new file mode 100644
index 0000000..1c3235a
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/objectdb.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/objectinfo.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/objectinfo.cpython-35.pyc
new file mode 100644
index 0000000..7bfa27f
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/objectinfo.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/soa.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/soa.cpython-35.pyc
new file mode 100644
index 0000000..db456c3
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/soa.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/soi.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/soi.cpython-35.pyc
new file mode 100644
index 0000000..0f9c1ec
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/soi.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/transform.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/transform.cpython-35.pyc
new file mode 100644
index 0000000..7a47f87
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/__pycache__/transform.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/doa.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/doa.py
new file mode 100644
index 0000000..3f314c6
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/doa.py
@@ -0,0 +1,166 @@
+try:
+    import pickle
+except ImportError:
+    import cPickle as pickle
+import marshal
+import os
+import socket
+import subprocess
+import sys
+import tempfile
+import threading
+
+
+class PythonFileRunner(object):
+    """A class for running python project files"""
+
+    def __init__(self, pycore, file_, args=None, stdin=None,
+                 stdout=None, analyze_data=None):
+        self.pycore = pycore
+        self.file = file_
+        self.analyze_data = analyze_data
+        self.observers = []
+        self.args = args
+        self.stdin = stdin
+        self.stdout = stdout
+
+    def run(self):
+        """Execute the process"""
+        env = dict(os.environ)
+        file_path = self.file.real_path
+        path_folders = self.pycore.project.get_source_folders() + \
+            self.pycore.project.get_python_path_folders()
+        env['PYTHONPATH'] = os.pathsep.join(folder.real_path
+                                            for folder in path_folders)
+        runmod_path = self.pycore.project.find_module('rope.base.oi.runmod').real_path
+        self.receiver = None
+        self._init_data_receiving()
+        send_info = '-'
+        if self.receiver:
+            send_info = self.receiver.get_send_info()
+        args = [sys.executable, runmod_path, send_info,
+                self.pycore.project.address, self.file.real_path]
+        if self.analyze_data is None:
+            del args[1:4]
+        if self.args is not None:
+            args.extend(self.args)
+        self.process = subprocess.Popen(
+            executable=sys.executable, args=args, env=env,
+            cwd=os.path.split(file_path)[0], stdin=self.stdin,
+            stdout=self.stdout, stderr=self.stdout, close_fds=os.name != 'nt')
+
+    def _init_data_receiving(self):
+        if self.analyze_data is None:
+            return
+        # Disabling FIFO data transfer due to blocking when running
+        # unittests in the GUI.
+        # XXX: Handle FIFO data transfer for `rope.ui.testview`
+        if True or os.name == 'nt':
+            self.receiver = _SocketReceiver()
+        else:
+            self.receiver = _FIFOReceiver()
+        self.receiving_thread = threading.Thread(
+            target=self._receive_information)
+        self.receiving_thread.setDaemon(True)
+        self.receiving_thread.start()
+
+    def _receive_information(self):
+        #temp = open('/dev/shm/info', 'wb')
+        for data in self.receiver.receive_data():
+            self.analyze_data(data)
+            #temp.write(str(data) + '\n')
+        #temp.close()
+        for observer in self.observers:
+            observer()
+
+    def wait_process(self):
+        """Wait for the process to finish"""
+        self.process.wait()
+        if self.analyze_data:
+            self.receiving_thread.join()
+
+    def kill_process(self):
+        """Stop the process"""
+        if self.process.poll() is not None:
+            return
+        try:
+            if hasattr(self.process, 'terminate'):
+                self.process.terminate()
+            elif os.name != 'nt':
+                os.kill(self.process.pid, 9)
+            else:
+                import ctypes
+                handle = int(self.process._handle)
+                ctypes.windll.kernel32.TerminateProcess(handle, -1)
+        except OSError:
+            pass
+
+    def add_finishing_observer(self, observer):
+        """Notify this observer when execution finishes"""
+        self.observers.append(observer)
+
+
+class _MessageReceiver(object):
+
+    def receive_data(self):
+        pass
+
+    def get_send_info(self):
+        pass
+
+
+class _SocketReceiver(_MessageReceiver):
+
+    def __init__(self):
+        self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.data_port = 3037
+        while self.data_port < 4000:
+            try:
+                self.server_socket.bind(('', self.data_port))
+                break
+            except socket.error:
+                self.data_port += 1
+        self.server_socket.listen(1)
+
+    def get_send_info(self):
+        return str(self.data_port)
+
+    def receive_data(self):
+        conn, addr = self.server_socket.accept()
+        self.server_socket.close()
+        my_file = conn.makefile('rb')
+        while True:
+            try:
+                yield pickle.load(my_file)
+            except EOFError:
+                break
+        my_file.close()
+        conn.close()
+
+
+class _FIFOReceiver(_MessageReceiver):
+
+    def __init__(self):
+        # XXX: this is insecure and might cause race conditions
+        self.file_name = self._get_file_name()
+        os.mkfifo(self.file_name)
+
+    def _get_file_name(self):
+        prefix = tempfile.gettempdir() + '/__rope_'
+        i = 0
+        while os.path.exists(prefix + str(i).rjust(4, '0')):
+            i += 1
+        return prefix + str(i).rjust(4, '0')
+
+    def get_send_info(self):
+        return self.file_name
+
+    def receive_data(self):
+        my_file = open(self.file_name, 'rb')
+        while True:
+            try:
+                yield marshal.load(my_file)
+            except EOFError:
+                break
+        my_file.close()
+        os.remove(self.file_name)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/docstrings.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/docstrings.py
new file mode 100644
index 0000000..4519e12
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/docstrings.py
@@ -0,0 +1,226 @@
+"""
+Hinting the type using docstring of class/function.
+
+It's an irreplaceable thing if you are using Dependency Injection with passive class:
+http://www.martinfowler.com/articles/injection.html
+
+Some code extracted (or based on code) from:
+https://github.com/davidhalter/jedi/blob/b489019f5bd5750051122b94cc767df47751ecb7/jedi/evaluate/docstrings.py
+Thanks to @davidhalter for this utils under MIT License.
+
+Similar solutions:
+
+    - https://www.jetbrains.com/pycharm/help/type-hinting-in-pycharm.html
+    - https://www.python.org/dev/peps/pep-0484/#type-comments
+    - http://www.pydev.org/manual_adv_type_hints.html
+    - https://jedi.readthedocs.org/en/latest/docs/features.html#type-hinting
+
+Discussions:
+
+    - https://groups.google.com/d/topic/rope-dev/JlAzmZ83K1M/discussion
+    - https://groups.google.com/d/topic/rope-dev/LCFNN98vckI/discussion
+
+"""
+import re
+from ast import literal_eval
+
+from rope.base.exceptions import AttributeNotFoundError
+from rope.base.evaluate import ScopeNameFinder
+from rope.base.pyobjects import PyClass, PyFunction
+
+PEP0484_PATTERNS = [
+    re.compile(r'type:\s*([^\n, ]+)'),
+]
+
+DOCSTRING_PARAM_PATTERNS = [
+    r'\s*:type\s+%s:\s*([^\n, ]+)',  # Sphinx
+    r'\s*:param\s+(\w+)\s+%s:[^\n]+',  # Sphinx param with type
+    r'\s*@type\s+%s:\s*([^\n, ]+)',  # Epydoc
+]
+
+DOCSTRING_RETURN_PATTERNS = [
+    re.compile(r'\s*:rtype:\s*([^\n, ]+)', re.M),  # Sphinx
+    re.compile(r'\s*@rtype:\s*([^\n, ]+)', re.M),  # Epydoc
+]
+
+REST_ROLE_PATTERN = re.compile(r':[^`]+:`([^`]+)`')
+
+try:
+    from numpydoc.docscrape import NumpyDocString
+except ImportError:
+    def _search_param_in_numpydocstr(docstr, param_str):
+        return []
+else:
+    def _search_param_in_numpydocstr(docstr, param_str):
+        """Search `docstr` (in numpydoc format) for type(-s) of `param_str`."""
+        params = NumpyDocString(docstr)._parsed_data['Parameters']
+        for p_name, p_type, p_descr in params:
+            if p_name == param_str:
+                m = re.match('([^,]+(,[^,]+)*?)(,[ ]*optional)?$', p_type)
+                if m:
+                    p_type = m.group(1)
+
+                if p_type.startswith('{'):
+                    types = set(type(x).__name__ for x in literal_eval(p_type))
+                    return list(types)
+                else:
+                    return [p_type]
+        return []
+
+
+def hint_pep0484(pyname):
+    from rope.base.oi.soi import _get_lineno_for_node
+    lineno = _get_lineno_for_node(pyname.assignments[0].ast_node)
+    holding_scope = pyname.module.get_scope().get_inner_scope_for_line(lineno)
+    line = holding_scope._get_global_scope()._scope_finder.lines.get_line(lineno)
+    if '#' in line:
+        type_strs = _search_type_in_pep0484(line.split('#', 1)[1])
+        if type_strs:
+            return _resolve_type(type_strs[0], holding_scope.pyobject)
+
+
+def _search_type_in_pep0484(code):
+    """ For more info see:
+    https://www.python.org/dev/peps/pep-0484/#type-comments
+
+    >>> _search_type_in_pep0484('type: int')
+    ['int']
+    """
+    for p in PEP0484_PATTERNS:
+        match = p.search(code)
+        if match:
+            return [match.group(1)]
+
+
+def hint_param(pyfunc, param_name):
+    type_strs = None
+    func = pyfunc
+    while not type_strs and func:
+        if func.get_doc():
+            type_strs = _search_param_in_docstr(func.get_doc(), param_name)
+        func = _get_superfunc(func)
+
+    if type_strs:
+        return _resolve_type(type_strs[0], pyfunc)
+
+
+def _get_superfunc(pyfunc):
+
+    if not isinstance(pyfunc.parent, PyClass):
+        return
+
+    for cls in _get_mro(pyfunc.parent)[1:]:
+        try:
+            superfunc = cls.get_attribute(pyfunc.get_name()).get_object()
+        except AttributeNotFoundError:
+            pass
+        else:
+            if isinstance(superfunc, PyFunction):
+                return superfunc
+
+
+def _get_mro(pyclass):
+    # FIXME: to use real mro() result
+    l = [pyclass]
+    for cls in l:
+        for super_cls in cls.get_superclasses():
+            if isinstance(super_cls, PyClass) and super_cls not in l:
+                l.append(super_cls)
+    return l
+
+
+def _resolve_type(type_name, pyobj):
+    type_ = None
+    if '.' not in type_name:
+        try:
+            type_ = pyobj.get_module().get_scope().get_name(type_name).get_object()
+        except Exception:
+            pass
+    else:
+        mod_name, attr_name = type_name.rsplit('.', 1)
+        try:
+            mod_finder = ScopeNameFinder(pyobj.get_module())
+            mod = mod_finder._find_module(mod_name).get_object()
+            type_ = mod.get_attribute(attr_name).get_object()
+        except Exception:
+            pass
+    return type_
+
+
+def _search_param_in_docstr(docstr, param_str):
+    """
+    Search `docstr` for type(-s) of `param_str`.
+
+    >>> _search_param_in_docstr(':type param: int', 'param')
+    ['int']
+    >>> _search_param_in_docstr('@type param: int', 'param')
+    ['int']
+    >>> _search_param_in_docstr(
+    ...   ':type param: :class:`threading.Thread`', 'param')
+    ['threading.Thread']
+    >>> bool(_search_param_in_docstr('no document', 'param'))
+    False
+    >>> _search_param_in_docstr(':param int param: some description', 'param')
+    ['int']
+
+    """
+    patterns = [re.compile(p % re.escape(param_str))
+                for p in DOCSTRING_PARAM_PATTERNS]
+    for pattern in patterns:
+        match = pattern.search(docstr)
+        if match:
+            return [_strip_rst_role(match.group(1))]
+
+    return (_search_param_in_numpydocstr(docstr, param_str) or
+            [])
+
+
+def _strip_rst_role(type_str):
+    """
+    Strip off the part looks like a ReST role in `type_str`.
+
+    >>> _strip_rst_role(':class:`ClassName`')  # strip off :class:
+    'ClassName'
+    >>> _strip_rst_role(':py:obj:`module.Object`')  # works with domain
+    'module.Object'
+    >>> _strip_rst_role('ClassName')  # do nothing when not ReST role
+    'ClassName'
+
+    See also:
+    http://sphinx-doc.org/domains.html#cross-referencing-python-objects
+
+    """
+    match = REST_ROLE_PATTERN.match(type_str)
+    if match:
+        return match.group(1)
+    else:
+        return type_str
+
+
+def hint_return(pyfunc):
+    type_str = None
+    func = pyfunc
+    while not type_str and func:
+        if func.get_doc():
+            type_str = _search_return_in_docstr(func.get_doc())
+        func = _get_superfunc(func)
+    if type_str:
+        return _resolve_type(type_str, pyfunc)
+
+
+def _search_return_in_docstr(code):
+    for p in DOCSTRING_RETURN_PATTERNS:
+        match = p.search(code)
+        if match:
+            return _strip_rst_role(match.group(1))
+
+
+def hint_attr(pyclass, attr_name):
+    type_strs = None
+    for cls in _get_mro(pyclass):
+        if cls.get_doc():
+            type_strs = _search_param_in_docstr(cls.get_doc(), attr_name)
+            if type_strs:
+                break
+    if type_strs:
+        return _resolve_type(type_strs[0], pyclass)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/memorydb.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/memorydb.py
new file mode 100644
index 0000000..01c814c
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/memorydb.py
@@ -0,0 +1,127 @@
+from rope.base.oi import objectdb
+
+
+class MemoryDB(objectdb.FileDict):
+
+    def __init__(self, project, persist=None):
+        self.project = project
+        self._persist = persist
+        self.files = self
+        self._load_files()
+        self.project.data_files.add_write_hook(self.write)
+
+    def _load_files(self):
+        self._files = {}
+        if self.persist:
+            result = self.project.data_files.read_data(
+                'objectdb', compress=self.compress, import_=True)
+            if result is not None:
+                self._files = result
+
+    def keys(self):
+        return self._files.keys()
+
+    def __iter__(self):
+        for f in self._files:
+            yield f
+
+    def __len__(self):
+        return len(self._files)
+
+    def __setitem__(self):
+        raise NotImplementedError()
+
+    def __contains__(self, key):
+        return key in self._files
+
+    def __getitem__(self, key):
+        return FileInfo(self._files[key])
+
+    def create(self, path):
+        self._files[path] = {}
+
+    def rename(self, file, newfile):
+        if file not in self._files:
+            return
+        self._files[newfile] = self._files[file]
+        del self[file]
+
+    def __delitem__(self, file):
+        del self._files[file]
+
+    def write(self):
+        if self.persist:
+            self.project.data_files.write_data('objectdb', self._files,
+                                               self.compress)
+
+    @property
+    def compress(self):
+        return self.project.prefs.get('compress_objectdb', False)
+
+    @property
+    def persist(self):
+        if self._persist is not None:
+            return self._persist
+        else:
+            return self.project.prefs.get('save_objectdb', False)
+
+
+class FileInfo(objectdb.FileInfo):
+
+    def __init__(self, scopes):
+        self.scopes = scopes
+
+    def create_scope(self, key):
+        self.scopes[key] = ScopeInfo()
+
+    def keys(self):
+        return self.scopes.keys()
+
+    def __contains__(self, key):
+        return key in self.scopes
+
+    def __getitem__(self, key):
+        return self.scopes[key]
+
+    def __delitem__(self, key):
+        del self.scopes[key]
+
+    def __iter__(self):
+        for s in self.scopes:
+            yield s
+
+    def __len__(self):
+        return len(self.scopes)
+
+    def __setitem__(self):
+        raise NotImplementedError()
+
+
+
+class ScopeInfo(objectdb.ScopeInfo):
+
+    def __init__(self):
+        self.call_info = {}
+        self.per_name = {}
+
+    def get_per_name(self, name):
+        return self.per_name.get(name, None)
+
+    def save_per_name(self, name, value):
+        self.per_name[name] = value
+
+    def get_returned(self, parameters):
+        return self.call_info.get(parameters, None)
+
+    def get_call_infos(self):
+        for args, returned in self.call_info.items():
+            yield objectdb.CallInfo(args, returned)
+
+    def add_call(self, parameters, returned):
+        self.call_info[parameters] = returned
+
+    def __getstate__(self):
+        return (self.call_info, self.per_name)
+
+    def __setstate__(self, data):
+        self.call_info, self.per_name = data
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/objectdb.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/objectdb.py
new file mode 100644
index 0000000..61f2711
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/objectdb.py
@@ -0,0 +1,179 @@
+from __future__ import print_function
+try:
+    from collections import MutableMapping
+except ImportError:
+    from UserDict import DictMixin as MutableMapping
+
+
+class ObjectDB(object):
+
+    def __init__(self, db, validation):
+        self.db = db
+        self.validation = validation
+        self.observers = []
+        self.files = db.files
+
+    def validate_files(self):
+        for file in list(self.files):
+            if not self.validation.is_file_valid(file):
+                del self.files[file]
+                self._file_removed(file)
+
+    def validate_file(self, file):
+        if file not in self.files:
+            return
+        for key in list(self.files[file]):
+            if not self.validation.is_scope_valid(file, key):
+                del self.files[file][key]
+
+    def file_moved(self, file, newfile):
+        if file not in self.files:
+            return
+        self.files.rename(file, newfile)
+        self._file_removed(file)
+        self._file_added(newfile)
+
+    def get_files(self):
+        return self.files.keys()
+
+    def get_returned(self, path, key, args):
+        scope_info = self._get_scope_info(path, key, readonly=True)
+        result = scope_info.get_returned(args)
+        if self.validation.is_value_valid(result):
+            return result
+
+    def get_pername(self, path, key, name):
+        scope_info = self._get_scope_info(path, key, readonly=True)
+        result = scope_info.get_per_name(name)
+        if self.validation.is_value_valid(result):
+            return result
+
+    def get_callinfos(self, path, key):
+        scope_info = self._get_scope_info(path, key, readonly=True)
+        return scope_info.get_call_infos()
+
+    def add_callinfo(self, path, key, args, returned):
+        scope_info = self._get_scope_info(path, key, readonly=False)
+        old_returned = scope_info.get_returned(args)
+        if self.validation.is_more_valid(returned, old_returned):
+            scope_info.add_call(args, returned)
+
+    def add_pername(self, path, key, name, value):
+        scope_info = self._get_scope_info(path, key, readonly=False)
+        old_value = scope_info.get_per_name(name)
+        if self.validation.is_more_valid(value, old_value):
+            scope_info.save_per_name(name, value)
+
+    def add_file_list_observer(self, observer):
+        self.observers.append(observer)
+
+    def write(self):
+        self.db.write()
+
+    def _get_scope_info(self, path, key, readonly=True):
+        if path not in self.files:
+            if readonly:
+                return _NullScopeInfo()
+            self.files.create(path)
+            self._file_added(path)
+        if key not in self.files[path]:
+            if readonly:
+                return _NullScopeInfo()
+            self.files[path].create_scope(key)
+        result = self.files[path][key]
+        if isinstance(result, dict):
+            print(self.files, self.files[path], self.files[path][key])
+        return result
+
+    def _file_removed(self, path):
+        for observer in self.observers:
+            observer.removed(path)
+
+    def _file_added(self, path):
+        for observer in self.observers:
+            observer.added(path)
+
+    def __str__(self):
+        scope_count = 0
+        for file_dict in self.files.values():
+            scope_count += len(file_dict)
+        return 'ObjectDB holds %s file and %s scope infos' % \
+               (len(self.files), scope_count)
+
+
+class _NullScopeInfo(object):
+
+    def __init__(self, error_on_write=True):
+        self.error_on_write = error_on_write
+
+    def get_per_name(self, name):
+        pass
+
+    def save_per_name(self, name, value):
+        if self.error_on_write:
+            raise NotImplementedError()
+
+    def get_returned(self, parameters):
+        pass
+
+    def get_call_infos(self):
+        return []
+
+    def add_call(self, parameters, returned):
+        if self.error_on_write:
+            raise NotImplementedError()
+
+
+class FileInfo(MutableMapping):
+
+    def create_scope(self, key):
+        pass
+
+
+class FileDict(MutableMapping):
+
+    def create(self, key):
+        pass
+
+    def rename(self, key, new_key):
+        pass
+
+
+class ScopeInfo(object):
+
+    def get_per_name(self, name):
+        pass
+
+    def save_per_name(self, name, value):
+        pass
+
+    def get_returned(self, parameters):
+        pass
+
+    def get_call_infos(self):
+        pass
+
+    def add_call(self, parameters, returned):
+        pass
+
+
+class CallInfo(object):
+
+    def __init__(self, args, returned):
+        self.args = args
+        self.returned = returned
+
+    def get_parameters(self):
+        return self.args
+
+    def get_returned(self):
+        return self.returned
+
+
+class FileListObserver(object):
+
+    def added(self, path):
+        pass
+
+    def removed(self, path):
+        pass
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/objectinfo.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/objectinfo.py
new file mode 100644
index 0000000..f86d72e
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/objectinfo.py
@@ -0,0 +1,232 @@
+import warnings
+
+from rope.base import exceptions, resourceobserver
+from rope.base.oi import objectdb, memorydb, transform
+
+
+class ObjectInfoManager(object):
+    """Stores object information
+
+    It uses an instance of `objectdb.ObjectDB` for storing
+    information.
+
+    """
+
+    def __init__(self, project):
+        self.project = project
+        self.to_textual = transform.PyObjectToTextual(project)
+        self.to_pyobject = transform.TextualToPyObject(project)
+        self.doi_to_pyobject = transform.DOITextualToPyObject(project)
+        self._init_objectdb()
+        if project.prefs.get('validate_objectdb', False):
+            self._init_validation()
+
+    def _init_objectdb(self):
+        dbtype = self.project.get_prefs().get('objectdb_type', None)
+        persist = None
+        if dbtype is not None:
+            warnings.warn(
+                '"objectdb_type" project config is deprecated;\n'
+                'Use "save_objectdb" instead in your project '
+                'config file.\n(".ropeproject/config.py" by default)\n',
+                DeprecationWarning)
+            if dbtype != 'memory' and self.project.ropefolder is not None:
+                persist = True
+        self.validation = TextualValidation(self.to_pyobject)
+        db = memorydb.MemoryDB(self.project, persist=persist)
+        self.objectdb = objectdb.ObjectDB(db, self.validation)
+
+    def _init_validation(self):
+        self.objectdb.validate_files()
+        observer = resourceobserver.ResourceObserver(
+            changed=self._resource_changed, moved=self._resource_moved,
+            removed=self._resource_moved)
+        files = []
+        for path in self.objectdb.get_files():
+            resource = self.to_pyobject.path_to_resource(path)
+            if resource is not None and resource.project == self.project:
+                files.append(resource)
+        self.observer = resourceobserver.FilteredResourceObserver(observer,
+                                                                  files)
+        self.objectdb.add_file_list_observer(_FileListObserver(self))
+        self.project.add_observer(self.observer)
+
+    def _resource_changed(self, resource):
+        try:
+            self.objectdb.validate_file(
+                self.to_textual.resource_to_path(resource))
+        except exceptions.ModuleSyntaxError:
+            pass
+
+    def _resource_moved(self, resource, new_resource=None):
+        self.observer.remove_resource(resource)
+        if new_resource is not None:
+            old = self.to_textual.resource_to_path(resource)
+            new = self.to_textual.resource_to_path(new_resource)
+            self.objectdb.file_moved(old, new)
+            self.observer.add_resource(new_resource)
+
+    def get_returned(self, pyobject, args):
+        result = self.get_exact_returned(pyobject, args)
+        if result is not None:
+            return result
+        path, key = self._get_scope(pyobject)
+        if path is None:
+            return None
+        for call_info in self.objectdb.get_callinfos(path, key):
+            returned = call_info.get_returned()
+            if returned and returned[0] not in ('unknown', 'none'):
+                result = returned
+                break
+            if result is None:
+                result = returned
+        if result is not None:
+            return self.to_pyobject(result)
+
+    def get_exact_returned(self, pyobject, args):
+        path, key = self._get_scope(pyobject)
+        if path is not None:
+            returned = self.objectdb.get_returned(
+                path, key, self._args_to_textual(pyobject, args))
+            if returned is not None:
+                return self.to_pyobject(returned)
+
+    def _args_to_textual(self, pyfunction, args):
+        parameters = list(pyfunction.get_param_names(special_args=False))
+        arguments = args.get_arguments(parameters)[:len(parameters)]
+        textual_args = tuple([self.to_textual(arg)
+                              for arg in arguments])
+        return textual_args
+
+    def get_parameter_objects(self, pyobject):
+        path, key = self._get_scope(pyobject)
+        if path is None:
+            return None
+        arg_count = len(pyobject.get_param_names(special_args=False))
+        unknowns = arg_count
+        parameters = [None] * arg_count
+        for call_info in self.objectdb.get_callinfos(path, key):
+            args = call_info.get_parameters()
+            for index, arg in enumerate(args[:arg_count]):
+                old = parameters[index]
+                if self.validation.is_more_valid(arg, old):
+                    parameters[index] = arg
+                    if self.validation.is_value_valid(arg):
+                        unknowns -= 1
+            if unknowns == 0:
+                break
+        if unknowns < arg_count:
+            return [self.to_pyobject(parameter)
+                    for parameter in parameters]
+
+    def get_passed_objects(self, pyfunction, parameter_index):
+        path, key = self._get_scope(pyfunction)
+        if path is None:
+            return []
+        result = []
+        for call_info in self.objectdb.get_callinfos(path, key):
+            args = call_info.get_parameters()
+            if len(args) > parameter_index:
+                parameter = self.to_pyobject(args[parameter_index])
+                if parameter is not None:
+                    result.append(parameter)
+        return result
+
+    def doa_data_received(self, data):
+        def doi_to_normal(textual):
+            pyobject = self.doi_to_pyobject(textual)
+            return self.to_textual(pyobject)
+        function = doi_to_normal(data[0])
+        args = tuple([doi_to_normal(textual) for textual in data[1]])
+        returned = doi_to_normal(data[2])
+        if function[0] == 'defined' and len(function) == 3:
+            self._save_data(function, args, returned)
+
+    def function_called(self, pyfunction, params, returned=None):
+        function_text = self.to_textual(pyfunction)
+        params_text = tuple([self.to_textual(param)
+                             for param in params])
+        returned_text = ('unknown',)
+        if returned is not None:
+            returned_text = self.to_textual(returned)
+        self._save_data(function_text, params_text, returned_text)
+
+    def save_per_name(self, scope, name, data):
+        path, key = self._get_scope(scope.pyobject)
+        if path is not None:
+            self.objectdb.add_pername(path, key, name, self.to_textual(data))
+
+    def get_per_name(self, scope, name):
+        path, key = self._get_scope(scope.pyobject)
+        if path is not None:
+            result = self.objectdb.get_pername(path, key, name)
+            if result is not None:
+                return self.to_pyobject(result)
+
+    def _save_data(self, function, args, returned=('unknown',)):
+        self.objectdb.add_callinfo(function[1], function[2], args, returned)
+
+    def _get_scope(self, pyobject):
+        resource = pyobject.get_module().get_resource()
+        if resource is None:
+            return None, None
+        textual = self.to_textual(pyobject)
+        if textual[0] == 'defined':
+            path = textual[1]
+            if len(textual) == 3:
+                key = textual[2]
+            else:
+                key = ''
+            return path, key
+        return None, None
+
+    def sync(self):
+        self.objectdb.sync()
+
+    def __str__(self):
+        return str(self.objectdb)
+
+
+class TextualValidation(object):
+
+    def __init__(self, to_pyobject):
+        self.to_pyobject = to_pyobject
+
+    def is_value_valid(self, value):
+        # ???: Should none and unknown be considered valid?
+        if value is None or value[0] in ('none', 'unknown'):
+            return False
+        return self.to_pyobject(value) is not None
+
+    def is_more_valid(self, new, old):
+        if old is None:
+            return True
+        return new[0] not in ('unknown', 'none')
+
+    def is_file_valid(self, path):
+        return self.to_pyobject.path_to_resource(path) is not None
+
+    def is_scope_valid(self, path, key):
+        if key == '':
+            textual = ('defined', path)
+        else:
+            textual = ('defined', path, key)
+        return self.to_pyobject(textual) is not None
+
+
+class _FileListObserver(object):
+
+    def __init__(self, object_info):
+        self.object_info = object_info
+        self.observer = self.object_info.observer
+        self.to_pyobject = self.object_info.to_pyobject
+
+    def removed(self, path):
+        resource = self.to_pyobject.path_to_resource(path)
+        if resource is not None:
+            self.observer.remove_resource(resource)
+
+    def added(self, path):
+        resource = self.to_pyobject.path_to_resource(path)
+        if resource is not None:
+            self.observer.add_resource(resource)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/runmod.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/runmod.py
new file mode 100644
index 0000000..ba0184c
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/runmod.py
@@ -0,0 +1,222 @@
+def __rope_start_everything():
+    import os
+    import sys
+    import socket
+    try:
+        import pickle
+    except ImportError:
+        import cPickle as pickle
+    import marshal
+    import inspect
+    import types
+    import threading
+    import rope.base.utils.pycompat as pycompat
+
+    class _MessageSender(object):
+
+        def send_data(self, data):
+            pass
+
+    class _SocketSender(_MessageSender):
+
+        def __init__(self, port):
+            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            s.connect(('127.0.0.1', port))
+            self.my_file = s.makefile('wb')
+
+        def send_data(self, data):
+            if not self.my_file.closed:
+                pickle.dump(data, self.my_file)
+
+        def close(self):
+            self.my_file.close()
+
+    class _FileSender(_MessageSender):
+
+        def __init__(self, file_name):
+            self.my_file = open(file_name, 'wb')
+
+        def send_data(self, data):
+            if not self.my_file.closed:
+                marshal.dump(data, self.my_file)
+
+        def close(self):
+            self.my_file.close()
+
+    def _cached(func):
+        cache = {}
+
+        def newfunc(self, arg):
+            if arg in cache:
+                return cache[arg]
+            result = func(self, arg)
+            cache[arg] = result
+            return result
+        return newfunc
+
+    class _FunctionCallDataSender(object):
+
+        def __init__(self, send_info, project_root):
+            self.project_root = project_root
+            if send_info.isdigit():
+                self.sender = _SocketSender(int(send_info))
+            else:
+                self.sender = _FileSender(send_info)
+
+            def global_trace(frame, event, arg):
+                # HACK: Ignoring out->in calls
+                # This might lose some information
+                if self._is_an_interesting_call(frame):
+                    return self.on_function_call
+            sys.settrace(global_trace)
+            threading.settrace(global_trace)
+
+        def on_function_call(self, frame, event, arg):
+            if event != 'return':
+                return
+            args = []
+            returned = ('unknown',)
+            code = frame.f_code
+            for argname in code.co_varnames[:code.co_argcount]:
+                try:
+                    argvalue = self._object_to_persisted_form(
+                        frame.f_locals[argname])
+                    args.append(argvalue)
+                except (TypeError, AttributeError):
+                    args.append(('unknown',))
+            try:
+                returned = self._object_to_persisted_form(arg)
+            except (TypeError, AttributeError):
+                pass
+            try:
+                data = (self._object_to_persisted_form(frame.f_code),
+                        tuple(args), returned)
+                self.sender.send_data(data)
+            except (TypeError):
+                pass
+            return self.on_function_call
+
+        def _is_an_interesting_call(self, frame):
+            #if frame.f_code.co_name in ['?', '<module>']:
+            #    return False
+            #return not frame.f_back or
+            #    not self._is_code_inside_project(frame.f_back.f_code)
+            if not self._is_code_inside_project(frame.f_code) and \
+               (not frame.f_back or
+                    not self._is_code_inside_project(frame.f_back.f_code)):
+                return False
+            return True
+
+        def _is_code_inside_project(self, code):
+            source = self._path(code.co_filename)
+            return source is not None and os.path.exists(source) and \
+                _realpath(source).startswith(self.project_root)
+
+        @_cached
+        def _get_persisted_code(self, object_):
+            source = self._path(object_.co_filename)
+            if not os.path.exists(source):
+                raise TypeError('no source')
+            return ('defined', _realpath(source), str(object_.co_firstlineno))
+
+        @_cached
+        def _get_persisted_class(self, object_):
+            try:
+                return ('defined', _realpath(inspect.getsourcefile(object_)),
+                        object_.__name__)
+            except (TypeError, AttributeError):
+                return ('unknown',)
+
+        def _get_persisted_builtin(self, object_):
+            if isinstance(object_, pycompat.string_types):
+                return ('builtin', 'str')
+            if isinstance(object_, list):
+                holding = None
+                if len(object_) > 0:
+                    holding = object_[0]
+                return ('builtin', 'list',
+                        self._object_to_persisted_form(holding))
+            if isinstance(object_, dict):
+                keys = None
+                values = None
+                if len(object_) > 0:
+                    # @todo - fix it properly, why is __locals__ being
+                    # duplicated ?
+                    keys = [key for key in object_.keys() if key != '__locals__'][0]
+                    values = object_[keys]
+                return ('builtin', 'dict',
+                        self._object_to_persisted_form(keys),
+                        self._object_to_persisted_form(values))
+            if isinstance(object_, tuple):
+                objects = []
+                if len(object_) < 3:
+                    for holding in object_:
+                        objects.append(self._object_to_persisted_form(holding))
+                else:
+                    objects.append(self._object_to_persisted_form(object_[0]))
+                return tuple(['builtin', 'tuple'] + objects)
+            if isinstance(object_, set):
+                holding = None
+                if len(object_) > 0:
+                    for o in object_:
+                        holding = o
+                        break
+                return ('builtin', 'set',
+                        self._object_to_persisted_form(holding))
+            return ('unknown',)
+
+        def _object_to_persisted_form(self, object_):
+            if object_ is None:
+                return ('none',)
+            if isinstance(object_, types.CodeType):
+                return self._get_persisted_code(object_)
+            if isinstance(object_, types.FunctionType):
+                return self._get_persisted_code(object_.__code__)
+            if isinstance(object_, types.MethodType):
+                return self._get_persisted_code(object_.__func__.__code__)
+            if isinstance(object_, types.ModuleType):
+                return self._get_persisted_module(object_)
+            if isinstance(object_, pycompat.string_types + (list, dict, tuple, set)):
+                return self._get_persisted_builtin(object_)
+            if isinstance(object_, type):
+                return self._get_persisted_class(object_)
+            return ('instance', self._get_persisted_class(type(object_)))
+
+        @_cached
+        def _get_persisted_module(self, object_):
+            path = self._path(object_.__file__)
+            if path and os.path.exists(path):
+                return ('defined', _realpath(path))
+            return ('unknown',)
+
+        def _path(self, path):
+            if path.endswith('.pyc'):
+                path = path[:-1]
+            if path.endswith('.py'):
+                return path
+
+        def close(self):
+            self.sender.close()
+            sys.settrace(None)
+
+    def _realpath(path):
+        return os.path.realpath(os.path.abspath(os.path.expanduser(path)))
+
+    send_info = sys.argv[1]
+    project_root = sys.argv[2]
+    file_to_run = sys.argv[3]
+    run_globals = globals()
+    run_globals.update({'__name__': '__main__',
+                        '__builtins__': __builtins__,
+                        '__file__': file_to_run})
+
+    if send_info != '-':
+        data_sender = _FunctionCallDataSender(send_info, project_root)
+    del sys.argv[1:4]
+    pycompat.execfile(file_to_run, run_globals)
+    if send_info != '-':
+        data_sender.close()
+
+
+if __name__ == '__main__':
+    __rope_start_everything()
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/soa.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/soa.py
new file mode 100644
index 0000000..a34b970
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/soa.py
@@ -0,0 +1,139 @@
+import rope.base.ast
+import rope.base.oi.soi
+import rope.base.pynames
+from rope.base import pyobjects, evaluate, astutils, arguments
+
+
+def analyze_module(pycore, pymodule, should_analyze,
+                   search_subscopes, followed_calls):
+    """Analyze `pymodule` for static object inference
+
+    Analyzes scopes for collecting object information.  The analysis
+    starts from inner scopes.
+
+    """
+    _analyze_node(pycore, pymodule, should_analyze,
+                  search_subscopes, followed_calls)
+
+
+def _analyze_node(pycore, pydefined, should_analyze,
+                  search_subscopes, followed_calls):
+    if search_subscopes(pydefined):
+        for scope in pydefined.get_scope().get_scopes():
+            _analyze_node(pycore, scope.pyobject, should_analyze,
+                          search_subscopes, followed_calls)
+    if should_analyze(pydefined):
+        new_followed_calls = max(0, followed_calls - 1)
+        return_true = lambda pydefined: True
+        return_false = lambda pydefined: False
+
+        def _follow(pyfunction):
+            _analyze_node(pycore, pyfunction, return_true,
+                          return_false, new_followed_calls)
+
+        if not followed_calls:
+            _follow = None
+        visitor = SOAVisitor(pycore, pydefined, _follow)
+        for child in rope.base.ast.get_child_nodes(pydefined.get_ast()):
+            rope.base.ast.walk(child, visitor)
+
+
+class SOAVisitor(object):
+
+    def __init__(self, pycore, pydefined, follow_callback=None):
+        self.pycore = pycore
+        self.pymodule = pydefined.get_module()
+        self.scope = pydefined.get_scope()
+        self.follow = follow_callback
+
+    def _FunctionDef(self, node):
+        pass
+
+    def _ClassDef(self, node):
+        pass
+
+    def _Call(self, node):
+        for child in rope.base.ast.get_child_nodes(node):
+            rope.base.ast.walk(child, self)
+        primary, pyname = evaluate.eval_node2(self.scope, node.func)
+        if pyname is None:
+            return
+        pyfunction = pyname.get_object()
+        if isinstance(pyfunction, pyobjects.AbstractFunction):
+            args = arguments.create_arguments(primary, pyfunction,
+                                              node, self.scope)
+        elif isinstance(pyfunction, pyobjects.PyClass):
+            pyclass = pyfunction
+            if '__init__' in pyfunction:
+                pyfunction = pyfunction['__init__'].get_object()
+            pyname = rope.base.pynames.UnboundName(pyobjects.PyObject(pyclass))
+            args = self._args_with_self(primary, pyname, pyfunction, node)
+        elif '__call__' in pyfunction:
+            pyfunction = pyfunction['__call__'].get_object()
+            args = self._args_with_self(primary, pyname, pyfunction, node)
+        else:
+            return
+        self._call(pyfunction, args)
+
+    def _args_with_self(self, primary, self_pyname, pyfunction, node):
+        base_args = arguments.create_arguments(primary, pyfunction,
+                                               node, self.scope)
+        return arguments.MixedArguments(self_pyname, base_args, self.scope)
+
+    def _call(self, pyfunction, args):
+        if isinstance(pyfunction, pyobjects.PyFunction):
+            if self.follow is not None:
+                before = self._parameter_objects(pyfunction)
+            self.pycore.object_info.function_called(
+                pyfunction, args.get_arguments(pyfunction.get_param_names()))
+            pyfunction._set_parameter_pyobjects(None)
+            if self.follow is not None:
+                after = self._parameter_objects(pyfunction)
+                if after != before:
+                    self.follow(pyfunction)
+        # XXX: Maybe we should not call every builtin function
+        if isinstance(pyfunction, rope.base.builtins.BuiltinFunction):
+            pyfunction.get_returned_object(args)
+
+    def _parameter_objects(self, pyfunction):
+        result = []
+        for i in range(len(pyfunction.get_param_names(False))):
+            result.append(pyfunction.get_parameter(i))
+        return result
+
+    def _Assign(self, node):
+        for child in rope.base.ast.get_child_nodes(node):
+            rope.base.ast.walk(child, self)
+        visitor = _SOAAssignVisitor()
+        nodes = []
+        for child in node.targets:
+            rope.base.ast.walk(child, visitor)
+            nodes.extend(visitor.nodes)
+        for subscript, levels in nodes:
+            instance = evaluate.eval_node(self.scope, subscript.value)
+            args_pynames = []
+            args_pynames.append(evaluate.eval_node(self.scope,
+                                                   subscript.slice.value))
+            value = rope.base.oi.soi._infer_assignment(
+                rope.base.pynames.AssignmentValue(node.value, levels),
+                self.pymodule)
+            args_pynames.append(rope.base.pynames.UnboundName(value))
+            if instance is not None and value is not None:
+                pyobject = instance.get_object()
+                if '__setitem__' in pyobject:
+                    pyfunction = pyobject['__setitem__'].get_object()
+                    args = arguments.ObjectArguments([instance] + args_pynames)
+                    self._call(pyfunction, args)
+                # IDEA: handle `__setslice__`, too
+
+
+class _SOAAssignVisitor(astutils._NodeNameCollector):
+
+    def __init__(self):
+        super(_SOAAssignVisitor, self).__init__()
+        self.nodes = []
+
+    def _added(self, node, levels):
+        if isinstance(node, rope.base.ast.Subscript) and \
+           isinstance(node.slice, rope.base.ast.Index):
+            self.nodes.append((node, levels))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/soi.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/soi.py
new file mode 100644
index 0000000..f39e6a8
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/soi.py
@@ -0,0 +1,243 @@
+"""A module for inferring objects
+
+For more information see the documentation in `rope.base.oi`
+package.
+
+"""
+import rope.base.builtins
+import rope.base.pynames
+import rope.base.pyobjects
+from rope.base import evaluate, utils, arguments
+from rope.base.oi.docstrings import hint_return, hint_param, hint_attr, hint_pep0484
+
+
+_ignore_inferred = utils.ignore_exception(
+    rope.base.pyobjects.IsBeingInferredError)
+
+
+@_ignore_inferred
+def infer_returned_object(pyfunction, args):
+    """Infer the `PyObject` this `PyFunction` returns after calling"""
+    object_info = pyfunction.pycore.object_info
+    result = object_info.get_exact_returned(pyfunction, args)
+    if result is not None:
+        return result
+    result = _infer_returned(pyfunction, args)
+    if result is not None:
+        if args and pyfunction.get_module().get_resource() is not None:
+            params = args.get_arguments(
+                pyfunction.get_param_names(special_args=False))
+            object_info.function_called(pyfunction, params, result)
+        return result
+    result = object_info.get_returned(pyfunction, args)
+    if result is not None:
+        return result
+    type_ = hint_return(pyfunction)
+    if type_ is not None:
+        return rope.base.pyobjects.PyObject(type_)
+
+
+@_ignore_inferred
+def infer_parameter_objects(pyfunction):
+    """Infer the `PyObject`\s of parameters of this `PyFunction`"""
+    object_info = pyfunction.pycore.object_info
+    result = object_info.get_parameter_objects(pyfunction)
+    if result is None:
+        result = _parameter_objects(pyfunction)
+    _handle_first_parameter(pyfunction, result)
+    return result
+
+
+def _handle_first_parameter(pyobject, parameters):
+    kind = pyobject.get_kind()
+    if parameters is None or kind not in ['method', 'classmethod']:
+        pass
+    if not parameters:
+        if not pyobject.get_param_names(special_args=False):
+            return
+        parameters.append(rope.base.pyobjects.get_unknown())
+    if kind == 'method':
+        parameters[0] = rope.base.pyobjects.PyObject(pyobject.parent)
+    if kind == 'classmethod':
+        parameters[0] = pyobject.parent
+
+
+@_ignore_inferred
+def infer_assigned_object(pyname):
+    if not pyname.assignments:
+        return
+    for assignment in reversed(pyname.assignments):
+        result = _infer_assignment(assignment, pyname.module)
+        if isinstance(result, rope.base.builtins.BuiltinUnknown) and result.get_name() == 'NotImplementedType':
+            break
+        elif result == rope.base.pyobjects.get_unknown():
+            break
+        elif result is not None:
+            return result
+
+    hinting_result = hint_pep0484(pyname)
+    if hinting_result is not None:
+        return hinting_result
+
+    hinting_result = _infer_assigned_object_by_hint(pyname)
+    if hinting_result is not None:
+        return hinting_result
+
+    return result
+
+
+def _infer_assigned_object_by_hint(pyname):
+    lineno = _get_lineno_for_node(pyname.assignments[0].ast_node)
+    holding_scope = pyname.module.get_scope().get_inner_scope_for_line(lineno)
+    pyobject = holding_scope.pyobject
+    if isinstance(pyobject, rope.base.pyobjects.PyClass):
+        pyclass = pyobject
+    elif (isinstance(pyobject, rope.base.pyobjectsdef.PyFunction) and
+          isinstance(pyobject.parent, rope.base.pyobjects.PyClass)):
+        pyclass = pyobject.parent
+    else:
+        return
+    for name, attr in pyclass.get_attributes().items():
+        if attr is pyname:
+            type_ = hint_attr(pyclass, name)
+            if type_ is not None:
+                return rope.base.pyobjects.PyObject(type_)
+            break
+
+
+def get_passed_objects(pyfunction, parameter_index):
+    object_info = pyfunction.pycore.object_info
+    result = object_info.get_passed_objects(pyfunction,
+                                            parameter_index)
+    if not result:
+        statically_inferred = _parameter_objects(pyfunction)
+        if len(statically_inferred) > parameter_index:
+            result.append(statically_inferred[parameter_index])
+    return result
+
+
+def _infer_returned(pyobject, args):
+    if args:
+        # HACK: Setting parameter objects manually
+        # This is not thread safe and might cause problems if `args`
+        # does not come from a good call site
+        pyobject.get_scope().invalidate_data()
+        pyobject._set_parameter_pyobjects(
+            args.get_arguments(pyobject.get_param_names(special_args=False)))
+    scope = pyobject.get_scope()
+    if not scope._get_returned_asts():
+        return
+    maxtries = 3
+    for returned_node in reversed(scope._get_returned_asts()[-maxtries:]):
+        try:
+            resulting_pyname = evaluate.eval_node(scope, returned_node)
+            if resulting_pyname is None:
+                continue
+            pyobject = resulting_pyname.get_object()
+            if pyobject == rope.base.pyobjects.get_unknown():
+                continue
+            if not scope._is_generator():
+                return pyobject
+            else:
+                return rope.base.builtins.get_generator(pyobject)
+        except rope.base.pyobjects.IsBeingInferredError:
+            pass
+
+
+def _parameter_objects(pyobject):
+    result = []
+    params = pyobject.get_param_names(special_args=False)
+    for name in params:
+        type_ = hint_param(pyobject, name)
+        if type_ is not None:
+            result.append(rope.base.pyobjects.PyObject(type_))
+        else:
+            result.append(rope.base.pyobjects.get_unknown())
+    return result
+
+# handling `rope.base.pynames.AssignmentValue`
+
+
+@_ignore_inferred
+def _infer_assignment(assignment, pymodule):
+    result = _follow_pyname(assignment, pymodule)
+    if result is None:
+        return None
+    pyname, pyobject = result
+    pyobject = _follow_evaluations(assignment, pyname, pyobject)
+    if pyobject is None:
+        return None
+    return _follow_levels(assignment, pyobject)
+
+
+def _follow_levels(assignment, pyobject):
+    for index in assignment.levels:
+        if isinstance(pyobject.get_type(), rope.base.builtins.Tuple):
+            holdings = pyobject.get_type().get_holding_objects()
+            if holdings:
+                pyobject = holdings[min(len(holdings) - 1, index)]
+            else:
+                pyobject = None
+        elif isinstance(pyobject.get_type(), rope.base.builtins.List):
+            pyobject = pyobject.get_type().holding
+        else:
+            pyobject = None
+        if pyobject is None:
+            break
+    return pyobject
+
+
+@_ignore_inferred
+def _follow_pyname(assignment, pymodule, lineno=None):
+    assign_node = assignment.ast_node
+    if lineno is None:
+        lineno = _get_lineno_for_node(assign_node)
+    holding_scope = pymodule.get_scope().get_inner_scope_for_line(lineno)
+    pyname = evaluate.eval_node(holding_scope, assign_node)
+    if pyname is not None:
+        result = pyname.get_object()
+        if isinstance(result.get_type(), rope.base.builtins.Property) and \
+           holding_scope.get_kind() == 'Class':
+            arg = rope.base.pynames.UnboundName(
+                rope.base.pyobjects.PyObject(holding_scope.pyobject))
+            return pyname, result.get_type().get_property_object(
+                arguments.ObjectArguments([arg]))
+        return pyname, result
+
+
+@_ignore_inferred
+def _follow_evaluations(assignment, pyname, pyobject):
+    new_pyname = pyname
+    tokens = assignment.evaluation.split('.')
+    for token in tokens:
+        call = token.endswith('()')
+        if call:
+            token = token[:-2]
+        if token:
+            pyname = new_pyname
+            new_pyname = _get_attribute(pyobject, token)
+            if new_pyname is not None:
+                pyobject = new_pyname.get_object()
+        if pyobject is not None and call:
+            if isinstance(pyobject, rope.base.pyobjects.AbstractFunction):
+                args = arguments.ObjectArguments([pyname])
+                pyobject = pyobject.get_returned_object(args)
+            else:
+                pyobject = None
+        if pyobject is None:
+            break
+    if pyobject is not None and assignment.assign_type:
+        return rope.base.pyobjects.PyObject(pyobject)
+    return pyobject
+
+
+def _get_lineno_for_node(assign_node):
+    if hasattr(assign_node, 'lineno') and \
+       assign_node.lineno is not None:
+        return assign_node.lineno
+    return 1
+
+
+def _get_attribute(pyobject, name):
+    if pyobject is not None and name in pyobject:
+        return pyobject[name]
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/transform.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/transform.py
new file mode 100644
index 0000000..aa29c37
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/oi/transform.py
@@ -0,0 +1,285 @@
+"""Provides classes for persisting `PyObject`\s"""
+import os
+import re
+
+import rope.base.builtins
+from rope.base import exceptions
+
+
+class PyObjectToTextual(object):
+    """For transforming `PyObject` to textual form
+
+    This can be used for storing `PyObjects` in files.  Use
+    `TextualToPyObject` for converting back.
+
+    """
+
+    def __init__(self, project):
+        self.project = project
+
+    def transform(self, pyobject):
+        """Transform a `PyObject` to textual form"""
+        if pyobject is None:
+            return ('none',)
+        object_type = type(pyobject)
+        try:
+            method = getattr(self, object_type.__name__ + '_to_textual')
+            return method(pyobject)
+        except AttributeError:
+            return ('unknown',)
+
+    def __call__(self, pyobject):
+        return self.transform(pyobject)
+
+    def PyObject_to_textual(self, pyobject):
+        if isinstance(pyobject.get_type(), rope.base.pyobjects.AbstractClass):
+            result = self.transform(pyobject.get_type())
+            if result[0] == 'defined':
+                return ('instance', result)
+            return result
+        return ('unknown',)
+
+    def PyFunction_to_textual(self, pyobject):
+        return self._defined_to_textual(pyobject)
+
+    def PyClass_to_textual(self, pyobject):
+        return self._defined_to_textual(pyobject)
+
+    def _defined_to_textual(self, pyobject):
+        address = []
+        while pyobject.parent is not None:
+            address.insert(0, pyobject.get_name())
+            pyobject = pyobject.parent
+        return ('defined', self._get_pymodule_path(pyobject.get_module()),
+                '.'.join(address))
+
+    def PyModule_to_textual(self, pyobject):
+        return ('defined', self._get_pymodule_path(pyobject))
+
+    def PyPackage_to_textual(self, pyobject):
+        return ('defined', self._get_pymodule_path(pyobject))
+
+    def List_to_textual(self, pyobject):
+        return ('builtin', 'list', self.transform(pyobject.holding))
+
+    def Dict_to_textual(self, pyobject):
+        return ('builtin', 'dict', self.transform(pyobject.keys),
+                self.transform(pyobject.values))
+
+    def Tuple_to_textual(self, pyobject):
+        objects = [self.transform(holding)
+                   for holding in pyobject.get_holding_objects()]
+        return tuple(['builtin', 'tuple'] + objects)
+
+    def Set_to_textual(self, pyobject):
+        return ('builtin', 'set', self.transform(pyobject.holding))
+
+    def Iterator_to_textual(self, pyobject):
+        return ('builtin', 'iter', self.transform(pyobject.holding))
+
+    def Generator_to_textual(self, pyobject):
+        return ('builtin', 'generator', self.transform(pyobject.holding))
+
+    def Str_to_textual(self, pyobject):
+        return ('builtin', 'str')
+
+    def File_to_textual(self, pyobject):
+        return ('builtin', 'file')
+
+    def BuiltinFunction_to_textual(self, pyobject):
+        return ('builtin', 'function', pyobject.get_name())
+
+    def _get_pymodule_path(self, pymodule):
+        return self.resource_to_path(pymodule.get_resource())
+
+    def resource_to_path(self, resource):
+        if resource.project == self.project:
+            return resource.path
+        else:
+            return resource.real_path
+
+
+class TextualToPyObject(object):
+    """For transforming textual form to `PyObject`"""
+
+    def __init__(self, project, allow_in_project_absolutes=False):
+        self.project = project
+
+    def __call__(self, textual):
+        return self.transform(textual)
+
+    def transform(self, textual):
+        """Transform an object from textual form to `PyObject`"""
+        if textual is None:
+            return None
+        type = textual[0]
+        try:
+            method = getattr(self, type + '_to_pyobject')
+            return method(textual)
+        except AttributeError:
+            return None
+
+    def builtin_to_pyobject(self, textual):
+        method = getattr(self, 'builtin_%s_to_pyobject' % textual[1], None)
+        if method is not None:
+            return method(textual)
+
+    def builtin_str_to_pyobject(self, textual):
+        return rope.base.builtins.get_str()
+
+    def builtin_list_to_pyobject(self, textual):
+        holding = self.transform(textual[2])
+        return rope.base.builtins.get_list(holding)
+
+    def builtin_dict_to_pyobject(self, textual):
+        keys = self.transform(textual[2])
+        values = self.transform(textual[3])
+        return rope.base.builtins.get_dict(keys, values)
+
+    def builtin_tuple_to_pyobject(self, textual):
+        objects = []
+        for holding in textual[2:]:
+            objects.append(self.transform(holding))
+        return rope.base.builtins.get_tuple(*objects)
+
+    def builtin_set_to_pyobject(self, textual):
+        holding = self.transform(textual[2])
+        return rope.base.builtins.get_set(holding)
+
+    def builtin_iter_to_pyobject(self, textual):
+        holding = self.transform(textual[2])
+        return rope.base.builtins.get_iterator(holding)
+
+    def builtin_generator_to_pyobject(self, textual):
+        holding = self.transform(textual[2])
+        return rope.base.builtins.get_generator(holding)
+
+    def builtin_file_to_pyobject(self, textual):
+        return rope.base.builtins.get_file()
+
+    def builtin_function_to_pyobject(self, textual):
+        if textual[2] in rope.base.builtins.builtins:
+            return rope.base.builtins.builtins[textual[2]].get_object()
+
+    def unknown_to_pyobject(self, textual):
+        return None
+
+    def none_to_pyobject(self, textual):
+        return None
+
+    def _module_to_pyobject(self, textual):
+        path = textual[1]
+        return self._get_pymodule(path)
+
+    def _hierarchical_defined_to_pyobject(self, textual):
+        path = textual[1]
+        names = textual[2].split('.')
+        pymodule = self._get_pymodule(path)
+        pyobject = pymodule
+        for name in names:
+            if pyobject is None:
+                return None
+            if isinstance(pyobject, rope.base.pyobjects.PyDefinedObject):
+                try:
+                    pyobject = pyobject.get_scope()[name].get_object()
+                except exceptions.NameNotFoundError:
+                    return None
+            else:
+                return None
+        return pyobject
+
+    def defined_to_pyobject(self, textual):
+        if len(textual) == 2 or textual[2] == '':
+            return self._module_to_pyobject(textual)
+        else:
+            return self._hierarchical_defined_to_pyobject(textual)
+
+    def instance_to_pyobject(self, textual):
+        type = self.transform(textual[1])
+        if type is not None:
+            return rope.base.pyobjects.PyObject(type)
+
+    def _get_pymodule(self, path):
+        resource = self.path_to_resource(path)
+        if resource is not None:
+            return self.project.get_pymodule(resource)
+
+    def path_to_resource(self, path):
+        try:
+            root = self.project.address
+            if not os.path.isabs(path):
+                return self.project.get_resource(path)
+            if path == root or path.startswith(root + os.sep):
+                # INFO: This is a project file; should not be absolute
+                return None
+            import rope.base.project
+            return rope.base.project.get_no_project().get_resource(path)
+        except exceptions.ResourceNotFoundError:
+            return None
+
+
+class DOITextualToPyObject(TextualToPyObject):
+    """For transforming textual form to `PyObject`
+
+    The textual form DOI uses is different from rope's standard
+    textual form.  The reason is that we cannot find the needed
+    information by analyzing live objects.  This class can be
+    used to transform DOI textual form to `PyObject` and later
+    we can convert it to standard textual form using
+    `TextualToPyObject` class.
+
+    """
+
+    def _function_to_pyobject(self, textual):
+        path = textual[1]
+        lineno = int(textual[2])
+        pymodule = self._get_pymodule(path)
+        if pymodule is not None:
+            scope = pymodule.get_scope()
+            inner_scope = scope.get_inner_scope_for_line(lineno)
+            return inner_scope.pyobject
+
+    def _class_to_pyobject(self, textual):
+        path, name = textual[1:]
+        pymodule = self._get_pymodule(path)
+        if pymodule is None:
+            return None
+        module_scope = pymodule.get_scope()
+        suspected = None
+        if name in module_scope.get_names():
+            suspected = module_scope[name].get_object()
+        if suspected is not None and \
+           isinstance(suspected, rope.base.pyobjects.PyClass):
+            return suspected
+        else:
+            lineno = self._find_occurrence(name,
+                                           pymodule.get_resource().read())
+            if lineno is not None:
+                inner_scope = module_scope.get_inner_scope_for_line(lineno)
+                return inner_scope.pyobject
+
+    def defined_to_pyobject(self, textual):
+        if len(textual) == 2:
+            return self._module_to_pyobject(textual)
+        else:
+            if textual[2].isdigit():
+                result = self._function_to_pyobject(textual)
+            else:
+                result = self._class_to_pyobject(textual)
+            if not isinstance(result, rope.base.pyobjects.PyModule):
+                return result
+
+    def _find_occurrence(self, name, source):
+        pattern = re.compile(r'^\s*class\s*' + name + r'\b')
+        lines = source.split('\n')
+        for i in range(len(lines)):
+            if pattern.match(lines[i]):
+                return i + 1
+
+    def path_to_resource(self, path):
+        import rope.base.libutils
+        relpath = rope.base.libutils.path_relative_to_project_root(
+            self.project, path)
+        if relpath is not None:
+            path = relpath
+        return super(DOITextualToPyObject, self).path_to_resource(path)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/prefs.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/prefs.py
new file mode 100644
index 0000000..2ab45da
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/prefs.py
@@ -0,0 +1,41 @@
+class Prefs(object):
+
+    def __init__(self):
+        self.prefs = {}
+        self.callbacks = {}
+
+    def set(self, key, value):
+        """Set the value of `key` preference to `value`."""
+        if key in self.callbacks:
+            self.callbacks[key](value)
+        else:
+            self.prefs[key] = value
+
+    def add(self, key, value):
+        """Add an entry to a list preference
+
+        Add `value` to the list of entries for the `key` preference.
+
+        """
+        if not key in self.prefs:
+            self.prefs[key] = []
+        self.prefs[key].append(value)
+
+    def get(self, key, default=None):
+        """Get the value of the key preference"""
+        return self.prefs.get(key, default)
+
+    def add_callback(self, key, callback):
+        """Add `key` preference with `callback` function
+
+        Whenever `key` is set the callback is called with the
+        given `value` as parameter.
+
+        """
+        self.callbacks[key] = callback
+
+    def __setitem__(self, key, value):
+        self.set(key, value)
+
+    def __getitem__(self, key):
+        return self.get(key)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/project.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/project.py
new file mode 100644
index 0000000..2feef36
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/project.py
@@ -0,0 +1,491 @@
+import os
+import shutil
+import sys
+import warnings
+
+import rope.base.fscommands
+import rope.base.resourceobserver as resourceobserver
+import rope.base.utils.pycompat as pycompat
+from rope.base import exceptions, taskhandle, prefs, history, pycore, utils
+from rope.base.exceptions import ModuleNotFoundError
+from rope.base.resources import File, Folder, _ResourceMatcher
+
+try:
+    import pickle
+except ImportError:
+    import cPickle as pickle
+
+
+class _Project(object):
+
+    def __init__(self, fscommands):
+        self.observers = []
+        self.fscommands = fscommands
+        self.prefs = prefs.Prefs()
+        self.data_files = _DataFiles(self)
+        self._custom_source_folders = []
+
+    def get_resource(self, resource_name):
+        """Get a resource in a project.
+
+        `resource_name` is the path of a resource in a project.  It is
+        the path of a resource relative to project root.  Project root
+        folder address is an empty string.  If the resource does not
+        exist a `exceptions.ResourceNotFound` exception would be
+        raised.  Use `get_file()` and `get_folder()` when you need to
+        get nonexistent `Resource`\s.
+
+        """
+        path = self._get_resource_path(resource_name)
+        if not os.path.exists(path):
+            raise exceptions.ResourceNotFoundError(
+                'Resource <%s> does not exist' % resource_name)
+        elif os.path.isfile(path):
+            return File(self, resource_name)
+        elif os.path.isdir(path):
+            return Folder(self, resource_name)
+        else:
+            raise exceptions.ResourceNotFoundError('Unknown resource '
+                                                   + resource_name)
+
+    def get_module(self, name, folder=None):
+        """Returns a `PyObject` if the module was found."""
+        # check if this is a builtin module
+        pymod = self.pycore.builtin_module(name)
+        if pymod is not None:
+            return pymod
+        module = self.find_module(name, folder)
+        if module is None:
+            raise ModuleNotFoundError('Module %s not found' % name)
+        return self.pycore.resource_to_pyobject(module)
+
+    def get_python_path_folders(self):
+        result = []
+        for src in self.prefs.get('python_path', []) + sys.path:
+            try:
+                src_folder = get_no_project().get_resource(src)
+                result.append(src_folder)
+            except exceptions.ResourceNotFoundError:
+                pass
+        return result
+
+    # INFO: It was decided not to cache source folders, since:
+    #  - Does not take much time when the root folder contains
+    #    packages, that is most of the time
+    #  - We need a separate resource observer; `self.observer`
+    #    does not get notified about module and folder creations
+    def get_source_folders(self):
+        """Returns project source folders"""
+        if self.root is None:
+            return []
+        result = list(self._custom_source_folders)
+        result.extend(self.pycore._find_source_folders(self.root))
+        return result
+
+    def validate(self, folder):
+        """Validate files and folders contained in this folder
+
+        It validates all of the files and folders contained in this
+        folder if some observers are interested in them.
+
+        """
+        for observer in list(self.observers):
+            observer.validate(folder)
+
+    def add_observer(self, observer):
+        """Register a `ResourceObserver`
+
+        See `FilteredResourceObserver`.
+        """
+        self.observers.append(observer)
+
+    def remove_observer(self, observer):
+        """Remove a registered `ResourceObserver`"""
+        if observer in self.observers:
+            self.observers.remove(observer)
+
+    def do(self, changes, task_handle=taskhandle.NullTaskHandle()):
+        """Apply the changes in a `ChangeSet`
+
+        Most of the time you call this function for committing the
+        changes for a refactoring.
+        """
+        self.history.do(changes, task_handle=task_handle)
+
+    def get_pymodule(self, resource, force_errors=False):
+        return self.pycore.resource_to_pyobject(resource, force_errors)
+
+    def get_pycore(self):
+        return self.pycore
+
+    def get_file(self, path):
+        """Get the file with `path` (it may not exist)"""
+        return File(self, path)
+
+    def get_folder(self, path):
+        """Get the folder with `path` (it may not exist)"""
+        return Folder(self, path)
+
+    def get_prefs(self):
+        return self.prefs
+
+    def get_relative_module(self, name, folder, level):
+        module = self.find_relative_module(name, folder, level)
+        if module is None:
+            raise ModuleNotFoundError('Module %s not found' % name)
+        return self.pycore.resource_to_pyobject(module)
+
+    def find_module(self, modname, folder=None):
+        """Returns a resource corresponding to the given module
+
+        returns None if it can not be found
+        """
+        for src in self.get_source_folders():
+            module = _find_module_in_folder(src, modname)
+            if module is not None:
+                return module
+        for src in self.get_python_path_folders():
+            module = _find_module_in_folder(src, modname)
+            if module is not None:
+                return module
+        if folder is not None:
+            module = _find_module_in_folder(folder, modname)
+            if module is not None:
+                return module
+        return None
+
+    def find_relative_module(self, modname, folder, level):
+        for i in range(level - 1):
+            folder = folder.parent
+        if modname == '':
+            return folder
+        else:
+            return _find_module_in_folder(folder, modname)
+
+    def is_ignored(self, resource):
+        return False
+
+    def _get_resource_path(self, name):
+        pass
+
+    @property
+    @utils.saveit
+    def history(self):
+        return history.History(self)
+
+    @property
+    @utils.saveit
+    def pycore(self):
+        return pycore.PyCore(self)
+
+    def close(self):
+        warnings.warn('Cannot close a NoProject',
+                      DeprecationWarning, stacklevel=2)
+
+    ropefolder = None
+
+
+class Project(_Project):
+    """A Project containing files and folders"""
+
+    def __init__(self, projectroot, fscommands=None,
+                 ropefolder='.ropeproject', **prefs):
+        """A rope project
+
+        :parameters:
+            - `projectroot`: The address of the root folder of the project
+            - `fscommands`: Implements the file system operations used
+              by rope; have a look at `rope.base.fscommands`
+            - `ropefolder`: The name of the folder in which rope stores
+              project configurations and data.  Pass `None` for not using
+              such a folder at all.
+            - `prefs`: Specify project preferences.  These values
+              overwrite config file preferences.
+
+        """
+        if projectroot != '/':
+            projectroot = _realpath(projectroot).rstrip('/\\')
+        self._address = projectroot
+        self._ropefolder_name = ropefolder
+        if not os.path.exists(self._address):
+            os.mkdir(self._address)
+        elif not os.path.isdir(self._address):
+            raise exceptions.RopeError('Project root exists and'
+                                       ' is not a directory')
+        if fscommands is None:
+            fscommands = rope.base.fscommands.create_fscommands(self._address)
+        super(Project, self).__init__(fscommands)
+        self.ignored = _ResourceMatcher()
+        self.file_list = _FileListCacher(self)
+        self.prefs.add_callback('ignored_resources', self.ignored.set_patterns)
+        if ropefolder is not None:
+            self.prefs['ignored_resources'] = [ropefolder]
+        self._init_prefs(prefs)
+        self._init_source_folders()
+
+    @utils.deprecated('Delete once deprecated functions are gone')
+    def _init_source_folders(self):
+        for path in self.prefs.get('source_folders', []):
+            folder = self.get_resource(path)
+            self._custom_source_folders.append(folder)
+
+    def get_files(self):
+        return self.file_list.get_files()
+
+    def get_python_files(self):
+        """Returns all python files available in the project"""
+        return [resource for resource in self.get_files()
+                if self.pycore.is_python_file(resource)]
+
+    def _get_resource_path(self, name):
+        return os.path.join(self._address, *name.split('/'))
+
+    def _init_ropefolder(self):
+        if self.ropefolder is not None:
+            if not self.ropefolder.exists():
+                self._create_recursively(self.ropefolder)
+            if not self.ropefolder.has_child('config.py'):
+                config = self.ropefolder.create_file('config.py')
+                config.write(self._default_config())
+
+    def _create_recursively(self, folder):
+        if folder.parent != self.root and not folder.parent.exists():
+            self._create_recursively(folder.parent)
+        folder.create()
+
+    def _init_prefs(self, prefs):
+        run_globals = {}
+        if self.ropefolder is not None:
+            config = self.get_file(self.ropefolder.path + '/config.py')
+            run_globals.update({'__name__': '__main__',
+                                '__builtins__': __builtins__,
+                                '__file__': config.real_path})
+            if config.exists():
+                config = self.ropefolder.get_child('config.py')
+                pycompat.execfile(config.real_path, run_globals)
+            else:
+                exec(self._default_config(), run_globals)
+            if 'set_prefs' in run_globals:
+                run_globals['set_prefs'](self.prefs)
+        for key, value in prefs.items():
+            self.prefs[key] = value
+        self._init_other_parts()
+        self._init_ropefolder()
+        if 'project_opened' in run_globals:
+            run_globals['project_opened'](self)
+
+    def _default_config(self):
+        import rope.base.default_config
+        import inspect
+        return inspect.getsource(rope.base.default_config)
+
+    def _init_other_parts(self):
+        # Forcing the creation of `self.pycore` to register observers
+        self.pycore
+
+    def is_ignored(self, resource):
+        return self.ignored.does_match(resource)
+
+    def sync(self):
+        """Closes project open resources"""
+        self.close()
+
+    def close(self):
+        """Closes project open resources"""
+        self.data_files.write()
+
+    def set(self, key, value):
+        """Set the `key` preference to `value`"""
+        self.prefs.set(key, value)
+
+    @property
+    def ropefolder(self):
+        if self._ropefolder_name is not None:
+            return self.get_folder(self._ropefolder_name)
+
+    def validate(self, folder=None):
+        if folder is None:
+            folder = self.root
+        super(Project, self).validate(folder)
+
+    root = property(lambda self: self.get_resource(''))
+    address = property(lambda self: self._address)
+
+
+class NoProject(_Project):
+    """A null object for holding out of project files.
+
+    This class is singleton use `get_no_project` global function
+    """
+
+    def __init__(self):
+        fscommands = rope.base.fscommands.FileSystemCommands()
+        super(NoProject, self).__init__(fscommands)
+
+    def _get_resource_path(self, name):
+        real_name = name.replace('/', os.path.sep)
+        return _realpath(real_name)
+
+    def get_resource(self, name):
+        universal_name = _realpath(name).replace(os.path.sep, '/')
+        return super(NoProject, self).get_resource(universal_name)
+
+    def get_files(self):
+        return []
+
+    def get_python_files(self):
+        return []
+
+    _no_project = None
+
+
+def get_no_project():
+    if NoProject._no_project is None:
+        NoProject._no_project = NoProject()
+    return NoProject._no_project
+
+
+class _FileListCacher(object):
+
+    def __init__(self, project):
+        self.project = project
+        self.files = None
+        rawobserver = resourceobserver.ResourceObserver(
+            self._changed, self._invalid, self._invalid,
+            self._invalid, self._invalid)
+        self.project.add_observer(rawobserver)
+
+    def get_files(self):
+        if self.files is None:
+            self.files = set()
+            self._add_files(self.project.root)
+        return self.files
+
+    def _add_files(self, folder):
+        for child in folder.get_children():
+            if child.is_folder():
+                self._add_files(child)
+            elif not self.project.is_ignored(child):
+                self.files.add(child)
+
+    def _changed(self, resource):
+        if resource.is_folder():
+            self.files = None
+
+    def _invalid(self, resource, new_resource=None):
+        self.files = None
+
+
+class _DataFiles(object):
+
+    def __init__(self, project):
+        self.project = project
+        self.hooks = []
+
+    def read_data(self, name, compress=False, import_=False):
+        if self.project.ropefolder is None:
+            return None
+        compress = compress and self._can_compress()
+        opener = self._get_opener(compress)
+        file = self._get_file(name, compress)
+        if not compress and import_:
+            self._import_old_files(name)
+        if file.exists():
+            input = opener(file.real_path, 'rb')
+            try:
+                result = []
+                try:
+                    while True:
+                        result.append(pickle.load(input))
+                except EOFError:
+                    pass
+                if len(result) == 1:
+                    return result[0]
+                if len(result) > 1:
+                    return result
+            finally:
+                input.close()
+
+    def write_data(self, name, data, compress=False):
+        if self.project.ropefolder is not None:
+            compress = compress and self._can_compress()
+            file = self._get_file(name, compress)
+            opener = self._get_opener(compress)
+            output = opener(file.real_path, 'wb')
+            try:
+                pickle.dump(data, output, 2)
+            finally:
+                output.close()
+
+    def add_write_hook(self, hook):
+        self.hooks.append(hook)
+
+    def write(self):
+        for hook in self.hooks:
+            hook()
+
+    def _can_compress(self):
+        try:
+            import gzip  # noqa
+            return True
+        except ImportError:
+            return False
+
+    def _import_old_files(self, name):
+        old = self._get_file(name + '.pickle', False)
+        new = self._get_file(name, False)
+        if old.exists() and not new.exists():
+            shutil.move(old.real_path, new.real_path)
+
+    def _get_opener(self, compress):
+        if compress:
+            try:
+                import gzip
+                return gzip.open
+            except ImportError:
+                pass
+        return open
+
+    def _get_file(self, name, compress):
+        path = self.project.ropefolder.path + '/' + name
+        if compress:
+            path += '.gz'
+        return self.project.get_file(path)
+
+
+def _realpath(path):
+    """Return the real path of `path`
+
+    Is equivalent to ``realpath(abspath(expanduser(path)))``.
+
+    Of the particular notice is the hack dealing with the unfortunate
+    sitaution of running native-Windows python (os.name == 'nt') inside
+    of Cygwin (abspath starts with '/'), which apparently normal
+    os.path.realpath completely messes up.
+
+    """
+    # there is a bug in cygwin for os.path.abspath() for abs paths
+    if sys.platform == 'cygwin':
+        if path[1:3] == ':\\':
+            return path
+        elif path[1:3] == ':/':
+            path = "/cygdrive/" + path[0] + path[2:]
+        return os.path.abspath(os.path.expanduser(path))
+    return os.path.realpath(os.path.abspath(os.path.expanduser(path)))
+
+
+def _find_module_in_folder(folder, modname):
+    module = folder
+    packages = modname.split('.')
+    for pkg in packages[:-1]:
+        if module.is_folder() and module.has_child(pkg):
+            module = module.get_child(pkg)
+        else:
+            return None
+    if module.is_folder():
+        if module.has_child(packages[-1]) and \
+           module.get_child(packages[-1]).is_folder():
+            return module.get_child(packages[-1])
+        elif module.has_child(packages[-1] + '.py') and \
+                not module.get_child(packages[-1] + '.py').is_folder():
+            return module.get_child(packages[-1] + '.py')
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pycore.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pycore.py
new file mode 100644
index 0000000..c4c1195
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pycore.py
@@ -0,0 +1,346 @@
+import bisect
+import difflib
+import sys
+import warnings
+
+import rope.base.libutils
+import rope.base.resourceobserver
+import rope.base.resources
+import rope.base.oi.doa
+import rope.base.oi.objectinfo
+import rope.base.oi.soa
+from rope.base import builtins
+from rope.base import exceptions
+from rope.base import stdmods
+from rope.base import taskhandle
+from rope.base import utils
+from rope.base.exceptions import ModuleNotFoundError
+from rope.base.pyobjectsdef import PyModule, PyPackage
+
+
+class PyCore(object):
+
+    def __init__(self, project):
+        self.project = project
+        self._init_resource_observer()
+        self.cache_observers = []
+        self.module_cache = _ModuleCache(self)
+        self.extension_cache = _ExtensionCache(self)
+        self.object_info = rope.base.oi.objectinfo.ObjectInfoManager(project)
+        self._init_python_files()
+        self._init_automatic_soa()
+
+    def _init_python_files(self):
+        self.python_matcher = None
+        patterns = self.project.prefs.get('python_files', None)
+        if patterns is not None:
+            self.python_matcher = rope.base.resources._ResourceMatcher()
+            self.python_matcher.set_patterns(patterns)
+
+    def _init_resource_observer(self):
+        callback = self._invalidate_resource_cache
+        observer = rope.base.resourceobserver.ResourceObserver(
+            changed=callback, moved=callback, removed=callback)
+        self.observer = \
+            rope.base.resourceobserver.FilteredResourceObserver(observer)
+        self.project.add_observer(self.observer)
+
+    def _init_automatic_soa(self):
+        if not self.automatic_soa:
+            return
+        callback = self._file_changed_for_soa
+        observer = rope.base.resourceobserver.ResourceObserver(
+            changed=callback, moved=callback, removed=callback)
+        self.project.add_observer(observer)
+
+    @property
+    def automatic_soa(self):
+        auto_soa = self.project.prefs.get('automatic_soi', None)
+        return self.project.prefs.get('automatic_soa', auto_soa)
+
+    def _file_changed_for_soa(self, resource, new_resource=None):
+        old_contents = self.project.history.\
+            contents_before_current_change(resource)
+        if old_contents is not None:
+            perform_soa_on_changed_scopes(self.project, resource, old_contents)
+
+    def is_python_file(self, resource):
+        if resource.is_folder():
+            return False
+        if self.python_matcher is None:
+            return resource.name.endswith('.py')
+        return self.python_matcher.does_match(resource)
+
+    @utils.deprecated('Use `project.get_module` instead')
+    def get_module(self, name, folder=None):
+        """Returns a `PyObject` if the module was found."""
+        return self.project.get_module(name, folder)
+
+    def _builtin_submodules(self, modname):
+        result = {}
+        for extension in self.extension_modules:
+            if extension.startswith(modname + '.'):
+                name = extension[len(modname) + 1:]
+                if '.' not in name:
+                    result[name] = self.builtin_module(extension)
+        return result
+
+    def builtin_module(self, name):
+        return self.extension_cache.get_pymodule(name)
+
+    @utils.deprecated('Use `project.get_relative_module` instead')
+    def get_relative_module(self, name, folder, level):
+        return self.project.get_relative_module(name, folder, level)
+
+    @utils.deprecated('Use `libutils.get_string_module` instead')
+    def get_string_module(self, code, resource=None, force_errors=False):
+        """Returns a `PyObject` object for the given code
+
+        If `force_errors` is `True`, `exceptions.ModuleSyntaxError` is
+        raised if module has syntax errors.  This overrides
+        ``ignore_syntax_errors`` project config.
+
+        """
+        return PyModule(self, code, resource, force_errors=force_errors)
+
+    @utils.deprecated('Use `libutils.get_string_scope` instead')
+    def get_string_scope(self, code, resource=None):
+        """Returns a `Scope` object for the given code"""
+        return rope.base.libutils.get_string_scope(code, resource)
+
+    def _invalidate_resource_cache(self, resource, new_resource=None):
+        for observer in self.cache_observers:
+            observer(resource)
+
+    @utils.deprecated('Use `project.get_python_path_folders` instead')
+    def get_python_path_folders(self):
+        return self.project.get_python_path_folders()
+
+    @utils.deprecated('Use `project.find_module` instead')
+    def find_module(self, modname, folder=None):
+        """Returns a resource corresponding to the given module
+
+        returns None if it can not be found
+        """
+        return self.project.find_module(modname, folder)
+
+    @utils.deprecated('Use `project.find_relative_module` instead')
+    def find_relative_module(self, modname, folder, level):
+        return self.project.find_relative_module(modname, folder, level)
+
+    # INFO: It was decided not to cache source folders, since:
+    #  - Does not take much time when the root folder contains
+    #    packages, that is most of the time
+    #  - We need a separate resource observer; `self.observer`
+    #    does not get notified about module and folder creations
+    @utils.deprecated('Use `project.get_source_folders` instead')
+    def get_source_folders(self):
+        """Returns project source folders"""
+        return self.project.get_source_folders()
+
+    def resource_to_pyobject(self, resource, force_errors=False):
+        return self.module_cache.get_pymodule(resource, force_errors)
+
+    @utils.deprecated('Use `project.get_python_files` instead')
+    def get_python_files(self):
+        """Returns all python files available in the project"""
+        return self.project.get_python_files()
+
+    def _is_package(self, folder):
+        if folder.has_child('__init__.py') and \
+           not folder.get_child('__init__.py').is_folder():
+            return True
+        else:
+            return False
+
+    def _find_source_folders(self, folder):
+        for resource in folder.get_folders():
+            if self._is_package(resource):
+                return [folder]
+        result = []
+        for resource in folder.get_files():
+            if resource.name.endswith('.py'):
+                result.append(folder)
+                break
+        for resource in folder.get_folders():
+            result.extend(self._find_source_folders(resource))
+        return result
+
+    def run_module(self, resource, args=None, stdin=None, stdout=None):
+        """Run `resource` module
+
+        Returns a `rope.base.oi.doa.PythonFileRunner` object for
+        controlling the process.
+
+        """
+        perform_doa = self.project.prefs.get('perform_doi', True)
+        perform_doa = self.project.prefs.get('perform_doa', perform_doa)
+        receiver = self.object_info.doa_data_received
+        if not perform_doa:
+            receiver = None
+        runner = rope.base.oi.doa.PythonFileRunner(
+            self, resource, args, stdin, stdout, receiver)
+        runner.add_finishing_observer(self.module_cache.forget_all_data)
+        runner.run()
+        return runner
+
+    def analyze_module(self, resource, should_analyze=lambda py: True,
+                       search_subscopes=lambda py: True, followed_calls=None):
+        """Analyze `resource` module for static object inference
+
+        This function forces rope to analyze this module to collect
+        information about function calls.  `should_analyze` is a
+        function that is called with a `PyDefinedObject` argument.  If
+        it returns `True` the element is analyzed.  If it is `None` or
+        returns `False` the element is not analyzed.
+
+        `search_subscopes` is like `should_analyze`; The difference is
+        that if it returns `False` the sub-scopes are all ignored.
+        That is it is assumed that `should_analyze` returns `False`
+        for all of its subscopes.
+
+        `followed_calls` override the value of ``soa_followed_calls``
+        project config.
+        """
+        if followed_calls is None:
+            followed_calls = self.project.prefs.get('soa_followed_calls', 0)
+        pymodule = self.resource_to_pyobject(resource)
+        self.module_cache.forget_all_data()
+        rope.base.oi.soa.analyze_module(
+            self, pymodule, should_analyze, search_subscopes, followed_calls)
+
+    def get_classes(self, task_handle=taskhandle.NullTaskHandle()):
+        warnings.warn('`PyCore.get_classes()` is deprecated',
+                      DeprecationWarning, stacklevel=2)
+        return []
+
+    def __str__(self):
+        return str(self.module_cache) + str(self.object_info)
+
+    @utils.deprecated('Use `libutils.modname` instead')
+    def modname(self, resource):
+        return rope.base.libutils.modname(resource)
+
+    @property
+    @utils.cacheit
+    def extension_modules(self):
+        result = set(self.project.prefs.get('extension_modules', []))
+        if self.project.prefs.get('import_dynload_stdmods', False):
+            result.update(stdmods.dynload_modules())
+        return result
+
+
+class _ModuleCache(object):
+
+    def __init__(self, pycore):
+        self.pycore = pycore
+        self.module_map = {}
+        self.pycore.cache_observers.append(self._invalidate_resource)
+        self.observer = self.pycore.observer
+
+    def _invalidate_resource(self, resource):
+        if resource in self.module_map:
+            self.forget_all_data()
+            self.observer.remove_resource(resource)
+            del self.module_map[resource]
+
+    def get_pymodule(self, resource, force_errors=False):
+        if resource in self.module_map:
+            return self.module_map[resource]
+        if resource.is_folder():
+            result = PyPackage(self.pycore, resource,
+                               force_errors=force_errors)
+        else:
+            result = PyModule(self.pycore, resource=resource,
+                              force_errors=force_errors)
+            if result.has_errors:
+                return result
+        self.module_map[resource] = result
+        self.observer.add_resource(resource)
+        return result
+
+    def forget_all_data(self):
+        for pymodule in self.module_map.values():
+            pymodule._forget_concluded_data()
+
+    def __str__(self):
+        return 'PyCore caches %d PyModules\n' % len(self.module_map)
+
+
+class _ExtensionCache(object):
+
+    def __init__(self, pycore):
+        self.pycore = pycore
+        self.extensions = {}
+
+    def get_pymodule(self, name):
+        if name == '__builtin__':
+            return builtins.builtins
+        allowed = self.pycore.extension_modules
+        if name not in self.extensions and name in allowed:
+            self.extensions[name] = builtins.BuiltinModule(name, self.pycore)
+        return self.extensions.get(name)
+
+
+def perform_soa_on_changed_scopes(project, resource, old_contents):
+    pycore = project.pycore
+    if resource.exists() and pycore.is_python_file(resource):
+        try:
+            new_contents = resource.read()
+            # detecting changes in new_contents relative to old_contents
+            detector = _TextChangeDetector(new_contents, old_contents)
+
+            def search_subscopes(pydefined):
+                scope = pydefined.get_scope()
+                return detector.is_changed(scope.get_start(), scope.get_end())
+
+            def should_analyze(pydefined):
+                scope = pydefined.get_scope()
+                start = scope.get_start()
+                end = scope.get_end()
+                return detector.consume_changes(start, end)
+            pycore.analyze_module(resource, should_analyze, search_subscopes)
+        except exceptions.ModuleSyntaxError:
+            pass
+
+
+class _TextChangeDetector(object):
+
+    def __init__(self, old, new):
+        self.old = old
+        self.new = new
+        self._set_diffs()
+
+    def _set_diffs(self):
+        differ = difflib.Differ()
+        self.lines = []
+        lineno = 0
+        for line in differ.compare(self.old.splitlines(True),
+                                   self.new.splitlines(True)):
+            if line.startswith(' '):
+                lineno += 1
+            elif line.startswith('-'):
+                lineno += 1
+                self.lines.append(lineno)
+
+    def is_changed(self, start, end):
+        """Tell whether any of start till end lines have changed
+
+        The end points are inclusive and indices start from 1.
+        """
+        left, right = self._get_changed(start, end)
+        if left < right:
+            return True
+        return False
+
+    def consume_changes(self, start, end):
+        """Clear the changed status of lines from start till end"""
+        left, right = self._get_changed(start, end)
+        if left < right:
+            del self.lines[left:right]
+        return left < right
+
+    def _get_changed(self, start, end):
+        left = bisect.bisect_left(self.lines, start)
+        right = bisect.bisect_right(self.lines, end)
+        return left, right
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pynames.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pynames.py
new file mode 100644
index 0000000..5d48981
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pynames.py
@@ -0,0 +1,201 @@
+import rope.base.pyobjects
+from rope.base import exceptions, utils
+
+
+class PyName(object):
+    """References to `PyObject`\s inside python programs"""
+
+    def get_object(self):
+        """Return the `PyObject` object referenced by this `PyName`"""
+
+    def get_definition_location(self):
+        """Return a (module, lineno) tuple"""
+
+
+class DefinedName(PyName):
+
+    def __init__(self, pyobject):
+        self.pyobject = pyobject
+
+    def get_object(self):
+        return self.pyobject
+
+    def get_definition_location(self):
+        return (self.pyobject.get_module(), self.pyobject.get_ast().lineno)
+
+
+class AssignedName(PyName):
+    """Only a placeholder"""
+
+
+class UnboundName(PyName):
+
+    def __init__(self, pyobject=None):
+        self.pyobject = pyobject
+        if self.pyobject is None:
+            self.pyobject = rope.base.pyobjects.get_unknown()
+
+    def get_object(self):
+        return self.pyobject
+
+    def get_definition_location(self):
+        return (None, None)
+
+
+class AssignmentValue(object):
+    """An assigned expression"""
+
+    def __init__(self, ast_node, levels=None, evaluation='',
+                 assign_type=False):
+        """The `level` is `None` for simple assignments and is
+        a list of numbers for tuple assignments for example in::
+
+           a, (b, c) = x
+
+        The levels for for `a` is ``[0]``, for `b` is ``[1, 0]`` and for
+        `c` is ``[1, 1]``.
+
+        """
+        self.ast_node = ast_node
+        if levels is None:
+            self.levels = []
+        else:
+            self.levels = levels
+        self.evaluation = evaluation
+        self.assign_type = assign_type
+
+    def get_lineno(self):
+        return self.ast_node.lineno
+
+
+class EvaluatedName(PyName):
+    """A name whose object will be evaluated later"""
+
+    def __init__(self, callback, module=None, lineno=None):
+        self.module = module
+        self.lineno = lineno
+        self.callback = callback
+        self.pyobject = _Inferred(callback, _get_concluded_data(module))
+
+    def get_object(self):
+        return self.pyobject.get()
+
+    def get_definition_location(self):
+        return (self.module, self.lineno)
+
+    def invalidate(self):
+        """Forget the `PyObject` this `PyName` holds"""
+        self.pyobject.set(None)
+
+
+class ParameterName(PyName):
+    """Only a placeholder"""
+
+
+class ImportedModule(PyName):
+
+    def __init__(self, importing_module, module_name=None,
+                 level=0, resource=None):
+        self.importing_module = importing_module
+        self.module_name = module_name
+        self.level = level
+        self.resource = resource
+        self.pymodule = _get_concluded_data(self.importing_module)
+
+    def _current_folder(self):
+        resource = self.importing_module.get_module().get_resource()
+        if resource is None:
+            return None
+        return resource.parent
+
+    def _get_pymodule(self):
+        if self.pymodule.get() is None:
+            pycore = self.importing_module.pycore
+            if self.resource is not None:
+                self.pymodule.set(pycore.project.get_pymodule(self.resource))
+            elif self.module_name is not None:
+                try:
+                    if self.level == 0:
+                        pymodule = pycore.project.get_module(
+                            self.module_name, self._current_folder())
+                    else:
+                        pymodule = pycore.project.get_relative_module(
+                            self.module_name, self._current_folder(),
+                            self.level)
+                    self.pymodule.set(pymodule)
+                except exceptions.ModuleNotFoundError:
+                    pass
+        return self.pymodule.get()
+
+    def get_object(self):
+        if self._get_pymodule() is None:
+            return rope.base.pyobjects.get_unknown()
+        return self._get_pymodule()
+
+    def get_definition_location(self):
+        pymodule = self._get_pymodule()
+        if not isinstance(pymodule, rope.base.pyobjects.PyDefinedObject):
+            return (None, None)
+        return (pymodule.get_module(), 1)
+
+
+class ImportedName(PyName):
+
+    def __init__(self, imported_module, imported_name):
+        self.imported_module = imported_module
+        self.imported_name = imported_name
+
+    def _get_imported_pyname(self):
+        try:
+            result = self.imported_module.get_object()[self.imported_name]
+            if result != self:
+                return result
+        except exceptions.AttributeNotFoundError:
+            pass
+        return UnboundName()
+
+    @utils.prevent_recursion(rope.base.pyobjects.get_unknown)
+    def get_object(self):
+        return self._get_imported_pyname().get_object()
+
+    @utils.prevent_recursion(lambda: (None, None))
+    def get_definition_location(self):
+        return self._get_imported_pyname().get_definition_location()
+
+
+def _get_concluded_data(module):
+    if module is None:
+        return rope.base.pyobjects._ConcludedData()
+    return module._get_concluded_data()
+
+
+def _circular_inference():
+    raise rope.base.pyobjects.IsBeingInferredError(
+        'Circular Object Inference')
+
+
+class _Inferred(object):
+
+    def __init__(self, get_inferred, concluded=None):
+        self.get_inferred = get_inferred
+        self.concluded = concluded
+        if self.concluded is None:
+            self.temp = None
+
+    @utils.prevent_recursion(_circular_inference)
+    def get(self, *args, **kwds):
+        if self.concluded is None or self.concluded.get() is None:
+            self.set(self.get_inferred(*args, **kwds))
+        if self._get() is None:
+            self.set(rope.base.pyobjects.get_unknown())
+        return self._get()
+
+    def set(self, pyobject):
+        if self.concluded is not None:
+            self.concluded.set(pyobject)
+        self.temp = pyobject
+
+    def _get(self):
+        if self.concluded is not None:
+            return self.concluded.get()
+        return self.temp
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pynamesdef.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pynamesdef.py
new file mode 100644
index 0000000..6dba0a8
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pynamesdef.py
@@ -0,0 +1,55 @@
+import rope.base.oi.soi
+from rope.base import pynames
+from rope.base.pynames import *
+
+
+class AssignedName(pynames.AssignedName):
+
+    def __init__(self, lineno=None, module=None, pyobject=None):
+        self.lineno = lineno
+        self.module = module
+        self.assignments = []
+        self.pyobject = _Inferred(self._get_inferred,
+                                  pynames._get_concluded_data(module))
+        self.pyobject.set(pyobject)
+
+    @utils.prevent_recursion(lambda: None)
+    def _get_inferred(self):
+        if self.module is not None:
+            return rope.base.oi.soi.infer_assigned_object(self)
+
+    def get_object(self):
+        return self.pyobject.get()
+
+    def get_definition_location(self):
+        """Returns a (module, lineno) tuple"""
+        if self.lineno is None and self.assignments:
+            self.lineno = self.assignments[0].get_lineno()
+        return (self.module, self.lineno)
+
+    def invalidate(self):
+        """Forget the `PyObject` this `PyName` holds"""
+        self.pyobject.set(None)
+
+
+class ParameterName(pynames.ParameterName):
+
+    def __init__(self, pyfunction, index):
+        self.pyfunction = pyfunction
+        self.index = index
+
+    def get_object(self):
+        result = self.pyfunction.get_parameter(self.index)
+        if result is None:
+            result = rope.base.pyobjects.get_unknown()
+        return result
+
+    def get_objects(self):
+        """Returns the list of objects passed as this parameter"""
+        return rope.base.oi.soi.get_passed_objects(
+            self.pyfunction, self.index)
+
+    def get_definition_location(self):
+        return (self.pyfunction.get_module(), self.pyfunction.get_ast().lineno)
+
+_Inferred = pynames._Inferred
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyobjects.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyobjects.py
new file mode 100644
index 0000000..fd4d1c8
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyobjects.py
@@ -0,0 +1,311 @@
+from rope.base.fscommands import _decode_data
+from rope.base import ast, exceptions, utils
+
+
+class PyObject(object):
+
+    def __init__(self, type_):
+        if type_ is None:
+            type_ = self
+        self.type = type_
+
+    def get_attributes(self):
+        if self.type is self:
+            return {}
+        return self.type.get_attributes()
+
+    def get_attribute(self, name):
+        if name not in self.get_attributes():
+            raise exceptions.AttributeNotFoundError(
+                'Attribute %s not found' % name)
+        return self.get_attributes()[name]
+
+    def get_type(self):
+        return self.type
+
+    def __getitem__(self, key):
+        """The same as ``get_attribute(key)``"""
+        return self.get_attribute(key)
+
+    def __contains__(self, key):
+        """The same as ``key in self.get_attributes()``"""
+        return key in self.get_attributes()
+
+    def __eq__(self, obj):
+        """Check the equality of two `PyObject`\s
+
+        Currently it is assumed that instances (the direct instances
+        of `PyObject`, not the instances of its subclasses) are equal
+        if their types are equal.  For every other object like
+        defineds or builtins rope assumes objects are reference
+        objects and their identities should match.
+
+        """
+        if self.__class__ != obj.__class__:
+            return False
+        if type(self) == PyObject:
+            if self is not self.type:
+                return self.type == obj.type
+            else:
+                return self.type is obj.type
+        return self is obj
+
+    def __ne__(self, obj):
+        return not self.__eq__(obj)
+
+    def __hash__(self):
+        """See docs for `__eq__()` method"""
+        if type(self) == PyObject and self != self.type:
+            return hash(self.type) + 1
+        else:
+            return super(PyObject, self).__hash__()
+
+    def __iter__(self):
+        """The same as ``iter(self.get_attributes())``"""
+        return iter(self.get_attributes())
+
+    _types = None
+    _unknown = None
+
+    @staticmethod
+    def _get_base_type(name):
+        if PyObject._types is None:
+            PyObject._types = {}
+            base_type = PyObject(None)
+            PyObject._types['Type'] = base_type
+            PyObject._types['Module'] = PyObject(base_type)
+            PyObject._types['Function'] = PyObject(base_type)
+            PyObject._types['Unknown'] = PyObject(base_type)
+        return PyObject._types[name]
+
+
+def get_base_type(name):
+    """Return the base type with name `name`.
+
+    The base types are 'Type', 'Function', 'Module' and 'Unknown'.  It
+    was used to check the type of a `PyObject` but currently its use
+    is discouraged.  Use classes defined in this module instead.
+    For example instead of
+    ``pyobject.get_type() == get_base_type('Function')`` use
+    ``isinstance(pyobject, AbstractFunction)``.
+
+    You can use `AbstractClass` for classes, `AbstractFunction` for
+    functions, and `AbstractModule` for modules.  You can also use
+    `PyFunction` and `PyClass` for testing if an object is
+    defined somewhere and rope can access its source.  These classes
+    provide more methods.
+
+    """
+    return PyObject._get_base_type(name)
+
+
+def get_unknown():
+    """Return a pyobject whose type is unknown
+
+    Note that two unknown objects are equal.  So for example you can
+    write::
+
+      if pyname.get_object() == get_unknown():
+          print('cannot determine what this pyname holds')
+
+    Rope could have used `None` for indicating unknown objects but
+    we had to check that in many places.  So actually this method
+    returns a null object.
+
+    """
+    if PyObject._unknown is None:
+        PyObject._unknown = PyObject(get_base_type('Unknown'))
+    return PyObject._unknown
+
+
+class AbstractClass(PyObject):
+
+    def __init__(self):
+        super(AbstractClass, self).__init__(get_base_type('Type'))
+
+    def get_name(self):
+        pass
+
+    def get_doc(self):
+        pass
+
+    def get_superclasses(self):
+        return []
+
+
+class AbstractFunction(PyObject):
+
+    def __init__(self):
+        super(AbstractFunction, self).__init__(get_base_type('Function'))
+
+    def get_name(self):
+        pass
+
+    def get_doc(self):
+        pass
+
+    def get_param_names(self, special_args=True):
+        return []
+
+    def get_returned_object(self, args):
+        return get_unknown()
+
+
+class AbstractModule(PyObject):
+
+    def __init__(self, doc=None):
+        super(AbstractModule, self).__init__(get_base_type('Module'))
+
+    def get_doc(self):
+        pass
+
+    def get_resource(self):
+        pass
+
+
+class PyDefinedObject(object):
+    """Python defined names that rope can access their sources"""
+
+    def __init__(self, pycore, ast_node, parent):
+        self.pycore = pycore
+        self.ast_node = ast_node
+        self.scope = None
+        self.parent = parent
+        self.structural_attributes = None
+        self.concluded_attributes = self.get_module()._get_concluded_data()
+        self.attributes = self.get_module()._get_concluded_data()
+        self.defineds = None
+
+    visitor_class = None
+
+    @utils.prevent_recursion(lambda: {})
+    def _get_structural_attributes(self):
+        if self.structural_attributes is None:
+            self.structural_attributes = self._create_structural_attributes()
+        return self.structural_attributes
+
+    @utils.prevent_recursion(lambda: {})
+    def _get_concluded_attributes(self):
+        if self.concluded_attributes.get() is None:
+            self._get_structural_attributes()
+            self.concluded_attributes.set(self._create_concluded_attributes())
+        return self.concluded_attributes.get()
+
+    def get_attributes(self):
+        if self.attributes.get() is None:
+            result = dict(self._get_concluded_attributes())
+            result.update(self._get_structural_attributes())
+            self.attributes.set(result)
+        return self.attributes.get()
+
+    def get_attribute(self, name):
+        if name in self._get_structural_attributes():
+            return self._get_structural_attributes()[name]
+        if name in self._get_concluded_attributes():
+            return self._get_concluded_attributes()[name]
+        raise exceptions.AttributeNotFoundError('Attribute %s not found' %
+                                                name)
+
+    def get_scope(self):
+        if self.scope is None:
+            self.scope = self._create_scope()
+        return self.scope
+
+    def get_module(self):
+        current_object = self
+        while current_object.parent is not None:
+            current_object = current_object.parent
+        return current_object
+
+    def get_doc(self):
+        if len(self.get_ast().body) > 0:
+            expr = self.get_ast().body[0]
+            if isinstance(expr, ast.Expr) and \
+               isinstance(expr.value, ast.Str):
+                docstring = expr.value.s
+                coding = self.get_module().coding
+                return _decode_data(docstring, coding)
+
+    def _get_defined_objects(self):
+        if self.defineds is None:
+            self._get_structural_attributes()
+        return self.defineds
+
+    def _create_structural_attributes(self):
+        if self.visitor_class is None:
+            return {}
+        new_visitor = self.visitor_class(self.pycore, self)
+        for child in ast.get_child_nodes(self.ast_node):
+            ast.walk(child, new_visitor)
+        self.defineds = new_visitor.defineds
+        return new_visitor.names
+
+    def _create_concluded_attributes(self):
+        return {}
+
+    def get_ast(self):
+        return self.ast_node
+
+    def _create_scope(self):
+        pass
+
+
+class PyFunction(PyDefinedObject, AbstractFunction):
+    """Only a placeholder"""
+
+
+class PyClass(PyDefinedObject, AbstractClass):
+    """Only a placeholder"""
+
+
+class _ConcludedData(object):
+
+    def __init__(self):
+        self.data_ = None
+
+    def set(self, data):
+        self.data_ = data
+
+    def get(self):
+        return self.data_
+
+    data = property(get, set)
+
+    def _invalidate(self):
+        self.data = None
+
+    def __str__(self):
+        return '<' + str(self.data) + '>'
+
+
+class _PyModule(PyDefinedObject, AbstractModule):
+
+    def __init__(self, pycore, ast_node, resource):
+        self.resource = resource
+        self.concluded_data = []
+        AbstractModule.__init__(self)
+        PyDefinedObject.__init__(self, pycore, ast_node, None)
+
+    def _get_concluded_data(self):
+        new_data = _ConcludedData()
+        self.concluded_data.append(new_data)
+        return new_data
+
+    def _forget_concluded_data(self):
+        for data in self.concluded_data:
+            data._invalidate()
+
+    def get_resource(self):
+        return self.resource
+
+
+class PyModule(_PyModule):
+    """Only a placeholder"""
+
+
+class PyPackage(_PyModule):
+    """Only a placeholder"""
+
+
+class IsBeingInferredError(exceptions.RopeError):
+    pass
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyobjectsdef.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyobjectsdef.py
new file mode 100644
index 0000000..b7aef62
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyobjectsdef.py
@@ -0,0 +1,560 @@
+import rope.base.builtins
+import rope.base.codeanalyze
+import rope.base.evaluate
+import rope.base.libutils
+import rope.base.oi.soi
+import rope.base.pyscopes
+from rope.base import (pynamesdef as pynames, exceptions, ast,
+                       astutils, pyobjects, fscommands, arguments, utils)
+from rope.base.utils import pycompat
+
+try:
+    unicode
+except NameError:
+    unicode = str
+
+
+class PyFunction(pyobjects.PyFunction):
+
+    def __init__(self, pycore, ast_node, parent):
+        rope.base.pyobjects.AbstractFunction.__init__(self)
+        rope.base.pyobjects.PyDefinedObject.__init__(
+            self, pycore, ast_node, parent)
+        self.arguments = self.ast_node.args
+        self.parameter_pyobjects = pynames._Inferred(
+            self._infer_parameters, self.get_module()._get_concluded_data())
+        self.returned = pynames._Inferred(self._infer_returned)
+        self.parameter_pynames = None
+
+    def _create_structural_attributes(self):
+        return {}
+
+    def _create_concluded_attributes(self):
+        return {}
+
+    def _create_scope(self):
+        return rope.base.pyscopes.FunctionScope(self.pycore, self,
+                                                _FunctionVisitor)
+
+    def _infer_parameters(self):
+        pyobjects = rope.base.oi.soi.infer_parameter_objects(self)
+        self._handle_special_args(pyobjects)
+        return pyobjects
+
+    def _infer_returned(self, args=None):
+        return rope.base.oi.soi.infer_returned_object(self, args)
+
+    def _handle_special_args(self, pyobjects):
+        if len(pyobjects) == len(self.arguments.args):
+            if self.arguments.vararg:
+                pyobjects.append(rope.base.builtins.get_list())
+            if self.arguments.kwarg:
+                pyobjects.append(rope.base.builtins.get_dict())
+
+    def _set_parameter_pyobjects(self, pyobjects):
+        if pyobjects is not None:
+            self._handle_special_args(pyobjects)
+        self.parameter_pyobjects.set(pyobjects)
+
+    def get_parameters(self):
+        if self.parameter_pynames is None:
+            result = {}
+            for index, name in enumerate(self.get_param_names()):
+                # TODO: handle tuple parameters
+                result[name] = pynames.ParameterName(self, index)
+            self.parameter_pynames = result
+        return self.parameter_pynames
+
+    def get_parameter(self, index):
+        if index < len(self.parameter_pyobjects.get()):
+            return self.parameter_pyobjects.get()[index]
+
+    def get_returned_object(self, args):
+        return self.returned.get(args)
+
+    def get_name(self):
+        return self.get_ast().name
+
+    def get_param_names(self, special_args=True):
+        # TODO: handle tuple parameters
+        result = [pycompat.get_ast_arg_arg(node) for node in self.arguments.args
+                  if isinstance(node, pycompat.ast_arg_type)]
+        if special_args:
+            if self.arguments.vararg:
+                result.append(pycompat.get_ast_arg_arg(self.arguments.vararg))
+            if self.arguments.kwarg:
+                result.append(pycompat.get_ast_arg_arg(self.arguments.kwarg))
+        return result
+
+    def get_kind(self):
+        """Get function type
+
+        It returns one of 'function', 'method', 'staticmethod' or
+        'classmethod' strs.
+
+        """
+        scope = self.parent.get_scope()
+        if isinstance(self.parent, PyClass):
+            for decorator in self.decorators:
+                pyname = rope.base.evaluate.eval_node(scope, decorator)
+                if pyname == rope.base.builtins.builtins['staticmethod']:
+                    return 'staticmethod'
+                if pyname == rope.base.builtins.builtins['classmethod']:
+                    return 'classmethod'
+            return 'method'
+        return 'function'
+
+    @property
+    def decorators(self):
+        try:
+            return getattr(self.ast_node, 'decorator_list')
+        except AttributeError:
+            return getattr(self.ast_node, 'decorators', None)
+
+
+class PyClass(pyobjects.PyClass):
+
+    def __init__(self, pycore, ast_node, parent):
+        self.visitor_class = _ClassVisitor
+        rope.base.pyobjects.AbstractClass.__init__(self)
+        rope.base.pyobjects.PyDefinedObject.__init__(
+            self, pycore, ast_node, parent)
+        self.parent = parent
+        self._superclasses = self.get_module()._get_concluded_data()
+
+    def get_superclasses(self):
+        if self._superclasses.get() is None:
+            self._superclasses.set(self._get_bases())
+        return self._superclasses.get()
+
+    def get_name(self):
+        return self.get_ast().name
+
+    def _create_concluded_attributes(self):
+        result = {}
+        for base in reversed(self.get_superclasses()):
+            result.update(base.get_attributes())
+        return result
+
+    def _get_bases(self):
+        result = []
+        for base_name in self.ast_node.bases:
+            base = rope.base.evaluate.eval_node(self.parent.get_scope(),
+                                                base_name)
+            if base is not None and \
+                base.get_object().get_type() == \
+                    rope.base.pyobjects.get_base_type('Type'):
+                    result.append(base.get_object())
+        return result
+
+    def _create_scope(self):
+        return rope.base.pyscopes.ClassScope(self.pycore, self)
+
+
+class PyModule(pyobjects.PyModule):
+
+    def __init__(self, pycore, source=None,
+                 resource=None, force_errors=False):
+        ignore = pycore.project.prefs.get('ignore_syntax_errors', False)
+        syntax_errors = force_errors or not ignore
+        self.has_errors = False
+        try:
+            source, node = self._init_source(pycore, source, resource)
+        except exceptions.ModuleSyntaxError:
+            self.has_errors = True
+            if syntax_errors:
+                raise
+            else:
+                source = '\n'
+                node = ast.parse('\n')
+        self.source_code = source
+        self.star_imports = []
+        self.visitor_class = _GlobalVisitor
+        self.coding = fscommands.read_str_coding(self.source_code)
+        super(PyModule, self).__init__(pycore, node, resource)
+
+    def _init_source(self, pycore, source_code, resource):
+        filename = 'string'
+        if resource:
+            filename = resource.path
+        try:
+            if source_code is None:
+                source_bytes = resource.read_bytes()
+                source_code = fscommands.file_data_to_unicode(source_bytes)
+            else:
+                if isinstance(source_code, unicode):
+                    source_bytes = fscommands.unicode_to_file_data(source_code)
+                else:
+                    source_bytes = source_code
+            ast_node = ast.parse(source_bytes, filename=filename)
+        except SyntaxError as e:
+            raise exceptions.ModuleSyntaxError(filename, e.lineno, e.msg)
+        except UnicodeDecodeError as e:
+            raise exceptions.ModuleSyntaxError(filename, 1, '%s' % (e.reason))
+        return source_code, ast_node
+
+    @utils.prevent_recursion(lambda: {})
+    def _create_concluded_attributes(self):
+        result = {}
+        for star_import in self.star_imports:
+            result.update(star_import.get_names())
+        return result
+
+    def _create_scope(self):
+        return rope.base.pyscopes.GlobalScope(self.pycore, self)
+
+    @property
+    @utils.saveit
+    def lines(self):
+        """A `SourceLinesAdapter`"""
+        return rope.base.codeanalyze.SourceLinesAdapter(self.source_code)
+
+    @property
+    @utils.saveit
+    def logical_lines(self):
+        """A `LogicalLinesFinder`"""
+        return rope.base.codeanalyze.CachingLogicalLineFinder(self.lines)
+
+
+class PyPackage(pyobjects.PyPackage):
+
+    def __init__(self, pycore, resource=None, force_errors=False):
+        self.resource = resource
+        init_dot_py = self._get_init_dot_py()
+        if init_dot_py is not None:
+            ast_node = pycore.project.get_pymodule(
+                init_dot_py, force_errors=force_errors).get_ast()
+        else:
+            ast_node = ast.parse('\n')
+        super(PyPackage, self).__init__(pycore, ast_node, resource)
+
+    def _create_structural_attributes(self):
+        result = {}
+        modname = rope.base.libutils.modname(self.resource)
+        extension_submodules = self.pycore._builtin_submodules(modname)
+        for name, module in extension_submodules.items():
+            result[name] = rope.base.builtins.BuiltinName(module)
+        if self.resource is None:
+            return result
+        for name, resource in self._get_child_resources().items():
+            result[name] = pynames.ImportedModule(self, resource=resource)
+        return result
+
+    def _create_concluded_attributes(self):
+        result = {}
+        init_dot_py = self._get_init_dot_py()
+        if init_dot_py:
+            init_object = self.pycore.project.get_pymodule(init_dot_py)
+            result.update(init_object.get_attributes())
+        return result
+
+    def _get_child_resources(self):
+        result = {}
+        for child in self.resource.get_children():
+            if child.is_folder():
+                result[child.name] = child
+            elif child.name.endswith('.py') and \
+                    child.name != '__init__.py':
+                name = child.name[:-3]
+                result[name] = child
+        return result
+
+    def _get_init_dot_py(self):
+        if self.resource is not None and \
+                self.resource.has_child('__init__.py'):
+            return self.resource.get_child('__init__.py')
+        else:
+            return None
+
+    def _create_scope(self):
+        return self.get_module().get_scope()
+
+    def get_module(self):
+        init_dot_py = self._get_init_dot_py()
+        if init_dot_py:
+            return self.pycore.project.get_pymodule(init_dot_py)
+        return self
+
+
+class _AssignVisitor(object):
+
+    def __init__(self, scope_visitor):
+        self.scope_visitor = scope_visitor
+        self.assigned_ast = None
+
+    def _Assign(self, node):
+        self.assigned_ast = node.value
+        for child_node in node.targets:
+            ast.walk(child_node, self)
+
+    def _assigned(self, name, assignment=None):
+        self.scope_visitor._assigned(name, assignment)
+
+    def _Name(self, node):
+        assignment = None
+        if self.assigned_ast is not None:
+            assignment = pynames.AssignmentValue(self.assigned_ast)
+        self._assigned(node.id, assignment)
+
+    def _Tuple(self, node):
+        names = astutils.get_name_levels(node)
+        for name, levels in names:
+            assignment = None
+            if self.assigned_ast is not None:
+                assignment = pynames.AssignmentValue(self.assigned_ast, levels)
+            self._assigned(name, assignment)
+
+    def _Attribute(self, node):
+        pass
+
+    def _Subscript(self, node):
+        pass
+
+    def _Slice(self, node):
+        pass
+
+
+class _ScopeVisitor(object):
+
+    def __init__(self, pycore, owner_object):
+        self.pycore = pycore
+        self.owner_object = owner_object
+        self.names = {}
+        self.defineds = []
+
+    def get_module(self):
+        if self.owner_object is not None:
+            return self.owner_object.get_module()
+        else:
+            return None
+
+    def _ClassDef(self, node):
+        pyclass = PyClass(self.pycore, node, self.owner_object)
+        self.names[node.name] = pynames.DefinedName(pyclass)
+        self.defineds.append(pyclass)
+
+    def _FunctionDef(self, node):
+        pyfunction = PyFunction(self.pycore, node, self.owner_object)
+        for decorator in pyfunction.decorators:
+            if isinstance(decorator, ast.Name) and decorator.id == 'property':
+                if isinstance(self, _ClassVisitor):
+                    type_ = rope.base.builtins.Property(pyfunction)
+                    arg = pynames.UnboundName(
+                        rope.base.pyobjects.PyObject(self.owner_object))
+
+                    def _eval(type_=type_, arg=arg):
+                        return type_.get_property_object(
+                            arguments.ObjectArguments([arg]))
+                    self.names[node.name] = pynames.EvaluatedName(
+                        _eval, module=self.get_module(), lineno=node.lineno)
+                    break
+        else:
+            self.names[node.name] = pynames.DefinedName(pyfunction)
+        self.defineds.append(pyfunction)
+
+    def _Assign(self, node):
+        ast.walk(node, _AssignVisitor(self))
+
+    def _AugAssign(self, node):
+        pass
+
+    def _For(self, node):
+        names = self._update_evaluated(node.target, node.iter,  # noqa
+                                       '.__iter__().next()')
+        for child in node.body + node.orelse:
+            ast.walk(child, self)
+
+    def _assigned(self, name, assignment):
+        pyname = self.names.get(name, None)
+        if pyname is None:
+            pyname = pynames.AssignedName(module=self.get_module())
+        if isinstance(pyname, pynames.AssignedName):
+            if assignment is not None:
+                pyname.assignments.append(assignment)
+            self.names[name] = pyname
+
+    def _update_evaluated(self, targets, assigned,
+                          evaluation='', eval_type=False):
+        result = {}
+        if isinstance(targets, str):
+            assignment = pynames.AssignmentValue(assigned, [],
+                                                 evaluation, eval_type)
+            self._assigned(targets, assignment)
+        else:
+            names = astutils.get_name_levels(targets)
+            for name, levels in names:
+                assignment = pynames.AssignmentValue(assigned, levels,
+                                                     evaluation, eval_type)
+                self._assigned(name, assignment)
+        return result
+
+    def _With(self, node):
+        for item in pycompat.get_ast_with_items(node):
+            if item.optional_vars:
+                self._update_evaluated(item.optional_vars,
+                                       item.context_expr, '.__enter__()')
+        for child in node.body:
+            ast.walk(child, self)
+
+    def _excepthandler(self, node):
+        node_name_type = str if pycompat.PY3 else ast.Name
+        if node.name is not None and isinstance(node.name, node_name_type):
+            type_node = node.type
+            if isinstance(node.type, ast.Tuple) and type_node.elts:
+                type_node = type_node.elts[0]
+            self._update_evaluated(node.name, type_node, eval_type=True)
+
+        for child in node.body:
+            ast.walk(child, self)
+
+    def _ExceptHandler(self, node):
+        self._excepthandler(node)
+
+    def _Import(self, node):
+        for import_pair in node.names:
+            module_name = import_pair.name
+            alias = import_pair.asname
+            first_package = module_name.split('.')[0]
+            if alias is not None:
+                imported = pynames.ImportedModule(self.get_module(),
+                                                  module_name)
+                if not self._is_ignored_import(imported):
+                    self.names[alias] = imported
+            else:
+                imported = pynames.ImportedModule(self.get_module(),
+                                                  first_package)
+                if not self._is_ignored_import(imported):
+                    self.names[first_package] = imported
+
+    def _ImportFrom(self, node):
+        level = 0
+        if node.level:
+            level = node.level
+        imported_module = pynames.ImportedModule(self.get_module(),
+                                                 node.module, level)
+        if self._is_ignored_import(imported_module):
+            return
+        if len(node.names) == 1 and node.names[0].name == '*':
+            if isinstance(self.owner_object, PyModule):
+                self.owner_object.star_imports.append(
+                    StarImport(imported_module))
+        else:
+            for imported_name in node.names:
+                imported = imported_name.name
+                alias = imported_name.asname
+                if alias is not None:
+                    imported = alias
+                self.names[imported] = pynames.ImportedName(imported_module,
+                                                            imported_name.name)
+
+    def _is_ignored_import(self, imported_module):
+        if not self.pycore.project.prefs.get('ignore_bad_imports', False):
+            return False
+        return not isinstance(imported_module.get_object(),
+                              rope.base.pyobjects.AbstractModule)
+
+    def _Global(self, node):
+        module = self.get_module()
+        for name in node.names:
+            if module is not None:
+                try:
+                    pyname = module[name]
+                except exceptions.AttributeNotFoundError:
+                    pyname = pynames.AssignedName(node.lineno)
+            self.names[name] = pyname
+
+
+class _GlobalVisitor(_ScopeVisitor):
+
+    def __init__(self, pycore, owner_object):
+        super(_GlobalVisitor, self).__init__(pycore, owner_object)
+
+
+class _ClassVisitor(_ScopeVisitor):
+
+    def __init__(self, pycore, owner_object):
+        super(_ClassVisitor, self).__init__(pycore, owner_object)
+
+    def _FunctionDef(self, node):
+        _ScopeVisitor._FunctionDef(self, node)
+        if len(node.args.args) > 0:
+            first = node.args.args[0]
+            new_visitor = None
+            if isinstance(first, pycompat.ast_arg_type):
+                new_visitor = _ClassInitVisitor(self, pycompat.get_ast_arg_arg(first))
+            if new_visitor is not None:
+                for child in ast.get_child_nodes(node):
+                    ast.walk(child, new_visitor)
+
+
+class _FunctionVisitor(_ScopeVisitor):
+
+    def __init__(self, pycore, owner_object):
+        super(_FunctionVisitor, self).__init__(pycore, owner_object)
+        self.returned_asts = []
+        self.generator = False
+
+    def _Return(self, node):
+        if node.value is not None:
+            self.returned_asts.append(node.value)
+
+    def _Yield(self, node):
+        if node.value is not None:
+            self.returned_asts.append(node.value)
+        self.generator = True
+
+
+class _ClassInitVisitor(_AssignVisitor):
+
+    def __init__(self, scope_visitor, self_name):
+        super(_ClassInitVisitor, self).__init__(scope_visitor)
+        self.self_name = self_name
+
+    def _Attribute(self, node):
+        if not isinstance(node.ctx, ast.Store):
+            return
+        if isinstance(node.value, ast.Name) and \
+           node.value.id == self.self_name:
+            if node.attr not in self.scope_visitor.names:
+                self.scope_visitor.names[node.attr] = pynames.AssignedName(
+                    lineno=node.lineno, module=self.scope_visitor.get_module())
+            if self.assigned_ast is not None:
+                pyname = self.scope_visitor.names[node.attr]
+                if isinstance(pyname, pynames.AssignedName):
+                    pyname.assignments.append(
+                        pynames.AssignmentValue(self.assigned_ast))
+
+    def _Tuple(self, node):
+        if not isinstance(node.ctx, ast.Store):
+            return
+        for child in ast.get_child_nodes(node):
+            ast.walk(child, self)
+
+    def _Name(self, node):
+        pass
+
+    def _FunctionDef(self, node):
+        pass
+
+    def _ClassDef(self, node):
+        pass
+
+    def _For(self, node):
+        pass
+
+    def _With(self, node):
+        pass
+
+
+class StarImport(object):
+
+    def __init__(self, imported_module):
+        self.imported_module = imported_module
+
+    def get_names(self):
+        result = {}
+        imported = self.imported_module.get_object()
+        for name in imported:
+            if not name.startswith('_'):
+                result[name] = pynames.ImportedName(self.imported_module, name)
+        return result
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyscopes.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyscopes.py
new file mode 100644
index 0000000..0bed19a
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/pyscopes.py
@@ -0,0 +1,314 @@
+import rope.base.builtins
+import rope.base.codeanalyze
+import rope.base.pynames
+from rope.base import ast, exceptions, utils
+
+
+class Scope(object):
+
+    def __init__(self, pycore, pyobject, parent_scope):
+        self.pycore = pycore
+        self.pyobject = pyobject
+        self.parent = parent_scope
+
+    def get_names(self):
+        """Return the names defined or imported in this scope"""
+        return self.pyobject.get_attributes()
+
+    def get_defined_names(self):
+        """Return the names defined in this scope"""
+        return self.pyobject._get_structural_attributes()
+
+    def get_name(self, name):
+        """Return name `PyName` defined in this scope"""
+        if name not in self.get_names():
+            raise exceptions.NameNotFoundError('name %s not found' % name)
+        return self.get_names()[name]
+
+    def __getitem__(self, key):
+        """The same as ``get_name(key)``"""
+        return self.get_name(key)
+
+    def __contains__(self, key):
+        """The same as ``key in self.get_names()``"""
+        return key in self.get_names()
+
+    @utils.saveit
+    def get_scopes(self):
+        """Return the subscopes of this scope
+
+        The returned scopes should be sorted by the order they appear.
+        """
+        return self._create_scopes()
+
+    def lookup(self, name):
+        if name in self.get_names():
+            return self.get_names()[name]
+        if self.parent is not None:
+            return self.parent._propagated_lookup(name)
+        return None
+
+    def get_propagated_names(self):
+        """Return the visible names of this scope
+
+        Return the names defined in this scope that are visible from
+        scopes containing this scope.  This method returns the same
+        dictionary returned by `get_names()` except for `ClassScope`
+        which returns an empty dict.
+        """
+        return self.get_names()
+
+    def _propagated_lookup(self, name):
+        if name in self.get_propagated_names():
+            return self.get_propagated_names()[name]
+        if self.parent is not None:
+            return self.parent._propagated_lookup(name)
+        return None
+
+    def _create_scopes(self):
+        return [pydefined.get_scope()
+                for pydefined in self.pyobject._get_defined_objects()]
+
+    def _get_global_scope(self):
+        current = self
+        while current.parent is not None:
+            current = current.parent
+        return current
+
+    def get_start(self):
+        return self.pyobject.get_ast().lineno
+
+    def get_body_start(self):
+        body = self.pyobject.get_ast().body
+        if body:
+            return body[0].lineno
+        return self.get_start()
+
+    def get_end(self):
+        pymodule = self._get_global_scope().pyobject
+        return pymodule.logical_lines.logical_line_in(self.logical_end)[1]
+
+    @utils.saveit
+    def get_logical_end(self):
+        global_scope = self._get_global_scope()
+        return global_scope._scope_finder.find_scope_end(self)
+
+    start = property(get_start)
+    end = property(get_end)
+    logical_end = property(get_logical_end)
+
+    def get_kind(self):
+        pass
+
+
+class GlobalScope(Scope):
+
+    def __init__(self, pycore, module):
+        super(GlobalScope, self).__init__(pycore, module, None)
+        self.names = module._get_concluded_data()
+
+    def get_start(self):
+        return 1
+
+    def get_kind(self):
+        return 'Module'
+
+    def get_name(self, name):
+        try:
+            return self.pyobject[name]
+        except exceptions.AttributeNotFoundError:
+            if name in self.builtin_names:
+                return self.builtin_names[name]
+            raise exceptions.NameNotFoundError('name %s not found' % name)
+
+    def get_names(self):
+        if self.names.get() is None:
+            result = dict(self.builtin_names)
+            result.update(super(GlobalScope, self).get_names())
+            self.names.set(result)
+        return self.names.get()
+
+    def get_inner_scope_for_line(self, lineno, indents=None):
+        return self._scope_finder.get_holding_scope(self, lineno, indents)
+
+    def get_inner_scope_for_offset(self, offset):
+        return self._scope_finder.get_holding_scope_for_offset(self, offset)
+
+    @property
+    @utils.saveit
+    def _scope_finder(self):
+        return _HoldingScopeFinder(self.pyobject)
+
+    @property
+    def builtin_names(self):
+        return rope.base.builtins.builtins.get_attributes()
+
+
+class FunctionScope(Scope):
+
+    def __init__(self, pycore, pyobject, visitor):
+        super(FunctionScope, self).__init__(pycore, pyobject,
+                                            pyobject.parent.get_scope())
+        self.names = None
+        self.returned_asts = None
+        self.is_generator = None
+        self.defineds = None
+        self.visitor = visitor
+
+    def _get_names(self):
+        if self.names is None:
+            self._visit_function()
+        return self.names
+
+    def _visit_function(self):
+        if self.names is None:
+            new_visitor = self.visitor(self.pycore, self.pyobject)
+            for n in ast.get_child_nodes(self.pyobject.get_ast()):
+                ast.walk(n, new_visitor)
+            self.names = new_visitor.names
+            self.names.update(self.pyobject.get_parameters())
+            self.returned_asts = new_visitor.returned_asts
+            self.is_generator = new_visitor.generator
+            self.defineds = new_visitor.defineds
+
+    def _get_returned_asts(self):
+        if self.names is None:
+            self._visit_function()
+        return self.returned_asts
+
+    def _is_generator(self):
+        if self.is_generator is None:
+            self._get_returned_asts()
+        return self.is_generator
+
+    def get_names(self):
+        return self._get_names()
+
+    def _create_scopes(self):
+        if self.defineds is None:
+            self._visit_function()
+        return [pydefined.get_scope() for pydefined in self.defineds]
+
+    def get_kind(self):
+        return 'Function'
+
+    def invalidate_data(self):
+        for pyname in self.get_names().values():
+            if isinstance(pyname, (rope.base.pynames.AssignedName,
+                                   rope.base.pynames.EvaluatedName)):
+                pyname.invalidate()
+
+
+class ClassScope(Scope):
+
+    def __init__(self, pycore, pyobject):
+        super(ClassScope, self).__init__(pycore, pyobject,
+                                         pyobject.parent.get_scope())
+
+    def get_kind(self):
+        return 'Class'
+
+    def get_propagated_names(self):
+        return {}
+
+
+class _HoldingScopeFinder(object):
+
+    def __init__(self, pymodule):
+        self.pymodule = pymodule
+
+    def get_indents(self, lineno):
+        return rope.base.codeanalyze.count_line_indents(
+            self.lines.get_line(lineno))
+
+    def _get_scope_indents(self, scope):
+        return self.get_indents(scope.get_start())
+
+    def get_holding_scope(self, module_scope, lineno, line_indents=None):
+        if line_indents is None:
+            line_indents = self.get_indents(lineno)
+        current_scope = module_scope
+        new_scope = current_scope
+        while new_scope is not None and \
+                (new_scope.get_kind() == 'Module' or
+                 self._get_scope_indents(new_scope) <= line_indents):
+            current_scope = new_scope
+            if current_scope.get_start() == lineno and \
+               current_scope.get_kind() != 'Module':
+                return current_scope
+            new_scope = None
+            for scope in current_scope.get_scopes():
+                if scope.get_start() <= lineno:
+                    if lineno <= scope.get_end():
+                        new_scope = scope
+                        break
+                else:
+                    break
+        return current_scope
+
+    def _is_empty_line(self, lineno):
+        line = self.lines.get_line(lineno)
+        return line.strip() == '' or line.lstrip().startswith('#')
+
+    def _get_body_indents(self, scope):
+        return self.get_indents(scope.get_body_start())
+
+    def get_holding_scope_for_offset(self, scope, offset):
+        return self.get_holding_scope(
+            scope, self.lines.get_line_number(offset))
+
+    def find_scope_end(self, scope):
+        if not scope.parent:
+            return self.lines.length()
+        end = scope.pyobject.get_ast().body[-1].lineno
+        scope_start = self.pymodule.logical_lines.logical_line_in(scope.start)
+        if scope_start[1] >= end:
+            # handling one-liners
+            body_indents = self._get_scope_indents(scope) + 4
+        else:
+            body_indents = self._get_body_indents(scope)
+        for l in self.logical_lines.generate_starts(
+                min(end + 1, self.lines.length()), self.lines.length() + 1):
+            if not self._is_empty_line(l):
+                if self.get_indents(l) < body_indents:
+                    return end
+                else:
+                    end = l
+        return end
+
+    @property
+    def lines(self):
+        return self.pymodule.lines
+
+    @property
+    def code(self):
+        return self.pymodule.source_code
+
+    @property
+    def logical_lines(self):
+        return self.pymodule.logical_lines
+
+
+class TemporaryScope(Scope):
+    """Currently used for list comprehensions and generator expressions
+
+    These scopes do not appear in the `get_scopes()` method of their
+    parent scopes.
+    """
+
+    def __init__(self, pycore, parent_scope, names):
+        super(TemporaryScope, self).__init__(
+            pycore, parent_scope.pyobject, parent_scope)
+        self.names = names
+
+    def get_names(self):
+        return self.names
+
+    def get_defined_names(self):
+        return self.names
+
+    def _create_scopes(self):
+        return []
+
+    def get_kind(self):
+        return 'Temporary'
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/resourceobserver.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/resourceobserver.py
new file mode 100644
index 0000000..7c0937d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/resourceobserver.py
@@ -0,0 +1,272 @@
+import os
+
+
+class ResourceObserver(object):
+    """Provides the interface for observing resources
+
+    `ResourceObserver`\s can be registered using `Project.
+    add_observer()`.  But most of the time `FilteredResourceObserver`
+    should be used.  `ResourceObserver`\s report all changes passed
+    to them and they don't report changes to all resources.  For
+    example if a folder is removed, it only calls `removed()` for that
+    folder and not its contents.  You can use
+    `FilteredResourceObserver` if you are interested in changes only
+    to a list of resources.  And you want changes to be reported on
+    individual resources.
+
+    """
+
+    def __init__(self, changed=None, moved=None, created=None,
+                 removed=None, validate=None):
+        self.changed = changed
+        self.moved = moved
+        self.created = created
+        self.removed = removed
+        self._validate = validate
+
+    def resource_changed(self, resource):
+        """It is called when the resource changes"""
+        if self.changed is not None:
+            self.changed(resource)
+
+    def resource_moved(self, resource, new_resource):
+        """It is called when a resource is moved"""
+        if self.moved is not None:
+            self.moved(resource, new_resource)
+
+    def resource_created(self, resource):
+        """Is called when a new resource is created"""
+        if self.created is not None:
+            self.created(resource)
+
+    def resource_removed(self, resource):
+        """Is called when a new resource is removed"""
+        if self.removed is not None:
+            self.removed(resource)
+
+    def validate(self, resource):
+        """Validate the existence of this resource and its children.
+
+        This function is called when rope need to update its resource
+        cache about the files that might have been changed or removed
+        by other processes.
+
+        """
+        if self._validate is not None:
+            self._validate(resource)
+
+
+class FilteredResourceObserver(object):
+    """A useful decorator for `ResourceObserver`
+
+    Most resource observers have a list of resources and are
+    interested only in changes to those files.  This class satisfies
+    this need.  It dispatches resource changed and removed messages.
+    It performs these tasks:
+
+    * Changes to files and folders are analyzed to check whether any
+      of the interesting resources are changed or not.  If they are,
+      it reports these changes to `resource_observer` passed to the
+      constructor.
+    * When a resource is removed it checks whether any of the
+      interesting resources are contained in that folder and reports
+      them to `resource_observer`.
+    * When validating a folder it validates all of the interesting
+      files in that folder.
+
+    Since most resource observers are interested in a list of
+    resources that change over time, `add_resource` and
+    `remove_resource` might be useful.
+
+    """
+
+    def __init__(self, resource_observer, initial_resources=None,
+                 timekeeper=None):
+        self.observer = resource_observer
+        self.resources = {}
+        if timekeeper is not None:
+            self.timekeeper = timekeeper
+        else:
+            self.timekeeper = ChangeIndicator()
+        if initial_resources is not None:
+            for resource in initial_resources:
+                self.add_resource(resource)
+
+    def add_resource(self, resource):
+        """Add a resource to the list of interesting resources"""
+        if resource.exists():
+            self.resources[resource] = self.timekeeper.get_indicator(resource)
+        else:
+            self.resources[resource] = None
+
+    def remove_resource(self, resource):
+        """Add a resource to the list of interesting resources"""
+        if resource in self.resources:
+            del self.resources[resource]
+
+    def clear_resources(self):
+        """Removes all registered resources"""
+        self.resources.clear()
+
+    def resource_changed(self, resource):
+        changes = _Changes()
+        self._update_changes_caused_by_changed(changes, resource)
+        self._perform_changes(changes)
+
+    def _update_changes_caused_by_changed(self, changes, changed):
+        if changed in self.resources:
+            changes.add_changed(changed)
+        if self._is_parent_changed(changed):
+            changes.add_changed(changed.parent)
+
+    def _update_changes_caused_by_moved(self, changes, resource,
+                                        new_resource=None):
+        if resource in self.resources:
+            changes.add_removed(resource, new_resource)
+        if new_resource in self.resources:
+            changes.add_created(new_resource)
+        if resource.is_folder():
+            for file in list(self.resources):
+                if resource.contains(file):
+                    new_file = self._calculate_new_resource(
+                        resource, new_resource, file)
+                    changes.add_removed(file, new_file)
+        if self._is_parent_changed(resource):
+            changes.add_changed(resource.parent)
+        if new_resource is not None:
+            if self._is_parent_changed(new_resource):
+                changes.add_changed(new_resource.parent)
+
+    def _is_parent_changed(self, child):
+        return child.parent in self.resources
+
+    def resource_moved(self, resource, new_resource):
+        changes = _Changes()
+        self._update_changes_caused_by_moved(changes, resource, new_resource)
+        self._perform_changes(changes)
+
+    def resource_created(self, resource):
+        changes = _Changes()
+        self._update_changes_caused_by_created(changes, resource)
+        self._perform_changes(changes)
+
+    def _update_changes_caused_by_created(self, changes, resource):
+        if resource in self.resources:
+            changes.add_created(resource)
+        if self._is_parent_changed(resource):
+            changes.add_changed(resource.parent)
+
+    def resource_removed(self, resource):
+        changes = _Changes()
+        self._update_changes_caused_by_moved(changes, resource)
+        self._perform_changes(changes)
+
+    def _perform_changes(self, changes):
+        for resource in changes.changes:
+            self.observer.resource_changed(resource)
+            self.resources[resource] = self.timekeeper.get_indicator(resource)
+        for resource, new_resource in changes.moves.items():
+            self.resources[resource] = None
+            if new_resource is not None:
+                self.observer.resource_moved(resource, new_resource)
+            else:
+                self.observer.resource_removed(resource)
+        for resource in changes.creations:
+            self.observer.resource_created(resource)
+            self.resources[resource] = self.timekeeper.get_indicator(resource)
+
+    def validate(self, resource):
+        changes = _Changes()
+        for file in self._search_resource_moves(resource):
+            if file in self.resources:
+                self._update_changes_caused_by_moved(changes, file)
+        for file in self._search_resource_changes(resource):
+            if file in self.resources:
+                self._update_changes_caused_by_changed(changes, file)
+        for file in self._search_resource_creations(resource):
+            if file in self.resources:
+                changes.add_created(file)
+        self._perform_changes(changes)
+
+    def _search_resource_creations(self, resource):
+        creations = set()
+        if resource in self.resources and resource.exists() and \
+           self.resources[resource] is None:
+            creations.add(resource)
+        if resource.is_folder():
+            for file in self.resources:
+                if file.exists() and resource.contains(file) and \
+                   self.resources[file] is None:
+                    creations.add(file)
+        return creations
+
+    def _search_resource_moves(self, resource):
+        all_moved = set()
+        if resource in self.resources and not resource.exists():
+            all_moved.add(resource)
+        if resource.is_folder():
+            for file in self.resources:
+                if resource.contains(file):
+                    if not file.exists():
+                        all_moved.add(file)
+        moved = set(all_moved)
+        for folder in [file for file in all_moved if file.is_folder()]:
+            if folder in moved:
+                for file in list(moved):
+                    if folder.contains(file):
+                        moved.remove(file)
+        return moved
+
+    def _search_resource_changes(self, resource):
+        changed = set()
+        if resource in self.resources and self._is_changed(resource):
+            changed.add(resource)
+        if resource.is_folder():
+            for file in self.resources:
+                if file.exists() and resource.contains(file):
+                    if self._is_changed(file):
+                        changed.add(file)
+        return changed
+
+    def _is_changed(self, resource):
+        if self.resources[resource] is None:
+            return False
+        return self.resources[resource] != \
+            self.timekeeper.get_indicator(resource)
+
+    def _calculate_new_resource(self, main, new_main, resource):
+        if new_main is None:
+            return None
+        diff = resource.path[len(main.path):]
+        return resource.project.get_resource(new_main.path + diff)
+
+
+class ChangeIndicator(object):
+
+    def get_indicator(self, resource):
+        """Return the modification time and size of a `Resource`."""
+        path = resource.real_path
+        # on dos, mtime does not change for a folder when files are added
+        if os.name != 'posix' and os.path.isdir(path):
+            return (os.path.getmtime(path),
+                    len(os.listdir(path)),
+                    os.path.getsize(path))
+        return (os.path.getmtime(path),
+                os.path.getsize(path))
+
+
+class _Changes(object):
+
+    def __init__(self):
+        self.changes = set()
+        self.creations = set()
+        self.moves = {}
+
+    def add_changed(self, resource):
+        self.changes.add(resource)
+
+    def add_removed(self, resource, new_resource=None):
+        self.moves[resource] = new_resource
+
+    def add_created(self, resource):
+        self.creations.add(resource)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/resources.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/resources.py
new file mode 100644
index 0000000..af8ac0a
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/resources.py
@@ -0,0 +1,243 @@
+"""Files and folders in a project are represented as resource objects.
+
+Files and folders are access through `Resource` objects. `Resource` has
+two subclasses: `File` and `Folder`. What we care about is that
+refactorings and `rope.base.change.Change`s use resources.
+
+There are two options to create a `Resource` for a path in a project.
+Note that in these examples `path` is the path to a file or folder
+relative to the project's root. A project's root folder is represented
+by an empty string.
+
+  1) Use the `rope.base.Project.get_resource()` method. E.g.:
+
+       myresource = myproject.get_resource(path)
+
+
+  2) Use the `rope.base.libutils` module. `libutils` has a function
+     named `path_to_resource()`. It takes a project and a path:
+
+       from rope.base import libutils
+
+       myresource = libutils.path_to_resource(myproject, path)
+
+Once we have a `Resource`, we can retrieve information from it, like
+getting the path relative to the project's root (via `path`), reading
+from and writing to the resource, moving the resource, etc.
+"""
+
+import os
+import re
+
+from rope.base import change
+from rope.base import exceptions
+from rope.base import fscommands
+
+
+class Resource(object):
+    """Represents files and folders in a project"""
+
+    def __init__(self, project, path):
+        self.project = project
+        self._path = path
+
+    def move(self, new_location):
+        """Move resource to `new_location`"""
+        self._perform_change(change.MoveResource(self, new_location),
+                             'Moving <%s> to <%s>' % (self.path, new_location))
+
+    def remove(self):
+        """Remove resource from the project"""
+        self._perform_change(change.RemoveResource(self),
+                             'Removing <%s>' % self.path)
+
+    def is_folder(self):
+        """Return true if the resource is a folder"""
+
+    def create(self):
+        """Create this resource"""
+
+    def exists(self):
+        return os.path.exists(self.real_path)
+
+    @property
+    def parent(self):
+        parent = '/'.join(self.path.split('/')[0:-1])
+        return self.project.get_folder(parent)
+
+    @property
+    def path(self):
+        """Return the path of this resource relative to the project root
+
+        The path is the list of parent directories separated by '/' followed
+        by the resource name.
+        """
+        return self._path
+
+    @property
+    def name(self):
+        """Return the name of this resource"""
+        return self.path.split('/')[-1]
+
+    @property
+    def real_path(self):
+        """Return the file system path of this resource"""
+        return self.project._get_resource_path(self.path)
+
+    def __eq__(self, obj):
+        return self.__class__ == obj.__class__ and self.path == obj.path
+
+    def __ne__(self, obj):
+        return not self.__eq__(obj)
+
+    def __hash__(self):
+        return hash(self.path)
+
+    def _perform_change(self, change_, description):
+        changes = change.ChangeSet(description)
+        changes.add_change(change_)
+        self.project.do(changes)
+
+
+class File(Resource):
+    """Represents a file"""
+
+    def __init__(self, project, name):
+        super(File, self).__init__(project, name)
+
+    def read(self):
+        data = self.read_bytes()
+        try:
+            return fscommands.file_data_to_unicode(data)
+        except UnicodeDecodeError as e:
+            raise exceptions.ModuleDecodeError(self.path, e.reason)
+
+    def read_bytes(self):
+        return open(self.real_path, 'rb').read()
+
+    def write(self, contents):
+        try:
+            if contents == self.read():
+                return
+        except IOError:
+            pass
+        self._perform_change(change.ChangeContents(self, contents),
+                             'Writing file <%s>' % self.path)
+
+    def is_folder(self):
+        return False
+
+    def create(self):
+        self.parent.create_file(self.name)
+
+
+class Folder(Resource):
+    """Represents a folder"""
+
+    def __init__(self, project, name):
+        super(Folder, self).__init__(project, name)
+
+    def is_folder(self):
+        return True
+
+    def get_children(self):
+        """Return the children of this folder"""
+        try:
+            children = os.listdir(self.real_path)
+        except OSError:
+            return []
+        result = []
+        for name in children:
+            try:
+                child = self.get_child(name)
+            except exceptions.ResourceNotFoundError:
+                continue
+            if not self.project.is_ignored(child):
+                result.append(self.get_child(name))
+        return result
+
+    def create_file(self, file_name):
+        self._perform_change(
+            change.CreateFile(self, file_name),
+            'Creating file <%s>' % self._get_child_path(file_name))
+        return self.get_child(file_name)
+
+    def create_folder(self, folder_name):
+        self._perform_change(
+            change.CreateFolder(self, folder_name),
+            'Creating folder <%s>' % self._get_child_path(folder_name))
+        return self.get_child(folder_name)
+
+    def _get_child_path(self, name):
+        if self.path:
+            return self.path + '/' + name
+        else:
+            return name
+
+    def get_child(self, name):
+        return self.project.get_resource(self._get_child_path(name))
+
+    def has_child(self, name):
+        try:
+            self.get_child(name)
+            return True
+        except exceptions.ResourceNotFoundError:
+            return False
+
+    def get_files(self):
+        return [resource for resource in self.get_children()
+                if not resource.is_folder()]
+
+    def get_folders(self):
+        return [resource for resource in self.get_children()
+                if resource.is_folder()]
+
+    def contains(self, resource):
+        if self == resource:
+            return False
+        return self.path == '' or resource.path.startswith(self.path + '/')
+
+    def create(self):
+        self.parent.create_folder(self.name)
+
+
+class _ResourceMatcher(object):
+
+    def __init__(self):
+        self.patterns = []
+        self._compiled_patterns = []
+
+    def set_patterns(self, patterns):
+        """Specify which resources to match
+
+        `patterns` is a `list` of `str`\s that can contain ``*`` and
+        ``?`` signs for matching resource names.
+
+        """
+        self._compiled_patterns = None
+        self.patterns = patterns
+
+    def _add_pattern(self, pattern):
+        re_pattern = pattern.replace('.', '\\.').\
+            replace('*', '[^/]*').replace('?', '[^/]').\
+            replace('//', '/(.*/)?')
+        re_pattern = '^(.*/)?' + re_pattern + '(/.*)?$'
+        self.compiled_patterns.append(re.compile(re_pattern))
+
+    def does_match(self, resource):
+        for pattern in self.compiled_patterns:
+            if pattern.match(resource.path):
+                return True
+        path = os.path.join(resource.project.address,
+                            *resource.path.split('/'))
+        if os.path.islink(path):
+            return True
+        return False
+
+    @property
+    def compiled_patterns(self):
+        if self._compiled_patterns is None:
+            self._compiled_patterns = []
+            for pattern in self.patterns:
+                self._add_pattern(pattern)
+        return self._compiled_patterns
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/simplify.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/simplify.py
new file mode 100644
index 0000000..bc4cade
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/simplify.py
@@ -0,0 +1,55 @@
+"""A module to ease code analysis
+
+This module is here to help source code analysis.
+"""
+import re
+
+from rope.base import codeanalyze, utils
+
+
+@utils.cached(7)
+def real_code(source):
+    """Simplify `source` for analysis
+
+    It replaces:
+
+    * comments with spaces
+    * strs with a new str filled with spaces
+    * implicit and explicit continuations with spaces
+    * tabs and semicolons with spaces
+
+    The resulting code is a lot easier to analyze if we are interested
+    only in offsets.
+    """
+    collector = codeanalyze.ChangeCollector(source)
+    for start, end in ignored_regions(source):
+        if source[start] == '#':
+            replacement = ' ' * (end - start)
+        else:
+            replacement = '"%s"' % (' ' * (end - start - 2))
+        collector.add_change(start, end, replacement)
+    source = collector.get_changed() or source
+    collector = codeanalyze.ChangeCollector(source)
+    parens = 0
+    for match in _parens.finditer(source):
+        i = match.start()
+        c = match.group()
+        if c in '({[':
+            parens += 1
+        if c in ')}]':
+            parens -= 1
+        if c == '\n' and parens > 0:
+            collector.add_change(i, i + 1, ' ')
+    source = collector.get_changed() or source
+    return source.replace('\\\n', '  ').replace('\t', ' ').replace(';', '\n')
+
+
+@utils.cached(7)
+def ignored_regions(source):
+    """Return ignored regions like strings and comments in `source` """
+    return [(match.start(), match.end()) for match in _str.finditer(source)]
+
+
+_str = re.compile('%s|%s' % (codeanalyze.get_comment_pattern(),
+                             codeanalyze.get_string_pattern()))
+_parens = re.compile(r'[\({\[\]}\)\n]')
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/stdmods.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/stdmods.py
new file mode 100644
index 0000000..5e868c2
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/stdmods.py
@@ -0,0 +1,61 @@
+import os
+import re
+import sys
+
+from rope.base import utils
+from rope.base.utils import pycompat
+
+
+def _stdlib_path():
+    if pycompat.PY2:
+        from distutils import sysconfig
+        return sysconfig.get_python_lib(standard_lib=True,
+                                        plat_specific=True)
+    elif pycompat.PY3:
+        import inspect
+        return os.path.dirname(inspect.getsourcefile(inspect))
+
+
+@utils.cached(1)
+def standard_modules():
+    return python_modules() | dynload_modules()
+
+
+@utils.cached(1)
+def python_modules():
+    result = set()
+    lib_path = _stdlib_path()
+    if os.path.exists(lib_path):
+        for name in os.listdir(lib_path):
+            path = os.path.join(lib_path, name)
+            if os.path.isdir(path):
+                if '-' not in name:
+                    result.add(name)
+            else:
+                if name.endswith('.py'):
+                    result.add(name[:-3])
+    return result
+
+
+def normalize_so_name(name):
+    """
+    Handle different types of python installations
+    """
+    if "cpython" in name:
+        return os.path.splitext(os.path.splitext(name)[0])[0]
+    return os.path.splitext(name)[0]
+
+
+@utils.cached(1)
+def dynload_modules():
+    result = set(sys.builtin_module_names)
+    dynload_path = os.path.join(_stdlib_path(), 'lib-dynload')
+    if os.path.exists(dynload_path):
+        for name in os.listdir(dynload_path):
+            path = os.path.join(dynload_path, name)
+            if os.path.isfile(path):
+                if name.endswith('.dll'):
+                    result.add(normalize_so_name(name))
+                if name.endswith('.so'):
+                    result.add(normalize_so_name(name))
+    return result
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/taskhandle.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/taskhandle.py
new file mode 100644
index 0000000..c1f01b9
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/taskhandle.py
@@ -0,0 +1,131 @@
+from rope.base import exceptions
+
+
+class TaskHandle(object):
+
+    def __init__(self, name='Task', interrupts=True):
+        """Construct a TaskHandle
+
+        If `interrupts` is `False` the task won't be interrupted by
+        calling `TaskHandle.stop()`.
+
+        """
+        self.name = name
+        self.interrupts = interrupts
+        self.stopped = False
+        self.job_sets = []
+        self.observers = []
+
+    def stop(self):
+        """Interrupts the refactoring"""
+        if self.interrupts:
+            self.stopped = True
+            self._inform_observers()
+
+    def current_jobset(self):
+        """Return the current `JobSet`"""
+        if self.job_sets:
+            return self.job_sets[-1]
+
+    def add_observer(self, observer):
+        """Register an observer for this task handle
+
+        The observer is notified whenever the task is stopped or
+        a job gets finished.
+
+        """
+        self.observers.append(observer)
+
+    def is_stopped(self):
+        return self.stopped
+
+    def get_jobsets(self):
+        return self.job_sets
+
+    def create_jobset(self, name='JobSet', count=None):
+        result = JobSet(self, name=name, count=count)
+        self.job_sets.append(result)
+        self._inform_observers()
+        return result
+
+    def _inform_observers(self):
+        for observer in list(self.observers):
+            observer()
+
+
+class JobSet(object):
+
+    def __init__(self, handle, name, count):
+        self.handle = handle
+        self.name = name
+        self.count = count
+        self.done = 0
+        self.job_name = None
+
+    def started_job(self, name):
+        self.check_status()
+        self.job_name = name
+        self.handle._inform_observers()
+
+    def finished_job(self):
+        self.check_status()
+        self.done += 1
+        self.handle._inform_observers()
+        self.job_name = None
+
+    def check_status(self):
+        if self.handle.is_stopped():
+            raise exceptions.InterruptedTaskError()
+
+    def get_active_job_name(self):
+        return self.job_name
+
+    def get_percent_done(self):
+        if self.count is not None and self.count > 0:
+            percent = self.done * 100 // self.count
+            return min(percent, 100)
+
+    def get_name(self):
+        return self.name
+
+
+class NullTaskHandle(object):
+
+    def __init__(self):
+        pass
+
+    def is_stopped(self):
+        return False
+
+    def stop(self):
+        pass
+
+    def create_jobset(self, *args, **kwds):
+        return NullJobSet()
+
+    def get_jobsets(self):
+        return []
+
+    def add_observer(self, observer):
+        pass
+
+
+class NullJobSet(object):
+
+    def started_job(self, name):
+        pass
+
+    def finished_job(self):
+        pass
+
+    def check_status(self):
+        pass
+
+    def get_active_job_name(self):
+        pass
+
+    def get_percent_done(self):
+        pass
+
+    def get_name(self):
+        pass
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__init__.py
new file mode 100644
index 0000000..11556c1
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__init__.py
@@ -0,0 +1,83 @@
+import warnings
+
+
+def saveit(func):
+    """A decorator that caches the return value of a function"""
+
+    name = '_' + func.__name__
+
+    def _wrapper(self, *args, **kwds):
+        if not hasattr(self, name):
+            setattr(self, name, func(self, *args, **kwds))
+        return getattr(self, name)
+    return _wrapper
+
+cacheit = saveit
+
+
+def prevent_recursion(default):
+    """A decorator that returns the return value of `default` in recursions"""
+    def decorator(func):
+        name = '_calling_%s_' % func.__name__
+
+        def newfunc(self, *args, **kwds):
+            if getattr(self, name, False):
+                return default()
+            setattr(self, name, True)
+            try:
+                return func(self, *args, **kwds)
+            finally:
+                setattr(self, name, False)
+        return newfunc
+    return decorator
+
+
+def ignore_exception(exception_class):
+    """A decorator that ignores `exception_class` exceptions"""
+    def _decorator(func):
+        def newfunc(*args, **kwds):
+            try:
+                return func(*args, **kwds)
+            except exception_class:
+                pass
+        return newfunc
+    return _decorator
+
+
+def deprecated(message=None):
+    """A decorator for deprecated functions"""
+    def _decorator(func, message=message):
+        if message is None:
+            message = '%s is deprecated' % func.__name__
+
+        def newfunc(*args, **kwds):
+            warnings.warn(message, DeprecationWarning, stacklevel=2)
+            return func(*args, **kwds)
+        return newfunc
+    return _decorator
+
+
+def cached(count):
+    """A caching decorator based on parameter objects"""
+    def decorator(func):
+        return _Cached(func, count)
+    return decorator
+
+
+class _Cached(object):
+
+    def __init__(self, func, count):
+        self.func = func
+        self.cache = []
+        self.count = count
+
+    def __call__(self, *args, **kwds):
+        key = (args, kwds)
+        for cached_key, cached_result in self.cache:
+            if cached_key == key:
+                return cached_result
+        result = self.func(*args, **kwds)
+        self.cache.append((key, result))
+        if len(self.cache) > self.count:
+            del self.cache[0]
+        return result
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..36badec
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/datastructures.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/datastructures.cpython-35.pyc
new file mode 100644
index 0000000..7a0dbc3
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/datastructures.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/pycompat.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/pycompat.cpython-35.pyc
new file mode 100644
index 0000000..455600c
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/__pycache__/pycompat.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/datastructures.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/datastructures.py
new file mode 100644
index 0000000..0cb16cf
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/datastructures.py
@@ -0,0 +1,67 @@
+# this snippet was taken from this link
+# http://code.activestate.com/recipes/576694/
+
+import collections
+
+
+class OrderedSet(collections.MutableSet):
+
+    def __init__(self, iterable=None):
+        self.end = end = []
+        end += [None, end, end]  # sentinel
+        # node for doubly linked list
+        self.map = {}  # key --> [key, prev, next]
+        if iterable is not None:
+            self |= iterable
+
+    def __len__(self):
+        return len(self.map)
+
+    def __contains__(self, key):
+        return key in self.map
+
+    def add(self, key):
+        if key not in self.map:
+            end = self.end
+            curr = end[1]
+            curr[2] = end[1] = self.map[key] = [key, curr, end]
+
+    def intersection(self, set_b):
+        return OrderedSet([item for item in self if item in set_b])
+
+    def discard(self, key):
+        if key in self.map:
+            key, prev, next = self.map.pop(key)
+            prev[2] = next
+            next[1] = prev
+
+    def __iter__(self):
+        end = self.end
+        curr = end[2]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[2]
+
+    def __reversed__(self):
+        end = self.end
+        curr = end[1]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[1]
+
+    def pop(self, last=True):
+        if not self:
+            raise KeyError('set is empty')
+        key = self.end[1][0] if last else self.end[2][0]
+        self.discard(key)
+        return key
+
+    def __repr__(self):
+        if not self:
+            return '%s()' % (self.__class__.__name__,)
+        return '%s(%r)' % (self.__class__.__name__, list(self))
+
+    def __eq__(self, other):
+        if isinstance(other, OrderedSet):
+            return len(self) == len(other) and list(self) == list(other)
+        return set(self) == set(other)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/pycompat.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/pycompat.py
new file mode 100644
index 0000000..367cf09
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/utils/pycompat.py
@@ -0,0 +1,45 @@
+import sys
+import _ast
+# from rope.base import ast
+
+PY2 = sys.version_info[0] == 2
+PY27 = sys.version_info[0:2] >= (2, 7)
+PY3 = sys.version_info[0] == 3
+PY34 = sys.version_info[0:2] >= (3, 4)
+
+try:
+    str = unicode
+except NameError:  # PY3
+
+    str = str
+    string_types = (str,)
+    import builtins
+    ast_arg_type = _ast.arg
+
+    def execfile(fn, global_vars=None, local_vars=None):
+        with open(fn) as f:
+            code = compile(f.read(), fn, 'exec')
+            exec(code, global_vars or {}, local_vars)
+
+    def get_ast_arg_arg(node):
+        if isinstance(node, string_types):  # TODO: G21: Understand the Algorithm (Where it's used?)
+            return node
+        return node.arg
+
+    def get_ast_with_items(node):
+        return node.items
+
+else:  # PY2
+
+    string_types = (basestring,)
+    builtins = __import__('__builtin__')
+    ast_arg_type = _ast.Name
+    execfile = execfile
+
+    def get_ast_arg_arg(node):
+        if isinstance(node, string_types):  # Python2 arguments.vararg, arguments.kwarg
+            return node
+        return node.id
+
+    def get_ast_with_items(node):
+        return [node]
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/base/worder.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/worder.py
new file mode 100644
index 0000000..c85c6b3
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/base/worder.py
@@ -0,0 +1,525 @@
+import bisect
+import keyword
+
+import rope.base.simplify
+
+
+def get_name_at(resource, offset):
+    source_code = resource.read()
+    word_finder = Worder(source_code)
+    return word_finder.get_word_at(offset)
+
+
+class Worder(object):
+    """A class for finding boundaries of words and expressions
+
+    Note that in these methods, offset should be the index of the
+    character not the index of the character after it.
+    """
+
+    def __init__(self, code, handle_ignores=False):
+        simplified = rope.base.simplify.real_code(code)
+        self.code_finder = _RealFinder(simplified, code)
+        self.handle_ignores = handle_ignores
+        self.code = code
+
+    def _init_ignores(self):
+        ignores = rope.base.simplify.ignored_regions(self.code)
+        self.dumb_finder = _RealFinder(self.code, self.code)
+        self.starts = [ignored[0] for ignored in ignores]
+        self.ends = [ignored[1] for ignored in ignores]
+
+    def _context_call(self, name, offset):
+        if self.handle_ignores:
+            if not hasattr(self, 'starts'):
+                self._init_ignores()
+            start = bisect.bisect(self.starts, offset)
+            if start > 0 and offset < self.ends[start - 1]:
+                return getattr(self.dumb_finder, name)(offset)
+        return getattr(self.code_finder, name)(offset)
+
+    def get_primary_at(self, offset):
+        return self._context_call('get_primary_at', offset)
+
+    def get_word_at(self, offset):
+        return self._context_call('get_word_at', offset)
+
+    def get_primary_range(self, offset):
+        return self._context_call('get_primary_range', offset)
+
+    def get_splitted_primary_before(self, offset):
+        return self._context_call('get_splitted_primary_before', offset)
+
+    def get_word_range(self, offset):
+        return self._context_call('get_word_range', offset)
+
+    def is_function_keyword_parameter(self, offset):
+        return self.code_finder.is_function_keyword_parameter(offset)
+
+    def is_a_class_or_function_name_in_header(self, offset):
+        return self.code_finder.is_a_class_or_function_name_in_header(offset)
+
+    def is_from_statement_module(self, offset):
+        return self.code_finder.is_from_statement_module(offset)
+
+    def is_from_aliased(self, offset):
+        return self.code_finder.is_from_aliased(offset)
+
+    def find_parens_start_from_inside(self, offset):
+        return self.code_finder.find_parens_start_from_inside(offset)
+
+    def is_a_name_after_from_import(self, offset):
+        return self.code_finder.is_a_name_after_from_import(offset)
+
+    def is_from_statement(self, offset):
+        return self.code_finder.is_from_statement(offset)
+
+    def get_from_aliased(self, offset):
+        return self.code_finder.get_from_aliased(offset)
+
+    def is_import_statement(self, offset):
+        return self.code_finder.is_import_statement(offset)
+
+    def is_assigned_here(self, offset):
+        return self.code_finder.is_assigned_here(offset)
+
+    def is_a_function_being_called(self, offset):
+        return self.code_finder.is_a_function_being_called(offset)
+
+    def get_word_parens_range(self, offset):
+        return self.code_finder.get_word_parens_range(offset)
+
+    def is_name_assigned_in_class_body(self, offset):
+        return self.code_finder.is_name_assigned_in_class_body(offset)
+
+    def is_on_function_call_keyword(self, offset):
+        return self.code_finder.is_on_function_call_keyword(offset)
+
+    def _find_parens_start(self, offset):
+        return self.code_finder._find_parens_start(offset)
+
+    def get_parameters(self, first, last):
+        return self.code_finder.get_parameters(first, last)
+
+    def get_from_module(self, offset):
+        return self.code_finder.get_from_module(offset)
+
+    def is_assigned_in_a_tuple_assignment(self, offset):
+        return self.code_finder.is_assigned_in_a_tuple_assignment(offset)
+
+    def get_assignment_type(self, offset):
+        return self.code_finder.get_assignment_type(offset)
+
+    def get_function_and_args_in_header(self, offset):
+        return self.code_finder.get_function_and_args_in_header(offset)
+
+    def get_lambda_and_args(self, offset):
+        return self.code_finder.get_lambda_and_args(offset)
+
+    def find_function_offset(self, offset):
+        return self.code_finder.find_function_offset(offset)
+
+
+class _RealFinder(object):
+
+    def __init__(self, code, raw):
+        self.code = code
+        self.raw = raw
+
+    def _find_word_start(self, offset):
+        current_offset = offset
+        while current_offset >= 0 and self._is_id_char(current_offset):
+            current_offset -= 1
+        return current_offset + 1
+
+    def _find_word_end(self, offset):
+        while offset + 1 < len(self.code) and self._is_id_char(offset + 1):
+            offset += 1
+        return offset
+
+    def _find_last_non_space_char(self, offset):
+        while offset >= 0 and self.code[offset].isspace():
+            if self.code[offset] == '\n':
+                return offset
+            offset -= 1
+        return max(-1, offset)
+
+    def get_word_at(self, offset):
+        offset = self._get_fixed_offset(offset)
+        return self.raw[self._find_word_start(offset):
+                        self._find_word_end(offset) + 1]
+
+    def _get_fixed_offset(self, offset):
+        if offset >= len(self.code):
+            return offset - 1
+        if not self._is_id_char(offset):
+            if offset > 0 and self._is_id_char(offset - 1):
+                return offset - 1
+            if offset < len(self.code) - 1 and self._is_id_char(offset + 1):
+                return offset + 1
+        return offset
+
+    def _is_id_char(self, offset):
+        return self.code[offset].isalnum() or self.code[offset] == '_'
+
+    def _find_string_start(self, offset):
+        kind = self.code[offset]
+        try:
+            return self.code.rindex(kind, 0, offset)
+        except ValueError:
+            return 0
+
+    def _find_parens_start(self, offset):
+        offset = self._find_last_non_space_char(offset - 1)
+        while offset >= 0 and self.code[offset] not in '[({':
+            if self.code[offset] not in ':,':
+                offset = self._find_primary_start(offset)
+            offset = self._find_last_non_space_char(offset - 1)
+        return offset
+
+    def _find_atom_start(self, offset):
+        old_offset = offset
+        if self.code[offset] == '\n':
+            return offset + 1
+        if self.code[offset].isspace():
+            offset = self._find_last_non_space_char(offset)
+        if self.code[offset] in '\'"':
+            return self._find_string_start(offset)
+        if self.code[offset] in ')]}':
+            return self._find_parens_start(offset)
+        if self._is_id_char(offset):
+            return self._find_word_start(offset)
+        return old_offset
+
+    def _find_primary_without_dot_start(self, offset):
+        """It tries to find the undotted primary start
+
+        It is different from `self._get_atom_start()` in that it
+        follows function calls, too; such as in ``f(x)``.
+
+        """
+        last_atom = offset
+        offset = self._find_last_non_space_char(last_atom)
+        while offset > 0 and self.code[offset] in ')]':
+            last_atom = self._find_parens_start(offset)
+            offset = self._find_last_non_space_char(last_atom - 1)
+        if offset >= 0 and (self.code[offset] in '"\'})]' or
+                            self._is_id_char(offset)):
+            atom_start = self._find_atom_start(offset)
+            if not keyword.iskeyword(self.code[atom_start:offset + 1]):
+                return atom_start
+        return last_atom
+
+    def _find_primary_start(self, offset):
+        if offset >= len(self.code):
+            offset = len(self.code) - 1
+        if self.code[offset] != '.':
+            offset = self._find_primary_without_dot_start(offset)
+        else:
+            offset = offset + 1
+        while offset > 0:
+            prev = self._find_last_non_space_char(offset - 1)
+            if offset <= 0 or self.code[prev] != '.':
+                break
+            offset = self._find_primary_without_dot_start(prev - 1)
+            if not self._is_id_char(offset):
+                break
+
+        return offset
+
+    def get_primary_at(self, offset):
+        offset = self._get_fixed_offset(offset)
+        start, end = self.get_primary_range(offset)
+        return self.raw[start:end].strip()
+
+    def get_splitted_primary_before(self, offset):
+        """returns expression, starting, starting_offset
+
+        This function is used in `rope.codeassist.assist` function.
+        """
+        if offset == 0:
+            return ('', '', 0)
+        end = offset - 1
+        word_start = self._find_atom_start(end)
+        real_start = self._find_primary_start(end)
+        if self.code[word_start:offset].strip() == '':
+            word_start = end
+        if self.code[end].isspace():
+            word_start = end
+        if self.code[real_start:word_start].strip() == '':
+            real_start = word_start
+        if real_start == word_start == end and not self._is_id_char(end):
+            return ('', '', offset)
+        if real_start == word_start:
+            return ('', self.raw[word_start:offset], word_start)
+        else:
+            if self.code[end] == '.':
+                return (self.raw[real_start:end], '', offset)
+            last_dot_position = word_start
+            if self.code[word_start] != '.':
+                last_dot_position = \
+                    self._find_last_non_space_char(word_start - 1)
+            last_char_position = \
+                self._find_last_non_space_char(last_dot_position - 1)
+            if self.code[word_start].isspace():
+                word_start = offset
+            return (self.raw[real_start:last_char_position + 1],
+                    self.raw[word_start:offset], word_start)
+
+    def _get_line_start(self, offset):
+        try:
+            return self.code.rindex('\n', 0, offset + 1)
+        except ValueError:
+            return 0
+
+    def _get_line_end(self, offset):
+        try:
+            return self.code.index('\n', offset)
+        except ValueError:
+            return len(self.code)
+
+    def is_name_assigned_in_class_body(self, offset):
+        word_start = self._find_word_start(offset - 1)
+        word_end = self._find_word_end(offset) + 1
+        if '.' in self.code[word_start:word_end]:
+            return False
+        line_start = self._get_line_start(word_start)
+        line = self.code[line_start:word_start].strip()
+        return not line and self.get_assignment_type(offset) == '='
+
+    def is_a_class_or_function_name_in_header(self, offset):
+        word_start = self._find_word_start(offset - 1)
+        line_start = self._get_line_start(word_start)
+        prev_word = self.code[line_start:word_start].strip()
+        return prev_word in ['def', 'class']
+
+    def _find_first_non_space_char(self, offset):
+        if offset >= len(self.code):
+            return len(self.code)
+        while offset < len(self.code) and self.code[offset].isspace():
+            if self.code[offset] == '\n':
+                return offset
+            offset += 1
+        return offset
+
+    def is_a_function_being_called(self, offset):
+        word_end = self._find_word_end(offset) + 1
+        next_char = self._find_first_non_space_char(word_end)
+        return next_char < len(self.code) and \
+            self.code[next_char] == '(' and \
+            not self.is_a_class_or_function_name_in_header(offset)
+
+    def _find_import_end(self, start):
+        return self._get_line_end(start)
+
+    def is_import_statement(self, offset):
+        try:
+            last_import = self.code.rindex('import ', 0, offset)
+        except ValueError:
+            return False
+        return self._find_import_end(last_import + 7) >= offset
+
+    def is_from_statement(self, offset):
+        try:
+            last_from = self.code.rindex('from ', 0, offset)
+            from_import = self.code.index(' import ', last_from)
+            from_names = from_import + 8
+        except ValueError:
+            return False
+        from_names = self._find_first_non_space_char(from_names)
+        return self._find_import_end(from_names) >= offset
+
+    def is_from_statement_module(self, offset):
+        if offset >= len(self.code) - 1:
+            return False
+        stmt_start = self._find_primary_start(offset)
+        line_start = self._get_line_start(stmt_start)
+        prev_word = self.code[line_start:stmt_start].strip()
+        return prev_word == 'from'
+
+    def is_a_name_after_from_import(self, offset):
+        try:
+            if len(self.code) > offset and self.code[offset] == '\n':
+                line_start = self._get_line_start(offset - 1)
+            else:
+                line_start = self._get_line_start(offset)
+            last_from = self.code.rindex('from ', line_start, offset)
+            from_import = self.code.index(' import ', last_from)
+            from_names = from_import + 8
+        except ValueError:
+            return False
+        if from_names - 1 > offset:
+            return False
+        return self._find_import_end(from_names) >= offset
+
+    def get_from_module(self, offset):
+        try:
+            last_from = self.code.rindex('from ', 0, offset)
+            import_offset = self.code.index(' import ', last_from)
+            end = self._find_last_non_space_char(import_offset)
+            return self.get_primary_at(end)
+        except ValueError:
+            pass
+
+    def is_from_aliased(self, offset):
+        if not self.is_a_name_after_from_import(offset):
+            return False
+        try:
+            end = self._find_word_end(offset)
+            as_end = min(self._find_word_end(end + 1), len(self.code))
+            as_start = self._find_word_start(as_end)
+            if self.code[as_start:as_end + 1] == 'as':
+                return True
+        except ValueError:
+            return False
+
+    def get_from_aliased(self, offset):
+        try:
+            end = self._find_word_end(offset)
+            as_ = self._find_word_end(end + 1)
+            alias = self._find_word_end(as_ + 1)
+            start = self._find_word_start(alias)
+            return self.raw[start:alias + 1]
+        except ValueError:
+            pass
+
+    def is_function_keyword_parameter(self, offset):
+        word_end = self._find_word_end(offset)
+        if word_end + 1 == len(self.code):
+            return False
+        next_char = self._find_first_non_space_char(word_end + 1)
+        equals = self.code[next_char:next_char + 2]
+        if equals == '==' or not equals.startswith('='):
+            return False
+        word_start = self._find_word_start(offset)
+        prev_char = self._find_last_non_space_char(word_start - 1)
+        return prev_char - 1 >= 0 and self.code[prev_char] in ',('
+
+    def is_on_function_call_keyword(self, offset):
+        stop = self._get_line_start(offset)
+        if self._is_id_char(offset):
+            offset = self._find_word_start(offset) - 1
+        offset = self._find_last_non_space_char(offset)
+        if offset <= stop or self.code[offset] not in '(,':
+            return False
+        parens_start = self.find_parens_start_from_inside(offset)
+        return stop < parens_start
+
+    def find_parens_start_from_inside(self, offset):
+        stop = self._get_line_start(offset)
+        while offset > stop:
+            if self.code[offset] == '(':
+                break
+            if self.code[offset] != ',':
+                offset = self._find_primary_start(offset)
+            offset -= 1
+        return max(stop, offset)
+
+    def is_assigned_here(self, offset):
+        return self.get_assignment_type(offset) is not None
+
+    def get_assignment_type(self, offset):
+        # XXX: does not handle tuple assignments
+        word_end = self._find_word_end(offset)
+        next_char = self._find_first_non_space_char(word_end + 1)
+        single = self.code[next_char:next_char + 1]
+        double = self.code[next_char:next_char + 2]
+        triple = self.code[next_char:next_char + 3]
+        if double not in ('==', '<=', '>=', '!='):
+            for op in [single, double, triple]:
+                if op.endswith('='):
+                    return op
+
+    def get_primary_range(self, offset):
+        start = self._find_primary_start(offset)
+        end = self._find_word_end(offset) + 1
+        return (start, end)
+
+    def get_word_range(self, offset):
+        offset = max(0, offset)
+        start = self._find_word_start(offset)
+        end = self._find_word_end(offset) + 1
+        return (start, end)
+
+    def get_word_parens_range(self, offset, opening='(', closing=')'):
+        end = self._find_word_end(offset)
+        start_parens = self.code.index(opening, end)
+        index = start_parens
+        open_count = 0
+        while index < len(self.code):
+            if self.code[index] == opening:
+                open_count += 1
+            if self.code[index] == closing:
+                open_count -= 1
+            if open_count == 0:
+                return (start_parens, index + 1)
+            index += 1
+        return (start_parens, index)
+
+    def get_parameters(self, first, last):
+        keywords = []
+        args = []
+        current = self._find_last_non_space_char(last - 1)
+        while current > first:
+            primary_start = current
+            current = self._find_primary_start(current)
+            while current != first and self.code[current] not in '=,':
+                current = self._find_last_non_space_char(current - 1)
+            primary = self.raw[current + 1:primary_start + 1].strip()
+            if self.code[current] == '=':
+                primary_start = current - 1
+                current -= 1
+                while current != first and self.code[current] not in ',':
+                    current = self._find_last_non_space_char(current - 1)
+                param_name = self.raw[current + 1:primary_start + 1].strip()
+                keywords.append((param_name, primary))
+            else:
+                args.append(primary)
+            current = self._find_last_non_space_char(current - 1)
+        args.reverse()
+        keywords.reverse()
+        return args, keywords
+
+    def is_assigned_in_a_tuple_assignment(self, offset):
+        start = self._get_line_start(offset)
+        end = self._get_line_end(offset)
+        primary_start = self._find_primary_start(offset)
+        primary_end = self._find_word_end(offset)
+
+        prev_char_offset = self._find_last_non_space_char(primary_start - 1)
+        next_char_offset = self._find_first_non_space_char(primary_end + 1)
+        next_char = prev_char = ''
+        if prev_char_offset >= start:
+            prev_char = self.code[prev_char_offset]
+        if next_char_offset < end:
+            next_char = self.code[next_char_offset]
+        try:
+            equals_offset = self.code.index('=', start, end)
+        except ValueError:
+            return False
+        if prev_char not in '(,' and next_char not in ',)':
+            return False
+        parens_start = self.find_parens_start_from_inside(offset)
+        # XXX: only handling (x, y) = value
+        return offset < equals_offset and \
+            self.code[start:parens_start].strip() == ''
+
+    def get_function_and_args_in_header(self, offset):
+        offset = self.find_function_offset(offset)
+        lparens, rparens = self.get_word_parens_range(offset)
+        return self.raw[offset:rparens + 1]
+
+    def find_function_offset(self, offset, definition='def '):
+        while True:
+            offset = self.code.index(definition, offset)
+            if offset == 0 or not self._is_id_char(offset - 1):
+                break
+            offset += 1
+        def_ = offset + 4
+        return self._find_first_non_space_char(def_)
+
+    def get_lambda_and_args(self, offset):
+        offset = self.find_function_offset(offset, definition='lambda ')
+        lparens, rparens = self.get_word_parens_range(offset, opening=' ',
+                                                      closing=':')
+        return self.raw[offset:rparens + 1]
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__init__.py
new file mode 100644
index 0000000..0d3f837
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__init__.py
@@ -0,0 +1,7 @@
+"""rope IDE tools package
+
+This package contains modules that can be used in IDEs
+but do not depend on the UI.  So these modules will be used
+by `rope.ui` modules.
+
+"""
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..7bc6a78
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/autoimport.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/autoimport.cpython-35.pyc
new file mode 100644
index 0000000..9136dc0
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/autoimport.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/codeassist.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/codeassist.cpython-35.pyc
new file mode 100644
index 0000000..c72ef33
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/codeassist.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/findit.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/findit.cpython-35.pyc
new file mode 100644
index 0000000..65b0a4b
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/findit.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/fixsyntax.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/fixsyntax.cpython-35.pyc
new file mode 100644
index 0000000..f2df883
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/fixsyntax.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/generate.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/generate.cpython-35.pyc
new file mode 100644
index 0000000..ac93427
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/__pycache__/generate.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/autoimport.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/autoimport.py
new file mode 100644
index 0000000..9670080
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/autoimport.py
@@ -0,0 +1,222 @@
+import re
+
+from rope.base import builtins
+from rope.base import exceptions
+from rope.base import libutils
+from rope.base import pynames
+from rope.base import pyobjects
+from rope.base import resources
+from rope.base import resourceobserver
+from rope.base import taskhandle
+from rope.refactor import importutils
+
+
+class AutoImport(object):
+    """A class for finding the module that provides a name
+
+    This class maintains a cache of global names in python modules.
+    Note that this cache is not accurate and might be out of date.
+
+    """
+
+    def __init__(self, project, observe=True, underlined=False):
+        """Construct an AutoImport object
+
+        If `observe` is `True`, listen for project changes and update
+        the cache.
+
+        If `underlined` is `True`, underlined names are cached, too.
+        """
+        self.project = project
+        self.underlined = underlined
+        self.names = project.data_files.read_data('globalnames')
+        if self.names is None:
+            self.names = {}
+        project.data_files.add_write_hook(self._write)
+        # XXX: using a filtered observer
+        observer = resourceobserver.ResourceObserver(
+            changed=self._changed, moved=self._moved, removed=self._removed)
+        if observe:
+            project.add_observer(observer)
+
+    def import_assist(self, starting):
+        """Return a list of ``(name, module)`` tuples
+
+        This function tries to find modules that have a global name
+        that starts with `starting`.
+        """
+        # XXX: breaking if gave up! use generators
+        result = []
+        for module in self.names:
+            for global_name in self.names[module]:
+                if global_name.startswith(starting):
+                    result.append((global_name, module))
+        return result
+
+    def get_modules(self, name):
+        """Return the list of modules that have global `name`"""
+        result = []
+        for module in self.names:
+            if name in self.names[module]:
+                result.append(module)
+        return result
+
+    def get_all_names(self):
+        """Return the list of all cached global names"""
+        result = set()
+        for module in self.names:
+            result.update(set(self.names[module]))
+        return result
+
+    def get_name_locations(self, name):
+        """Return a list of ``(resource, lineno)`` tuples"""
+        result = []
+        for module in self.names:
+            if name in self.names[module]:
+                try:
+                    pymodule = self.project.get_module(module)
+                    if name in pymodule:
+                        pyname = pymodule[name]
+                        module, lineno = pyname.get_definition_location()
+                        if module is not None:
+                            resource = module.get_module().get_resource()
+                            if resource is not None and lineno is not None:
+                                result.append((resource, lineno))
+                except exceptions.ModuleNotFoundError:
+                    pass
+        return result
+
+    def generate_cache(self, resources=None, underlined=None,
+                       task_handle=taskhandle.NullTaskHandle()):
+        """Generate global name cache for project files
+
+        If `resources` is a list of `rope.base.resource.File`\s, only
+        those files are searched; otherwise all python modules in the
+        project are cached.
+
+        """
+        if resources is None:
+            resources = self.project.get_python_files()
+        job_set = task_handle.create_jobset(
+            'Generatig autoimport cache', len(resources))
+        for file in resources:
+            job_set.started_job('Working on <%s>' % file.path)
+            self.update_resource(file, underlined)
+            job_set.finished_job()
+
+    def generate_modules_cache(self, modules, underlined=None,
+                               task_handle=taskhandle.NullTaskHandle()):
+        """Generate global name cache for modules listed in `modules`"""
+        job_set = task_handle.create_jobset(
+            'Generatig autoimport cache for modules', len(modules))
+        for modname in modules:
+            job_set.started_job('Working on <%s>' % modname)
+            if modname.endswith('.*'):
+                mod = self.project.find_module(modname[:-2])
+                if mod:
+                    for sub in submodules(mod):
+                        self.update_resource(sub, underlined)
+            else:
+                self.update_module(modname, underlined)
+            job_set.finished_job()
+
+    def clear_cache(self):
+        """Clear all entries in global-name cache
+
+        It might be a good idea to use this function before
+        regenerating global names.
+
+        """
+        self.names.clear()
+
+    def find_insertion_line(self, code):
+        """Guess at what line the new import should be inserted"""
+        match = re.search(r'^(def|class)\s+', code)
+        if match is not None:
+            code = code[:match.start()]
+        try:
+            pymodule = libutils.get_string_module(self.project, code)
+        except exceptions.ModuleSyntaxError:
+            return 1
+        testmodname = '__rope_testmodule_rope'
+        importinfo = importutils.NormalImport(((testmodname, None),))
+        module_imports = importutils.get_module_imports(self.project,
+                                                        pymodule)
+        module_imports.add_import(importinfo)
+        code = module_imports.get_changed_source()
+        offset = code.index(testmodname)
+        lineno = code.count('\n', 0, offset) + 1
+        return lineno
+
+    def update_resource(self, resource, underlined=None):
+        """Update the cache for global names in `resource`"""
+        try:
+            pymodule = self.project.get_pymodule(resource)
+            modname = self._module_name(resource)
+            self._add_names(pymodule, modname, underlined)
+        except exceptions.ModuleSyntaxError:
+            pass
+
+    def update_module(self, modname, underlined=None):
+        """Update the cache for global names in `modname` module
+
+        `modname` is the name of a module.
+        """
+        try:
+            pymodule = self.project.get_module(modname)
+            self._add_names(pymodule, modname, underlined)
+        except exceptions.ModuleNotFoundError:
+            pass
+
+    def _module_name(self, resource):
+        return libutils.modname(resource)
+
+    def _add_names(self, pymodule, modname, underlined):
+        if underlined is None:
+            underlined = self.underlined
+        globals = []
+        if isinstance(pymodule, pyobjects.PyDefinedObject):
+            attributes = pymodule._get_structural_attributes()
+        else:
+            attributes = pymodule.get_attributes()
+        for name, pyname in attributes.items():
+            if not underlined and name.startswith('_'):
+                continue
+            if isinstance(pyname, (pynames.AssignedName, pynames.DefinedName)):
+                globals.append(name)
+            if isinstance(pymodule, builtins.BuiltinModule):
+                globals.append(name)
+        self.names[modname] = globals
+
+    def _write(self):
+        self.project.data_files.write_data('globalnames', self.names)
+
+    def _changed(self, resource):
+        if not resource.is_folder():
+            self.update_resource(resource)
+
+    def _moved(self, resource, newresource):
+        if not resource.is_folder():
+            modname = self._module_name(resource)
+            if modname in self.names:
+                del self.names[modname]
+            self.update_resource(newresource)
+
+    def _removed(self, resource):
+        if not resource.is_folder():
+            modname = self._module_name(resource)
+            if modname in self.names:
+                del self.names[modname]
+
+
+def submodules(mod):
+    if isinstance(mod, resources.File):
+        if mod.name.endswith('.py') and mod.name != '__init__.py':
+            return set([mod])
+        return set()
+    if not mod.has_child('__init__.py'):
+        return set()
+    result = set([mod])
+    for child in mod.get_children():
+        result |= submodules(child)
+    return result
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/changestack.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/changestack.py
new file mode 100644
index 0000000..70f2271
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/changestack.py
@@ -0,0 +1,52 @@
+"""For performing many refactorings as a single command
+
+`changestack` module can be used to perform many refactorings on top
+of each other as one bigger command.  It can be used like::
+
+  stack = ChangeStack(project, 'my big command')
+
+  #..
+  stack.push(refactoring1.get_changes())
+  #..
+  stack.push(refactoring2.get_changes())
+  #..
+  stack.push(refactoringX.get_changes())
+
+  stack.pop_all()
+  changes = stack.merged()
+
+Now `changes` can be previewed or performed as before.
+"""
+
+from rope.base import change
+
+
+class ChangeStack(object):
+
+    def __init__(self, project, description='merged changes'):
+        self.project = project
+        self.description = description
+        self.stack = []
+
+    def push(self, changes):
+        self.stack.append(changes)
+        self.project.do(changes)
+
+    def pop_all(self):
+        for i in range(len(self.stack)):
+            self.project.history.undo(drop=True)
+
+    def merged(self):
+        result = change.ChangeSet(self.description)
+        for changes in self.stack:
+            for c in self._basic_changes(changes):
+                result.add_change(c)
+        return result
+
+    def _basic_changes(self, changes):
+        if isinstance(changes, change.ChangeSet):
+            for child in changes.changes:
+                for atom in self._basic_changes(child):
+                    yield atom
+        else:
+            yield changes
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/codeassist.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/codeassist.py
new file mode 100644
index 0000000..92c1bfc
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/codeassist.py
@@ -0,0 +1,695 @@
+import keyword
+import sys
+import warnings
+
+import rope.base.codeanalyze
+import rope.base.evaluate
+from rope.base import builtins
+from rope.base import exceptions
+from rope.base import libutils
+from rope.base import pynames
+from rope.base import pynamesdef
+from rope.base import pyobjects
+from rope.base import pyobjectsdef
+from rope.base import pyscopes
+from rope.base import worder
+from rope.contrib import fixsyntax
+from rope.refactor import functionutils
+
+
+def code_assist(project, source_code, offset, resource=None,
+                templates=None, maxfixes=1, later_locals=True):
+    """Return python code completions as a list of `CodeAssistProposal`\s
+
+    `resource` is a `rope.base.resources.Resource` object.  If
+    provided, relative imports are handled.
+
+    `maxfixes` is the maximum number of errors to fix if the code has
+    errors in it.
+
+    If `later_locals` is `False` names defined in this scope and after
+    this line is ignored.
+
+    """
+    if templates is not None:
+        warnings.warn('Codeassist no longer supports templates',
+                      DeprecationWarning, stacklevel=2)
+    assist = _PythonCodeAssist(
+        project, source_code, offset, resource=resource,
+        maxfixes=maxfixes, later_locals=later_locals)
+    return assist()
+
+
+def starting_offset(source_code, offset):
+    """Return the offset in which the completion should be inserted
+
+    Usually code assist proposals should be inserted like::
+
+        completion = proposal.name
+        result = (source_code[:starting_offset] +
+                  completion + source_code[offset:])
+
+    Where starting_offset is the offset returned by this function.
+
+    """
+    word_finder = worder.Worder(source_code, True)
+    expression, starting, starting_offset = \
+        word_finder.get_splitted_primary_before(offset)
+    return starting_offset
+
+
+def get_doc(project, source_code, offset, resource=None, maxfixes=1):
+    """Get the pydoc"""
+    fixer = fixsyntax.FixSyntax(project, source_code, resource, maxfixes)
+    pyname = fixer.pyname_at(offset)
+    if pyname is None:
+        return None
+    pyobject = pyname.get_object()
+    return PyDocExtractor().get_doc(pyobject)
+
+
+def get_calltip(project, source_code, offset, resource=None,
+                maxfixes=1, ignore_unknown=False, remove_self=False):
+    """Get the calltip of a function
+
+    The format of the returned string is
+    ``module_name.holding_scope_names.function_name(arguments)``.  For
+    classes `__init__()` and for normal objects `__call__()` function
+    is used.
+
+    Note that the offset is on the function itself *not* after the its
+    open parenthesis.  (Actually it used to be the other way but it
+    was easily confused when string literals were involved.  So I
+    decided it is better for it not to try to be too clever when it
+    cannot be clever enough).  You can use a simple search like::
+
+        offset = source_code.rindex('(', 0, offset) - 1
+
+    to handle simple situations.
+
+    If `ignore_unknown` is `True`, `None` is returned for functions
+    without source-code like builtins and extensions.
+
+    If `remove_self` is `True`, the first parameter whose name is self
+    will be removed for methods.
+    """
+    fixer = fixsyntax.FixSyntax(project, source_code, resource, maxfixes)
+    pyname = fixer.pyname_at(offset)
+    if pyname is None:
+        return None
+    pyobject = pyname.get_object()
+    return PyDocExtractor().get_calltip(pyobject, ignore_unknown, remove_self)
+
+
+def get_definition_location(project, source_code, offset,
+                            resource=None, maxfixes=1):
+    """Return the definition location of the python name at `offset`
+
+    Return a (`rope.base.resources.Resource`, lineno) tuple.  If no
+    `resource` is given and the definition is inside the same module,
+    the first element of the returned tuple would be `None`.  If the
+    location cannot be determined ``(None, None)`` is returned.
+
+    """
+    fixer = fixsyntax.FixSyntax(project, source_code, resource, maxfixes)
+    pyname = fixer.pyname_at(offset)
+    if pyname is not None:
+        module, lineno = pyname.get_definition_location()
+        if module is not None:
+            return module.get_module().get_resource(), lineno
+    return (None, None)
+
+
+def find_occurrences(*args, **kwds):
+    import rope.contrib.findit
+    warnings.warn('Use `rope.contrib.findit.find_occurrences()` instead',
+                  DeprecationWarning, stacklevel=2)
+    return rope.contrib.findit.find_occurrences(*args, **kwds)
+
+
+def get_canonical_path(project, resource, offset):
+    """Get the canonical path to an object.
+
+    Given the offset of the object, this returns a list of
+    (name, name_type) tuples representing the canonical path to the
+    object. For example, the 'x' in the following code:
+
+        class Foo(object):
+            def bar(self):
+                class Qux(object):
+                    def mux(self, x):
+                        pass
+
+    we will return:
+
+        [('Foo', 'CLASS'), ('bar', 'FUNCTION'), ('Qux', 'CLASS'),
+         ('mux', 'FUNCTION'), ('x', 'PARAMETER')]
+
+    `resource` is a `rope.base.resources.Resource` object.
+
+    `offset` is the offset of the pyname you want the path to.
+
+    """
+    # Retrieve the PyName.
+    pymod = project.get_pymodule(resource)
+    pyname = rope.base.evaluate.eval_location(pymod, offset)
+
+    # Now get the location of the definition and its containing scope.
+    defmod, lineno = pyname.get_definition_location()
+    if not defmod:
+        return None
+    scope = defmod.get_scope().get_inner_scope_for_line(lineno)
+
+    # Start with the name of the object we're interested in.
+    names = []
+    if isinstance(pyname, pynamesdef.ParameterName):
+        names = [(worder.get_name_at(pymod.get_resource(), offset),
+                  'PARAMETER') ]
+    elif isinstance(pyname, pynamesdef.AssignedName):
+        names = [(worder.get_name_at(pymod.get_resource(), offset),
+                  'VARIABLE')]
+
+    # Collect scope names.
+    while scope.parent:
+        if isinstance(scope, pyscopes.FunctionScope):
+            scope_type = 'FUNCTION'
+        elif isinstance(scope, pyscopes.ClassScope):
+            scope_type = 'CLASS'
+        else:
+            scope_type = None
+        names.append((scope.pyobject.get_name(), scope_type))
+        scope = scope.parent
+
+    names.append((defmod.get_resource().real_path, 'MODULE'))
+    names.reverse()
+    return names
+
+
+class CompletionProposal(object):
+    """A completion proposal
+
+    The `scope` instance variable shows where proposed name came from
+    and can be 'global', 'local', 'builtin', 'attribute', 'keyword',
+    'imported', 'parameter_keyword'.
+
+    The `type` instance variable shows the approximate type of the
+    proposed object and can be 'instance', 'class', 'function', 'module',
+    and `None`.
+
+    All possible relations between proposal's `scope` and `type` are shown
+    in the table below (different scopes in rows and types in columns):
+
+                      | instance | class | function | module | None
+                local |    +     |   +   |    +     |   +    |
+               global |    +     |   +   |    +     |   +    |
+              builtin |    +     |   +   |    +     |        |
+            attribute |    +     |   +   |    +     |   +    |
+             imported |    +     |   +   |    +     |   +    |
+              keyword |          |       |          |        |  +
+    parameter_keyword |          |       |          |        |  +
+
+    """
+
+    def __init__(self, name, scope, pyname=None):
+        self.name = name
+        self.pyname = pyname
+        self.scope = self._get_scope(scope)
+
+    def __str__(self):
+        return '%s (%s, %s)' % (self.name, self.scope, self.type)
+
+    def __repr__(self):
+        return str(self)
+
+    @property
+    def parameters(self):
+        """The names of the parameters the function takes.
+
+        Returns None if this completion is not a function.
+        """
+        pyname = self.pyname
+        if isinstance(pyname, pynames.ImportedName):
+            pyname = pyname._get_imported_pyname()
+        if isinstance(pyname, pynames.DefinedName):
+            pyobject = pyname.get_object()
+            if isinstance(pyobject, pyobjects.AbstractFunction):
+                return pyobject.get_param_names()
+
+    @property
+    def type(self):
+        pyname = self.pyname
+        if isinstance(pyname, builtins.BuiltinName):
+            pyobject = pyname.get_object()
+            if isinstance(pyobject, builtins.BuiltinFunction):
+                return 'function'
+            elif isinstance(pyobject, builtins.BuiltinClass):
+                return 'class'
+            elif isinstance(pyobject, builtins.BuiltinObject) or \
+                    isinstance(pyobject, builtins.BuiltinName):
+                return 'instance'
+        elif isinstance(pyname, pynames.ImportedModule):
+            return 'module'
+        elif isinstance(pyname, pynames.ImportedName) or \
+                isinstance(pyname, pynames.DefinedName):
+            pyobject = pyname.get_object()
+            if isinstance(pyobject, pyobjects.AbstractFunction):
+                return 'function'
+            if isinstance(pyobject, pyobjects.AbstractClass):
+                return 'class'
+        return 'instance'
+
+    def _get_scope(self, scope):
+        if isinstance(self.pyname, builtins.BuiltinName):
+            return 'builtin'
+        if isinstance(self.pyname, pynames.ImportedModule) or \
+           isinstance(self.pyname, pynames.ImportedName):
+            return 'imported'
+        return scope
+
+    def get_doc(self):
+        """Get the proposed object's docstring.
+
+        Returns None if it can not be get.
+        """
+        if not self.pyname:
+            return None
+        pyobject = self.pyname.get_object()
+        if not hasattr(pyobject, 'get_doc'):
+            return None
+        return self.pyname.get_object().get_doc()
+
+    @property
+    def kind(self):
+        warnings.warn("the proposal's `kind` property is deprecated, "
+                      "use `scope` instead")
+        return self.scope
+
+
+# leaved for backward compatibility
+CodeAssistProposal = CompletionProposal
+
+
+class NamedParamProposal(CompletionProposal):
+    """A parameter keyword completion proposal
+
+    Holds reference to ``_function`` -- the function which
+    parameter ``name`` belongs to. This allows to determine
+    default value for this parameter.
+    """
+    def __init__(self, name, function):
+        self.argname = name
+        name = '%s=' % name
+        super(NamedParamProposal, self).__init__(name, 'parameter_keyword')
+        self._function = function
+
+    def get_default(self):
+        """Get a string representation of a param's default value.
+
+        Returns None if there is no default value for this param.
+        """
+        definfo = functionutils.DefinitionInfo.read(self._function)
+        for arg, default in definfo.args_with_defaults:
+            if self.argname == arg:
+                return default
+        return None
+
+
+def sorted_proposals(proposals, scopepref=None, typepref=None):
+    """Sort a list of proposals
+
+    Return a sorted list of the given `CodeAssistProposal`\s.
+
+    `scopepref` can be a list of proposal scopes.  Defaults to
+    ``['parameter_keyword', 'local', 'global', 'imported',
+    'attribute', 'builtin', 'keyword']``.
+
+    `typepref` can be a list of proposal types.  Defaults to
+    ``['class', 'function', 'instance', 'module', None]``.
+    (`None` stands for completions with no type like keywords.)
+    """
+    sorter = _ProposalSorter(proposals, scopepref, typepref)
+    return sorter.get_sorted_proposal_list()
+
+
+def starting_expression(source_code, offset):
+    """Return the expression to complete"""
+    word_finder = worder.Worder(source_code, True)
+    expression, starting, starting_offset = \
+        word_finder.get_splitted_primary_before(offset)
+    if expression:
+        return expression + '.' + starting
+    return starting
+
+
+def default_templates():
+    warnings.warn('default_templates() is deprecated.',
+                  DeprecationWarning, stacklevel=2)
+    return {}
+
+
+class _PythonCodeAssist(object):
+
+    def __init__(self, project, source_code, offset, resource=None,
+                 maxfixes=1, later_locals=True):
+        self.project = project
+        self.code = source_code
+        self.resource = resource
+        self.maxfixes = maxfixes
+        self.later_locals = later_locals
+        self.word_finder = worder.Worder(source_code, True)
+        self.expression, self.starting, self.offset = \
+            self.word_finder.get_splitted_primary_before(offset)
+
+    keywords = keyword.kwlist
+
+    def _find_starting_offset(self, source_code, offset):
+        current_offset = offset - 1
+        while current_offset >= 0 and (source_code[current_offset].isalnum() or
+                                       source_code[current_offset] in '_'):
+            current_offset -= 1
+        return current_offset + 1
+
+    def _matching_keywords(self, starting):
+        result = []
+        for kw in self.keywords:
+            if kw.startswith(starting):
+                result.append(CompletionProposal(kw, 'keyword'))
+        return result
+
+    def __call__(self):
+        if self.offset > len(self.code):
+            return []
+        completions = list(self._code_completions().values())
+        if self.expression.strip() == '' and self.starting.strip() != '':
+            completions.extend(self._matching_keywords(self.starting))
+        return completions
+
+    def _dotted_completions(self, module_scope, holding_scope):
+        result = {}
+        found_pyname = rope.base.evaluate.eval_str(holding_scope,
+                                                   self.expression)
+        if found_pyname is not None:
+            element = found_pyname.get_object()
+            compl_scope = 'attribute'
+            if isinstance(element, (pyobjectsdef.PyModule,
+                                    pyobjectsdef.PyPackage)):
+                compl_scope = 'imported'
+            for name, pyname in element.get_attributes().items():
+                if name.startswith(self.starting):
+                    result[name] = CompletionProposal(name, compl_scope,
+                                                      pyname)
+        return result
+
+    def _undotted_completions(self, scope, result, lineno=None):
+        if scope.parent is not None:
+            self._undotted_completions(scope.parent, result)
+        if lineno is None:
+            names = scope.get_propagated_names()
+        else:
+            names = scope.get_names()
+        for name, pyname in names.items():
+            if name.startswith(self.starting):
+                compl_scope = 'local'
+                if scope.get_kind() == 'Module':
+                    compl_scope = 'global'
+                if lineno is None or self.later_locals or \
+                   not self._is_defined_after(scope, pyname, lineno):
+                    result[name] = CompletionProposal(name, compl_scope,
+                                                      pyname)
+
+    def _from_import_completions(self, pymodule):
+        module_name = self.word_finder.get_from_module(self.offset)
+        if module_name is None:
+            return {}
+        pymodule = self._find_module(pymodule, module_name)
+        result = {}
+        for name in pymodule:
+            if name.startswith(self.starting):
+                result[name] = CompletionProposal(name, scope='global',
+                                                  pyname=pymodule[name])
+        return result
+
+    def _find_module(self, pymodule, module_name):
+        dots = 0
+        while module_name[dots] == '.':
+            dots += 1
+        pyname = pynames.ImportedModule(pymodule,
+                                        module_name[dots:], dots)
+        return pyname.get_object()
+
+    def _is_defined_after(self, scope, pyname, lineno):
+        location = pyname.get_definition_location()
+        if location is not None and location[1] is not None:
+            if location[0] == scope.pyobject.get_module() and \
+               lineno <= location[1] <= scope.get_end():
+                return True
+
+    def _code_completions(self):
+        lineno = self.code.count('\n', 0, self.offset) + 1
+        fixer = fixsyntax.FixSyntax(self.project, self.code,
+                                    self.resource, self.maxfixes)
+        pymodule = fixer.get_pymodule()
+        module_scope = pymodule.get_scope()
+        code = pymodule.source_code
+        lines = code.split('\n')
+        result = {}
+        start = fixsyntax._logical_start(lines, lineno)
+        indents = fixsyntax._get_line_indents(lines[start - 1])
+        inner_scope = module_scope.get_inner_scope_for_line(start, indents)
+        if self.word_finder.is_a_name_after_from_import(self.offset):
+            return self._from_import_completions(pymodule)
+        if self.expression.strip() != '':
+            result.update(self._dotted_completions(module_scope, inner_scope))
+        else:
+            result.update(self._keyword_parameters(module_scope.pyobject,
+                                                   inner_scope))
+            self._undotted_completions(inner_scope, result, lineno=lineno)
+        return result
+
+    def _keyword_parameters(self, pymodule, scope):
+        offset = self.offset
+        if offset == 0:
+            return {}
+        word_finder = worder.Worder(self.code, True)
+        if word_finder.is_on_function_call_keyword(offset - 1):
+            function_parens = word_finder.\
+                find_parens_start_from_inside(offset - 1)
+            primary = word_finder.get_primary_at(function_parens - 1)
+            try:
+                function_pyname = rope.base.evaluate.\
+                    eval_str(scope, primary)
+            except exceptions.BadIdentifierError:
+                return {}
+            if function_pyname is not None:
+                pyobject = function_pyname.get_object()
+                if isinstance(pyobject, pyobjects.AbstractFunction):
+                    pass
+                elif isinstance(pyobject, pyobjects.AbstractClass) and \
+                        '__init__' in pyobject:
+                    pyobject = pyobject['__init__'].get_object()
+                elif '__call__' in pyobject:
+                    pyobject = pyobject['__call__'].get_object()
+                if isinstance(pyobject, pyobjects.AbstractFunction):
+                    param_names = []
+                    param_names.extend(
+                        pyobject.get_param_names(special_args=False))
+                    result = {}
+                    for name in param_names:
+                        if name.startswith(self.starting):
+                            result[name + '='] = NamedParamProposal(
+                                name, pyobject
+                            )
+                    return result
+        return {}
+
+
+class _ProposalSorter(object):
+    """Sort a list of code assist proposals"""
+
+    def __init__(self, code_assist_proposals, scopepref=None, typepref=None):
+        self.proposals = code_assist_proposals
+        if scopepref is None:
+            scopepref = ['parameter_keyword', 'local', 'global', 'imported',
+                         'attribute', 'builtin', 'keyword']
+        self.scopepref = scopepref
+        if typepref is None:
+            typepref = ['class', 'function', 'instance', 'module', None]
+        self.typerank = dict((type, index)
+                             for index, type in enumerate(typepref))
+
+    def get_sorted_proposal_list(self):
+        """Return a list of `CodeAssistProposal`"""
+        proposals = {}
+        for proposal in self.proposals:
+            proposals.setdefault(proposal.scope, []).append(proposal)
+        result = []
+        for scope in self.scopepref:
+            scope_proposals = proposals.get(scope, [])
+            scope_proposals = [proposal for proposal in scope_proposals
+                               if proposal.type in self.typerank]
+            scope_proposals.sort(key=self._proposal_key)
+            result.extend(scope_proposals)
+        return result
+
+    def _proposal_key(self, proposal1):
+        def _underline_count(name):
+             return sum(1 for c in name if c == "_")
+        return (self.typerank.get(proposal1.type, 100),
+                _underline_count(proposal1.name),
+                proposal1.name)
+        #if proposal1.type != proposal2.type:
+        #    return cmp(self.typerank.get(proposal1.type, 100),
+        #               self.typerank.get(proposal2.type, 100))
+        #return self._compare_underlined_names(proposal1.name,
+        #                                      proposal2.name)
+
+
+class PyDocExtractor(object):
+
+    def get_doc(self, pyobject):
+        if isinstance(pyobject, pyobjects.AbstractFunction):
+            return self._get_function_docstring(pyobject)
+        elif isinstance(pyobject, pyobjects.AbstractClass):
+            return self._get_class_docstring(pyobject)
+        elif isinstance(pyobject, pyobjects.AbstractModule):
+            return self._trim_docstring(pyobject.get_doc())
+        return None
+
+    def get_calltip(self, pyobject, ignore_unknown=False, remove_self=False):
+        try:
+            if isinstance(pyobject, pyobjects.AbstractClass):
+                pyobject = pyobject['__init__'].get_object()
+            if not isinstance(pyobject, pyobjects.AbstractFunction):
+                pyobject = pyobject['__call__'].get_object()
+        except exceptions.AttributeNotFoundError:
+            return None
+        if ignore_unknown and not isinstance(pyobject, pyobjects.PyFunction):
+            return
+        if isinstance(pyobject, pyobjects.AbstractFunction):
+            result = self._get_function_signature(pyobject, add_module=True)
+            if remove_self and self._is_method(pyobject):
+                return result.replace('(self)', '()').replace('(self, ', '(')
+            return result
+
+    def _get_class_docstring(self, pyclass):
+        contents = self._trim_docstring(pyclass.get_doc(), 2)
+        supers = [super.get_name() for super in pyclass.get_superclasses()]
+        doc = 'class %s(%s):\n\n' % (pyclass.get_name(), ', '.join(supers)) \
+            + contents
+
+        if '__init__' in pyclass:
+            init = pyclass['__init__'].get_object()
+            if isinstance(init, pyobjects.AbstractFunction):
+                doc += '\n\n' + self._get_single_function_docstring(init)
+        return doc
+
+    def _get_function_docstring(self, pyfunction):
+        functions = [pyfunction]
+        if self._is_method(pyfunction):
+            functions.extend(self._get_super_methods(pyfunction.parent,
+                                                     pyfunction.get_name()))
+        return '\n\n'.join([self._get_single_function_docstring(function)
+                            for function in functions])
+
+    def _is_method(self, pyfunction):
+        return isinstance(pyfunction, pyobjects.PyFunction) and \
+            isinstance(pyfunction.parent, pyobjects.PyClass)
+
+    def _get_single_function_docstring(self, pyfunction):
+        signature = self._get_function_signature(pyfunction)
+        docs = self._trim_docstring(pyfunction.get_doc(), indents=2)
+        return signature + ':\n\n' + docs
+
+    def _get_super_methods(self, pyclass, name):
+        result = []
+        for super_class in pyclass.get_superclasses():
+            if name in super_class:
+                function = super_class[name].get_object()
+                if isinstance(function, pyobjects.AbstractFunction):
+                    result.append(function)
+            result.extend(self._get_super_methods(super_class, name))
+        return result
+
+    def _get_function_signature(self, pyfunction, add_module=False):
+        location = self._location(pyfunction, add_module)
+        if isinstance(pyfunction, pyobjects.PyFunction):
+            info = functionutils.DefinitionInfo.read(pyfunction)
+            return location + info.to_string()
+        else:
+            return '%s(%s)' % (location + pyfunction.get_name(),
+                               ', '.join(pyfunction.get_param_names()))
+
+    def _location(self, pyobject, add_module=False):
+        location = []
+        parent = pyobject.parent
+        while parent and not isinstance(parent, pyobjects.AbstractModule):
+            location.append(parent.get_name())
+            location.append('.')
+            parent = parent.parent
+        if add_module:
+            if isinstance(pyobject, pyobjects.PyFunction):
+                location.insert(0, self._get_module(pyobject))
+            if isinstance(parent, builtins.BuiltinModule):
+                location.insert(0, parent.get_name() + '.')
+        return ''.join(location)
+
+    def _get_module(self, pyfunction):
+        module = pyfunction.get_module()
+        if module is not None:
+            resource = module.get_resource()
+            if resource is not None:
+                return libutils.modname(resource) + '.'
+        return ''
+
+    def _trim_docstring(self, docstring, indents=0):
+        """The sample code from :PEP:`257`"""
+        if not docstring:
+            return ''
+        # Convert tabs to spaces (following normal Python rules)
+        # and split into a list of lines:
+        lines = docstring.expandtabs().splitlines()
+        # Determine minimum indentation (first line doesn't count):
+        indent = sys.maxsize
+        for line in lines[1:]:
+            stripped = line.lstrip()
+            if stripped:
+                indent = min(indent, len(line) - len(stripped))
+        # Remove indentation (first line is special):
+        trimmed = [lines[0].strip()]
+        if indent < sys.maxsize:
+            for line in lines[1:]:
+                trimmed.append(line[indent:].rstrip())
+        # Strip off trailing and leading blank lines:
+        while trimmed and not trimmed[-1]:
+            trimmed.pop()
+        while trimmed and not trimmed[0]:
+            trimmed.pop(0)
+        # Return a single string:
+        return '\n'.join((' ' * indents + line for line in trimmed))
+
+
+# Deprecated classes
+
+class TemplateProposal(CodeAssistProposal):
+    def __init__(self, name, template):
+        warnings.warn('TemplateProposal is deprecated.',
+                      DeprecationWarning, stacklevel=2)
+        super(TemplateProposal, self).__init__(name, 'template')
+        self.template = template
+
+
+class Template(object):
+
+    def __init__(self, template):
+        self.template = template
+        warnings.warn('Template is deprecated.',
+                      DeprecationWarning, stacklevel=2)
+
+    def variables(self):
+        return []
+
+    def substitute(self, mapping):
+        return self.template
+
+    def get_cursor_location(self, mapping):
+        return len(self.template)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/finderrors.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/finderrors.py
new file mode 100644
index 0000000..109a3e8
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/finderrors.py
@@ -0,0 +1,91 @@
+"""Finding bad name and attribute accesses
+
+`find_errors` function can be used to find possible bad name and
+attribute accesses.  As an example::
+
+  errors = find_errors(project, project.get_resource('mod.py'))
+  for error in errors:
+      print('%s: %s' % (error.lineno, error.error))
+
+prints possible errors for ``mod.py`` file.
+
+TODO:
+
+* use task handles
+* reporting names at most once
+* attributes of extension modules that don't appear in
+  extension_modules project config can be ignored
+* not calling `PyScope.get_inner_scope_for_line()` if it is a
+  bottleneck; needs profiling
+* not reporting occurrences where rope cannot infer the object
+* rope saves multiple objects for some of the names in its objectdb
+  use all of them not to give false positives
+* ... ;-)
+
+"""
+from rope.base import ast, evaluate, pyobjects
+
+
+def find_errors(project, resource):
+    """Find possible bad name and attribute accesses
+
+    It returns a list of `Error`\s.
+    """
+    pymodule = project.get_pymodule(resource)
+    finder = _BadAccessFinder(pymodule)
+    ast.walk(pymodule.get_ast(), finder)
+    return finder.errors
+
+
+class _BadAccessFinder(object):
+
+    def __init__(self, pymodule):
+        self.pymodule = pymodule
+        self.scope = pymodule.get_scope()
+        self.errors = []
+
+    def _Name(self, node):
+        if isinstance(node.ctx, (ast.Store, ast.Param)):
+            return
+        scope = self.scope.get_inner_scope_for_line(node.lineno)
+        pyname = scope.lookup(node.id)
+        if pyname is None:
+            self._add_error(node, 'Unresolved variable')
+        elif self._is_defined_after(scope, pyname, node.lineno):
+            self._add_error(node, 'Defined later')
+
+    def _Attribute(self, node):
+        if not isinstance(node.ctx, ast.Store):
+            scope = self.scope.get_inner_scope_for_line(node.lineno)
+            pyname = evaluate.eval_node(scope, node.value)
+            if pyname is not None and \
+               pyname.get_object() != pyobjects.get_unknown():
+                if node.attr not in pyname.get_object():
+                    self._add_error(node, 'Unresolved attribute')
+        ast.walk(node.value, self)
+
+    def _add_error(self, node, msg):
+        if isinstance(node, ast.Attribute):
+            name = node.attr
+        else:
+            name = node.id
+        if name != 'None':
+            error = Error(node.lineno, msg + ' ' + name)
+            self.errors.append(error)
+
+    def _is_defined_after(self, scope, pyname, lineno):
+        location = pyname.get_definition_location()
+        if location is not None and location[1] is not None:
+            if location[0] == self.pymodule and \
+               lineno <= location[1] <= scope.get_end():
+                return True
+
+
+class Error(object):
+
+    def __init__(self, lineno, error):
+        self.lineno = lineno
+        self.error = error
+
+    def __str__(self):
+        return '%s: %s' % (self.lineno, self.error)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/findit.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/findit.py
new file mode 100644
index 0000000..93eb01a
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/findit.py
@@ -0,0 +1,114 @@
+import rope.base.codeanalyze
+import rope.base.evaluate
+import rope.base.pyobjects
+from rope.base import taskhandle, exceptions, worder
+from rope.contrib import fixsyntax
+from rope.refactor import occurrences
+
+
+def find_occurrences(project, resource, offset, unsure=False, resources=None,
+                     in_hierarchy=False,
+                     task_handle=taskhandle.NullTaskHandle()):
+    """Return a list of `Location`\s
+
+    If `unsure` is `True`, possible matches are returned, too.  You
+    can use `Location.unsure` to see which are unsure occurrences.
+    `resources` can be a list of `rope.base.resource.File`\s that
+    should be searched for occurrences; if `None` all python files
+    in the project are searched.
+
+    """
+    name = worder.get_name_at(resource, offset)
+    this_pymodule = project.get_pymodule(resource)
+    primary, pyname = rope.base.evaluate.eval_location2(
+        this_pymodule, offset)
+
+    def is_match(occurrence):
+        return unsure
+    finder = occurrences.create_finder(
+        project, name, pyname, unsure=is_match,
+        in_hierarchy=in_hierarchy, instance=primary)
+    if resources is None:
+        resources = project.get_python_files()
+    job_set = task_handle.create_jobset('Finding Occurrences',
+                                        count=len(resources))
+    return _find_locations(finder, resources, job_set)
+
+
+def find_implementations(project, resource, offset, resources=None,
+                         task_handle=taskhandle.NullTaskHandle()):
+    """Find the places a given method is overridden.
+
+    Finds the places a method is implemented.  Returns a list of
+    `Location`\s.
+    """
+    name = worder.get_name_at(resource, offset)
+    this_pymodule = project.get_pymodule(resource)
+    pyname = rope.base.evaluate.eval_location(this_pymodule, offset)
+    if pyname is not None:
+        pyobject = pyname.get_object()
+        if not isinstance(pyobject, rope.base.pyobjects.PyFunction) or \
+           pyobject.get_kind() != 'method':
+            raise exceptions.BadIdentifierError('Not a method!')
+    else:
+        raise exceptions.BadIdentifierError('Cannot resolve the identifier!')
+
+    def is_defined(occurrence):
+        if not occurrence.is_defined():
+            return False
+
+    def not_self(occurrence):
+        if occurrence.get_pyname().get_object() == pyname.get_object():
+            return False
+    filters = [is_defined, not_self,
+               occurrences.InHierarchyFilter(pyname, True)]
+    finder = occurrences.Finder(project, name, filters=filters)
+    if resources is None:
+        resources = project.get_python_files()
+    job_set = task_handle.create_jobset('Finding Implementations',
+                                        count=len(resources))
+    return _find_locations(finder, resources, job_set)
+
+
+def find_definition(project, code, offset, resource=None, maxfixes=1):
+    """Return the definition location of the python name at `offset`
+
+    A `Location` object is returned if the definition location can be
+    determined, otherwise ``None`` is returned.
+    """
+    fixer = fixsyntax.FixSyntax(project, code, resource, maxfixes)
+    pyname = fixer.pyname_at(offset)
+    if pyname is not None:
+        module, lineno = pyname.get_definition_location()
+        name = rope.base.worder.Worder(code).get_word_at(offset)
+        if lineno is not None:
+            start = module.lines.get_line_start(lineno)
+
+            def check_offset(occurrence):
+                if occurrence.offset < start:
+                    return False
+            pyname_filter = occurrences.PyNameFilter(pyname)
+            finder = occurrences.Finder(project, name,
+                                        [check_offset, pyname_filter])
+            for occurrence in finder.find_occurrences(pymodule=module):
+                return Location(occurrence)
+
+
+class Location(object):
+
+    def __init__(self, occurrence):
+        self.resource = occurrence.resource
+        self.region = occurrence.get_word_range()
+        self.offset = self.region[0]
+        self.unsure = occurrence.is_unsure()
+        self.lineno = occurrence.lineno
+
+
+def _find_locations(finder, resources, job_set):
+    result = []
+    for resource in resources:
+        job_set.started_job(resource.path)
+        for occurrence in finder.find_occurrences(resource):
+            result.append(Location(occurrence))
+        job_set.finished_job()
+    return result
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/fixmodnames.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/fixmodnames.py
new file mode 100644
index 0000000..d8bd3da
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/fixmodnames.py
@@ -0,0 +1,69 @@
+"""Fix the name of modules
+
+This module is useful when you want to rename many of the modules in
+your project.  That can happen specially when you want to change their
+naming style.
+
+For instance::
+
+  fixer = FixModuleNames(project)
+  changes = fixer.get_changes(fixer=str.lower)
+  project.do(changes)
+
+Here it renames all modules and packages to use lower-cased chars.
+You can tell it to use any other style by using the ``fixer``
+argument.
+
+"""
+from rope.base import taskhandle
+from rope.contrib import changestack
+from rope.refactor import rename
+
+
+class FixModuleNames(object):
+
+    def __init__(self, project):
+        self.project = project
+
+    def get_changes(self, fixer=str.lower,
+                    task_handle=taskhandle.NullTaskHandle()):
+        """Fix module names
+
+        `fixer` is a function that takes and returns a `str`.  Given
+        the name of a module, it should return the fixed name.
+
+        """
+        stack = changestack.ChangeStack(self.project, 'Fixing module names')
+        jobset = task_handle.create_jobset('Fixing module names',
+                                           self._count_fixes(fixer) + 1)
+        try:
+            while True:
+                for resource in self._tobe_fixed(fixer):
+                    jobset.started_job(resource.path)
+                    renamer = rename.Rename(self.project, resource)
+                    changes = renamer.get_changes(fixer(self._name(resource)))
+                    stack.push(changes)
+                    jobset.finished_job()
+                    break
+                else:
+                    break
+        finally:
+            jobset.started_job('Reverting to original state')
+            stack.pop_all()
+            jobset.finished_job()
+        return stack.merged()
+
+    def _count_fixes(self, fixer):
+        return len(list(self._tobe_fixed(fixer)))
+
+    def _tobe_fixed(self, fixer):
+        for resource in self.project.get_python_files():
+            modname = self._name(resource)
+            if modname != fixer(modname):
+                yield resource
+
+    def _name(self, resource):
+        modname = resource.name.rsplit('.', 1)[0]
+        if modname == '__init__':
+            modname = resource.parent.name
+        return modname
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/fixsyntax.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/fixsyntax.py
new file mode 100644
index 0000000..fa2a17d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/fixsyntax.py
@@ -0,0 +1,181 @@
+import rope.base.codeanalyze
+import rope.base.evaluate
+from rope.base import exceptions
+from rope.base import libutils
+from rope.base import utils
+from rope.base import worder
+from rope.base.codeanalyze import ArrayLinesAdapter, LogicalLineFinder
+
+
+class FixSyntax(object):
+
+    def __init__(self, project, code, resource, maxfixes=1):
+        self.project = project
+        self.code = code
+        self.resource = resource
+        self.maxfixes = maxfixes
+
+    @utils.saveit
+    def get_pymodule(self):
+        """Get a `PyModule`"""
+        msg = None
+        code = self.code
+        tries = 0
+        while True:
+            try:
+                if tries == 0 and self.resource is not None and \
+                   self.resource.read() == code:
+                    return self.project.get_pymodule(self.resource,
+                                                     force_errors=True)
+                return libutils.get_string_module(
+                    self.project, code, resource=self.resource,
+                    force_errors=True)
+            except exceptions.ModuleSyntaxError as e:
+                if msg is None:
+                    msg = '%s:%s %s' % (e.filename, e.lineno, e.message_)
+                if tries < self.maxfixes:
+                    tries += 1
+                    self.commenter.comment(e.lineno)
+                    code = '\n'.join(self.commenter.lines)
+                else:
+                    raise exceptions.ModuleSyntaxError(
+                        e.filename, e.lineno,
+                        'Failed to fix error: {0}'.format(msg))
+
+    @property
+    @utils.saveit
+    def commenter(self):
+        return _Commenter(self.code)
+
+    def pyname_at(self, offset):
+        pymodule = self.get_pymodule()
+
+        def old_pyname():
+            word_finder = worder.Worder(self.code, True)
+            expression = word_finder.get_primary_at(offset)
+            expression = expression.replace('\\\n', ' ').replace('\n', ' ')
+            lineno = self.code.count('\n', 0, offset)
+            scope = pymodule.get_scope().get_inner_scope_for_line(lineno)
+            return rope.base.evaluate.eval_str(scope, expression)
+        new_code = pymodule.source_code
+
+        def new_pyname():
+            newoffset = self.commenter.transfered_offset(offset)
+            return rope.base.evaluate.eval_location(pymodule, newoffset)
+        if new_code.startswith(self.code[:offset + 1]):
+            return new_pyname()
+        result = old_pyname()
+        if result is None:
+            return new_pyname()
+        return result
+
+
+class _Commenter(object):
+
+    def __init__(self, code):
+        self.code = code
+        self.lines = self.code.split('\n')
+        self.lines.append('\n')
+        self.origs = list(range(len(self.lines) + 1))
+        self.diffs = [0] * (len(self.lines) + 1)
+
+    def comment(self, lineno):
+        start = _logical_start(self.lines, lineno, check_prev=True) - 1
+        # using self._get_stmt_end() instead of self._get_block_end()
+        # to lower commented lines
+        end = self._get_stmt_end(start)
+        indents = _get_line_indents(self.lines[start])
+        if 0 < start:
+            last_lineno = self._last_non_blank(start - 1)
+            last_line = self.lines[last_lineno]
+            if last_line.rstrip().endswith(':'):
+                indents = _get_line_indents(last_line) + 4
+        self._set(start, ' ' * indents + 'pass')
+        for line in range(start + 1, end + 1):
+            self._set(line, self.lines[start])
+        self._fix_incomplete_try_blocks(lineno, indents)
+
+    def transfered_offset(self, offset):
+        lineno = self.code.count('\n', 0, offset)
+        diff = sum(self.diffs[:lineno])
+        return offset + diff
+
+    def _last_non_blank(self, start):
+        while start > 0 and self.lines[start].strip() == '':
+            start -= 1
+        return start
+
+    def _get_block_end(self, lineno):
+        end_line = lineno
+        base_indents = _get_line_indents(self.lines[lineno])
+        for i in range(lineno + 1, len(self.lines)):
+            if _get_line_indents(self.lines[i]) >= base_indents:
+                end_line = i
+            else:
+                break
+        return end_line
+
+    def _get_stmt_end(self, lineno):
+        base_indents = _get_line_indents(self.lines[lineno])
+        for i in range(lineno + 1, len(self.lines)):
+            if _get_line_indents(self.lines[i]) <= base_indents:
+                return i - 1
+        return lineno
+
+    def _fix_incomplete_try_blocks(self, lineno, indents):
+        block_start = lineno
+        last_indents = indents
+        while block_start > 0:
+            block_start = rope.base.codeanalyze.get_block_start(
+                ArrayLinesAdapter(self.lines), block_start) - 1
+            if self.lines[block_start].strip().startswith('try:'):
+                indents = _get_line_indents(self.lines[block_start])
+                if indents > last_indents:
+                    continue
+                last_indents = indents
+                block_end = self._find_matching_deindent(block_start)
+                line = self.lines[block_end].strip()
+                if not (line.startswith('finally:') or
+                        line.startswith('except ') or
+                        line.startswith('except:')):
+                    self._insert(block_end, ' ' * indents + 'finally:')
+                    self._insert(block_end + 1, ' ' * indents + '    pass')
+
+    def _find_matching_deindent(self, line_number):
+        indents = _get_line_indents(self.lines[line_number])
+        current_line = line_number + 1
+        while current_line < len(self.lines):
+            line = self.lines[current_line]
+            if not line.strip().startswith('#') and not line.strip() == '':
+                # HACK: We should have used logical lines here
+                if _get_line_indents(self.lines[current_line]) <= indents:
+                    return current_line
+            current_line += 1
+        return len(self.lines) - 1
+
+    def _set(self, lineno, line):
+        self.diffs[self.origs[lineno]] += len(line) - len(self.lines[lineno])
+        self.lines[lineno] = line
+
+    def _insert(self, lineno, line):
+        self.diffs[self.origs[lineno]] += len(line) + 1
+        self.origs.insert(lineno, self.origs[lineno])
+        self.lines.insert(lineno, line)
+
+
+def _logical_start(lines, lineno, check_prev=False):
+    logical_finder = LogicalLineFinder(ArrayLinesAdapter(lines))
+    if check_prev:
+        prev = lineno - 1
+        while prev > 0:
+            start, end = logical_finder.logical_line_in(prev)
+            if end is None or start <= lineno < end:
+                return start
+            if start <= prev:
+                break
+            prev -= 1
+    return logical_finder.logical_line_in(lineno)[0]
+
+
+def _get_line_indents(line):
+    return rope.base.codeanalyze.count_line_indents(line)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/generate.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/generate.py
new file mode 100644
index 0000000..825f26d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/contrib/generate.py
@@ -0,0 +1,362 @@
+import rope.base.evaluate
+from rope.base import libutils
+from rope.base import (change, pyobjects, exceptions, pynames, worder,
+                       codeanalyze)
+from rope.refactor import sourceutils, importutils, functionutils, suites
+
+
+def create_generate(kind, project, resource, offset):
+    """A factory for creating `Generate` objects
+
+    `kind` can be 'variable', 'function', 'class', 'module' or
+    'package'.
+
+    """
+    generate = eval('Generate' + kind.title())
+    return generate(project, resource, offset)
+
+
+def create_module(project, name, sourcefolder=None):
+    """Creates a module and returns a `rope.base.resources.File`"""
+    if sourcefolder is None:
+        sourcefolder = project.root
+    packages = name.split('.')
+    parent = sourcefolder
+    for package in packages[:-1]:
+        parent = parent.get_child(package)
+    return parent.create_file(packages[-1] + '.py')
+
+
+def create_package(project, name, sourcefolder=None):
+    """Creates a package and returns a `rope.base.resources.Folder`"""
+    if sourcefolder is None:
+        sourcefolder = project.root
+    packages = name.split('.')
+    parent = sourcefolder
+    for package in packages[:-1]:
+        parent = parent.get_child(package)
+    made_packages = parent.create_folder(packages[-1])
+    made_packages.create_file('__init__.py')
+    return made_packages
+
+
+class _Generate(object):
+
+    def __init__(self, project, resource, offset):
+        self.project = project
+        self.resource = resource
+        self.info = self._generate_info(project, resource, offset)
+        self.name = self.info.get_name()
+        self._check_exceptional_conditions()
+
+    def _generate_info(self, project, resource, offset):
+        return _GenerationInfo(project.pycore, resource, offset)
+
+    def _check_exceptional_conditions(self):
+        if self.info.element_already_exists():
+            raise exceptions.RefactoringError(
+                'Element <%s> already exists.' % self.name)
+        if not self.info.primary_is_found():
+            raise exceptions.RefactoringError(
+                'Cannot determine the scope <%s> should be defined in.' %
+                self.name)
+
+    def get_changes(self):
+        changes = change.ChangeSet('Generate %s <%s>' %
+                                   (self._get_element_kind(), self.name))
+        indents = self.info.get_scope_indents()
+        blanks = self.info.get_blank_lines()
+        base_definition = sourceutils.fix_indentation(self._get_element(),
+                                                      indents)
+        definition = '\n' * blanks[0] + base_definition + '\n' * blanks[1]
+
+        resource = self.info.get_insertion_resource()
+        start, end = self.info.get_insertion_offsets()
+
+        collector = codeanalyze.ChangeCollector(resource.read())
+        collector.add_change(start, end, definition)
+        changes.add_change(change.ChangeContents(
+                           resource, collector.get_changed()))
+        return changes
+
+    def get_location(self):
+        return (self.info.get_insertion_resource(),
+                self.info.get_insertion_lineno())
+
+    def _get_element_kind(self):
+        raise NotImplementedError()
+
+    def _get_element(self):
+        raise NotImplementedError()
+
+
+class GenerateFunction(_Generate):
+
+    def _generate_info(self, project, resource, offset):
+        return _FunctionGenerationInfo(project.pycore, resource, offset)
+
+    def _get_element(self):
+        decorator = ''
+        args = []
+        if self.info.is_static_method():
+            decorator = '@staticmethod\n'
+        if self.info.is_method() or self.info.is_constructor() or \
+           self.info.is_instance():
+            args.append('self')
+        args.extend(self.info.get_passed_args())
+        definition = '%sdef %s(%s):\n    pass\n' % (decorator, self.name,
+                                                    ', '.join(args))
+        return definition
+
+    def _get_element_kind(self):
+        return 'Function'
+
+
+class GenerateVariable(_Generate):
+
+    def _get_element(self):
+        return '%s = None\n' % self.name
+
+    def _get_element_kind(self):
+        return 'Variable'
+
+
+class GenerateClass(_Generate):
+
+    def _get_element(self):
+        return 'class %s(object):\n    pass\n' % self.name
+
+    def _get_element_kind(self):
+        return 'Class'
+
+
+class GenerateModule(_Generate):
+
+    def get_changes(self):
+        package = self.info.get_package()
+        changes = change.ChangeSet('Generate Module <%s>' % self.name)
+        new_resource = self.project.get_file('%s/%s.py' %
+                                             (package.path, self.name))
+        if new_resource.exists():
+            raise exceptions.RefactoringError(
+                'Module <%s> already exists' % new_resource.path)
+        changes.add_change(change.CreateResource(new_resource))
+        changes.add_change(_add_import_to_module(
+                           self.project, self.resource, new_resource))
+        return changes
+
+    def get_location(self):
+        package = self.info.get_package()
+        return (package.get_child('%s.py' % self.name), 1)
+
+
+class GeneratePackage(_Generate):
+
+    def get_changes(self):
+        package = self.info.get_package()
+        changes = change.ChangeSet('Generate Package <%s>' % self.name)
+        new_resource = self.project.get_folder('%s/%s' %
+                                               (package.path, self.name))
+        if new_resource.exists():
+            raise exceptions.RefactoringError(
+                'Package <%s> already exists' % new_resource.path)
+        changes.add_change(change.CreateResource(new_resource))
+        changes.add_change(_add_import_to_module(
+                           self.project, self.resource, new_resource))
+        child = self.project.get_folder(package.path + '/' + self.name)
+        changes.add_change(change.CreateFile(child, '__init__.py'))
+        return changes
+
+    def get_location(self):
+        package = self.info.get_package()
+        child = package.get_child(self.name)
+        return (child.get_child('__init__.py'), 1)
+
+
+def _add_import_to_module(project, resource, imported):
+    pymodule = project.get_pymodule(resource)
+    import_tools = importutils.ImportTools(project)
+    module_imports = import_tools.module_imports(pymodule)
+    module_name = libutils.modname(imported)
+    new_import = importutils.NormalImport(((module_name, None), ))
+    module_imports.add_import(new_import)
+    return change.ChangeContents(resource, module_imports.get_changed_source())
+
+
+class _GenerationInfo(object):
+
+    def __init__(self, pycore, resource, offset):
+        self.pycore = pycore
+        self.resource = resource
+        self.offset = offset
+        self.source_pymodule = self.pycore.project.get_pymodule(resource)
+        finder = rope.base.evaluate.ScopeNameFinder(self.source_pymodule)
+        self.primary, self.pyname = finder.get_primary_and_pyname_at(offset)
+        self._init_fields()
+
+    def _init_fields(self):
+        self.source_scope = self._get_source_scope()
+        self.goal_scope = self._get_goal_scope()
+        self.goal_pymodule = self._get_goal_module(self.goal_scope)
+
+    def _get_goal_scope(self):
+        if self.primary is None:
+            return self._get_source_scope()
+        pyobject = self.primary.get_object()
+        if isinstance(pyobject, pyobjects.PyDefinedObject):
+            return pyobject.get_scope()
+        elif isinstance(pyobject.get_type(), pyobjects.PyClass):
+            return pyobject.get_type().get_scope()
+
+    def _get_goal_module(self, scope):
+        if scope is None:
+            return
+        while scope.parent is not None:
+            scope = scope.parent
+        return scope.pyobject
+
+    def _get_source_scope(self):
+        module_scope = self.source_pymodule.get_scope()
+        lineno = self.source_pymodule.lines.get_line_number(self.offset)
+        return module_scope.get_inner_scope_for_line(lineno)
+
+    def get_insertion_lineno(self):
+        lines = self.goal_pymodule.lines
+        if self.goal_scope == self.source_scope:
+            line_finder = self.goal_pymodule.logical_lines
+            lineno = lines.get_line_number(self.offset)
+            lineno = line_finder.logical_line_in(lineno)[0]
+            root = suites.ast_suite_tree(self.goal_scope.pyobject.get_ast())
+            suite = root.find_suite(lineno)
+            indents = sourceutils.get_indents(lines, lineno)
+            while self.get_scope_indents() < indents:
+                lineno = suite.get_start()
+                indents = sourceutils.get_indents(lines, lineno)
+                suite = suite.parent
+            return lineno
+        else:
+            return min(self.goal_scope.get_end() + 1, lines.length())
+
+    def get_insertion_resource(self):
+        return self.goal_pymodule.get_resource()
+
+    def get_insertion_offsets(self):
+        if self.goal_scope.get_kind() == 'Class':
+            start, end = sourceutils.get_body_region(self.goal_scope.pyobject)
+            if self.goal_pymodule.source_code[start:end].strip() == 'pass':
+                return start, end
+        lines = self.goal_pymodule.lines
+        start = lines.get_line_start(self.get_insertion_lineno())
+        return (start, start)
+
+    def get_scope_indents(self):
+        if self.goal_scope.get_kind() == 'Module':
+            return 0
+        return sourceutils.get_indents(self.goal_pymodule.lines,
+                                       self.goal_scope.get_start()) + 4
+
+    def get_blank_lines(self):
+        if self.goal_scope.get_kind() == 'Module':
+            base_blanks = 2
+            if self.goal_pymodule.source_code.strip() == '':
+                base_blanks = 0
+        if self.goal_scope.get_kind() == 'Class':
+            base_blanks = 1
+        if self.goal_scope.get_kind() == 'Function':
+            base_blanks = 0
+        if self.goal_scope == self.source_scope:
+            return (0, base_blanks)
+        return (base_blanks, 0)
+
+    def get_package(self):
+        primary = self.primary
+        if self.primary is None:
+            return self.pycore.project.get_source_folders()[0]
+        if isinstance(primary.get_object(), pyobjects.PyPackage):
+            return primary.get_object().get_resource()
+        raise exceptions.RefactoringError(
+            'A module/package can be only created in a package.')
+
+    def primary_is_found(self):
+        return self.goal_scope is not None
+
+    def element_already_exists(self):
+        if self.pyname is None or isinstance(self.pyname, pynames.UnboundName):
+            return False
+        return self.get_name() in self.goal_scope.get_defined_names()
+
+    def get_name(self):
+        return worder.get_name_at(self.resource, self.offset)
+
+
+class _FunctionGenerationInfo(_GenerationInfo):
+
+    def _get_goal_scope(self):
+        if self.is_constructor():
+            return self.pyname.get_object().get_scope()
+        if self.is_instance():
+            return self.pyname.get_object().get_type().get_scope()
+        if self.primary is None:
+            return self._get_source_scope()
+        pyobject = self.primary.get_object()
+        if isinstance(pyobject, pyobjects.PyDefinedObject):
+            return pyobject.get_scope()
+        elif isinstance(pyobject.get_type(), pyobjects.PyClass):
+            return pyobject.get_type().get_scope()
+
+    def element_already_exists(self):
+        if self.pyname is None or isinstance(self.pyname, pynames.UnboundName):
+            return False
+        return self.get_name() in self.goal_scope.get_defined_names()
+
+    def is_static_method(self):
+        return self.primary is not None and \
+            isinstance(self.primary.get_object(), pyobjects.PyClass)
+
+    def is_method(self):
+        return self.primary is not None and \
+            isinstance(self.primary.get_object().get_type(), pyobjects.PyClass)
+
+    def is_constructor(self):
+        return self.pyname is not None and \
+            isinstance(self.pyname.get_object(), pyobjects.PyClass)
+
+    def is_instance(self):
+        if self.pyname is None:
+            return False
+        pyobject = self.pyname.get_object()
+        return isinstance(pyobject.get_type(), pyobjects.PyClass)
+
+    def get_name(self):
+        if self.is_constructor():
+            return '__init__'
+        if self.is_instance():
+            return '__call__'
+        return worder.get_name_at(self.resource, self.offset)
+
+    def get_passed_args(self):
+        result = []
+        source = self.source_pymodule.source_code
+        finder = worder.Worder(source)
+        if finder.is_a_function_being_called(self.offset):
+            start, end = finder.get_primary_range(self.offset)
+            parens_start, parens_end = finder.get_word_parens_range(end - 1)
+            call = source[start:parens_end]
+            parser = functionutils._FunctionParser(call, False)
+            args, keywords = parser.get_parameters()
+            for arg in args:
+                if self._is_id(arg):
+                    result.append(arg)
+                else:
+                    result.append('arg%d' % len(result))
+            for name, value in keywords:
+                result.append(name)
+        return result
+
+    def _is_id(self, arg):
+        def id_or_underline(c):
+            return c.isalpha() or c == '_'
+        for c in arg:
+            if not id_or_underline(c) and not c.isdigit():
+                return False
+        return id_or_underline(arg[0])
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__init__.py
new file mode 100644
index 0000000..4ef6751
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__init__.py
@@ -0,0 +1,55 @@
+"""rope refactor package
+
+This package contains modules that perform python refactorings.
+Refactoring classes perform refactorings in 4 steps:
+
+1. Collect some data for performing the refactoring and use them
+   to construct a refactoring class.  Like::
+
+     renamer = Rename(project, resource, offset)
+
+2. Some refactorings give you useful information about the
+   refactoring after their construction.  Like::
+
+     print(renamer.get_old_name())
+
+3. Give the refactoring class more information about how to
+   perform the refactoring and get the changes this refactoring is
+   going to make.  This is done by calling `get_changes` method of the
+   refactoring class.  Like::
+
+     changes = renamer.get_changes(new_name)
+
+4. You can commit the changes.  Like::
+
+     project.do(changes)
+
+These steps are like the steps IDEs usually do for performing a
+refactoring.  These are the things an IDE does in each step:
+
+1. Construct a refactoring object by giving it information like
+   resource, offset and ... .  Some of the refactoring problems (like
+   performing rename refactoring on language keywords) can be reported
+   here.
+2. Print some information about the refactoring and ask the user
+   about the information that are necessary for completing the
+   refactoring (like new name).
+3. Call the `get_changes` by passing it information asked from
+   the user (if necessary) and get and preview the changes returned by
+   it.
+4. perform the refactoring.
+
+From ``0.5m5`` release the `get_changes()` method of some time-
+consuming refactorings take an optional `rope.base.taskhandle.
+TaskHandle` parameter.  You can use this object for stopping or
+monitoring the progress of refactorings.
+
+"""
+from rope.refactor.importutils import ImportOrganizer  # noqa
+from rope.refactor.topackage import ModuleToPackage  # noqa
+
+
+__all__ = ['rename', 'move', 'inline', 'extract', 'restructure', 'topackage',
+           'importutils', 'usefunction', 'change_signature',
+           'encapsulate_field', 'introduce_factory', 'introduce_parameter',
+           'localtofield', 'method_object', 'multiproject']
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..7ce12bb
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/change_signature.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/change_signature.cpython-35.pyc
new file mode 100644
index 0000000..860c6ca
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/change_signature.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/extract.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/extract.cpython-35.pyc
new file mode 100644
index 0000000..39595f9
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/extract.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/functionutils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/functionutils.cpython-35.pyc
new file mode 100644
index 0000000..6466f65
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/functionutils.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/inline.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/inline.cpython-35.pyc
new file mode 100644
index 0000000..e7594b2
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/inline.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/move.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/move.cpython-35.pyc
new file mode 100644
index 0000000..5c3c7a9
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/move.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/occurrences.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/occurrences.cpython-35.pyc
new file mode 100644
index 0000000..63eac1e
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/occurrences.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/patchedast.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/patchedast.cpython-35.pyc
new file mode 100644
index 0000000..b7af757
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/patchedast.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/rename.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/rename.cpython-35.pyc
new file mode 100644
index 0000000..6123b54
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/rename.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/restructure.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/restructure.cpython-35.pyc
new file mode 100644
index 0000000..38702c7
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/restructure.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/similarfinder.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/similarfinder.cpython-35.pyc
new file mode 100644
index 0000000..25ae629
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/similarfinder.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/sourceutils.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/sourceutils.cpython-35.pyc
new file mode 100644
index 0000000..9638b53
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/sourceutils.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/suites.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/suites.cpython-35.pyc
new file mode 100644
index 0000000..ec4f73c
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/suites.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/topackage.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/topackage.cpython-35.pyc
new file mode 100644
index 0000000..e0c2af3
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/topackage.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/usefunction.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/usefunction.cpython-35.pyc
new file mode 100644
index 0000000..f0c598b
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/usefunction.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/wildcards.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/wildcards.cpython-35.pyc
new file mode 100644
index 0000000..05c3b9b
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/__pycache__/wildcards.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/change_signature.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/change_signature.py
new file mode 100644
index 0000000..b5ba185
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/change_signature.py
@@ -0,0 +1,352 @@
+import copy
+
+import rope.base.exceptions
+from rope.base import codeanalyze
+from rope.base import evaluate
+from rope.base import pyobjects
+from rope.base import taskhandle
+from rope.base import utils
+from rope.base import worder
+from rope.base.change import ChangeContents, ChangeSet
+from rope.refactor import occurrences, functionutils
+
+
+class ChangeSignature(object):
+
+    def __init__(self, project, resource, offset):
+        self.project = project
+        self.resource = resource
+        self.offset = offset
+        self._set_name_and_pyname()
+        if self.pyname is None or self.pyname.get_object() is None or \
+           not isinstance(self.pyname.get_object(), pyobjects.PyFunction):
+            raise rope.base.exceptions.RefactoringError(
+                'Change method signature should be performed on functions')
+
+    def _set_name_and_pyname(self):
+        self.name = worder.get_name_at(self.resource, self.offset)
+        this_pymodule = self.project.get_pymodule(self.resource)
+        self.primary, self.pyname = evaluate.eval_location2(
+            this_pymodule, self.offset)
+        if self.pyname is None:
+            return
+        pyobject = self.pyname.get_object()
+        if isinstance(pyobject, pyobjects.PyClass) and \
+           '__init__' in pyobject:
+            self.pyname = pyobject['__init__']
+            self.name = '__init__'
+        pyobject = self.pyname.get_object()
+        self.others = None
+        if self.name == '__init__' and \
+           isinstance(pyobject, pyobjects.PyFunction) and \
+           isinstance(pyobject.parent, pyobjects.PyClass):
+            pyclass = pyobject.parent
+            self.others = (pyclass.get_name(),
+                           pyclass.parent[pyclass.get_name()])
+
+    def _change_calls(self, call_changer, in_hierarchy=None, resources=None,
+                      handle=taskhandle.NullTaskHandle()):
+        if resources is None:
+            resources = self.project.get_python_files()
+        changes = ChangeSet('Changing signature of <%s>' % self.name)
+        job_set = handle.create_jobset('Collecting Changes', len(resources))
+        finder = occurrences.create_finder(
+            self.project, self.name, self.pyname, instance=self.primary,
+            in_hierarchy=in_hierarchy and self.is_method())
+        if self.others:
+            name, pyname = self.others
+            constructor_finder = occurrences.create_finder(
+                self.project, name, pyname, only_calls=True)
+            finder = _MultipleFinders([finder, constructor_finder])
+        for file in resources:
+            job_set.started_job(file.path)
+            change_calls = _ChangeCallsInModule(
+                self.project, finder, file, call_changer)
+            changed_file = change_calls.get_changed_module()
+            if changed_file is not None:
+                changes.add_change(ChangeContents(file, changed_file))
+            job_set.finished_job()
+        return changes
+
+    def get_args(self):
+        """Get function arguments.
+
+        Return a list of ``(name, default)`` tuples for all but star
+        and double star arguments.  For arguments that don't have a
+        default, `None` will be used.
+        """
+        return self._definfo().args_with_defaults
+
+    def is_method(self):
+        pyfunction = self.pyname.get_object()
+        return isinstance(pyfunction.parent, pyobjects.PyClass)
+
+    @utils.deprecated('Use `ChangeSignature.get_args()` instead')
+    def get_definition_info(self):
+        return self._definfo()
+
+    def _definfo(self):
+        return functionutils.DefinitionInfo.read(self.pyname.get_object())
+
+    @utils.deprecated()
+    def normalize(self):
+        changer = _FunctionChangers(
+            self.pyname.get_object(), self.get_definition_info(),
+            [ArgumentNormalizer()])
+        return self._change_calls(changer)
+
+    @utils.deprecated()
+    def remove(self, index):
+        changer = _FunctionChangers(
+            self.pyname.get_object(), self.get_definition_info(),
+            [ArgumentRemover(index)])
+        return self._change_calls(changer)
+
+    @utils.deprecated()
+    def add(self, index, name, default=None, value=None):
+        changer = _FunctionChangers(
+            self.pyname.get_object(), self.get_definition_info(),
+            [ArgumentAdder(index, name, default, value)])
+        return self._change_calls(changer)
+
+    @utils.deprecated()
+    def inline_default(self, index):
+        changer = _FunctionChangers(
+            self.pyname.get_object(), self.get_definition_info(),
+            [ArgumentDefaultInliner(index)])
+        return self._change_calls(changer)
+
+    @utils.deprecated()
+    def reorder(self, new_ordering):
+        changer = _FunctionChangers(
+            self.pyname.get_object(), self.get_definition_info(),
+            [ArgumentReorderer(new_ordering)])
+        return self._change_calls(changer)
+
+    def get_changes(self, changers, in_hierarchy=False, resources=None,
+                    task_handle=taskhandle.NullTaskHandle()):
+        """Get changes caused by this refactoring
+
+        `changers` is a list of `_ArgumentChanger`\s.  If `in_hierarchy`
+        is `True` the changers are applyed to all matching methods in
+        the class hierarchy.
+        `resources` can be a list of `rope.base.resource.File`\s that
+        should be searched for occurrences; if `None` all python files
+        in the project are searched.
+
+        """
+        function_changer = _FunctionChangers(self.pyname.get_object(),
+                                             self._definfo(), changers)
+        return self._change_calls(function_changer, in_hierarchy,
+                                  resources, task_handle)
+
+
+class _FunctionChangers(object):
+
+    def __init__(self, pyfunction, definition_info, changers=None):
+        self.pyfunction = pyfunction
+        self.definition_info = definition_info
+        self.changers = changers
+        self.changed_definition_infos = self._get_changed_definition_infos()
+
+    def _get_changed_definition_infos(self):
+        result = []
+        definition_info = self.definition_info
+        result.append(definition_info)
+        for changer in self.changers:
+            definition_info = copy.deepcopy(definition_info)
+            changer.change_definition_info(definition_info)
+            result.append(definition_info)
+        return result
+
+    def change_definition(self, call):
+        return self.changed_definition_infos[-1].to_string()
+
+    def change_call(self, primary, pyname, call):
+        call_info = functionutils.CallInfo.read(
+            primary, pyname, self.definition_info, call)
+        mapping = functionutils.ArgumentMapping(self.definition_info,
+                                                call_info)
+
+        for definition_info, changer in zip(self.changed_definition_infos,
+                                            self.changers):
+            changer.change_argument_mapping(definition_info, mapping)
+
+        return mapping.to_call_info(
+            self.changed_definition_infos[-1]).to_string()
+
+
+class _ArgumentChanger(object):
+
+    def change_definition_info(self, definition_info):
+        pass
+
+    def change_argument_mapping(self, definition_info, argument_mapping):
+        pass
+
+
+class ArgumentNormalizer(_ArgumentChanger):
+    pass
+
+
+class ArgumentRemover(_ArgumentChanger):
+
+    def __init__(self, index):
+        self.index = index
+
+    def change_definition_info(self, call_info):
+        if self.index < len(call_info.args_with_defaults):
+            del call_info.args_with_defaults[self.index]
+        elif self.index == len(call_info.args_with_defaults) and \
+                call_info.args_arg is not None:
+            call_info.args_arg = None
+        elif (self.index == len(call_info.args_with_defaults) and
+              call_info.args_arg is None and
+              call_info.keywords_arg is not None) or \
+                (self.index == len(call_info.args_with_defaults) + 1 and
+                 call_info.args_arg is not None and
+                 call_info.keywords_arg is not None):
+            call_info.keywords_arg = None
+
+    def change_argument_mapping(self, definition_info, mapping):
+        if self.index < len(definition_info.args_with_defaults):
+            name = definition_info.args_with_defaults[0]
+            if name in mapping.param_dict:
+                del mapping.param_dict[name]
+
+
+class ArgumentAdder(_ArgumentChanger):
+
+    def __init__(self, index, name, default=None, value=None):
+        self.index = index
+        self.name = name
+        self.default = default
+        self.value = value
+
+    def change_definition_info(self, definition_info):
+        for pair in definition_info.args_with_defaults:
+            if pair[0] == self.name:
+                raise rope.base.exceptions.RefactoringError(
+                    'Adding duplicate parameter: <%s>.' % self.name)
+        definition_info.args_with_defaults.insert(self.index,
+                                                  (self.name, self.default))
+
+    def change_argument_mapping(self, definition_info, mapping):
+        if self.value is not None:
+            mapping.param_dict[self.name] = self.value
+
+
+class ArgumentDefaultInliner(_ArgumentChanger):
+
+    def __init__(self, index):
+        self.index = index
+        self.remove = False
+
+    def change_definition_info(self, definition_info):
+        if self.remove:
+            definition_info.args_with_defaults[self.index] = \
+                (definition_info.args_with_defaults[self.index][0], None)
+
+    def change_argument_mapping(self, definition_info, mapping):
+        default = definition_info.args_with_defaults[self.index][1]
+        name = definition_info.args_with_defaults[self.index][0]
+        if default is not None and name not in mapping.param_dict:
+            mapping.param_dict[name] = default
+
+
+class ArgumentReorderer(_ArgumentChanger):
+
+    def __init__(self, new_order, autodef=None):
+        """Construct an `ArgumentReorderer`
+
+        Note that the `new_order` is a list containing the new
+        position of parameters; not the position each parameter
+        is going to be moved to. (changed in ``0.5m4``)
+
+        For example changing ``f(a, b, c)`` to ``f(c, a, b)``
+        requires passing ``[2, 0, 1]`` and *not* ``[1, 2, 0]``.
+
+        The `autodef` (automatic default) argument, forces rope to use
+        it as a default if a default is needed after the change.  That
+        happens when an argument without default is moved after
+        another that has a default value.  Note that `autodef` should
+        be a string or `None`; the latter disables adding automatic
+        default.
+
+        """
+        self.new_order = new_order
+        self.autodef = autodef
+
+    def change_definition_info(self, definition_info):
+        new_args = list(definition_info.args_with_defaults)
+        for new_index, index in enumerate(self.new_order):
+            new_args[new_index] = definition_info.args_with_defaults[index]
+        seen_default = False
+        for index, (arg, default) in enumerate(list(new_args)):
+            if default is not None:
+                seen_default = True
+            if seen_default and default is None and self.autodef is not None:
+                new_args[index] = (arg, self.autodef)
+        definition_info.args_with_defaults = new_args
+
+
+class _ChangeCallsInModule(object):
+
+    def __init__(self, project, occurrence_finder, resource, call_changer):
+        self.project = project
+        self.occurrence_finder = occurrence_finder
+        self.resource = resource
+        self.call_changer = call_changer
+
+    def get_changed_module(self):
+        word_finder = worder.Worder(self.source)
+        change_collector = codeanalyze.ChangeCollector(self.source)
+        for occurrence in self.occurrence_finder.find_occurrences(
+                self.resource):
+            if not occurrence.is_called() and not occurrence.is_defined():
+                continue
+            start, end = occurrence.get_primary_range()
+            begin_parens, end_parens = word_finder.\
+                get_word_parens_range(end - 1)
+            if occurrence.is_called():
+                primary, pyname = occurrence.get_primary_and_pyname()
+                changed_call = self.call_changer.change_call(
+                    primary, pyname, self.source[start:end_parens])
+            else:
+                changed_call = self.call_changer.change_definition(
+                    self.source[start:end_parens])
+            if changed_call is not None:
+                change_collector.add_change(start, end_parens, changed_call)
+        return change_collector.get_changed()
+
+    @property
+    @utils.saveit
+    def pymodule(self):
+        return self.project.get_pymodule(self.resource)
+
+    @property
+    @utils.saveit
+    def source(self):
+        if self.resource is not None:
+            return self.resource.read()
+        else:
+            return self.pymodule.source_code
+
+    @property
+    @utils.saveit
+    def lines(self):
+        return self.pymodule.lines
+
+
+class _MultipleFinders(object):
+
+    def __init__(self, finders):
+        self.finders = finders
+
+    def find_occurrences(self, resource=None, pymodule=None):
+        all_occurrences = []
+        for finder in self.finders:
+            all_occurrences.extend(finder.find_occurrences(resource, pymodule))
+        all_occurrences.sort(key=lambda x: x.get_primary_range())
+        return all_occurrences
+
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/encapsulate_field.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/encapsulate_field.py
new file mode 100644
index 0000000..32cb7a9
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/encapsulate_field.py
@@ -0,0 +1,209 @@
+from rope.base import evaluate
+from rope.base import exceptions
+from rope.base import libutils
+from rope.base import pynames
+from rope.base import taskhandle
+from rope.base import utils
+from rope.base import worder
+from rope.base.change import ChangeSet, ChangeContents
+from rope.refactor import sourceutils, occurrences
+
+
+class EncapsulateField(object):
+
+    def __init__(self, project, resource, offset):
+        self.project = project
+        self.name = worder.get_name_at(resource, offset)
+        this_pymodule = self.project.get_pymodule(resource)
+        self.pyname = evaluate.eval_location(this_pymodule, offset)
+        if not self._is_an_attribute(self.pyname):
+            raise exceptions.RefactoringError(
+                'Encapsulate field should be performed on class attributes.')
+        self.resource = self.pyname.get_definition_location()[0].get_resource()
+
+    def get_changes(self, getter=None, setter=None, resources=None,
+                    task_handle=taskhandle.NullTaskHandle()):
+        """Get the changes this refactoring makes
+
+        If `getter` is not `None`, that will be the name of the
+        getter, otherwise ``get_${field_name}`` will be used.  The
+        same is true for `setter` and if it is None set_${field_name} is
+        used.
+
+        `resources` can be a list of `rope.base.resource.File`\s that
+        the refactoring should be applied on; if `None` all python
+        files in the project are searched.
+
+        """
+        if resources is None:
+            resources = self.project.get_python_files()
+        changes = ChangeSet('Encapsulate field <%s>' % self.name)
+        job_set = task_handle.create_jobset('Collecting Changes',
+                                            len(resources))
+        if getter is None:
+            getter = 'get_' + self.name
+        if setter is None:
+            setter = 'set_' + self.name
+        renamer = GetterSetterRenameInModule(
+            self.project, self.name, self.pyname, getter, setter)
+        for file in resources:
+            job_set.started_job(file.path)
+            if file == self.resource:
+                result = self._change_holding_module(changes, renamer,
+                                                     getter, setter)
+                changes.add_change(ChangeContents(self.resource, result))
+            else:
+                result = renamer.get_changed_module(file)
+                if result is not None:
+                    changes.add_change(ChangeContents(file, result))
+            job_set.finished_job()
+        return changes
+
+    def get_field_name(self):
+        """Get the name of the field to be encapsulated"""
+        return self.name
+
+    def _is_an_attribute(self, pyname):
+        if pyname is not None and isinstance(pyname, pynames.AssignedName):
+            pymodule, lineno = self.pyname.get_definition_location()
+            scope = pymodule.get_scope().\
+                get_inner_scope_for_line(lineno)
+            if scope.get_kind() == 'Class':
+                return pyname in scope.get_names().values()
+            parent = scope.parent
+            if parent is not None and parent.get_kind() == 'Class':
+                return pyname in parent.get_names().values()
+        return False
+
+    def _get_defining_class_scope(self):
+        defining_scope = self._get_defining_scope()
+        if defining_scope.get_kind() == 'Function':
+            defining_scope = defining_scope.parent
+        return defining_scope
+
+    def _get_defining_scope(self):
+        pymodule, line = self.pyname.get_definition_location()
+        return pymodule.get_scope().get_inner_scope_for_line(line)
+
+    def _change_holding_module(self, changes, renamer, getter, setter):
+        pymodule = self.project.get_pymodule(self.resource)
+        class_scope = self._get_defining_class_scope()
+        defining_object = self._get_defining_scope().pyobject
+        start, end = sourceutils.get_body_region(defining_object)
+
+        new_source = renamer.get_changed_module(pymodule=pymodule,
+                                                skip_start=start, skip_end=end)
+        if new_source is not None:
+            pymodule = libutils.get_string_module(
+                self.project, new_source, self.resource)
+            class_scope = pymodule.get_scope().\
+                get_inner_scope_for_line(class_scope.get_start())
+        indents = sourceutils.get_indent(self.project) * ' '
+        getter = 'def %s(self):\n%sreturn self.%s' % \
+                 (getter, indents, self.name)
+        setter = 'def %s(self, value):\n%sself.%s = value' % \
+                 (setter, indents, self.name)
+        new_source = sourceutils.add_methods(pymodule, class_scope,
+                                             [getter, setter])
+        return new_source
+
+
+class GetterSetterRenameInModule(object):
+
+    def __init__(self, project, name, pyname, getter, setter):
+        self.project = project
+        self.name = name
+        self.finder = occurrences.create_finder(project, name, pyname)
+        self.getter = getter
+        self.setter = setter
+
+    def get_changed_module(self, resource=None, pymodule=None,
+                           skip_start=0, skip_end=0):
+        change_finder = _FindChangesForModule(self, resource, pymodule,
+                                              skip_start, skip_end)
+        return change_finder.get_changed_module()
+
+
+class _FindChangesForModule(object):
+
+    def __init__(self, finder, resource, pymodule, skip_start, skip_end):
+        self.project = finder.project
+        self.finder = finder.finder
+        self.getter = finder.getter
+        self.setter = finder.setter
+        self.resource = resource
+        self.pymodule = pymodule
+        self.last_modified = 0
+        self.last_set = None
+        self.set_index = None
+        self.skip_start = skip_start
+        self.skip_end = skip_end
+
+    def get_changed_module(self):
+        result = []
+        for occurrence in self.finder.find_occurrences(self.resource,
+                                                       self.pymodule):
+            start, end = occurrence.get_word_range()
+            if self.skip_start <= start < self.skip_end:
+                continue
+            self._manage_writes(start, result)
+            result.append(self.source[self.last_modified:start])
+            if self._is_assigned_in_a_tuple_assignment(occurrence):
+                raise exceptions.RefactoringError(
+                    'Cannot handle tuple assignments in encapsulate field.')
+            if occurrence.is_written():
+                assignment_type = self.worder.get_assignment_type(start)
+                if assignment_type == '=':
+                    result.append(self.setter + '(')
+                else:
+                    var_name = self.source[occurrence.get_primary_range()[0]:
+                                           start] + self.getter + '()'
+                    result.append(self.setter + '(' + var_name
+                                  + ' %s ' % assignment_type[:-1])
+                current_line = self.lines.get_line_number(start)
+                start_line, end_line = self.pymodule.logical_lines.\
+                    logical_line_in(current_line)
+                self.last_set = self.lines.get_line_end(end_line)
+                end = self.source.index('=', end) + 1
+                self.set_index = len(result)
+            else:
+                result.append(self.getter + '()')
+            self.last_modified = end
+        if self.last_modified != 0:
+            self._manage_writes(len(self.source), result)
+            result.append(self.source[self.last_modified:])
+            return ''.join(result)
+        return None
+
+    def _manage_writes(self, offset, result):
+        if self.last_set is not None and self.last_set <= offset:
+            result.append(self.source[self.last_modified:self.last_set])
+            set_value = ''.join(result[self.set_index:]).strip()
+            del result[self.set_index:]
+            result.append(set_value + ')')
+            self.last_modified = self.last_set
+            self.last_set = None
+
+    def _is_assigned_in_a_tuple_assignment(self, occurance):
+        offset = occurance.get_word_range()[0]
+        return self.worder.is_assigned_in_a_tuple_assignment(offset)
+
+    @property
+    @utils.saveit
+    def source(self):
+        if self.resource is not None:
+            return self.resource.read()
+        else:
+            return self.pymodule.source_code
+
+    @property
+    @utils.saveit
+    def lines(self):
+        if self.pymodule is None:
+            self.pymodule = self.project.get_pymodule(self.resource)
+        return self.pymodule.lines
+
+    @property
+    @utils.saveit
+    def worder(self):
+        return worder.Worder(self.source)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/extract.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/extract.py
new file mode 100644
index 0000000..80e7431
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/extract.py
@@ -0,0 +1,810 @@
+import re
+
+from rope.base.utils.datastructures import OrderedSet
+from rope.base import ast, codeanalyze
+from rope.base.change import ChangeSet, ChangeContents
+from rope.base.exceptions import RefactoringError
+from rope.base.utils import pycompat
+from rope.refactor import (sourceutils, similarfinder,
+                           patchedast, suites, usefunction)
+
+
+# Extract refactoring has lots of special cases.  I tried to split it
+# to smaller parts to make it more manageable:
+#
+# _ExtractInfo: holds information about the refactoring; it is passed
+# to the parts that need to have information about the refactoring
+#
+# _ExtractCollector: merely saves all of the information necessary for
+# performing the refactoring.
+#
+# _DefinitionLocationFinder: finds where to insert the definition.
+#
+# _ExceptionalConditionChecker: checks for exceptional conditions in
+# which the refactoring cannot be applied.
+#
+# _ExtractMethodParts: generates the pieces of code (like definition)
+# needed for performing extract method.
+#
+# _ExtractVariableParts: like _ExtractMethodParts for variables.
+#
+# _ExtractPerformer: Uses above classes to collect refactoring
+# changes.
+#
+# There are a few more helper functions and classes used by above
+# classes.
+class _ExtractRefactoring(object):
+
+    def __init__(self, project, resource, start_offset, end_offset,
+                 variable=False):
+        self.project = project
+        self.resource = resource
+        self.start_offset = self._fix_start(resource.read(), start_offset)
+        self.end_offset = self._fix_end(resource.read(), end_offset)
+
+    def _fix_start(self, source, offset):
+        while offset < len(source) and source[offset].isspace():
+            offset += 1
+        return offset
+
+    def _fix_end(self, source, offset):
+        while offset > 0 and source[offset - 1].isspace():
+            offset -= 1
+        return offset
+
+    def get_changes(self, extracted_name, similar=False, global_=False):
+        """Get the changes this refactoring makes
+
+        :parameters:
+            - `similar`: if `True`, similar expressions/statements are also
+              replaced.
+            - `global_`: if `True`, the extracted method/variable will
+              be global.
+
+        """
+        info = _ExtractInfo(
+            self.project, self.resource, self.start_offset, self.end_offset,
+            extracted_name, variable=self.kind == 'variable',
+            similar=similar, make_global=global_)
+        new_contents = _ExtractPerformer(info).extract()
+        changes = ChangeSet('Extract %s <%s>' % (self.kind,
+                                                 extracted_name))
+        changes.add_change(ChangeContents(self.resource, new_contents))
+        return changes
+
+
+class ExtractMethod(_ExtractRefactoring):
+
+    def __init__(self, *args, **kwds):
+        super(ExtractMethod, self).__init__(*args, **kwds)
+
+    kind = 'method'
+
+
+class ExtractVariable(_ExtractRefactoring):
+
+    def __init__(self, *args, **kwds):
+        kwds = dict(kwds)
+        kwds['variable'] = True
+        super(ExtractVariable, self).__init__(*args, **kwds)
+
+    kind = 'variable'
+
+
+class _ExtractInfo(object):
+    """Holds information about the extract to be performed"""
+
+    def __init__(self, project, resource, start, end, new_name,
+                 variable, similar, make_global):
+        self.project = project
+        self.resource = resource
+        self.pymodule = project.get_pymodule(resource)
+        self.global_scope = self.pymodule.get_scope()
+        self.source = self.pymodule.source_code
+        self.lines = self.pymodule.lines
+        self.new_name = new_name
+        self.variable = variable
+        self.similar = similar
+        self._init_parts(start, end)
+        self._init_scope()
+        self.make_global = make_global
+
+    def _init_parts(self, start, end):
+        self.region = (self._choose_closest_line_end(start),
+                       self._choose_closest_line_end(end, end=True))
+
+        start = self.logical_lines.logical_line_in(
+            self.lines.get_line_number(self.region[0]))[0]
+        end = self.logical_lines.logical_line_in(
+            self.lines.get_line_number(self.region[1]))[1]
+        self.region_lines = (start, end)
+
+        self.lines_region = (self.lines.get_line_start(self.region_lines[0]),
+                             self.lines.get_line_end(self.region_lines[1]))
+
+    @property
+    def logical_lines(self):
+        return self.pymodule.logical_lines
+
+    def _init_scope(self):
+        start_line = self.region_lines[0]
+        scope = self.global_scope.get_inner_scope_for_line(start_line)
+        if scope.get_kind() != 'Module' and scope.get_start() == start_line:
+            scope = scope.parent
+        self.scope = scope
+        self.scope_region = self._get_scope_region(self.scope)
+
+    def _get_scope_region(self, scope):
+        return (self.lines.get_line_start(scope.get_start()),
+                self.lines.get_line_end(scope.get_end()) + 1)
+
+    def _choose_closest_line_end(self, offset, end=False):
+        lineno = self.lines.get_line_number(offset)
+        line_start = self.lines.get_line_start(lineno)
+        line_end = self.lines.get_line_end(lineno)
+        if self.source[line_start:offset].strip() == '':
+            if end:
+                return line_start - 1
+            else:
+                return line_start
+        elif self.source[offset:line_end].strip() == '':
+            return min(line_end, len(self.source))
+        return offset
+
+    @property
+    def one_line(self):
+        return self.region != self.lines_region and \
+            (self.logical_lines.logical_line_in(self.region_lines[0]) ==
+             self.logical_lines.logical_line_in(self.region_lines[1]))
+
+    @property
+    def global_(self):
+        return self.scope.parent is None
+
+    @property
+    def method(self):
+        return self.scope.parent is not None and \
+            self.scope.parent.get_kind() == 'Class'
+
+    @property
+    def indents(self):
+        return sourceutils.get_indents(self.pymodule.lines,
+                                       self.region_lines[0])
+
+    @property
+    def scope_indents(self):
+        if self.global_:
+            return 0
+        return sourceutils.get_indents(self.pymodule.lines,
+                                       self.scope.get_start())
+
+    @property
+    def extracted(self):
+        return self.source[self.region[0]:self.region[1]]
+
+    _returned = None
+
+    @property
+    def returned(self):
+        """Does the extracted piece contain return statement"""
+        if self._returned is None:
+            node = _parse_text(self.extracted)
+            self._returned = usefunction._returns_last(node)
+        return self._returned
+
+
+class _ExtractCollector(object):
+    """Collects information needed for performing the extract"""
+
+    def __init__(self, info):
+        self.definition = None
+        self.body_pattern = None
+        self.checks = {}
+        self.replacement_pattern = None
+        self.matches = None
+        self.replacements = None
+        self.definition_location = None
+
+
+class _ExtractPerformer(object):
+
+    def __init__(self, info):
+        self.info = info
+        _ExceptionalConditionChecker()(self.info)
+
+    def extract(self):
+        extract_info = self._collect_info()
+        content = codeanalyze.ChangeCollector(self.info.source)
+        definition = extract_info.definition
+        lineno, indents = extract_info.definition_location
+        offset = self.info.lines.get_line_start(lineno)
+        indented = sourceutils.fix_indentation(definition, indents)
+        content.add_change(offset, offset, indented)
+        self._replace_occurrences(content, extract_info)
+        return content.get_changed()
+
+    def _replace_occurrences(self, content, extract_info):
+        for match in extract_info.matches:
+            replacement = similarfinder.CodeTemplate(
+                extract_info.replacement_pattern)
+            mapping = {}
+            for name in replacement.get_names():
+                node = match.get_ast(name)
+                if node:
+                    start, end = patchedast.node_region(match.get_ast(name))
+                    mapping[name] = self.info.source[start:end]
+                else:
+                    mapping[name] = name
+            region = match.get_region()
+            content.add_change(region[0], region[1],
+                               replacement.substitute(mapping))
+
+    def _collect_info(self):
+        extract_collector = _ExtractCollector(self.info)
+        self._find_definition(extract_collector)
+        self._find_matches(extract_collector)
+        self._find_definition_location(extract_collector)
+        return extract_collector
+
+    def _find_matches(self, collector):
+        regions = self._where_to_search()
+        finder = similarfinder.SimilarFinder(self.info.pymodule)
+        matches = []
+        for start, end in regions:
+            matches.extend((finder.get_matches(collector.body_pattern,
+                                               collector.checks, start, end)))
+        collector.matches = matches
+
+    def _where_to_search(self):
+        if self.info.similar:
+            if self.info.make_global or self.info.global_:
+                return [(0, len(self.info.pymodule.source_code))]
+            if self.info.method and not self.info.variable:
+                class_scope = self.info.scope.parent
+                regions = []
+                method_kind = _get_function_kind(self.info.scope)
+                for scope in class_scope.get_scopes():
+                    if method_kind == 'method' and \
+                       _get_function_kind(scope) != 'method':
+                        continue
+                    start = self.info.lines.get_line_start(scope.get_start())
+                    end = self.info.lines.get_line_end(scope.get_end())
+                    regions.append((start, end))
+                return regions
+            else:
+                if self.info.variable:
+                    return [self.info.scope_region]
+                else:
+                    return [self.info._get_scope_region(
+                        self.info.scope.parent)]
+        else:
+            return [self.info.region]
+
+    def _find_definition_location(self, collector):
+        matched_lines = []
+        for match in collector.matches:
+            start = self.info.lines.get_line_number(match.get_region()[0])
+            start_line = self.info.logical_lines.logical_line_in(start)[0]
+            matched_lines.append(start_line)
+        location_finder = _DefinitionLocationFinder(self.info, matched_lines)
+        collector.definition_location = (location_finder.find_lineno(),
+                                         location_finder.find_indents())
+
+    def _find_definition(self, collector):
+        if self.info.variable:
+            parts = _ExtractVariableParts(self.info)
+        else:
+            parts = _ExtractMethodParts(self.info)
+        collector.definition = parts.get_definition()
+        collector.body_pattern = parts.get_body_pattern()
+        collector.replacement_pattern = parts.get_replacement_pattern()
+        collector.checks = parts.get_checks()
+
+
+class _DefinitionLocationFinder(object):
+
+    def __init__(self, info, matched_lines):
+        self.info = info
+        self.matched_lines = matched_lines
+        # This only happens when subexpressions cannot be matched
+        if not matched_lines:
+            self.matched_lines.append(self.info.region_lines[0])
+
+    def find_lineno(self):
+        if self.info.variable and not self.info.make_global:
+            return self._get_before_line()
+        if self.info.make_global or self.info.global_:
+            toplevel = self._find_toplevel(self.info.scope)
+            ast = self.info.pymodule.get_ast()
+            newlines = sorted(self.matched_lines + [toplevel.get_end() + 1])
+            return suites.find_visible(ast, newlines)
+        return self._get_after_scope()
+
+    def _find_toplevel(self, scope):
+        toplevel = scope
+        if toplevel.parent is not None:
+            while toplevel.parent.parent is not None:
+                toplevel = toplevel.parent
+        return toplevel
+
+    def find_indents(self):
+        if self.info.variable and not self.info.make_global:
+            return sourceutils.get_indents(self.info.lines,
+                                           self._get_before_line())
+        else:
+            if self.info.global_ or self.info.make_global:
+                return 0
+        return self.info.scope_indents
+
+    def _get_before_line(self):
+        ast = self.info.scope.pyobject.get_ast()
+        return suites.find_visible(ast, self.matched_lines)
+
+    def _get_after_scope(self):
+        return self.info.scope.get_end() + 1
+
+
+class _ExceptionalConditionChecker(object):
+
+    def __call__(self, info):
+        self.base_conditions(info)
+        if info.one_line:
+            self.one_line_conditions(info)
+        else:
+            self.multi_line_conditions(info)
+
+    def base_conditions(self, info):
+        if info.region[1] > info.scope_region[1]:
+            raise RefactoringError('Bad region selected for extract method')
+        end_line = info.region_lines[1]
+        end_scope = info.global_scope.get_inner_scope_for_line(end_line)
+        if end_scope != info.scope and end_scope.get_end() != end_line:
+            raise RefactoringError('Bad region selected for extract method')
+        try:
+            extracted = info.source[info.region[0]:info.region[1]]
+            if info.one_line:
+                extracted = '(%s)' % extracted
+            if _UnmatchedBreakOrContinueFinder.has_errors(extracted):
+                raise RefactoringError('A break/continue without having a '
+                                       'matching for/while loop.')
+        except SyntaxError:
+            raise RefactoringError('Extracted piece should '
+                                   'contain complete statements.')
+
+    def one_line_conditions(self, info):
+        if self._is_region_on_a_word(info):
+            raise RefactoringError('Should extract complete statements.')
+        if info.variable and not info.one_line:
+            raise RefactoringError('Extract variable should not '
+                                   'span multiple lines.')
+
+    def multi_line_conditions(self, info):
+        node = _parse_text(info.source[info.region[0]:info.region[1]])
+        count = usefunction._return_count(node)
+        if count > 1:
+            raise RefactoringError('Extracted piece can have only one '
+                                   'return statement.')
+        if usefunction._yield_count(node):
+            raise RefactoringError('Extracted piece cannot '
+                                   'have yield statements.')
+        if count == 1 and not usefunction._returns_last(node):
+            raise RefactoringError('Return should be the last statement.')
+        if info.region != info.lines_region:
+            raise RefactoringError('Extracted piece should '
+                                   'contain complete statements.')
+
+    def _is_region_on_a_word(self, info):
+        if info.region[0] > 0 and \
+                self._is_on_a_word(info, info.region[0] - 1) or \
+                self._is_on_a_word(info, info.region[1] - 1):
+            return True
+
+    def _is_on_a_word(self, info, offset):
+        prev = info.source[offset]
+        if not (prev.isalnum() or prev == '_') or \
+           offset + 1 == len(info.source):
+            return False
+        next = info.source[offset + 1]
+        return next.isalnum() or next == '_'
+
+
+class _ExtractMethodParts(object):
+
+    def __init__(self, info):
+        self.info = info
+        self.info_collector = self._create_info_collector()
+
+    def get_definition(self):
+        if self.info.global_:
+            return '\n%s\n' % self._get_function_definition()
+        else:
+            return '\n%s' % self._get_function_definition()
+
+    def get_replacement_pattern(self):
+        variables = []
+        variables.extend(self._find_function_arguments())
+        variables.extend(self._find_function_returns())
+        return similarfinder.make_pattern(self._get_call(), variables)
+
+    def get_body_pattern(self):
+        variables = []
+        variables.extend(self._find_function_arguments())
+        variables.extend(self._find_function_returns())
+        variables.extend(self._find_temps())
+        return similarfinder.make_pattern(self._get_body(), variables)
+
+    def _get_body(self):
+        result = sourceutils.fix_indentation(self.info.extracted, 0)
+        if self.info.one_line:
+            result = '(%s)' % result
+        return result
+
+    def _find_temps(self):
+        return usefunction.find_temps(self.info.project,
+                                      self._get_body())
+
+    def get_checks(self):
+        if self.info.method and not self.info.make_global:
+            if _get_function_kind(self.info.scope) == 'method':
+                class_name = similarfinder._pydefined_to_str(
+                    self.info.scope.parent.pyobject)
+                return {self._get_self_name(): 'type=' + class_name}
+        return {}
+
+    def _create_info_collector(self):
+        zero = self.info.scope.get_start() - 1
+        start_line = self.info.region_lines[0] - zero
+        end_line = self.info.region_lines[1] - zero
+        info_collector = _FunctionInformationCollector(start_line, end_line,
+                                                       self.info.global_)
+        body = self.info.source[self.info.scope_region[0]:
+                                self.info.scope_region[1]]
+        node = _parse_text(body)
+        ast.walk(node, info_collector)
+        return info_collector
+
+    def _get_function_definition(self):
+        args = self._find_function_arguments()
+        returns = self._find_function_returns()
+        result = []
+        if self.info.method and not self.info.make_global and \
+           _get_function_kind(self.info.scope) != 'method':
+            result.append('@staticmethod\n')
+        result.append('def %s:\n' % self._get_function_signature(args))
+        unindented_body = self._get_unindented_function_body(returns)
+        indents = sourceutils.get_indent(self.info.project)
+        function_body = sourceutils.indent_lines(unindented_body, indents)
+        result.append(function_body)
+        definition = ''.join(result)
+
+        return definition + '\n'
+
+    def _get_function_signature(self, args):
+        args = list(args)
+        prefix = ''
+        if self._extracting_method():
+            self_name = self._get_self_name()
+            if self_name is None:
+                raise RefactoringError('Extracting a method from a function '
+                                       'with no self argument.')
+            if self_name in args:
+                args.remove(self_name)
+            args.insert(0, self_name)
+        return prefix + self.info.new_name + \
+            '(%s)' % self._get_comma_form(args)
+
+    def _extracting_method(self):
+        return self.info.method and not self.info.make_global and \
+            _get_function_kind(self.info.scope) == 'method'
+
+    def _get_self_name(self):
+        param_names = self.info.scope.pyobject.get_param_names()
+        if param_names:
+            return param_names[0]
+
+    def _get_function_call(self, args):
+        prefix = ''
+        if self.info.method and not self.info.make_global:
+            if _get_function_kind(self.info.scope) == 'method':
+                self_name = self._get_self_name()
+                if self_name in args:
+                    args.remove(self_name)
+                prefix = self_name + '.'
+            else:
+                prefix = self.info.scope.parent.pyobject.get_name() + '.'
+        return prefix + '%s(%s)' % (self.info.new_name,
+                                    self._get_comma_form(args))
+
+    def _get_comma_form(self, names):
+        result = ''
+        if names:
+            result += names[0]
+            for name in names[1:]:
+                result += ', ' + name
+        return result
+
+    def _get_call(self):
+        if self.info.one_line:
+            args = self._find_function_arguments()
+            return self._get_function_call(args)
+        args = self._find_function_arguments()
+        returns = self._find_function_returns()
+        call_prefix = ''
+        if returns:
+            call_prefix = self._get_comma_form(returns) + ' = '
+        if self.info.returned:
+            call_prefix = 'return '
+        return call_prefix + self._get_function_call(args)
+
+    def _find_function_arguments(self):
+        # if not make_global, do not pass any global names; they are
+        # all visible.
+        if self.info.global_ and not self.info.make_global:
+            return ()
+        if not self.info.one_line:
+            result = (self.info_collector.prewritten &
+                      self.info_collector.read)
+            result |= (self.info_collector.prewritten &
+                       self.info_collector.postread &
+                       (self.info_collector.maybe_written -
+                        self.info_collector.written))
+            return list(result)
+        start = self.info.region[0]
+        if start == self.info.lines_region[0]:
+            start = start + re.search('\S', self.info.extracted).start()
+        function_definition = self.info.source[start:self.info.region[1]]
+        read = _VariableReadsAndWritesFinder.find_reads_for_one_liners(
+            function_definition)
+        return list(self.info_collector.prewritten.intersection(read))
+
+    def _find_function_returns(self):
+        if self.info.one_line or self.info.returned:
+            return []
+        written = self.info_collector.written | \
+            self.info_collector.maybe_written
+        return list(written & self.info_collector.postread)
+
+    def _get_unindented_function_body(self, returns):
+        if self.info.one_line:
+            return 'return ' + _join_lines(self.info.extracted)
+        extracted_body = self.info.extracted
+        unindented_body = sourceutils.fix_indentation(extracted_body, 0)
+        if returns:
+            unindented_body += '\nreturn %s' % self._get_comma_form(returns)
+        return unindented_body
+
+
+class _ExtractVariableParts(object):
+
+    def __init__(self, info):
+        self.info = info
+
+    def get_definition(self):
+        result = self.info.new_name + ' = ' + \
+            _join_lines(self.info.extracted) + '\n'
+        return result
+
+    def get_body_pattern(self):
+        return '(%s)' % self.info.extracted.strip()
+
+    def get_replacement_pattern(self):
+        return self.info.new_name
+
+    def get_checks(self):
+        return {}
+
+
+class _FunctionInformationCollector(object):
+
+    def __init__(self, start, end, is_global):
+        self.start = start
+        self.end = end
+        self.is_global = is_global
+        self.prewritten = OrderedSet()
+        self.maybe_written = OrderedSet()
+        self.written = OrderedSet()
+        self.read = OrderedSet()
+        self.postread = OrderedSet()
+        self.postwritten = OrderedSet()
+        self.host_function = True
+        self.conditional = False
+
+    def _read_variable(self, name, lineno):
+        if self.start <= lineno <= self.end:
+            if name not in self.written:
+                if not self.conditional or name not in self.maybe_written:
+                    self.read.add(name)
+        if self.end < lineno:
+            if name not in self.postwritten:
+                self.postread.add(name)
+
+    def _written_variable(self, name, lineno):
+        if self.start <= lineno <= self.end:
+            if self.conditional:
+                self.maybe_written.add(name)
+            else:
+                self.written.add(name)
+        if self.start > lineno:
+            self.prewritten.add(name)
+        if self.end < lineno:
+            self.postwritten.add(name)
+
+    def _FunctionDef(self, node):
+        if not self.is_global and self.host_function:
+            self.host_function = False
+            for name in _get_argnames(node.args):
+                self._written_variable(name, node.lineno)
+            for child in node.body:
+                ast.walk(child, self)
+        else:
+            self._written_variable(node.name, node.lineno)
+            visitor = _VariableReadsAndWritesFinder()
+            for child in node.body:
+                ast.walk(child, visitor)
+            for name in visitor.read - visitor.written:
+                self._read_variable(name, node.lineno)
+
+    def _Name(self, node):
+        if isinstance(node.ctx, (ast.Store, ast.AugStore)):
+            self._written_variable(node.id, node.lineno)
+        if not isinstance(node.ctx, ast.Store):
+            self._read_variable(node.id, node.lineno)
+
+    def _Assign(self, node):
+        ast.walk(node.value, self)
+        for child in node.targets:
+            ast.walk(child, self)
+
+    def _ClassDef(self, node):
+        self._written_variable(node.name, node.lineno)
+
+    def _handle_conditional_node(self, node):
+        self.conditional = True
+        try:
+            for child in ast.get_child_nodes(node):
+                ast.walk(child, self)
+        finally:
+            self.conditional = False
+
+    def _If(self, node):
+        self._handle_conditional_node(node)
+
+    def _While(self, node):
+        self._handle_conditional_node(node)
+
+    def _For(self, node):
+        self.conditional = True
+        try:
+            # iter has to be checked before the target variables
+            ast.walk(node.iter, self)
+            ast.walk(node.target, self)
+
+            for child in node.body:
+                ast.walk(child, self)
+            for child in node.orelse:
+                ast.walk(child, self)
+        finally:
+            self.conditional = False
+
+
+def _get_argnames(arguments):
+    result = [pycompat.get_ast_arg_arg(node) for node in arguments.args
+              if isinstance(node, pycompat.ast_arg_type)]
+    if arguments.vararg:
+        result.append(pycompat.get_ast_arg_arg(arguments.vararg))
+    if arguments.kwarg:
+        result.append(pycompat.get_ast_arg_arg(arguments.kwarg))
+    return result
+
+
+class _VariableReadsAndWritesFinder(object):
+
+    def __init__(self):
+        self.written = set()
+        self.read = set()
+
+    def _Name(self, node):
+        if isinstance(node.ctx, (ast.Store, ast.AugStore)):
+            self.written.add(node.id)
+        if not isinstance(node, ast.Store):
+            self.read.add(node.id)
+
+    def _FunctionDef(self, node):
+        self.written.add(node.name)
+        visitor = _VariableReadsAndWritesFinder()
+        for child in ast.get_child_nodes(node):
+            ast.walk(child, visitor)
+        self.read.update(visitor.read - visitor.written)
+
+    def _Class(self, node):
+        self.written.add(node.name)
+
+    @staticmethod
+    def find_reads_and_writes(code):
+        if code.strip() == '':
+            return set(), set()
+        if isinstance(code, unicode):
+            code = code.encode('utf-8')
+        node = _parse_text(code)
+        visitor = _VariableReadsAndWritesFinder()
+        ast.walk(node, visitor)
+        return visitor.read, visitor.written
+
+    @staticmethod
+    def find_reads_for_one_liners(code):
+        if code.strip() == '':
+            return set(), set()
+        node = _parse_text(code)
+        visitor = _VariableReadsAndWritesFinder()
+        ast.walk(node, visitor)
+        return visitor.read
+
+
+class _UnmatchedBreakOrContinueFinder(object):
+
+    def __init__(self):
+        self.error = False
+        self.loop_count = 0
+
+    def _For(self, node):
+        self.loop_encountered(node)
+
+    def _While(self, node):
+        self.loop_encountered(node)
+
+    def loop_encountered(self, node):
+        self.loop_count += 1
+        for child in node.body:
+            ast.walk(child, self)
+        self.loop_count -= 1
+        if node.orelse:
+            if isinstance(node.orelse,(list,tuple)):
+                for node_ in node.orelse:
+                    ast.walk(node_, self)
+            else:
+                ast.walk(node.orelse, self)
+
+    def _Break(self, node):
+        self.check_loop()
+
+    def _Continue(self, node):
+        self.check_loop()
+
+    def check_loop(self):
+        if self.loop_count < 1:
+            self.error = True
+
+    def _FunctionDef(self, node):
+        pass
+
+    def _ClassDef(self, node):
+        pass
+
+    @staticmethod
+    def has_errors(code):
+        if code.strip() == '':
+            return False
+        node = _parse_text(code)
+        visitor = _UnmatchedBreakOrContinueFinder()
+        ast.walk(node, visitor)
+        return visitor.error
+
+
+def _get_function_kind(scope):
+    return scope.pyobject.get_kind()
+
+
+def _parse_text(body):
+    body = sourceutils.fix_indentation(body, 0)
+    node = ast.parse(body)
+    return node
+
+
+def _join_lines(code):
+    lines = []
+    for line in code.splitlines():
+        if line.endswith('\\'):
+            lines.append(line[:-1].strip())
+        else:
+            lines.append(line.strip())
+    return ' '.join(lines)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/functionutils.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/functionutils.py
new file mode 100644
index 0000000..58baf91
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/functionutils.py
@@ -0,0 +1,222 @@
+import rope.base.exceptions
+import rope.base.pyobjects
+from rope.base.builtins import Lambda
+from rope.base import worder
+
+
+class DefinitionInfo(object):
+
+    def __init__(self, function_name, is_method, args_with_defaults,
+                 args_arg, keywords_arg):
+        self.function_name = function_name
+        self.is_method = is_method
+        self.args_with_defaults = args_with_defaults
+        self.args_arg = args_arg
+        self.keywords_arg = keywords_arg
+
+    def to_string(self):
+        return '%s(%s)' % (self.function_name, self.arguments_to_string())
+
+    def arguments_to_string(self, from_index=0):
+        params = []
+        for arg, default in self.args_with_defaults:
+            if default is not None:
+                params.append('%s=%s' % (arg, default))
+            else:
+                params.append(arg)
+        if self.args_arg is not None:
+            params.append('*' + self.args_arg)
+        if self.keywords_arg:
+            params.append('**' + self.keywords_arg)
+        return ', '.join(params[from_index:])
+
+    @staticmethod
+    def _read(pyfunction, code):
+        kind = pyfunction.get_kind()
+        is_method = kind == 'method'
+        is_lambda = kind == 'lambda'
+        info = _FunctionParser(code, is_method, is_lambda)
+        args, keywords = info.get_parameters()
+        args_arg = None
+        keywords_arg = None
+        if args and args[-1].startswith('**'):
+            keywords_arg = args[-1][2:]
+            del args[-1]
+        if args and args[-1].startswith('*'):
+            args_arg = args[-1][1:]
+            del args[-1]
+        args_with_defaults = [(name, None) for name in args]
+        args_with_defaults.extend(keywords)
+        return DefinitionInfo(info.get_function_name(), is_method,
+                              args_with_defaults, args_arg, keywords_arg)
+
+    @staticmethod
+    def read(pyfunction):
+        pymodule = pyfunction.get_module()
+        word_finder = worder.Worder(pymodule.source_code)
+        lineno = pyfunction.get_ast().lineno
+        start = pymodule.lines.get_line_start(lineno)
+        if isinstance(pyfunction, Lambda):
+            call = word_finder.get_lambda_and_args(start)
+        else:
+            call = word_finder.get_function_and_args_in_header(start)
+        return DefinitionInfo._read(pyfunction, call)
+
+
+class CallInfo(object):
+
+    def __init__(self, function_name, args, keywords, args_arg,
+                 keywords_arg, implicit_arg, constructor):
+        self.function_name = function_name
+        self.args = args
+        self.keywords = keywords
+        self.args_arg = args_arg
+        self.keywords_arg = keywords_arg
+        self.implicit_arg = implicit_arg
+        self.constructor = constructor
+
+    def to_string(self):
+        function = self.function_name
+        if self.implicit_arg:
+            function = self.args[0] + '.' + self.function_name
+        params = []
+        start = 0
+        if self.implicit_arg or self.constructor:
+            start = 1
+        if self.args[start:]:
+            params.extend(self.args[start:])
+        if self.keywords:
+            params.extend(['%s=%s' % (name, value)
+                          for name, value in self.keywords])
+        if self.args_arg is not None:
+            params.append('*' + self.args_arg)
+        if self.keywords_arg:
+            params.append('**' + self.keywords_arg)
+        return '%s(%s)' % (function, ', '.join(params))
+
+    @staticmethod
+    def read(primary, pyname, definition_info, code):
+        is_method_call = CallInfo._is_method_call(primary, pyname)
+        is_constructor = CallInfo._is_class(pyname)
+        is_classmethod = CallInfo._is_classmethod(pyname)
+        info = _FunctionParser(code, is_method_call or is_classmethod)
+        args, keywords = info.get_parameters()
+        args_arg = None
+        keywords_arg = None
+        if args and args[-1].startswith('**'):
+            keywords_arg = args[-1][2:]
+            del args[-1]
+        if args and args[-1].startswith('*'):
+            args_arg = args[-1][1:]
+            del args[-1]
+        if is_constructor:
+            args.insert(0, definition_info.args_with_defaults[0][0])
+        return CallInfo(info.get_function_name(), args, keywords, args_arg,
+                        keywords_arg, is_method_call or is_classmethod,
+                        is_constructor)
+
+    @staticmethod
+    def _is_method_call(primary, pyname):
+        return primary is not None and \
+            isinstance(primary.get_object().get_type(),
+                       rope.base.pyobjects.PyClass) and \
+            CallInfo._is_method(pyname)
+
+    @staticmethod
+    def _is_class(pyname):
+        return pyname is not None and \
+            isinstance(pyname.get_object(),
+                       rope.base.pyobjects.PyClass)
+
+    @staticmethod
+    def _is_method(pyname):
+        if pyname is not None and \
+           isinstance(pyname.get_object(), rope.base.pyobjects.PyFunction):
+            return pyname.get_object().get_kind() == 'method'
+        return False
+
+    @staticmethod
+    def _is_classmethod(pyname):
+        if pyname is not None and \
+           isinstance(pyname.get_object(), rope.base.pyobjects.PyFunction):
+            return pyname.get_object().get_kind() == 'classmethod'
+        return False
+
+
+class ArgumentMapping(object):
+
+    def __init__(self, definition_info, call_info):
+        self.call_info = call_info
+        self.param_dict = {}
+        self.keyword_args = []
+        self.args_arg = []
+        for index, value in enumerate(call_info.args):
+            if index < len(definition_info.args_with_defaults):
+                name = definition_info.args_with_defaults[index][0]
+                self.param_dict[name] = value
+            else:
+                self.args_arg.append(value)
+        for name, value in call_info.keywords:
+            index = -1
+            for pair in definition_info.args_with_defaults:
+                if pair[0] == name:
+                    self.param_dict[name] = value
+                    break
+            else:
+                self.keyword_args.append((name, value))
+
+    def to_call_info(self, definition_info):
+        args = []
+        keywords = []
+        for index in range(len(definition_info.args_with_defaults)):
+            name = definition_info.args_with_defaults[index][0]
+            if name in self.param_dict:
+                args.append(self.param_dict[name])
+            else:
+                for i in range(index, len(definition_info.args_with_defaults)):
+                    name = definition_info.args_with_defaults[i][0]
+                    if name in self.param_dict:
+                        keywords.append((name, self.param_dict[name]))
+                break
+        args.extend(self.args_arg)
+        keywords.extend(self.keyword_args)
+        return CallInfo(self.call_info.function_name, args, keywords,
+                        self.call_info.args_arg, self.call_info.keywords_arg,
+                        self.call_info.implicit_arg,
+                        self.call_info.constructor)
+
+
+class _FunctionParser(object):
+
+    def __init__(self, call, implicit_arg, is_lambda=False):
+        self.call = call
+        self.implicit_arg = implicit_arg
+        self.word_finder = worder.Worder(self.call)
+        if is_lambda:
+            self.last_parens = self.call.rindex(':')
+        else:
+            self.last_parens = self.call.rindex(')')
+        self.first_parens = self.word_finder._find_parens_start(
+            self.last_parens)
+
+    def get_parameters(self):
+        args, keywords = self.word_finder.get_parameters(self.first_parens,
+                                                         self.last_parens)
+        if self.is_called_as_a_method():
+            instance = self.call[:self.call.rindex('.', 0, self.first_parens)]
+            args.insert(0, instance.strip())
+        return args, keywords
+
+    def get_instance(self):
+        if self.is_called_as_a_method():
+            return self.word_finder.get_primary_at(
+                self.call.rindex('.', 0, self.first_parens) - 1)
+
+    def get_function_name(self):
+        if self.is_called_as_a_method():
+            return self.word_finder.get_word_at(self.first_parens - 1)
+        else:
+            return self.word_finder.get_primary_at(self.first_parens - 1)
+
+    def is_called_as_a_method(self):
+        return self.implicit_arg and '.' in self.call[:self.first_parens]
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__init__.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__init__.py
new file mode 100644
index 0000000..6a44f01
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__init__.py
@@ -0,0 +1,316 @@
+"""A package for handling imports
+
+This package provides tools for modifying module imports after
+refactorings or as a separate task.
+
+"""
+import rope.base.evaluate
+from rope.base import libutils
+from rope.base.change import ChangeSet, ChangeContents
+from rope.refactor import occurrences, rename
+from rope.refactor.importutils import module_imports, actions
+from rope.refactor.importutils.importinfo import NormalImport, FromImport
+import rope.base.codeanalyze
+
+
+class ImportOrganizer(object):
+    """Perform some import-related commands
+
+    Each method returns a `rope.base.change.Change` object.
+
+    """
+
+    def __init__(self, project):
+        self.project = project
+        self.import_tools = ImportTools(self.project)
+
+    def organize_imports(self, resource, offset=None):
+        return self._perform_command_on_import_tools(
+            self.import_tools.organize_imports, resource, offset)
+
+    def expand_star_imports(self, resource, offset=None):
+        return self._perform_command_on_import_tools(
+            self.import_tools.expand_stars, resource, offset)
+
+    def froms_to_imports(self, resource, offset=None):
+        return self._perform_command_on_import_tools(
+            self.import_tools.froms_to_imports, resource, offset)
+
+    def relatives_to_absolutes(self, resource, offset=None):
+        return self._perform_command_on_import_tools(
+            self.import_tools.relatives_to_absolutes, resource, offset)
+
+    def handle_long_imports(self, resource, offset=None):
+        return self._perform_command_on_import_tools(
+            self.import_tools.handle_long_imports, resource, offset)
+
+    def _perform_command_on_import_tools(self, method, resource, offset):
+        pymodule = self.project.get_pymodule(resource)
+        before_performing = pymodule.source_code
+        import_filter = None
+        if offset is not None:
+            import_filter = self._line_filter(
+                pymodule.lines.get_line_number(offset))
+        result = method(pymodule, import_filter=import_filter)
+        if result is not None and result != before_performing:
+            changes = ChangeSet(method.__name__.replace('_', ' ') +
+                                ' in <%s>' % resource.path)
+            changes.add_change(ChangeContents(resource, result))
+            return changes
+
+    def _line_filter(self, lineno):
+        def import_filter(import_stmt):
+            return import_stmt.start_line <= lineno < import_stmt.end_line
+        return import_filter
+
+
+class ImportTools(object):
+
+    def __init__(self, project):
+        self.project = project
+
+    def get_import(self, resource):
+        """The import statement for `resource`"""
+        module_name = libutils.modname(resource)
+        return NormalImport(((module_name, None), ))
+
+    def get_from_import(self, resource, name):
+        """The from import statement for `name` in `resource`"""
+        module_name = libutils.modname(resource)
+        names = []
+        if isinstance(name, list):
+            names = [(imported, None) for imported in name]
+        else:
+            names = [(name, None), ]
+        return FromImport(module_name, 0, tuple(names))
+
+    def module_imports(self, module, imports_filter=None):
+        return module_imports.ModuleImports(self.project, module,
+                                            imports_filter)
+
+    def froms_to_imports(self, pymodule, import_filter=None):
+        pymodule = self._clean_up_imports(pymodule, import_filter)
+        module_imports = self.module_imports(pymodule, import_filter)
+        for import_stmt in module_imports.imports:
+            if import_stmt.readonly or \
+               not self._is_transformable_to_normal(import_stmt.import_info):
+                continue
+            pymodule = self._from_to_normal(pymodule, import_stmt)
+
+        # Adding normal imports in place of froms
+        module_imports = self.module_imports(pymodule, import_filter)
+        for import_stmt in module_imports.imports:
+            if not import_stmt.readonly and \
+               self._is_transformable_to_normal(import_stmt.import_info):
+                import_stmt.import_info = \
+                    NormalImport(((import_stmt.import_info.module_name,
+                                 None),))
+        module_imports.remove_duplicates()
+        return module_imports.get_changed_source()
+
+    def expand_stars(self, pymodule, import_filter=None):
+        module_imports = self.module_imports(pymodule, import_filter)
+        module_imports.expand_stars()
+        return module_imports.get_changed_source()
+
+    def _from_to_normal(self, pymodule, import_stmt):
+        resource = pymodule.get_resource()
+        from_import = import_stmt.import_info
+        module_name = from_import.module_name
+        for name, alias in from_import.names_and_aliases:
+            imported = name
+            if alias is not None:
+                imported = alias
+            occurrence_finder = occurrences.create_finder(
+                self.project, imported, pymodule[imported], imports=False)
+            source = rename.rename_in_module(
+                occurrence_finder, module_name + '.' + name,
+                pymodule=pymodule, replace_primary=True)
+            if source is not None:
+                pymodule = libutils.get_string_module(
+                    self.project, source, resource)
+        return pymodule
+
+    def _clean_up_imports(self, pymodule, import_filter):
+        resource = pymodule.get_resource()
+        module_with_imports = self.module_imports(pymodule, import_filter)
+        module_with_imports.expand_stars()
+        source = module_with_imports.get_changed_source()
+        if source is not None:
+            pymodule = libutils.get_string_module(
+                self.project, source, resource)
+        source = self.relatives_to_absolutes(pymodule)
+        if source is not None:
+            pymodule = libutils.get_string_module(
+                self.project, source, resource)
+
+        module_with_imports = self.module_imports(pymodule, import_filter)
+        module_with_imports.remove_duplicates()
+        module_with_imports.remove_unused_imports()
+        source = module_with_imports.get_changed_source()
+        if source is not None:
+            pymodule = libutils.get_string_module(
+                self.project, source, resource)
+        return pymodule
+
+    def relatives_to_absolutes(self, pymodule, import_filter=None):
+        module_imports = self.module_imports(pymodule, import_filter)
+        to_be_absolute_list = module_imports.get_relative_to_absolute_list()
+        for name, absolute_name in to_be_absolute_list:
+            pymodule = self._rename_in_module(pymodule, name, absolute_name)
+        module_imports = self.module_imports(pymodule, import_filter)
+        module_imports.get_relative_to_absolute_list()
+        source = module_imports.get_changed_source()
+        if source is None:
+            source = pymodule.source_code
+        return source
+
+    def _is_transformable_to_normal(self, import_info):
+        if not isinstance(import_info, FromImport):
+            return False
+        return True
+
+    def organize_imports(self, pymodule,
+                         unused=True, duplicates=True,
+                         selfs=True, sort=True, import_filter=None):
+        if unused or duplicates:
+            module_imports = self.module_imports(pymodule, import_filter)
+            if unused:
+                module_imports.remove_unused_imports()
+            if self.project.prefs.get("split_imports"):
+                module_imports.force_single_imports()
+            if duplicates:
+                module_imports.remove_duplicates()
+            source = module_imports.get_changed_source()
+            if source is not None:
+                pymodule = libutils.get_string_module(
+                    self.project, source, pymodule.get_resource())
+        if selfs:
+            pymodule = self._remove_self_imports(pymodule, import_filter)
+        if sort:
+            return self.sort_imports(pymodule, import_filter)
+        else:
+            return pymodule.source_code
+
+    def _remove_self_imports(self, pymodule, import_filter=None):
+        module_imports = self.module_imports(pymodule, import_filter)
+        to_be_fixed, to_be_renamed = \
+            module_imports.get_self_import_fix_and_rename_list()
+        for name in to_be_fixed:
+            try:
+                pymodule = self._rename_in_module(pymodule, name, '',
+                                                  till_dot=True)
+            except ValueError:
+                # There is a self import with direct access to it
+                return pymodule
+        for name, new_name in to_be_renamed:
+            pymodule = self._rename_in_module(pymodule, name, new_name)
+        module_imports = self.module_imports(pymodule, import_filter)
+        module_imports.get_self_import_fix_and_rename_list()
+        source = module_imports.get_changed_source()
+        if source is not None:
+            pymodule = libutils.get_string_module(
+                self.project, source, pymodule.get_resource())
+        return pymodule
+
+    def _rename_in_module(self, pymodule, name, new_name, till_dot=False):
+        old_name = name.split('.')[-1]
+        old_pyname = rope.base.evaluate.eval_str(pymodule.get_scope(), name)
+        occurrence_finder = occurrences.create_finder(
+            self.project, old_name, old_pyname, imports=False)
+        changes = rope.base.codeanalyze.ChangeCollector(pymodule.source_code)
+        for occurrence in occurrence_finder.find_occurrences(
+                pymodule=pymodule):
+            start, end = occurrence.get_primary_range()
+            if till_dot:
+                new_end = pymodule.source_code.index('.', end) + 1
+                space = pymodule.source_code[end:new_end - 1].strip()
+                if not space == '':
+                    for c in space:
+                        if not c.isspace() and c not in '\\':
+                            raise ValueError()
+                end = new_end
+            changes.add_change(start, end, new_name)
+        source = changes.get_changed()
+        if source is not None:
+            pymodule = libutils.get_string_module(
+                self.project, source, pymodule.get_resource())
+        return pymodule
+
+    def sort_imports(self, pymodule, import_filter=None):
+        module_imports = self.module_imports(pymodule, import_filter)
+        module_imports.sort_imports()
+        return module_imports.get_changed_source()
+
+    def handle_long_imports(self, pymodule, maxdots=2, maxlength=27,
+                            import_filter=None):
+        # IDEA: `maxdots` and `maxlength` can be specified in project config
+        # adding new from imports
+        module_imports = self.module_imports(pymodule, import_filter)
+        to_be_fixed = module_imports.handle_long_imports(maxdots, maxlength)
+        # performing the renaming
+        pymodule = libutils.get_string_module(
+            self.project, module_imports.get_changed_source(),
+            resource=pymodule.get_resource())
+        for name in to_be_fixed:
+            pymodule = self._rename_in_module(pymodule, name,
+                                              name.split('.')[-1])
+        # organizing imports
+        return self.organize_imports(pymodule, selfs=False, sort=False,
+                                     import_filter=import_filter)
+
+
+def get_imports(project, pydefined):
+    """A shortcut for getting the `ImportInfo`\s used in a scope"""
+    pymodule = pydefined.get_module()
+    module = module_imports.ModuleImports(project, pymodule)
+    if pymodule == pydefined:
+        return [stmt.import_info for stmt in module.imports]
+    return module.get_used_imports(pydefined)
+
+
+def get_module_imports(project, pymodule):
+    """A shortcut for creating a `module_imports.ModuleImports` object"""
+    return module_imports.ModuleImports(project, pymodule)
+
+
+def add_import(project, pymodule, module_name, name=None):
+    imports = get_module_imports(project, pymodule)
+    candidates = []
+    names = []
+    selected_import = None
+    # from mod import name
+    if name is not None:
+        from_import = FromImport(module_name, 0, [(name, None)])
+        names.append(name)
+        candidates.append(from_import)
+    # from pkg import mod
+    if '.' in module_name:
+        pkg, mod = module_name.rsplit('.', 1)
+        from_import = FromImport(pkg, 0, [(mod, None)])
+        if project.prefs.get('prefer_module_from_imports'):
+            selected_import = from_import
+        candidates.append(from_import)
+        if name:
+            names.append(mod + '.' + name)
+        else:
+            names.append(mod)
+    # import mod
+    normal_import = NormalImport([(module_name, None)])
+    if name:
+        names.append(module_name + '.' + name)
+    else:
+        names.append(module_name)
+
+    candidates.append(normal_import)
+
+    visitor = actions.AddingVisitor(project, candidates)
+    if selected_import is None:
+        selected_import = normal_import
+    for import_statement in imports.imports:
+        if import_statement.accept(visitor):
+            selected_import = visitor.import_info
+            break
+    imports.add_import(selected_import)
+    imported_name = names[candidates.index(selected_import)]
+    return imports.get_changed_source(), imported_name
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/__init__.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/__init__.cpython-35.pyc
new file mode 100644
index 0000000..81e7850
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/__init__.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/actions.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/actions.cpython-35.pyc
new file mode 100644
index 0000000..be4277d
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/actions.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/importinfo.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/importinfo.cpython-35.pyc
new file mode 100644
index 0000000..5b829ba
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/importinfo.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/module_imports.cpython-35.pyc b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/module_imports.cpython-35.pyc
new file mode 100644
index 0000000..8fc6242
Binary files /dev/null and b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/__pycache__/module_imports.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/actions.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/actions.py
new file mode 100644
index 0000000..fd0f705
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/actions.py
@@ -0,0 +1,361 @@
+from rope.base import libutils
+from rope.base import pyobjects, exceptions, stdmods
+from rope.refactor import occurrences
+from rope.refactor.importutils import importinfo
+
+
+class ImportInfoVisitor(object):
+
+    def dispatch(self, import_):
+        try:
+            method_name = 'visit' + import_.import_info.__class__.__name__
+            method = getattr(self, method_name)
+            return method(import_, import_.import_info)
+        except exceptions.ModuleNotFoundError:
+            pass
+
+    def visitEmptyImport(self, import_stmt, import_info):
+        pass
+
+    def visitNormalImport(self, import_stmt, import_info):
+        pass
+
+    def visitFromImport(self, import_stmt, import_info):
+        pass
+
+
+class RelativeToAbsoluteVisitor(ImportInfoVisitor):
+
+    def __init__(self, project, current_folder):
+        self.to_be_absolute = []
+        self.project = project
+        self.folder = current_folder
+        self.context = importinfo.ImportContext(project, current_folder)
+
+    def visitNormalImport(self, import_stmt, import_info):
+        self.to_be_absolute.extend(
+            self._get_relative_to_absolute_list(import_info))
+        new_pairs = []
+        for name, alias in import_info.names_and_aliases:
+            resource = self.project.find_module(name, folder=self.folder)
+            if resource is None:
+                new_pairs.append((name, alias))
+                continue
+            absolute_name = libutils.modname(resource)
+            new_pairs.append((absolute_name, alias))
+        if not import_info._are_name_and_alias_lists_equal(
+                new_pairs, import_info.names_and_aliases):
+            import_stmt.import_info = importinfo.NormalImport(new_pairs)
+
+    def _get_relative_to_absolute_list(self, import_info):
+        result = []
+        for name, alias in import_info.names_and_aliases:
+            if alias is not None:
+                continue
+            resource = self.project.find_module(name, folder=self.folder)
+            if resource is None:
+                continue
+            absolute_name = libutils.modname(resource)
+            if absolute_name != name:
+                result.append((name, absolute_name))
+        return result
+
+    def visitFromImport(self, import_stmt, import_info):
+        resource = import_info.get_imported_resource(self.context)
+        if resource is None:
+            return None
+        absolute_name = libutils.modname(resource)
+        if import_info.module_name != absolute_name:
+            import_stmt.import_info = importinfo.FromImport(
+                absolute_name, 0, import_info.names_and_aliases)
+
+
+class FilteringVisitor(ImportInfoVisitor):
+
+    def __init__(self, project, folder, can_select):
+        self.to_be_absolute = []
+        self.project = project
+        self.can_select = self._transform_can_select(can_select)
+        self.context = importinfo.ImportContext(project, folder)
+
+    def _transform_can_select(self, can_select):
+        def can_select_name_and_alias(name, alias):
+            imported = name
+            if alias is not None:
+                imported = alias
+            return can_select(imported)
+        return can_select_name_and_alias
+
+    def visitNormalImport(self, import_stmt, import_info):
+        new_pairs = []
+        for name, alias in import_info.names_and_aliases:
+            if self.can_select(name, alias):
+                new_pairs.append((name, alias))
+        return importinfo.NormalImport(new_pairs)
+
+    def visitFromImport(self, import_stmt, import_info):
+        if _is_future(import_info):
+            return import_info
+        new_pairs = []
+        if import_info.is_star_import():
+            for name in import_info.get_imported_names(self.context):
+                if self.can_select(name, None):
+                    new_pairs.append(import_info.names_and_aliases[0])
+                    break
+        else:
+            for name, alias in import_info.names_and_aliases:
+                if self.can_select(name, alias):
+                    new_pairs.append((name, alias))
+        return importinfo.FromImport(
+            import_info.module_name, import_info.level, new_pairs)
+
+
+class RemovingVisitor(ImportInfoVisitor):
+
+    def __init__(self, project, folder, can_select):
+        self.to_be_absolute = []
+        self.project = project
+        self.filtering = FilteringVisitor(project, folder, can_select)
+
+    def dispatch(self, import_):
+        result = self.filtering.dispatch(import_)
+        if result is not None:
+            import_.import_info = result
+
+
+class AddingVisitor(ImportInfoVisitor):
+    """A class for adding imports
+
+    Given a list of `ImportInfo`\s, it tries to add each import to the
+    module and returns `True` and gives up when an import can be added
+    to older ones.
+
+    """
+
+    def __init__(self, project, import_list):
+        self.project = project
+        self.import_list = import_list
+        self.import_info = None
+
+    def dispatch(self, import_):
+        for import_info in self.import_list:
+            self.import_info = import_info
+            if ImportInfoVisitor.dispatch(self, import_):
+                return True
+
+    # TODO: Handle adding relative and absolute imports
+    def visitNormalImport(self, import_stmt, import_info):
+        if not isinstance(self.import_info, import_info.__class__):
+            return False
+        # Adding ``import x`` and ``import x.y`` that results ``import x.y``
+        if len(import_info.names_and_aliases) == \
+           len(self.import_info.names_and_aliases) == 1:
+            imported1 = import_info.names_and_aliases[0]
+            imported2 = self.import_info.names_and_aliases[0]
+            if imported1[1] == imported2[1] is None:
+                if imported1[0].startswith(imported2[0] + '.'):
+                    return True
+                if imported2[0].startswith(imported1[0] + '.'):
+                    import_stmt.import_info = self.import_info
+                    return True
+        # Multiple imports using a single import statement is discouraged
+        # so we won't bother adding them.
+        if self.import_info._are_name_and_alias_lists_equal(
+                import_info.names_and_aliases,
+                self.import_info.names_and_aliases):
+            return True
+
+    def visitFromImport(self, import_stmt, import_info):
+        if isinstance(self.import_info, import_info.__class__) and \
+           import_info.module_name == self.import_info.module_name and \
+           import_info.level == self.import_info.level:
+            if import_info.is_star_import():
+                return True
+            if self.import_info.is_star_import():
+                import_stmt.import_info = self.import_info
+                return True
+            if self.project.prefs.get("split_imports"):
+                return self.import_info.names_and_aliases == \
+                    import_info.names_and_aliases
+            new_pairs = list(import_info.names_and_aliases)
+            for pair in self.import_info.names_and_aliases:
+                if pair not in new_pairs:
+                    new_pairs.append(pair)
+            import_stmt.import_info = importinfo.FromImport(
+                import_info.module_name, import_info.level, new_pairs)
+            return True
+
+
+class ExpandStarsVisitor(ImportInfoVisitor):
+
+    def __init__(self, project, folder, can_select):
+        self.project = project
+        self.filtering = FilteringVisitor(project, folder, can_select)
+        self.context = importinfo.ImportContext(project, folder)
+
+    def visitNormalImport(self, import_stmt, import_info):
+        self.filtering.dispatch(import_stmt)
+
+    def visitFromImport(self, import_stmt, import_info):
+        if import_info.is_star_import():
+            new_pairs = []
+            for name in import_info.get_imported_names(self.context):
+                new_pairs.append((name, None))
+            new_import = importinfo.FromImport(
+                import_info.module_name, import_info.level, new_pairs)
+            import_stmt.import_info = \
+                self.filtering.visitFromImport(None, new_import)
+        else:
+            self.filtering.dispatch(import_stmt)
+
+
+class SelfImportVisitor(ImportInfoVisitor):
+
+    def __init__(self, project, current_folder, resource):
+        self.project = project
+        self.folder = current_folder
+        self.resource = resource
+        self.to_be_fixed = set()
+        self.to_be_renamed = set()
+        self.context = importinfo.ImportContext(project, current_folder)
+
+    def visitNormalImport(self, import_stmt, import_info):
+        new_pairs = []
+        for name, alias in import_info.names_and_aliases:
+            resource = self.project.find_module(name, folder=self.folder)
+            if resource is not None and resource == self.resource:
+                imported = name
+                if alias is not None:
+                    imported = alias
+                self.to_be_fixed.add(imported)
+            else:
+                new_pairs.append((name, alias))
+        if not import_info._are_name_and_alias_lists_equal(
+                new_pairs, import_info.names_and_aliases):
+            import_stmt.import_info = importinfo.NormalImport(new_pairs)
+
+    def visitFromImport(self, import_stmt, import_info):
+        resource = import_info.get_imported_resource(self.context)
+        if resource is None:
+            return
+        if resource == self.resource:
+            self._importing_names_from_self(import_info, import_stmt)
+            return
+        pymodule = self.project.get_pymodule(resource)
+        new_pairs = []
+        for name, alias in import_info.names_and_aliases:
+            try:
+                result = pymodule[name].get_object()
+                if isinstance(result, pyobjects.PyModule) and \
+                   result.get_resource() == self.resource:
+                    imported = name
+                    if alias is not None:
+                        imported = alias
+                    self.to_be_fixed.add(imported)
+                else:
+                    new_pairs.append((name, alias))
+            except exceptions.AttributeNotFoundError:
+                new_pairs.append((name, alias))
+        if not import_info._are_name_and_alias_lists_equal(
+                new_pairs, import_info.names_and_aliases):
+            import_stmt.import_info = importinfo.FromImport(
+                import_info.module_name, import_info.level, new_pairs)
+
+    def _importing_names_from_self(self, import_info, import_stmt):
+        if not import_info.is_star_import():
+            for name, alias in import_info.names_and_aliases:
+                if alias is not None:
+                    self.to_be_renamed.add((alias, name))
+        import_stmt.empty_import()
+
+
+class SortingVisitor(ImportInfoVisitor):
+
+    def __init__(self, project, current_folder):
+        self.project = project
+        self.folder = current_folder
+        self.standard = set()
+        self.third_party = set()
+        self.in_project = set()
+        self.future = set()
+        self.context = importinfo.ImportContext(project, current_folder)
+
+    def visitNormalImport(self, import_stmt, import_info):
+        if import_info.names_and_aliases:
+            name, alias = import_info.names_and_aliases[0]
+            resource = self.project.find_module(
+                name, folder=self.folder)
+            self._check_imported_resource(import_stmt, resource, name)
+
+    def visitFromImport(self, import_stmt, import_info):
+        resource = import_info.get_imported_resource(self.context)
+        self._check_imported_resource(import_stmt, resource,
+                                      import_info.module_name)
+
+    def _check_imported_resource(self, import_stmt, resource, imported_name):
+        info = import_stmt.import_info
+        if resource is not None and resource.project == self.project:
+            self.in_project.add(import_stmt)
+        elif _is_future(info):
+            self.future.add(import_stmt)
+        elif imported_name.split('.')[0] in stdmods.standard_modules():
+            self.standard.add(import_stmt)
+        else:
+            self.third_party.add(import_stmt)
+
+
+class LongImportVisitor(ImportInfoVisitor):
+
+    def __init__(self, current_folder, project, maxdots, maxlength):
+        self.maxdots = maxdots
+        self.maxlength = maxlength
+        self.to_be_renamed = set()
+        self.current_folder = current_folder
+        self.project = project
+        self.new_imports = []
+
+    def visitNormalImport(self, import_stmt, import_info):
+        for name, alias in import_info.names_and_aliases:
+            if alias is None and self._is_long(name):
+                self.to_be_renamed.add(name)
+                last_dot = name.rindex('.')
+                from_ = name[:last_dot]
+                imported = name[last_dot + 1:]
+                self.new_imports.append(
+                    importinfo.FromImport(from_, 0, ((imported, None), )))
+
+    def _is_long(self, name):
+        return name.count('.') > self.maxdots or \
+            ('.' in name and len(name) > self.maxlength)
+
+
+class RemovePyNameVisitor(ImportInfoVisitor):
+
+    def __init__(self, project, pymodule, pyname, folder):
+        self.pymodule = pymodule
+        self.pyname = pyname
+        self.context = importinfo.ImportContext(project, folder)
+
+    def visitFromImport(self, import_stmt, import_info):
+        new_pairs = []
+        if not import_info.is_star_import():
+            for name, alias in import_info.names_and_aliases:
+                try:
+                    pyname = self.pymodule[alias or name]
+                    if occurrences.same_pyname(self.pyname, pyname):
+                        continue
+                except exceptions.AttributeNotFoundError:
+                    pass
+                new_pairs.append((name, alias))
+        return importinfo.FromImport(
+            import_info.module_name, import_info.level, new_pairs)
+
+    def dispatch(self, import_):
+        result = ImportInfoVisitor.dispatch(self, import_)
+        if result is not None:
+            import_.import_info = result
+
+
+def _is_future(info):
+    return isinstance(info, importinfo.FromImport) and \
+        info.module_name == '__future__'
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/importinfo.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/importinfo.py
new file mode 100644
index 0000000..114080a
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/importinfo.py
@@ -0,0 +1,201 @@
+class ImportStatement(object):
+    """Represent an import in a module
+
+    `readonly` attribute controls whether this import can be changed
+    by import actions or not.
+
+    """
+
+    def __init__(self, import_info, start_line, end_line,
+                 main_statement=None, blank_lines=0):
+        self.start_line = start_line
+        self.end_line = end_line
+        self.readonly = False
+        self.main_statement = main_statement
+        self._import_info = None
+        self.import_info = import_info
+        self._is_changed = False
+        self.new_start = None
+        self.blank_lines = blank_lines
+
+    def _get_import_info(self):
+        return self._import_info
+
+    def _set_import_info(self, new_import):
+        if not self.readonly and \
+           new_import is not None and not new_import == self._import_info:
+            self._is_changed = True
+            self._import_info = new_import
+
+    import_info = property(_get_import_info, _set_import_info)
+
+    def get_import_statement(self):
+        if self._is_changed or self.main_statement is None:
+            return self.import_info.get_import_statement()
+        else:
+            return self.main_statement
+
+    def empty_import(self):
+        self.import_info = ImportInfo.get_empty_import()
+
+    def move(self, lineno, blank_lines=0):
+        self.new_start = lineno
+        self.blank_lines = blank_lines
+
+    def get_old_location(self):
+        return self.start_line, self.end_line
+
+    def get_new_start(self):
+        return self.new_start
+
+    def is_changed(self):
+        return self._is_changed or (self.new_start is not None or
+                                    self.new_start != self.start_line)
+
+    def accept(self, visitor):
+        return visitor.dispatch(self)
+
+
+class ImportInfo(object):
+
+    def get_imported_primaries(self, context):
+        pass
+
+    def get_imported_names(self, context):
+        return [primary.split('.')[0]
+                for primary in self.get_imported_primaries(context)]
+
+    def get_import_statement(self):
+        pass
+
+    def is_empty(self):
+        pass
+
+    def __hash__(self):
+        return hash(self.get_import_statement())
+
+    def _are_name_and_alias_lists_equal(self, list1, list2):
+        if len(list1) != len(list2):
+            return False
+        for pair1, pair2 in zip(list1, list2):
+            if pair1 != pair2:
+                return False
+        return True
+
+    def __eq__(self, obj):
+        return isinstance(obj, self.__class__) and \
+            self.get_import_statement() == obj.get_import_statement()
+
+    def __ne__(self, obj):
+        return not self.__eq__(obj)
+
+    @staticmethod
+    def get_empty_import():
+        return EmptyImport()
+
+
+class NormalImport(ImportInfo):
+
+    def __init__(self, names_and_aliases):
+        self.names_and_aliases = names_and_aliases
+
+    def get_imported_primaries(self, context):
+        result = []
+        for name, alias in self.names_and_aliases:
+            if alias:
+                result.append(alias)
+            else:
+                result.append(name)
+        return result
+
+    def get_import_statement(self):
+        result = 'import '
+        for name, alias in self.names_and_aliases:
+            result += name
+            if alias:
+                result += ' as ' + alias
+            result += ', '
+        return result[:-2]
+
+    def is_empty(self):
+        return len(self.names_and_aliases) == 0
+
+
+class FromImport(ImportInfo):
+
+    def __init__(self, module_name, level, names_and_aliases):
+        self.module_name = module_name
+        self.level = level
+        self.names_and_aliases = names_and_aliases
+
+    def get_imported_primaries(self, context):
+        if self.names_and_aliases[0][0] == '*':
+            module = self.get_imported_module(context)
+            return [name for name in module
+                    if not name.startswith('_')]
+        result = []
+        for name, alias in self.names_and_aliases:
+            if alias:
+                result.append(alias)
+            else:
+                result.append(name)
+        return result
+
+    def get_imported_resource(self, context):
+        """Get the imported resource
+
+        Returns `None` if module was not found.
+        """
+        if self.level == 0:
+            return context.project.find_module(
+                self.module_name, folder=context.folder)
+        else:
+            return context.project.find_relative_module(
+                self.module_name, context.folder, self.level)
+
+    def get_imported_module(self, context):
+        """Get the imported `PyModule`
+
+        Raises `rope.base.exceptions.ModuleNotFoundError` if module
+        could not be found.
+        """
+        if self.level == 0:
+            return context.project.get_module(
+                self.module_name, context.folder)
+        else:
+            return context.project.get_relative_module(
+                self.module_name, context.folder, self.level)
+
+    def get_import_statement(self):
+        result = 'from ' + '.' * self.level + self.module_name + ' import '
+        for name, alias in self.names_and_aliases:
+            result += name
+            if alias:
+                result += ' as ' + alias
+            result += ', '
+        return result[:-2]
+
+    def is_empty(self):
+        return len(self.names_and_aliases) == 0
+
+    def is_star_import(self):
+        return len(self.names_and_aliases) > 0 and \
+            self.names_and_aliases[0][0] == '*'
+
+
+class EmptyImport(ImportInfo):
+
+    names_and_aliases = []
+
+    def is_empty(self):
+        return True
+
+    def get_imported_primaries(self, context):
+        return []
+
+
+class ImportContext(object):
+
+    def __init__(self, project, folder):
+        self.project = project
+        self.folder = folder
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/module_imports.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/module_imports.py
new file mode 100644
index 0000000..26059a4
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/importutils/module_imports.py
@@ -0,0 +1,487 @@
+from rope.base import ast
+from rope.base import pynames
+from rope.base import utils
+from rope.refactor.importutils import actions
+from rope.refactor.importutils import importinfo
+
+
+class ModuleImports(object):
+
+    def __init__(self, project, pymodule, import_filter=None):
+        self.project = project
+        self.pymodule = pymodule
+        self.separating_lines = 0
+        self.filter = import_filter
+
+    @property
+    @utils.saveit
+    def imports(self):
+        finder = _GlobalImportFinder(self.pymodule)
+        result = finder.find_import_statements()
+        self.separating_lines = finder.get_separating_line_count()
+        if self.filter is not None:
+            for import_stmt in result:
+                if not self.filter(import_stmt):
+                    import_stmt.readonly = True
+        return result
+
+    def _get_unbound_names(self, defined_pyobject):
+        visitor = _GlobalUnboundNameFinder(self.pymodule, defined_pyobject)
+        ast.walk(self.pymodule.get_ast(), visitor)
+        return visitor.unbound
+
+    def remove_unused_imports(self):
+        can_select = _OneTimeSelector(self._get_unbound_names(self.pymodule))
+        visitor = actions.RemovingVisitor(
+            self.project, self._current_folder(), can_select)
+        for import_statement in self.imports:
+            import_statement.accept(visitor)
+
+    def get_used_imports(self, defined_pyobject):
+        result = []
+        can_select = _OneTimeSelector(
+            self._get_unbound_names(defined_pyobject))
+        visitor = actions.FilteringVisitor(
+            self.project, self._current_folder(), can_select)
+        for import_statement in self.imports:
+            new_import = import_statement.accept(visitor)
+            if new_import is not None and not new_import.is_empty():
+                result.append(new_import)
+        return result
+
+    def get_changed_source(self):
+        # Make sure we forward a removed import's preceding blank
+        # lines count to the following import statement.
+        prev_stmt = None
+        for stmt in self.imports:
+            if prev_stmt is not None and prev_stmt.import_info.is_empty():
+                stmt.blank_lines = max(prev_stmt.blank_lines, stmt.blank_lines)
+            prev_stmt = stmt
+        # The new list of imports.
+        imports = [stmt for stmt in self.imports
+                   if not stmt.import_info.is_empty()]
+
+        after_removing = self._remove_imports(self.imports)
+        first_non_blank = self._first_non_blank_line(after_removing, 0)
+        first_import = self._first_import_line() - 1
+        result = []
+        # Writing module docs
+        result.extend(after_removing[first_non_blank:first_import])
+        # Writing imports
+        sorted_imports = sorted(imports, key=self._get_location)
+        for stmt in sorted_imports:
+            if stmt != sorted_imports[0]:
+                result.append('\n' * stmt.blank_lines)
+            result.append(stmt.get_import_statement() + '\n')
+        if sorted_imports and first_non_blank < len(after_removing):
+            result.append('\n' * self.separating_lines)
+
+        # Writing the body
+        first_after_imports = self._first_non_blank_line(after_removing,
+                                                         first_import)
+        result.extend(after_removing[first_after_imports:])
+        return ''.join(result)
+
+    def _get_import_location(self, stmt):
+        start = stmt.get_new_start()
+        if start is None:
+            start = stmt.get_old_location()[0]
+        return start
+
+    def _get_location(self, stmt):
+        if stmt.get_new_start() is not None:
+            return stmt.get_new_start()
+        else:
+            return stmt.get_old_location()[0]
+
+    def _remove_imports(self, imports):
+        lines = self.pymodule.source_code.splitlines(True)
+        after_removing = []
+        first_import_line = self._first_import_line()
+        last_index = 0
+        for stmt in imports:
+            start, end = stmt.get_old_location()
+            blank_lines = 0
+            if start != first_import_line:
+                blank_lines = _count_blank_lines(lines.__getitem__, start - 2,
+                                                 last_index - 1, -1)
+            after_removing.extend(lines[last_index:start - 1 - blank_lines])
+            last_index = end - 1
+        after_removing.extend(lines[last_index:])
+        return after_removing
+
+    def _first_non_blank_line(self, lines, lineno):
+        return lineno + _count_blank_lines(lines.__getitem__, lineno,
+                                           len(lines))
+
+    def add_import(self, import_info):
+        visitor = actions.AddingVisitor(self.project, [import_info])
+        for import_statement in self.imports:
+            if import_statement.accept(visitor):
+                break
+        else:
+            lineno = self._get_new_import_lineno()
+            blanks = self._get_new_import_blanks()
+            self.imports.append(importinfo.ImportStatement(
+                                import_info, lineno, lineno,
+                                blank_lines=blanks))
+
+    def _get_new_import_blanks(self):
+        return 0
+
+    def _get_new_import_lineno(self):
+        if self.imports:
+            return self.imports[-1].end_line
+        return 1
+
+    def filter_names(self, can_select):
+        visitor = actions.RemovingVisitor(
+            self.project, self._current_folder(), can_select)
+        for import_statement in self.imports:
+            import_statement.accept(visitor)
+
+    def expand_stars(self):
+        can_select = _OneTimeSelector(self._get_unbound_names(self.pymodule))
+        visitor = actions.ExpandStarsVisitor(
+            self.project, self._current_folder(), can_select)
+        for import_statement in self.imports:
+            import_statement.accept(visitor)
+
+    def remove_duplicates(self):
+        added_imports = []
+        for import_stmt in self.imports:
+            visitor = actions.AddingVisitor(self.project,
+                                            [import_stmt.import_info])
+            for added_import in added_imports:
+                if added_import.accept(visitor):
+                    import_stmt.empty_import()
+            else:
+                added_imports.append(import_stmt)
+
+    def force_single_imports(self):
+        """force a single import per statement"""
+        for import_stmt in self.imports[:]:
+            import_info = import_stmt.import_info
+            if import_info.is_empty() or import_stmt.readonly:
+                continue
+            if len(import_info.names_and_aliases) > 1:
+                for name_and_alias in import_info.names_and_aliases:
+                    if hasattr(import_info, "module_name"):
+                        new_import = importinfo.FromImport(
+                            import_info.module_name, import_info.level,
+                            [name_and_alias])
+                    else:
+                        new_import = importinfo.NormalImport([name_and_alias])
+                    self.add_import(new_import)
+                import_stmt.empty_import()
+
+    def get_relative_to_absolute_list(self):
+        visitor = actions.RelativeToAbsoluteVisitor(
+            self.project, self._current_folder())
+        for import_stmt in self.imports:
+            if not import_stmt.readonly:
+                import_stmt.accept(visitor)
+        return visitor.to_be_absolute
+
+    def get_self_import_fix_and_rename_list(self):
+        visitor = actions.SelfImportVisitor(
+            self.project, self._current_folder(), self.pymodule.get_resource())
+        for import_stmt in self.imports:
+            if not import_stmt.readonly:
+                import_stmt.accept(visitor)
+        return visitor.to_be_fixed, visitor.to_be_renamed
+
+    def _current_folder(self):
+        return self.pymodule.get_resource().parent
+
+    def sort_imports(self):
+        if self.project.prefs.get("sort_imports_alphabetically"):
+            sort_kwargs = dict(key=self._get_import_name)
+        else:
+            sort_kwargs = dict(key=self._key_imports)
+
+        # IDEA: Sort from import list
+        visitor = actions.SortingVisitor(self.project, self._current_folder())
+        for import_statement in self.imports:
+            import_statement.accept(visitor)
+        in_projects = sorted(visitor.in_project, **sort_kwargs)
+        third_party = sorted(visitor.third_party, **sort_kwargs)
+        standards = sorted(visitor.standard, **sort_kwargs)
+        future = sorted(visitor.future, **sort_kwargs)
+        last_index = self._first_import_line()
+        last_index = self._move_imports(future, last_index, 0)
+        last_index = self._move_imports(standards, last_index, 1)
+        last_index = self._move_imports(third_party, last_index, 1)
+        last_index = self._move_imports(in_projects, last_index, 1)
+        self.separating_lines = 2
+
+    def _first_import_line(self):
+        nodes = self.pymodule.get_ast().body
+        lineno = 0
+        if self.pymodule.get_doc() is not None:
+            lineno = 1
+        if len(nodes) > lineno:
+            if (isinstance(nodes[lineno], ast.Import) or
+                isinstance(nodes[lineno], ast.ImportFrom)):
+                return nodes[lineno].lineno
+            lineno = self.pymodule.logical_lines.logical_line_in(
+                nodes[lineno].lineno)[0]
+        else:
+            lineno = self.pymodule.lines.length()
+
+        return lineno - _count_blank_lines(self.pymodule.lines.get_line,
+                                           lineno - 1, 1, -1)
+
+    def _get_import_name(self, import_stmt):
+        import_info = import_stmt.import_info
+        if hasattr(import_info, "module_name"):
+            return "%s.%s" % (import_info.module_name,
+                              import_info.names_and_aliases[0][0])
+        else:
+            return import_info.names_and_aliases[0][0]
+
+    def _key_imports(self, stm1):
+        str1 = stm1.get_import_statement()
+        return str1.startswith("from "), str1
+
+        #str1 = stmt1.get_import_statement()
+        #str2 = stmt2.get_import_statement()
+        #if str1.startswith('from ') and not str2.startswith('from '):
+        #    return 1
+        #if not str1.startswith('from ') and str2.startswith('from '):
+        #    return -1
+        #return cmp(str1, str2)
+
+    def _move_imports(self, imports, index, blank_lines):
+        if imports:
+            imports[0].move(index, blank_lines)
+            index += 1
+            if len(imports) > 1:
+                for stmt in imports[1:]:
+                    stmt.move(index)
+                    index += 1
+        return index
+
+    def handle_long_imports(self, maxdots, maxlength):
+        visitor = actions.LongImportVisitor(
+            self._current_folder(), self.project, maxdots, maxlength)
+        for import_statement in self.imports:
+            if not import_statement.readonly:
+                import_statement.accept(visitor)
+        for import_info in visitor.new_imports:
+            self.add_import(import_info)
+        return visitor.to_be_renamed
+
+    def remove_pyname(self, pyname):
+        """Removes pyname when imported in ``from mod import x``"""
+        visitor = actions.RemovePyNameVisitor(self.project, self.pymodule,
+                                              pyname, self._current_folder())
+        for import_stmt in self.imports:
+            import_stmt.accept(visitor)
+
+
+def _count_blank_lines(get_line, start, end, step=1):
+    count = 0
+    for idx in range(start, end, step):
+        if get_line(idx).strip() == '':
+            count += 1
+        else:
+            break
+    return count
+
+
+class _OneTimeSelector(object):
+
+    def __init__(self, names):
+        self.names = names
+        self.selected_names = set()
+
+    def __call__(self, imported_primary):
+        if self._can_name_be_added(imported_primary):
+            for name in self._get_dotted_tokens(imported_primary):
+                self.selected_names.add(name)
+            return True
+        return False
+
+    def _get_dotted_tokens(self, imported_primary):
+        tokens = imported_primary.split('.')
+        for i in range(len(tokens)):
+            yield '.'.join(tokens[:i + 1])
+
+    def _can_name_be_added(self, imported_primary):
+        for name in self._get_dotted_tokens(imported_primary):
+            if name in self.names and name not in self.selected_names:
+                return True
+        return False
+
+
+class _UnboundNameFinder(object):
+
+    def __init__(self, pyobject):
+        self.pyobject = pyobject
+
+    def _visit_child_scope(self, node):
+        pyobject = self.pyobject.get_module().get_scope().\
+            get_inner_scope_for_line(node.lineno).pyobject
+        visitor = _LocalUnboundNameFinder(pyobject, self)
+        for child in ast.get_child_nodes(node):
+            ast.walk(child, visitor)
+
+    def _FunctionDef(self, node):
+        self._visit_child_scope(node)
+
+    def _ClassDef(self, node):
+        self._visit_child_scope(node)
+
+    def _Name(self, node):
+        if self._get_root()._is_node_interesting(node) and \
+           not self.is_bound(node.id):
+            self.add_unbound(node.id)
+
+    def _Attribute(self, node):
+        result = []
+        while isinstance(node, ast.Attribute):
+            result.append(node.attr)
+            node = node.value
+        if isinstance(node, ast.Name):
+            result.append(node.id)
+            primary = '.'.join(reversed(result))
+            if self._get_root()._is_node_interesting(node) and \
+               not self.is_bound(primary):
+                self.add_unbound(primary)
+        else:
+            ast.walk(node, self)
+
+    def _get_root(self):
+        pass
+
+    def is_bound(self, name, propagated=False):
+        pass
+
+    def add_unbound(self, name):
+        pass
+
+
+class _GlobalUnboundNameFinder(_UnboundNameFinder):
+
+    def __init__(self, pymodule, wanted_pyobject):
+        super(_GlobalUnboundNameFinder, self).__init__(pymodule)
+        self.unbound = set()
+        self.names = set()
+        for name, pyname in pymodule._get_structural_attributes().items():
+            if not isinstance(pyname, (pynames.ImportedName,
+                                       pynames.ImportedModule)):
+                self.names.add(name)
+        wanted_scope = wanted_pyobject.get_scope()
+        self.start = wanted_scope.get_start()
+        self.end = wanted_scope.get_end() + 1
+
+    def _get_root(self):
+        return self
+
+    def is_bound(self, primary, propagated=False):
+        name = primary.split('.')[0]
+        if name in self.names:
+            return True
+        return False
+
+    def add_unbound(self, name):
+        names = name.split('.')
+        for i in range(len(names)):
+            self.unbound.add('.'.join(names[:i + 1]))
+
+    def _is_node_interesting(self, node):
+        return self.start <= node.lineno < self.end
+
+
+class _LocalUnboundNameFinder(_UnboundNameFinder):
+
+    def __init__(self, pyobject, parent):
+        super(_LocalUnboundNameFinder, self).__init__(pyobject)
+        self.parent = parent
+
+    def _get_root(self):
+        return self.parent._get_root()
+
+    def is_bound(self, primary, propagated=False):
+        name = primary.split('.')[0]
+        if propagated:
+            names = self.pyobject.get_scope().get_propagated_names()
+        else:
+            names = self.pyobject.get_scope().get_names()
+        if name in names or self.parent.is_bound(name, propagated=True):
+            return True
+        return False
+
+    def add_unbound(self, name):
+        self.parent.add_unbound(name)
+
+
+class _GlobalImportFinder(object):
+
+    def __init__(self, pymodule):
+        self.current_folder = None
+        if pymodule.get_resource():
+            self.current_folder = pymodule.get_resource().parent
+            self.pymodule = pymodule
+        self.imports = []
+        self.pymodule = pymodule
+        self.lines = self.pymodule.lines
+
+    def visit_import(self, node, end_line):
+        start_line = node.lineno
+        import_statement = importinfo.ImportStatement(
+            importinfo.NormalImport(self._get_names(node.names)),
+            start_line, end_line, self._get_text(start_line, end_line),
+            blank_lines=self._count_empty_lines_before(start_line))
+        self.imports.append(import_statement)
+
+    def _count_empty_lines_before(self, lineno):
+        return _count_blank_lines(self.lines.get_line, lineno - 1, 0, -1)
+
+    def _count_empty_lines_after(self, lineno):
+        return _count_blank_lines(self.lines.get_line, lineno + 1,
+                                  self.lines.length())
+
+    def get_separating_line_count(self):
+        if not self.imports:
+            return 0
+        return self._count_empty_lines_after(self.imports[-1].end_line - 1)
+
+    def _get_text(self, start_line, end_line):
+        result = []
+        for index in range(start_line, end_line):
+            result.append(self.lines.get_line(index))
+        return '\n'.join(result)
+
+    def visit_from(self, node, end_line):
+        level = 0
+        if node.level:
+            level = node.level
+        import_info = importinfo.FromImport(
+            node.module or '',  # see comment at rope.base.ast.walk
+            level, self._get_names(node.names))
+        start_line = node.lineno
+        self.imports.append(importinfo.ImportStatement(
+                            import_info, node.lineno, end_line,
+                            self._get_text(start_line, end_line),
+                            blank_lines=
+                            self._count_empty_lines_before(start_line)))
+
+    def _get_names(self, alias_names):
+        result = []
+        for alias in alias_names:
+            result.append((alias.name, alias.asname))
+        return result
+
+    def find_import_statements(self):
+        nodes = self.pymodule.get_ast().body
+        for index, node in enumerate(nodes):
+            if isinstance(node, (ast.Import, ast.ImportFrom)):
+                lines = self.pymodule.logical_lines
+                end_line = lines.logical_line_in(node.lineno)[1] + 1
+            if isinstance(node, ast.Import):
+                self.visit_import(node, end_line)
+            if isinstance(node, ast.ImportFrom):
+                self.visit_from(node, end_line)
+        return self.imports
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/inline.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/inline.py
new file mode 100644
index 0000000..467edef
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/inline.py
@@ -0,0 +1,625 @@
+# Known Bugs when inlining a function/method
+# The values passed to function are inlined using _inlined_variable.
+# This may cause two problems, illustrated in the examples below
+#
+# def foo(var1):
+#    var1 = var1*10
+#    return var1
+#
+#  If a call to foo(20) is inlined, the result of inlined function is 20,
+#  but it should be 200.
+#
+# def foo(var1):
+#    var2 = var1*10
+#    return var2
+#
+# 2- If a call to foo(10+10) is inlined the result of inlined function is 110
+#  but it should be 200.
+
+import re
+
+import rope.base.exceptions
+import rope.refactor.functionutils
+from rope.base import (pynames, pyobjects, codeanalyze,
+                       taskhandle, evaluate, worder, utils, libutils)
+from rope.base.change import ChangeSet, ChangeContents
+from rope.refactor import (occurrences, rename, sourceutils,
+                           importutils, move, change_signature)
+
+
+def unique_prefix():
+    n = 0
+    while True:
+        yield "__" + str(n) + "__"
+        n += 1
+
+
+def create_inline(project, resource, offset):
+    """Create a refactoring object for inlining
+
+    Based on `resource` and `offset` it returns an instance of
+    `InlineMethod`, `InlineVariable` or `InlineParameter`.
+
+    """
+    pyname = _get_pyname(project, resource, offset)
+    message = 'Inline refactoring should be performed on ' \
+              'a method, local variable or parameter.'
+    if pyname is None:
+        raise rope.base.exceptions.RefactoringError(message)
+    if isinstance(pyname, pynames.ImportedName):
+        pyname = pyname._get_imported_pyname()
+    if isinstance(pyname, pynames.AssignedName):
+        return InlineVariable(project, resource, offset)
+    if isinstance(pyname, pynames.ParameterName):
+        return InlineParameter(project, resource, offset)
+    if isinstance(pyname.get_object(), pyobjects.PyFunction):
+        return InlineMethod(project, resource, offset)
+    else:
+        raise rope.base.exceptions.RefactoringError(message)
+
+
+class _Inliner(object):
+
+    def __init__(self, project, resource, offset):
+        self.project = project
+        self.pyname = _get_pyname(project, resource, offset)
+        range_finder = worder.Worder(resource.read(), True)
+        self.region = range_finder.get_primary_range(offset)
+        self.name = range_finder.get_word_at(offset)
+        self.offset = offset
+        self.original = resource
+
+    def get_changes(self, *args, **kwds):
+        pass
+
+    def get_kind(self):
+        """Return either 'variable', 'method' or 'parameter'"""
+
+
+class InlineMethod(_Inliner):
+
+    def __init__(self, *args, **kwds):
+        super(InlineMethod, self).__init__(*args, **kwds)
+        self.pyfunction = self.pyname.get_object()
+        self.pymodule = self.pyfunction.get_module()
+        self.resource = self.pyfunction.get_module().get_resource()
+        self.occurrence_finder = occurrences.create_finder(
+            self.project, self.name, self.pyname)
+        self.normal_generator = _DefinitionGenerator(self.project,
+                                                     self.pyfunction)
+        self._init_imports()
+
+    def _init_imports(self):
+        body = sourceutils.get_body(self.pyfunction)
+        body, imports = move.moving_code_with_imports(
+            self.project, self.resource, body)
+        self.imports = imports
+        self.others_generator = _DefinitionGenerator(
+            self.project, self.pyfunction, body=body)
+
+    def _get_scope_range(self):
+        scope = self.pyfunction.get_scope()
+        lines = self.pymodule.lines
+        start_line = scope.get_start()
+        if self.pyfunction.decorators:
+            decorators = self.pyfunction.decorators
+            if hasattr(decorators[0], 'lineno'):
+                start_line = decorators[0].lineno
+        start_offset = lines.get_line_start(start_line)
+        end_offset = min(lines.get_line_end(scope.end) + 1,
+                         len(self.pymodule.source_code))
+        return (start_offset, end_offset)
+
+    def get_changes(self, remove=True, only_current=False, resources=None,
+                    task_handle=taskhandle.NullTaskHandle()):
+        """Get the changes this refactoring makes
+
+        If `remove` is `False` the definition will not be removed.  If
+        `only_current` is `True`, the the current occurrence will be
+        inlined, only.
+        """
+        changes = ChangeSet('Inline method <%s>' % self.name)
+        if resources is None:
+            resources = self.project.get_python_files()
+        if only_current:
+            resources = [self.original]
+            if remove:
+                resources.append(self.resource)
+        job_set = task_handle.create_jobset('Collecting Changes',
+                                            len(resources))
+        for file in resources:
+            job_set.started_job(file.path)
+            if file == self.resource:
+                changes.add_change(self._defining_file_changes(
+                    changes, remove=remove, only_current=only_current))
+            else:
+                aim = None
+                if only_current and self.original == file:
+                    aim = self.offset
+                handle = _InlineFunctionCallsForModuleHandle(
+                    self.project, file, self.others_generator, aim)
+                result = move.ModuleSkipRenamer(
+                    self.occurrence_finder, file, handle).get_changed_module()
+                if result is not None:
+                    result = _add_imports(self.project, result,
+                                          file, self.imports)
+                    if remove:
+                        result = _remove_from(self.project, self.pyname,
+                                              result, file)
+                    changes.add_change(ChangeContents(file, result))
+            job_set.finished_job()
+        return changes
+
+    def _get_removed_range(self):
+        scope = self.pyfunction.get_scope()
+        lines = self.pymodule.lines
+        start, end = self._get_scope_range()
+        end_line = scope.get_end()
+        for i in range(end_line + 1, lines.length()):
+            if lines.get_line(i).strip() == '':
+                end_line = i
+            else:
+                break
+        end = min(lines.get_line_end(end_line) + 1,
+                  len(self.pymodule.source_code))
+        return (start, end)
+
+    def _defining_file_changes(self, changes, remove, only_current):
+        start_offset, end_offset = self._get_removed_range()
+        aim = None
+        if only_current:
+            if self.resource == self.original:
+                aim = self.offset
+            else:
+                # we don't want to change any of them
+                aim = len(self.resource.read()) + 100
+        handle = _InlineFunctionCallsForModuleHandle(
+            self.project, self.resource,
+            self.normal_generator, aim_offset=aim)
+        replacement = None
+        if remove:
+            replacement = self._get_method_replacement()
+        result = move.ModuleSkipRenamer(
+            self.occurrence_finder, self.resource, handle, start_offset,
+            end_offset, replacement).get_changed_module()
+        return ChangeContents(self.resource, result)
+
+    def _get_method_replacement(self):
+        if self._is_the_last_method_of_a_class():
+            indents = sourceutils.get_indents(
+                self.pymodule.lines, self.pyfunction.get_scope().get_start())
+            return ' ' * indents + 'pass\n'
+        return ''
+
+    def _is_the_last_method_of_a_class(self):
+        pyclass = self.pyfunction.parent
+        if not isinstance(pyclass, pyobjects.PyClass):
+            return False
+        class_start, class_end = sourceutils.get_body_region(pyclass)
+        source = self.pymodule.source_code
+        func_start, func_end = self._get_scope_range()
+        if source[class_start:func_start].strip() == '' and \
+           source[func_end:class_end].strip() == '':
+            return True
+        return False
+
+    def get_kind(self):
+        return 'method'
+
+
+class InlineVariable(_Inliner):
+
+    def __init__(self, *args, **kwds):
+        super(InlineVariable, self).__init__(*args, **kwds)
+        self.pymodule = self.pyname.get_definition_location()[0]
+        self.resource = self.pymodule.get_resource()
+        self._check_exceptional_conditions()
+        self._init_imports()
+
+    def _check_exceptional_conditions(self):
+        if len(self.pyname.assignments) != 1:
+            raise rope.base.exceptions.RefactoringError(
+                'Local variable should be assigned once for inlining.')
+
+    def get_changes(self, remove=True, only_current=False, resources=None,
+                    docs=False, task_handle=taskhandle.NullTaskHandle()):
+        if resources is None:
+            if rename._is_local(self.pyname):
+                resources = [self.resource]
+            else:
+                resources = self.project.get_python_files()
+        if only_current:
+            resources = [self.original]
+            if remove and self.original != self.resource:
+                resources.append(self.resource)
+        changes = ChangeSet('Inline variable <%s>' % self.name)
+        jobset = task_handle.create_jobset('Calculating changes',
+                                           len(resources))
+
+        for resource in resources:
+            jobset.started_job(resource.path)
+            if resource == self.resource:
+                source = self._change_main_module(remove, only_current, docs)
+                changes.add_change(ChangeContents(self.resource, source))
+            else:
+                result = self._change_module(resource, remove, only_current)
+                if result is not None:
+                    result = _add_imports(self.project, result,
+                                          resource, self.imports)
+                    changes.add_change(ChangeContents(resource, result))
+            jobset.finished_job()
+        return changes
+
+    def _change_main_module(self, remove, only_current, docs):
+        region = None
+        if only_current and self.original == self.resource:
+            region = self.region
+        return _inline_variable(self.project, self.pymodule, self.pyname,
+                                self.name, remove=remove, region=region,
+                                docs=docs)
+
+    def _init_imports(self):
+        vardef = _getvardef(self.pymodule, self.pyname)
+        self.imported, self.imports = move.moving_code_with_imports(
+            self.project, self.resource, vardef)
+
+    def _change_module(self, resource, remove, only_current):
+        filters = [occurrences.NoImportsFilter(),
+                   occurrences.PyNameFilter(self.pyname)]
+        if only_current and resource == self.original:
+            def check_aim(occurrence):
+                start, end = occurrence.get_primary_range()
+                if self.offset < start or end < self.offset:
+                    return False
+            filters.insert(0, check_aim)
+        finder = occurrences.Finder(self.project, self.name, filters=filters)
+        changed = rename.rename_in_module(
+            finder, self.imported, resource=resource, replace_primary=True)
+        if changed and remove:
+            changed = _remove_from(self.project, self.pyname,
+                                   changed, resource)
+        return changed
+
+    def get_kind(self):
+        return 'variable'
+
+
+class InlineParameter(_Inliner):
+
+    def __init__(self, *args, **kwds):
+        super(InlineParameter, self).__init__(*args, **kwds)
+        resource, offset = self._function_location()
+        index = self.pyname.index
+        self.changers = [change_signature.ArgumentDefaultInliner(index)]
+        self.signature = change_signature.ChangeSignature(self.project,
+                                                          resource, offset)
+
+    def _function_location(self):
+        pymodule, lineno = self.pyname.get_definition_location()
+        resource = pymodule.get_resource()
+        start = pymodule.lines.get_line_start(lineno)
+        word_finder = worder.Worder(pymodule.source_code)
+        offset = word_finder.find_function_offset(start)
+        return resource, offset
+
+    def get_changes(self, **kwds):
+        """Get the changes needed by this refactoring
+
+        See `rope.refactor.change_signature.ChangeSignature.get_changes()`
+        for arguments.
+        """
+        return self.signature.get_changes(self.changers, **kwds)
+
+    def get_kind(self):
+        return 'parameter'
+
+
+def _join_lines(lines):
+    definition_lines = []
+    for unchanged_line in lines:
+        line = unchanged_line.strip()
+        if line.endswith('\\'):
+            line = line[:-1].strip()
+        definition_lines.append(line)
+    joined = ' '.join(definition_lines)
+    return joined
+
+
+class _DefinitionGenerator(object):
+    unique_prefix = unique_prefix()
+
+    def __init__(self, project, pyfunction, body=None):
+        self.project = project
+        self.pyfunction = pyfunction
+        self.pymodule = pyfunction.get_module()
+        self.resource = self.pymodule.get_resource()
+        self.definition_info = self._get_definition_info()
+        self.definition_params = self._get_definition_params()
+        self._calculated_definitions = {}
+        if body is not None:
+            self.body = body
+        else:
+            self.body = sourceutils.get_body(self.pyfunction)
+
+    def _get_definition_info(self):
+        return rope.refactor.functionutils.DefinitionInfo.read(self.pyfunction)
+
+    def _get_definition_params(self):
+        definition_info = self.definition_info
+        paramdict = dict([pair for pair in definition_info.args_with_defaults])
+        if definition_info.args_arg is not None or \
+           definition_info.keywords_arg is not None:
+            raise rope.base.exceptions.RefactoringError(
+                'Cannot inline functions with list and keyword arguements.')
+        if self.pyfunction.get_kind() == 'classmethod':
+            paramdict[definition_info.args_with_defaults[0][0]] = \
+                self.pyfunction.parent.get_name()
+        return paramdict
+
+    def get_function_name(self):
+        return self.pyfunction.get_name()
+
+    def get_definition(self, primary, pyname, call, host_vars=[],
+                       returns=False):
+        # caching already calculated definitions
+        return self._calculate_definition(primary, pyname, call,
+                                          host_vars, returns)
+
+    def _calculate_header(self, primary, pyname, call):
+        # A header is created which initializes parameters
+        # to the values passed to the function.
+        call_info = rope.refactor.functionutils.CallInfo.read(
+            primary, pyname, self.definition_info, call)
+        paramdict = self.definition_params
+        mapping = rope.refactor.functionutils.ArgumentMapping(
+            self.definition_info, call_info)
+        for param_name, value in mapping.param_dict.items():
+            paramdict[param_name] = value
+        header = ''
+        to_be_inlined = []
+        for name, value in paramdict.items():
+            if name != value and value is not None:
+                header += name + ' = ' + value.replace('\n', ' ') + '\n'
+                to_be_inlined.append(name)
+        return header, to_be_inlined
+
+    def _calculate_definition(self, primary, pyname, call, host_vars, returns):
+
+        header, to_be_inlined = self._calculate_header(primary, pyname, call)
+
+        source = header + self.body
+        mod = libutils.get_string_module(self.project, source)
+        name_dict = mod.get_scope().get_names()
+        all_names = [x for x in name_dict if
+                     not isinstance(name_dict[x],
+                                    rope.base.builtins.BuiltinName)]
+
+        # If there is a name conflict, all variable names
+        # inside the inlined function are renamed
+        if len(set(all_names).intersection(set(host_vars))) > 0:
+
+            prefix = next(_DefinitionGenerator.unique_prefix)
+            guest = libutils.get_string_module(self.project, source,
+                                               self.resource)
+
+            to_be_inlined = [prefix + item for item in to_be_inlined]
+            for item in all_names:
+                pyname = guest[item]
+                occurrence_finder = occurrences.create_finder(self.project,
+                                                              item, pyname)
+                source = rename.rename_in_module(occurrence_finder,
+                                                 prefix + item, pymodule=guest)
+                guest = libutils.get_string_module(
+                    self.project, source, self.resource)
+
+        #parameters not reassigned inside the functions are now inlined.
+        for name in to_be_inlined:
+            pymodule = libutils.get_string_module(
+                self.project, source, self.resource)
+            pyname = pymodule[name]
+            source = _inline_variable(self.project, pymodule, pyname, name)
+
+        return self._replace_returns_with(source, returns)
+
+    def _replace_returns_with(self, source, returns):
+        result = []
+        returned = None
+        last_changed = 0
+        for match in _DefinitionGenerator._get_return_pattern().finditer(
+                source):
+            for key, value in match.groupdict().items():
+                if value and key == 'return':
+                    result.append(source[last_changed:match.start('return')])
+                    if returns:
+                        self._check_nothing_after_return(source,
+                                                         match.end('return'))
+                        beg_idx = match.end('return')
+                        returned = _join_lines(
+                            source[beg_idx:len(source)].splitlines())
+                        last_changed = len(source)
+                    else:
+                        current = match.end('return')
+                        while current < len(source) and \
+                                source[current] in ' \t':
+                            current += 1
+                        last_changed = current
+                        if current == len(source) or source[current] == '\n':
+                            result.append('pass')
+        result.append(source[last_changed:])
+        return ''.join(result), returned
+
+    def _check_nothing_after_return(self, source, offset):
+        lines = codeanalyze.SourceLinesAdapter(source)
+        lineno = lines.get_line_number(offset)
+        logical_lines = codeanalyze.LogicalLineFinder(lines)
+        lineno = logical_lines.logical_line_in(lineno)[1]
+        if source[lines.get_line_end(lineno):len(source)].strip() != '':
+            raise rope.base.exceptions.RefactoringError(
+                'Cannot inline functions with statements ' +
+                'after return statement.')
+
+    @classmethod
+    def _get_return_pattern(cls):
+        if not hasattr(cls, '_return_pattern'):
+            def named_pattern(name, list_):
+                return "(?P<%s>" % name + "|".join(list_) + ")"
+            comment_pattern = named_pattern('comment', [r'#[^\n]*'])
+            string_pattern = named_pattern('string',
+                                           [codeanalyze.get_string_pattern()])
+            return_pattern = r'\b(?P<return>return)\b'
+            cls._return_pattern = re.compile(comment_pattern + "|" +
+                                             string_pattern + "|" +
+                                             return_pattern)
+        return cls._return_pattern
+
+
+class _InlineFunctionCallsForModuleHandle(object):
+
+    def __init__(self, project, resource,
+                 definition_generator, aim_offset=None):
+        """Inlines occurrences
+
+        If `aim` is not `None` only the occurrences that intersect
+        `aim` offset will be inlined.
+
+        """
+        self.project = project
+        self.generator = definition_generator
+        self.resource = resource
+        self.aim = aim_offset
+
+    def occurred_inside_skip(self, change_collector, occurrence):
+        if not occurrence.is_defined():
+            raise rope.base.exceptions.RefactoringError(
+                'Cannot inline functions that reference themselves')
+
+    def occurred_outside_skip(self, change_collector, occurrence):
+        start, end = occurrence.get_primary_range()
+        # we remove out of date imports later
+        if occurrence.is_in_import_statement():
+            return
+        # the function is referenced outside an import statement
+        if not occurrence.is_called():
+            raise rope.base.exceptions.RefactoringError(
+                'Reference to inlining function other than function call'
+                ' in <file: %s, offset: %d>' % (self.resource.path, start))
+        if self.aim is not None and (self.aim < start or self.aim > end):
+            return
+        end_parens = self._find_end_parens(self.source, end - 1)
+        lineno = self.lines.get_line_number(start)
+        start_line, end_line = self.pymodule.logical_lines.\
+            logical_line_in(lineno)
+        line_start = self.lines.get_line_start(start_line)
+        line_end = self.lines.get_line_end(end_line)
+
+        returns = self.source[line_start:start].strip() != '' or \
+            self.source[end_parens:line_end].strip() != ''
+        indents = sourceutils.get_indents(self.lines, start_line)
+        primary, pyname = occurrence.get_primary_and_pyname()
+
+        host = self.pymodule
+        scope = host.scope.get_inner_scope_for_line(lineno)
+        definition, returned = self.generator.get_definition(
+            primary, pyname, self.source[start:end_parens], scope.get_names(),
+            returns=returns)
+
+        end = min(line_end + 1, len(self.source))
+        change_collector.add_change(
+            line_start, end, sourceutils.fix_indentation(definition, indents))
+        if returns:
+            name = returned
+            if name is None:
+                name = 'None'
+            change_collector.add_change(
+                line_end, end, self.source[line_start:start] + name +
+                self.source[end_parens:end])
+
+    def _find_end_parens(self, source, offset):
+        finder = worder.Worder(source)
+        return finder.get_word_parens_range(offset)[1]
+
+    @property
+    @utils.saveit
+    def pymodule(self):
+        return self.project.get_pymodule(self.resource)
+
+    @property
+    @utils.saveit
+    def source(self):
+        if self.resource is not None:
+            return self.resource.read()
+        else:
+            return self.pymodule.source_code
+
+    @property
+    @utils.saveit
+    def lines(self):
+        return self.pymodule.lines
+
+
+def _inline_variable(project, pymodule, pyname, name,
+                     remove=True, region=None, docs=False):
+    definition = _getvardef(pymodule, pyname)
+    start, end = _assigned_lineno(pymodule, pyname)
+
+    occurrence_finder = occurrences.create_finder(project, name, pyname,
+                                                  docs=docs)
+    changed_source = rename.rename_in_module(
+        occurrence_finder, definition, pymodule=pymodule,
+        replace_primary=True, writes=False, region=region)
+    if changed_source is None:
+        changed_source = pymodule.source_code
+    if remove:
+        lines = codeanalyze.SourceLinesAdapter(changed_source)
+        source = changed_source[:lines.get_line_start(start)] + \
+            changed_source[lines.get_line_end(end) + 1:]
+    else:
+        source = changed_source
+    return source
+
+
+def _getvardef(pymodule, pyname):
+    assignment = pyname.assignments[0]
+    lines = pymodule.lines
+    start, end = _assigned_lineno(pymodule, pyname)
+    definition_with_assignment = _join_lines(
+        [lines.get_line(n) for n in range(start, end + 1)])
+    if assignment.levels:
+        raise rope.base.exceptions.RefactoringError(
+            'Cannot inline tuple assignments.')
+    definition = definition_with_assignment[definition_with_assignment.
+                                            index('=') + 1:].strip()
+    return definition
+
+
+def _assigned_lineno(pymodule, pyname):
+    definition_line = pyname.assignments[0].ast_node.lineno
+    return pymodule.logical_lines.logical_line_in(definition_line)
+
+
+def _add_imports(project, source, resource, imports):
+    if not imports:
+        return source
+    pymodule = libutils.get_string_module(project, source, resource)
+    module_import = importutils.get_module_imports(project, pymodule)
+    for import_info in imports:
+        module_import.add_import(import_info)
+    source = module_import.get_changed_source()
+    pymodule = libutils.get_string_module(project, source, resource)
+    import_tools = importutils.ImportTools(project)
+    return import_tools.organize_imports(pymodule, unused=False, sort=False)
+
+
+def _get_pyname(project, resource, offset):
+    pymodule = project.get_pymodule(resource)
+    pyname = evaluate.eval_location(pymodule, offset)
+    if isinstance(pyname, pynames.ImportedName):
+        pyname = pyname._get_imported_pyname()
+    return pyname
+
+
+def _remove_from(project, pyname, source, resource):
+    pymodule = libutils.get_string_module(project, source, resource)
+    module_import = importutils.get_module_imports(project, pymodule)
+    module_import.remove_pyname(pyname)
+    return module_import.get_changed_source()
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/introduce_factory.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/introduce_factory.py
new file mode 100644
index 0000000..7532e36
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/introduce_factory.py
@@ -0,0 +1,135 @@
+import rope.base.exceptions
+import rope.base.pyobjects
+from rope.base import libutils
+from rope.base import taskhandle, evaluate
+from rope.base.change import (ChangeSet, ChangeContents)
+from rope.refactor import rename, occurrences, sourceutils, importutils
+
+
+class IntroduceFactory(object):
+
+    def __init__(self, project, resource, offset):
+        self.project = project
+        self.offset = offset
+
+        this_pymodule = self.project.get_pymodule(resource)
+        self.old_pyname = evaluate.eval_location(this_pymodule, offset)
+        if self.old_pyname is None or \
+                not isinstance(self.old_pyname.get_object(),
+                               rope.base.pyobjects.PyClass):
+            raise rope.base.exceptions.RefactoringError(
+                'Introduce factory should be performed on a class.')
+        self.old_name = self.old_pyname.get_object().get_name()
+        self.pymodule = self.old_pyname.get_object().get_module()
+        self.resource = self.pymodule.get_resource()
+
+    def get_changes(self, factory_name, global_factory=False, resources=None,
+                    task_handle=taskhandle.NullTaskHandle()):
+        """Get the changes this refactoring makes
+
+        `factory_name` indicates the name of the factory function to
+        be added.  If `global_factory` is `True` the factory will be
+        global otherwise a static method is added to the class.
+
+        `resources` can be a list of `rope.base.resource.File`\s that
+        this refactoring should be applied on; if `None` all python
+        files in the project are searched.
+
+        """
+        if resources is None:
+            resources = self.project.get_python_files()
+        changes = ChangeSet('Introduce factory method <%s>' % factory_name)
+        job_set = task_handle.create_jobset('Collecting Changes',
+                                            len(resources))
+        self._change_module(resources, changes, factory_name,
+                            global_factory, job_set)
+        return changes
+
+    def get_name(self):
+        """Return the name of the class"""
+        return self.old_name
+
+    def _change_module(self, resources, changes,
+                       factory_name, global_, job_set):
+        if global_:
+            replacement = '__rope_factory_%s_' % factory_name
+        else:
+            replacement = self._new_function_name(factory_name, global_)
+
+        for file_ in resources:
+            job_set.started_job(file_.path)
+            if file_ == self.resource:
+                self._change_resource(changes, factory_name, global_)
+                job_set.finished_job()
+                continue
+            changed_code = self._rename_occurrences(file_, replacement,
+                                                    global_)
+            if changed_code is not None:
+                if global_:
+                    new_pymodule = libutils.get_string_module(
+                        self.project, changed_code, self.resource)
+                    modname = libutils.modname(self.resource)
+                    changed_code, imported = importutils.add_import(
+                        self.project, new_pymodule, modname, factory_name)
+                    changed_code = changed_code.replace(replacement, imported)
+                changes.add_change(ChangeContents(file_, changed_code))
+            job_set.finished_job()
+
+    def _change_resource(self, changes, factory_name, global_):
+        class_scope = self.old_pyname.get_object().get_scope()
+        source_code = self._rename_occurrences(
+            self.resource, self._new_function_name(factory_name,
+                                                   global_), global_)
+        if source_code is None:
+            source_code = self.pymodule.source_code
+        else:
+            self.pymodule = libutils.get_string_module(
+                self.project, source_code, resource=self.resource)
+        lines = self.pymodule.lines
+        start = self._get_insertion_offset(class_scope, lines)
+        result = source_code[:start]
+        result += self._get_factory_method(lines, class_scope,
+                                           factory_name, global_)
+        result += source_code[start:]
+        changes.add_change(ChangeContents(self.resource, result))
+
+    def _get_insertion_offset(self, class_scope, lines):
+        start_line = class_scope.get_end()
+        if class_scope.get_scopes():
+            start_line = class_scope.get_scopes()[-1].get_end()
+        start = lines.get_line_end(start_line) + 1
+        return start
+
+    def _get_factory_method(self, lines, class_scope,
+                            factory_name, global_):
+        unit_indents = ' ' * sourceutils.get_indent(self.project)
+        if global_:
+            if self._get_scope_indents(lines, class_scope) > 0:
+                raise rope.base.exceptions.RefactoringError(
+                    'Cannot make global factory method for nested classes.')
+            return ('\ndef %s(*args, **kwds):\n%sreturn %s(*args, **kwds)\n' %
+                    (factory_name, unit_indents, self.old_name))
+        unindented_factory = \
+            ('@staticmethod\ndef %s(*args, **kwds):\n' % factory_name +
+             '%sreturn %s(*args, **kwds)\n' % (unit_indents, self.old_name))
+        indents = self._get_scope_indents(lines, class_scope) + \
+            sourceutils.get_indent(self.project)
+        return '\n' + sourceutils.indent_lines(unindented_factory, indents)
+
+    def _get_scope_indents(self, lines, scope):
+        return sourceutils.get_indents(lines, scope.get_start())
+
+    def _new_function_name(self, factory_name, global_):
+        if global_:
+            return factory_name
+        else:
+            return self.old_name + '.' + factory_name
+
+    def _rename_occurrences(self, file_, changed_name, global_factory):
+        finder = occurrences.create_finder(self.project, self.old_name,
+                                           self.old_pyname, only_calls=True)
+        result = rename.rename_in_module(finder, changed_name, resource=file_,
+                                         replace_primary=global_factory)
+        return result
+
+IntroduceFactoryRefactoring = IntroduceFactory
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/introduce_parameter.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/introduce_parameter.py
new file mode 100644
index 0000000..43d6f75
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/introduce_parameter.py
@@ -0,0 +1,96 @@
+import rope.base.change
+from rope.base import exceptions, evaluate, worder, codeanalyze
+from rope.refactor import functionutils, sourceutils, occurrences
+
+
+class IntroduceParameter(object):
+    """Introduce parameter refactoring
+
+    This refactoring adds a new parameter to a function and replaces
+    references to an expression in it with the new parameter.
+
+    The parameter finding part is different from finding similar
+    pieces in extract refactorings.  In this refactoring parameters
+    are found based on the object they reference to.  For instance
+    in::
+
+      class A(object):
+          var = None
+
+      class B(object):
+          a = A()
+
+      b = B()
+      a = b.a
+
+      def f(a):
+          x = b.a.var + a.var
+
+    using this refactoring on ``a.var`` with ``p`` as the new
+    parameter name, will result in::
+
+      def f(p=a.var):
+          x = p + p
+
+    """
+
+    def __init__(self, project, resource, offset):
+        self.project = project
+        self.resource = resource
+        self.offset = offset
+        self.pymodule = self.project.get_pymodule(self.resource)
+        scope = self.pymodule.get_scope().get_inner_scope_for_offset(offset)
+        if scope.get_kind() != 'Function':
+            raise exceptions.RefactoringError(
+                'Introduce parameter should be performed inside functions')
+        self.pyfunction = scope.pyobject
+        self.name, self.pyname = self._get_name_and_pyname()
+        if self.pyname is None:
+            raise exceptions.RefactoringError(
+                'Cannot find the definition of <%s>' % self.name)
+
+    def _get_primary(self):
+        word_finder = worder.Worder(self.resource.read())
+        return word_finder.get_primary_at(self.offset)
+
+    def _get_name_and_pyname(self):
+        return (worder.get_name_at(self.resource, self.offset),
+                evaluate.eval_location(self.pymodule, self.offset))
+
+    def get_changes(self, new_parameter):
+        definition_info = functionutils.DefinitionInfo.read(self.pyfunction)
+        definition_info.args_with_defaults.append((new_parameter,
+                                                   self._get_primary()))
+        collector = codeanalyze.ChangeCollector(self.resource.read())
+        header_start, header_end = self._get_header_offsets()
+        body_start, body_end = sourceutils.get_body_region(self.pyfunction)
+        collector.add_change(header_start, header_end,
+                             definition_info.to_string())
+        self._change_function_occurances(collector, body_start,
+                                         body_end, new_parameter)
+        changes = rope.base.change.ChangeSet('Introduce parameter <%s>' %
+                                             new_parameter)
+        change = rope.base.change.ChangeContents(self.resource,
+                                                 collector.get_changed())
+        changes.add_change(change)
+        return changes
+
+    def _get_header_offsets(self):
+        lines = self.pymodule.lines
+        start_line = self.pyfunction.get_scope().get_start()
+        end_line = self.pymodule.logical_lines.\
+            logical_line_in(start_line)[1]
+        start = lines.get_line_start(start_line)
+        end = lines.get_line_end(end_line)
+        start = self.pymodule.source_code.find('def', start) + 4
+        end = self.pymodule.source_code.rfind(':', start, end)
+        return start, end
+
+    def _change_function_occurances(self, collector, function_start,
+                                    function_end, new_name):
+        finder = occurrences.create_finder(self.project, self.name,
+                                           self.pyname)
+        for occurrence in finder.find_occurrences(resource=self.resource):
+            start, end = occurrence.get_primary_range()
+            if function_start <= start < function_end:
+                collector.add_change(start, end, new_name)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/localtofield.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/localtofield.py
new file mode 100644
index 0000000..f276070
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/localtofield.py
@@ -0,0 +1,49 @@
+from rope.base import pynames, evaluate, exceptions, worder
+from rope.refactor.rename import Rename
+
+
+class LocalToField(object):
+
+    def __init__(self, project, resource, offset):
+        self.project = project
+        self.resource = resource
+        self.offset = offset
+
+    def get_changes(self):
+        name = worder.get_name_at(self.resource, self.offset)
+        this_pymodule = self.project.get_pymodule(self.resource)
+        pyname = evaluate.eval_location(this_pymodule, self.offset)
+        if not self._is_a_method_local(pyname):
+            raise exceptions.RefactoringError(
+                'Convert local variable to field should be performed on \n'
+                'a local variable of a method.')
+
+        pymodule, lineno = pyname.get_definition_location()
+        function_scope = pymodule.get_scope().get_inner_scope_for_line(lineno)
+        # Not checking redefinition
+        #self._check_redefinition(name, function_scope)
+
+        new_name = self._get_field_name(function_scope.pyobject, name)
+        changes = Rename(self.project, self.resource, self.offset).\
+            get_changes(new_name, resources=[self.resource])
+        return changes
+
+    def _check_redefinition(self, name, function_scope):
+        class_scope = function_scope.parent
+        if name in class_scope.pyobject:
+            raise exceptions.RefactoringError(
+                'The field %s already exists' % name)
+
+    def _get_field_name(self, pyfunction, name):
+        self_name = pyfunction.get_param_names()[0]
+        new_name = self_name + '.' + name
+        return new_name
+
+    def _is_a_method_local(self, pyname):
+        pymodule, lineno = pyname.get_definition_location()
+        holding_scope = pymodule.get_scope().get_inner_scope_for_line(lineno)
+        parent = holding_scope.parent
+        return isinstance(pyname, pynames.AssignedName) and \
+            pyname in holding_scope.get_names().values() and \
+            holding_scope.get_kind() == 'Function' and \
+            parent is not None and parent.get_kind() == 'Class'
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/method_object.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/method_object.py
new file mode 100644
index 0000000..29ce429
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/method_object.py
@@ -0,0 +1,90 @@
+import warnings
+
+from rope.base import libutils
+from rope.base import pyobjects, exceptions, change, evaluate, codeanalyze
+from rope.refactor import sourceutils, occurrences, rename
+
+
+class MethodObject(object):
+
+    def __init__(self, project, resource, offset):
+        self.project = project
+        this_pymodule = self.project.get_pymodule(resource)
+        pyname = evaluate.eval_location(this_pymodule, offset)
+        if pyname is None or not isinstance(pyname.get_object(),
+                                            pyobjects.PyFunction):
+            raise exceptions.RefactoringError(
+                'Replace method with method object refactoring should be '
+                'performed on a function.')
+        self.pyfunction = pyname.get_object()
+        self.pymodule = self.pyfunction.get_module()
+        self.resource = self.pymodule.get_resource()
+
+    def get_new_class(self, name):
+        body = sourceutils.fix_indentation(
+            self._get_body(), sourceutils.get_indent(self.project) * 2)
+        return 'class %s(object):\n\n%s%sdef __call__(self):\n%s' % \
+               (name, self._get_init(),
+                ' ' * sourceutils.get_indent(self.project), body)
+
+    def get_changes(self, classname=None, new_class_name=None):
+        if new_class_name is not None:
+            warnings.warn(
+                'new_class_name parameter is deprecated; use classname',
+                DeprecationWarning, stacklevel=2)
+            classname = new_class_name
+        collector = codeanalyze.ChangeCollector(self.pymodule.source_code)
+        start, end = sourceutils.get_body_region(self.pyfunction)
+        indents = sourceutils.get_indents(
+            self.pymodule.lines, self.pyfunction.get_scope().get_start()) + \
+            sourceutils.get_indent(self.project)
+        new_contents = ' ' * indents + 'return %s(%s)()\n' % \
+                       (classname, ', '.join(self._get_parameter_names()))
+        collector.add_change(start, end, new_contents)
+        insertion = self._get_class_insertion_point()
+        collector.add_change(insertion, insertion,
+                             '\n\n' + self.get_new_class(classname))
+        changes = change.ChangeSet(
+            'Replace method with method object refactoring')
+        changes.add_change(change.ChangeContents(self.resource,
+                                                 collector.get_changed()))
+        return changes
+
+    def _get_class_insertion_point(self):
+        current = self.pyfunction
+        while current.parent != self.pymodule:
+            current = current.parent
+        end = self.pymodule.lines.get_line_end(current.get_scope().get_end())
+        return min(end + 1, len(self.pymodule.source_code))
+
+    def _get_body(self):
+        body = sourceutils.get_body(self.pyfunction)
+        for param in self._get_parameter_names():
+            body = param + ' = None\n' + body
+            pymod = libutils.get_string_module(
+                self.project, body, self.resource)
+            pyname = pymod[param]
+            finder = occurrences.create_finder(self.project, param, pyname)
+            result = rename.rename_in_module(finder, 'self.' + param,
+                                             pymodule=pymod)
+            body = result[result.index('\n') + 1:]
+        return body
+
+    def _get_init(self):
+        params = self._get_parameter_names()
+        indents = ' ' * sourceutils.get_indent(self.project)
+        if not params:
+            return ''
+        header = indents + 'def __init__(self'
+        body = ''
+        for arg in params:
+            new_name = arg
+            if arg == 'self':
+                new_name = 'host'
+            header += ', %s' % new_name
+            body += indents * 2 + 'self.%s = %s\n' % (arg, new_name)
+        header += '):'
+        return '%s\n%s\n' % (header, body)
+
+    def _get_parameter_names(self):
+        return self.pyfunction.get_param_names()
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/move.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/move.py
new file mode 100644
index 0000000..ce61827
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/move.py
@@ -0,0 +1,784 @@
+"""A module containing classes for move refactoring
+
+`create_move()` is a factory for creating move refactoring objects
+based on inputs.
+
+"""
+from rope.base import (pyobjects, codeanalyze, exceptions, pynames,
+                       taskhandle, evaluate, worder, libutils)
+from rope.base.change import ChangeSet, ChangeContents, MoveResource
+from rope.refactor import importutils, rename, occurrences, sourceutils, \
+    functionutils
+
+
+def create_move(project, resource, offset=None):
+    """A factory for creating Move objects
+
+    Based on `resource` and `offset`, return one of `MoveModule`,
+    `MoveGlobal` or `MoveMethod` for performing move refactoring.
+
+    """
+    if offset is None:
+        return MoveModule(project, resource)
+    this_pymodule = project.get_pymodule(resource)
+    pyname = evaluate.eval_location(this_pymodule, offset)
+    if pyname is not None:
+        pyobject = pyname.get_object()
+        if isinstance(pyobject, pyobjects.PyModule) or \
+           isinstance(pyobject, pyobjects.PyPackage):
+            return MoveModule(project, pyobject.get_resource())
+        if isinstance(pyobject, pyobjects.PyFunction) and \
+           isinstance(pyobject.parent, pyobjects.PyClass):
+            return MoveMethod(project, resource, offset)
+        if isinstance(pyobject, pyobjects.PyDefinedObject) and \
+           isinstance(pyobject.parent, pyobjects.PyModule) or \
+           isinstance(pyname, pynames.AssignedName):
+            return MoveGlobal(project, resource, offset)
+    raise exceptions.RefactoringError(
+        'Move only works on global classes/functions/variables, modules and '
+        'methods.')
+
+
+class MoveMethod(object):
+    """For moving methods
+
+    It makes a new method in the destination class and changes
+    the body of the old method to call the new method.  You can
+    inline the old method to change all of its occurrences.
+
+    """
+
+    def __init__(self, project, resource, offset):
+        self.project = project
+        this_pymodule = self.project.get_pymodule(resource)
+        pyname = evaluate.eval_location(this_pymodule, offset)
+        self.method_name = worder.get_name_at(resource, offset)
+        self.pyfunction = pyname.get_object()
+        if self.pyfunction.get_kind() != 'method':
+            raise exceptions.RefactoringError('Only normal methods'
+                                              ' can be moved.')
+
+    def get_changes(self, dest_attr, new_name=None, resources=None,
+                    task_handle=taskhandle.NullTaskHandle()):
+        """Return the changes needed for this refactoring
+
+        Parameters:
+
+        - `dest_attr`: the name of the destination attribute
+        - `new_name`: the name of the new method; if `None` uses
+          the old name
+        - `resources` can be a list of `rope.base.resources.File`\s to
+          apply this refactoring on.  If `None`, the restructuring
+          will be applied to all python files.
+
+        """
+        changes = ChangeSet('Moving method <%s>' % self.method_name)
+        if resources is None:
+            resources = self.project.get_python_files()
+        if new_name is None:
+            new_name = self.get_method_name()
+        resource1, start1, end1, new_content1 = \
+            self._get_changes_made_by_old_class(dest_attr, new_name)
+        collector1 = codeanalyze.ChangeCollector(resource1.read())
+        collector1.add_change(start1, end1, new_content1)
+
+        resource2, start2, end2, new_content2 = \
+            self._get_changes_made_by_new_class(dest_attr, new_name)
+        if resource1 == resource2:
+            collector1.add_change(start2, end2, new_content2)
+        else:
+            collector2 = codeanalyze.ChangeCollector(resource2.read())
+            collector2.add_change(start2, end2, new_content2)
+            result = collector2.get_changed()
+            import_tools = importutils.ImportTools(self.project)
+            new_imports = self._get_used_imports(import_tools)
+            if new_imports:
+                goal_pymodule = libutils.get_string_module(
+                    self.project, result, resource2)
+                result = _add_imports_to_module(
+                    import_tools, goal_pymodule, new_imports)
+            if resource2 in resources:
+                changes.add_change(ChangeContents(resource2, result))
+
+        if resource1 in resources:
+            changes.add_change(ChangeContents(resource1,
+                                              collector1.get_changed()))
+        return changes
+
+    def get_method_name(self):
+        return self.method_name
+
+    def _get_used_imports(self, import_tools):
+        return importutils.get_imports(self.project, self.pyfunction)
+
+    def _get_changes_made_by_old_class(self, dest_attr, new_name):
+        pymodule = self.pyfunction.get_module()
+        indents = self._get_scope_indents(self.pyfunction)
+        body = 'return self.%s.%s(%s)\n' % (
+            dest_attr, new_name, self._get_passed_arguments_string())
+        region = sourceutils.get_body_region(self.pyfunction)
+        return (pymodule.get_resource(), region[0], region[1],
+                sourceutils.fix_indentation(body, indents))
+
+    def _get_scope_indents(self, pyobject):
+        pymodule = pyobject.get_module()
+        return sourceutils.get_indents(
+            pymodule.lines, pyobject.get_scope().get_start()) + \
+            sourceutils.get_indent(self.project)
+
+    def _get_changes_made_by_new_class(self, dest_attr, new_name):
+        old_pyclass = self.pyfunction.parent
+        if dest_attr not in old_pyclass:
+            raise exceptions.RefactoringError(
+                'Destination attribute <%s> not found' % dest_attr)
+        pyclass = old_pyclass[dest_attr].get_object().get_type()
+        if not isinstance(pyclass, pyobjects.PyClass):
+            raise exceptions.RefactoringError(
+                'Unknown class type for attribute <%s>' % dest_attr)
+        pymodule = pyclass.get_module()
+        resource = pyclass.get_module().get_resource()
+        start, end = sourceutils.get_body_region(pyclass)
+        pre_blanks = '\n'
+        if pymodule.source_code[start:end].strip() != 'pass':
+            pre_blanks = '\n\n'
+            start = end
+        indents = self._get_scope_indents(pyclass)
+        body = pre_blanks + sourceutils.fix_indentation(
+            self.get_new_method(new_name), indents)
+        return resource, start, end, body
+
+    def get_new_method(self, name):
+        return '%s\n%s' % (
+            self._get_new_header(name),
+            sourceutils.fix_indentation(self._get_body(),
+                                        sourceutils.get_indent(self.project)))
+
+    def _get_unchanged_body(self):
+        return sourceutils.get_body(self.pyfunction)
+
+    def _get_body(self, host='host'):
+        self_name = self._get_self_name()
+        body = self_name + ' = None\n' + self._get_unchanged_body()
+        pymodule = libutils.get_string_module(self.project, body)
+        finder = occurrences.create_finder(
+            self.project, self_name, pymodule[self_name])
+        result = rename.rename_in_module(finder, host, pymodule=pymodule)
+        if result is None:
+            result = body
+        return result[result.index('\n') + 1:]
+
+    def _get_self_name(self):
+        return self.pyfunction.get_param_names()[0]
+
+    def _get_new_header(self, name):
+        header = 'def %s(self' % name
+        if self._is_host_used():
+            header += ', host'
+        definition_info = functionutils.DefinitionInfo.read(self.pyfunction)
+        others = definition_info.arguments_to_string(1)
+        if others:
+            header += ', ' + others
+        return header + '):'
+
+    def _get_passed_arguments_string(self):
+        result = ''
+        if self._is_host_used():
+            result = 'self'
+        definition_info = functionutils.DefinitionInfo.read(self.pyfunction)
+        others = definition_info.arguments_to_string(1)
+        if others:
+            if result:
+                result += ', '
+            result += others
+        return result
+
+    def _is_host_used(self):
+        return self._get_body('__old_self') != self._get_unchanged_body()
+
+
+class MoveGlobal(object):
+    """For moving global function and classes"""
+
+    def __init__(self, project, resource, offset):
+        self.project = project
+        this_pymodule = self.project.get_pymodule(resource)
+        self.old_pyname = evaluate.eval_location(this_pymodule, offset)
+        if self.old_pyname is None:
+            raise exceptions.RefactoringError(
+                'Move refactoring should be performed on a '
+                'class/function/variable.')
+        if self._is_variable(self.old_pyname):
+            self.old_name = worder.get_name_at(resource, offset)
+            pymodule = this_pymodule
+        else:
+            self.old_name = self.old_pyname.get_object().get_name()
+            pymodule = self.old_pyname.get_object().get_module()
+        self._check_exceptional_conditions()
+        self.source = pymodule.get_resource()
+        self.tools = _MoveTools(self.project, self.source,
+                                self.old_pyname, self.old_name)
+        self.import_tools = self.tools.import_tools
+
+    def _import_filter(self, stmt):
+      module_name = libutils.modname(self.source)
+
+      if isinstance(stmt.import_info, importutils.NormalImport):
+          # Affect any statement that imports the source module
+          return any(module_name == name
+                     for name, alias in stmt.import_info.names_and_aliases)
+      elif isinstance(stmt.import_info, importutils.FromImport):
+          # Affect statements importing from the source package
+          if '.' in module_name:
+              package_name, basename = module_name.rsplit('.', 1)
+              if (stmt.import_info.module_name == package_name and
+                  any(basename == name
+                      for name, alias in stmt.import_info.names_and_aliases)):
+                  return True
+          return stmt.import_info.module_name == module_name
+      return False
+
+    def _check_exceptional_conditions(self):
+        if self._is_variable(self.old_pyname):
+            pymodule = self.old_pyname.get_definition_location()[0]
+            try:
+                pymodule.get_scope().get_name(self.old_name)
+            except exceptions.NameNotFoundError:
+                self._raise_refactoring_error()
+        elif not (isinstance(self.old_pyname.get_object(),
+                             pyobjects.PyDefinedObject) and
+                  self._is_global(self.old_pyname.get_object())):
+            self._raise_refactoring_error()
+
+    def _raise_refactoring_error(self):
+        raise exceptions.RefactoringError(
+            'Move refactoring should be performed on a global class, function '
+            'or variable.')
+
+    def _is_global(self, pyobject):
+        return pyobject.get_scope().parent == pyobject.get_module().get_scope()
+
+    def _is_variable(self, pyname):
+      return isinstance(pyname, pynames.AssignedName)
+
+    def get_changes(self, dest, resources=None,
+                    task_handle=taskhandle.NullTaskHandle()):
+        if resources is None:
+            resources = self.project.get_python_files()
+        if dest is None or not dest.exists():
+            raise exceptions.RefactoringError(
+                'Move destination does not exist.')
+        if dest.is_folder() and dest.has_child('__init__.py'):
+            dest = dest.get_child('__init__.py')
+        if dest.is_folder():
+            raise exceptions.RefactoringError(
+                'Move destination for non-modules should not be folders.')
+        if self.source == dest:
+            raise exceptions.RefactoringError(
+                'Moving global elements to the same module.')
+        return self._calculate_changes(dest, resources, task_handle)
+
+    def _calculate_changes(self, dest, resources, task_handle):
+        changes = ChangeSet('Moving global <%s>' % self.old_name)
+        job_set = task_handle.create_jobset('Collecting Changes',
+                                            len(resources))
+        for file_ in resources:
+            job_set.started_job(file_.path)
+            if file_ == self.source:
+                changes.add_change(self._source_module_changes(dest))
+            elif file_ == dest:
+                changes.add_change(self._dest_module_changes(dest))
+            elif self.tools.occurs_in_module(resource=file_):
+                pymodule = self.project.get_pymodule(file_)
+                # Changing occurrences
+                placeholder = '__rope_renaming_%s_' % self.old_name
+                source = self.tools.rename_in_module(placeholder,
+                                                     resource=file_)
+                should_import = source is not None
+                # Removing out of date imports
+                pymodule = self.tools.new_pymodule(pymodule, source)
+                source = self.import_tools.organize_imports(
+                    pymodule, sort=False, import_filter=self._import_filter)
+                # Adding new import
+                if should_import:
+                    pymodule = self.tools.new_pymodule(pymodule, source)
+                    source, imported = importutils.add_import(
+                        self.project, pymodule, self._new_modname(dest),
+                        self.old_name)
+                    source = source.replace(placeholder, imported)
+                source = self.tools.new_source(pymodule, source)
+                if source != file_.read():
+                    changes.add_change(ChangeContents(file_, source))
+            job_set.finished_job()
+        return changes
+
+    def _source_module_changes(self, dest):
+        placeholder = '__rope_moving_%s_' % self.old_name
+        handle = _ChangeMoveOccurrencesHandle(placeholder)
+        occurrence_finder = occurrences.create_finder(
+            self.project, self.old_name, self.old_pyname)
+        start, end = self._get_moving_region()
+        renamer = ModuleSkipRenamer(occurrence_finder, self.source,
+                                    handle, start, end)
+        source = renamer.get_changed_module()
+        pymodule = libutils.get_string_module(self.project, source, self.source)
+        source = self.import_tools.organize_imports(pymodule, sort=False)
+        if handle.occurred:
+            pymodule = libutils.get_string_module(
+                self.project, source, self.source)
+            # Adding new import
+            source, imported = importutils.add_import(
+                self.project, pymodule, self._new_modname(dest), self.old_name)
+            source = source.replace(placeholder, imported)
+        return ChangeContents(self.source, source)
+
+    def _new_modname(self, dest):
+        return libutils.modname(dest)
+
+    def _dest_module_changes(self, dest):
+        # Changing occurrences
+        pymodule = self.project.get_pymodule(dest)
+        source = self.tools.rename_in_module(self.old_name, pymodule)
+        pymodule = self.tools.new_pymodule(pymodule, source)
+
+        moving, imports = self._get_moving_element_with_imports()
+        pymodule, has_changed = self._add_imports2(pymodule, imports)
+
+        module_with_imports = self.import_tools.module_imports(pymodule)
+        source = pymodule.source_code
+        lineno = 0
+        if module_with_imports.imports:
+            lineno = module_with_imports.imports[-1].end_line - 1
+        else:
+            while lineno < pymodule.lines.length() and \
+                    pymodule.lines.get_line(lineno + 1).\
+                    lstrip().startswith('#'):
+                lineno += 1
+        if lineno > 0:
+            cut = pymodule.lines.get_line_end(lineno) + 1
+            result = source[:cut] + '\n\n' + moving + source[cut:]
+        else:
+            result = moving + source
+
+        # Organizing imports
+        source = result
+        pymodule = libutils.get_string_module(self.project, source, dest)
+        source = self.import_tools.organize_imports(pymodule, sort=False,
+                                                    unused=False)
+        # Remove unused imports of the old module
+        pymodule = libutils.get_string_module(self.project, source, dest)
+        source = self.import_tools.organize_imports(
+            pymodule, sort=False, selfs=False, unused=True,
+            import_filter=self._import_filter)
+        return ChangeContents(dest, source)
+
+    def _get_moving_element_with_imports(self):
+        return moving_code_with_imports(
+            self.project, self.source, self._get_moving_element())
+
+    def _get_module_with_imports(self, source_code, resource):
+        pymodule = libutils.get_string_module(
+            self.project, source_code, resource)
+        return self.import_tools.module_imports(pymodule)
+
+    def _get_moving_element(self):
+        start, end = self._get_moving_region()
+        moving = self.source.read()[start:end]
+        return moving.rstrip() + '\n'
+
+    def _get_moving_region(self):
+        pymodule = self.project.get_pymodule(self.source)
+        lines = pymodule.lines
+        if self._is_variable(self.old_pyname):
+            logical_lines = pymodule.logical_lines
+            lineno = logical_lines.logical_line_in(
+                self.old_pyname.get_definition_location()[1])[0]
+            start = lines.get_line_start(lineno)
+            end_line = logical_lines.logical_line_in(lineno)[1]
+        else:
+            scope = self.old_pyname.get_object().get_scope()
+            start = lines.get_line_start(scope.get_start())
+            end_line = scope.get_end()
+
+        # Include comment lines before the definition
+        start_line = lines.get_line_number(start)
+        while start_line > 1 and lines.get_line(start_line - 1).startswith('#'):
+          start_line -= 1
+        start = lines.get_line_start(start_line)
+
+        while end_line < lines.length() and \
+                lines.get_line(end_line + 1).strip() == '':
+            end_line += 1
+        end = min(lines.get_line_end(end_line) + 1, len(pymodule.source_code))
+        return start, end
+
+    def _add_imports2(self, pymodule, new_imports):
+        source = self.tools.add_imports(pymodule, new_imports)
+        if source is None:
+            return pymodule, False
+        else:
+            resource = pymodule.get_resource()
+            pymodule = libutils.get_string_module(
+                self.project, source, resource)
+            return pymodule, True
+
+
+class MoveModule(object):
+    """For moving modules and packages"""
+
+    def __init__(self, project, resource):
+        self.project = project
+        if not resource.is_folder() and resource.name == '__init__.py':
+            resource = resource.parent
+        if resource.is_folder() and not resource.has_child('__init__.py'):
+            raise exceptions.RefactoringError(
+                'Cannot move non-package folder.')
+        dummy_pymodule = libutils.get_string_module(self.project, '')
+        self.old_pyname = pynames.ImportedModule(dummy_pymodule,
+                                                 resource=resource)
+        self.source = self.old_pyname.get_object().get_resource()
+        if self.source.is_folder():
+            self.old_name = self.source.name
+        else:
+            self.old_name = self.source.name[:-3]
+        self.tools = _MoveTools(self.project, self.source,
+                                self.old_pyname, self.old_name)
+        self.import_tools = self.tools.import_tools
+
+    def get_changes(self, dest, resources=None,
+                    task_handle=taskhandle.NullTaskHandle()):
+        if resources is None:
+            resources = self.project.get_python_files()
+        if dest is None or not dest.is_folder():
+            raise exceptions.RefactoringError(
+                'Move destination for modules should be packages.')
+        return self._calculate_changes(dest, resources, task_handle)
+
+    def _calculate_changes(self, dest, resources, task_handle):
+        changes = ChangeSet('Moving module <%s>' % self.old_name)
+        job_set = task_handle.create_jobset('Collecting changes',
+                                            len(resources))
+        for module in resources:
+            job_set.started_job(module.path)
+            if module == self.source:
+                self._change_moving_module(changes, dest)
+            else:
+                source = self._change_occurrences_in_module(dest,
+                                                            resource=module)
+                if source is not None:
+                    changes.add_change(ChangeContents(module, source))
+            job_set.finished_job()
+        if self.project == self.source.project:
+            changes.add_change(MoveResource(self.source, dest.path))
+        return changes
+
+    def _new_modname(self, dest):
+        destname = libutils.modname(dest)
+        if destname:
+            return destname + '.' + self.old_name
+        return self.old_name
+
+    def _new_import(self, dest):
+        return importutils.NormalImport([(self._new_modname(dest), None)])
+
+    def _change_moving_module(self, changes, dest):
+        if not self.source.is_folder():
+            pymodule = self.project.get_pymodule(self.source)
+            source = self.import_tools.relatives_to_absolutes(pymodule)
+            pymodule = self.tools.new_pymodule(pymodule, source)
+            source = self._change_occurrences_in_module(dest, pymodule)
+            source = self.tools.new_source(pymodule, source)
+            if source != self.source.read():
+                changes.add_change(ChangeContents(self.source, source))
+
+    def _change_occurrences_in_module(self, dest, pymodule=None,
+                                      resource=None):
+        if not self.tools.occurs_in_module(pymodule=pymodule,
+                                           resource=resource):
+            return
+        if pymodule is None:
+            pymodule = self.project.get_pymodule(resource)
+        new_name = self._new_modname(dest)
+        module_imports = importutils.get_module_imports(self.project, pymodule)
+        changed = False
+        source = None
+        if libutils.modname(dest):
+            changed = self._change_import_statements(dest, new_name,
+                                                     module_imports)
+            if changed:
+                source = module_imports.get_changed_source()
+                source = self.tools.new_source(pymodule, source)
+                pymodule = self.tools.new_pymodule(pymodule, source)
+
+        new_import = self._new_import(dest)
+        source = self.tools.rename_in_module(
+            new_name, imports=True, pymodule=pymodule,
+            resource=resource if not changed else None)
+        should_import = self.tools.occurs_in_module(
+            pymodule=pymodule, resource=resource, imports=False)
+        pymodule = self.tools.new_pymodule(pymodule, source)
+        source = self.tools.remove_old_imports(pymodule)
+        if should_import:
+            pymodule = self.tools.new_pymodule(pymodule, source)
+            source = self.tools.add_imports(pymodule, [new_import])
+        source = self.tools.new_source(pymodule, source)
+        if source is not None and source != pymodule.resource.read():
+            return source
+        return None
+
+    def _change_import_statements(self, dest, new_name, module_imports):
+        moving_module = self.source
+        parent_module = moving_module.parent
+
+        changed = False
+        for import_stmt in module_imports.imports:
+            if not any(name_and_alias[0] == self.old_name
+                       for name_and_alias in
+                       import_stmt.import_info.names_and_aliases) and \
+               not any(name_and_alias[0] == libutils.modname(self.source)
+                       for name_and_alias in
+                       import_stmt.import_info.names_and_aliases):
+                continue
+
+            # Case 1: Look for normal imports of the moving module.
+            if isinstance(import_stmt.import_info, importutils.NormalImport):
+                continue
+
+            # Case 2: The moving module is from-imported.
+            changed = self._handle_moving_in_from_import_stmt(
+                dest, import_stmt, module_imports, parent_module) or changed
+
+            # Case 3: Names are imported from the moving module.
+            context = importutils.importinfo.ImportContext(self.project, None)
+            if not import_stmt.import_info.is_empty() and \
+               import_stmt.import_info.get_imported_resource(context) == \
+                    moving_module:
+                import_stmt.import_info = importutils.FromImport(
+                    new_name, import_stmt.import_info.level,
+                    import_stmt.import_info.names_and_aliases)
+                changed = True
+
+        return changed
+
+    def _handle_moving_in_from_import_stmt(self, dest, import_stmt,
+                                           module_imports, parent_module):
+        changed = False
+        context = importutils.importinfo.ImportContext(self.project, None)
+        if import_stmt.import_info.get_imported_resource(context) == \
+                parent_module:
+            imports = import_stmt.import_info.names_and_aliases
+            new_imports = []
+            for name, alias in imports:
+                # The moving module was imported.
+                if name == self.old_name:
+                    changed = True
+                    new_import = importutils.FromImport(
+                        libutils.modname(dest), 0,
+                        [(self.old_name, alias)])
+                    module_imports.add_import(new_import)
+                else:
+                    new_imports.append((name, alias))
+
+            # Update the imports if the imported names were changed.
+            if new_imports != imports:
+                changed = True
+                if new_imports:
+                    import_stmt.import_info = importutils.FromImport(
+                        import_stmt.import_info.module_name,
+                        import_stmt.import_info.level,
+                        new_imports)
+                else:
+                    import_stmt.empty_import()
+        return changed
+
+
+class _ChangeMoveOccurrencesHandle(object):
+
+    def __init__(self, new_name):
+        self.new_name = new_name
+        self.occurred = False
+
+    def occurred_inside_skip(self, change_collector, occurrence):
+        pass
+
+    def occurred_outside_skip(self, change_collector, occurrence):
+        start, end = occurrence.get_primary_range()
+        change_collector.add_change(start, end, self.new_name)
+        self.occurred = True
+
+
+class _MoveTools(object):
+
+    def __init__(self, project, source, pyname, old_name):
+        self.project = project
+        self.source = source
+        self.old_pyname = pyname
+        self.old_name = old_name
+        self.import_tools = importutils.ImportTools(self.project)
+
+    def remove_old_imports(self, pymodule):
+        old_source = pymodule.source_code
+        module_with_imports = self.import_tools.module_imports(pymodule)
+
+        class CanSelect(object):
+            changed = False
+            old_name = self.old_name
+            old_pyname = self.old_pyname
+
+            def __call__(self, name):
+                try:
+                    if name == self.old_name and \
+                       pymodule[name].get_object() == \
+                       self.old_pyname.get_object():
+                        self.changed = True
+                        return False
+                except exceptions.AttributeNotFoundError:
+                    pass
+                return True
+        can_select = CanSelect()
+        module_with_imports.filter_names(can_select)
+        new_source = module_with_imports.get_changed_source()
+        if old_source != new_source:
+            return new_source
+
+    def rename_in_module(self, new_name, pymodule=None,
+                         imports=False, resource=None):
+        occurrence_finder = self._create_finder(imports)
+        source = rename.rename_in_module(
+            occurrence_finder, new_name, replace_primary=True,
+            pymodule=pymodule, resource=resource)
+        return source
+
+    def occurs_in_module(self, pymodule=None, resource=None, imports=True):
+        finder = self._create_finder(imports)
+        for occurrence in finder.find_occurrences(pymodule=pymodule,
+                                                  resource=resource):
+            return True
+        return False
+
+    def _create_finder(self, imports):
+        return occurrences.create_finder(self.project, self.old_name,
+                                         self.old_pyname, imports=imports,
+                                         keywords=False)
+
+    def new_pymodule(self, pymodule, source):
+        if source is not None:
+            return libutils.get_string_module(
+                self.project, source, pymodule.get_resource())
+        return pymodule
+
+    def new_source(self, pymodule, source):
+        if source is None:
+            return pymodule.source_code
+        return source
+
+    def add_imports(self, pymodule, new_imports):
+        return _add_imports_to_module(self.import_tools, pymodule, new_imports)
+
+
+def _add_imports_to_module(import_tools, pymodule, new_imports):
+    module_with_imports = import_tools.module_imports(pymodule)
+    for new_import in new_imports:
+        module_with_imports.add_import(new_import)
+    return module_with_imports.get_changed_source()
+
+
+def moving_code_with_imports(project, resource, source):
+    import_tools = importutils.ImportTools(project)
+    pymodule = libutils.get_string_module(project, source, resource)
+
+    # Strip comment prefix, if any. These need to stay before the moving
+    # section, but imports would be added between them.
+    lines = codeanalyze.SourceLinesAdapter(source)
+    start = 1
+    while start < lines.length() and lines.get_line(start).startswith('#'):
+        start += 1
+    moving_prefix = source[:lines.get_line_start(start)]
+    pymodule = libutils.get_string_module(
+        project, source[lines.get_line_start(start):], resource)
+
+    origin = project.get_pymodule(resource)
+
+    imports = []
+    for stmt in import_tools.module_imports(origin).imports:
+        imports.append(stmt.import_info)
+
+    back_names = []
+    for name in origin:
+        if name not in pymodule:
+            back_names.append(name)
+    imports.append(import_tools.get_from_import(resource, back_names))
+
+    source = _add_imports_to_module(import_tools, pymodule, imports)
+    pymodule = libutils.get_string_module(project, source, resource)
+
+    source = import_tools.relatives_to_absolutes(pymodule)
+    pymodule = libutils.get_string_module(project, source, resource)
+    source = import_tools.organize_imports(pymodule, selfs=False)
+    pymodule = libutils.get_string_module(project, source, resource)
+
+    # extracting imports after changes
+    module_imports = import_tools.module_imports(pymodule)
+    imports = [import_stmt.import_info
+               for import_stmt in module_imports.imports]
+    start = 1
+    if module_imports.imports:
+        start = module_imports.imports[-1].end_line
+    lines = codeanalyze.SourceLinesAdapter(source)
+    while start < lines.length() and not lines.get_line(start).strip():
+        start += 1
+
+    # Reinsert the prefix which was removed at the beginning
+    moving = moving_prefix + source[lines.get_line_start(start):]
+    return moving, imports
+
+
+class ModuleSkipRenamerHandle(object):
+
+    def occurred_outside_skip(self, change_collector, occurrence):
+        pass
+
+    def occurred_inside_skip(self, change_collector, occurrence):
+        pass
+
+
+class ModuleSkipRenamer(object):
+    """Rename occurrences in a module
+
+    This class can be used when you want to treat a region in a file
+    separately from other parts when renaming.
+
+    """
+
+    def __init__(self, occurrence_finder, resource, handle=None,
+                 skip_start=0, skip_end=0, replacement=''):
+        """Constructor
+
+        if replacement is `None` the region is not changed.  Otherwise
+        it is replaced with `replacement`.
+
+        """
+        self.occurrence_finder = occurrence_finder
+        self.resource = resource
+        self.skip_start = skip_start
+        self.skip_end = skip_end
+        self.replacement = replacement
+        self.handle = handle
+        if self.handle is None:
+            self.handle = ModuleSkipRenamerHandle()
+
+    def get_changed_module(self):
+        source = self.resource.read()
+        change_collector = codeanalyze.ChangeCollector(source)
+        if self.replacement is not None:
+            change_collector.add_change(self.skip_start, self.skip_end,
+                                        self.replacement)
+        for occurrence in self.occurrence_finder.find_occurrences(
+                self.resource):
+            start, end = occurrence.get_primary_range()
+            if self.skip_start <= start < self.skip_end:
+                self.handle.occurred_inside_skip(change_collector, occurrence)
+            else:
+                self.handle.occurred_outside_skip(change_collector, occurrence)
+        result = change_collector.get_changed()
+        if result is not None and result != source:
+            return result
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/multiproject.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/multiproject.py
new file mode 100644
index 0000000..ac243bd
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/multiproject.py
@@ -0,0 +1,78 @@
+"""This module can be used for performing cross-project refactorings
+
+See the "cross-project refactorings" section of ``docs/library.rst``
+file.
+
+"""
+
+from rope.base import resources, libutils
+
+
+class MultiProjectRefactoring(object):
+
+    def __init__(self, refactoring, projects, addpath=True):
+        """Create a multiproject proxy for the main refactoring
+
+        `projects` are other project.
+
+        """
+        self.refactoring = refactoring
+        self.projects = projects
+        self.addpath = addpath
+
+    def __call__(self, project, *args, **kwds):
+        """Create the refactoring"""
+        return _MultiRefactoring(self.refactoring, self.projects,
+                                 self.addpath, project, *args, **kwds)
+
+
+class _MultiRefactoring(object):
+
+    def __init__(self, refactoring, other_projects, addpath,
+                 project, *args, **kwds):
+        self.refactoring = refactoring
+        self.projects = [project] + other_projects
+        for other_project in other_projects:
+            for folder in self.project.get_source_folders():
+                other_project.get_prefs().add('python_path', folder.real_path)
+        self.refactorings = []
+        for other in self.projects:
+            args, kwds = self._resources_for_args(other, args, kwds)
+            self.refactorings.append(
+                self.refactoring(other, *args, **kwds))
+
+    def get_all_changes(self, *args, **kwds):
+        """Get a project to changes dict"""
+        result = []
+        for project, refactoring in zip(self.projects, self.refactorings):
+            args, kwds = self._resources_for_args(project, args, kwds)
+            result.append((project, refactoring.get_changes(*args, **kwds)))
+        return result
+
+    def __getattr__(self, name):
+        return getattr(self.main_refactoring, name)
+
+    def _resources_for_args(self, project, args, kwds):
+        newargs = [self._change_project_resource(project, arg) for arg in args]
+        newkwds = dict((name, self._change_project_resource(project, value))
+                       for name, value in kwds.items())
+        return newargs, newkwds
+
+    def _change_project_resource(self, project, obj):
+        if isinstance(obj, resources.Resource) and \
+           obj.project != project:
+            return libutils.path_to_resource(project, obj.real_path)
+        return obj
+
+    @property
+    def project(self):
+        return self.projects[0]
+
+    @property
+    def main_refactoring(self):
+        return self.refactorings[0]
+
+
+def perform(project_changes):
+    for project, changes in project_changes:
+        project.do(changes)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/occurrences.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/occurrences.py
new file mode 100644
index 0000000..dfc2d68
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/occurrences.py
@@ -0,0 +1,402 @@
+"""Find occurrences of a name in a project.
+
+This module consists of a `Finder` that finds all occurrences of a name
+in a project. The `Finder.find_occurrences()` method is a generator that
+yields `Occurrence` instances for each occurrence of the name. To create
+a `Finder` object, use the `create_finder()` function:
+
+    finder = occurrences.create_finder(project, 'foo', pyname)
+    for occurrence in finder.find_occurrences():
+        pass
+
+It's possible to filter the occurrences. They can be specified when
+calling the `create_finder()` function.
+
+  * `only_calls`: If True, return only those instances where the name is
+    a function that's being called.
+
+  * `imports`: If False, don't return instances that are in import
+    statements.
+
+  * `unsure`: If a prediate function, return instances where we don't
+    know what the name references. It also filters based on the
+    predicate function.
+
+  * `docs`: If True, it will search for occurrences in regions normally
+    ignored. E.g., strings and comments.
+
+  * `in_hierarchy`: If True, it will find occurrences if the name is in
+    the class's hierarchy.
+
+  * `instance`: Used only when you want implicit interfaces to be
+    considered.
+
+  * `keywords`: If False, don't return instances that are the names of keyword
+    arguments
+"""
+
+import re
+
+from rope.base import codeanalyze
+from rope.base import evaluate
+from rope.base import exceptions
+from rope.base import pynames
+from rope.base import pyobjects
+from rope.base import utils
+from rope.base import worder
+
+
+class Finder(object):
+    """For finding occurrences of a name
+
+    The constructor takes a `filters` argument.  It should be a list
+    of functions that take a single argument.  For each possible
+    occurrence, these functions are called in order with the an
+    instance of `Occurrence`:
+
+      * If it returns `None` other filters are tried.
+      * If it returns `True`, the occurrence will be a match.
+      * If it returns `False`, the occurrence will be skipped.
+      * If all of the filters return `None`, it is skipped also.
+
+    """
+
+    def __init__(self, project, name, filters=[lambda o: True], docs=False):
+        self.project = project
+        self.name = name
+        self.docs = docs
+        self.filters = filters
+        self._textual_finder = _TextualFinder(name, docs=docs)
+
+    def find_occurrences(self, resource=None, pymodule=None):
+        """Generate `Occurrence` instances"""
+        tools = _OccurrenceToolsCreator(self.project, resource=resource,
+                                        pymodule=pymodule, docs=self.docs)
+        for offset in self._textual_finder.find_offsets(tools.source_code):
+            occurrence = Occurrence(tools, offset)
+            for filter in self.filters:
+                result = filter(occurrence)
+                if result is None:
+                    continue
+                if result:
+                    yield occurrence
+                break
+
+
+def create_finder(project, name, pyname, only_calls=False, imports=True,
+                  unsure=None, docs=False, instance=None, in_hierarchy=False,
+                  keywords=True):
+    """A factory for `Finder`
+
+    Based on the arguments it creates a list of filters.  `instance`
+    argument is needed only when you want implicit interfaces to be
+    considered.
+
+    """
+    pynames_ = set([pyname])
+    filters = []
+    if only_calls:
+        filters.append(CallsFilter())
+    if not imports:
+        filters.append(NoImportsFilter())
+    if not keywords:
+        filters.append(NoKeywordsFilter())
+    if isinstance(instance, pynames.ParameterName):
+        for pyobject in instance.get_objects():
+            try:
+                pynames_.add(pyobject[name])
+            except exceptions.AttributeNotFoundError:
+                pass
+    for pyname in pynames_:
+        filters.append(PyNameFilter(pyname))
+        if in_hierarchy:
+            filters.append(InHierarchyFilter(pyname))
+    if unsure:
+        filters.append(UnsureFilter(unsure))
+    return Finder(project, name, filters=filters, docs=docs)
+
+
+class Occurrence(object):
+
+    def __init__(self, tools, offset):
+        self.tools = tools
+        self.offset = offset
+        self.resource = tools.resource
+
+    @utils.saveit
+    def get_word_range(self):
+        return self.tools.word_finder.get_word_range(self.offset)
+
+    @utils.saveit
+    def get_primary_range(self):
+        return self.tools.word_finder.get_primary_range(self.offset)
+
+    @utils.saveit
+    def get_pyname(self):
+        try:
+            return self.tools.name_finder.get_pyname_at(self.offset)
+        except exceptions.BadIdentifierError:
+            pass
+
+    @utils.saveit
+    def get_primary_and_pyname(self):
+        try:
+            return self.tools.name_finder.get_primary_and_pyname_at(
+                self.offset)
+        except exceptions.BadIdentifierError:
+            pass
+
+    @utils.saveit
+    def is_in_import_statement(self):
+        return (self.tools.word_finder.is_from_statement(self.offset) or
+                self.tools.word_finder.is_import_statement(self.offset))
+
+    def is_called(self):
+        return self.tools.word_finder.is_a_function_being_called(self.offset)
+
+    def is_defined(self):
+        return self.tools.word_finder.is_a_class_or_function_name_in_header(
+            self.offset)
+
+    def is_a_fixed_primary(self):
+        return self.tools.word_finder.is_a_class_or_function_name_in_header(
+            self.offset) or \
+            self.tools.word_finder.is_a_name_after_from_import(self.offset)
+
+    def is_written(self):
+        return self.tools.word_finder.is_assigned_here(self.offset)
+
+    def is_unsure(self):
+        return unsure_pyname(self.get_pyname())
+
+    def is_function_keyword_parameter(self):
+        return self.tools.word_finder.is_function_keyword_parameter(
+            self.offset)
+
+    @property
+    @utils.saveit
+    def lineno(self):
+        offset = self.get_word_range()[0]
+        return self.tools.pymodule.lines.get_line_number(offset)
+
+
+def same_pyname(expected, pyname):
+    """Check whether `expected` and `pyname` are the same"""
+    if expected is None or pyname is None:
+        return False
+    if expected == pyname:
+        return True
+    if type(expected) not in (pynames.ImportedModule, pynames.ImportedName) \
+        and type(pyname) not in \
+            (pynames.ImportedModule, pynames.ImportedName):
+        return False
+    return expected.get_definition_location() == \
+        pyname.get_definition_location() and \
+        expected.get_object() == pyname.get_object()
+
+
+def unsure_pyname(pyname, unbound=True):
+    """Return `True` if we don't know what this name references"""
+    if pyname is None:
+        return True
+    if unbound and not isinstance(pyname, pynames.UnboundName):
+        return False
+    if pyname.get_object() == pyobjects.get_unknown():
+        return True
+
+
+class PyNameFilter(object):
+    """For finding occurrences of a name."""
+
+    def __init__(self, pyname):
+        self.pyname = pyname
+
+    def __call__(self, occurrence):
+        if same_pyname(self.pyname, occurrence.get_pyname()):
+            return True
+
+
+class InHierarchyFilter(object):
+    """Finds the occurrence if the name is in the class's hierarchy."""
+
+    def __init__(self, pyname, implementations_only=False):
+        self.pyname = pyname
+        self.impl_only = implementations_only
+        self.pyclass = self._get_containing_class(pyname)
+        if self.pyclass is not None:
+            self.name = pyname.get_object().get_name()
+            self.roots = self._get_root_classes(self.pyclass, self.name)
+        else:
+            self.roots = None
+
+    def __call__(self, occurrence):
+        if self.roots is None:
+            return
+        pyclass = self._get_containing_class(occurrence.get_pyname())
+        if pyclass is not None:
+            roots = self._get_root_classes(pyclass, self.name)
+            if self.roots.intersection(roots):
+                return True
+
+    def _get_containing_class(self, pyname):
+        if isinstance(pyname, pynames.DefinedName):
+            scope = pyname.get_object().get_scope()
+            parent = scope.parent
+            if parent is not None and parent.get_kind() == 'Class':
+                return parent.pyobject
+
+    def _get_root_classes(self, pyclass, name):
+        if self.impl_only and pyclass == self.pyclass:
+            return set([pyclass])
+        result = set()
+        for superclass in pyclass.get_superclasses():
+            if name in superclass:
+                result.update(self._get_root_classes(superclass, name))
+        if not result:
+            return set([pyclass])
+        return result
+
+
+class UnsureFilter(object):
+    """Occurrences where we don't knoow what the name references."""
+
+    def __init__(self, unsure):
+        self.unsure = unsure
+
+    def __call__(self, occurrence):
+        if occurrence.is_unsure() and self.unsure(occurrence):
+            return True
+
+
+class NoImportsFilter(object):
+    """Don't include import statements as occurrences."""
+
+    def __call__(self, occurrence):
+        if occurrence.is_in_import_statement():
+            return False
+
+
+class CallsFilter(object):
+    """Filter out non-call occurrences."""
+
+    def __call__(self, occurrence):
+        if not occurrence.is_called():
+            return False
+
+
+class NoKeywordsFilter(object):
+    """Filter out keyword parameters."""
+
+    def __call__(self, occurrence):
+        if occurrence.is_function_keyword_parameter():
+            return False
+
+
+class _TextualFinder(object):
+
+    def __init__(self, name, docs=False):
+        self.name = name
+        self.docs = docs
+        self.comment_pattern = _TextualFinder.any('comment', [r'#[^\n]*'])
+        self.string_pattern = _TextualFinder.any(
+            'string', [codeanalyze.get_string_pattern()])
+        self.pattern = self._get_occurrence_pattern(self.name)
+
+    def find_offsets(self, source):
+        if not self._fast_file_query(source):
+            return
+        if self.docs:
+            searcher = self._normal_search
+        else:
+            searcher = self._re_search
+        for matched in searcher(source):
+            yield matched
+
+    def _re_search(self, source):
+        for match in self.pattern.finditer(source):
+            for key, value in match.groupdict().items():
+                if value and key == 'occurrence':
+                    yield match.start(key)
+
+    def _normal_search(self, source):
+        current = 0
+        while True:
+            try:
+                found = source.index(self.name, current)
+                current = found + len(self.name)
+                if (found == 0 or
+                        not self._is_id_char(source[found - 1])) and \
+                    (current == len(source) or
+                        not self._is_id_char(source[current])):
+                    yield found
+            except ValueError:
+                break
+
+    def _is_id_char(self, c):
+        return c.isalnum() or c == '_'
+
+    def _fast_file_query(self, source):
+        try:
+            source.index(self.name)
+            return True
+        except ValueError:
+            return False
+
+    def _get_source(self, resource, pymodule):
+        if resource is not None:
+            return resource.read()
+        else:
+            return pymodule.source_code
+
+    def _get_occurrence_pattern(self, name):
+        occurrence_pattern = _TextualFinder.any('occurrence',
+                                                ['\\b' + name + '\\b'])
+        pattern = re.compile(occurrence_pattern + '|' + self.comment_pattern +
+                             '|' + self.string_pattern)
+        return pattern
+
+    @staticmethod
+    def any(name, list_):
+        return '(?P<%s>' % name + '|'.join(list_) + ')'
+
+
+class _OccurrenceToolsCreator(object):
+
+    def __init__(self, project, resource=None, pymodule=None, docs=False):
+        self.project = project
+        self.__resource = resource
+        self.__pymodule = pymodule
+        self.docs = docs
+
+    @property
+    @utils.saveit
+    def name_finder(self):
+        return evaluate.ScopeNameFinder(self.pymodule)
+
+    @property
+    @utils.saveit
+    def source_code(self):
+        if self.__resource is not None:
+            return self.resource.read()
+        else:
+            return self.pymodule.source_code
+
+    @property
+    @utils.saveit
+    def word_finder(self):
+        return worder.Worder(self.source_code, self.docs)
+
+    @property
+    @utils.saveit
+    def resource(self):
+        if self.__resource is not None:
+            return self.__resource
+        if self.__pymodule is not None:
+            return self.__pymodule.resource
+
+    @property
+    @utils.saveit
+    def pymodule(self):
+        if self.__pymodule is not None:
+            return self.__pymodule
+        return self.project.get_pymodule(self.resource)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/patchedast.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/patchedast.py
new file mode 100644
index 0000000..10f0a05
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/patchedast.py
@@ -0,0 +1,829 @@
+import collections
+import re
+import warnings
+
+from rope.base import ast, codeanalyze, exceptions
+from rope.base.utils import pycompat
+
+try:
+    basestring
+except NameError:
+    basestring = (str, bytes)
+
+
+def get_patched_ast(source, sorted_children=False):
+    """Adds ``region`` and ``sorted_children`` fields to nodes
+
+    Adds ``sorted_children`` field only if `sorted_children` is True.
+
+    """
+    return patch_ast(ast.parse(source), source, sorted_children)
+
+
+def patch_ast(node, source, sorted_children=False):
+    """Patches the given node
+
+    After calling, each node in `node` will have a new field named
+    `region` that is a tuple containing the start and end offsets
+    of the code that generated it.
+
+    If `sorted_children` is true, a `sorted_children` field will
+    be created for each node, too.  It is a list containing child
+    nodes as well as whitespaces and comments that occur between
+    them.
+
+    """
+    if hasattr(node, 'region'):
+        return node
+    walker = _PatchingASTWalker(source, children=sorted_children)
+    ast.call_for_nodes(node, walker)
+    return node
+
+
+def node_region(patched_ast_node):
+    """Get the region of a patched ast node"""
+    return patched_ast_node.region
+
+
+def write_ast(patched_ast_node):
+    """Extract source form a patched AST node with `sorted_children` field
+
+    If the node is patched with sorted_children turned off you can use
+    `node_region` function for obtaining code using module source code.
+    """
+    result = []
+    for child in patched_ast_node.sorted_children:
+        if isinstance(child, ast.AST):
+            result.append(write_ast(child))
+        else:
+            result.append(child)
+    return ''.join(result)
+
+
+class MismatchedTokenError(exceptions.RopeError):
+    pass
+
+
+class _PatchingASTWalker(object):
+
+    def __init__(self, source, children=False):
+        self.source = _Source(source)
+        self.children = children
+        self.lines = codeanalyze.SourceLinesAdapter(source)
+        self.children_stack = []
+
+    Number = object()
+    String = object()
+    semicolon_or_as_in_except = object()
+
+    def __call__(self, node):
+        method = getattr(self, '_' + node.__class__.__name__, None)
+        if method is not None:
+            return method(node)
+        # ???: Unknown node; what should we do here?
+        warnings.warn('Unknown node type <%s>; please report!'
+                      % node.__class__.__name__, RuntimeWarning)
+        node.region = (self.source.offset, self.source.offset)
+        if self.children:
+            node.sorted_children = ast.get_children(node)
+
+    def _handle(self, node, base_children, eat_parens=False, eat_spaces=False):
+        if hasattr(node, 'region'):
+            # ???: The same node was seen twice; what should we do?
+            warnings.warn(
+                'Node <%s> has been already patched; please report!' %
+                node.__class__.__name__, RuntimeWarning)
+            return
+        base_children = collections.deque(base_children)
+        self.children_stack.append(base_children)
+        children = collections.deque()
+        formats = []
+        suspected_start = self.source.offset
+        start = suspected_start
+        first_token = True
+        while base_children:
+            child = base_children.popleft()
+            if child is None:
+                continue
+            offset = self.source.offset
+            if isinstance(child, ast.AST):
+                ast.call_for_nodes(child, self)
+                token_start = child.region[0]
+            else:
+                if child is self.String:
+                    region = self.source.consume_string(
+                        end=self._find_next_statement_start())
+                elif child is self.Number:
+                    region = self.source.consume_number()
+                elif child == '!=':
+                    # INFO: This has been added to handle deprecated ``<>``
+                    region = self.source.consume_not_equal()
+                elif child == self.semicolon_or_as_in_except:
+                    # INFO: This has been added to handle deprecated
+                    # semicolon in except
+                    region = self.source.consume_except_as_or_semicolon()
+                else:
+                    region = self.source.consume(child)
+                child = self.source[region[0]:region[1]]
+                token_start = region[0]
+            if not first_token:
+                formats.append(self.source[offset:token_start])
+                if self.children:
+                    children.append(self.source[offset:token_start])
+            else:
+                first_token = False
+                start = token_start
+            if self.children:
+                children.append(child)
+        start = self._handle_parens(children, start, formats)
+        if eat_parens:
+            start = self._eat_surrounding_parens(
+                children, suspected_start, start)
+        if eat_spaces:
+            if self.children:
+                children.appendleft(self.source[0:start])
+            end_spaces = self.source[self.source.offset:]
+            self.source.consume(end_spaces)
+            if self.children:
+                children.append(end_spaces)
+            start = 0
+        if self.children:
+            node.sorted_children = children
+        node.region = (start, self.source.offset)
+        self.children_stack.pop()
+
+    def _handle_parens(self, children, start, formats):
+        """Changes `children` and returns new start"""
+        opens, closes = self._count_needed_parens(formats)
+        old_end = self.source.offset
+        new_end = None
+        for i in range(closes):
+            new_end = self.source.consume(')')[1]
+        if new_end is not None:
+            if self.children:
+                children.append(self.source[old_end:new_end])
+        new_start = start
+        for i in range(opens):
+            new_start = self.source.rfind_token('(', 0, new_start)
+        if new_start != start:
+            if self.children:
+                children.appendleft(self.source[new_start:start])
+            start = new_start
+        return start
+
+    def _eat_surrounding_parens(self, children, suspected_start, start):
+        index = self.source.rfind_token('(', suspected_start, start)
+        if index is not None:
+            old_start = start
+            old_offset = self.source.offset
+            start = index
+            if self.children:
+                children.appendleft(self.source[start + 1:old_start])
+                children.appendleft('(')
+            token_start, token_end = self.source.consume(')')
+            if self.children:
+                children.append(self.source[old_offset:token_start])
+                children.append(')')
+        return start
+
+    def _count_needed_parens(self, children):
+        start = 0
+        opens = 0
+        for child in children:
+            if not isinstance(child, basestring):
+                continue
+            if child == '' or child[0] in '\'"':
+                continue
+            index = 0
+            while index < len(child):
+                if child[index] == ')':
+                    if opens > 0:
+                        opens -= 1
+                    else:
+                        start += 1
+                if child[index] == '(':
+                    opens += 1
+                if child[index] == '#':
+                    try:
+                        index = child.index('\n', index)
+                    except ValueError:
+                        break
+                index += 1
+        return start, opens
+
+    def _find_next_statement_start(self):
+        for children in reversed(self.children_stack):
+            for child in children:
+                if isinstance(child, ast.stmt):
+                    return child.col_offset \
+                        + self.lines.get_line_start(child.lineno)
+        return len(self.source.source)
+
+    _operators = {'And': 'and', 'Or': 'or', 'Add': '+', 'Sub': '-',
+                  'Mult': '*', 'Div': '/', 'Mod': '%', 'Pow': '**',
+                  'LShift': '<<', 'RShift': '>>', 'BitOr': '|', 'BitAnd': '&',
+                  'BitXor': '^', 'FloorDiv': '//', 'Invert': '~',
+                  'Not': 'not', 'UAdd': '+', 'USub': '-', 'Eq': '==',
+                  'NotEq': '!=', 'Lt': '<', 'LtE': '<=', 'Gt': '>',
+                  'GtE': '>=', 'Is': 'is', 'IsNot': 'is not', 'In': 'in',
+                  'NotIn': 'not in'}
+
+    def _get_op(self, node):
+        return self._operators[node.__class__.__name__].split(' ')
+
+    def _Attribute(self, node):
+        self._handle(node, [node.value, '.', node.attr])
+
+    def _Assert(self, node):
+        children = ['assert', node.test]
+        if node.msg:
+            children.append(',')
+            children.append(node.msg)
+        self._handle(node, children)
+
+    def _Assign(self, node):
+        children = self._child_nodes(node.targets, '=')
+        children.append('=')
+        children.append(node.value)
+        self._handle(node, children)
+
+    def _AugAssign(self, node):
+        children = [node.target]
+        children.extend(self._get_op(node.op))
+        children.extend(['=', node.value])
+        self._handle(node, children)
+
+    def _Repr(self, node):
+        self._handle(node, ['`', node.value, '`'])
+
+    def _BinOp(self, node):
+        children = [node.left] + self._get_op(node.op) + [node.right]
+        self._handle(node, children)
+
+    def _BoolOp(self, node):
+        self._handle(node, self._child_nodes(node.values,
+                                             self._get_op(node.op)[0]))
+
+    def _Break(self, node):
+        self._handle(node, ['break'])
+
+    def _Call(self, node):
+        children = [node.func, '(']
+        args = list(node.args) + node.keywords
+        children.extend(self._child_nodes(args, ','))
+        if getattr(node, 'starargs', None):
+            if args:
+                children.append(',')
+            children.extend(['*', node.starargs])
+        if getattr(node, 'kwargs', None):
+            if args or node.starargs is not None:
+                children.append(',')
+            children.extend(['**', node.kwargs])
+        children.append(')')
+        self._handle(node, children)
+
+    def _ClassDef(self, node):
+        children = []
+        if getattr(node, 'decorator_list', None):
+            for decorator in node.decorator_list:
+                children.append('@')
+                children.append(decorator)
+        children.extend(['class', node.name])
+        if node.bases:
+            children.append('(')
+            children.extend(self._child_nodes(node.bases, ','))
+            children.append(')')
+        children.append(':')
+        children.extend(node.body)
+        self._handle(node, children)
+
+    def _Compare(self, node):
+        children = []
+        children.append(node.left)
+        for op, expr in zip(node.ops, node.comparators):
+            children.extend(self._get_op(op))
+            children.append(expr)
+        self._handle(node, children)
+
+    def _Delete(self, node):
+        self._handle(node, ['del'] + self._child_nodes(node.targets, ','))
+
+    def _Num(self, node):
+        self._handle(node, [self.Number])
+
+    def _Str(self, node):
+        self._handle(node, [self.String])
+
+    def _Continue(self, node):
+        self._handle(node, ['continue'])
+
+    def _Dict(self, node):
+        children = []
+        children.append('{')
+        if node.keys:
+            for index, (key, value) in enumerate(zip(node.keys, node.values)):
+                children.extend([key, ':', value])
+                if index < len(node.keys) - 1:
+                    children.append(',')
+        children.append('}')
+        self._handle(node, children)
+
+    def _Ellipsis(self, node):
+        self._handle(node, ['...'])
+
+    def _Expr(self, node):
+        self._handle(node, [node.value])
+
+    def _Exec(self, node):
+        children = []
+        children.extend(['exec', node.body])
+        if node.globals:
+            children.extend(['in', node.globals])
+        if node.locals:
+            children.extend([',', node.locals])
+        self._handle(node, children)
+
+    def _ExtSlice(self, node):
+        children = []
+        for index, dim in enumerate(node.dims):
+            if index > 0:
+                children.append(',')
+            children.append(dim)
+        self._handle(node, children)
+
+    def _For(self, node):
+        children = ['for', node.target, 'in', node.iter, ':']
+        children.extend(node.body)
+        if node.orelse:
+            children.extend(['else', ':'])
+            children.extend(node.orelse)
+        self._handle(node, children)
+
+    def _ImportFrom(self, node):
+        children = ['from']
+        if node.level:
+            children.append('.' * node.level)
+        # see comment at rope.base.ast.walk
+        children.extend([node.module or '',
+                         'import'])
+        children.extend(self._child_nodes(node.names, ','))
+        self._handle(node, children)
+
+    def _alias(self, node):
+        children = [node.name]
+        if node.asname:
+            children.extend(['as', node.asname])
+        self._handle(node, children)
+
+    def _FunctionDef(self, node):
+        children = []
+        try:
+            decorators = getattr(node, 'decorator_list')
+        except AttributeError:
+            decorators = getattr(node, 'decorators', None)
+        if decorators:
+            for decorator in decorators:
+                children.append('@')
+                children.append(decorator)
+        children.extend(['def', node.name, '(', node.args])
+        children.extend([')', ':'])
+        children.extend(node.body)
+        self._handle(node, children)
+
+    def _arguments(self, node):
+        children = []
+        args = list(node.args)
+        defaults = [None] * (len(args) - len(node.defaults)) + \
+            list(node.defaults)
+        for index, (arg, default) in enumerate(zip(args, defaults)):
+            if index > 0:
+                children.append(',')
+            self._add_args_to_children(children, arg, default)
+        if node.vararg is not None:
+            if args:
+                children.append(',')
+            children.extend(['*', pycompat.get_ast_arg_arg(node.vararg)])
+        if node.kwarg is not None:
+            if args or node.vararg is not None:
+                children.append(',')
+            children.extend(['**', pycompat.get_ast_arg_arg(node.kwarg)])
+        self._handle(node, children)
+
+    def _add_args_to_children(self, children, arg, default):
+        if isinstance(arg, (list, tuple)):
+            self._add_tuple_parameter(children, arg)
+        else:
+            children.append(arg)
+        if default is not None:
+            children.append('=')
+            children.append(default)
+
+    def _add_tuple_parameter(self, children, arg):
+        children.append('(')
+        for index, token in enumerate(arg):
+            if index > 0:
+                children.append(',')
+            if isinstance(token, (list, tuple)):
+                self._add_tuple_parameter(children, token)
+            else:
+                children.append(token)
+        children.append(')')
+
+    def _GeneratorExp(self, node):
+        children = [node.elt]
+        children.extend(node.generators)
+        self._handle(node, children, eat_parens=True)
+
+    def _comprehension(self, node):
+        children = ['for', node.target, 'in', node.iter]
+        if node.ifs:
+            for if_ in node.ifs:
+                children.append('if')
+                children.append(if_)
+        self._handle(node, children)
+
+    def _Global(self, node):
+        children = self._child_nodes(node.names, ',')
+        children.insert(0, 'global')
+        self._handle(node, children)
+
+    def _If(self, node):
+        if self._is_elif(node):
+            children = ['elif']
+        else:
+            children = ['if']
+        children.extend([node.test, ':'])
+        children.extend(node.body)
+        if node.orelse:
+            if len(node.orelse) == 1 and self._is_elif(node.orelse[0]):
+                pass
+            else:
+                children.extend(['else', ':'])
+            children.extend(node.orelse)
+        self._handle(node, children)
+
+    def _is_elif(self, node):
+        if not isinstance(node, ast.If):
+            return False
+        offset = self.lines.get_line_start(node.lineno) + node.col_offset
+        word = self.source[offset:offset + 4]
+        # XXX: This is a bug; the offset does not point to the first
+        alt_word = self.source[offset - 5:offset - 1]
+        return 'elif' in (word, alt_word)
+
+    def _IfExp(self, node):
+        return self._handle(node, [node.body, 'if', node.test,
+                                   'else', node.orelse])
+
+    def _Import(self, node):
+        children = ['import']
+        children.extend(self._child_nodes(node.names, ','))
+        self._handle(node, children)
+
+    def _keyword(self, node):
+        children = []
+        if node.arg is None:
+            children.append(node.value)
+        else:
+            children.extend([node.arg, '=', node.value])
+        self._handle(node, children)
+
+    def _Lambda(self, node):
+        self._handle(node, ['lambda', node.args, ':', node.body])
+
+    def _List(self, node):
+        self._handle(node, ['['] + self._child_nodes(node.elts, ',') + [']'])
+
+    def _ListComp(self, node):
+        children = ['[', node.elt]
+        children.extend(node.generators)
+        children.append(']')
+        self._handle(node, children)
+
+    def _Set(self, node):
+        if node.elts:
+            self._handle(node,
+                         ['{'] + self._child_nodes(node.elts, ',') + ['}'])
+            return
+        # Python doesn't have empty set literals
+        warnings.warn('Tried to handle empty <Set> literal; please report!',
+                      RuntimeWarning)
+        self._handle(node, ['set(', ')'])
+
+    def _SetComp(self, node):
+        children = ['{', node.elt]
+        children.extend(node.generators)
+        children.append('}')
+        self._handle(node, children)
+
+    def _DictComp(self, node):
+        children = ['{']
+        children.extend([node.key, ':', node.value])
+        children.extend(node.generators)
+        children.append('}')
+        self._handle(node, children)
+
+    def _Module(self, node):
+        self._handle(node, list(node.body), eat_spaces=True)
+
+    def _Name(self, node):
+        self._handle(node, [node.id])
+
+    def _NameConstant(self, node):
+        self._handle(node, [str(node.value)])
+
+    def _arg(self, node):
+        self._handle(node, [node.arg])
+
+    def _Pass(self, node):
+        self._handle(node, ['pass'])
+
+    def _Print(self, node):
+        children = ['print']
+        if node.dest:
+            children.extend(['>>', node.dest])
+            if node.values:
+                children.append(',')
+        children.extend(self._child_nodes(node.values, ','))
+        if not node.nl:
+            children.append(',')
+        self._handle(node, children)
+
+    def _Raise(self, node):
+
+        def get_python3_raise_children(node):
+            children = ['raise']
+            if node.exc:
+                children.append(node.exc)
+            if node.cause:
+                children.append(node.cause)
+            return children
+
+        def get_python2_raise_children(node):
+            children = ['raise']
+            if node.type:
+                children.append(node.type)
+            if node.inst:
+                children.append(',')
+                children.append(node.inst)
+            if node.tback:
+                children.append(',')
+                children.append(node.tback)
+            return children
+        if pycompat.PY2:
+            children = get_python2_raise_children(node)
+        else:
+            children = get_python3_raise_children(node)
+        self._handle(node, children)
+
+    def _Return(self, node):
+        children = ['return']
+        if node.value:
+            children.append(node.value)
+        self._handle(node, children)
+
+    def _Sliceobj(self, node):
+        children = []
+        for index, slice in enumerate(node.nodes):
+            if index > 0:
+                children.append(':')
+            if slice:
+                children.append(slice)
+        self._handle(node, children)
+
+    def _Index(self, node):
+        self._handle(node, [node.value])
+
+    def _Subscript(self, node):
+        self._handle(node, [node.value, '[', node.slice, ']'])
+
+    def _Slice(self, node):
+        children = []
+        if node.lower:
+            children.append(node.lower)
+        children.append(':')
+        if node.upper:
+            children.append(node.upper)
+        if node.step:
+            children.append(':')
+            children.append(node.step)
+        self._handle(node, children)
+
+    def _TryFinally(self, node):
+        # @todo fixme
+        is_there_except_handler = False
+        not_empty_body = True
+        if len(node.finalbody) == 1:
+            if pycompat.PY2:
+                is_there_except_handler = isinstance(node.body[0], ast.TryExcept)
+                not_empty_body = not bool(len(node.body))
+            elif pycompat.PY3:
+                try:
+                    is_there_except_handler = isinstance(node.handlers[0], ast.ExceptHandler)
+                    not_empty_body = True
+                except IndexError:
+                    pass
+        children = []
+        if not_empty_body or not is_there_except_handler:
+            children.extend(['try', ':'])
+        children.extend(node.body)
+        if pycompat.PY3:
+            children.extend(node.handlers)
+        children.extend(['finally', ':'])
+        children.extend(node.finalbody)
+        self._handle(node, children)
+
+    def _TryExcept(self, node):
+        children = ['try', ':']
+        children.extend(node.body)
+        children.extend(node.handlers)
+        if node.orelse:
+            children.extend(['else', ':'])
+            children.extend(node.orelse)
+        self._handle(node, children)
+
+    def _Try(self, node):
+        if len(node.finalbody):
+            self._TryFinally(node)
+        else:
+            self._TryExcept(node)
+
+    def _ExceptHandler(self, node):
+        self._excepthandler(node)
+
+    def _excepthandler(self, node):
+        # self._handle(node, [self.semicolon_or_as_in_except])
+        children = ['except']
+        if node.type:
+            children.append(node.type)
+        if node.name:
+            children.append(self.semicolon_or_as_in_except)
+            children.append(node.name)
+        children.append(':')
+        children.extend(node.body)
+
+        self._handle(node, children)
+
+    def _Tuple(self, node):
+        if node.elts:
+            self._handle(node, self._child_nodes(node.elts, ','),
+                         eat_parens=True)
+        else:
+            self._handle(node, ['(', ')'])
+
+    def _UnaryOp(self, node):
+        children = self._get_op(node.op)
+        children.append(node.operand)
+        self._handle(node, children)
+
+    def _Yield(self, node):
+        children = ['yield']
+        if node.value:
+            children.append(node.value)
+        self._handle(node, children)
+
+    def _While(self, node):
+        children = ['while', node.test, ':']
+        children.extend(node.body)
+        if node.orelse:
+            children.extend(['else', ':'])
+            children.extend(node.orelse)
+        self._handle(node, children)
+
+    def _With(self, node):
+        children = []
+        for item in pycompat.get_ast_with_items(node):
+            children.extend(['with', item.context_expr])
+            if item.optional_vars:
+                children.extend(['as', item.optional_vars])
+        children.append(':')
+        children.extend(node.body)
+        self._handle(node, children)
+
+    def _child_nodes(self, nodes, separator):
+        children = []
+        for index, child in enumerate(nodes):
+            children.append(child)
+            if index < len(nodes) - 1:
+                children.append(separator)
+        return children
+
+    def _Starred(self, node):
+        self._handle(node, [node.value])
+
+class _Source(object):
+
+    def __init__(self, source):
+        self.source = source
+        self.offset = 0
+
+    def consume(self, token):
+        try:
+            while True:
+                new_offset = self.source.index(token, self.offset)
+                if self._good_token(token, new_offset):
+                    break
+                else:
+                    self._skip_comment()
+        except (ValueError, TypeError):
+            raise MismatchedTokenError(
+                'Token <%s> at %s cannot be matched' %
+                (token, self._get_location()))
+        self.offset = new_offset + len(token)
+        return (new_offset, self.offset)
+
+    def consume_string(self, end=None):
+        if _Source._string_pattern is None:
+            original = codeanalyze.get_string_pattern()
+            pattern = r'(%s)((\s|\\\n|#[^\n]*\n)*(%s))*' % \
+                      (original, original)
+            _Source._string_pattern = re.compile(pattern)
+        repattern = _Source._string_pattern
+        return self._consume_pattern(repattern, end)
+
+    def consume_number(self):
+        if _Source._number_pattern is None:
+            _Source._number_pattern = re.compile(
+                self._get_number_pattern())
+        repattern = _Source._number_pattern
+        return self._consume_pattern(repattern)
+
+    def consume_not_equal(self):
+        if _Source._not_equals_pattern is None:
+            _Source._not_equals_pattern = re.compile(r'<>|!=')
+        repattern = _Source._not_equals_pattern
+        return self._consume_pattern(repattern)
+
+    def consume_except_as_or_semicolon(self):
+        repattern = re.compile(r'as|,')
+        return self._consume_pattern(repattern)
+
+    def _good_token(self, token, offset, start=None):
+        """Checks whether consumed token is in comments"""
+        if start is None:
+            start = self.offset
+        try:
+            comment_index = self.source.rindex('#', start, offset)
+        except ValueError:
+            return True
+        try:
+            new_line_index = self.source.rindex('\n', start, offset)
+        except ValueError:
+            return False
+        return comment_index < new_line_index
+
+    def _skip_comment(self):
+        self.offset = self.source.index('\n', self.offset + 1)
+
+    def _get_location(self):
+        lines = self.source[:self.offset].split('\n')
+        return (len(lines), len(lines[-1]))
+
+    def _consume_pattern(self, repattern, end=None):
+        while True:
+            if end is None:
+                end = len(self.source)
+            match = repattern.search(self.source, self.offset, end)
+            if self._good_token(match.group(), match.start()):
+                break
+            else:
+                self._skip_comment()
+        self.offset = match.end()
+        return match.start(), match.end()
+
+    def till_token(self, token):
+        new_offset = self.source.index(token, self.offset)
+        return self[self.offset:new_offset]
+
+    def rfind_token(self, token, start, end):
+        index = start
+        while True:
+            try:
+                index = self.source.rindex(token, start, end)
+                if self._good_token(token, index, start=start):
+                    return index
+                else:
+                    end = index
+            except ValueError:
+                return None
+
+    def from_offset(self, offset):
+        return self[offset:self.offset]
+
+    def find_backwards(self, pattern, offset):
+        return self.source.rindex(pattern, 0, offset)
+
+    def __getitem__(self, index):
+        return self.source[index]
+
+    def __getslice__(self, i, j):
+        return self.source[i:j]
+
+    def _get_number_pattern(self):
+        # HACK: It is merely an approaximation and does the job
+        integer = r'\-?(0x[\da-fA-F]+|\d+)[lL]?'
+        return r'(%s(\.\d*)?|(\.\d+))([eE][-+]?\d+)?[jJ]?' % integer
+
+    _string_pattern = None
+    _number_pattern = None
+    _not_equals_pattern = None
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/rename.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/rename.py
new file mode 100644
index 0000000..3f1f5b7
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/rename.py
@@ -0,0 +1,220 @@
+import warnings
+
+from rope.base import (exceptions, pyobjects, pynames, taskhandle,
+                       evaluate, worder, codeanalyze, libutils)
+from rope.base.change import ChangeSet, ChangeContents, MoveResource
+from rope.refactor import occurrences
+
+
+class Rename(object):
+    """A class for performing rename refactoring
+
+    It can rename everything: classes, functions, modules, packages,
+    methods, variables and keyword arguments.
+
+    """
+
+    def __init__(self, project, resource, offset=None):
+        """If `offset` is None, the `resource` itself will be renamed"""
+        self.project = project
+        self.resource = resource
+        if offset is not None:
+            self.old_name = worder.get_name_at(self.resource, offset)
+            this_pymodule = self.project.get_pymodule(self.resource)
+            self.old_instance, self.old_pyname = \
+                evaluate.eval_location2(this_pymodule, offset)
+            if self.old_pyname is None:
+                raise exceptions.RefactoringError(
+                    'Rename refactoring should be performed'
+                    ' on resolvable python identifiers.')
+        else:
+            if not resource.is_folder() and resource.name == '__init__.py':
+                resource = resource.parent
+            dummy_pymodule = libutils.get_string_module(self.project, '')
+            self.old_instance = None
+            self.old_pyname = pynames.ImportedModule(dummy_pymodule,
+                                                     resource=resource)
+            if resource.is_folder():
+                self.old_name = resource.name
+            else:
+                self.old_name = resource.name[:-3]
+
+    def get_old_name(self):
+        return self.old_name
+
+    def get_changes(self, new_name, in_file=None, in_hierarchy=False,
+                    unsure=None, docs=False, resources=None,
+                    task_handle=taskhandle.NullTaskHandle()):
+        """Get the changes needed for this refactoring
+
+        Parameters:
+
+        - `in_hierarchy`: when renaming a method this keyword forces
+          to rename all matching methods in the hierarchy
+        - `docs`: when `True` rename refactoring will rename
+          occurrences in comments and strings where the name is
+          visible.  Setting it will make renames faster, too.
+        - `unsure`: decides what to do about unsure occurrences.
+          If `None`, they are ignored.  Otherwise `unsure` is
+          called with an instance of `occurrence.Occurrence` as
+          parameter.  If it returns `True`, the occurrence is
+          considered to be a match.
+        - `resources` can be a list of `rope.base.resources.File`\s to
+          apply this refactoring on.  If `None`, the restructuring
+          will be applied to all python files.
+        - `in_file`: this argument has been deprecated; use
+          `resources` instead.
+
+        """
+        if unsure in (True, False):
+            warnings.warn(
+                'unsure parameter should be a function that returns '
+                'True or False', DeprecationWarning, stacklevel=2)
+
+            def unsure_func(value=unsure):
+                return value
+            unsure = unsure_func
+        if in_file is not None:
+            warnings.warn(
+                '`in_file` argument has been deprecated; use `resources` '
+                'instead. ', DeprecationWarning, stacklevel=2)
+            if in_file:
+                resources = [self.resource]
+        if _is_local(self.old_pyname):
+            resources = [self.resource]
+        if resources is None:
+            resources = self.project.get_python_files()
+        changes = ChangeSet('Renaming <%s> to <%s>' %
+                            (self.old_name, new_name))
+        finder = occurrences.create_finder(
+            self.project, self.old_name, self.old_pyname, unsure=unsure,
+            docs=docs, instance=self.old_instance,
+            in_hierarchy=in_hierarchy and self.is_method())
+        job_set = task_handle.create_jobset('Collecting Changes',
+                                            len(resources))
+        for file_ in resources:
+            job_set.started_job(file_.path)
+            new_content = rename_in_module(finder, new_name, resource=file_)
+            if new_content is not None:
+                changes.add_change(ChangeContents(file_, new_content))
+            job_set.finished_job()
+        if self._is_renaming_a_module():
+            resource = self.old_pyname.get_object().get_resource()
+            if self._is_allowed_to_move(resources, resource):
+                self._rename_module(resource, new_name, changes)
+        return changes
+
+    def _is_allowed_to_move(self, resources, resource):
+        if resource.is_folder():
+            try:
+                return resource.get_child('__init__.py') in resources
+            except exceptions.ResourceNotFoundError:
+                return False
+        else:
+            return resource in resources
+
+    def _is_renaming_a_module(self):
+        if isinstance(self.old_pyname.get_object(), pyobjects.AbstractModule):
+            return True
+        return False
+
+    def is_method(self):
+        pyname = self.old_pyname
+        return isinstance(pyname, pynames.DefinedName) and \
+            isinstance(pyname.get_object(), pyobjects.PyFunction) and \
+            isinstance(pyname.get_object().parent, pyobjects.PyClass)
+
+    def _rename_module(self, resource, new_name, changes):
+        if not resource.is_folder():
+            new_name = new_name + '.py'
+        parent_path = resource.parent.path
+        if parent_path == '':
+            new_location = new_name
+        else:
+            new_location = parent_path + '/' + new_name
+        changes.add_change(MoveResource(resource, new_location))
+
+
+class ChangeOccurrences(object):
+    """A class for changing the occurrences of a name in a scope
+
+    This class replaces the occurrences of a name.  Note that it only
+    changes the scope containing the offset passed to the constructor.
+    What's more it does not have any side-effects.  That is for
+    example changing occurrences of a module does not rename the
+    module; it merely replaces the occurrences of that module in a
+    scope with the given expression.  This class is useful for
+    performing many custom refactorings.
+
+    """
+
+    def __init__(self, project, resource, offset):
+        self.project = project
+        self.resource = resource
+        self.offset = offset
+        self.old_name = worder.get_name_at(resource, offset)
+        self.pymodule = project.get_pymodule(self.resource)
+        self.old_pyname = evaluate.eval_location(self.pymodule, offset)
+
+    def get_old_name(self):
+        word_finder = worder.Worder(self.resource.read())
+        return word_finder.get_primary_at(self.offset)
+
+    def _get_scope_offset(self):
+        lines = self.pymodule.lines
+        scope = self.pymodule.get_scope().\
+            get_inner_scope_for_line(lines.get_line_number(self.offset))
+        start = lines.get_line_start(scope.get_start())
+        end = lines.get_line_end(scope.get_end())
+        return start, end
+
+    def get_changes(self, new_name, only_calls=False, reads=True, writes=True):
+        changes = ChangeSet('Changing <%s> occurrences to <%s>' %
+                            (self.old_name, new_name))
+        scope_start, scope_end = self._get_scope_offset()
+        finder = occurrences.create_finder(
+            self.project, self.old_name, self.old_pyname,
+            imports=False, only_calls=only_calls)
+        new_contents = rename_in_module(
+            finder, new_name, pymodule=self.pymodule, replace_primary=True,
+            region=(scope_start, scope_end), reads=reads, writes=writes)
+        if new_contents is not None:
+            changes.add_change(ChangeContents(self.resource, new_contents))
+        return changes
+
+
+def rename_in_module(occurrences_finder, new_name, resource=None,
+                     pymodule=None, replace_primary=False, region=None,
+                     reads=True, writes=True):
+    """Returns the changed source or `None` if there is no changes"""
+    if resource is not None:
+        source_code = resource.read()
+    else:
+        source_code = pymodule.source_code
+    change_collector = codeanalyze.ChangeCollector(source_code)
+    for occurrence in occurrences_finder.find_occurrences(resource, pymodule):
+        if replace_primary and occurrence.is_a_fixed_primary():
+            continue
+        if replace_primary:
+            start, end = occurrence.get_primary_range()
+        else:
+            start, end = occurrence.get_word_range()
+        if (not reads and not occurrence.is_written()) or \
+           (not writes and occurrence.is_written()):
+            continue
+        if region is None or region[0] <= start < region[1]:
+            change_collector.add_change(start, end, new_name)
+    return change_collector.get_changed()
+
+
+def _is_local(pyname):
+    module, lineno = pyname.get_definition_location()
+    if lineno is None:
+        return False
+    scope = module.get_scope().get_inner_scope_for_line(lineno)
+    if isinstance(pyname, pynames.DefinedName) and \
+       scope.get_kind() in ('Function', 'Class'):
+        scope = scope.parent
+    return scope.get_kind() == 'Function' and \
+        pyname in scope.get_names().values() and \
+        isinstance(pyname, pynames.AssignedName)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/restructure.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/restructure.py
new file mode 100644
index 0000000..98a11e3
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/restructure.py
@@ -0,0 +1,307 @@
+import warnings
+
+from rope.base import change, taskhandle, builtins, ast, codeanalyze
+from rope.base import libutils
+from rope.refactor import patchedast, similarfinder, sourceutils
+from rope.refactor.importutils import module_imports
+
+
+class Restructure(object):
+    """A class to perform python restructurings
+
+    A restructuring transforms pieces of code matching `pattern` to
+    `goal`.  In the `pattern` wildcards can appear.  Wildcards match
+    some piece of code based on their kind and arguments that are
+    passed to them through `args`.
+
+    `args` is a dictionary of wildcard names to wildcard arguments.
+    If the argument is a tuple, the first item of the tuple is
+    considered to be the name of the wildcard to use; otherwise the
+    "default" wildcard is used.  For getting the list arguments a
+    wildcard supports, see the pydoc of the wildcard.  (see
+    `rope.refactor.wildcard.DefaultWildcard` for the default
+    wildcard.)
+
+    `wildcards` is the list of wildcard types that can appear in
+    `pattern`.  See `rope.refactor.wildcards`.  If a wildcard does not
+    specify its kind (by using a tuple in args), the wildcard named
+    "default" is used.  So there should be a wildcard with "default"
+    name in `wildcards`.
+
+    `imports` is the list of imports that changed modules should
+    import.  Note that rope handles duplicate imports and does not add
+    the import if it already appears.
+
+    Example #1::
+
+      pattern ${pyobject}.get_attribute(${name})
+      goal ${pyobject}[${name}]
+      args pyobject: instance=rope.base.pyobjects.PyObject
+
+    Example #2::
+
+      pattern ${name} in ${pyobject}.get_attributes()
+      goal ${name} in {pyobject}
+      args pyobject: instance=rope.base.pyobjects.PyObject
+
+    Example #3::
+
+      pattern ${pycore}.create_module(${project}.root, ${name})
+      goal generate.create_module(${project}, ${name})
+
+      imports
+       from rope.contrib import generate
+
+      args
+       project: type=rope.base.project.Project
+
+    Example #4::
+
+      pattern ${pow}(${param1}, ${param2})
+      goal ${param1} ** ${param2}
+      args pow: name=mod.pow, exact
+
+    Example #5::
+
+      pattern ${inst}.longtask(${p1}, ${p2})
+      goal
+       ${inst}.subtask1(${p1})
+       ${inst}.subtask2(${p2})
+      args
+       inst: type=mod.A,unsure
+
+    """
+
+    def __init__(self, project, pattern, goal, args=None,
+                 imports=None, wildcards=None):
+        """Construct a restructuring
+
+        See class pydoc for more info about the arguments.
+
+        """
+        self.project = project
+        self.pattern = pattern
+        self.goal = goal
+        self.args = args
+        if self.args is None:
+            self.args = {}
+        self.imports = imports
+        if self.imports is None:
+            self.imports = []
+        self.wildcards = wildcards
+        self.template = similarfinder.CodeTemplate(self.goal)
+
+    def get_changes(self, checks=None, imports=None, resources=None,
+                    task_handle=taskhandle.NullTaskHandle()):
+        """Get the changes needed by this restructuring
+
+        `resources` can be a list of `rope.base.resources.File`\s to
+        apply the restructuring on.  If `None`, the restructuring will
+        be applied to all python files.
+
+        `checks` argument has been deprecated.  Use the `args` argument
+        of the constructor.  The usage of::
+
+          strchecks = {'obj1.type': 'mod.A', 'obj2': 'mod.B',
+                       'obj3.object': 'mod.C'}
+          checks = restructuring.make_checks(strchecks)
+
+        can be replaced with::
+
+          args = {'obj1': 'type=mod.A', 'obj2': 'name=mod.B',
+                  'obj3': 'object=mod.C'}
+
+        where obj1, obj2 and obj3 are wildcard names that appear
+        in restructuring pattern.
+
+        """
+        if checks is not None:
+            warnings.warn(
+                'The use of checks parameter is deprecated; '
+                'use the args parameter of the constructor instead.',
+                DeprecationWarning, stacklevel=2)
+            for name, value in checks.items():
+                self.args[name] = similarfinder._pydefined_to_str(value)
+        if imports is not None:
+            warnings.warn(
+                'The use of imports parameter is deprecated; '
+                'use imports parameter of the constructor, instead.',
+                DeprecationWarning, stacklevel=2)
+            self.imports = imports
+        changes = change.ChangeSet('Restructuring <%s> to <%s>' %
+                                   (self.pattern, self.goal))
+        if resources is not None:
+            files = [resource for resource in resources
+                     if libutils.is_python_file(self.project, resource)]
+        else:
+            files = self.project.get_python_files()
+        job_set = task_handle.create_jobset('Collecting Changes', len(files))
+        for resource in files:
+            job_set.started_job(resource.path)
+            pymodule = self.project.get_pymodule(resource)
+            finder = similarfinder.SimilarFinder(pymodule,
+                                                 wildcards=self.wildcards)
+            matches = list(finder.get_matches(self.pattern, self.args))
+            computer = self._compute_changes(matches, pymodule)
+            result = computer.get_changed()
+            if result is not None:
+                imported_source = self._add_imports(resource, result,
+                                                    self.imports)
+                changes.add_change(change.ChangeContents(resource,
+                                                         imported_source))
+            job_set.finished_job()
+        return changes
+
+    def _compute_changes(self, matches, pymodule):
+        return _ChangeComputer(
+            pymodule.source_code, pymodule.get_ast(),
+            pymodule.lines, self.template, matches)
+
+    def _add_imports(self, resource, source, imports):
+        if not imports:
+            return source
+        import_infos = self._get_import_infos(resource, imports)
+        pymodule = libutils.get_string_module(self.project, source, resource)
+        imports = module_imports.ModuleImports(self.project, pymodule)
+        for import_info in import_infos:
+            imports.add_import(import_info)
+        return imports.get_changed_source()
+
+    def _get_import_infos(self, resource, imports):
+        pymodule = libutils.get_string_module(
+            self.project, '\n'.join(imports), resource)
+        imports = module_imports.ModuleImports(self.project, pymodule)
+        return [imports.import_info
+                for imports in imports.imports]
+
+    def make_checks(self, string_checks):
+        """Convert str to str dicts to str to PyObject dicts
+
+        This function is here to ease writing a UI.
+
+        """
+        checks = {}
+        for key, value in string_checks.items():
+            is_pyname = not key.endswith('.object') and \
+                not key.endswith('.type')
+            evaluated = self._evaluate(value, is_pyname=is_pyname)
+            if evaluated is not None:
+                checks[key] = evaluated
+        return checks
+
+    def _evaluate(self, code, is_pyname=True):
+        attributes = code.split('.')
+        pyname = None
+        if attributes[0] in ('__builtin__', '__builtins__'):
+            class _BuiltinsStub(object):
+                def get_attribute(self, name):
+                    return builtins.builtins[name]
+            pyobject = _BuiltinsStub()
+        else:
+            pyobject = self.project.get_module(attributes[0])
+        for attribute in attributes[1:]:
+            pyname = pyobject[attribute]
+            if pyname is None:
+                return None
+            pyobject = pyname.get_object()
+        return pyname if is_pyname else pyobject
+
+
+def replace(code, pattern, goal):
+    """used by other refactorings"""
+    finder = similarfinder.RawSimilarFinder(code)
+    matches = list(finder.get_matches(pattern))
+    ast = patchedast.get_patched_ast(code)
+    lines = codeanalyze.SourceLinesAdapter(code)
+    template = similarfinder.CodeTemplate(goal)
+    computer = _ChangeComputer(code, ast, lines, template, matches)
+    result = computer.get_changed()
+    if result is None:
+        return code
+    return result
+
+
+class _ChangeComputer(object):
+
+    def __init__(self, code, ast, lines, goal, matches):
+        self.source = code
+        self.goal = goal
+        self.matches = matches
+        self.ast = ast
+        self.lines = lines
+        self.matched_asts = {}
+        self._nearest_roots = {}
+        if self._is_expression():
+            for match in self.matches:
+                self.matched_asts[match.ast] = match
+
+    def get_changed(self):
+        if self._is_expression():
+            result = self._get_node_text(self.ast)
+            if result == self.source:
+                return None
+            return result
+        else:
+            collector = codeanalyze.ChangeCollector(self.source)
+            last_end = -1
+            for match in self.matches:
+                start, end = match.get_region()
+                if start < last_end:
+                    if not self._is_expression():
+                        continue
+                last_end = end
+                replacement = self._get_matched_text(match)
+                collector.add_change(start, end, replacement)
+            return collector.get_changed()
+
+    def _is_expression(self):
+        return self.matches and isinstance(self.matches[0],
+                                           similarfinder.ExpressionMatch)
+
+    def _get_matched_text(self, match):
+        mapping = {}
+        for name in self.goal.get_names():
+            node = match.get_ast(name)
+            if node is None:
+                raise similarfinder.BadNameInCheckError(
+                    'Unknown name <%s>' % name)
+            force = self._is_expression() and match.ast == node
+            mapping[name] = self._get_node_text(node, force)
+        unindented = self.goal.substitute(mapping)
+        return self._auto_indent(match.get_region()[0], unindented)
+
+    def _get_node_text(self, node, force=False):
+        if not force and node in self.matched_asts:
+            return self._get_matched_text(self.matched_asts[node])
+        start, end = patchedast.node_region(node)
+        main_text = self.source[start:end]
+        collector = codeanalyze.ChangeCollector(main_text)
+        for node in self._get_nearest_roots(node):
+            sub_start, sub_end = patchedast.node_region(node)
+            collector.add_change(sub_start - start, sub_end - start,
+                                 self._get_node_text(node))
+        result = collector.get_changed()
+        if result is None:
+            return main_text
+        return result
+
+    def _auto_indent(self, offset, text):
+        lineno = self.lines.get_line_number(offset)
+        indents = sourceutils.get_indents(self.lines, lineno)
+        result = []
+        for index, line in enumerate(text.splitlines(True)):
+            if index != 0 and line.strip():
+                result.append(' ' * indents)
+            result.append(line)
+        return ''.join(result)
+
+    def _get_nearest_roots(self, node):
+        if node not in self._nearest_roots:
+            result = []
+            for child in ast.get_child_nodes(node):
+                if child in self.matched_asts:
+                    result.append(child)
+                else:
+                    result.extend(self._get_nearest_roots(child))
+            self._nearest_roots[node] = result
+        return self._nearest_roots[node]
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/similarfinder.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/similarfinder.py
new file mode 100644
index 0000000..425f9ed
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/similarfinder.py
@@ -0,0 +1,370 @@
+"""This module can be used for finding similar code"""
+import re
+
+import rope.refactor.wildcards
+from rope.base import libutils
+from rope.base import codeanalyze, exceptions, ast, builtins
+from rope.refactor import (patchedast, wildcards)
+
+from rope.refactor.patchedast import MismatchedTokenError
+
+
+class BadNameInCheckError(exceptions.RefactoringError):
+    pass
+
+
+class SimilarFinder(object):
+    """`SimilarFinder` can be used to find similar pieces of code
+
+    See the notes in the `rope.refactor.restructure` module for more
+    info.
+
+    """
+
+    def __init__(self, pymodule, wildcards=None):
+        """Construct a SimilarFinder"""
+        self.source = pymodule.source_code
+        try:
+            self.raw_finder = RawSimilarFinder(
+                pymodule.source_code, pymodule.get_ast(), self._does_match)
+        except MismatchedTokenError:
+            print("in file %s" % pymodule.resource.path)
+            raise
+        self.pymodule = pymodule
+        if wildcards is None:
+            self.wildcards = {}
+            for wildcard in [rope.refactor.wildcards.
+                             DefaultWildcard(pymodule.pycore.project)]:
+                self.wildcards[wildcard.get_name()] = wildcard
+        else:
+            self.wildcards = wildcards
+
+    def get_matches(self, code, args={}, start=0, end=None):
+        self.args = args
+        if end is None:
+            end = len(self.source)
+        skip_region = None
+        if 'skip' in args.get('', {}):
+            resource, region = args['']['skip']
+            if resource == self.pymodule.get_resource():
+                skip_region = region
+        return self.raw_finder.get_matches(code, start=start, end=end,
+                                           skip=skip_region)
+
+    def get_match_regions(self, *args, **kwds):
+        for match in self.get_matches(*args, **kwds):
+            yield match.get_region()
+
+    def _does_match(self, node, name):
+        arg = self.args.get(name, '')
+        kind = 'default'
+        if isinstance(arg, (tuple, list)):
+            kind = arg[0]
+            arg = arg[1]
+        suspect = wildcards.Suspect(self.pymodule, node, name)
+        return self.wildcards[kind].matches(suspect, arg)
+
+
+class RawSimilarFinder(object):
+    """A class for finding similar expressions and statements"""
+
+    def __init__(self, source, node=None, does_match=None):
+        if node is None:
+            node = ast.parse(source)
+        if does_match is None:
+            self.does_match = self._simple_does_match
+        else:
+            self.does_match = does_match
+        self._init_using_ast(node, source)
+
+    def _simple_does_match(self, node, name):
+        return isinstance(node, (ast.expr, ast.Name))
+
+    def _init_using_ast(self, node, source):
+        self.source = source
+        self._matched_asts = {}
+        if not hasattr(node, 'region'):
+            patchedast.patch_ast(node, source)
+        self.ast = node
+
+    def get_matches(self, code, start=0, end=None, skip=None):
+        """Search for `code` in source and return a list of `Match`\es
+
+        `code` can contain wildcards.  ``${name}`` matches normal
+        names and ``${?name} can match any expression.  You can use
+        `Match.get_ast()` for getting the node that has matched a
+        given pattern.
+
+        """
+        if end is None:
+            end = len(self.source)
+        for match in self._get_matched_asts(code):
+            match_start, match_end = match.get_region()
+            if start <= match_start and match_end <= end:
+                if skip is not None and (skip[0] < match_end and
+                                         skip[1] > match_start):
+                    continue
+                yield match
+
+    def _get_matched_asts(self, code):
+        if code not in self._matched_asts:
+            wanted = self._create_pattern(code)
+            matches = _ASTMatcher(self.ast, wanted,
+                                  self.does_match).find_matches()
+            self._matched_asts[code] = matches
+        return self._matched_asts[code]
+
+    def _create_pattern(self, expression):
+        expression = self._replace_wildcards(expression)
+        node = ast.parse(expression)
+        # Getting Module.Stmt.nodes
+        nodes = node.body
+        if len(nodes) == 1 and isinstance(nodes[0], ast.Expr):
+            # Getting Discard.expr
+            wanted = nodes[0].value
+        else:
+            wanted = nodes
+        return wanted
+
+    def _replace_wildcards(self, expression):
+        ropevar = _RopeVariable()
+        template = CodeTemplate(expression)
+        mapping = {}
+        for name in template.get_names():
+            mapping[name] = ropevar.get_var(name)
+        return template.substitute(mapping)
+
+
+class _ASTMatcher(object):
+
+    def __init__(self, body, pattern, does_match):
+        """Searches the given pattern in the body AST.
+
+        body is an AST node and pattern can be either an AST node or
+        a list of ASTs nodes
+        """
+        self.body = body
+        self.pattern = pattern
+        self.matches = None
+        self.ropevar = _RopeVariable()
+        self.matches_callback = does_match
+
+    def find_matches(self):
+        if self.matches is None:
+            self.matches = []
+            ast.call_for_nodes(self.body, self._check_node, recursive=True)
+        return self.matches
+
+    def _check_node(self, node):
+        if isinstance(self.pattern, list):
+            self._check_statements(node)
+        else:
+            self._check_expression(node)
+
+    def _check_expression(self, node):
+        mapping = {}
+        if self._match_nodes(self.pattern, node, mapping):
+            self.matches.append(ExpressionMatch(node, mapping))
+
+    def _check_statements(self, node):
+        for child in ast.get_children(node):
+            if isinstance(child, (list, tuple)):
+                self.__check_stmt_list(child)
+
+    def __check_stmt_list(self, nodes):
+        for index in range(len(nodes)):
+            if len(nodes) - index >= len(self.pattern):
+                current_stmts = nodes[index:index + len(self.pattern)]
+                mapping = {}
+                if self._match_stmts(current_stmts, mapping):
+                    self.matches.append(StatementMatch(current_stmts, mapping))
+
+    def _match_nodes(self, expected, node, mapping):
+        if isinstance(expected, ast.Name):
+            if self.ropevar.is_var(expected.id):
+                return self._match_wildcard(expected, node, mapping)
+        if not isinstance(expected, ast.AST):
+            return expected == node
+        if expected.__class__ != node.__class__:
+            return False
+
+        children1 = self._get_children(expected)
+        children2 = self._get_children(node)
+        if len(children1) != len(children2):
+            return False
+        for child1, child2 in zip(children1, children2):
+            if isinstance(child1, ast.AST):
+                if not self._match_nodes(child1, child2, mapping):
+                    return False
+            elif isinstance(child1, (list, tuple)):
+                if not isinstance(child2, (list, tuple)) or \
+                   len(child1) != len(child2):
+                    return False
+                for c1, c2 in zip(child1, child2):
+                    if not self._match_nodes(c1, c2, mapping):
+                        return False
+            else:
+                if child1 != child2:
+                    return False
+        return True
+
+    def _get_children(self, node):
+        """Return not `ast.expr_context` children of `node`"""
+        children = ast.get_children(node)
+        return [child for child in children
+                if not isinstance(child, ast.expr_context)]
+
+    def _match_stmts(self, current_stmts, mapping):
+        if len(current_stmts) != len(self.pattern):
+            return False
+        for stmt, expected in zip(current_stmts, self.pattern):
+            if not self._match_nodes(expected, stmt, mapping):
+                return False
+        return True
+
+    def _match_wildcard(self, node1, node2, mapping):
+        name = self.ropevar.get_base(node1.id)
+        if name not in mapping:
+            if self.matches_callback(node2, name):
+                mapping[name] = node2
+                return True
+            return False
+        else:
+            return self._match_nodes(mapping[name], node2, {})
+
+
+class Match(object):
+
+    def __init__(self, mapping):
+        self.mapping = mapping
+
+    def get_region(self):
+        """Returns match region"""
+
+    def get_ast(self, name):
+        """Return the ast node that has matched rope variables"""
+        return self.mapping.get(name, None)
+
+
+class ExpressionMatch(Match):
+
+    def __init__(self, ast, mapping):
+        super(ExpressionMatch, self).__init__(mapping)
+        self.ast = ast
+
+    def get_region(self):
+        return self.ast.region
+
+
+class StatementMatch(Match):
+
+    def __init__(self, ast_list, mapping):
+        super(StatementMatch, self).__init__(mapping)
+        self.ast_list = ast_list
+
+    def get_region(self):
+        return self.ast_list[0].region[0], self.ast_list[-1].region[1]
+
+
+class CodeTemplate(object):
+
+    def __init__(self, template):
+        self.template = template
+        self._find_names()
+
+    def _find_names(self):
+        self.names = {}
+        for match in CodeTemplate._get_pattern().finditer(self.template):
+            if 'name' in match.groupdict() and \
+               match.group('name') is not None:
+                start, end = match.span('name')
+                name = self.template[start + 2:end - 1]
+                if name not in self.names:
+                    self.names[name] = []
+                self.names[name].append((start, end))
+
+    def get_names(self):
+        return self.names.keys()
+
+    def substitute(self, mapping):
+        collector = codeanalyze.ChangeCollector(self.template)
+        for name, occurrences in self.names.items():
+            for region in occurrences:
+                collector.add_change(region[0], region[1], mapping[name])
+        result = collector.get_changed()
+        if result is None:
+            return self.template
+        return result
+
+    _match_pattern = None
+
+    @classmethod
+    def _get_pattern(cls):
+        if cls._match_pattern is None:
+            pattern = codeanalyze.get_comment_pattern() + '|' + \
+                codeanalyze.get_string_pattern() + '|' + \
+                r'(?P<name>\$\{[^\s\$\}]*\})'
+            cls._match_pattern = re.compile(pattern)
+        return cls._match_pattern
+
+
+class _RopeVariable(object):
+    """Transform and identify rope inserted wildcards"""
+
+    _normal_prefix = '__rope__variable_normal_'
+    _any_prefix = '__rope__variable_any_'
+
+    def get_var(self, name):
+        if name.startswith('?'):
+            return self._get_any(name)
+        else:
+            return self._get_normal(name)
+
+    def is_var(self, name):
+        return self._is_normal(name) or self._is_var(name)
+
+    def get_base(self, name):
+        if self._is_normal(name):
+            return name[len(self._normal_prefix):]
+        if self._is_var(name):
+            return '?' + name[len(self._any_prefix):]
+
+    def _get_normal(self, name):
+        return self._normal_prefix + name
+
+    def _get_any(self, name):
+        return self._any_prefix + name[1:]
+
+    def _is_normal(self, name):
+        return name.startswith(self._normal_prefix)
+
+    def _is_var(self, name):
+        return name.startswith(self._any_prefix)
+
+
+def make_pattern(code, variables):
+    variables = set(variables)
+    collector = codeanalyze.ChangeCollector(code)
+
+    def does_match(node, name):
+        return isinstance(node, ast.Name) and node.id == name
+    finder = RawSimilarFinder(code, does_match=does_match)
+    for variable in variables:
+        for match in finder.get_matches('${%s}' % variable):
+            start, end = match.get_region()
+            collector.add_change(start, end, '${%s}' % variable)
+    result = collector.get_changed()
+    return result if result is not None else code
+
+
+def _pydefined_to_str(pydefined):
+    address = []
+    if isinstance(pydefined,
+                  (builtins.BuiltinClass, builtins.BuiltinFunction)):
+        return '__builtins__.' + pydefined.get_name()
+    else:
+        while pydefined.parent is not None:
+            address.insert(0, pydefined.get_name())
+            pydefined = pydefined.parent
+        module_name = libutils.modname(pydefined.resource)
+    return '.'.join(module_name.split('.') + address)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/sourceutils.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/sourceutils.py
new file mode 100644
index 0000000..9b84290
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/sourceutils.py
@@ -0,0 +1,91 @@
+from rope.base import codeanalyze
+
+
+def get_indents(lines, lineno):
+    return codeanalyze.count_line_indents(lines.get_line(lineno))
+
+
+def find_minimum_indents(source_code):
+    result = 80
+    lines = source_code.split('\n')
+    for line in lines:
+        if line.strip() == '':
+            continue
+        result = min(result, codeanalyze.count_line_indents(line))
+    return result
+
+
+def indent_lines(source_code, amount):
+    if amount == 0:
+        return source_code
+    lines = source_code.splitlines(True)
+    result = []
+    for l in lines:
+        if l.strip() == '':
+            result.append('\n')
+            continue
+        if amount < 0:
+            indents = codeanalyze.count_line_indents(l)
+            result.append(max(0, indents + amount) * ' ' + l.lstrip())
+        else:
+            result.append(' ' * amount + l)
+    return ''.join(result)
+
+
+def fix_indentation(code, new_indents):
+    """Change the indentation of `code` to `new_indents`"""
+    min_indents = find_minimum_indents(code)
+    return indent_lines(code, new_indents - min_indents)
+
+
+def add_methods(pymodule, class_scope, methods_sources):
+    source_code = pymodule.source_code
+    lines = pymodule.lines
+    insertion_line = class_scope.get_end()
+    if class_scope.get_scopes():
+        insertion_line = class_scope.get_scopes()[-1].get_end()
+    insertion_offset = lines.get_line_end(insertion_line)
+    methods = '\n\n' + '\n\n'.join(methods_sources)
+    indented_methods = fix_indentation(
+        methods, get_indents(lines, class_scope.get_start()) +
+        get_indent(pymodule.pycore.project))
+    result = []
+    result.append(source_code[:insertion_offset])
+    result.append(indented_methods)
+    result.append(source_code[insertion_offset:])
+    return ''.join(result)
+
+
+def get_body(pyfunction):
+    """Return unindented function body"""
+    # FIXME scope = pyfunction.get_scope()
+    pymodule = pyfunction.get_module()
+    start, end = get_body_region(pyfunction)
+    return fix_indentation(pymodule.source_code[start:end], 0)
+
+
+def get_body_region(defined):
+    """Return the start and end offsets of function body"""
+    scope = defined.get_scope()
+    pymodule = defined.get_module()
+    lines = pymodule.lines
+    node = defined.get_ast()
+    start_line = node.lineno
+    if defined.get_doc() is None:
+        start_line = node.body[0].lineno
+    elif len(node.body) > 1:
+        start_line = node.body[1].lineno
+    start = lines.get_line_start(start_line)
+    scope_start = pymodule.logical_lines.logical_line_in(scope.start)
+    if scope_start[1] >= start_line:
+        # a one-liner!
+        # XXX: what if colon appears in a string
+        start = pymodule.source_code.index(':', start) + 1
+        while pymodule.source_code[start].isspace():
+            start += 1
+    end = min(lines.get_line_end(scope.end) + 1, len(pymodule.source_code))
+    return start, end
+
+
+def get_indent(project):
+    return project.prefs.get('indent_size', 4)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/suites.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/suites.py
new file mode 100644
index 0000000..6878508
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/suites.py
@@ -0,0 +1,158 @@
+from rope.base import ast
+from rope.base.utils import pycompat
+
+
+def find_visible(node, lines):
+    """Return the line which is visible from all `lines`"""
+    root = ast_suite_tree(node)
+    return find_visible_for_suite(root, lines)
+
+
+def find_visible_for_suite(root, lines):
+    if len(lines) == 1:
+        return lines[0]
+    line1 = lines[0]
+    line2 = find_visible_for_suite(root, lines[1:])
+    suite1 = root.find_suite(line1)
+    suite2 = root.find_suite(line2)
+
+    def valid(suite):
+        return suite is not None and not suite.ignored
+    if valid(suite1) and not valid(suite2):
+        return line1
+    if not valid(suite1) and valid(suite2):
+        return line2
+    if not valid(suite1) and not valid(suite2):
+        return None
+    while suite1 != suite2 and suite1.parent != suite2.parent:
+        if suite1._get_level() < suite2._get_level():
+            line2 = suite2.get_start()
+            suite2 = suite2.parent
+        elif suite1._get_level() > suite2._get_level():
+            line1 = suite1.get_start()
+            suite1 = suite1.parent
+        else:
+            line1 = suite1.get_start()
+            line2 = suite2.get_start()
+            suite1 = suite1.parent
+            suite2 = suite2.parent
+    if suite1 == suite2:
+        return min(line1, line2)
+    return min(suite1.get_start(), suite2.get_start())
+
+
+def ast_suite_tree(node):
+    if hasattr(node, 'lineno'):
+        lineno = node.lineno
+    else:
+        lineno = 1
+    return Suite(node.body, lineno)
+
+
+class Suite(object):
+
+    def __init__(self, child_nodes, lineno, parent=None, ignored=False):
+        self.parent = parent
+        self.lineno = lineno
+        self.child_nodes = child_nodes
+        self._children = None
+        self.ignored = ignored
+
+    def get_start(self):
+        if self.parent is None:
+            if self.child_nodes:
+                return self.local_start()
+            else:
+                return 1
+        return self.lineno
+
+    def get_children(self):
+        if self._children is None:
+            walker = _SuiteWalker(self)
+            for child in self.child_nodes:
+                ast.walk(child, walker)
+            self._children = walker.suites
+        return self._children
+
+    def local_start(self):
+        return self.child_nodes[0].lineno
+
+    def local_end(self):
+        end = self.child_nodes[-1].lineno
+        if self.get_children():
+            end = max(end, self.get_children()[-1].local_end())
+        return end
+
+    def find_suite(self, line):
+        if line is None:
+            return None
+        for child in self.get_children():
+            if child.local_start() <= line <= child.local_end():
+                return child.find_suite(line)
+        return self
+
+    def _get_level(self):
+        if self.parent is None:
+            return 0
+        return self.parent._get_level() + 1
+
+
+class _SuiteWalker(object):
+
+    def __init__(self, suite):
+        self.suite = suite
+        self.suites = []
+
+    def _If(self, node):
+        self._add_if_like_node(node)
+
+    def _For(self, node):
+        self._add_if_like_node(node)
+
+    def _While(self, node):
+        self._add_if_like_node(node)
+
+    def _With(self, node):
+        self.suites.append(Suite(node.body, node.lineno, self.suite))
+
+    def _TryFinally(self, node):
+        proceed_to_except_handler = False
+        if len(node.finalbody) == 1:
+            if pycompat.PY2:
+                proceed_to_except_handler = isinstance(node.body[0], ast.TryExcept)
+            elif pycompat.PY3:
+                try:
+                    proceed_to_except_handler = isinstance(node.handlers[0], ast.ExceptHandler)
+                except IndexError:
+                    pass
+        if proceed_to_except_handler:
+            self._TryExcept(node if pycompat.PY3 else node.body[0])
+        else:
+            self.suites.append(Suite(node.body, node.lineno, self.suite))
+        self.suites.append(Suite(node.finalbody, node.lineno, self.suite))
+
+    def _Try(self, node):
+        if len(node.finalbody) == 1:
+            self._TryFinally(node)
+        else:
+            self._TryExcept(node)
+
+    def _TryExcept(self, node):
+        self.suites.append(Suite(node.body, node.lineno, self.suite))
+        for handler in node.handlers:
+            self.suites.append(Suite(handler.body, node.lineno, self.suite))
+        if node.orelse:
+            self.suites.append(Suite(node.orelse, node.lineno, self.suite))
+
+    def _add_if_like_node(self, node):
+        self.suites.append(Suite(node.body, node.lineno, self.suite))
+        if node.orelse:
+            self.suites.append(Suite(node.orelse, node.lineno, self.suite))
+
+    def _FunctionDef(self, node):
+        self.suites.append(Suite(node.body, node.lineno,
+                                 self.suite, ignored=True))
+
+    def _ClassDef(self, node):
+        self.suites.append(Suite(node.body, node.lineno,
+                                 self.suite, ignored=True))
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/topackage.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/topackage.py
new file mode 100644
index 0000000..f36a6d5
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/topackage.py
@@ -0,0 +1,32 @@
+import rope.refactor.importutils
+from rope.base.change import ChangeSet, ChangeContents, MoveResource, \
+    CreateFolder
+
+
+class ModuleToPackage(object):
+
+    def __init__(self, project, resource):
+        self.project = project
+        self.resource = resource
+
+    def get_changes(self):
+        changes = ChangeSet('Transform <%s> module to package' %
+                            self.resource.path)
+        new_content = self._transform_relatives_to_absolute(self.resource)
+        if new_content is not None:
+            changes.add_change(ChangeContents(self.resource, new_content))
+        parent = self.resource.parent
+        name = self.resource.name[:-3]
+        changes.add_change(CreateFolder(parent, name))
+        parent_path = parent.path + '/'
+        if not parent.path:
+            parent_path = ''
+        new_path = parent_path + '%s/__init__.py' % name
+        if self.resource.project == self.project:
+            changes.add_change(MoveResource(self.resource, new_path))
+        return changes
+
+    def _transform_relatives_to_absolute(self, resource):
+        pymodule = self.project.get_pymodule(resource)
+        import_tools = rope.refactor.importutils.ImportTools(self.project)
+        return import_tools.relatives_to_absolutes(pymodule)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/usefunction.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/usefunction.py
new file mode 100644
index 0000000..85896a9
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/usefunction.py
@@ -0,0 +1,174 @@
+from rope.base import (change, taskhandle, evaluate,
+                       exceptions, pyobjects, pynames, ast)
+from rope.base import libutils
+from rope.refactor import restructure, sourceutils, similarfinder
+
+
+class UseFunction(object):
+    """Try to use a function wherever possible"""
+
+    def __init__(self, project, resource, offset):
+        self.project = project
+        self.offset = offset
+        this_pymodule = project.get_pymodule(resource)
+        pyname = evaluate.eval_location(this_pymodule, offset)
+        if pyname is None:
+            raise exceptions.RefactoringError('Unresolvable name selected')
+        self.pyfunction = pyname.get_object()
+        if not isinstance(self.pyfunction, pyobjects.PyFunction) or \
+           not isinstance(self.pyfunction.parent, pyobjects.PyModule):
+            raise exceptions.RefactoringError(
+                'Use function works for global functions, only.')
+        self.resource = self.pyfunction.get_module().get_resource()
+        self._check_returns()
+
+    def _check_returns(self):
+        node = self.pyfunction.get_ast()
+        if _yield_count(node):
+            raise exceptions.RefactoringError('Use function should not '
+                                              'be used on generators.')
+        returns = _return_count(node)
+        if returns > 1:
+            raise exceptions.RefactoringError('usefunction: Function has more '
+                                              'than one return statement.')
+        if returns == 1 and not _returns_last(node):
+            raise exceptions.RefactoringError('usefunction: return should '
+                                              'be the last statement.')
+
+    def get_changes(self, resources=None,
+                    task_handle=taskhandle.NullTaskHandle()):
+        if resources is None:
+            resources = self.project.get_python_files()
+        changes = change.ChangeSet('Using function <%s>' %
+                                   self.pyfunction.get_name())
+        if self.resource in resources:
+            newresources = list(resources)
+            newresources.remove(self.resource)
+        for c in self._restructure(newresources, task_handle).changes:
+            changes.add_change(c)
+        if self.resource in resources:
+            for c in self._restructure([self.resource], task_handle,
+                                       others=False).changes:
+                changes.add_change(c)
+        return changes
+
+    def get_function_name(self):
+        return self.pyfunction.get_name()
+
+    def _restructure(self, resources, task_handle, others=True):
+        pattern = self._make_pattern()
+        goal = self._make_goal(import_=others)
+        imports = None
+        if others:
+            imports = ['import %s' % self._module_name()]
+
+        body_region = sourceutils.get_body_region(self.pyfunction)
+        args_value = {'skip': (self.resource, body_region)}
+        args = {'': args_value}
+
+        restructuring = restructure.Restructure(
+            self.project, pattern, goal, args=args, imports=imports)
+        return restructuring.get_changes(resources=resources,
+                                         task_handle=task_handle)
+
+    def _find_temps(self):
+        return find_temps(self.project, self._get_body())
+
+    def _module_name(self):
+        return libutils.modname(self.resource)
+
+    def _make_pattern(self):
+        params = self.pyfunction.get_param_names()
+        body = self._get_body()
+        body = restructure.replace(body, 'return', 'pass')
+        wildcards = list(params)
+        wildcards.extend(self._find_temps())
+        if self._does_return():
+            if self._is_expression():
+                replacement = '${%s}' % self._rope_returned
+            else:
+                replacement = '%s = ${%s}' % (self._rope_result,
+                                              self._rope_returned)
+            body = restructure.replace(
+                body, 'return ${%s}' % self._rope_returned,
+                replacement)
+            wildcards.append(self._rope_result)
+        return similarfinder.make_pattern(body, wildcards)
+
+    def _get_body(self):
+        return sourceutils.get_body(self.pyfunction)
+
+    def _make_goal(self, import_=False):
+        params = self.pyfunction.get_param_names()
+        function_name = self.pyfunction.get_name()
+        if import_:
+            function_name = self._module_name() + '.' + function_name
+        goal = '%s(%s)' % (function_name,
+                           ', ' .join(('${%s}' % p) for p in params))
+        if self._does_return() and not self._is_expression():
+            goal = '${%s} = %s' % (self._rope_result, goal)
+        return goal
+
+    def _does_return(self):
+        body = self._get_body()
+        removed_return = restructure.replace(body, 'return ${result}', '')
+        return removed_return != body
+
+    def _is_expression(self):
+        return len(self.pyfunction.get_ast().body) == 1
+
+    _rope_result = '_rope__result'
+    _rope_returned = '_rope__returned'
+
+
+def find_temps(project, code):
+    code = 'def f():\n' + sourceutils.indent_lines(code, 4)
+    pymodule = libutils.get_string_module(project, code)
+    result = []
+    function_scope = pymodule.get_scope().get_scopes()[0]
+    for name, pyname in function_scope.get_names().items():
+        if isinstance(pyname, pynames.AssignedName):
+            result.append(name)
+    return result
+
+
+def _returns_last(node):
+    return node.body and isinstance(node.body[-1], ast.Return)
+
+
+def _yield_count(node):
+    visitor = _ReturnOrYieldFinder()
+    visitor.start_walking(node)
+    return visitor.yields
+
+
+def _return_count(node):
+    visitor = _ReturnOrYieldFinder()
+    visitor.start_walking(node)
+    return visitor.returns
+
+
+class _ReturnOrYieldFinder(object):
+
+    def __init__(self):
+        self.returns = 0
+        self.yields = 0
+
+    def _Return(self, node):
+        self.returns += 1
+
+    def _Yield(self, node):
+        self.yields += 1
+
+    def _FunctionDef(self, node):
+        pass
+
+    def _ClassDef(self, node):
+        pass
+
+    def start_walking(self, node):
+        nodes = [node]
+        if isinstance(node, ast.FunctionDef):
+            nodes = ast.get_child_nodes(node)
+        for child in nodes:
+            ast.walk(child, self)
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/wildcards.py b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/wildcards.py
new file mode 100644
index 0000000..90040c7
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/rope/refactor/wildcards.py
@@ -0,0 +1,178 @@
+from rope.base import ast, evaluate, builtins, pyobjects
+from rope.refactor import patchedast, occurrences
+
+
+class Wildcard(object):
+
+    def get_name(self):
+        """Return the name of this wildcard"""
+
+    def matches(self, suspect, arg):
+        """Return `True` if `suspect` matches this wildcard"""
+
+
+class Suspect(object):
+
+    def __init__(self, pymodule, node, name):
+        self.name = name
+        self.pymodule = pymodule
+        self.node = node
+
+
+class DefaultWildcard(object):
+    """The default restructuring wildcard
+
+    The argument passed to this wildcard is in the
+    ``key1=value1,key2=value2,...`` format.  Possible keys are:
+
+    * name - for checking the reference
+    * type - for checking the type
+    * object - for checking the object
+    * instance - for checking types but similar to builtin isinstance
+    * exact - matching only occurrences with the same name as the wildcard
+    * unsure - matching unsure occurrences
+
+    """
+
+    def __init__(self, project):
+        self.project = project
+
+    def get_name(self):
+        return 'default'
+
+    def matches(self, suspect, arg=''):
+        args = parse_arg(arg)
+
+        if not self._check_exact(args, suspect):
+            return False
+        if not self._check_object(args, suspect):
+            return False
+        return True
+
+    def _check_object(self, args, suspect):
+        kind = None
+        expected = None
+        unsure = args.get('unsure', False)
+        for check in ['name', 'object', 'type', 'instance']:
+            if check in args:
+                kind = check
+                expected = args[check]
+            if expected is not None:
+                checker = _CheckObject(self.project, expected,
+                                       kind, unsure=unsure)
+                return checker(suspect.pymodule, suspect.node)
+        return True
+
+    def _check_exact(self, args, suspect):
+        node = suspect.node
+        if args.get('exact'):
+            if not isinstance(node, ast.Name) or not node.id == suspect.name:
+                return False
+        else:
+            if not isinstance(node, ast.expr):
+                return False
+        return True
+
+
+def parse_arg(arg):
+    if isinstance(arg, dict):
+        return arg
+    result = {}
+    tokens = arg.split(',')
+    for token in tokens:
+        if '=' in token:
+            parts = token.split('=', 1)
+            result[parts[0].strip()] = parts[1].strip()
+        else:
+            result[token.strip()] = True
+    return result
+
+
+class _CheckObject(object):
+
+    def __init__(self, project, expected, kind='object', unsure=False):
+        self.project = project
+        self.kind = kind
+        self.unsure = unsure
+        self.expected = self._evaluate(expected)
+
+    def __call__(self, pymodule, node):
+        pyname = self._evaluate_node(pymodule, node)
+        if pyname is None or self.expected is None:
+            return self.unsure
+        if self._unsure_pyname(pyname, unbound=self.kind == 'name'):
+            return True
+        if self.kind == 'name':
+            return self._same_pyname(self.expected, pyname)
+        else:
+            pyobject = pyname.get_object()
+            if self.kind == 'object':
+                objects = [pyobject]
+            if self.kind == 'type':
+                objects = [pyobject.get_type()]
+            if self.kind == 'instance':
+                objects = [pyobject]
+                objects.extend(self._get_super_classes(pyobject))
+                objects.extend(self._get_super_classes(pyobject.get_type()))
+            for pyobject in objects:
+                if self._same_pyobject(self.expected.get_object(), pyobject):
+                    return True
+            return False
+
+    def _get_super_classes(self, pyobject):
+        result = []
+        if isinstance(pyobject, pyobjects.AbstractClass):
+            for superclass in pyobject.get_superclasses():
+                result.append(superclass)
+                result.extend(self._get_super_classes(superclass))
+        return result
+
+    def _same_pyobject(self, expected, pyobject):
+        return expected == pyobject
+
+    def _same_pyname(self, expected, pyname):
+        return occurrences.same_pyname(expected, pyname)
+
+    def _unsure_pyname(self, pyname, unbound=True):
+        return self.unsure and occurrences.unsure_pyname(pyname, unbound)
+
+    def _split_name(self, name):
+        parts = name.split('.')
+        expression, kind = parts[0], parts[-1]
+        if len(parts) == 1:
+            kind = 'name'
+        return expression, kind
+
+    def _evaluate_node(self, pymodule, node):
+        scope = pymodule.get_scope().get_inner_scope_for_line(node.lineno)
+        expression = node
+        if isinstance(expression, ast.Name) and \
+           isinstance(expression.ctx, ast.Store):
+            start, end = patchedast.node_region(expression)
+            text = pymodule.source_code[start:end]
+            return evaluate.eval_str(scope, text)
+        else:
+            return evaluate.eval_node(scope, expression)
+
+    def _evaluate(self, code):
+        attributes = code.split('.')
+        pyname = None
+        if attributes[0] in ('__builtin__', '__builtins__'):
+            class _BuiltinsStub(object):
+                def get_attribute(self, name):
+                    return builtins.builtins[name]
+
+                def __getitem__(self, name):
+                    return builtins.builtins[name]
+
+                def __contains__(self, name):
+                    return name in builtins.builtins
+            pyobject = _BuiltinsStub()
+        else:
+            pyobject = self.project.get_module(attributes[0])
+        for attribute in attributes[1:]:
+            pyname = pyobject[attribute]
+            if pyname is None:
+                return None
+            pyobject = pyname.get_object()
+        return pyname
diff --git a/vim-plugins/bundle/python-mode/pymode/libs/six.py b/vim-plugins/bundle/python-mode/pymode/libs/six.py
new file mode 100644
index 0000000..ffa3fe1
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/libs/six.py
@@ -0,0 +1,838 @@
+"""Utilities for writing code that runs on Python 2 and 3"""
+
+# Copyright (c) 2010-2015 Benjamin Peterson
+#
+# 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.
+
+from __future__ import absolute_import
+
+import functools
+import itertools
+import operator
+import sys
+import types
+
+__author__ = "Benjamin Peterson <benjamin@python.org>"
+__version__ = "1.9.0"
+
+
+# Useful for very coarse version differentiation.
+PY2 = sys.version_info[0] == 2
+PY3 = sys.version_info[0] == 3
+
+if PY3:
+    string_types = str,
+    integer_types = int,
+    class_types = type,
+    text_type = str
+    binary_type = bytes
+
+    MAXSIZE = sys.maxsize
+else:
+    string_types = basestring,
+    integer_types = (int, long)
+    class_types = (type, types.ClassType)
+    text_type = unicode
+    binary_type = str
+
+    if sys.platform.startswith("java"):
+        # Jython always uses 32 bits.
+        MAXSIZE = int((1 << 31) - 1)
+    else:
+        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
+        class X(object):
+            def __len__(self):
+                return 1 << 31
+        try:
+            len(X())
+        except OverflowError:
+            # 32-bit
+            MAXSIZE = int((1 << 31) - 1)
+        else:
+            # 64-bit
+            MAXSIZE = int((1 << 63) - 1)
+        del X
+
+
+def _add_doc(func, doc):
+    """Add documentation to a function."""
+    func.__doc__ = doc
+
+
+def _import_module(name):
+    """Import module, returning the module after the last dot."""
+    __import__(name)
+    return sys.modules[name]
+
+
+class _LazyDescr(object):
+
+    def __init__(self, name):
+        self.name = name
+
+    def __get__(self, obj, tp):
+        result = self._resolve()
+        setattr(obj, self.name, result) # Invokes __set__.
+        try:
+            # This is a bit ugly, but it avoids running this again by
+            # removing this descriptor.
+            delattr(obj.__class__, self.name)
+        except AttributeError:
+            pass
+        return result
+
+
+class MovedModule(_LazyDescr):
+
+    def __init__(self, name, old, new=None):
+        super(MovedModule, self).__init__(name)
+        if PY3:
+            if new is None:
+                new = name
+            self.mod = new
+        else:
+            self.mod = old
+
+    def _resolve(self):
+        return _import_module(self.mod)
+
+    def __getattr__(self, attr):
+        _module = self._resolve()
+        value = getattr(_module, attr)
+        setattr(self, attr, value)
+        return value
+
+
+class _LazyModule(types.ModuleType):
+
+    def __init__(self, name):
+        super(_LazyModule, self).__init__(name)
+        self.__doc__ = self.__class__.__doc__
+
+    def __dir__(self):
+        attrs = ["__doc__", "__name__"]
+        attrs += [attr.name for attr in self._moved_attributes]
+        return attrs
+
+    # Subclasses should override this
+    _moved_attributes = []
+
+
+class MovedAttribute(_LazyDescr):
+
+    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
+        super(MovedAttribute, self).__init__(name)
+        if PY3:
+            if new_mod is None:
+                new_mod = name
+            self.mod = new_mod
+            if new_attr is None:
+                if old_attr is None:
+                    new_attr = name
+                else:
+                    new_attr = old_attr
+            self.attr = new_attr
+        else:
+            self.mod = old_mod
+            if old_attr is None:
+                old_attr = name
+            self.attr = old_attr
+
+    def _resolve(self):
+        module = _import_module(self.mod)
+        return getattr(module, self.attr)
+
+
+class _SixMetaPathImporter(object):
+    """
+    A meta path importer to import six.moves and its submodules.
+
+    This class implements a PEP302 finder and loader. It should be compatible
+    with Python 2.5 and all existing versions of Python3
+    """
+    def __init__(self, six_module_name):
+        self.name = six_module_name
+        self.known_modules = {}
+
+    def _add_module(self, mod, *fullnames):
+        for fullname in fullnames:
+            self.known_modules[self.name + "." + fullname] = mod
+
+    def _get_module(self, fullname):
+        return self.known_modules[self.name + "." + fullname]
+
+    def find_module(self, fullname, path=None):
+        if fullname in self.known_modules:
+            return self
+        return None
+
+    def __get_module(self, fullname):
+        try:
+            return self.known_modules[fullname]
+        except KeyError:
+            raise ImportError("This loader does not know module " + fullname)
+
+    def load_module(self, fullname):
+        try:
+            # in case of a reload
+            return sys.modules[fullname]
+        except KeyError:
+            pass
+        mod = self.__get_module(fullname)
+        if isinstance(mod, MovedModule):
+            mod = mod._resolve()
+        else:
+            mod.__loader__ = self
+        sys.modules[fullname] = mod
+        return mod
+
+    def is_package(self, fullname):
+        """
+        Return true, if the named module is a package.
+
+        We need this method to get correct spec objects with
+        Python 3.4 (see PEP451)
+        """
+        return hasattr(self.__get_module(fullname), "__path__")
+
+    def get_code(self, fullname):
+        """Return None
+
+        Required, if is_package is implemented"""
+        self.__get_module(fullname)  # eventually raises ImportError
+        return None
+    get_source = get_code  # same as get_code
+
+_importer = _SixMetaPathImporter(__name__)
+
+
+class _MovedItems(_LazyModule):
+    """Lazy loading of moved objects"""
+    __path__ = []  # mark as package
+
+
+_moved_attributes = [
+    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
+    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
+    MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
+    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
+    MovedAttribute("intern", "__builtin__", "sys"),
+    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
+    MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("reload_module", "__builtin__", "imp", "reload"),
+    MovedAttribute("reduce", "__builtin__", "functools"),
+    MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
+    MovedAttribute("StringIO", "StringIO", "io"),
+    MovedAttribute("UserDict", "UserDict", "collections"),
+    MovedAttribute("UserList", "UserList", "collections"),
+    MovedAttribute("UserString", "UserString", "collections"),
+    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
+    MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
+
+    MovedModule("builtins", "__builtin__"),
+    MovedModule("configparser", "ConfigParser"),
+    MovedModule("copyreg", "copy_reg"),
+    MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
+    MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread"),
+    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
+    MovedModule("http_cookies", "Cookie", "http.cookies"),
+    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
+    MovedModule("html_parser", "HTMLParser", "html.parser"),
+    MovedModule("http_client", "httplib", "http.client"),
+    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
+    MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
+    MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
+    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
+    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
+    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
+    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
+    MovedModule("cPickle", "cPickle", "pickle"),
+    MovedModule("queue", "Queue"),
+    MovedModule("reprlib", "repr"),
+    MovedModule("socketserver", "SocketServer"),
+    MovedModule("_thread", "thread", "_thread"),
+    MovedModule("tkinter", "Tkinter"),
+    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
+    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
+    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
+    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
+    MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
+    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
+    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
+    MovedModule("tkinter_colorchooser", "tkColorChooser",
+                "tkinter.colorchooser"),
+    MovedModule("tkinter_commondialog", "tkCommonDialog",
+                "tkinter.commondialog"),
+    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
+    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
+    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
+                "tkinter.simpledialog"),
+    MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
+    MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
+    MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
+    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
+    MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
+    MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
+    MovedModule("winreg", "_winreg"),
+]
+for attr in _moved_attributes:
+    setattr(_MovedItems, attr.name, attr)
+    if isinstance(attr, MovedModule):
+        _importer._add_module(attr, "moves." + attr.name)
+del attr
+
+_MovedItems._moved_attributes = _moved_attributes
+
+moves = _MovedItems(__name__ + ".moves")
+_importer._add_module(moves, "moves")
+
+
+class Module_six_moves_urllib_parse(_LazyModule):
+    """Lazy loading of moved objects in six.moves.urllib_parse"""
+
+
+_urllib_parse_moved_attributes = [
+    MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
+    MovedAttribute("SplitResult", "urlparse", "urllib.parse"),
+    MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
+    MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
+    MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
+    MovedAttribute("urljoin", "urlparse", "urllib.parse"),
+    MovedAttribute("urlparse", "urlparse", "urllib.parse"),
+    MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
+    MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
+    MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
+    MovedAttribute("quote", "urllib", "urllib.parse"),
+    MovedAttribute("quote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("unquote", "urllib", "urllib.parse"),
+    MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
+    MovedAttribute("urlencode", "urllib", "urllib.parse"),
+    MovedAttribute("splitquery", "urllib", "urllib.parse"),
+    MovedAttribute("splittag", "urllib", "urllib.parse"),
+    MovedAttribute("splituser", "urllib", "urllib.parse"),
+    MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_params", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_query", "urlparse", "urllib.parse"),
+    MovedAttribute("uses_relative", "urlparse", "urllib.parse"),
+]
+for attr in _urllib_parse_moved_attributes:
+    setattr(Module_six_moves_urllib_parse, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
+                      "moves.urllib_parse", "moves.urllib.parse")
+
+
+class Module_six_moves_urllib_error(_LazyModule):
+    """Lazy loading of moved objects in six.moves.urllib_error"""
+
+
+_urllib_error_moved_attributes = [
+    MovedAttribute("URLError", "urllib2", "urllib.error"),
+    MovedAttribute("HTTPError", "urllib2", "urllib.error"),
+    MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
+]
+for attr in _urllib_error_moved_attributes:
+    setattr(Module_six_moves_urllib_error, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
+                      "moves.urllib_error", "moves.urllib.error")
+
+
+class Module_six_moves_urllib_request(_LazyModule):
+    """Lazy loading of moved objects in six.moves.urllib_request"""
+
+
+_urllib_request_moved_attributes = [
+    MovedAttribute("urlopen", "urllib2", "urllib.request"),
+    MovedAttribute("install_opener", "urllib2", "urllib.request"),
+    MovedAttribute("build_opener", "urllib2", "urllib.request"),
+    MovedAttribute("pathname2url", "urllib", "urllib.request"),
+    MovedAttribute("url2pathname", "urllib", "urllib.request"),
+    MovedAttribute("getproxies", "urllib", "urllib.request"),
+    MovedAttribute("Request", "urllib2", "urllib.request"),
+    MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
+    MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
+    MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
+    MovedAttribute("FileHandler", "urllib2", "urllib.request"),
+    MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
+    MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
+    MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
+    MovedAttribute("urlretrieve", "urllib", "urllib.request"),
+    MovedAttribute("urlcleanup", "urllib", "urllib.request"),
+    MovedAttribute("URLopener", "urllib", "urllib.request"),
+    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
+    MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
+]
+for attr in _urllib_request_moved_attributes:
+    setattr(Module_six_moves_urllib_request, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
+                      "moves.urllib_request", "moves.urllib.request")
+
+
+class Module_six_moves_urllib_response(_LazyModule):
+    """Lazy loading of moved objects in six.moves.urllib_response"""
+
+
+_urllib_response_moved_attributes = [
+    MovedAttribute("addbase", "urllib", "urllib.response"),
+    MovedAttribute("addclosehook", "urllib", "urllib.response"),
+    MovedAttribute("addinfo", "urllib", "urllib.response"),
+    MovedAttribute("addinfourl", "urllib", "urllib.response"),
+]
+for attr in _urllib_response_moved_attributes:
+    setattr(Module_six_moves_urllib_response, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
+                      "moves.urllib_response", "moves.urllib.response")
+
+
+class Module_six_moves_urllib_robotparser(_LazyModule):
+    """Lazy loading of moved objects in six.moves.urllib_robotparser"""
+
+
+_urllib_robotparser_moved_attributes = [
+    MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
+]
+for attr in _urllib_robotparser_moved_attributes:
+    setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
+del attr
+
+Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
+
+_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
+                      "moves.urllib_robotparser", "moves.urllib.robotparser")
+
+
+class Module_six_moves_urllib(types.ModuleType):
+    """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
+    __path__ = []  # mark as package
+    parse = _importer._get_module("moves.urllib_parse")
+    error = _importer._get_module("moves.urllib_error")
+    request = _importer._get_module("moves.urllib_request")
+    response = _importer._get_module("moves.urllib_response")
+    robotparser = _importer._get_module("moves.urllib_robotparser")
+
+    def __dir__(self):
+        return ['parse', 'error', 'request', 'response', 'robotparser']
+
+_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"),
+                      "moves.urllib")
+
+
+def add_move(move):
+    """Add an item to six.moves."""
+    setattr(_MovedItems, move.name, move)
+
+
+def remove_move(name):
+    """Remove item from six.moves."""
+    try:
+        delattr(_MovedItems, name)
+    except AttributeError:
+        try:
+            del moves.__dict__[name]
+        except KeyError:
+            raise AttributeError("no such move, %r" % (name,))
+
+
+if PY3:
+    _meth_func = "__func__"
+    _meth_self = "__self__"
+
+    _func_closure = "__closure__"
+    _func_code = "__code__"
+    _func_defaults = "__defaults__"
+    _func_globals = "__globals__"
+else:
+    _meth_func = "im_func"
+    _meth_self = "im_self"
+
+    _func_closure = "func_closure"
+    _func_code = "func_code"
+    _func_defaults = "func_defaults"
+    _func_globals = "func_globals"
+
+
+try:
+    advance_iterator = next
+except NameError:
+    def advance_iterator(it):
+        return it.next()
+next = advance_iterator
+
+
+try:
+    callable = callable
+except NameError:
+    def callable(obj):
+        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
+
+
+if PY3:
+    def get_unbound_function(unbound):
+        return unbound
+
+    create_bound_method = types.MethodType
+
+    Iterator = object
+else:
+    def get_unbound_function(unbound):
+        return unbound.im_func
+
+    def create_bound_method(func, obj):
+        return types.MethodType(func, obj, obj.__class__)
+
+    class Iterator(object):
+
+        def next(self):
+            return type(self).__next__(self)
+
+    callable = callable
+_add_doc(get_unbound_function,
+         """Get the function out of a possibly unbound function""")
+
+
+get_method_function = operator.attrgetter(_meth_func)
+get_method_self = operator.attrgetter(_meth_self)
+get_function_closure = operator.attrgetter(_func_closure)
+get_function_code = operator.attrgetter(_func_code)
+get_function_defaults = operator.attrgetter(_func_defaults)
+get_function_globals = operator.attrgetter(_func_globals)
+
+
+if PY3:
+    def iterkeys(d, **kw):
+        return iter(d.keys(**kw))
+
+    def itervalues(d, **kw):
+        return iter(d.values(**kw))
+
+    def iteritems(d, **kw):
+        return iter(d.items(**kw))
+
+    def iterlists(d, **kw):
+        return iter(d.lists(**kw))
+
+    viewkeys = operator.methodcaller("keys")
+
+    viewvalues = operator.methodcaller("values")
+
+    viewitems = operator.methodcaller("items")
+else:
+    def iterkeys(d, **kw):
+        return iter(d.iterkeys(**kw))
+
+    def itervalues(d, **kw):
+        return iter(d.itervalues(**kw))
+
+    def iteritems(d, **kw):
+        return iter(d.iteritems(**kw))
+
+    def iterlists(d, **kw):
+        return iter(d.iterlists(**kw))
+
+    viewkeys = operator.methodcaller("viewkeys")
+
+    viewvalues = operator.methodcaller("viewvalues")
+
+    viewitems = operator.methodcaller("viewitems")
+
+_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
+_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
+_add_doc(iteritems,
+         "Return an iterator over the (key, value) pairs of a dictionary.")
+_add_doc(iterlists,
+         "Return an iterator over the (key, [values]) pairs of a dictionary.")
+
+
+if PY3:
+    def b(s):
+        return s.encode("latin-1")
+    def u(s):
+        return s
+    unichr = chr
+    if sys.version_info[1] <= 1:
+        def int2byte(i):
+            return bytes((i,))
+    else:
+        # This is about 2x faster than the implementation above on 3.2+
+        int2byte = operator.methodcaller("to_bytes", 1, "big")
+    byte2int = operator.itemgetter(0)
+    indexbytes = operator.getitem
+    iterbytes = iter
+    import io
+    StringIO = io.StringIO
+    BytesIO = io.BytesIO
+    _assertCountEqual = "assertCountEqual"
+    _assertRaisesRegex = "assertRaisesRegex"
+    _assertRegex = "assertRegex"
+else:
+    def b(s):
+        return s
+    # Workaround for standalone backslash
+    def u(s):
+        return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
+    unichr = unichr
+    int2byte = chr
+    def byte2int(bs):
+        return ord(bs[0])
+    def indexbytes(buf, i):
+        return ord(buf[i])
+    iterbytes = functools.partial(itertools.imap, ord)
+    import StringIO
+    StringIO = BytesIO = StringIO.StringIO
+    _assertCountEqual = "assertItemsEqual"
+    _assertRaisesRegex = "assertRaisesRegexp"
+    _assertRegex = "assertRegexpMatches"
+_add_doc(b, """Byte literal""")
+_add_doc(u, """Text literal""")
+
+
+def assertCountEqual(self, *args, **kwargs):
+    return getattr(self, _assertCountEqual)(*args, **kwargs)
+
+
+def assertRaisesRegex(self, *args, **kwargs):
+    return getattr(self, _assertRaisesRegex)(*args, **kwargs)
+
+
+def assertRegex(self, *args, **kwargs):
+    return getattr(self, _assertRegex)(*args, **kwargs)
+
+
+if PY3:
+    exec_ = getattr(moves.builtins, "exec")
+
+
+    def reraise(tp, value, tb=None):
+        if value is None:
+            value = tp()
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
+
+else:
+    def exec_(_code_, _globs_=None, _locs_=None):
+        """Execute code in a namespace."""
+        if _globs_ is None:
+            frame = sys._getframe(1)
+            _globs_ = frame.f_globals
+            if _locs_ is None:
+                _locs_ = frame.f_locals
+            del frame
+        elif _locs_ is None:
+            _locs_ = _globs_
+        exec("""exec _code_ in _globs_, _locs_""")
+
+
+    exec_("""def reraise(tp, value, tb=None):
+    raise tp, value, tb
+""")
+
+
+if sys.version_info[:2] == (3, 2):
+    exec_("""def raise_from(value, from_value):
+    if from_value is None:
+        raise value
+    raise value from from_value
+""")
+elif sys.version_info[:2] > (3, 2):
+    exec_("""def raise_from(value, from_value):
+    raise value from from_value
+""")
+else:
+    def raise_from(value, from_value):
+        raise value
+
+
+print_ = getattr(moves.builtins, "print", None)
+if print_ is None:
+    def print_(*args, **kwargs):
+        """The new-style print function for Python 2.4 and 2.5."""
+        fp = kwargs.pop("file", sys.stdout)
+        if fp is None:
+            return
+        def write(data):
+            if not isinstance(data, basestring):
+                data = str(data)
+            # If the file has an encoding, encode unicode with it.
+            if (isinstance(fp, file) and
+                isinstance(data, unicode) and
+                fp.encoding is not None):
+                errors = getattr(fp, "errors", None)
+                if errors is None:
+                    errors = "strict"
+                data = data.encode(fp.encoding, errors)
+            fp.write(data)
+        want_unicode = False
+        sep = kwargs.pop("sep", None)
+        if sep is not None:
+            if isinstance(sep, unicode):
+                want_unicode = True
+            elif not isinstance(sep, str):
+                raise TypeError("sep must be None or a string")
+        end = kwargs.pop("end", None)
+        if end is not None:
+            if isinstance(end, unicode):
+                want_unicode = True
+            elif not isinstance(end, str):
+                raise TypeError("end must be None or a string")
+        if kwargs:
+            raise TypeError("invalid keyword arguments to print()")
+        if not want_unicode:
+            for arg in args:
+                if isinstance(arg, unicode):
+                    want_unicode = True
+                    break
+        if want_unicode:
+            newline = unicode("\n")
+            space = unicode(" ")
+        else:
+            newline = "\n"
+            space = " "
+        if sep is None:
+            sep = space
+        if end is None:
+            end = newline
+        for i, arg in enumerate(args):
+            if i:
+                write(sep)
+            write(arg)
+        write(end)
+if sys.version_info[:2] < (3, 3):
+    _print = print_
+    def print_(*args, **kwargs):
+        fp = kwargs.get("file", sys.stdout)
+        flush = kwargs.pop("flush", False)
+        _print(*args, **kwargs)
+        if flush and fp is not None:
+            fp.flush()
+
+_add_doc(reraise, """Reraise an exception.""")
+
+if sys.version_info[0:2] < (3, 4):
+    def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
+              updated=functools.WRAPPER_UPDATES):
+        def wrapper(f):
+            f = functools.wraps(wrapped, assigned, updated)(f)
+            f.__wrapped__ = wrapped
+            return f
+        return wrapper
+else:
+    wraps = functools.wraps
+
+def with_metaclass(meta, *bases):
+    """Create a base class with a metaclass."""
+    # This requires a bit of explanation: the basic idea is to make a dummy
+    # metaclass for one level of class instantiation that replaces itself with
+    # the actual metaclass.
+    class metaclass(meta):
+        def __new__(cls, name, this_bases, d):
+            return meta(name, bases, d)
+    return type.__new__(metaclass, 'temporary_class', (), {})
+
+
+def add_metaclass(metaclass):
+    """Class decorator for creating a class with a metaclass."""
+    def wrapper(cls):
+        orig_vars = cls.__dict__.copy()
+        slots = orig_vars.get('__slots__')
+        if slots is not None:
+            if isinstance(slots, str):
+                slots = [slots]
+            for slots_var in slots:
+                orig_vars.pop(slots_var)
+        orig_vars.pop('__dict__', None)
+        orig_vars.pop('__weakref__', None)
+        return metaclass(cls.__name__, cls.__bases__, orig_vars)
+    return wrapper
+
+
+def python_2_unicode_compatible(klass):
+    """
+    A decorator that defines __unicode__ and __str__ methods under Python 2.
+    Under Python 3 it does nothing.
+
+    To support Python 2 and 3 with a single code base, define a __str__ method
+    returning text and apply this decorator to the class.
+    """
+    if PY2:
+        if '__str__' not in klass.__dict__:
+            raise ValueError("@python_2_unicode_compatible cannot be applied "
+                             "to %s because it doesn't define __str__()." %
+                             klass.__name__)
+        klass.__unicode__ = klass.__str__
+        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
+    return klass
+
+
+# Complete the moves implementation.
+# This code is at the end of this module to speed up module loading.
+# Turn this module into a package.
+__path__ = []  # required for PEP 302 and PEP 451
+__package__ = __name__  # see PEP 366 @ReservedAssignment
+if globals().get("__spec__") is not None:
+    __spec__.submodule_search_locations = []  # PEP 451 @UndefinedVariable
+# Remove other six meta path importers, since they cause problems. This can
+# happen if six is removed from sys.modules and then reloaded. (Setuptools does
+# this for some reason.)
+if sys.meta_path:
+    for i, importer in enumerate(sys.meta_path):
+        # Here's some real nastiness: Another "instance" of the six module might
+        # be floating around. Therefore, we can't use isinstance() to check for
+        # the six meta path importer, since the other six instance will have
+        # inserted an importer with different class.
+        if (type(importer).__name__ == "_SixMetaPathImporter" and
+            importer.name == __name__):
+            del sys.meta_path[i]
+            break
+    del i, importer
+# Finally, add the importer to the meta path import hook.
+sys.meta_path.append(_importer)
diff --git a/vim-plugins/bundle/python-mode/pymode/lint.py b/vim-plugins/bundle/python-mode/pymode/lint.py
new file mode 100644
index 0000000..57c97f7
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/lint.py
@@ -0,0 +1,83 @@
+"""Pylama integration."""
+
+from .environment import env
+from .utils import silence_stderr
+
+import os.path
+
+
+from pylama.lint.extensions import LINTERS
+
+try:
+    from pylama.lint.pylama_pylint import Linter
+    LINTERS['pylint'] = Linter()
+except Exception: # noqa
+    pass
+
+
+def code_check():
+    """Run pylama and check current file.
+
+    :return bool:
+
+    """
+    with silence_stderr():
+
+        from pylama.core import run
+        from pylama.main import parse_options
+
+        if not env.curbuf.name:
+            return env.stop()
+
+        linters = env.var('g:pymode_lint_checkers')
+        env.debug(linters)
+
+        options = parse_options(
+            linters=linters, force=1,
+            ignore=env.var('g:pymode_lint_ignore'),
+            select=env.var('g:pymode_lint_select'),
+        )
+
+        for linter in linters:
+            opts = env.var('g:pymode_lint_options_%s' % linter, silence=True)
+            if opts:
+                options.linters_params[linter] = options.linters_params.get(linter, {})
+                options.linters_params[linter].update(opts)
+
+        env.debug(options)
+
+        path = os.path.relpath(env.curbuf.name, env.curdir)
+        env.debug("Start code check: ", path)
+
+        if getattr(options, 'skip', None) and any(p.match(path) for p in options.skip): # noqa
+            env.message('Skip code checking.')
+            env.debug("Skipped")
+            return env.stop()
+
+        if env.options.get('debug'):
+            from pylama.core import LOGGER, logging
+            LOGGER.setLevel(logging.DEBUG)
+
+        errors = run(path, code='\n'.join(env.curbuf) + '\n', options=options)
+
+    env.debug("Find errors: ", len(errors))
+    sort_rules = env.var('g:pymode_lint_sort')
+
+    def __sort(e):
+        try:
+            return sort_rules.index(e.get('type'))
+        except ValueError:
+            return 999
+
+    if sort_rules:
+        env.debug("Find sorting: ", sort_rules)
+        errors = sorted(errors, key=__sort)
+
+    for e in errors:
+        e._info['bufnr'] = env.curbuf.number
+        if e._info['col'] is None:
+            e._info['col'] = 1
+
+    env.run('g:PymodeLocList.current().extend', [e._info for e in errors])
+
+# pylama:ignore=W0212,E1103
diff --git a/vim-plugins/bundle/python-mode/pymode/rope.py b/vim-plugins/bundle/python-mode/pymode/rope.py
new file mode 100644
index 0000000..3a20c26
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/rope.py
@@ -0,0 +1,935 @@
+"""Integration with Rope library."""
+
+from __future__ import absolute_import, print_function
+
+import os.path
+import re
+import site
+import sys
+
+from rope.base import project, libutils, exceptions, change, worder, pycore
+from rope.base.fscommands import FileSystemCommands # noqa
+from rope.base.taskhandle import TaskHandle # noqa
+from rope.contrib import autoimport as rope_autoimport, codeassist, findit, generate # noqa
+from rope.refactor import ModuleToPackage, ImportOrganizer, rename, extract, inline, usefunction, move, change_signature, importutils # noqa
+
+from .environment import env
+
+
+def look_ropeproject(path):
+    """Search for ropeproject in current and parent dirs.
+
+    :return str|None: A finded path
+
+    """
+    env.debug('Look project', path)
+    p = os.path.abspath(path)
+
+    while True:
+        if '.ropeproject' in os.listdir(p):
+            return p
+
+        new_p = os.path.abspath(os.path.join(p, ".."))
+        if new_p == p:
+            return path
+
+        p = new_p
+
+
+@env.catch_exceptions
+def completions():
+    """ Search completions.
+
+    :return None:
+
+    """
+    row, col = env.cursor
+    if env.var('a:findstart', True):
+        count = 0
+        for char in reversed(env.current.line[:col]):
+            if not re.match(r'[\w\d]', char):
+                break
+            count += 1
+        env.debug('Complete find start', (col - count))
+        return env.stop(col - count)
+
+    base = env.var('a:base')
+    source, offset = env.get_offset_params((row, col), base)
+    proposals = get_proporsals(source, offset, base)
+    return env.stop(proposals)
+
+
+FROM_RE = re.compile(r'^\s*from\s+[\.\w\d_]+$')
+
+
+@env.catch_exceptions
+def complete(dot=False):
+    """ Ctrl+Space completion.
+
+    :return bool: success
+
+    """
+    row, col = env.cursor
+    source, offset = env.get_offset_params()
+
+    cline = env.current.line[:col]
+    env.debug('dot completion', cline)
+    if FROM_RE.match(cline) or cline.endswith('..') or cline.endswith('\.'):  # noqa
+        return env.stop("")
+
+    proposals = get_proporsals(source, offset, dot=dot)
+    if not proposals:
+        return False
+
+    prefix = proposals[0]['word']
+
+    # Find common part
+    for p in proposals:
+        common = len([
+            c1 for c1, c2 in zip(prefix, p['word']) if c1 == c2 and c1 != ' '
+        ])
+        prefix = prefix[:common]
+    s_offset = codeassist.starting_offset(source, offset)
+    p_prefix = prefix[offset - s_offset:]
+    line = env.lines[row - 1]
+    cline = line[:col] + p_prefix + line[col:]
+    if cline != line:
+        env.curbuf[row - 1] = env.prepare_value(cline, dumps=False)
+    env.current.window.cursor = (row, col + len(p_prefix))
+    env.run('complete', col - len(prefix) + len(p_prefix) + 1, proposals)
+    return True
+
+
+def get_proporsals(source, offset, base='', dot=False):
+    """ Code assist.
+
+    :return str:
+
+    """
+    with RopeContext() as ctx:  # noqa
+
+        try:
+            proposals = codeassist.code_assist(
+                ctx.project, source, offset, ctx.resource, maxfixes=3,
+                later_locals=False)
+
+        except exceptions.ModuleSyntaxError:
+            proposals = []
+
+        proposals = sorted(proposals, key=_sort_proporsals)
+
+        out = []
+        preview = 'preview' in ctx.options.get('completeopt')
+        for p in proposals:
+            out.append(dict(
+                word=p.name,
+                menu=p.type,
+                kind=p.scope + ':',
+                info=p.get_doc() or "No docs." if preview else "",
+            ))
+
+        out = _get_autoimport_proposals(out, ctx, source, offset, dot=dot)
+
+    return out
+
+
+@env.catch_exceptions
+def goto():
+    """ Goto definition. """
+    with RopeContext() as ctx:
+        source, offset = env.get_offset_params()
+
+        found_resource, line = codeassist.get_definition_location(
+            ctx.project, source, offset, ctx.resource, maxfixes=3)
+
+        if not found_resource:
+            env.error('Definition not found')
+            return
+
+        env.goto_file(
+            found_resource.real_path,
+            cmd=ctx.options.get('goto_definition_cmd'))
+        env.goto_line(line)
+
+
+@env.catch_exceptions
+def show_doc():
+    """ Show documentation. """
+    with RopeContext() as ctx:
+        source, offset = env.get_offset_params()
+        try:
+            doc = codeassist.get_doc(
+                ctx.project, source, offset, ctx.resource, maxfixes=3)
+            if not doc:
+                raise exceptions.BadIdentifierError
+            env.let('l:output', doc.split('\n'))
+        except exceptions.BadIdentifierError:
+            env.error("No documentation found.")
+
+
+def find_it():
+    """ Find occurrences. """
+    with RopeContext() as ctx:
+        _, offset = env.get_offset_params()
+        try:
+            occurrences = findit.find_occurrences(
+                ctx.project, ctx.resource, offset)
+        except exceptions.BadIdentifierError:
+            occurrences = []
+
+    lst = []
+    for oc in occurrences:
+        lst.append(dict(
+            filename=oc.resource.path,
+            text=env.lines[oc.lineno - 1] if oc.resource.real_path == env.curbuf.name else "", # noqa
+            lnum=oc.lineno,
+        ))
+    env.let('loclist._loclist', lst)
+
+
+def update_python_path(paths):
+    """ Update sys.path and make sure the new items come first. """
+    old_sys_path_items = list(sys.path)
+
+    for path in paths:
+        # see if it is a site dir
+        if path.find('site-packages') != -1:
+            site.addsitedir(path)
+
+        else:
+            sys.path.insert(0, path)
+
+    # Reorder sys.path so new directories at the front.
+    new_sys_path_items = set(sys.path) - set(old_sys_path_items)
+    sys.path = list(new_sys_path_items) + old_sys_path_items
+
+
+def organize_imports():
+    """ Organize imports in current file. """
+    with RopeContext() as ctx:
+        organizer = ImportOrganizer(ctx.project)
+        changes = organizer.organize_imports(ctx.resource)
+        if changes is not None:
+            progress = ProgressHandler('Organize imports')
+            ctx.project.do(changes, task_handle=progress.handle)
+            reload_changes(changes)
+
+
+@env.catch_exceptions
+def regenerate():
+    """ Clear cache. """
+    with RopeContext() as ctx:
+        ctx.project.pycore._invalidate_resource_cache(ctx.resource) # noqa
+        ctx.importer.generate_cache()
+        ctx.project.sync()
+
+
+def new():
+    """ Create a new project. """
+    root = None
+    if env.var('a:0') != '0':
+        root = env.var('a:1')
+    else:
+        default = env.var('g:pymode_rope_project_root')
+        if not default:
+            default = env.var('getcwd()')
+        root = env.var('input("Enter project root: ", "%s")' % default)
+    ropefolder = env.var('g:pymode_rope_ropefolder')
+    prj = project.Project(projectroot=root, ropefolder=ropefolder)
+    prj.close()
+    env.message("Project is opened: %s" % root)
+
+
+def undo():
+    """ Undo last changes.
+
+    :return bool:
+
+    """
+    with RopeContext() as ctx:
+        changes = ctx.project.history.tobe_undone
+        if changes is None:
+            env.error('Nothing to undo!')
+            return False
+
+        if env.user_confirm('Undo [%s]?' % str(changes)):
+            progress = ProgressHandler('Undo %s' % str(changes))
+            for c in ctx.project.history.undo(task_handle=progress.handle):
+                reload_changes(c)
+
+
+def redo():
+    """ Redo last changes.
+
+    :return bool:
+
+    """
+    with RopeContext() as ctx:
+        changes = ctx.project.history.tobe_redone
+        if changes is None:
+            env.error('Nothing to redo!')
+            return False
+
+        if env.user_confirm('Redo [%s]?' % str(changes)):
+            progress = ProgressHandler('Redo %s' % str(changes))
+            for c in ctx.project.history.redo(task_handle=progress.handle):
+                reload_changes(c)
+
+
+def cache_project(cls):
+    """ Cache projects.
+
+    :return func:
+
+    """
+    projects = dict()
+    resources = dict()
+
+    def get_ctx(*args, **kwargs):
+        path = env.curbuf.name
+        if resources.get(path):
+            return resources.get(path)
+
+        project_path = env.var('g:pymode_rope_project_root')
+        if not project_path:
+            project_path = env.curdir
+            env.debug('Look ctx', project_path)
+            if env.var('g:pymode_rope_lookup_project', True):
+                project_path = look_ropeproject(project_path)
+
+        if not os.path.exists(project_path):
+            env.error("Rope project root not exist: %s" % project_path)
+            ctx = None
+
+        else:
+            ctx = projects.get(project_path)
+
+        if not ctx:
+            projects[project_path] = ctx = cls(path, project_path)
+
+        resources[path] = ctx
+        return ctx
+    return get_ctx
+
+
+def autoimport():
+    """ Autoimport modules.
+
+    :return bool:
+
+    """
+    word = env.var('a:word')
+    if not word:
+        env.error("Should be word under cursor.")
+        return False
+
+    with RopeContext() as ctx:
+        if not ctx.importer.names:
+            ctx.generate_autoimport_cache()
+        modules = ctx.importer.get_modules(word)
+        if not modules:
+            env.message('Global name %s not found.' % word)
+            return False
+
+        if len(modules) == 1:
+            _insert_import(word, modules[0], ctx)
+
+        else:
+            module = env.user_input_choices(
+                'Which module to import:', *modules)
+            _insert_import(word, module, ctx)
+
+        return True
+
+
+@cache_project
+class RopeContext(object):
+
+    """ A context manager to have a rope project context. """
+
+    projects = {}
+    resource = {}
+
+    def __init__(self, path=None, project_path=None):
+        """ Init Rope context. """
+        self.path = path
+
+        self.project = project.Project(project_path, fscommands=FileSystemCommands())
+
+        self.importer = rope_autoimport.AutoImport(
+            project=self.project, observe=False)
+
+        update_python_path(self.project.prefs.get('python_path', []))
+
+        self.resource = None
+        self.current = None
+        self.options = dict(
+            completeopt=env.var('&completeopt'),
+            autoimport=env.var('g:pymode_rope_autoimport', True),
+            autoimport_modules=env.var('g:pymode_rope_autoimport_modules'),
+            goto_definition_cmd=env.var('g:pymode_rope_goto_definition_cmd'),
+        )
+
+        if os.path.exists("%s/__init__.py" % project_path):
+            sys.path.append(project_path)
+
+        if self.options.get('autoimport'):
+            self.generate_autoimport_cache()
+
+        env.debug('Context init', project_path)
+        env.message('Init Rope project: %s' % project_path)
+
+    def __enter__(self):
+        """ Enter to Rope ctx. """
+        env.let('g:pymode_rope_current', self.project.root.real_path)
+        self.project.validate(self.project.root)
+        self.resource = libutils.path_to_resource(
+            self.project, env.curbuf.name, 'file')
+
+        if not self.resource.exists() or os.path.isdir(
+                self.resource.real_path):
+            self.resource = None
+        else:
+            env.debug('Found resource', self.resource.path)
+
+        return self
+
+    def __exit__(self, t, value, traceback):
+        """ Exit from Rope ctx. """
+        if t is None:
+            self.project.close()
+
+    def generate_autoimport_cache(self):
+        """ Update autoimport cache. """
+        env.message('Regenerate autoimport cache.')
+        modules = self.options.get('autoimport_modules', [])
+
+        def _update_cache(importer, modules=None):
+            importer.generate_cache()
+            if modules:
+                importer.generate_modules_cache(modules)
+            importer.project.sync()
+
+        _update_cache(self.importer, modules)
+
+
+class ProgressHandler(object):
+
+    """ Handle task progress. """
+
+    def __init__(self, msg):
+        """ Init progress handler. """
+        self.handle = TaskHandle(name="refactoring_handle")
+        self.handle.add_observer(self)
+        self.message = msg
+
+    def __call__(self):
+        """ Show current progress. """
+        percent_done = self.handle.current_jobset().get_percent_done()
+        env.message('%s - done %s%%' % (self.message, percent_done))
+
+
+_scope_weight = {
+    'local': 10, 'attribute': 20, 'global': 30, 'imported': 40, 'builtin': 50}
+
+
+def _sort_proporsals(p):
+    return (
+        _scope_weight.get(p.scope, 100), int(p.name.startswith('_')), p.name)
+
+
+class Refactoring(object): # noqa
+
+    """ Base class for refactor operations. """
+
+    def run(self):
+        """ Run refactoring.
+
+        :return bool:
+
+        """
+        with RopeContext() as ctx:
+
+            if not ctx.resource:
+                env.error("You should save the file before refactoring.")
+                return None
+
+            try:
+                env.message(self.__doc__)
+                refactor = self.get_refactor(ctx)
+                input_str = self.get_input_str(refactor, ctx)
+                if not input_str:
+                    return False
+
+                action = env.user_input_choices(
+                    'Choose what to do:', 'perform', 'preview',
+                    'perform in class hierarchy',
+                    'preview in class hierarchy')
+
+                in_hierarchy = action.endswith("in class hierarchy")
+
+                changes = self.get_changes(refactor, input_str, in_hierarchy)
+
+                if not action:
+                    return False
+
+                if action.startswith('preview'):
+                    print("\n   ")
+                    print("-------------------------------")
+                    print("\n%s\n" % changes.get_description())
+                    print("-------------------------------\n\n")
+                    if not env.user_confirm('Do the changes?'):
+                        return False
+
+                progress = ProgressHandler('Apply changes ...')
+                ctx.project.do(changes, task_handle=progress.handle)
+                reload_changes(changes)
+            except exceptions.RefactoringError as e:
+                env.error(str(e))
+
+            except Exception as e: # noqa
+                env.error('Unhandled exception in Pymode: %s' % e)
+
+    @staticmethod
+    def get_refactor(ctx):
+        """ Get refactor object. """
+        raise NotImplementedError
+
+    @staticmethod
+    def get_input_str(refactor, ctx):
+        """ Get user input. Skip by default.
+
+        :return bool: True
+
+        """
+        return True
+
+    @staticmethod
+    def get_changes(refactor, input_str, in_hierarchy=False):
+        return refactor.get_changes(input_str)
+
+
+class RenameRefactoring(Refactoring):
+
+    """ Rename var/function/method/class. """
+
+    def __init__(self, module=False):
+        self.module = module
+        super(RenameRefactoring, self).__init__()
+
+    def get_refactor(self, ctx):
+        """ Function description.
+
+        :return Rename:
+
+        """
+        offset = None
+        if not self.module:
+            _, offset = env.get_offset_params()
+        env.debug('Prepare rename', offset)
+        return rename.Rename(ctx.project, ctx.resource, offset)
+
+    def get_input_str(self, refactor, ctx):
+        """ Return user input. """
+
+        oldname = str(refactor.get_old_name())
+        msg = 'Renaming method/variable. New name:'
+        if self.module:
+            msg = 'Renaming module. New name:'
+        newname = env.user_input(msg, oldname)
+
+        if newname == oldname:
+            env.message("Nothing to do.")
+            return False
+
+        return newname
+
+    @staticmethod
+    def get_changes(refactor, input_str, in_hierarchy=False):
+        """ Get changes.
+
+        :return Changes:
+
+        """
+        return refactor.get_changes(input_str, in_hierarchy=in_hierarchy)
+
+
+class ExtractMethodRefactoring(Refactoring):
+
+    """ Extract method. """
+
+    @staticmethod
+    def get_input_str(refactor, ctx):
+        """ Return user input. """
+
+        return env.user_input('New method name:')
+
+    @staticmethod
+    def get_refactor(ctx):
+        """ Function description.
+
+        :return Rename:
+
+        """
+        cursor1, cursor2 = env.curbuf.mark('<'), env.curbuf.mark('>')
+        _, offset1 = env.get_offset_params(cursor1)
+        _, offset2 = env.get_offset_params(cursor2)
+        return extract.ExtractMethod(
+            ctx.project, ctx.resource, offset1, offset2)
+
+
+class ExtractVariableRefactoring(Refactoring):
+
+    """ Extract variable. """
+
+    @staticmethod
+    def get_input_str(refactor, ctx):
+        """ Return user input. """
+
+        return env.user_input('New variable name:')
+
+    @staticmethod
+    def get_refactor(ctx):
+        """ Function description.
+
+        :return Rename:
+
+        """
+        cursor1, cursor2 = env.curbuf.mark('<'), env.curbuf.mark('>')
+        _, offset1 = env.get_offset_params(cursor1)
+        _, offset2 = env.get_offset_params(cursor2)
+        return extract.ExtractVariable(
+            ctx.project, ctx.resource, offset1, offset2)
+
+
+class InlineRefactoring(Refactoring):
+
+    """ Inline variable/method. """
+
+    @staticmethod
+    def get_refactor(ctx):
+        """ Function description.
+
+        :return Rename:
+
+        """
+        _, offset = env.get_offset_params()
+        return inline.create_inline(ctx.project, ctx.resource, offset)
+
+    @staticmethod
+    def get_changes(refactor, input_str, in_hierarchy=False):
+        """ Get changes.
+
+        :return Changes:
+
+        """
+        return refactor.get_changes()
+
+
+class UseFunctionRefactoring(Refactoring):
+
+    """ Use selected function as possible. """
+
+    @staticmethod
+    def get_refactor(ctx):
+        """ Function description.
+
+        :return Rename:
+
+        """
+        _, offset = env.get_offset_params()
+        return usefunction.UseFunction(ctx.project, ctx.resource, offset)
+
+    @staticmethod
+    def get_changes(refactor, input_str, in_hierarchy=False):
+        """ Get changes.
+
+        :return Changes:
+
+        """
+        return refactor.get_changes()
+
+
+class ModuleToPackageRefactoring(Refactoring):
+
+    """ Convert module to package. """
+
+    @staticmethod
+    def get_refactor(ctx):
+        """ Function description.
+
+        :return Rename:
+
+        """
+        return ModuleToPackage(ctx.project, ctx.resource)
+
+    @staticmethod
+    def get_changes(refactor, input_str, in_hierarchy=False):
+        """ Get changes.
+
+        :return Changes:
+
+        """
+        return refactor.get_changes()
+
+
+class MoveRefactoring(Refactoring):
+
+    """ Move method/module to other class/global. """
+
+    @staticmethod
+    def get_input_str(refactor, ctx):
+        """ Get destination.
+
+        :return str:
+
+        """
+
+        return env.user_input('Enter destination:')
+
+    @staticmethod
+    def get_refactor(ctx):
+        """ Function description.
+
+        :return Rename:
+
+        """
+        _, offset = env.get_offset_params()
+        if offset == 0:
+            offset = None
+        return move.create_move(ctx.project, ctx.resource, offset)
+
+
+class ChangeSignatureRefactoring(Refactoring):
+
+    """ Change function signature (add/remove/sort arguments). """
+
+    @staticmethod
+    def get_input_str(refactor, ctx):
+        """ Get destination.
+
+        :return str:
+
+        """
+        args = refactor.get_args()
+        default = ', '.join(a[0] for a in args)
+        return env.user_input('Change the signature:', default)
+
+    @staticmethod
+    def get_refactor(ctx):
+        """ Function description.
+
+        :return Rename:
+
+        """
+        _, offset = env.get_offset_params()
+        return change_signature.ChangeSignature(
+            ctx.project, ctx.resource, offset)
+
+    def get_changes(self, refactor, input_string, in_hierarchy=False):
+        """ Function description.
+
+        :return Rope.changes:
+
+        """
+        args = re.sub(r'[\s\(\)]+', '', input_string).split(',')
+        olds = [arg[0] for arg in refactor.get_args()]
+
+        changers = []
+        for arg in [a for a in olds if a not in args]:
+            changers.append(change_signature.ArgumentRemover(olds.index(arg)))
+            olds.remove(arg)
+
+        order = []
+        for index, arg in enumerate(args):
+            if arg not in olds:
+                changers.append(change_signature.ArgumentAdder(index, arg))
+                olds.insert(index, arg)
+            order.append(olds.index(arg))
+
+        changers.append(change_signature.ArgumentReorderer(
+            order, autodef='None'))
+
+        return refactor.get_changes(changers, in_hierarchy=in_hierarchy)
+
+
+class GenerateElementRefactoring(Refactoring):
+
+    """ Class description. """
+
+    def __init__(self, kind, *args, **kwargs):
+        """ Function description. """
+        self.kind = kind
+        super(GenerateElementRefactoring, self).__init__(*args, **kwargs)
+
+    def get_refactor(self, ctx):
+        """ Function description.
+
+        :return Rename:
+
+        """
+        _, offset = env.get_offset_params()
+        return generate.create_generate(
+            self.kind, ctx.project, ctx.resource, offset)
+
+    def get_changes(self, refactor, input_str, in_hierarchy=False):
+        """ Function description.
+
+        :return Rope.changes:
+
+        """
+
+        return refactor.get_changes()
+
+
+@env.catch_exceptions
+def reload_changes(changes):
+    """ Reload changed buffers. """
+
+    resources = changes.get_changed_resources()
+    moved = _get_moved_resources(changes) # noqa
+    current = env.curbuf.number
+
+    for f in resources:
+        bufnr = env.var('bufnr("%s")' % f.real_path)
+        env.goto_buffer(bufnr)
+
+        path = env.curbuf.name
+        if f in moved:
+            path = moved[f].real_path
+
+        env.debug('Reload', f.real_path, path, bufnr)
+        env.goto_file(path, 'e!', force=True)
+        env.message("%s has been changed." % f.real_path, history=True)
+
+    env.goto_buffer(current)
+
+
+def _get_moved_resources(changes):
+
+    moved = dict()
+
+    if isinstance(changes, change.ChangeSet):
+        for c in changes.changes:
+            moved.update(_get_moved_resources(c))
+
+    if isinstance(changes, change.MoveResource):
+        moved[changes.resource] = changes.new_resource
+
+    return moved
+
+
+def _get_autoimport_proposals(out, ctx, source, offset, dot=False):
+
+    if not ctx.options.get('autoimport') or dot:
+        return out
+
+    if '.' in codeassist.starting_expression(source, offset):
+        return out
+
+    current_offset = offset - 1
+    while current_offset > 0 and (
+            source[current_offset].isalnum() or source[current_offset] == '_'):
+        current_offset -= 1
+    starting = source[current_offset:offset]
+    starting = starting.strip()
+
+    if not starting:
+        return out
+
+    for assist in ctx.importer.import_assist(starting):
+        out.append(dict(
+            abbr=' : '.join(assist),
+            word=assist[0],
+            kind='autoimport:',
+        ))
+
+    return out
+
+
+@env.catch_exceptions
+def complete_check():
+    """ Function description.
+
+    :return bool:
+
+    """
+
+    row, column = env.cursor
+    line = env.lines[row - 1]
+    word_finder = worder.Worder(line, True)
+    parent, name, _ = word_finder.get_splitted_primary_before(column - 1)
+    if parent:
+        return False
+
+    with RopeContext() as ctx:
+        modules = ctx.importer.get_modules(name)
+
+        if not modules:
+            return False
+
+        if name in ctx.project.pycore.resource_to_pyobject(ctx.resource):
+            return False
+
+        if not env.user_confirm("Import %s?" % name, True):
+            return False
+
+        if len(modules) == 1:
+            _insert_import(name, modules[0], ctx)
+
+        else:
+            module = env.user_input_choices('With module to import:', *modules)
+            if module:
+                _insert_import(name, module, ctx)
+
+
+def _insert_import(name, module, ctx):
+    if not ctx.resource:
+        source, _ = env.get_offset_params()
+        lineno = ctx.importer.find_insertion_line(source)
+        line = 'from %s import %s' % (module, name)
+        env.curbuf[lineno - 1:lineno - 1] = [
+            env.prepare_value(line, dumps=False)]
+        return True
+
+    pyobject = ctx.project.pycore.resource_to_pyobject(ctx.resource)
+    import_tools = importutils.ImportTools(ctx.project.pycore)
+    module_imports = import_tools.module_imports(pyobject)
+    new_import = importutils.FromImport(module, 0, [[name, None]])
+    module_imports.add_import(new_import)
+    changes = change.ChangeContents(
+        ctx.resource, module_imports.get_changed_source())
+
+    action = env.user_input_choices(
+        'Choose what to do:', 'perform', 'preview')
+
+    if not action:
+        return False
+
+    if action == 'preview':
+        print("\n   ")
+        print("-------------------------------")
+        print("\n%s\n" % changes.get_description())
+        print("-------------------------------\n\n")
+        if not env.user_confirm('Do the changes?'):
+            return False
+
+    progress = ProgressHandler('Apply changes ...')
+    ctx.project.do(changes, task_handle=progress.handle)
+    reload_changes(changes)
+
+
+# Monkey patch Rope
+def find_source_folders(self, folder):
+    """Look only python files an packages."""
+    for resource in folder.get_folders():
+        if self._is_package(resource):  # noqa
+            return [folder]
+
+    for resource in folder.get_files():
+        if resource.name.endswith('.py'):
+            return [folder]
+
+    return []
+
+pycore.PyCore._find_source_folders = find_source_folders  # noqa
diff --git a/vim-plugins/bundle/python-mode/pymode/run.py b/vim-plugins/bundle/python-mode/pymode/run.py
new file mode 100644
index 0000000..5c11364
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/run.py
@@ -0,0 +1,80 @@
+""" Code runnning support. """
+import sys
+from re import compile as re
+
+from ._compat import StringIO
+from .environment import env
+
+
+encoding = re(r'#.*coding[:=]\s*([-\w.]+)')
+
+
+def run_code():
+    """ Run python code in current buffer.
+
+    :returns: None
+
+    """
+    errors, err = [], ''
+    line1, line2 = env.var('a:line1'), env.var('a:line2')
+    lines = __prepare_lines(line1, line2)
+    if encoding.match(lines[0]):
+        lines.pop(0)
+        if encoding.match(lines[0]):
+            lines.pop(0)
+    elif encoding.match(lines[1]):
+        lines.pop(1)
+
+    context = dict(
+        __name__='__main__',
+        __file__=env.var('expand("%:p")'),
+        input=env.user_input,
+        raw_input=env.user_input)
+
+    sys.stdout, stdout_ = StringIO(), sys.stdout
+    sys.stderr, stderr_ = StringIO(), sys.stderr
+
+    try:
+        code = compile('\n'.join(lines) + '\n', env.curbuf.name, 'exec')
+        sys.path.insert(0, env.curdir)
+        exec(code, context) # noqa
+        sys.path.pop(0)
+
+    except SystemExit as e:
+        if e.code:
+            # A non-false code indicates abnormal termination.
+            # A false code will be treated as a
+            # successful run, and the error will be hidden from Vim
+            env.error("Script exited with code %s" % e.code)
+            return env.stop()
+
+    except Exception:
+        import traceback
+        err = traceback.format_exc()
+
+    else:
+        err = sys.stderr.getvalue()
+
+    output = sys.stdout.getvalue()
+    output = env.prepare_value(output, dumps=False)
+    sys.stdout, sys.stderr = stdout_, stderr_
+
+    errors += [er for er in err.splitlines() if er and "<string>" not in er]
+
+    env.let('l:traceback', errors[2:])
+    env.let('l:output', [s for s in output.splitlines()])
+
+
+def __prepare_lines(line1, line2):
+
+    lines = [l.rstrip() for l in env.lines[int(line1) - 1:int(line2)]]
+
+    indent = 0
+    for line in lines:
+        if line:
+            indent = len(line) - len(line.lstrip())
+            break
+
+    if len(lines) == 1:
+        lines.append('')
+    return [l[indent:] for l in lines]
diff --git a/vim-plugins/bundle/python-mode/pymode/utils.py b/vim-plugins/bundle/python-mode/pymode/utils.py
new file mode 100644
index 0000000..1ce2e34
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/utils.py
@@ -0,0 +1,39 @@
+""" Pymode utils. """
+import os.path
+import sys
+import threading
+import warnings
+from contextlib import contextmanager
+
+import vim # noqa
+from ._compat import StringIO
+
+
+DEBUG = int(vim.eval('g:pymode_debug'))
+
+warnings.filterwarnings('ignore')
+
+
+@contextmanager
+def silence_stderr():
+    """ Redirect stderr. """
+    if DEBUG:
+        yield
+
+    else:
+        with threading.Lock():
+            stderr = sys.stderr
+            sys.stderr = StringIO()
+
+        yield
+
+        with threading.Lock():
+            sys.stderr = stderr
+
+
+def patch_paths():
+    """Patch python sys.path.
+
+    Load required modules from the plugin's sources.
+    """
+    sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'libs'))
diff --git a/vim-plugins/bundle/python-mode/pymode/virtualenv.py b/vim-plugins/bundle/python-mode/pymode/virtualenv.py
new file mode 100644
index 0000000..bf8f55f
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/pymode/virtualenv.py
@@ -0,0 +1,75 @@
+""" Support virtualenv in pymode. """
+
+import os
+import sys
+import site
+
+from .environment import env
+
+
+@env.catch_exceptions
+def enable_virtualenv():
+    """ Enable virtualenv for vim.
+
+    :return bool:
+
+    """
+    path = env.var('g:pymode_virtualenv_path')
+    # Normalize path to be an absolute path
+    # If an absolute path is provided, that path will be returned, otherwise
+    # the returned path will be an absolute path but computed relative
+    # to the current working directory
+    path = os.path.abspath(path)
+    enabled = env.var('g:pymode_virtualenv_enabled')
+    if path == enabled:
+        env.message('Virtualenv %s already enabled.' % path)
+        return env.stop()
+
+    activate_this = os.path.join(os.path.join(path, 'bin'), 'activate_this.py')
+
+    # Fix for windows
+    if not os.path.exists(activate_this):
+        activate_this = os.path.join(
+            os.path.join(path, 'Scripts'), 'activate_this.py')
+
+    try:
+        with open(activate_this) as f:
+            source = f.read()
+            exec(compile(  # noqa
+                source, activate_this, 'exec'), dict(__file__=activate_this))
+    except IOError:
+        _activate_env_from_path(path)
+
+    env.message('Activate virtualenv: ' + path)
+    env.let('g:pymode_virtualenv_enabled', path)
+    return True
+
+
+def _activate_env_from_path(env_path):
+    """ Fix when `activate_this.py` does not exist.
+
+        For Python 3.3 and newer, a new command-line tool `pyvenv` create venv
+        will not provide 'activate_this.py'.
+    """
+    prev_sys_path = list(sys.path)
+
+    if sys.platform == 'win32':
+        site_packages_paths = [os.path.join(env_path, 'Lib', 'site-packages')]
+    else:
+        lib_path = os.path.join(env_path, 'lib')
+        site_packages_paths = [os.path.join(lib_path, lib, 'site-packages')
+                               for lib in os.listdir(lib_path)]
+    for site_packages_path in site_packages_paths:
+        site.addsitedir(site_packages_path)
+
+    sys.real_prefix = sys.prefix
+    sys.prefix = env_path
+    sys.exec_prefix = env_path
+
+    # Move the added items to the front of the path:
+    new_sys_path = []
+    for item in list(sys.path):
+        if item not in prev_sys_path:
+            new_sys_path.append(item)
+            sys.path.remove(item)
+    sys.path[:0] = new_sys_path
diff --git a/vim-plugins/bundle/python-mode/python-mode.yaml b/vim-plugins/bundle/python-mode/python-mode.yaml
new file mode 100644
index 0000000..b5635e6
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/python-mode.yaml
@@ -0,0 +1,268 @@
+addon: python-mode
+description: "swissknife for python"
+files: 
+  - after/ftplugin/pyrex.vim
+  - after/ftplugin/python.vim
+  - after/indent/pyrex.vim
+  - after/indent/python.vim
+  - autoload/pymode/breakpoint.vim
+  - autoload/pymode/doc.vim
+  - autoload/pymode/folding.vim
+  - autoload/pymode/indent.vim
+  - autoload/pymode/lint.vim
+  - autoload/pymode/motion.vim
+  - autoload/pymode/rope.vim
+  - autoload/pymode/run.vim
+  - autoload/pymode/tools/loclist.vim
+  - autoload/pymode/tools/signs.vim
+  - autoload/pymode/troubleshooting.vim
+  - autoload/pymode/virtualenv.vim
+  - autoload/pymode.vim
+  - ftplugin/pyrex.vim
+  - ftplugin/python/pymode.vim
+  - plugin/pymode.vim
+  - syntax/pyrex.vim
+  - syntax/python.vim
+  - pymode/__init__.py
+  - pymode/async.py
+  - pymode/autopep8.py
+  - pymode/environment.py
+  - pymode/libs/pylama/__init__.py
+  - pymode/libs/pylama/config.py
+  - pymode/libs/pylama/core.py
+  - pymode/libs/pylama/hook.py
+  - pymode/libs/pylama/libs/__init__.py
+  - pymode/libs/pylama/libs/importlib.py
+  - pymode/libs/pylama/libs/inirama.py
+  - pymode/libs/pylama/lint/__init__.py
+  - pymode/libs/pylama/lint/extensions.py
+  - pymode/libs/pylama/lint/pylama_mccabe/__init__.py
+  - pymode/libs/pylama/lint/pylama_mccabe/mccabe.py
+  - pymode/libs/pylama/lint/pylama_pep257/__init__.py
+  - pymode/libs/pylama/lint/pylama_pep257/pep257.py
+  - pymode/libs/pylama/lint/pylama_pep8/__init__.py
+  - pymode/libs/pylama/lint/pylama_pep8/pep8.py
+  - pymode/libs/pylama/lint/pylama_pyflakes/__init__.py
+  - pymode/libs/pylama/lint/pylama_pyflakes/pyflakes/__init__.py
+  - pymode/libs/pylama/lint/pylama_pyflakes/pyflakes/checker.py
+  - pymode/libs/pylama/lint/pylama_pyflakes/pyflakes/messages.py
+  - pymode/libs/pylama/lint/pylama_pylint/__init__.py
+  - pymode/libs/pylama/lint/pylama_pylint/main.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/__init__.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/__pkginfo__.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/__init__.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/__pkginfo__.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/as_string.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/bases.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/builder.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/exceptions.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/inference.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/manager.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/mixins.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/node_classes.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/nodes.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/protocols.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/raw_building.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/rebuilder.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/scoped_nodes.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/astroid/utils.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/__init__.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/base.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/classes.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/design_analysis.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/exceptions.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/format.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/imports.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/logging.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/misc.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/newstyle.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/raw_metrics.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/similar.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/stdlib.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/strings.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/typecheck.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/utils.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/checkers/variables.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/config.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/interfaces.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/lint.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/__init__.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/__init__.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/__pkginfo__.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/changelog.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/compat.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/configuration.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/decorators.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/deprecation.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/graph.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/interface.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/modutils.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/optik_ext.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/textutils.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/tree.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/ureports/__init__.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/ureports/docbook_writer.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/ureports/html_writer.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/ureports/nodes.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/ureports/text_writer.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/logilab/common/visitor.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/reporters/__init__.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/reporters/guireporter.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/reporters/html.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/reporters/text.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint/utils.py
+  - pymode/libs/pylama/main.py
+  - pymode/libs/pylama/tasks.py
+  - pymode/libs/pylama/utils.py
+  - pymode/libs2/rope/__init__.py
+  - pymode/libs2/rope/base/__init__.py
+  - pymode/libs2/rope/base/arguments.py
+  - pymode/libs2/rope/base/ast.py
+  - pymode/libs2/rope/base/astutils.py
+  - pymode/libs2/rope/base/builtins.py
+  - pymode/libs2/rope/base/change.py
+  - pymode/libs2/rope/base/codeanalyze.py
+  - pymode/libs2/rope/base/default_config.py
+  - pymode/libs2/rope/base/evaluate.py
+  - pymode/libs2/rope/base/exceptions.py
+  - pymode/libs2/rope/base/fscommands.py
+  - pymode/libs2/rope/base/history.py
+  - pymode/libs2/rope/base/libutils.py
+  - pymode/libs2/rope/base/oi/__init__.py
+  - pymode/libs2/rope/base/oi/doa.py
+  - pymode/libs2/rope/base/oi/memorydb.py
+  - pymode/libs2/rope/base/oi/objectdb.py
+  - pymode/libs2/rope/base/oi/objectinfo.py
+  - pymode/libs2/rope/base/oi/runmod.py
+  - pymode/libs2/rope/base/oi/soa.py
+  - pymode/libs2/rope/base/oi/soi.py
+  - pymode/libs2/rope/base/oi/transform.py
+  - pymode/libs2/rope/base/prefs.py
+  - pymode/libs2/rope/base/project.py
+  - pymode/libs2/rope/base/pycore.py
+  - pymode/libs2/rope/base/pynames.py
+  - pymode/libs2/rope/base/pynamesdef.py
+  - pymode/libs2/rope/base/pyobjects.py
+  - pymode/libs2/rope/base/pyobjectsdef.py
+  - pymode/libs2/rope/base/pyscopes.py
+  - pymode/libs2/rope/base/resourceobserver.py
+  - pymode/libs2/rope/base/resources.py
+  - pymode/libs2/rope/base/simplify.py
+  - pymode/libs2/rope/base/stdmods.py
+  - pymode/libs2/rope/base/taskhandle.py
+  - pymode/libs2/rope/base/utils.py
+  - pymode/libs2/rope/base/worder.py
+  - pymode/libs2/rope/contrib/__init__.py
+  - pymode/libs2/rope/contrib/autoimport.py
+  - pymode/libs2/rope/contrib/changestack.py
+  - pymode/libs2/rope/contrib/codeassist.py
+  - pymode/libs2/rope/contrib/finderrors.py
+  - pymode/libs2/rope/contrib/findit.py
+  - pymode/libs2/rope/contrib/fixmodnames.py
+  - pymode/libs2/rope/contrib/fixsyntax.py
+  - pymode/libs2/rope/contrib/generate.py
+  - pymode/libs2/rope/refactor/__init__.py
+  - pymode/libs2/rope/refactor/change_signature.py
+  - pymode/libs2/rope/refactor/encapsulate_field.py
+  - pymode/libs2/rope/refactor/extract.py
+  - pymode/libs2/rope/refactor/functionutils.py
+  - pymode/libs2/rope/refactor/importutils/__init__.py
+  - pymode/libs2/rope/refactor/importutils/actions.py
+  - pymode/libs2/rope/refactor/importutils/importinfo.py
+  - pymode/libs2/rope/refactor/importutils/module_imports.py
+  - pymode/libs2/rope/refactor/inline.py
+  - pymode/libs2/rope/refactor/introduce_factory.py
+  - pymode/libs2/rope/refactor/introduce_parameter.py
+  - pymode/libs2/rope/refactor/localtofield.py
+  - pymode/libs2/rope/refactor/method_object.py
+  - pymode/libs2/rope/refactor/move.py
+  - pymode/libs2/rope/refactor/multiproject.py
+  - pymode/libs2/rope/refactor/occurrences.py
+  - pymode/libs2/rope/refactor/patchedast.py
+  - pymode/libs2/rope/refactor/rename.py
+  - pymode/libs2/rope/refactor/restructure.py
+  - pymode/libs2/rope/refactor/similarfinder.py
+  - pymode/libs2/rope/refactor/sourceutils.py
+  - pymode/libs2/rope/refactor/suites.py
+  - pymode/libs2/rope/refactor/topackage.py
+  - pymode/libs2/rope/refactor/usefunction.py
+  - pymode/libs2/rope/refactor/wildcards.py
+  - pymode/libs3/rope/__init__.py
+  - pymode/libs3/rope/base/__init__.py
+  - pymode/libs3/rope/base/arguments.py
+  - pymode/libs3/rope/base/ast.py
+  - pymode/libs3/rope/base/astutils.py
+  - pymode/libs3/rope/base/builtins.py
+  - pymode/libs3/rope/base/change.py
+  - pymode/libs3/rope/base/codeanalyze.py
+  - pymode/libs3/rope/base/default_config.py
+  - pymode/libs3/rope/base/evaluate.py
+  - pymode/libs3/rope/base/exceptions.py
+  - pymode/libs3/rope/base/fscommands.py
+  - pymode/libs3/rope/base/history.py
+  - pymode/libs3/rope/base/libutils.py
+  - pymode/libs3/rope/base/oi/__init__.py
+  - pymode/libs3/rope/base/oi/doa.py
+  - pymode/libs3/rope/base/oi/memorydb.py
+  - pymode/libs3/rope/base/oi/objectdb.py
+  - pymode/libs3/rope/base/oi/objectinfo.py
+  - pymode/libs3/rope/base/oi/runmod.py
+  - pymode/libs3/rope/base/oi/soa.py
+  - pymode/libs3/rope/base/oi/soi.py
+  - pymode/libs3/rope/base/oi/transform.py
+  - pymode/libs3/rope/base/prefs.py
+  - pymode/libs3/rope/base/project.py
+  - pymode/libs3/rope/base/pycore.py
+  - pymode/libs3/rope/base/pynames.py
+  - pymode/libs3/rope/base/pynamesdef.py
+  - pymode/libs3/rope/base/pyobjects.py
+  - pymode/libs3/rope/base/pyobjectsdef.py
+  - pymode/libs3/rope/base/pyscopes.py
+  - pymode/libs3/rope/base/resourceobserver.py
+  - pymode/libs3/rope/base/resources.py
+  - pymode/libs3/rope/base/simplify.py
+  - pymode/libs3/rope/base/stdmods.py
+  - pymode/libs3/rope/base/taskhandle.py
+  - pymode/libs3/rope/base/utils.py
+  - pymode/libs3/rope/base/worder.py
+  - pymode/libs3/rope/contrib/__init__.py
+  - pymode/libs3/rope/contrib/autoimport.py
+  - pymode/libs3/rope/contrib/changestack.py
+  - pymode/libs3/rope/contrib/codeassist.py
+  - pymode/libs3/rope/contrib/finderrors.py
+  - pymode/libs3/rope/contrib/findit.py
+  - pymode/libs3/rope/contrib/fixmodnames.py
+  - pymode/libs3/rope/contrib/fixsyntax.py
+  - pymode/libs3/rope/contrib/generate.py
+  - pymode/libs3/rope/refactor/__init__.py
+  - pymode/libs3/rope/refactor/change_signature.py
+  - pymode/libs3/rope/refactor/encapsulate_field.py
+  - pymode/libs3/rope/refactor/extract.py
+  - pymode/libs3/rope/refactor/functionutils.py
+  - pymode/libs3/rope/refactor/importutils/__init__.py
+  - pymode/libs3/rope/refactor/importutils/actions.py
+  - pymode/libs3/rope/refactor/importutils/importinfo.py
+  - pymode/libs3/rope/refactor/importutils/module_imports.py
+  - pymode/libs3/rope/refactor/inline.py
+  - pymode/libs3/rope/refactor/introduce_factory.py
+  - pymode/libs3/rope/refactor/introduce_parameter.py
+  - pymode/libs3/rope/refactor/localtofield.py
+  - pymode/libs3/rope/refactor/method_object.py
+  - pymode/libs3/rope/refactor/move.py
+  - pymode/libs3/rope/refactor/multiproject.py
+  - pymode/libs3/rope/refactor/occurrences.py
+  - pymode/libs3/rope/refactor/patchedast.py
+  - pymode/libs3/rope/refactor/rename.py
+  - pymode/libs3/rope/refactor/restructure.py
+  - pymode/libs3/rope/refactor/similarfinder.py
+  - pymode/libs3/rope/refactor/sourceutils.py
+  - pymode/libs3/rope/refactor/suites.py
+  - pymode/libs3/rope/refactor/topackage.py
+  - pymode/libs3/rope/refactor/usefunction.py
+  - pymode/libs3/rope/refactor/wildcards.py
+  - pymode/lint.py
+  - pymode/rope.py
+  - pymode/run.py
+  - pymode/utils.py
+  - pymode/virtualenv.py
+  - pymode/libs/pylama/lint/pylama_pylint/pylint.rc
diff --git a/vim-plugins/bundle/python-mode/syntax/pyrex.vim b/vim-plugins/bundle/python-mode/syntax/pyrex.vim
new file mode 100644
index 0000000..acbe237
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/syntax/pyrex.vim
@@ -0,0 +1,71 @@
+" Vim syntax file
+" Language:	Pyrex
+" Maintainer:	John Tyree
+" Last Change:	2012 Nov 06
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+" Read the Python syntax to start with
+if version < 600
+  so <sfile>:p:h/python.vim
+else
+  runtime! syntax/python.vim
+  unlet b:current_syntax
+endif
+
+" Pyrex extentions
+syn keyword pyrexStatement	nogil inline typedef ctypedef sizeof
+syn keyword pyrexType		Py_ssize_t int long short float double char object void
+" Here we want slightly different behavior depending on whether we're declaring
+" variables or functions. c[p]def should work on the top level as a keyword, but
+" should ALSO work to identify functions and classes.
+syn match   pyrexStatement      "\<cp\?def\>"
+syn match   pyrexStatement      "\<cp\?def\>[^=]*(\@=" contains=pythonStatement,pyrexStatement,pythonFunction,pyrexType skipwhite
+syn keyword pyrexType		signed unsigned
+syn keyword pyrexStructure	struct union enum
+syn keyword pyrexInclude	include cimport
+syn keyword pyrexAccess		public private property readonly extern
+" If someome wants Python's built-ins highlighted probably he
+" also wants Pyrex's built-ins highlighted
+if exists("python_highlight_builtins") || exists("pyrex_highlight_builtins")
+    syn keyword pyrexBuiltin    NULL
+endif
+
+" This deletes "from" from the keywords and re-adds it as a
+" match with lower priority than pyrexForFrom
+syn clear   pythonInclude
+syn keyword pythonInclude     import
+syn match   pythonInclude     "\<from\>"
+
+" With "for[^:]*\zsfrom" VIM does not match "for" anymore, so
+" I used the slower "\@<=" form
+syn match   pyrexForFrom        "\(\<for\>[^:]*\)\@<=\<from\>"
+
+" Default highlighting
+if version >= 508 || !exists("did_pyrex_syntax_inits")
+  if version < 508
+    let did_pyrex_syntax_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink pyrexStatement		Statement
+  HiLink pyrexType		Type
+  HiLink pyrexStructure		Structure
+  HiLink pyrexInclude		PreCondit
+  HiLink pyrexAccess		pyrexStatement
+  if exists("python_highlight_builtins") || exists("pyrex_highlight_builtins")
+      HiLink pyrexBuiltin	Function
+  endif
+  HiLink pyrexForFrom		Statement
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "pyrex"
diff --git a/vim-plugins/bundle/python-mode/syntax/python.vim b/vim-plugins/bundle/python-mode/syntax/python.vim
new file mode 100644
index 0000000..aebb15a
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/syntax/python.vim
@@ -0,0 +1,404 @@
+" vim: ft=vim:fdm=marker
+
+" Enable pymode syntax for python files
+call pymode#default('g:pymode', 1)
+call pymode#default('g:pymode_syntax', g:pymode)
+
+" DESC: Disable script loading
+if !g:pymode || !g:pymode_syntax || pymode#default('b:current_syntax', 'pymode')
+    finish
+endif
+
+" OPTIONS: {{{
+
+" Highlight all by default
+call pymode#default('g:pymode_syntax_all', 1)
+
+" Highlight 'print' as function
+call pymode#default("g:pymode_syntax_print_as_function", 0)
+"
+" Highlight 'async/await' keywords
+call pymode#default("g:pymode_syntax_highlight_async_await", g:pymode_syntax_all)
+
+" Highlight '=' operator
+call pymode#default('g:pymode_syntax_highlight_equal_operator', g:pymode_syntax_all)
+
+" Highlight '*' operator
+call pymode#default('g:pymode_syntax_highlight_stars_operator', g:pymode_syntax_all)
+
+" Highlight 'self' keyword
+call pymode#default('g:pymode_syntax_highlight_self', g:pymode_syntax_all)
+
+" Highlight indent's errors
+call pymode#default('g:pymode_syntax_indent_errors', g:pymode_syntax_all)
+
+" Highlight space's errors
+call pymode#default('g:pymode_syntax_space_errors', g:pymode_syntax_all)
+
+" Highlight string formatting
+call pymode#default('g:pymode_syntax_string_formatting', g:pymode_syntax_all)
+call pymode#default('g:pymode_syntax_string_format', g:pymode_syntax_all)
+call pymode#default('g:pymode_syntax_string_templates', g:pymode_syntax_all)
+call pymode#default('g:pymode_syntax_doctests', g:pymode_syntax_all)
+
+" Support docstrings in syntax highlighting
+call pymode#default('g:pymode_syntax_docstrings', 1)
+
+" Highlight builtin objects (True, False, ...)
+call pymode#default('g:pymode_syntax_builtin_objs', g:pymode_syntax_all)
+
+" Highlight builtin types (str, list, ...)
+call pymode#default('g:pymode_syntax_builtin_types', g:pymode_syntax_all)
+
+" Highlight builtin types (div, eval, ...)
+call pymode#default('g:pymode_syntax_builtin_funcs', g:pymode_syntax_all)
+
+" Highlight exceptions (TypeError, ValueError, ...)
+call pymode#default('g:pymode_syntax_highlight_exceptions', g:pymode_syntax_all)
+
+" More slow synchronizing. Disable on the slow machine, but code in docstrings
+" could be broken.
+call pymode#default('g:pymode_syntax_slow_sync', 1)
+
+" }}}
+
+
+" For version 5.x: Clear all syntax items
+if version < 600
+    syntax clear
+endif
+
+" Keywords {{{
+" ============
+
+    syn keyword pythonStatement break continue del
+    syn keyword pythonStatement exec return
+    syn keyword pythonStatement pass raise
+    syn keyword pythonStatement global nonlocal assert
+    syn keyword pythonStatement yield
+    syn keyword pythonLambdaExpr lambda
+    syn keyword pythonStatement with as
+
+    syn keyword pythonStatement def nextgroup=pythonFunction skipwhite
+    syn match pythonFunction "\%(\%(def\s\|@\)\s*\)\@<=\h\%(\w\|\.\)*" contained nextgroup=pythonVars
+    syn region pythonVars start="(" skip=+\(".*"\|'.*'\)+ end=")" contained contains=pythonParameters transparent keepend
+    syn match pythonParameters "[^,]*" contained contains=pythonParam skipwhite
+    syn match pythonParam "[^,]*" contained contains=pythonExtraOperator,pythonLambdaExpr,pythonBuiltinObj,pythonBuiltinType,pythonConstant,pythonString,pythonNumber,pythonBrackets,pythonSelf,pythonComment skipwhite
+    syn match pythonBrackets "{[(|)]}" contained skipwhite
+
+    syn keyword pythonStatement class nextgroup=pythonClass skipwhite
+    syn match pythonClass "\%(\%(class\s\)\s*\)\@<=\h\%(\w\|\.\)*" contained nextgroup=pythonClassVars
+    syn region pythonClassVars start="(" end=")" contained contains=pythonClassParameters transparent keepend
+    syn match pythonClassParameters "[^,\*]*" contained contains=pythonBuiltin,pythonBuiltinObj,pythonBuiltinType,pythonExtraOperatorpythonStatement,pythonBrackets,pythonString,pythonComment skipwhite
+
+    syn keyword pythonRepeat        for while
+    syn keyword pythonConditional   if elif else
+    syn keyword pythonInclude       import from
+    syn keyword pythonException     try except finally
+    syn keyword pythonOperator      and in is not or
+
+    syn match pythonExtraOperator "\%([~!^&|/%+-]\|\%(class\s*\)\@<!<<\|<=>\|<=\|\%(<\|\<class\s\+\u\w*\s*\)\@<!<[^<]\@=\|===\|==\|=\~\|>>\|>=\|=\@<!>\|\.\.\.\|\.\.\|::\)"
+    syn match pythonExtraPseudoOperator "\%(-=\|/=\|\*\*=\|\*=\|&&=\|&=\|&&\|||=\||=\|||\|%=\|+=\|!\~\|!=\)"
+
+    if !g:pymode_syntax_print_as_function
+        syn keyword pythonStatement print
+    endif
+
+    if g:pymode_syntax_highlight_async_await
+        syn keyword pythonStatement async await
+        syn match pythonStatement "\<async\s\+def\>" nextgroup=pythonFunction skipwhite
+        syn match pythonStatement "\<async\s\+with\>" display
+        syn match pythonStatement "\<async\s\+for\>" nextgroup=pythonRepeat skipwhite
+    endif
+
+    if g:pymode_syntax_highlight_equal_operator
+        syn match pythonExtraOperator "\%(=\)"
+    endif
+
+    if g:pymode_syntax_highlight_stars_operator
+        syn match pythonExtraOperator "\%(\*\|\*\*\)"
+    endif
+    
+    if g:pymode_syntax_highlight_self
+        syn keyword pythonSelf self cls
+    endif
+
+" }}}
+
+
+" Decorators {{{
+" ==============
+
+    syn match   pythonDecorator "@" display nextgroup=pythonDottedName skipwhite
+    syn match   pythonDottedName "[a-zA-Z_][a-zA-Z0-9_]*\(\.[a-zA-Z_][a-zA-Z0-9_]*\)*" display contained
+    syn match   pythonDot        "\." display containedin=pythonDottedName
+
+" }}}
+
+
+" Comments {{{
+" ============
+
+    syn match   pythonComment   "#.*$" display contains=pythonTodo,@Spell
+    syn match   pythonRun       "\%^#!.*$"
+    syn match   pythonCoding    "\%^.*\(\n.*\)\?#.*coding[:=]\s*[0-9A-Za-z-_.]\+.*$"
+    syn keyword pythonTodo      TODO FIXME XXX contained
+
+" }}}
+
+
+" Errors {{{
+" ==========
+
+    syn match pythonError       "\<\d\+\D\+\>" display
+    syn match pythonError       "[$?]" display
+    syn match pythonError       "[&|]\{2,}" display
+    syn match pythonError       "[=]\{3,}" display
+
+    " Indent errors (mix space and tabs)
+    if g:pymode_syntax_indent_errors
+        syn match pythonIndentError "^\s*\( \t\|\t \)\s*\S"me=e-1 display
+    endif
+
+    " Trailing space errors
+    if g:pymode_syntax_space_errors
+        syn match pythonSpaceError  "\s\+$" display
+    endif
+
+" }}}
+
+
+" Strings {{{
+" ===========
+
+    syn region pythonString     start=+[bB]\='+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonEscape,pythonEscapeError,@Spell
+    syn region pythonString     start=+[bB]\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonEscape,pythonEscapeError,@Spell
+    syn region pythonString     start=+[bB]\="""+ end=+"""+ keepend contains=pythonEscape,pythonEscapeError,pythonDocTest2,pythonSpaceError,@Spell
+    syn region pythonString     start=+[bB]\='''+ end=+'''+ keepend contains=pythonEscape,pythonEscapeError,pythonDocTest,pythonSpaceError,@Spell
+
+    syn match  pythonEscape     +\\[abfnrtv'"\\]+ display contained
+    syn match  pythonEscape     "\\\o\o\=\o\=" display contained
+    syn match  pythonEscapeError    "\\\o\{,2}[89]" display contained
+    syn match  pythonEscape     "\\x\x\{2}" display contained
+    syn match  pythonEscapeError    "\\x\x\=\X" display contained
+    syn match  pythonEscape     "\\$"
+
+    " Unicode
+    syn region pythonUniString  start=+[uU]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError,@Spell
+    syn region pythonUniString  start=+[uU]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError,@Spell
+    syn region pythonUniString  start=+[uU]"""+ end=+"""+ keepend contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError,pythonDocTest2,pythonSpaceError,@Spell
+    syn region pythonUniString  start=+[uU]'''+ end=+'''+ keepend contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError,pythonDocTest,pythonSpaceError,@Spell
+
+    syn match  pythonUniEscape          "\\u\x\{4}" display contained
+    syn match  pythonUniEscapeError     "\\u\x\{,3}\X" display contained
+    syn match  pythonUniEscape          "\\U\x\{8}" display contained
+    syn match  pythonUniEscapeError     "\\U\x\{,7}\X" display contained
+    syn match  pythonUniEscape          "\\N{[A-Z ]\+}" display contained
+    syn match  pythonUniEscapeError "\\N{[^A-Z ]\+}" display contained
+
+    " Raw strings
+    syn region pythonRawString  start=+[rR]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonRawEscape,@Spell
+    syn region pythonRawString  start=+[rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonRawEscape,@Spell
+    syn region pythonRawString  start=+[rR]"""+ end=+"""+ keepend contains=pythonDocTest2,pythonSpaceError,@Spell
+    syn region pythonRawString  start=+[rR]'''+ end=+'''+ keepend contains=pythonDocTest,pythonSpaceError,@Spell
+
+    syn match pythonRawEscape           +\\['"]+ display transparent contained
+
+    " Unicode raw strings
+    syn region pythonUniRawString   start=+[uU][rR]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonRawEscape,pythonUniRawEscape,pythonUniRawEscapeError,@Spell
+    syn region pythonUniRawString   start=+[uU][rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonRawEscape,pythonUniRawEscape,pythonUniRawEscapeError,@Spell
+    syn region pythonUniRawString   start=+[uU][rR]"""+ end=+"""+ keepend contains=pythonUniRawEscape,pythonUniRawEscapeError,pythonDocTest2,pythonSpaceError,@Spell
+    syn region pythonUniRawString   start=+[uU][rR]'''+ end=+'''+ keepend contains=pythonUniRawEscape,pythonUniRawEscapeError,pythonDocTest,pythonSpaceError,@Spell
+
+    syn match  pythonUniRawEscape   "\([^\\]\(\\\\\)*\)\@<=\\u\x\{4}" display contained
+    syn match  pythonUniRawEscapeError  "\([^\\]\(\\\\\)*\)\@<=\\u\x\{,3}\X" display contained
+
+    " String formatting
+    if g:pymode_syntax_string_formatting
+        syn match pythonStrFormatting   "%\(([^)]\+)\)\=[-#0 +]*\d*\(\.\d\+\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
+        syn match pythonStrFormatting   "%[-#0 +]*\(\*\|\d\+\)\=\(\.\(\*\|\d\+\)\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
+    endif
+
+    " Str.format syntax
+    if g:pymode_syntax_string_format
+        syn match pythonStrFormat "{{\|}}" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
+        syn match pythonStrFormat "{\([a-zA-Z0-9_]*\|\d\+\)\(\.[a-zA-Z_][a-zA-Z0-9_]*\|\[\(\d\+\|[^!:\}]\+\)\]\)*\(![rs]\)\=\(:\({\([a-zA-Z_][a-zA-Z0-9_]*\|\d\+\)}\|\([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*\(\.\d\+\)\=[bcdeEfFgGnoxX%]\=\)\=\)\=}" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
+    endif
+
+    " String templates
+    if g:pymode_syntax_string_templates
+        syn match pythonStrTemplate "\$\$" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
+        syn match pythonStrTemplate "\${[a-zA-Z_][a-zA-Z0-9_]*}" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
+        syn match pythonStrTemplate "\$[a-zA-Z_][a-zA-Z0-9_]*" contained containedin=pythonString,pythonUniString,pythonRawString,pythonUniRawString
+    endif
+
+    " DocTests
+    if g:pymode_syntax_doctests
+        syn region pythonDocTest    start="^\s*>>>" end=+'''+he=s-1 end="^\s*$" contained
+        syn region pythonDocTest2   start="^\s*>>>" end=+"""+he=s-1 end="^\s*$" contained
+    endif
+
+    " DocStrings
+    if g:pymode_syntax_docstrings
+        syn region pythonDocstring  start=+^\s*[uU]\?[rR]\?"""+ end=+"""+ keepend excludenl contains=pythonEscape,@Spell,pythonDoctest,pythonDocTest2,pythonSpaceError
+        syn region pythonDocstring  start=+^\s*[uU]\?[rR]\?'''+ end=+'''+ keepend excludenl contains=pythonEscape,@Spell,pythonDoctest,pythonDocTest2,pythonSpaceError
+    endif
+
+
+" }}}
+
+" Numbers {{{
+" ===========
+
+    syn match   pythonHexError  "\<0[xX]\x*[g-zG-Z]\x*[lL]\=\>" display
+    syn match   pythonHexNumber "\<0[xX]\x\+[lL]\=\>" display
+    syn match   pythonOctNumber "\<0[oO]\o\+[lL]\=\>" display
+    syn match   pythonBinNumber "\<0[bB][01]\+[lL]\=\>" display
+    syn match   pythonNumber    "\<\d\+[lLjJ]\=\>" display
+    syn match   pythonFloat "\.\d\+\([eE][+-]\=\d\+\)\=[jJ]\=\>" display
+    syn match   pythonFloat "\<\d\+[eE][+-]\=\d\+[jJ]\=\>" display
+    syn match   pythonFloat "\<\d\+\.\d*\([eE][+-]\=\d\+\)\=[jJ]\=" display
+    syn match   pythonOctError  "\<0[oO]\=\o*[8-9]\d*[lL]\=\>" display
+    syn match   pythonBinError  "\<0[bB][01]*[2-9]\d*[lL]\=\>" display
+
+" }}}
+
+" Builtins {{{
+" ============
+
+    " Builtin objects and types
+    if g:pymode_syntax_builtin_objs
+        syn keyword pythonBuiltinObj True False Ellipsis None NotImplemented
+        syn keyword pythonBuiltinObj __debug__ __doc__ __file__ __name__ __package__
+    endif
+    
+    if g:pymode_syntax_builtin_types    
+        syn keyword pythonBuiltinType type object
+        syn keyword pythonBuiltinType str basestring unicode buffer bytearray bytes chr unichr
+        syn keyword pythonBuiltinType dict int long bool float complex set frozenset list tuple
+        syn keyword pythonBuiltinType file super
+    endif
+
+    " Builtin functions
+    if g:pymode_syntax_builtin_funcs
+        syn keyword pythonBuiltinFunc   __import__ abs all any apply
+        syn keyword pythonBuiltinFunc   bin callable classmethod cmp coerce compile
+        syn keyword pythonBuiltinFunc   delattr dir divmod enumerate eval execfile filter
+        syn keyword pythonBuiltinFunc   format getattr globals locals hasattr hash help hex id
+        syn keyword pythonBuiltinFunc   input intern isinstance issubclass iter len map max min
+        syn keyword pythonBuiltinFunc   next oct open ord pow property range xrange
+        syn keyword pythonBuiltinFunc   raw_input reduce reload repr reversed round setattr
+        syn keyword pythonBuiltinFunc   slice sorted staticmethod sum vars zip
+
+        if g:pymode_syntax_print_as_function
+            syn keyword pythonBuiltinFunc   print
+        endif
+
+    endif
+
+    " Builtin exceptions and warnings
+    if g:pymode_syntax_highlight_exceptions
+        syn keyword pythonExClass   BaseException
+        syn keyword pythonExClass   Exception StandardError ArithmeticError
+        syn keyword pythonExClass   LookupError EnvironmentError
+        syn keyword pythonExClass   AssertionError AttributeError BufferError EOFError
+        syn keyword pythonExClass   FloatingPointError GeneratorExit IOError
+        syn keyword pythonExClass   ImportError IndexError KeyError
+        syn keyword pythonExClass   KeyboardInterrupt MemoryError NameError
+        syn keyword pythonExClass   NotImplementedError OSError OverflowError
+        syn keyword pythonExClass   ReferenceError RuntimeError StopIteration
+        syn keyword pythonExClass   SyntaxError IndentationError TabError
+        syn keyword pythonExClass   SystemError SystemExit TypeError
+        syn keyword pythonExClass   UnboundLocalError UnicodeError
+        syn keyword pythonExClass   UnicodeEncodeError UnicodeDecodeError
+        syn keyword pythonExClass   UnicodeTranslateError ValueError VMSError
+        syn keyword pythonExClass   WindowsError ZeroDivisionError
+        syn keyword pythonExClass   Warning UserWarning BytesWarning DeprecationWarning
+        syn keyword pythonExClass   PendingDepricationWarning SyntaxWarning
+        syn keyword pythonExClass   RuntimeWarning FutureWarning
+        syn keyword pythonExClass   ImportWarning UnicodeWarning
+    endif
+
+" }}}
+
+
+if g:pymode_syntax_slow_sync
+    syn sync minlines=2000
+else
+    " This is fast but code inside triple quoted strings screws it up. It
+    " is impossible to fix because the only way to know if you are inside a
+    " triple quoted string is to start from the beginning of the file.
+    syn sync match pythonSync grouphere NONE "):$"
+    syn sync maxlines=200
+endif
+
+" Highlight {{{
+" =============
+
+    hi def link  pythonStatement    Statement
+    hi def link  pythonLambdaExpr   Statement
+    hi def link  pythonInclude      Include
+    hi def link  pythonFunction     Function
+    hi def link  pythonClass        Type
+    hi def link  pythonParameters   Normal
+    hi def link  pythonParam        Normal
+    hi def link  pythonBrackets     Normal
+    hi def link  pythonClassParameters Normal
+    hi def link  pythonSelf         Identifier
+
+    hi def link  pythonConditional  Conditional
+    hi def link  pythonRepeat       Repeat
+    hi def link  pythonException    Exception
+    hi def link  pythonOperator     Operator
+    hi def link  pythonExtraOperator        Operator
+    hi def link  pythonExtraPseudoOperator  Operator
+
+    hi def link  pythonDecorator    Define
+    hi def link  pythonDottedName   Function
+    hi def link  pythonDot          Normal
+
+    hi def link  pythonComment      Comment
+    hi def link  pythonCoding       Special
+    hi def link  pythonRun          Special
+    hi def link  pythonTodo         Todo
+
+    hi def link  pythonError        Error
+    hi def link  pythonIndentError  Error
+    hi def link  pythonSpaceError   Error
+
+    hi def link  pythonString       String
+    hi def link  pythonDocstring    String
+    hi def link  pythonUniString    String
+    hi def link  pythonRawString    String
+    hi def link  pythonUniRawString String
+
+    hi def link  pythonEscape       Special
+    hi def link  pythonEscapeError  Error
+    hi def link  pythonUniEscape    Special
+    hi def link  pythonUniEscapeError Error
+    hi def link  pythonUniRawEscape Special
+    hi def link  pythonUniRawEscapeError Error
+
+    hi def link  pythonStrFormatting Special
+    hi def link  pythonStrFormat    Special
+    hi def link  pythonStrTemplate  Special
+
+    hi def link  pythonDocTest      Special
+    hi def link  pythonDocTest2     Special
+
+    hi def link  pythonNumber       Number
+    hi def link  pythonHexNumber    Number
+    hi def link  pythonOctNumber    Number
+    hi def link  pythonBinNumber    Number
+    hi def link  pythonFloat        Float
+    hi def link  pythonOctError     Error
+    hi def link  pythonHexError     Error
+    hi def link  pythonBinError     Error
+
+    hi def link  pythonBuiltinType  Type
+    hi def link  pythonBuiltinObj   Structure
+    hi def link  pythonBuiltinFunc  Function
+
+    hi def link  pythonExClass      Structure
+
+" }}}
diff --git a/vim-plugins/bundle/python-mode/t/docs.vim b/vim-plugins/bundle/python-mode/t/docs.vim
new file mode 100644
index 0000000..1f5be0f
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/t/docs.vim
@@ -0,0 +1,24 @@
+source  plugin/pymode.vim 
+
+describe 'docs'
+    before
+        set filetype=python
+    end
+
+    after
+        bd!
+        bd!
+    end
+
+    it 'pymode show docs'
+        Expect g:pymode_doc == 1
+        put = 'def'
+        normal GK
+        wincmd p
+        Expect bufname('%') == "__doc__"
+        Expect getline(1) == 'Function definitions'
+        Expect &filetype == 'rst'
+    end
+
+end
+
diff --git a/vim-plugins/bundle/python-mode/t/ftplugin.vim b/vim-plugins/bundle/python-mode/t/ftplugin.vim
new file mode 100644
index 0000000..0648e68
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/t/ftplugin.vim
@@ -0,0 +1,18 @@
+source  plugin/pymode.vim 
+
+describe 'pymode-ftplugin'
+
+    before
+        set filetype=python
+    end
+
+    after
+        bd!
+    end
+
+    it 'pymode init'
+        PymodePython import pymode
+    end
+
+end
+
diff --git a/vim-plugins/bundle/python-mode/t/indent.vim b/vim-plugins/bundle/python-mode/t/indent.vim
new file mode 100644
index 0000000..db7b2b6
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/t/indent.vim
@@ -0,0 +1,23 @@
+source  plugin/pymode.vim 
+
+describe 'indent'
+
+    before
+        set ft=python
+        source after/indent/python.vim
+    end
+
+    after
+        bd!
+    end
+
+    it 'pymode indent loaded'
+        Expect g:pymode_indent == 1
+        Expect &expandtab == 1
+        Expect &shiftround == 1
+        Expect &autoindent == 1
+        Expect &indentexpr == 'pymode#indent#get_indent(v:lnum)'
+    end
+
+end
+
diff --git a/vim-plugins/bundle/python-mode/t/lint.vim b/vim-plugins/bundle/python-mode/t/lint.vim
new file mode 100644
index 0000000..29463a8
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/t/lint.vim
@@ -0,0 +1,30 @@
+source  plugin/pymode.vim 
+
+describe 'pymode check code'
+
+    before
+        set ft=python
+    end
+
+    after
+        bd!
+    end
+
+    it 'pymode lint loaded'
+        Expect g:pymode_lint == 1
+    end
+
+    it 'lint new'
+        put =['# coding: utf-8', 'call_unknown_function()']
+        PymodeLint
+        Expect getloclist(0) ==  []
+    end
+
+    it 'lint code'
+        e t/test.py
+        PymodeLint
+        Expect getloclist(0) ==  [{'lnum': 6, 'bufnr': 1, 'col': 0, 'valid': 1, 'vcol': 0, 'nr': 0, 'type': 'E', 'pattern': '', 'text': 'W0612 local variable "unused" is assigned to but never used [pyflakes]'}, {'lnum': 8, 'bufnr': 1, 'col': 0, 'valid': 1, 'vcol': 0, 'nr': 0, 'type': 'E', 'pattern': '', 'text': 'E0602 undefined name "unknown" [pyflakes]'}]
+    end
+
+end
+
diff --git a/vim-plugins/bundle/python-mode/t/plugin.vim b/vim-plugins/bundle/python-mode/t/plugin.vim
new file mode 100644
index 0000000..33951f8
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/t/plugin.vim
@@ -0,0 +1,58 @@
+describe 'pymode-plugin'
+
+    before
+        source  plugin/pymode.vim 
+        set filetype=python
+    end
+
+    after
+        bd!
+    end
+
+    it 'pymode options'
+        Expect g:pymode == 1
+        Expect g:pymode_python == 'python'
+        Expect g:pymode_paths == []
+        Expect g:pymode_virtualenv == 1
+        Expect g:pymode_run == 1
+        Expect g:pymode_lint == 1
+        Expect g:pymode_breakpoint == 1
+        Expect g:pymode_doc == 1
+        Expect g:pymode_indent == 1
+    end
+
+    it 'pymode interpreter'
+        PymodePython import vim
+        PymodePython vim.current.buffer.append('test success')
+        Expect getline('$') == 'test success'
+    end
+
+    it 'pymode save'
+        Expect expand('%') == ''
+        Expect pymode#save() == 0
+    end
+
+end
+
+
+describe 'pymode-python-disable'
+    before
+        let g:pymode_python = 'disable'
+        source  plugin/pymode.vim 
+        set filetype=python
+    end
+
+    after
+        bd!
+    end
+
+    it 'pymode disable python'
+        Expect g:pymode_doc        == 0
+        Expect g:pymode_lint       == 0
+        Expect g:pymode_path       == 0
+        Expect g:pymode_rope       == 0
+        Expect g:pymode_run        == 0
+        Expect g:pymode_virtualenv == 0
+    end
+
+end
diff --git a/vim-plugins/bundle/python-mode/t/rope.vim b/vim-plugins/bundle/python-mode/t/rope.vim
new file mode 100644
index 0000000..fa8154b
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/t/rope.vim
@@ -0,0 +1,34 @@
+let g:pymode_rope_completion_bind = 'X'
+let g:pymode_rope_autoimport = 0
+let g:pymode_debug = 1
+let g:pymode_rope_lookup_project = 0
+
+source  plugin/pymode.vim 
+
+describe 'pymode-plugin'
+
+    before
+        set filetype=python
+    end
+
+    after
+        bd!
+        bd!
+    end
+
+    it 'pymode rope auto open project in current working directory'
+
+        if $TRAVIS != ""
+            SKIP 'Travis fails on this test'
+        endif
+
+        let project_path = getcwd() . '/.ropeproject'
+        Expect isdirectory(project_path)  == 0
+        normal oimporX
+        Expect getline('.') == 'import'
+        Expect g:pymode_rope_current == getcwd() . '/'
+        Expect g:pymode_rope_current . '.ropeproject' == project_path
+        Expect isdirectory(project_path)  == 1
+    end
+
+end
diff --git a/vim-plugins/bundle/python-mode/t/syntax.vim b/vim-plugins/bundle/python-mode/t/syntax.vim
new file mode 100644
index 0000000..989bb2d
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/t/syntax.vim
@@ -0,0 +1,34 @@
+describe 'pymode-syntax'
+
+    before
+        syntax on
+        set filetype=python
+    end
+
+    after
+        bd!
+    end
+
+    it 'pymode-syntax options'
+        Expect g:pymode_syntax == 1
+        Expect g:pymode_syntax_all == 1
+        Expect g:pymode_syntax_print_as_function == 0
+        Expect g:pymode_syntax_highlight_async_await == 1
+        Expect g:pymode_syntax_highlight_equal_operator == 1
+        Expect g:pymode_syntax_highlight_stars_operator == 1
+        Expect g:pymode_syntax_highlight_self == 1
+        Expect g:pymode_syntax_indent_errors == 1
+        Expect g:pymode_syntax_space_errors == 1
+        Expect g:pymode_syntax_string_formatting == 1
+        Expect g:pymode_syntax_string_format == 1
+        Expect g:pymode_syntax_string_templates == 1
+        Expect g:pymode_syntax_doctests == 1
+        Expect g:pymode_syntax_builtin_objs == 1
+        Expect g:pymode_syntax_builtin_types == 1
+        Expect g:pymode_syntax_builtin_funcs == 1
+        Expect g:pymode_syntax_highlight_exceptions == 1
+        Expect g:pymode_syntax_slow_sync == 1
+    end
+
+end
+
diff --git a/vim-plugins/bundle/python-mode/t/test.py b/vim-plugins/bundle/python-mode/t/test.py
new file mode 100644
index 0000000..ba7d5ef
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/t/test.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+# coding: utf-8
+
+
+def main():
+    unused = 1
+
+unknown()
diff --git a/vim-plugins/bundle/python-mode/t/trouble.vim b/vim-plugins/bundle/python-mode/t/trouble.vim
new file mode 100644
index 0000000..b2dd2c3
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/t/trouble.vim
@@ -0,0 +1,15 @@
+source  plugin/pymode.vim 
+
+describe 'pymode troubleshooting'
+
+    after
+        bd!
+        bd!
+    end
+
+    it 'pymode troubleshooting'
+        call pymode#troubleshooting#test()
+        Expect getline(1) == 'Pymode diagnostic'
+    end
+
+end
diff --git a/vim-plugins/bundle/python-mode/t/virtualenv.vim b/vim-plugins/bundle/python-mode/t/virtualenv.vim
new file mode 100644
index 0000000..fcac026
--- /dev/null
+++ b/vim-plugins/bundle/python-mode/t/virtualenv.vim
@@ -0,0 +1,28 @@
+describe 'pymode-virtualenv'
+
+    before
+        source  plugin/pymode.vim 
+        set filetype=python
+    end
+
+    after
+        bd!
+    end
+
+    " TODO: How can we mock the virtualenv activation to check that the
+    " proper path is set to pymode_virtualenv_enabled? Right now, the 
+    " python function enable_virtualenv gets called but fails when trying
+    " to actually activate so the env.let never gets called
+
+    it 'accepts relative paths'
+        call pymode#virtualenv#activate("sample/relative/path")
+        " Our path variable is the path argument
+        Expect g:pymode_virtualenv_path == "sample/relative/path"
+    end
+
+    it 'accepts absolute paths'
+        call pymode#virtualenv#activate("/sample/absolute/path")
+        " Our path variable is the path argument
+        Expect g:pymode_virtualenv_path == "/sample/absolute/path"
+    end
+end
diff --git a/vim-plugins/bundle/supertab/Makefile b/vim-plugins/bundle/supertab/Makefile
new file mode 100644
index 0000000..7a3c371
--- /dev/null
+++ b/vim-plugins/bundle/supertab/Makefile
@@ -0,0 +1,17 @@
+SHELL=/bin/bash
+
+all: dist
+
+dist:
+	@rm supertab.vmb 2> /dev/null || true
+	@vim -c 'r! git ls-files doc plugin' \
+		-c '$$,$$d _' -c '%MkVimball supertab .' -c 'q!'
+
+clean:
+	@rm -R build 2> /dev/null || true
+
+install: supertab.vmb
+	vim $< -c 'so %' -c 'q'
+
+uninstall:
+	vim -c 'RmVimball supertab.vmb' -c 'q'
diff --git a/vim-plugins/bundle/supertab/README.rst b/vim-plugins/bundle/supertab/README.rst
new file mode 100644
index 0000000..89bafdb
--- /dev/null
+++ b/vim-plugins/bundle/supertab/README.rst
@@ -0,0 +1,172 @@
+.. Copyright (c) 2012 - 2014, Eric Van Dewoestine
+   All rights reserved.
+
+   Redistribution and use of this software in source and binary forms, with
+   or without modification, are permitted provided that the following
+   conditions are met:
+
+   * Redistributions of source code must retain the above
+     copyright notice, this list of conditions and the
+     following disclaimer.
+
+   * Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the
+     following disclaimer in the documentation and/or other
+     materials provided with the distribution.
+
+   * Neither the name of Eric Van Dewoestine nor the names of its
+     contributors may be used to endorse or promote products derived from
+     this software without specific prior written permission of
+     Eric Van Dewoestine.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+   IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+.. _overview:
+
+==================
+Overview
+==================
+
+Supertab is a vim plugin which allows you to use <Tab> for all your insert
+completion needs (:help ins-completion).
+
+Features
+--------
+
+- Configurable to suit you needs:
+
+  - Default completion type to use.
+  - Prevent <Tab> from completing after/before defined patterns.
+  - Close vim's completion preview window when code completion is finished.
+  - When using other completion types, you can configure how long to 'remember'
+    the current completion type before returning to the default.
+  - Don't like using <Tab>? You can also configure a different pair of keys to
+    scroll forwards and backwards through completion results.
+
+- Optional improved 'longest' completion support (after typing some characters,
+  hitting <Tab> will highlight the next longest match).
+- Built in 'context' completion option which chooses the appropriate completion
+  type based on the text preceding the cursor.
+
+  - You can also plug in your own functions to determine which completion type
+    to use.
+
+- Support for simple completion chaining (falling back to a different
+  completion type, keyword completion for example, if omni or user completion
+  returns no results).
+
+Installation
+------------
+
+You have a few options when it comes to installing supertab:
+
+1. Use your linux package manager:
+
+   Some linux distributions include a supertab package so you don't have to
+   manage the install/upgrade of supertab separately from other software on your
+   system.
+
+2. Use a vim plugin manager:
+
+   There are several plugin managers for vim, which will either allow you to
+   manually clone vim plugin repositories, or will do so for you. Probably the
+   two most popular ones currently are `pathogen
+   <https://github.com/tpope/vim-pathogen>`_ and `vundle
+   <https://github.com/gmarik/Vundle.vim>`_. Please refer to their docs for
+   instructions on how to install plugins.
+
+3. And lastly you can use the vimball (.vmb) file found on
+   `vim.org <http://www.vim.org/scripts/script.php?script_id=1643>`_:
+
+   Vimball files are installed by simply opening them in vim and then sourcing
+   the file:
+
+   ::
+
+     $ vim supertab.vmb
+     :source %
+
+Frequently Asked Questions
+--------------------------
+
+- **Why isn't supertab honoring my configured settings (attempts to complete at the
+  start of a line, always performs keyword completion instead of my configured
+  default, etc.)?**
+
+  Chances are that you have a very old version of `snipmate
+  <https://github.com/msanders/snipmate.vim>`_ installed, or something similar,
+  which will issue a `<c-n>` when no snippet is found. Supertab use to map to
+  `<c-n>`, so this behavior would act as a fallback to supertab, but current
+  versions of supertab no longer do so, resulting in snipmate bypassing supertab
+  entirely.
+
+  You can check if this is the case by running the following in vim to see what
+  is mapped to `<tab>`:
+
+  ::
+
+    :verbose imap <tab>
+
+  To resolve the issue you can either:
+
+  #. Install my `fork <https://github.com/ervandew/snipmate.vim>`_ or
+  #. Upgrade to a more recent snipmate fork, like `garbas/vim-snipmate
+     <https://github.com/garbas/vim-snipmate>`_
+
+  See `#74 <https://github.com/ervandew/supertab/issues/74>`_ for additional
+  details.
+
+- **Why does <tab> navigate the completion menu from bottom to top?**
+
+  First, if after reading the explanation below (or if you don't want to bother
+  reading it), you still want the default to scroll down the list then you can
+  use:
+
+  ::
+
+    let g:SuperTabDefaultCompletionType = "<c-n>"
+
+  or if your default completion type is currently `context` then you can use
+  this instead:
+
+  ::
+
+    let g:SuperTabContextDefaultCompletionType = "<c-n>"
+
+  Now on to the reasoning behind this. When using `<c-p>` or `<c-n>` to start
+  insert completion, both populate the completion popup with the same list of
+  words in the same order, the only difference is that `<c-p>` highlights the
+  nearest matching word located above the current cursor position, which is the
+  result at the bottom of the completion popup. Without supertab installed,
+  continuing to hit `<c-p>` will walk up the list to next nearest word above the
+  cursor.
+
+  I think Bram chose to display the results like this so that
+
+  #. the completion logic is the same for `<c-n>` and `<c-p>`, only the first
+     entry to highlight differs
+  #. so that the behavior of `<c-p>` mode is consistent, always moving up the
+     list and
+  #. when starting `<c-p>` mode you don't have to switch over to
+     using `<c-n>` to get the next nearest entry, just continue to hit `<c-p>`.
+
+  So, with supertab I wanted to preserve the same behavior. If `<c-p>` is your
+  default completion method (supertab defaults to this being the case), then
+  `<tab>` will start it and additional uses of `<tab>` will move up the list
+  instead of down so that you don't have to suddenly switch to using `<s-tab>`
+  to get the next nearest result.
+
+  Why is `<c-p>` the supertab default? The original supertab author found (and I
+  agree with his finding) that while coding, the keyword match you want is
+  typically the closer of the matches above the cursor, which `<c-p>` naturally
+  provides.
diff --git a/vim-plugins/bundle/supertab/doc/supertab.txt b/vim-plugins/bundle/supertab/doc/supertab.txt
new file mode 100644
index 0000000..941a9a0
--- /dev/null
+++ b/vim-plugins/bundle/supertab/doc/supertab.txt
@@ -0,0 +1,473 @@
+*supertab.txt*
+
+Author: Eric Van Dewoestine <ervandew@gmail.com>
+        Original concept and versions up to 0.32 written by
+        Gergely Kontra <kgergely@mcl.hu>
+
+This plugin is licensed under the terms of the BSD License.  Please see
+supertab.vim for the license in its entirety.
+
+==============================================================================
+Supertab                                    *supertab*
+
+1. Introduction                             |supertab-intro|
+2. Supertab Usage                           |supertab-usage|
+3. Supertab Options                         |supertab-options|
+    Default completion type                 |supertab-defaultcompletion|
+    Secondary default completion type       |supertab-contextdefault|
+    Completion contexts                     |supertab-completioncontexts|
+        Context text                        |supertab-contexttext|
+        Context Discover                    |supertab-contextdiscover|
+        Example                             |supertab-contextexample|
+    Completion Duration                     |supertab-duration|
+    Preventing Completion After/Before...   |supertab-preventcomplete|
+    Changing default mapping                |supertab-forwardbackward|
+    Inserting true tabs                     |supertab-mappingtabliteral|
+    Enhanced longest match support          |supertab-longestenhanced|
+    Preselecting the first entry            |supertab-longesthighlight|
+    Mapping <cr> to end completion          |supertab-crmapping|
+    Auto close the preview window           |supertab-closepreviewonpopupclose|
+    Keyword completion ignore/match case    |supertab-completecase|
+    Completion Chaining                     |supertab-completionchaining|
+
+==============================================================================
+1. Introduction                             *supertab-intro*
+
+Supertab is a plugin which allows you to perform all your insert completion
+(|ins-completion|) using the tab key.
+
+Supertab requires Vim version 7.0 or above.
+
+==============================================================================
+2. Supertab usage                           *supertab-usage*
+
+Using Supertab is as easy as hitting <Tab> or <S-Tab> (shift+tab) while in
+insert mode, with at least one non whitespace character before the cursor, to
+start the completion and then <Tab> or <S-Tab> again to cycle forwards or
+backwards through the available completions.
+
+Example ('|' denotes the cursor location):
+
+bar
+baz
+b|<Tab>    Hitting <Tab> here will start the completion, allowing you to
+           then cycle through the suggested words ('bar' and 'baz').
+
+==============================================================================
+3. Supertab Options                         *supertab-options*
+
+Supertab is configured via several global variables that you can set in your
+|vimrc| file according to your needs. Below is a comprehensive list of
+the variables available.
+
+
+Default Completion Type             *supertab-defaultcompletion*
+                                    *g:SuperTabDefaultCompletionType*
+
+g:SuperTabDefaultCompletionType (default value: "<c-p>")
+
+Used to set the default completion type. There is no need to escape this
+value as that will be done for you when the type is set.
+
+  Example: setting the default completion to 'user' completion:
+
+>
+    let g:SuperTabDefaultCompletionType = "<c-x><c-u>"
+<
+
+Note: a special value of 'context' is supported which will result in
+super tab attempting to use the text preceding the cursor to decide which
+type of completion to attempt. Currently supertab can recognize method calls
+or attribute references via '.', '::' or '->', and file path references
+containing '/'. If the language you are using doesn't use any of the member
+reference characters listed above, or you'd like to add additional patterns,
+you can write a custom context function also described in the next section
+(Completion context).
+
+  Example: setting the default completion to supertab's 'context' completion:
+>
+    let g:SuperTabDefaultCompletionType = "context"
+<
+
+    /usr/l<tab>     # will use filename completion
+    myvar.t<tab>    # will use user completion if completefunc set,
+                    # or omni completion if omnifunc set.
+    myvar-><tab>    # same as above
+
+When using context completion, super tab will fall back to a secondary default
+completion type set by |g:SuperTabContextDefaultCompletionType|.
+
+Note: once the buffer has been initialized, changing the value of this setting
+will not change the default complete type used. If you want to change the
+default completion type for the current buffer after it has been set, perhaps
+in an ftplugin, you'll need to call *SuperTabSetDefaultCompletionType* like so,
+supplying the completion type you wish to switch to:
+
+>
+    call SuperTabSetDefaultCompletionType("<c-x><c-u>")
+<
+
+
+Secondary default completion type   *supertab-contextdefault*
+                                    *g:SuperTabContextDefaultCompletionType*
+
+g:SuperTabContextDefaultCompletionType (default value: "<c-p>")
+
+Sets the default completion type used when g:SuperTabDefaultCompletionType is
+set to 'context' and no completion type is returned by any of the configured
+contexts.
+
+  Note: supertab also supports the b:SuperTabContextDefaultCompletionType
+  variable allowing you to set the default type separately for the current
+  buffer, like from an ftplugin for example.
+
+
+Completion contexts                 *supertab-completioncontexts*
+                                    *g:SuperTabCompletionContexts*
+
+g:SuperTabCompletionContexts (default value: ['s:ContextText'])
+
+Sets the list of contexts used for context completion. This value should
+be a list of function names which provide the context implementation.
+
+When supertab starts context completion, each of these contexts will be
+consulted, in the order they were supplied, to determine the completion type
+to use. If a context returns a completion type, that type will be used,
+otherwise the next context in the list will be consulted. If after executing
+all the context functions, no completion type has been determined, then the
+value of |g:SuperTabContextDefaultCompletionType| will be used.
+
+  Note: supertab also supports the b:SuperTabCompletionContexts variable
+  allowing you to set the list of contexts separately for the current buffer,
+  like from an ftplugin for example.
+
+Built in completion contexts:
+
+  s:ContextText                     *supertab-contexttext*
+
+  The text context will examine the text near the cursor to decide which type
+  of completion to attempt. Currently the text context can recognize method
+  calls or attribute references via '.', '::' or '->', and file path
+  references containing '/'.
+
+      /usr/l<tab>  # will use filename completion
+      myvar.t<tab> # will use user completion if completefunc set, or
+                   # omni completion if omnifunc set.
+      myvar-><tab> # same as above
+
+  Supported configuration attributes:
+
+    *g:SuperTabContextTextFileTypeExclusions*
+    List of file types for which the text context will be skipped.
+
+    *g:SuperTabContextTextOmniPrecedence* (default: ['&completefunc', '&omnifunc'])
+    *b:SuperTabContextTextOmniPrecedence*
+    List of omni completion option names in the order of precedence that they
+    should be used if available. By default, user completion will be given
+    precedence over omni completion, but you can use this variable to give
+    omni completion higher precedence by placing it first in the list.
+
+    *g:SuperTabContextTextMemberPatterns* (default: ['\.', '>\?::', '->'])
+    *b:SuperTabContextTextMemberPatterns*
+    List of patterns used to determine when omni/user completion should be
+    used. The default list consists of the most common patterns used to access
+    module/class/object members.
+
+    Note: For html and xml based files, the buffer local version of the above
+    two settings are set to trigger omni completion first when encountering a
+    potential end tag pattern of '</'.
+
+  s:ContextDiscover                 *supertab-contextdiscover*
+
+  This context will use the 'g:SuperTabContextDiscoverDiscovery' variable to
+  determine the completion type to use. It will evaluate each value, in the
+  order they were defined, until a variable evaluates to a non-zero or
+  non-empty value, then the associated completion type is used.
+
+  Supported configuration properties:
+
+    g:SuperTabContextDiscoverDiscovery
+    List of variable:completionType mappings.
+
+  Example context configuration:    *supertab-contextexample*
+
+>
+    let g:SuperTabCompletionContexts = ['s:ContextText', 's:ContextDiscover']
+    let g:SuperTabContextTextOmniPrecedence = ['&omnifunc', '&completefunc']
+    let g:SuperTabContextDiscoverDiscovery =
+        \ ["&completefunc:<c-x><c-u>", "&omnifunc:<c-x><c-o>"]
+<
+
+  In addition to the default completion contexts, you can plug in your own
+  implementation by creating a globally accessible function that returns
+  the completion type to use (eg. "\<c-x>\<c-u>").
+
+>
+    function MyTagContext()
+      if filereadable(expand('%:p:h') . '/tags')
+        return "\<c-x>\<c-]>"
+      endif
+      " no return will result in the evaluation of the next
+      " configured context
+    endfunction
+    let g:SuperTabCompletionContexts =
+        \ ['MyTagContext', 's:ContextText', 's:ContextDiscover']
+<
+
+  Here is another example that could be used to add context support for
+  clojure, and perhaps other lisp variants:
+
+>
+    let b:SuperTabCompletionContexts =
+      \ ['ClojureContext'] + g:SuperTabCompletionContexts
+
+    function! ClojureContext()
+      let curline = getline('.')
+      let cnum = col('.')
+      let synname = synIDattr(synID(line('.'), cnum - 1, 1), 'name')
+      if curline =~ '(\S\+\%' . cnum . 'c' && synname !~ '\(String\|Comment\)'
+        return "\<c-x>\<c-o>"
+      endif
+    endfunction
+<
+
+
+Completion Duration                 *supertab-duration*
+                                    *g:SuperTabRetainCompletionDuration*
+
+g:SuperTabRetainCompletionDuration (default value: 'insert')
+
+Determines if, and for how long, the current completion type is retained.
+The possible values include:
+'completion' - The current completion type is only retained for the
+               current completion. Once you have chosen a completion
+               result or exited the completion mode, the default
+               completion type is restored.
+'insert'     - The current completion type is saved until you exit insert
+               mode (via ESC). Once you exit insert mode the default
+               completion type is restored. (supertab default)
+'session'    - The current completion type is saved for the duration of
+               your vim session or until you enter a different completion
+               mode.
+
+
+Preventing completion after...      *supertab-preventcomplete*
+                                    *g:SuperTabNoCompleteBefore*
+                                    *g:SuperTabNoCompleteAfter*
+
+g:SuperTabNoCompleteBefore (default value: [])
+g:SuperTabNoCompleteAfter (default value: ['^', '\s'])
+
+These two variables are used to control when supertab will attempt completion
+or instead fall back to inserting a literal <tab>. There are two possible ways
+to define these variables:
+
+  1) by specifying a list of patterns which are tested against the text before
+  and after the current cursor position that when matched, prevent completion.
+  So if you don't want supertab to start completion at the start of a line,
+  after a comma, or after a space, you can set g:SuperTabNoCompleteAfter
+  to ['^', ',', '\s'].
+
+  2) by specifying a funcref to a global accessible function which expects
+  as parameter the text to be inspected (before or after) and, based on that (or
+  other factors), it returns 1 if completion must be prevented, 0 otherwise.
+
+Note: That a buffer local version of these variables
+(b:SuperTabNoCompleteBefore, b:SuperTabNoCompleteAfter) are also supported
+should you wish to have different values depending on the file type for
+instance.
+
+Changing the default mapping        *supertab-forwardbackward*
+                                    *g:SuperTabMappingForward*
+                                    *g:SuperTabMappingBackward*
+
+g:SuperTabMappingForward  (default value: '<tab>')
+g:SuperTabMappingBackward (default value: '<s-tab>')
+
+These two variables allow you to set the keys used to kick off the current
+completion. By default this is <tab> and <s-tab>. To change to something
+like <c-space> and <s-c-space>, you can add the following to your |vimrc|.
+
+>
+    let g:SuperTabMappingForward = '<c-space>'
+    let g:SuperTabMappingBackward = '<s-c-space>'
+>
+
+Note: if the above does not have the desired effect (which may happen in
+console version of vim), you can try the following mappings. Although the
+backwards mapping still doesn't seem to work in the console for me, your
+milage may vary.
+
+>
+    let g:SuperTabMappingForward = '<nul>'
+    let g:SuperTabMappingBackward = '<s-nul>'
+<
+
+
+Inserting true tabs                 *supertab-mappingtabliteral*
+                                    *g:SuperTabMappingTabLiteral*
+
+g:SuperTabMappingTabLiteral (default value: '<c-tab>')
+
+Sets the key mapping used to insert a literal tab where supertab would
+otherwise attempt to kick off insert completion. The default is '<c-tab>'
+(ctrl-tab) which unfortunately might not work at the console. So if you are
+using a console vim and want this functionality, you may have to change it to
+something that is supported. Alternatively, you can escape the <tab> with
+<c-v> (see |i_CTRL-V| for more infos).
+
+See also |supertab-preventcomplete|.
+
+
+Enhanced longest match support      *supertab-longestenhanced*
+                                    *g:SuperTabLongestEnhanced*
+
+g:SuperTabLongestEnhanced (default value: 0)
+
+When enabled and 'longest' is in your |completeopt| setting, supertab will
+provide an enhanced longest match support where typing one or more letters and
+hitting tab again while in a completion mode will complete the longest common
+match using the new text in the buffer.
+
+For example, say you have a buffer with the following contents:
+  FooBarFoo
+  FooBar
+  Foo
+  FooBarBaz
+And you then type F<tab>. Vim's builtin longest support will complete the
+longest common text 'Foo' and offer 'FooBarFoo', 'FooBar', 'Foo', and
+'FooBarBaz' as possible completions. With supertab's longest match
+enhancement disabled, typing B<tab> while still in the completion mode will
+end up completing 'FooBarBaz' or 'FooBarFoo' depending your settings, instead
+of the next longest common match of 'FooBar'. With supertab's enhanced
+longest match feature enabled, the typing of B<tab> will result in the next
+longest text being completed.
+
+
+Preselecting the first entry        *supertab-longesthighlight*
+                                    *g:SuperTabLongestHighlight*
+
+g:SuperTabLongestHighlight (default value: 0)
+
+Sets whether or not to pre-highlight the first match when completeopt has the
+popup menu enabled and the 'longest' option as well. When enabled, <tab> will
+kick off completion and pre-select the first entry in the popup menu, allowing
+you to simply hit <enter> to use it.
+
+
+Mapping <cr> to end completion      *supertab-crmapping*
+                                    *g:SuperTabCrMapping*
+
+g:SuperTabCrMapping (default value: 0)
+
+When enabled, <cr> will cancel completion mode preserving the current text.
+
+Compatibility with other plugins:
+  - endwise:     compatible
+  - delimitMate: not compatible (disabled if the delimitMate <cr> mapping is
+    detected.)
+
+Note: if you have an insert expression mapping with a <cr> in it or an insert
+abbreviation containing a <cr>, then supertab will not create a <cr> mapping
+which could potentially cause problems with those.
+
+
+Auto close the preview window       *supertab-closepreviewonpopupclose*
+                                    *g:SuperTabClosePreviewOnPopupClose*
+
+g:SuperTabClosePreviewOnPopupClose (default value: 0)
+
+When enabled, supertab will attempt to close vim's completion preview window
+when the completion popup closes (completion is finished or canceled).
+
+
+Completion ignore/match case        *supertab-completecase*
+                                    *g:SuperTabCompleteCase*
+
+g:SuperTabCompleteCase (default value: 'inherit')
+
+When issuing completions (keyword and potentially others), the value of your
+|'ignorecase'| setting will determine what results are returned based on
+whether or not you've chosen to ignore case or not. However, you may have
+|'ignorecase'| set or unset for other reasons and don't want that value
+considered when using insert completion. SuperTab allows you temporarily
+override |'ignorecase'| by setting g:SuperTabCompleteCase to either 'ignore'
+or 'match' depending on whether you want to always ignore or match case when
+using insert completion.
+
+Note: third party omni/user completion plugins may or may not honor
+|'ignorecase'|. If they do not, then you can probably contact them to add that
+support.
+
+Completion Chaining                  *supertab-completionchaining*
+
+SuperTab provides the ability to chain one of the completion functions
+(|completefunc| or |omnifunc|) together with one of the default vim
+completion key sequences (|ins-completion|), giving you the ability to attempt
+completion with the first, and upon no results, fall back to the second.
+
+To utilize this feature you need to call the *SuperTabChain* function where
+the first argument is the name of a vim compatible |complete-function| and the
+second is one of vim's insert completion (|ins-completion|) key bindings
+(<c-p>, <c-n>, <c-x><c-]>, etc). Calling this function will set the current
+buffer's |completefunc| option to a supertab provided implementation which
+utilizes the supplied arguments to perform the completion.
+
+Here is an example that can be added to your .vimrc which will setup the
+supertab chaining for any filetype that has a provided |omnifunc| to first
+try that, then fall back to supertab's default, <c-p>, completion:
+
+>
+  autocmd FileType *
+    \ if &omnifunc != '' |
+    \   call SuperTabChain(&omnifunc, "<c-p>") |
+    \ endif
+<
+
+You can also specify whether or not the 'context' completion method will
+be used as part of your completion chaining. If you've already set your
+default completion type to 'context', then no further action is needed. If
+however you haven't set that or don't want to use 'context' completion in this
+case, then you can supply a third argument to SuperTabChain which is a boolean
+(1 or 0) indicationg whether you want to use 'context' completion (1) or not
+(0).
+
+Here is an example where 'context' is the global default and completion
+chaining is enabled for file types that have omni completion support:
+
+>
+  let g:SuperTabDefaultCompletionType = 'context'
+  autocmd FileType *
+    \ if &omnifunc != '' |
+    \   call SuperTabChain(&omnifunc, "<c-p>") |
+    \ endif
+<
+
+This configuration will result in a completion flow like so:
+
+  if text before the cursor looks like a file path:
+    use file completion
+  elif text before the cursor looks like an attempt to access a member
+  (method, field, etc):
+    use user completion
+      where user completion is currently set to supertab's
+      completion chaining, resulting in:
+        if omni completion has results:
+          use omni completion
+        else:
+          use keyword completion
+  else:
+    use keyword completion
+
+Note: Completion chaining only supports chaining 1 completion function (omni
+or user) with 1 regular completion keybinding. All other combinations of
+completions (2 or more completion functions, 2 or more key bindings, etc.) are
+not supported due to limitations imposed by vim's code completion
+implementation.
+
+Note: If the |completefunc| or |omnifunc| use vim's |complete_add()| instead
+of returning completion results as a list, then Supertab's completion chaining
+won't work properly with it since Supertab uses the function result to
+determine if it should fallback to the next completion type.
+
+vim:tw=78:ts=8:ft=help:norl:
diff --git a/vim-plugins/bundle/supertab/ftplugin/html.vim b/vim-plugins/bundle/supertab/ftplugin/html.vim
new file mode 100644
index 0000000..4bd2385
--- /dev/null
+++ b/vim-plugins/bundle/supertab/ftplugin/html.vim
@@ -0,0 +1,61 @@
+" Author: Eric Van Dewoestine <ervandew@gmail.com>
+"
+" License: {{{
+"   Copyright (c) 2014
+"   All rights reserved.
+"
+"   Redistribution and use of this software in source and binary forms, with
+"   or without modification, are permitted provided that the following
+"   conditions are met:
+"
+"   * Redistributions of source code must retain the above
+"     copyright notice, this list of conditions and the
+"     following disclaimer.
+"
+"   * Redistributions in binary form must reproduce the above
+"     copyright notice, this list of conditions and the
+"     following disclaimer in the documentation and/or other
+"     materials provided with the distribution.
+"
+"   * Neither the name of Gergely Kontra or Eric Van Dewoestine nor the names
+"   of its contributors may be used to endorse or promote products derived
+"   from this software without specific prior written permission of Gergely
+"   Kontra or Eric Van Dewoestine.
+"
+"   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+"   IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+"   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+"   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+"   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+"   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+"   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+"   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+"   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+"   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+"   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+" }}}
+
+if !exists('b:SuperTabContextTextMemberPatterns')
+  let b:SuperTabContextTextMemberPatterns = ['</']
+endif
+if !exists('b:SuperTabContextTextOmniPrecedence')
+  let set_precedence = 1
+
+  " don't set omni precedence when user is using eclim + php
+  if &ft == 'php'
+    try
+      let project = eclim#project#util#GetCurrentProjectName()
+      if project != ''
+        let natures = eclim#project#util#GetProjectNatureAliases(project)
+        let set_precedence = !eclim#util#ListContains(natures, 'php')
+      endif
+    catch /E117/
+    endtry
+  endif
+
+  if set_precedence
+    let b:SuperTabContextTextOmniPrecedence = ['&omnifunc', '&completefunc']
+  endif
+endif
+
+" vim:ft=vim:fdm=marker
diff --git a/vim-plugins/bundle/supertab/ftplugin/xml.vim b/vim-plugins/bundle/supertab/ftplugin/xml.vim
new file mode 100644
index 0000000..2b23d88
--- /dev/null
+++ b/vim-plugins/bundle/supertab/ftplugin/xml.vim
@@ -0,0 +1,45 @@
+" Author: Eric Van Dewoestine <ervandew@gmail.com>
+"
+" License: {{{
+"   Copyright (c) 2014
+"   All rights reserved.
+"
+"   Redistribution and use of this software in source and binary forms, with
+"   or without modification, are permitted provided that the following
+"   conditions are met:
+"
+"   * Redistributions of source code must retain the above
+"     copyright notice, this list of conditions and the
+"     following disclaimer.
+"
+"   * Redistributions in binary form must reproduce the above
+"     copyright notice, this list of conditions and the
+"     following disclaimer in the documentation and/or other
+"     materials provided with the distribution.
+"
+"   * Neither the name of Gergely Kontra or Eric Van Dewoestine nor the names
+"   of its contributors may be used to endorse or promote products derived
+"   from this software without specific prior written permission of Gergely
+"   Kontra or Eric Van Dewoestine.
+"
+"   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+"   IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+"   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+"   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+"   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+"   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+"   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+"   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+"   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+"   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+"   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+" }}}
+
+if !exists('b:SuperTabContextTextMemberPatterns')
+  let b:SuperTabContextTextMemberPatterns = ['</']
+endif
+if !exists('b:SuperTabContextTextOmniPrecedence')
+  let b:SuperTabContextTextOmniPrecedence = ['&omnifunc', '&completefunc']
+endif
+
+" vim:ft=vim:fdm=marker
diff --git a/vim-plugins/bundle/supertab/plugin/supertab.vim b/vim-plugins/bundle/supertab/plugin/supertab.vim
new file mode 100644
index 0000000..ba8f4dd
--- /dev/null
+++ b/vim-plugins/bundle/supertab/plugin/supertab.vim
@@ -0,0 +1,1144 @@
+" Author: Eric Van Dewoestine <ervandew@gmail.com>
+"         Original concept and versions up to 0.32 written by
+"         Gergely Kontra <kgergely@mcl.hu>
+" Version: 2.1
+" GetLatestVimScripts: 1643 1 :AutoInstall: supertab.vim
+"
+" Description: {{{
+"   Use your tab key to do all your completion in insert mode!
+"   You can cycle forward and backward with the <Tab> and <S-Tab> keys
+"   Note: you must press <Tab> once to be able to cycle back
+"
+"   http://www.vim.org/scripts/script.php?script_id=1643
+" }}}
+"
+" License: {{{
+"   Copyright (c) 2002 - 2016
+"   All rights reserved.
+"
+"   Redistribution and use of this software in source and binary forms, with
+"   or without modification, are permitted provided that the following
+"   conditions are met:
+"
+"   * Redistributions of source code must retain the above
+"     copyright notice, this list of conditions and the
+"     following disclaimer.
+"
+"   * Redistributions in binary form must reproduce the above
+"     copyright notice, this list of conditions and the
+"     following disclaimer in the documentation and/or other
+"     materials provided with the distribution.
+"
+"   * Neither the name of Gergely Kontra or Eric Van Dewoestine nor the names
+"   of its contributors may be used to endorse or promote products derived
+"   from this software without specific prior written permission of Gergely
+"   Kontra or Eric Van Dewoestine.
+"
+"   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+"   IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+"   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+"   PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+"   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+"   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+"   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+"   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+"   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+"   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+"   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+" }}}
+"
+" Testing Info: {{{
+"   Running vim + supertab with the absolute bare minimum settings:
+"     $ vim -u NONE -U NONE -c "set nocp | runtime plugin/supertab.vim"
+" }}}
+
+if v:version < 700
+  finish
+endif
+
+if exists('complType') " Integration with other completion functions.
+  finish
+endif
+
+if exists("loaded_supertab")
+  finish
+endif
+let loaded_supertab = 1
+
+let s:save_cpo=&cpo
+set cpo&vim
+
+" Global Variables {{{
+
+  if !exists("g:SuperTabDefaultCompletionType")
+    let g:SuperTabDefaultCompletionType = "<c-p>"
+  endif
+
+  if !exists("g:SuperTabContextDefaultCompletionType")
+    let g:SuperTabContextDefaultCompletionType = "<c-p>"
+  endif
+
+  if !exists("g:SuperTabContextTextMemberPatterns")
+    let g:SuperTabContextTextMemberPatterns = ['\.', '>\?::', '->']
+  endif
+
+  if !exists("g:SuperTabCompletionContexts")
+    let g:SuperTabCompletionContexts = ['s:ContextText']
+  endif
+
+  if !exists("g:SuperTabRetainCompletionDuration")
+    let g:SuperTabRetainCompletionDuration = 'insert'
+  endif
+
+  if !exists("g:SuperTabNoCompleteBefore")
+    " retain backwards compatability
+    if exists("g:SuperTabMidWordCompletion") && !g:SuperTabMidWordCompletion
+      let g:SuperTabNoCompleteBefore = ['\k']
+    else
+      let g:SuperTabNoCompleteBefore = []
+    endif
+  endif
+
+  if !exists("g:SuperTabNoCompleteAfter")
+    " retain backwards compatability
+    if exists("g:SuperTabLeadingSpaceCompletion") && g:SuperTabLeadingSpaceCompletion
+      let g:SuperTabNoCompleteAfter = []
+    else
+      let g:SuperTabNoCompleteAfter = ['^', '\s']
+    endif
+  endif
+
+  if !exists("g:SuperTabMappingForward")
+    let g:SuperTabMappingForward = '<tab>'
+  endif
+  if !exists("g:SuperTabMappingBackward")
+    let g:SuperTabMappingBackward = '<s-tab>'
+  endif
+
+  if !exists("g:SuperTabMappingTabLiteral")
+    let g:SuperTabMappingTabLiteral = '<c-tab>'
+  endif
+
+  if !exists("g:SuperTabLongestEnhanced")
+    let g:SuperTabLongestEnhanced = 0
+  endif
+
+  if !exists("g:SuperTabLongestHighlight")
+    let g:SuperTabLongestHighlight = 0
+  endif
+
+  if !exists("g:SuperTabCrMapping")
+    let g:SuperTabCrMapping = 0
+  endif
+
+  if !exists("g:SuperTabClosePreviewOnPopupClose")
+    let g:SuperTabClosePreviewOnPopupClose = 0
+  endif
+
+  if !exists("g:SuperTabUndoBreak")
+    let g:SuperTabUndoBreak = 0
+  endif
+
+  if !exists("g:SuperTabCompleteCase")
+    let g:SuperTabCompleteCase = 'inherit'
+  endif
+
+" }}}
+
+" Script Variables {{{
+
+  " construct the help text.
+  let s:tabHelp =
+    \ "Hit <CR> or CTRL-] on the completion type you wish to switch to.\n" .
+    \ "Use :help ins-completion for more information.\n" .
+    \ "\n" .
+    \ "|<c-n>|      - Keywords in 'complete' searching down.\n" .
+    \ "|<c-p>|      - Keywords in 'complete' searching up (SuperTab default).\n" .
+    \ "|<c-x><c-l>| - Whole lines.\n" .
+    \ "|<c-x><c-n>| - Keywords in current file.\n" .
+    \ "|<c-x><c-k>| - Keywords in 'dictionary'.\n" .
+    \ "|<c-x><c-t>| - Keywords in 'thesaurus', thesaurus-style.\n" .
+    \ "|<c-x><c-i>| - Keywords in the current and included files.\n" .
+    \ "|<c-x><c-]>| - Tags.\n" .
+    \ "|<c-x><c-f>| - File names.\n" .
+    \ "|<c-x><c-d>| - Definitions or macros.\n" .
+    \ "|<c-x><c-v>| - Vim command-line.\n" .
+    \ "|<c-x><c-u>| - User defined completion.\n" .
+    \ "|<c-x><c-o>| - Omni completion.\n" .
+    \ "|<c-x>s|     - Spelling suggestions."
+
+  " set the available completion types and modes.
+  let s:types =
+    \ "\<c-e>\<c-y>\<c-l>\<c-n>\<c-k>\<c-t>\<c-i>\<c-]>" .
+    \ "\<c-f>\<c-d>\<c-v>\<c-n>\<c-p>\<c-u>\<c-o>\<c-n>\<c-p>s"
+  let s:modes = '/^E/^Y/^L/^N/^K/^T/^I/^]/^F/^D/^V/^P/^U/^O/s'
+  let s:types = s:types . "np"
+  let s:modes = s:modes . '/n/p'
+
+" }}}
+
+function! SuperTabSetDefaultCompletionType(type) " {{{
+  " Globally available function that users can use to set the default
+  " completion type for the current buffer, like in an ftplugin.
+
+  " don't allow overriding what SuperTabChain has set, otherwise chaining may
+  " not work.
+  if exists('b:SuperTabChain')
+    return
+  endif
+
+  " init hack for <c-x><c-v> workaround.
+  let b:complCommandLine = 0
+
+  let b:SuperTabDefaultCompletionType = a:type
+
+  " set the current completion type to the default
+  call SuperTabSetCompletionType(b:SuperTabDefaultCompletionType)
+endfunction " }}}
+
+function! SuperTabSetCompletionType(type) " {{{
+  " Globally available function that users can use to create mappings to quickly
+  " switch completion modes.  Useful when a user wants to restore the default or
+  " switch to another mode without having to kick off a completion of that type
+  " or use SuperTabHelp.  Note, this function only changes the current
+  " completion type, not the default, meaning that the default will still be
+  " restored once the configured retension duration has been met (see
+  " g:SuperTabRetainCompletionDuration).  To change the default for the current
+  " buffer, use SuperTabDefaultCompletionType(type) instead.  Example mapping to
+  " restore SuperTab default:
+  "   nmap <F6> :call SetSuperTabCompletionType("<c-p>")<cr>
+
+  " don't allow overriding what SuperTabChain has set, otherwise chaining may
+  " not work.
+  if exists('b:SuperTabChain')
+    return
+  endif
+
+  call s:InitBuffer()
+  exec "let b:complType = \"" . escape(a:type, '<') . "\""
+endfunction " }}}
+
+function! SuperTabAlternateCompletion(type) " {{{
+  " Function which can be mapped to a key to kick off an alternate completion
+  " other than the default.  For instance, if you have 'context' as the default
+  " and want to map ctrl+space to issue keyword completion.
+  " Note: due to the way vim expands ctrl characters in mappings, you cannot
+  " create the alternate mapping like so:
+  "    imap <c-space> <c-r>=SuperTabAlternateCompletion("<c-p>")<cr>
+  " instead, you have to use \<lt> to prevent vim from expanding the key
+  " when creating the mapping.
+  "    gvim:
+  "      imap <c-space> <c-r>=SuperTabAlternateCompletion("\<lt>c-p>")<cr>
+  "    console:
+  "      imap <nul> <c-r>=SuperTabAlternateCompletion("\<lt>c-p>")<cr>
+
+  call SuperTabSetCompletionType(a:type)
+  " end any current completion before attempting to start the new one.
+  " use feedkeys to prevent possible remapping of <c-e> from causing issues.
+  "call feedkeys("\<c-e>", 'n')
+  " ^ since we can't detect completion mode vs regular insert mode, we force
+  " vim into keyword completion mode and end that mode to prevent the regular
+  " insert behavior of <c-e> from occurring.
+  call feedkeys("\<c-x>\<c-p>\<c-e>", 'n')
+  call feedkeys(b:complType, 'n')
+  return ''
+endfunction " }}}
+
+function! SuperTabLongestHighlight(dir) " {{{
+  " When longest highlight is enabled, this function is used to do the actual
+  " selection of the completion popup entry.
+
+  if !pumvisible()
+    return ''
+  endif
+  return a:dir == -1 ? "\<up>" : "\<down>"
+endfunction " }}}
+
+function! s:Init() " {{{
+  " Setup mechanism to restore original completion type upon leaving insert
+  " mode if configured to do so
+  if g:SuperTabRetainCompletionDuration == 'insert'
+    augroup supertab_retain
+      autocmd!
+      autocmd InsertLeave * call s:SetDefaultCompletionType()
+    augroup END
+  endif
+endfunction " }}}
+
+function! s:InitBuffer() " {{{
+  if exists('b:SuperTabNoCompleteBefore')
+    return
+  endif
+
+  let b:complReset = 0
+  let b:complTypeManual = !exists('b:complTypeManual') ? '' : b:complTypeManual
+  let b:complTypeContext = ''
+
+  " init hack for <c-x><c-v> workaround.
+  let b:complCommandLine = 0
+
+  if !exists('b:SuperTabNoCompleteBefore')
+    let b:SuperTabNoCompleteBefore = g:SuperTabNoCompleteBefore
+  endif
+  if !exists('b:SuperTabNoCompleteAfter')
+    let b:SuperTabNoCompleteAfter = g:SuperTabNoCompleteAfter
+  endif
+
+  if !exists('b:SuperTabDefaultCompletionType')
+    let b:SuperTabDefaultCompletionType = g:SuperTabDefaultCompletionType
+  endif
+
+  if !exists('b:SuperTabContextDefaultCompletionType')
+    let b:SuperTabContextDefaultCompletionType =
+      \ g:SuperTabContextDefaultCompletionType
+  endif
+
+  " set the current completion type to the default
+  call SuperTabSetCompletionType(b:SuperTabDefaultCompletionType)
+
+  " hack to programatically revert a change to snipmate that breaks supertab
+  " but which the new maintainers don't care about:
+  " http://github.com/garbas/vim-snipmate/issues/37
+  let snipmate = maparg('<tab>', 'i')
+  if snipmate =~ '<C-G>u' && g:SuperTabMappingForward =~? '<tab>'
+    let snipmate = substitute(snipmate, '<C-G>u', '', '')
+    iunmap <tab>
+    exec "inoremap <silent> <tab> " . snipmate
+  endif
+endfunction " }}}
+
+function! s:ManualCompletionEnter() " {{{
+  " Handles manual entrance into completion mode.
+
+  if &smd
+    echo '' | echohl ModeMsg | echo '-- ^X++ mode (' . s:modes . ')' | echohl None
+  endif
+  let complType = nr2char(getchar())
+  if stridx(s:types, complType) != -1
+    if !exists('b:supertab_close_preview')
+      let b:supertab_close_preview = !s:IsPreviewOpen()
+    endif
+
+    if stridx("\<c-e>\<c-y>", complType) != -1 " no memory, just scroll...
+      return "\<c-x>" . complType
+    elseif stridx('np', complType) != -1
+      let complType = nr2char(char2nr(complType) - 96)
+    else
+      let complType = "\<c-x>" . complType
+    endif
+
+    let b:complTypeManual = complType
+
+    if index(['insert', 'session'], g:SuperTabRetainCompletionDuration) != -1
+      let b:complType = complType
+    endif
+
+    " Hack to workaround bug when invoking command line completion via <c-r>=
+    if complType == "\<c-x>\<c-v>"
+      return s:CommandLineCompletion()
+    endif
+
+    call s:InitBuffer()
+
+    " optionally enable enhanced longest completion
+    if g:SuperTabLongestEnhanced && &completeopt =~ 'longest'
+      call s:EnableLongestEnhancement()
+    " handle backspacing which triggers g:SuperTabNoCompleteAfter match
+    elseif s:IsNoCompleteAfterReset()
+      call s:EnableNoCompleteAfterReset()
+    endif
+
+    if g:SuperTabLongestHighlight &&
+     \ &completeopt =~ 'longest' &&
+     \ &completeopt =~ 'menu' &&
+     \ !s:CompletionMode()
+      let dir = (complType == "\<c-x>\<c-p>") ? -1 : 1
+      call feedkeys("\<c-r>=SuperTabLongestHighlight(" . dir . ")\<cr>", 'n')
+    endif
+
+    call s:StartCompletionMode()
+    return complType
+  endif
+
+  echohl "Unknown mode"
+  return complType
+endfunction " }}}
+
+function! s:SetCompletionType() " {{{
+  " Sets the completion type based on what the user has chosen from the help
+  " buffer.
+
+  let chosen = substitute(getline('.'), '.*|\(.*\)|.*', '\1', '')
+  if chosen != getline('.')
+    let winnr = b:winnr
+    close
+    exec winnr . 'winc w'
+    call SuperTabSetCompletionType(chosen)
+  endif
+endfunction " }}}
+
+function! s:SetDefaultCompletionType() " {{{
+  if exists('b:SuperTabDefaultCompletionType') &&
+  \ (!exists('b:complCommandLine') || !b:complCommandLine)
+    call SuperTabSetCompletionType(b:SuperTabDefaultCompletionType)
+  endif
+endfunction " }}}
+
+function! SuperTab(command) " {{{
+  " Used to perform proper cycle navigation as the user requests the next or
+  " previous entry in a completion list, and determines whether or not to simply
+  " retain the normal usage of <tab> based on the cursor position.
+
+  if exists('b:SuperTabDisabled') && b:SuperTabDisabled
+    if exists('s:Tab')
+      return s:Tab()
+    endif
+    return (
+        \ g:SuperTabMappingForward ==? '<tab>' ||
+        \ g:SuperTabMappingBackward ==? '<tab>'
+      \ ) ? "\<tab>" : ''
+  endif
+
+  call s:InitBuffer()
+
+  if s:WillComplete()
+    if !exists('b:supertab_close_preview')
+      let b:supertab_close_preview = !s:IsPreviewOpen()
+    endif
+
+    " optionally enable enhanced longest completion
+    if g:SuperTabLongestEnhanced && &completeopt =~ 'longest'
+      call s:EnableLongestEnhancement()
+    " handle backspacing which triggers g:SuperTabNoCompleteAfter match
+    elseif s:IsNoCompleteAfterReset()
+      call s:EnableNoCompleteAfterReset()
+    endif
+
+    if !s:CompletionMode()
+      let b:complTypeManual = ''
+    endif
+
+    " exception: if in <c-p> mode, then <c-n> should move up the list, and
+    " <c-p> down the list.
+    if a:command == 'p' && !b:complReset &&
+      \ (b:complType == "\<c-p>" ||
+      \   (b:complType == 'context' &&
+      \    b:complTypeManual == '' &&
+      \    b:complTypeContext == "\<c-p>"))
+      return "\<c-n>"
+
+    elseif a:command == 'p' && !b:complReset &&
+      \ (b:complType == "\<c-n>" ||
+      \   (b:complType == 'context' &&
+      \    b:complTypeManual == '' &&
+      \    b:complTypeContext == "\<c-n>"))
+      return "\<c-p>"
+
+    " already in completion mode and not resetting for longest enhancement, so
+    " just scroll to next/previous
+    elseif s:CompletionMode() && !b:complReset
+      let type = b:complType == 'context' ? b:complTypeContext : b:complType
+      if a:command == 'n'
+        return type == "\<c-p>" || type == "\<c-x>\<c-p>" ? "\<c-p>" : "\<c-n>"
+      endif
+      return type == "\<c-p>" || type == "\<c-x>\<c-p>" ? "\<c-n>" : "\<c-p>"
+    endif
+
+    " handle 'context' completion.
+    if b:complType == 'context'
+      let complType = s:ContextCompletion()
+      if complType == ''
+        exec "let complType = \"" .
+          \ escape(b:SuperTabContextDefaultCompletionType, '<') . "\""
+      endif
+      let b:complTypeContext = complType
+
+    " Hack to workaround bug when invoking command line completion via <c-r>=
+    elseif b:complType == "\<c-x>\<c-v>"
+      let complType = s:CommandLineCompletion()
+    else
+      let complType = b:complType
+    endif
+
+    " switch <c-x><c-p> / <c-x><c-n> completion in <c-p> mode
+    if a:command == 'p'
+      if complType == "\<c-x>\<c-p>"
+        let complType = "\<c-x>\<c-n>"
+      elseif complType == "\<c-x>\<c-n>"
+        let complType = "\<c-x>\<c-p>"
+      endif
+    endif
+
+    " highlight first result if longest enabled
+    if g:SuperTabLongestHighlight &&
+     \ &completeopt =~ 'longest' &&
+     \ &completeopt =~ 'menu' &&
+     \ (!s:CompletionMode() || b:complReset)
+      let dir = (complType == "\<c-p>") ? -1 : 1
+      call feedkeys("\<c-r>=SuperTabLongestHighlight(" . dir . ")\<cr>", 'n')
+    endif
+
+    if b:complReset
+      let b:complReset = 0
+      " not an accurate condition for everyone, but better than sending <c-e>
+      " at the wrong time.
+      if s:CompletionMode()
+        return "\<c-e>" . complType
+      endif
+    endif
+
+    if g:SuperTabUndoBreak && !s:CompletionMode()
+      call s:StartCompletionMode()
+      return "\<c-g>u" . complType
+    endif
+
+    if g:SuperTabCompleteCase == 'ignore' ||
+     \ g:SuperTabCompleteCase == 'match'
+      if exists('##CompleteDone')
+        let ignorecase = g:SuperTabCompleteCase == 'ignore' ? 1 : 0
+        if &ignorecase != ignorecase
+          let b:supertab_ignorecase_save = &ignorecase
+          let &ignorecase = ignorecase
+          augroup supertab_ignorecase
+            autocmd CompleteDone <buffer>
+              \ let &ignorecase = b:supertab_ignorecase_save |
+              \ unlet b:supertab_ignorecase_save |
+              \ autocmd! supertab_ignorecase
+          augroup END
+        endif
+      endif
+    endif
+
+    call s:StartCompletionMode()
+    return complType
+  endif
+
+  if (a:command == 'n' && g:SuperTabMappingForward ==? '<tab>') ||
+   \ (a:command == 'p' && g:SuperTabMappingBackward ==? '<tab>')
+
+    " trigger our func ref to the smart tabs plugin if present.
+    if exists('s:Tab')
+      return s:Tab()
+    endif
+
+    return "\<tab>"
+  endif
+
+  if (a:command == 'n' && g:SuperTabMappingForward ==? '<s-tab>') ||
+   \ (a:command == 'p' && g:SuperTabMappingBackward ==? '<s-tab>')
+    " support triggering <s-tab> mappings users might have.
+    if exists('s:ShiftTab')
+      if type(s:ShiftTab) == 2
+        return s:ShiftTab()
+      else
+        call feedkeys(s:ShiftTab, 'n')
+      endif
+    endif
+  endif
+
+  return ''
+endfunction " }}}
+
+function! s:SuperTabHelp() " {{{
+  " Opens a help window where the user can choose a completion type to enter.
+
+  let winnr = winnr()
+  if bufwinnr("SuperTabHelp") == -1
+    keepalt botright split SuperTabHelp
+
+    setlocal noswapfile
+    setlocal buftype=nowrite
+    setlocal bufhidden=wipe
+
+    silent put =s:tabHelp
+    call cursor(1, 1)
+    silent 1,delete _
+    call cursor(4, 1)
+    exec "resize " . line('$')
+
+    syntax match Special "|.\{-}|"
+
+    setlocal readonly
+    setlocal nomodifiable
+
+    nmap <silent> <buffer> <cr> :call <SID>SetCompletionType()<cr>
+    nmap <silent> <buffer> <c-]> :call <SID>SetCompletionType()<cr>
+  else
+    exec bufwinnr("SuperTabHelp") . "winc w"
+  endif
+  let b:winnr = winnr
+endfunction " }}}
+
+function! s:CompletionMode() " {{{
+  return pumvisible() || exists('b:supertab_completion_mode')
+endfunction " }}}
+
+function! s:StartCompletionMode() " {{{
+  if exists('##CompleteDone')
+    let b:supertab_completion_mode = 1
+    augroup supertab_completion_mode
+      autocmd CompleteDone <buffer>
+        \ if exists('b:supertab_completion_mode') |
+          \ unlet b:supertab_completion_mode |
+        \ endif |
+        \ autocmd! supertab_completion_mode
+    augroup END
+  endif
+endfunction " }}}
+
+function! s:WillComplete(...) " {{{
+  " Determines if completion should be kicked off at the current location.
+  " Optional arg:
+  "   col: The column to check at, otherwise use the current column.
+
+  " if an arg was supplied, then we will re-check even if already in
+  " completion mode.
+  if s:CompletionMode() && !a:0
+    return 1
+  endif
+
+  let line = getline('.')
+  let cnum = a:0 ? a:1 : col('.')
+
+  " honor SuperTabNoCompleteAfter
+  let pre = cnum >= 2 ? line[:cnum - 2] : ''
+  let complAfterType = type(b:SuperTabNoCompleteAfter)
+  if complAfterType == 3
+    " the option was provided as a list of patterns
+    for pattern in b:SuperTabNoCompleteAfter
+      if pre =~ pattern . '$'
+        return 0
+      endif
+    endfor
+  elseif complAfterType == 2
+    " the option was provided as a funcref
+    return !b:SuperTabNoCompleteAfter(pre)
+  endif
+
+  " honor SuperTabNoCompleteBefore
+  " Within a word, but user does not have mid word completion enabled.
+  let post = line[cnum - 1:]
+  let complBeforeType = type(b:SuperTabNoCompleteBefore)
+  if complBeforeType == 3
+    " a list of patterns
+    for pattern in b:SuperTabNoCompleteBefore
+      if post =~ '^' . pattern
+        return 0
+      endif
+    endfor
+  elseif complBeforeType == 2
+    " the option was provided as a funcref
+    return !b:SuperTabNoCompleteBefore(post)
+  endif
+
+  return 1
+endfunction " }}}
+
+function! s:EnableLongestEnhancement() " {{{
+  augroup supertab_reset
+    autocmd!
+    autocmd InsertLeave,CursorMovedI <buffer>
+      \ call s:ReleaseKeyPresses() | autocmd! supertab_reset
+  augroup END
+  call s:CaptureKeyPresses()
+endfunction " }}}
+
+function! s:IsNoCompleteAfterReset() " {{{
+  " if the user has g:SuperTabNoCompleteAfter set, then re-map <bs> so that
+  " backspacing to a point where one of the g:SuperTabNoCompleteAfter
+  " entries matches will cause completion mode to exit.
+  let complAfterType = type(b:SuperTabNoCompleteAfter)
+  if complAfterType == 2
+    return 1
+  endif
+  return len(g:SuperTabNoCompleteAfter) && g:SuperTabNoCompleteAfter != ['^', '\s']
+endfunction " }}}
+
+function! s:EnableNoCompleteAfterReset() " {{{
+  augroup supertab_reset
+    autocmd!
+    autocmd InsertLeave,CursorMovedI <buffer>
+      \ call s:ReleaseKeyPresses() | autocmd! supertab_reset
+  augroup END
+
+  " short version of s:CaptureKeyPresses
+  if !exists('b:capturing') || !b:capturing
+    let b:capturing = 1
+    let b:capturing_start = col('.')
+    let b:captured = {
+        \ '<bs>': s:CaptureKeyMap('<bs>'),
+        \ '<c-h>': s:CaptureKeyMap('<c-h>'),
+      \ }
+    imap <buffer> <bs> <c-r>=<SID>CompletionReset("\<lt>bs>")<cr>
+    imap <buffer> <c-h> <c-r>=<SID>CompletionReset("\<lt>c-h>")<cr>
+  endif
+endfunction " }}}
+
+function! s:CompletionReset(char) " {{{
+  let b:complReset = 1
+
+  " handle exiting completion mode if user has g:SuperTabNoCompleteAfter set
+  " and they are about to backspace to a point where that maches one of the
+  " entries in that var.
+  if (a:char == "\<bs>" || a:char == "\<c-h>") && s:IsNoCompleteAfterReset()
+    if !s:WillComplete(col('.') - 1)
+      " Exit from completion mode then issue the currently requested
+      " backspace (mapped).
+      call feedkeys("\<space>\<bs>", 'n')
+      call s:ReleaseKeyPresses()
+      call feedkeys("\<bs>", 'mt')
+      return ''
+    endif
+  endif
+
+  return a:char
+endfunction " }}}
+
+function! s:CaptureKeyPresses() " {{{
+  if !exists('b:capturing') || !b:capturing
+    let b:capturing = 1
+    let b:capturing_start = col('.')
+    " save any previous mappings
+    let b:captured = {
+        \ '<bs>': s:CaptureKeyMap('<bs>'),
+        \ '<c-h>': s:CaptureKeyMap('<c-h>'),
+      \ }
+    " TODO: use &keyword to get an accurate list of chars to map
+    for c in split('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_', '.\zs')
+      let existing = s:CaptureKeyMap(c)
+      let b:captured[c] = existing
+      exec 'imap <buffer> ' . c . ' <c-r>=<SID>CompletionReset("' . c . '")<cr>'
+    endfor
+    imap <buffer> <bs> <c-r>=<SID>CompletionReset("\<lt>bs>")<cr>
+    imap <buffer> <c-h> <c-r>=<SID>CompletionReset("\<lt>c-h>")<cr>
+  endif
+endfunction " }}}
+
+function! s:CaptureKeyMap(key) " {{{
+  " as of 7.3.032 maparg supports obtaining extended information about the
+  " mapping.
+  if s:has_dict_maparg
+    return maparg(a:key, 'i', 0, 1)
+  endif
+  return maparg(a:key, 'i')
+endfunction " }}}
+
+function! s:IsPreviewOpen() " {{{
+  let wins = tabpagewinnr(tabpagenr(), '$')
+  let winnr = 1
+  while winnr <= wins
+    if getwinvar(winnr, '&previewwindow') == 1
+      return 1
+    endif
+    let winnr += 1
+  endwhile
+  return 0
+endfunction " }}}
+
+function! s:ClosePreview() " {{{
+  if exists('b:supertab_close_preview') && b:supertab_close_preview
+    let preview = 0
+    for bufnum in tabpagebuflist()
+      if getwinvar(bufwinnr(bufnum), '&previewwindow')
+        let preview = 1
+        break
+      endif
+    endfor
+    if preview
+      pclose
+      try
+        doautocmd <nomodeline> supertab_preview_closed User <supertab>
+      catch /E216/
+        " ignore: no autocmds defined
+      endtry
+    endif
+  endif
+  silent! unlet b:supertab_close_preview
+endfunction " }}}
+
+function! s:ReleaseKeyPresses() " {{{
+  if exists('b:capturing') && b:capturing
+    let b:capturing = 0
+    for c in keys(b:captured)
+      exec 'iunmap <buffer> ' . c
+    endfor
+
+    " restore any previous mappings
+    for [key, mapping] in items(b:captured)
+      if !len(mapping)
+        continue
+      endif
+
+      if type(mapping) == 4
+        let restore = mapping.noremap ? "inoremap" : "imap"
+        let restore .= " <buffer>"
+        if mapping.silent
+          let restore .= " <silent>"
+        endif
+        if mapping.expr
+          let restore .= " <expr>"
+        endif
+        let rhs = substitute(mapping.rhs, '<SID>\c', '<SNR>' . mapping.sid . '_', 'g')
+        let restore .= ' ' . key . ' ' . rhs
+        exec restore
+      elseif type(c) == 1
+        let args = substitute(mapping, '.*\(".\{-}"\).*', '\1', '')
+        if args != mapping
+          let args = substitute(args, '<', '<lt>', 'g')
+          let expr = substitute(mapping, '\(.*\)".\{-}"\(.*\)', '\1%s\2', '')
+          let mapping = printf(expr, args)
+        endif
+        exec printf("imap <silent> <buffer> %s %s", key, mapping)
+      endif
+    endfor
+    unlet b:captured
+
+    if mode() == 'i' && &completeopt =~ 'menu' && b:capturing_start != col('.')
+      " force full exit from completion mode (don't exit insert mode since
+      " that will break repeating with '.')
+      call feedkeys("\<space>\<bs>", 'n')
+    endif
+    unlet b:capturing_start
+  endif
+endfunction " }}}
+
+function! s:CommandLineCompletion() " {{{
+  " Hack needed to account for apparent bug in vim command line mode completion
+  " when invoked via <c-r>=
+
+  " This hack will trigger InsertLeave which will then invoke
+  " s:SetDefaultCompletionType.  To prevent default completion from being
+  " restored prematurely, set an internal flag for s:SetDefaultCompletionType
+  " to check for.
+  let b:complCommandLine = 1
+  return "\<c-\>\<c-o>:call feedkeys('\<c-x>\<c-v>\<c-v>', 'n') | " .
+    \ "let b:complCommandLine = 0\<cr>"
+endfunction " }}}
+
+function! s:ContextCompletion() " {{{
+  let contexts = exists('b:SuperTabCompletionContexts') ?
+    \ b:SuperTabCompletionContexts : g:SuperTabCompletionContexts
+
+  for context in contexts
+    try
+      let Context = function(context)
+      let complType = Context()
+      unlet Context
+      if type(complType) == 1 && complType != ''
+        return complType
+      endif
+    catch /E700/
+      echohl Error
+      echom 'supertab: no context function "' . context . '" found.'
+      echohl None
+    endtry
+  endfor
+  return ''
+endfunction " }}}
+
+function! s:ContextDiscover() " {{{
+  let discovery = exists('g:SuperTabContextDiscoverDiscovery') ?
+    \ g:SuperTabContextDiscoverDiscovery : []
+
+  " loop through discovery list to find the default
+  if !empty(discovery)
+    for pair in discovery
+      let var = substitute(pair, '\(.*\):.*', '\1', '')
+      let type = substitute(pair, '.*:\(.*\)', '\1', '')
+      exec 'let value = ' . var
+      if value !~ '^\s*$' && value != '0'
+        exec "let complType = \"" . escape(type, '<') . "\""
+        return complType
+      endif
+    endfor
+  endif
+endfunction " }}}
+
+function! s:ContextText() " {{{
+  let exclusions = exists('g:SuperTabContextTextFileTypeExclusions') ?
+    \ g:SuperTabContextTextFileTypeExclusions : []
+
+  if index(exclusions, &ft) == -1
+    let curline = getline('.')
+    let cnum = col('.')
+    let synname = synIDattr(synID(line('.'), cnum - 1, 1), 'name')
+
+    let member_patterns = exists('b:SuperTabContextTextMemberPatterns') ?
+      \ b:SuperTabContextTextMemberPatterns : g:SuperTabContextTextMemberPatterns
+    let member_pattern = join(member_patterns, '\|')
+
+    " don't kick off file completion if the pattern is '</' (to account for
+    " sgml languanges), that's what the following <\@<! pattern is doing.
+    if curline =~ '<\@<!/\.\?\w*\%' . cnum . 'c' ||
+      \ ((has('win32') || has('win64')) && curline =~ '\\\w*\%' . cnum . 'c')
+
+      return "\<c-x>\<c-f>"
+
+    elseif curline =~ '\(' . member_pattern . '\)\w*\%' . cnum . 'c' &&
+      \ synname !~ '\(String\|Comment\)'
+      let omniPrecedence = exists('g:SuperTabContextTextOmniPrecedence') ?
+        \ g:SuperTabContextTextOmniPrecedence : ['&completefunc', '&omnifunc']
+      let omniPrecedence = exists('b:SuperTabContextTextOmniPrecedence') ?
+        \ b:SuperTabContextTextOmniPrecedence : omniPrecedence
+
+      for omniFunc in omniPrecedence
+        if omniFunc !~ '^&'
+          let omniFunc = '&' . omniFunc
+        endif
+        if getbufvar(bufnr('%'), omniFunc) != ''
+          return omniFunc == '&omnifunc' ? "\<c-x>\<c-o>" : "\<c-x>\<c-u>"
+        endif
+      endfor
+    endif
+  endif
+endfunction " }}}
+
+function! s:ExpandMap(map) " {{{
+  let map = a:map
+  if map =~ '<Plug>'
+    let plug = substitute(map, '.\{-}\(<Plug>\w\+\).*', '\1', '')
+    let plug_map = maparg(plug, 'i')
+    let map = substitute(map, '.\{-}\(<Plug>\w\+\).*', plug_map, '')
+  endif
+  return map
+endfunction " }}}
+
+function! SuperTabChain(completefunc, completekeys, ...) " {{{
+  if a:completefunc != 'SuperTabCodeComplete'
+    call s:InitBuffer()
+    if (a:0 && a:1) || (!a:0 && b:SuperTabDefaultCompletionType == 'context')
+      let b:SuperTabContextTextOmniPrecedence = ['&completefunc', '&omnifunc']
+      call SuperTabSetDefaultCompletionType("context")
+    else
+      call SuperTabSetDefaultCompletionType("<c-x><c-u>")
+    endif
+
+    let b:SuperTabChain = [a:completefunc, a:completekeys]
+    setlocal completefunc=SuperTabCodeComplete
+  endif
+endfunction " }}}
+
+function! SuperTabCodeComplete(findstart, base) " {{{
+  if !exists('b:SuperTabChain')
+    echoe 'No completion chain has been set.'
+    return -2
+  endif
+
+  if len(b:SuperTabChain) != 2
+    echoe 'Completion chain can only be used with 1 completion function ' .
+        \ 'and 1 fallback completion key binding.'
+    return -2
+  endif
+
+  let Func = function(b:SuperTabChain[0])
+
+  if a:findstart
+    let start = Func(a:findstart, a:base)
+    if start >= 0
+      return start
+    endif
+
+    return col('.') - 1
+  endif
+
+  let results = Func(a:findstart, a:base)
+  " Handle dict case, with 'words' and 'refresh' (optional).
+  " This is used by YouCompleteMe. (See complete-functions).
+  if type(results) == type({}) && has_key(results, 'words')
+    if len(results.words)
+      return results
+    endif
+  elseif len(results)
+    return results
+  endif
+
+  exec 'let keys = "' . escape(b:SuperTabChain[1], '<') . '"'
+  " <c-e>: stop completion and go back to the originally typed text.
+  call feedkeys("\<c-e>" . keys, 'nt')
+  return []
+endfunction " }}}
+
+" Autocmds {{{
+  if g:SuperTabClosePreviewOnPopupClose
+    augroup supertab_close_preview
+      autocmd!
+      autocmd InsertLeave,CursorMovedI * call s:ClosePreview()
+    augroup END
+  endif
+" }}}
+
+" Key Mappings {{{
+  " map a regular tab to ctrl-tab (note: doesn't work in console vim)
+  exec 'inoremap ' . g:SuperTabMappingTabLiteral . ' <tab>'
+
+  inoremap <silent> <c-x> <c-r>=<SID>ManualCompletionEnter()<cr>
+
+  imap <script> <Plug>SuperTabForward <c-r>=SuperTab('n')<cr>
+  imap <script> <Plug>SuperTabBackward <c-r>=SuperTab('p')<cr>
+
+  let s:has_dict_maparg = v:version > 703 || (v:version == 703 && has('patch32'))
+
+  " support delegating to smart tabs plugin
+  if g:SuperTabMappingForward ==? '<tab>' || g:SuperTabMappingBackward ==? '<tab>'
+    let existing_tab = maparg('<tab>', 'i')
+    if existing_tab =~ '\d\+_InsertSmartTab()$'
+      let s:Tab = function(substitute(existing_tab, '()$', '', ''))
+    endif
+  endif
+
+  " save user's existing <s-tab> mapping if they have one.
+  " Note: this could cause more problems than it solves if it picks up <s-tab>
+  " mappings from other plugins and misinterprets them, etc, so this block is
+  " experimental and could be removed later.
+  if g:SuperTabMappingForward ==? '<s-tab>' || g:SuperTabMappingBackward ==? '<s-tab>'
+    let stab = maparg('<s-tab>', 'i')
+    if s:has_dict_maparg
+      let existing_stab = maparg('<s-tab>', 'i', 0, 1)
+      if len(existing_stab) && existing_stab.expr
+        let stab = substitute(stab, '<SID>\c', '<SNR>' . existing_stab.sid . '_', '')
+        let stab = substitute(stab, '()$', '', '')
+        let s:ShiftTab = function(stab)
+        let stab = ''
+      endif
+    endif
+    if stab != ''
+      let stab = substitute(stab, '\(<[-a-zA-Z0-9]\+>\)', '\\\1', 'g')
+      exec "let stab = \"" . stab . "\""
+      let s:ShiftTab = stab
+    endif
+  endif
+
+  exec 'imap ' . g:SuperTabMappingForward . ' <Plug>SuperTabForward'
+  exec 'imap ' . g:SuperTabMappingBackward . ' <Plug>SuperTabBackward'
+
+  if g:SuperTabCrMapping
+    let expr_map = 0
+    if s:has_dict_maparg
+      let map_dict = maparg('<cr>', 'i', 0, 1)
+      let expr_map = has_key(map_dict, 'expr') && map_dict.expr
+    else
+      let expr_map = maparg('<cr>', 'i') =~? '\<cr>'
+    endif
+
+    redir => iabbrevs
+    silent iabbrev
+    redir END
+    let iabbrev_map = iabbrevs =~? '\<cr>'
+
+    if expr_map
+      " Not compatible w/ expr mappings. This is most likely a user mapping,
+      " typically with the same functionality anyways.
+      let g:SuperTabCrMapping = 0
+    elseif iabbrev_map
+      " Not compatible w/ insert abbreviations containing <cr>
+      let g:SuperTabCrMapping = 0
+    elseif maparg('<CR>', 'i') =~ '<Plug>delimitMateCR'
+      " Not compatible w/ delimitMate since it doesn't play well with others
+      " and will always return a <cr> which we don't want when selecting a
+      " completion.
+      let g:SuperTabCrMapping = 0
+    elseif maparg('<CR>', 'i') =~ '<CR>'
+      let map = maparg('<cr>', 'i')
+      let cr = !(map =~? '\(^\|[^)]\)<cr>' || map =~ 'ExpandCr')
+      let map = s:ExpandMap(map)
+      exec "inoremap <script> <cr> <c-r>=<SID>SelectCompletion(" . cr . ")<cr>" . map
+    else
+      inoremap <silent> <cr> <c-r>=<SID>SelectCompletion(1)<cr>
+    endif
+    function! s:SelectCompletion(cr)
+      " selecting a completion
+      if s:CompletionMode()
+        " ugly hack to let other <cr> mappings for other plugins cooperate
+        " with supertab
+        let b:supertab_pumwasvisible = 1
+
+        " close the preview window if configured to do so
+        if &completeopt =~ 'preview' && g:SuperTabClosePreviewOnPopupClose
+          if !exists('b:supertab_close_preview')
+            let b:supertab_close_preview = !s:IsPreviewOpen()
+          endif
+          call s:ClosePreview()
+        endif
+
+        return "\<c-y>"
+      endif
+
+      " only needed when chained with other mappings and one of them will
+      " issue a <cr>.
+      if exists('b:supertab_pumwasvisible') && !a:cr
+        unlet b:supertab_pumwasvisible
+        return ''
+      endif
+
+      " not so pleasant hack to keep <cr> working for abbreviations
+      let word = substitute(getline('.'), '^.*\s\+\(.*\%' . col('.') . 'c\).*', '\1', '')
+      let result = maparg(word, 'i', 1)
+      if result != ''
+        let bs = ""
+        let i = 0
+        while i < len(word)
+          let bs .= "\<bs>"
+          let i += 1
+        endwhile
+        " escape keys
+        let result = substitute(result, '\(<[a-zA-Z][-a-zA-Z]*>\)', '\\\1', 'g')
+        " ensure escaped keys are properly recognized
+        exec 'let result = "' . escape(result, '"') . '"'
+        return bs . result . (a:cr ? "\<cr>" : "")
+      endif
+
+      " only return a cr if nothing else is mapped to it since we don't want
+      " to duplicate a cr returned by another mapping.
+      return a:cr ? "\<cr>" : ""
+    endfunction
+  endif
+" }}}
+
+" Command Mappings {{{
+  if !exists(":SuperTabHelp")
+    command SuperTabHelp :call <SID>SuperTabHelp()
+  endif
+" }}}
+
+call s:Init()
+
+function! TestSuperTabCodeComplete(findstart, base) " {{{
+  " Test supertab completion chaining w/ a minimal vim environment:
+  " $ vim -u NONE -U NONE \
+  "   --cmd "set nocp | sy on" \
+  "   -c "so ~/.vim/plugin/supertab.vim" \
+  "   -c "let g:SuperTabDefaultCompletionType = '<c-x><c-u>'" \
+  "   -c "set completefunc=TestSuperTabCodeComplete" \
+  "   -c "call SuperTabChain(&completefunc, '<c-p>')"
+  if a:findstart
+    let line = getline('.')
+    let start = col('.') - 1
+    if line[start] =~ '\.'
+      let start -= 1
+    endif
+    while start > 0 && line[start - 1] =~ '\w'
+      let start -= 1
+    endwhile
+    return start
+  else
+    let completions = []
+    if getline('.') =~ 'TestC'
+      call add(completions, {
+          \ 'word': 'test1(',
+          \ 'kind': 'm',
+          \ 'menu': 'test1(...)',
+        \ })
+      call add(completions, {
+          \ 'word': 'testing2(',
+          \ 'kind': 'm',
+          \ 'menu': 'testing2(...)',
+        \ })
+    endif
+
+    return completions
+  endif
+endfunction " }}}
+
+let &cpo = s:save_cpo
+
+" vim:ft=vim:fdm=marker
diff --git a/vim-plugins/bundle/syntastic/CONTRIBUTING.md b/vim-plugins/bundle/syntastic/CONTRIBUTING.md
new file mode 100644
index 0000000..44eb13f
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/CONTRIBUTING.md
@@ -0,0 +1,105 @@
+# CONTRIBUTING
+- - -
+1\. [Bug reports / GitHub issues](#bugreps)  
+2\. [Submitting a patch](#patches)  
+3\. [General style notes](#generalstyle)  
+4\. [Syntax checker notes](#checkerstyle)  
+- - -
+
+<a name="bugreps"></a>
+
+## 1. Bug reports / GitHub issues
+
+Please note that the preferred channel for posting bug reports is the
+[issue tracker at GitHub][bug_tracker]. Reports posted elsewhere are less likely
+to be seen by the core team.
+
+When reporting a bug make sure you search the existing GitHub issues
+for the same/similar issues. If you find one, feel free to add a `+1`
+comment with any additional information that may help us solve the
+issue.
+
+When creating a new issue be sure to state the following:
+
+* steps to reproduce the bug;
+* the version of Vim you are using (run `:ver` to find out);
+* the version of syntastic you are using (see `:SyntasticInfo`).
+
+For syntax checker bugs also state the version of the checker executable
+that you are using. Adding debugging information is typically useful
+too:
+
+* open a file handled by your checker;
+* set `g:syntastic_debug` to 1 or 3;
+* run the checker;
+* copy the output of `:mes`.
+
+<a name="patches"></a>
+
+## 2. Submitting a patch
+
+Before you consider adding features to syntastic, _please_ spend a few minutes
+(re-)reading the latest version of the [manual][manual]. Syntastic is changing
+rapidly at times, and it's possible that some features you want to add exist
+already.
+
+To submit a patch:
+
+* fork the [repo][github] on GitHub;
+* make a [topic branch][branches] and start hacking;
+* submit a pull request based off your topic branch.
+
+Small, focused patches are preferred.
+
+Large changes to the code should be discussed with the core team first.
+Create an issue and explain your plan and see what we say.
+
+Also, make sure to update the manual whenever applicable. Nobody can use
+features that aren't documented.
+
+<a name="generalstyle"></a>
+
+## 3. General style notes
+
+Follow the coding conventions/styles used in the syntastic core:
+
+* use 4 space indents;
+* don't use abbreviated keywords - e.g. use `endfunction`, not `endfun`
+(there's always room for more fun!);
+* don't use `l:` prefixes for variables unless actually required (i.e.
+almost never);
+* code for maintainability; we would rather a function be a couple of
+lines longer and have (for example) some [explaining variables][variables] to
+aid readability.
+
+<a name="checkerstyle"></a>
+
+## 4. Syntax checker notes
+
+Make sure to read the [guide][guide] if you plan to add new syntax checkers.
+
+Use the existing checkers as templates, rather than writing everything
+from scratch.
+
+The preferred style for error format strings is one "clause" per line.
+E.g. (from the `coffee` checker):
+
+```vim
+let errorformat =
+    \ '%E%f:%l:%c: %trror: %m,' .
+    \ 'Syntax%trror: In %f\, %m on line %l,' .
+    \ '%EError: In %f\, Parse error on line %l: %m,' .
+    \ '%EError: In %f\, %m on line %l,' .
+    \ '%W%f(%l): lint warning: %m,' .
+    \ '%W%f(%l): warning: %m,' .
+    \ '%E%f(%l): SyntaxError: %m,' .
+    \ '%-Z%p^,' .
+    \ '%-G%.%#'
+```
+
+[bug_tracker]:      https://github.com/vim-syntastic/syntastic/issues
+[manual]:           https://github.com/vim-syntastic/syntastic/blob/master/doc/syntastic.txt
+[github]:           https://github.com/vim-syntastic/syntastic
+[branches]:         https://github.com/dchelimsky/rspec/wiki/Topic-Branches#using-topic-branches-when-contributing-patches
+[variables]:        http://www.refactoring.com/catalog/extractVariable.html
+[guide]:            https://github.com/vim-syntastic/syntastic/wiki/Syntax-Checker-Guide
diff --git a/vim-plugins/bundle/syntastic/LICENCE b/vim-plugins/bundle/syntastic/LICENCE
new file mode 100644
index 0000000..8b1a9d8
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/LICENCE
@@ -0,0 +1,13 @@
+           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                   Version 2, December 2004
+
+Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+Everyone is permitted to copy and distribute verbatim or modified
+copies of this license document, and changing it is allowed as long
+as the name is changed.
+
+           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. You just DO WHAT THE FUCK YOU WANT TO.
diff --git a/vim-plugins/bundle/syntastic/README.markdown b/vim-plugins/bundle/syntastic/README.markdown
new file mode 100644
index 0000000..7ed8cc8
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/README.markdown
@@ -0,0 +1,545 @@
+                   ,
+                  / \,,_  .'|
+               ,{{| /}}}}/_.'            _____________________________________________
+              }}}}` '{{'  '.            /                                             \
+            {{{{{    _   ;, \          /            Ladies and Gentlemen,              \
+         ,}}}}}}    /o`\  ` ;)        |                                                |
+        {{{{{{   /           (        |                 this is ...                    |
+        }}}}}}   |            \       |                                                |
+       {{{{{{{{   \            \      |                                                |
+       }}}}}}}}}   '.__      _  |     |    _____             __             __  _      |
+       {{{{{{{{       /`._  (_\ /     |   / ___/__  ______  / /_____ ______/ /_(_)____ |
+        }}}}}}'      |    //___/   --=:   \__ \/ / / / __ \/ __/ __ `/ ___/ __/ / ___/ |
+    jgs `{{{{`       |     '--'       |  ___/ / /_/ / / / / /_/ /_/ (__  ) /_/ / /__   |
+         }}}`                         | /____/\__, /_/ /_/\__/\__,_/____/\__/_/\___/   |
+                                      |      /____/                                    |
+                                      |                                               /
+                                       \_____________________________________________/
+
+
+- - -
+1. [Introduction](#introduction)  
+2. [Installation](#installation)  
+2.1. [Requirements](#requirements)  
+2.2. [Installing syntastic with Pathogen](#installpathogen)  
+3. [Recommended settings](#settings)  
+4. [FAQ](#faq)  
+4.1. [I installed syntastic but it isn't reporting any errors...](#faqinfo)  
+4.2. [Syntastic supports several checkers for my filetype, how do I tell it which one(s) to use?](#faqcheckers)  
+4.3. [How can I run checkers for "foreign" filetypes against the current file?](#faqforeign)  
+4.4. [I have enabled multiple checkers for the current filetype. How can I display all errors from all checkers together?](#faqaggregate)  
+4.5. [How can I pass additional arguments to a checker?](#faqargs)  
+4.6. [I run a checker and the location list is not updated...](#faqloclist)  
+4.6. [I run`:lopen` or `:lwindow` and the error window is empty...](#faqloclist)  
+4.7. [How can I jump between the different errors without using the location list at the bottom of the window?](#faqlnext)  
+4.8. [The error window is closed automatically when I `:quit` the current buffer but not when I `:bdelete` it?](#faqbdelete)  
+4.9. [My favourite checker needs to load a configuration file from the project's root rather than the current directory...](#faqconfig)  
+4.10. [What is the difference between syntax checkers and style checkers?](#faqstyle)  
+4.11. [How can I check scripts written for different versions of Python?](#faqpython)  
+4.12. [How can I check scripts written for different versions of Ruby?](#faqruby)  
+4.13. [The `perl` checker has stopped working...](#faqperl)  
+4.14. [What happened to the `rustc` checker?](#faqrust)  
+4.15. [What happened to the `tsc` checker?](#faqtsc)  
+4.16. [What happened to the `xcrun` checker?](#faqxcrun)  
+5. [Resources](#otherresources)  
+
+- - -
+
+<a name="introduction"></a>
+
+## 1\. Introduction
+
+Syntastic is a syntax checking plugin for [Vim][vim] created by
+[Martin Grenfell][scrooloose]. It runs files through external syntax checkers
+and displays any resulting errors to the user. This can be done on demand, or
+automatically as files are saved. If syntax errors are detected, the user is
+notified and is happy because they didn't have to compile their code or execute
+their script to find them.
+
+At the time of this writing, syntastic has checking plugins for ACPI
+Source Language, ActionScript, Ada, Ansible configurations, API Blueprint,
+AppleScript, AsciiDoc, Assembly languages, BEMHTML, Bro, Bourne shell, C,
+C++, C#, Cabal, Chef, CoffeeScript, Coco, Coq, CSS, Cucumber, CUDA, D, Dart,
+DocBook, Dockerfile, Dust, Elixir, Erlang, eRuby, Fortran, Gentoo metadata,
+GLSL, Go, Haml, Haskell, Haxe, Handlebars, HSS, HTML, Java, JavaScript, JSON,
+JSX, LESS, Lex, Limbo, LISP, LLVM intermediate language, Lua, Markdown,
+MATLAB, Mercury, NASM, Nix, Objective-C, Objective-C++, OCaml, Perl, Perl
+POD, PHP, gettext Portable Object, OS X and iOS property lists, Pug (formerly
+Jade), Puppet, Python, QML, R, Racket, RDF TriG, RDF Turtle, Relax NG,
+reStructuredText, RPM spec, Ruby, SASS/SCSS, Scala, Slim, SML, Solidity,
+Sphinx, SQL, Stylus, Tcl, TeX, Texinfo, Twig, TypeScript, Vala, Verilog, VHDL,
+Vim help, VimL, xHtml, XML, XSLT, XQuery, YACC, YAML, YANG data models, z80,
+Zope page templates, and Zsh. See the [manual][checkers] for details about the
+corresponding supported checkers (`:help syntastic-checkers` in Vim).
+
+A number of third-party Vim plugins also provide checkers for syntastic, for
+example: [merlin][merlin], [omnisharp-vim][omnisharp], [rust.vim][rust],
+[syntastic-extras][myint], [syntastic-more][roktas], [tsuquyomi][tsuquyomi],
+[vim-crystal][crystal], [vim-eastwood][eastwood], and [vim-swift][swift].
+
+Below is a screenshot showing the methods that Syntastic uses to display syntax
+errors. Note that, in practise, you will only have a subset of these methods
+enabled.
+
+![Screenshot 1][screenshot]
+
+1. Errors are loaded into the location list for the corresponding window.
+2. When the cursor is on a line containing an error, the error message is echoed in the command window.
+3. Signs are placed beside lines with errors - note that warnings are displayed in a different color.
+4. There is a configurable statusline flag you can include in your statusline config.
+5. Hover the mouse over a line containing an error and the error message is displayed as a balloon.
+6. (not shown) Highlighting errors with syntax highlighting. Erroneous parts of lines can be highlighted.
+
+<a name="installation"></a>
+
+## 2\. Installation
+
+<a name="requirements"></a>
+
+### 2.1\. Requirements
+
+Syntastic itself has rather relaxed requirements: it doesn't have any external
+dependencies, and it needs a version of [Vim][vim] compiled with a few common
+features: `autocmd`, `eval`, `file_in_path`, `modify_fname`, `quickfix`,
+`reltime`, and `user_commands`. Not all possible combinations of features that
+include the ones above make equal sense on all operating systems, but Vim
+version 7 or later with the "normal", "big", or "huge" feature sets should be
+fine.
+
+Syntastic should work with any modern plugin managers for Vim, such as
+[NeoBundle][neobundle], [Pathogen][pathogen], [Vim-Addon-Manager][vam],
+[Vim-Plug][plug], or [Vundle][vundle]. Instructions for installing syntastic
+with [Pathogen][pathogen] are included below for completeness.
+
+Starting with Vim version 7.4.1486 you can also load syntastic using the
+standard mechanism of packages, without the help of third-party plugin managers
+(see `:help packages` in Vim for details). Beware however that, while support
+for packages has been added in Vim 7.4.1384, the functionality needed by
+syntastic is present only in versions 7.4.1486 and later.
+
+Last but not least: syntastic doesn't know how to do any syntax checks by
+itself. In order to get meaningful results you need to install external
+checkers corresponding to the types of files you use. Please consult the
+[manual][checkers] (`:help syntastic-checkers` in Vim) for a list of supported
+checkers.
+
+<a name="installpathogen"></a>
+
+### 2.2\. Installing syntastic with Pathogen
+
+If you already have [Pathogen][pathogen] working then skip [Step 1](#step1) and go to
+[Step 2](#step2).
+
+<a name="step1"></a>
+
+#### 2.2.1\. Step 1: Install pathogen.vim
+
+First I'll show you how to install Tim Pope's [Pathogen][pathogen] so that it's easy to
+install syntastic. Do this in your terminal so that you get the `pathogen.vim`
+file and the directories it needs:
+```sh
+mkdir -p ~/.vim/autoload ~/.vim/bundle && \
+curl -LSso ~/.vim/autoload/pathogen.vim https://tpo.pe/pathogen.vim
+```
+Next you *need* to add this to your `~/.vimrc`:
+```vim
+execute pathogen#infect()
+```
+
+<a name="step2"></a>
+
+#### 2.2.2\. Step 2: Install syntastic as a Pathogen bundle
+
+You now have pathogen installed and can put syntastic into `~/.vim/bundle` like
+this:
+```sh
+cd ~/.vim/bundle && \
+git clone --depth=1 https://github.com/vim-syntastic/syntastic.git
+```
+Quit vim and start it back up to reload it, then type:
+```vim
+:Helptags
+```
+If you get an error when you do this, then you probably didn't install
+[Pathogen][pathogen] right. Go back to [Step 1](#step1) and make sure you did the
+following:
+
+1. Created both the `~/.vim/autoload` and `~/.vim/bundle` directories.
+2. Added the `execute pathogen#infect()` line to your `~/.vimrc` file
+3. Did the `git clone` of syntastic inside `~/.vim/bundle`
+4. Have permissions to access all of these directories.
+
+<a name="settings"></a>
+
+## 3\. Recommended settings
+
+Syntastic has numerous options that can be configured, and the defaults
+are not particularly well suitable for new users. It is recommended
+that you start by adding the following lines to your `vimrc` file, and
+return to them after reading the manual (see `:help syntastic` in Vim):
+```vim
+set statusline+=%#warningmsg#
+set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%*
+
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_auto_loc_list = 1
+let g:syntastic_check_on_open = 1
+let g:syntastic_check_on_wq = 0
+```
+
+<a name="faq"></a>
+
+## 4\. FAQ
+
+<a name="faqinfo"></a>
+
+__4.1. Q. I installed syntastic but it isn't reporting any errors...__
+
+A. The most likely reason is that none of the syntax checkers that it requires
+are installed. For example: by default, python requires either `flake8` or
+`pylint` to be installed and in your `$PATH`. Read the [manual][checkers]
+(`:help syntastic-checkers` in Vim) to find out what executables are
+supported. Note that aliases do not work; the actual executables must be
+available in your `$PATH`. Symbolic links are okay though.  You can see
+syntastic's idea of available checkers by running `:SyntasticInfo`.
+
+A second probable reason is that none of the available checkers are
+enabled. Syntastic comes preconfigured with a default list of enabled checkers
+per filetype, but this list is kept short in order to prevent slowing down Vim
+or trying to run conflicting checks. The command `:SyntasticInfo` will show you
+which checkers are enabled. You can tell syntastic which checkers (among the
+available ones) you want to run by setting `g:syntastic_<filetype>_checkers` in
+your `vimrc` (see [below](#faqcheckers)).
+
+A third possible reason is that the `$PATH` seen by syntastic might not be same
+as the `$PATH` in your login shell. Syntastic runs checkers using the shell
+pointed to by Vim's `shell` (or by `g:syntastic_shell`, if set), and that's the
+shell you need to configure to set the proper `$PATH` and environment variables
+for your checkers. You can see syntastic's idea of `$PATH` by running
+```vim
+:echo syntastic#util#system('echo "$PATH"')
+```
+on UNIX and Mac OS-X systems, or
+```vim
+:echo syntastic#util#system('echo %PATH%')
+```
+on Windows.
+
+Finally, another reason it could fail is that either the command line options
+or the error output for a syntax checker may have changed. In this case, make
+sure you have the latest version of the syntax checker installed. If it still
+fails then post an [issue][bug_tracker] - or better yet, create a pull request.
+
+<a name="faqcheckers"></a>
+
+__4.2. Q. Syntastic supports several checkers for my filetype, how do I tell it
+which one(s) to use?__
+
+A. Add a line like this to your `vimrc`:
+```vim
+let g:syntastic_<filetype>_checkers = ['<checker-name>']
+```
+
+To see the list of supported checkers for your filetype read the
+[manual][checkers] (`:help syntastic-checkers` in Vim).
+
+For example, Python has the following checkers, among others: `flake8`,
+`pyflakes`, `pylint` and a native `python` checker.  To tell syntastic to use
+`pylint`, you would use this setting:
+```vim
+let g:syntastic_python_checkers = ['pylint']
+```
+
+Checkers can be chained together like this:
+```vim
+let g:syntastic_php_checkers = ['php', 'phpcs', 'phpmd']
+```
+
+This is telling syntastic to run the `php` checker first, and if no errors are
+found, run `phpcs`, and then `phpmd`.
+
+You can also run checkers explicitly by calling `:SyntasticCheck <checker>`.
+For example to run `phpcs` and `phpmd`:
+```vim
+:SyntasticCheck phpcs phpmd
+```
+
+This works for any checkers available for the current filetype, even if they
+aren't listed in `g:syntastic_<filetype>_checkers`.
+
+<a name="faqforeign"></a>
+
+__4.3. Q. How can I run checkers for "foreign" filetypes against the current
+file?__
+
+A. You need to qualify the name of the "foreign" checker with the name
+of its filetype. For example to check `tex` files with the checker
+`language_check` (which normally acts only on files of type `text`), you can
+add `text/language_check` to the list fo checkers for `tex`:
+```vim
+let g:syntastic_tex_checkers = ['lacheck', 'text/language_check']
+```
+
+This also works with `:SyntasticCheck`, e.g. the following command runs
+`text/language_check` against the current file regardless of the current
+filetype:
+```vim
+:SyntasticCheck text/language_check
+```
+
+Of course, the checkers specified this way need to be known to syntastic, and
+they need to be shown as available when you run `:SyntasticInfo`. You can't
+just make up a combination of a filetype and a program name and expect it to
+work as a checker.
+
+<a name="faqaggregate"></a>
+
+__4.4. Q. I have enabled multiple checkers for the current filetype. How can I
+display all errors from all checkers together?__
+
+A. Set `g:syntastic_aggregate_errors` to 1 in your `vimrc`:
+```vim
+let g:syntastic_aggregate_errors = 1
+```
+
+See `:help syntastic-aggregating-errors` for more details.
+
+<a name="faqargs"></a>
+
+__4.5. Q. How can I pass additional arguments to a checker?__
+
+A. In most cases a command line is constructed using an internal function
+named `makeprgBuild()`, which provides a number of options that allow you to
+customise every part of the command that gets run. You can set these options
+using global variables.
+
+The general form of the global `args` variable is
+`syntastic_<filetype>_<checker>_args`. Thus if you wanted to pass
+`--my --args --here` to the Ruby `mri` checker you would add this line to your
+`vimrc`:
+```vim
+let g:syntastic_ruby_mri_args = "--my --args --here"
+```
+
+See `:help syntastic-checker-options` for more information.
+
+A number of checkers don't use the `makeprgBuild()` function mentioned above,
+or have additional options that can be configured. For these checkers the exact
+list of options should be included in the [manual][checkers]
+(`:help syntastic-checkers` in Vim).
+
+<a name="faqloclist"></a>
+
+__4.6. Q. I run a checker and the location list is not updated...__  
+__4.6. Q. I run`:lopen` or `:lwindow` and the error window is empty...__
+
+A. By default the location list is changed only when you run the `:Errors`
+command, in order to minimise conflicts with other plugins. If you want the
+location list to always be updated when you run the checkers, add this line to
+your `vimrc`:
+```vim
+let g:syntastic_always_populate_loc_list = 1
+```
+
+<a name="faqlnext"></a>
+
+__4.7. Q. How can I jump between the different errors without using the location
+list at the bottom of the window?__
+
+A. Vim provides several built-in commands for this. See `:help :lnext` and
+`:help :lprevious`.
+
+If you use these commands a lot then you may want to add shortcut mappings to
+your `vimrc`, or install something like [unimpaired][unimpaired], which provides such
+mappings (among other things).
+
+<a name="faqbdelete"></a>
+
+__4.8. Q. The error window is closed automatically when I `:quit` the current buffer
+but not when I `:bdelete` it?__
+
+A. There is no safe way to handle that situation automatically, but you can
+work around it:
+```vim
+nnoremap <silent> <C-d> :lclose<CR>:bdelete<CR>
+cabbrev <silent> bd <C-r>=(getcmdtype()==#':' && getcmdpos()==1 ? 'lclose\|bdelete' : 'bd')<CR>
+```
+
+<a name="faqconfig"></a>
+
+__4.9. My favourite checker needs to load a configuration file from the
+project's root rather than the current directory...__
+
+A. You can set up an `autocmd` to search for the configuration file in the
+current directory and upwards, and add it to the checker's options when found.
+For example for `jscs`:
+
+```vim
+function! FindConfig(prefix, what, where)
+    let cfg = findfile(a:what, escape(a:where, ' ') . ';')
+    return cfg !=# '' ? ' ' . a:prefix . ' ' . shellescape(cfg) : ''
+endfunction
+
+autocmd FileType javascript let b:syntastic_javascript_jscs_args =
+    \ get(g:, 'syntastic_javascript_jscs_args', '') .
+    \ FindConfig('-c', '.jscsrc', expand('<afile>:p:h', 1))
+```
+
+<a name="faqstyle"></a>
+
+__4.10. Q. What is the difference between syntax checkers and style checkers?__
+
+A. The errors and warnings they produce are highlighted differently and can
+be filtered by different rules, but otherwise the distinction is pretty much
+arbitrary. There is an ongoing effort to keep things consistent, so you can
+_generally_ expect messages produced by syntax checkers to be _mostly_ related
+to syntax, and messages produced by style checkers to be _mostly_ about style.
+But there can be no formal guarantee that, say, a style checker that runs into
+a syntax error wouldn't die with a fatal message, nor that a syntax checker
+wouldn't give you warnings against using some constructs as being bad practice.
+There is also no guarantee that messages marked as `style` are less severe than
+the ones marked as `syntax` (whatever that might mean). And there are even a
+few Frankenstein checkers (for example `flake8` and `pylama`) that, by their
+nature, produce both kinds of messages. Syntastic is not smart enough to be
+able to sort out these things by itself.
+
+Generally it's more useful to look at this from the perspective of filtering
+unwanted messages, rather than as an indicator of severity levels. The
+distinction between syntax and style is orthogonal to the distinction between
+errors and warnings, and thus you can turn off messages based on level, on
+type, or both.
+
+e.g. To disable all style messages:
+```vim
+let g:syntastic_quiet_messages = { "type": "style" }
+```
+See `:help syntastic_quiet_messages` for more information.
+
+<a name="faqpython"></a>
+
+__4.11. Q. How can I check scripts written for different versions of Python?__
+
+A. Install a Python version manager such as [virtualenv][virtualenv]
+or [pyenv][pyenv], activate the environment for the relevant version
+of Python, and install in it the checkers you want to use.  Set
+`g:syntastic_python_checkers` accordingly in your `vimrc`, and run [Vim][vim]
+from the virtual environment.
+
+If you're starting Vim from a desktop manager rather than from a terminal you
+might need to write wrapper scripts around your checkers, to activate the
+virtual environment before running the actual checks.  Then you'll need to
+point the relevant `g:syntastic_python_<checker>_exec` variables to the wrapper
+scripts.
+
+<a name="faqruby"></a>
+
+__4.12. Q. How can I check scripts written for different versions of Ruby?__
+
+A. Install a Ruby version manager such as [rvm][rvm] or [rbenv][rbenv],
+activate the environment for the relevant version of Ruby, and install in it
+the checkers you want to use.  Set `g:syntastic_ruby_checkers` accordingly in
+your `vimrc`, and run [Vim][vim] from the virtual environment.
+
+If you're starting Vim from a desktop manager rather than from a terminal you
+might need to write wrapper scripts around your checkers, to activate the
+virtual environment before running the actual checks.  Then you'll need to
+point the relevant `g:syntastic_ruby_<checker>_exec` variables to the wrapper
+scripts.
+
+<a name="faqperl"></a>
+
+__4.13. Q. The `perl` checker has stopped working...__
+
+A. The `perl` checker runs `perl -c` against your file, which in turn
+__executes__ any `BEGIN`, `UNITCHECK`, and `CHECK` blocks, and any `use`
+statements in your file (cf. [perlrun][perlrun]). This is probably fine if you
+wrote the file yourself, but it's a security problem if you're checking
+third-party files. Since there is currently no way to disable this behaviour
+while still producing useful results, the checker is now disabled by default.
+To (re-)enable it, make sure the `g:syntastic_perl_checkers` list includes
+`perl`, and set `g:syntastic_enable_perl_checker` to 1 in your `vimrc`:
+```vim
+let g:syntastic_enable_perl_checker = 1
+```
+
+<a name="faqrust"></a>
+
+__4.14. Q. What happened to the `rustc` checker?__
+
+A. It is now part of the [rust.vim][rust] plugin. If you install this plugin the
+checker should be picked up automatically by syntastic.
+
+<a name="faqtsc"></a>
+
+__4.15. Q. What happened to the `tsc` checker?__
+
+A. It didn't meet people's expectations and it has been removed. The plugin
+[tsuquyomi][tsuquyomi] comes packaged with a checker for TypeScript. If you
+install this plugin the checker should be picked up automatically by syntastic.
+
+<a name="faqxcrun"></a>
+
+__4.16. Q. What happened to the `xcrun` checker?__
+
+A. The `xcrun` checker used to have a security problem and it has been removed.
+A better checker for __Swift__ is part of the [vim-swift][swift] plugin. If you
+install this plugin the checker should be picked up automatically by syntastic.
+
+<a name="otherresources"></a>
+
+## 5\. Resources
+
+The preferred place for posting suggestions, reporting bugs, and general
+discussions related to syntastic is the [issue tracker at GitHub][bug_tracker].
+A guide for writing syntax checkers can be found in the [wiki][guide].
+There are also a dedicated [google group][google_group], and a
+[syntastic tag at StackOverflow][stack_overflow].
+
+Syntastic aims to provide a common interface to syntax checkers for as many
+languages as possible. For particular languages, there are, of course, other
+plugins that provide more functionality than syntastic. You might want to take
+a look at [ghcmod-vim][ghcmod], [jedi-vim][jedi], [python-mode][python_mode], [vim-go][vimgo], or
+[YouCompleteMe][ycm].
+
+[scrooloose]:       https://github.com/scrooloose
+[screenshot]:       https://github.com/vim-syntastic/syntastic/raw/master/_assets/screenshot_1.png
+
+[bug_tracker]:      https://github.com/vim-syntastic/syntastic/issues
+[checkers]:         https://github.com/vim-syntastic/syntastic/blob/master/doc/syntastic-checkers.txt
+[crystal]:          https://github.com/rhysd/vim-crystal
+[eastwood]:         https://github.com/venantius/vim-eastwood
+[ghcmod]:           https://github.com/eagletmt/ghcmod-vim
+[google_group]:     https://groups.google.com/group/vim-syntastic
+[guide]:            https://github.com/vim-syntastic/syntastic/wiki/Syntax-Checker-Guide
+[jedi]:             https://github.com/davidhalter/jedi-vim
+[merlin]:           https://github.com/the-lambda-church/merlin
+[myint]:            https://github.com/myint/syntastic-extras
+[neobundle]:        https://github.com/Shougo/neobundle.vim
+[omnisharp]:        https://github.com/OmniSharp/omnisharp-vim
+[pathogen]:         https://github.com/tpope/vim-pathogen
+[perlrun]:          http://perldoc.perl.org/perlrun.html#*-c*
+[plug]:             https://github.com/junegunn/vim-plug/
+[pyenv]:            https://github.com/yyuu/pyenv
+[python_mode]:      https://github.com/klen/python-mode
+[rbenv]:            https://github.com/rbenv/rbenv
+[roktas]:           https://github.com/roktas/syntastic-more
+[rust]:             https://github.com/rust-lang/rust.vim
+[rvm]:              https://rvm.io/
+[stack_overflow]:   http://stackoverflow.com/questions/tagged/syntastic
+[swift]:            https://github.com/kballard/vim-swift
+[tsuquyomi]:        https://github.com/Quramy/tsuquyomi/
+[unimpaired]:       https://github.com/tpope/vim-unimpaired
+[vam]:              https://github.com/MarcWeber/vim-addon-manager
+[vim]:              http://www.vim.org/
+[vimgo]:            https://github.com/fatih/vim-go
+[virtualenv]:       https://virtualenv.pypa.io/en/stable/
+[vnu]:              http://about.validator.nu/
+[vnu_jar]:          https://github.com/validator/validator/releases/latest
+[vnu_server]:       http://validator.github.io/validator/#standalone
+[vundle]:           https://github.com/gmarik/Vundle.vim
+[ycm]:              http://valloric.github.io/YouCompleteMe/
+
+<!--
+vim:tw=79:sw=4:
+-->
diff --git a/vim-plugins/bundle/syntastic/_assets/screenshot_1.png b/vim-plugins/bundle/syntastic/_assets/screenshot_1.png
new file mode 100644
index 0000000..c1b69f4
Binary files /dev/null and b/vim-plugins/bundle/syntastic/_assets/screenshot_1.png differ
diff --git a/vim-plugins/bundle/syntastic/autoload/syntastic/c.vim b/vim-plugins/bundle/syntastic/autoload/syntastic/c.vim
new file mode 100644
index 0000000..e49a29a
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/autoload/syntastic/c.vim
@@ -0,0 +1,341 @@
+if exists('g:loaded_syntastic_c_autoload') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_c_autoload = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Public functions {{{1
+
+" convenience function to determine the 'null device' parameter
+" based on the current operating system
+function! syntastic#c#NullOutput() abort " {{{2
+    let known_os = has('unix') || has('mac') || syntastic#util#isRunningWindows()
+    return known_os ? '-o ' . syntastic#util#DevNull() : ''
+endfunction " }}}2
+
+" read additional compiler flags from the given configuration file
+" the file format and its parsing mechanism is inspired by clang_complete
+function! syntastic#c#ReadConfig(file) abort " {{{2
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: looking for', a:file)
+
+    " search upwards from the current file's directory
+    let config = syntastic#util#findFileInParent(a:file, expand('%:p:h', 1))
+    if config ==# ''
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: file not found')
+        return ''
+    endif
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: config file:', config)
+    if !filereadable(config)
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: file unreadable')
+        return ''
+    endif
+
+    " convert filename into absolute path
+    let filepath = fnamemodify(config, ':p:h')
+
+    " try to read config file
+    try
+        let lines = readfile(config)
+    catch /\m^Vim\%((\a\+)\)\=:E48[45]/
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, 'ReadConfig: error reading file')
+        return ''
+    endtry
+
+    " filter out empty lines and comments
+    call filter(lines, 'v:val !~# ''\v^(\s*#|$)''')
+
+    " remove leading and trailing spaces
+    call map(lines, 'substitute(v:val, ''\m^\s\+'', "", "")')
+    call map(lines, 'substitute(v:val, ''\m\s\+$'', "", "")')
+
+    let parameters = []
+    for line in lines
+        let matches = matchstr(line, '\m\C^\s*-I\s*\zs.\+')
+        if matches !=# ''
+            " this one looks like an absolute path
+            if match(matches, '\m^\%(/\|\a:\)') != -1
+                call add(parameters, '-I' . matches)
+            else
+                call add(parameters, '-I' . filepath . syntastic#util#Slash() . matches)
+            endif
+        else
+            call add(parameters, line)
+        endif
+    endfor
+
+    return join(map(parameters, 'syntastic#util#shescape(v:val)'))
+endfunction " }}}2
+
+" GetLocList() for C-like compilers
+function! syntastic#c#GetLocList(filetype, subchecker, options) abort " {{{2
+    try
+        let flags = s:_get_cflags(a:filetype, a:subchecker, a:options)
+    catch /\m\C^Syntastic: skip checks$/
+        return []
+    endtry
+
+    let makeprg = syntastic#util#shexpand(g:syntastic_{a:filetype}_compiler) .
+        \ ' ' . flags . ' ' . syntastic#util#shexpand('%')
+
+    let errorformat = s:_get_checker_var('g', a:filetype, a:subchecker, 'errorformat', a:options['errorformat'])
+
+    let postprocess = s:_get_checker_var('g', a:filetype, a:subchecker, 'remove_include_errors', 0) ?
+        \ ['filterForeignErrors'] : []
+
+    " process makeprg
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': postprocess })
+endfunction " }}}2
+
+" }}}1
+
+" Private functions {{{1
+
+" initialize c/cpp syntax checker handlers
+function! s:_init() abort " {{{2
+    let s:handlers = []
+    let s:cflags = {}
+
+    call s:_registerHandler('\m\<cairo',       's:_checkPackage', ['cairo', 'cairo'])
+    call s:_registerHandler('\m\<freetype',    's:_checkPackage', ['freetype', 'freetype2', 'freetype'])
+    call s:_registerHandler('\m\<glade',       's:_checkPackage', ['glade', 'libglade-2.0', 'libglade'])
+    call s:_registerHandler('\m\<glib',        's:_checkPackage', ['glib', 'glib-2.0', 'glib'])
+    call s:_registerHandler('\m\<gtk',         's:_checkPackage', ['gtk', 'gtk+-2.0', 'gtk+', 'glib-2.0', 'glib'])
+    call s:_registerHandler('\m\<libsoup',     's:_checkPackage', ['libsoup', 'libsoup-2.4', 'libsoup-2.2'])
+    call s:_registerHandler('\m\<libxml',      's:_checkPackage', ['libxml', 'libxml-2.0', 'libxml'])
+    call s:_registerHandler('\m\<pango',       's:_checkPackage', ['pango', 'pango'])
+    call s:_registerHandler('\m\<SDL',         's:_checkPackage', ['sdl', 'sdl'])
+    call s:_registerHandler('\m\<opengl',      's:_checkPackage', ['opengl', 'gl'])
+    call s:_registerHandler('\m\<webkit',      's:_checkPackage', ['webkit', 'webkit-1.0'])
+
+    call s:_registerHandler('\m\<php\.h\>',    's:_checkPhp',    [])
+    call s:_registerHandler('\m\<Python\.h\>', 's:_checkPython', [])
+    call s:_registerHandler('\m\<ruby',        's:_checkRuby',   [])
+endfunction " }}}2
+
+" register a handler dictionary object
+function! s:_registerHandler(regex, function, args) abort " {{{2
+    let handler = {}
+    let handler['regex'] = a:regex
+    let handler['func'] = function(a:function)
+    let handler['args'] = a:args
+    call add(s:handlers, handler)
+endfunction " }}}2
+
+" try to find library with 'pkg-config'
+" search possible libraries from first to last given
+" argument until one is found
+function! s:_checkPackage(name, ...) abort " {{{2
+    if executable('pkg-config')
+        if !has_key(s:cflags, a:name)
+            for pkg in a:000
+                let pkg_flags = syntastic#util#system('pkg-config --cflags ' . pkg)
+                " since we cannot necessarily trust the pkg-config exit code
+                " we have to check for an error output as well
+                if v:shell_error == 0 && pkg_flags !~? 'not found'
+                    let pkg_flags = ' ' . substitute(pkg_flags, "\n", '', '')
+                    let s:cflags[a:name] = pkg_flags
+                    return pkg_flags
+                endif
+            endfor
+        else
+            return s:cflags[a:name]
+        endif
+    endif
+    return ''
+endfunction " }}}2
+
+" try to find PHP includes with 'php-config'
+function! s:_checkPhp() abort " {{{2
+    if executable('php-config')
+        if !has_key(s:cflags, 'php')
+            let s:cflags['php'] = syntastic#util#system('php-config --includes')
+            let s:cflags['php'] = ' ' . substitute(s:cflags['php'], "\n", '', '')
+        endif
+        return s:cflags['php']
+    endif
+    return ''
+endfunction " }}}2
+
+" try to find the python headers with distutils
+function! s:_checkPython() abort " {{{2
+    if executable('python')
+        if !has_key(s:cflags, 'python')
+            let s:cflags['python'] = syntastic#util#system('python -c ''from distutils import ' .
+                \ 'sysconfig; import sys; sys.stdout.write(sysconfig.get_python_inc())''')
+            let s:cflags['python'] = substitute(s:cflags['python'], "\n", '', '')
+            let s:cflags['python'] = ' -I' . s:cflags['python']
+        endif
+        return s:cflags['python']
+    endif
+    return ''
+endfunction " }}}2
+
+" try to find the ruby headers with 'rbconfig'
+function! s:_checkRuby() abort " {{{2
+    if executable('ruby')
+        if !has_key(s:cflags, 'ruby')
+            let s:cflags['ruby'] = syntastic#util#system('ruby -r rbconfig -e ' .
+                \ '''puts RbConfig::CONFIG["rubyhdrdir"] || RbConfig::CONFIG["archdir"]''')
+            let s:cflags['ruby'] = substitute(s:cflags['ruby'], "\n", '', '')
+            let s:cflags['ruby'] = ' -I' . s:cflags['ruby']
+        endif
+        return s:cflags['ruby']
+    endif
+    return ''
+endfunction " }}}2
+
+" }}}1
+
+" Utilities {{{1
+
+" resolve checker-related user variables
+function! s:_get_checker_var(scope, filetype, subchecker, name, default) abort " {{{2
+    let prefix = a:scope . ':' . 'syntastic_'
+    if exists(prefix . a:filetype . '_' . a:subchecker . '_' . a:name)
+        return {a:scope}:syntastic_{a:filetype}_{a:subchecker}_{a:name}
+    elseif exists(prefix . a:filetype . '_' . a:name)
+        return {a:scope}:syntastic_{a:filetype}_{a:name}
+    else
+        return a:default
+    endif
+endfunction " }}}2
+
+" resolve user CFLAGS
+function! s:_get_cflags(ft, ck, opts) abort " {{{2
+    " determine whether to parse header files as well
+    if has_key(a:opts, 'header_names') && expand('%', 1) =~? a:opts['header_names']
+        if s:_get_checker_var('g', a:ft, a:ck, 'check_header', 0)
+            let flags = get(a:opts, 'header_flags', '') . ' -c ' . syntastic#c#NullOutput()
+        else
+            " checking headers when check_header is unset: bail out
+            throw 'Syntastic: skip checks'
+        endif
+    else
+        let flags = get(a:opts, 'main_flags', '')
+    endif
+
+    let flags .= ' ' . s:_get_checker_var('g', a:ft, a:ck, 'compiler_options', '') . ' ' . s:_get_include_dirs(a:ft)
+
+    " check if the user manually set some cflags
+    let b_cflags = s:_get_checker_var('b', a:ft, a:ck, 'cflags', '')
+    if b_cflags !=# ''
+        let flags .= ' ' . b_cflags
+    endif
+
+    " add optional config file parameters
+    let config_file = s:_get_checker_var('g', a:ft, a:ck, 'config_file', '.syntastic_' . a:ft . '_config')
+    let flags .= ' ' . syntastic#c#ReadConfig(config_file)
+
+    if b_cflags ==# '' && (a:ft ==# 'c' || a:ft ==# 'cpp') && !s:_get_checker_var('g', a:ft, a:ck, 'no_include_search', 0)
+        " refresh the include file search if desired
+        if s:_get_checker_var('g', a:ft, a:ck, 'auto_refresh_includes', 0)
+            let flags .= ' ' . s:_search_headers()
+        else
+            " search for header includes if not cached already
+            if !exists('b:syntastic_' . a:ft . '_includes')
+                let b:syntastic_{a:ft}_includes = s:_search_headers()
+            endif
+            let flags .= ' ' . b:syntastic_{a:ft}_includes
+        endif
+    endif
+
+    return flags
+endfunction " }}}2
+
+" get the gcc include directory argument depending on the default
+" includes and the optional user-defined 'g:syntastic_c_include_dirs'
+function! s:_get_include_dirs(filetype) abort " {{{2
+    let include_dirs = []
+
+    if a:filetype =~# '\v^%(c|cpp|objc|objcpp)$' &&
+                \ (!exists('g:syntastic_'.a:filetype.'_no_default_include_dirs') ||
+                \ !g:syntastic_{a:filetype}_no_default_include_dirs)
+        let include_dirs = copy(s:default_includes)
+    endif
+
+    if exists('g:syntastic_'.a:filetype.'_include_dirs')
+        call extend(include_dirs, g:syntastic_{a:filetype}_include_dirs)
+    endif
+
+    return join(map(syntastic#util#unique(include_dirs), 'syntastic#util#shescape("-I" . v:val)'))
+endfunction " }}}2
+
+" search the first 100 lines for include statements that are
+" given in the handlers dictionary
+function! s:_search_headers() abort " {{{2
+    let includes = ''
+    let files = []
+    let found = []
+    let lines = filter(getline(1, 100), 'v:val =~# ''\m^\s*#\s*include''')
+
+    " search current buffer
+    for line in lines
+        let file = matchstr(line, '\m"\zs\S\+\ze"')
+        if file !=# ''
+            call add(files, file)
+            continue
+        endif
+
+        for handler in s:handlers
+            if line =~# handler['regex']
+                let includes .= call(handler['func'], handler['args'])
+                call add(found, handler['regex'])
+                break
+            endif
+        endfor
+    endfor
+
+    " search included headers
+    for hfile in files
+        if hfile !=# ''
+            let filename = expand('%:p:h', 1) . syntastic#util#Slash() . hfile
+
+            try
+                let lines = readfile(filename, '', 100)
+            catch /\m^Vim\%((\a\+)\)\=:E484/
+                continue
+            endtry
+
+            call filter(lines, 'v:val =~# ''\m^\s*#\s*include''')
+
+            for handler in s:handlers
+                if index(found, handler['regex']) != -1
+                    continue
+                endif
+
+                for line in lines
+                    if line =~# handler['regex']
+                        let includes .= call(handler['func'], handler['args'])
+                        call add(found, handler['regex'])
+                        break
+                    endif
+                endfor
+            endfor
+        endif
+    endfor
+
+    return includes
+endfunction " }}}2
+
+" }}}1
+
+" default include directories
+let s:default_includes = [
+    \ '.',
+    \ '..',
+    \ 'include',
+    \ 'includes',
+    \ '..' . syntastic#util#Slash() . 'include',
+    \ '..' . syntastic#util#Slash() . 'includes' ]
+
+call s:_init()
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/autoload/syntastic/log.vim b/vim-plugins/bundle/syntastic/autoload/syntastic/log.vim
new file mode 100644
index 0000000..d6d41a2
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/autoload/syntastic/log.vim
@@ -0,0 +1,222 @@
+if exists('g:loaded_syntastic_log_autoload') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_log_autoload = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:one_time_notices_issued = []
+
+" Public functions {{{1
+
+function! syntastic#log#info(msg) abort " {{{2
+    echomsg 'syntastic: info: ' . a:msg
+endfunction " }}}2
+
+function! syntastic#log#warn(msg) abort " {{{2
+    echohl WarningMsg
+    echomsg 'syntastic: warning: ' . a:msg
+    echohl None
+endfunction " }}}2
+
+function! syntastic#log#error(msg) abort " {{{2
+    execute 'normal! \<Esc>'
+    echohl ErrorMsg
+    echomsg 'syntastic: error: ' . a:msg
+    echohl None
+endfunction " }}}2
+
+function! syntastic#log#oneTimeWarn(msg) abort " {{{2
+    if index(s:one_time_notices_issued, a:msg) >= 0
+        return
+    endif
+
+    call add(s:one_time_notices_issued, a:msg)
+    call syntastic#log#warn(a:msg)
+endfunction " }}}2
+
+" @vimlint(EVL102, 1, l:OLD_VAR)
+function! syntastic#log#deprecationWarn(old, new, ...) abort " {{{2
+    if exists('g:syntastic_' . a:old) && !exists('g:syntastic_' . a:new)
+        let msg = 'variable g:syntastic_' . a:old . ' is deprecated, please use '
+
+        if a:0
+            let OLD_VAR = g:syntastic_{a:old}
+            try
+                let NEW_VAR = eval(a:1)
+                let msg .= 'in its stead: let g:syntastic_' . a:new . ' = ' . string(NEW_VAR)
+                let g:syntastic_{a:new} = NEW_VAR
+            catch
+                let msg .= 'g:syntastic_' . a:new . ' instead'
+            endtry
+        else
+            let msg .= 'g:syntastic_' . a:new . ' instead'
+            let g:syntastic_{a:new} = g:syntastic_{a:old}
+        endif
+
+        call syntastic#log#oneTimeWarn(msg)
+    endif
+endfunction " }}}2
+" @vimlint(EVL102, 0, l:OLD_VAR)
+
+function! syntastic#log#debug(level, msg, ...) abort " {{{2
+    if !s:_isDebugEnabled(a:level)
+        return
+    endif
+
+    let leader = s:_log_timestamp()
+    call s:_logRedirect(1)
+
+    if a:0
+        " filter out dictionary functions
+        echomsg leader . a:msg . ' ' .
+            \ strtrans(string(type(a:1) == type({}) || type(a:1) == type([]) ?
+            \ filter(copy(a:1), 'type(v:val) != type(function("tr"))') : a:1))
+    else
+        echomsg leader . a:msg
+    endif
+
+    call s:_logRedirect(0)
+endfunction " }}}2
+
+function! syntastic#log#debugShowOptions(level, names) abort " {{{2
+    if !s:_isDebugEnabled(a:level)
+        return
+    endif
+
+    let leader = s:_log_timestamp()
+    call s:_logRedirect(1)
+
+    let vlist = copy(type(a:names) == type('') ? [a:names] : a:names)
+    let add_shell = index(vlist, 'shell') >= 0 && &shell !=# syntastic#util#var('shell')
+    if !empty(vlist)
+        call map(vlist, "'&' . v:val . ' = ' . strtrans(string(eval('&' . v:val))) . (s:_is_modified(v:val) ? ' (!)' : '')")
+        if add_shell
+            call add(vlist, 'u:shell = ' . strtrans(string(syntastic#util#var('shell'))) . ' (!)')
+        endif
+        echomsg leader . join(vlist, ', ')
+    endif
+    call s:_logRedirect(0)
+endfunction " }}}2
+
+function! syntastic#log#debugShowVariables(level, names) abort " {{{2
+    if !s:_isDebugEnabled(a:level)
+        return
+    endif
+
+    let leader = s:_log_timestamp()
+    call s:_logRedirect(1)
+
+    let vlist = type(a:names) == type('') ? [a:names] : a:names
+    for name in vlist
+        let msg = s:_format_variable(name)
+        if msg !=# ''
+            echomsg leader . msg
+        endif
+    endfor
+
+    call s:_logRedirect(0)
+endfunction " }}}2
+
+function! syntastic#log#debugDump(level) abort " {{{2
+    if !s:_isDebugEnabled(a:level)
+        return
+    endif
+
+    call syntastic#log#debugShowVariables( a:level, sort(keys(g:_SYNTASTIC_DEFAULTS)) )
+endfunction " }}}2
+
+function! syntastic#log#ndebug(level, title, messages) abort " {{{2
+    if s:_isDebugEnabled(a:level)
+        return
+    endif
+
+    call syntastic#log#error(a:title)
+    if type(a:messages) == type([])
+        for msg in a:messages
+            echomsg msg
+        endfor
+    else
+        echomsg a:messages
+    endif
+endfunction " }}}2
+
+" }}}1
+
+" Private functions {{{1
+
+function! s:_isDebugEnabled_smart(level) abort " {{{2
+    return and(g:syntastic_debug, a:level)
+endfunction " }}}2
+
+function! s:_isDebugEnabled_dumb(level) abort " {{{2
+    " poor man's bit test for bit N, assuming a:level == 2**N
+    return (g:syntastic_debug / a:level) % 2
+endfunction " }}}2
+
+let s:_isDebugEnabled = function(exists('*and') ? 's:_isDebugEnabled_smart' : 's:_isDebugEnabled_dumb')
+lockvar s:_isDebugEnabled
+
+function! s:_logRedirect(on) abort " {{{2
+    if exists('g:syntastic_debug_file')
+        if a:on
+            try
+                execute 'redir >> ' . fnameescape(expand(g:syntastic_debug_file, 1))
+            catch /\m^Vim\%((\a\+)\)\=:/
+                silent! redir END
+                unlet g:syntastic_debug_file
+            endtry
+        else
+            silent! redir END
+        endif
+    endif
+endfunction " }}}2
+
+" }}}1
+
+" Utilities {{{1
+
+function! s:_log_timestamp_smart() abort " {{{2
+    return printf('syntastic: %f: ', reltimefloat(reltime(g:_SYNTASTIC_START)))
+endfunction " }}}2
+
+function! s:_log_timestamp_dumb() abort " {{{2
+    return 'syntastic: ' . split(reltimestr(reltime(g:_SYNTASTIC_START)))[0] . ': '
+endfunction " }}}2
+
+let s:_log_timestamp = function(has('float') && exists('*reltimefloat') ? 's:_log_timestamp_smart' : 's:_log_timestamp_dumb')
+lockvar s:_log_timestamp
+
+function! s:_format_variable(name) abort " {{{2
+    let vals = []
+    if exists('g:syntastic_' . a:name)
+        call add(vals, 'g:syntastic_' . a:name . ' = ' . strtrans(string(g:syntastic_{a:name})))
+    endif
+    if exists('b:syntastic_' . a:name)
+        call add(vals, 'b:syntastic_' . a:name . ' = ' . strtrans(string(b:syntastic_{a:name})))
+    endif
+
+    return join(vals, ', ')
+endfunction " }}}2
+
+function! s:_is_modified(name) abort " {{{2
+    if !exists('s:option_defaults')
+        let s:option_defaults = {}
+    endif
+    if !has_key(s:option_defaults, a:name)
+        let opt_save = eval('&' . a:name)
+        execute 'set ' . a:name . '&'
+        let s:option_defaults[a:name] = eval('&' . a:name)
+        execute 'let &' . a:name . ' = ' . string(opt_save)
+    endif
+
+    return s:option_defaults[a:name] !=# eval('&' . a:name)
+endfunction " }}}2
+
+" }}}1
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/autoload/syntastic/postprocess.vim b/vim-plugins/bundle/syntastic/autoload/syntastic/postprocess.vim
new file mode 100644
index 0000000..136fa58
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/autoload/syntastic/postprocess.vim
@@ -0,0 +1,73 @@
+if exists('g:loaded_syntastic_postprocess_autoload') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_postprocess_autoload = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Public functions {{{1
+
+" merge consecutive blanks
+function! syntastic#postprocess#compressWhitespace(errors) abort " {{{2
+    for e in a:errors
+        let e['text'] = substitute(e['text'], "\001", '', 'g')
+        let e['text'] = substitute(e['text'], '\n', ' ', 'g')
+        let e['text'] = substitute(e['text'], '\m\s\{2,}', ' ', 'g')
+        let e['text'] = substitute(e['text'], '\m^\s\+', '', '')
+        let e['text'] = substitute(e['text'], '\m\s\+$', '', '')
+    endfor
+
+    return a:errors
+endfunction " }}}2
+
+" remove spurious CR under Cygwin
+function! syntastic#postprocess#cygwinRemoveCR(errors) abort " {{{2
+    if has('win32unix')
+        for e in a:errors
+            let e['text'] = substitute(e['text'], '\r', '', 'g')
+        endfor
+    endif
+
+    return a:errors
+endfunction " }}}2
+
+" decode XML entities
+function! syntastic#postprocess#decodeXMLEntities(errors) abort " {{{2
+    for e in a:errors
+        let e['text'] = syntastic#util#decodeXMLEntities(e['text'])
+    endfor
+
+    return a:errors
+endfunction " }}}2
+
+" filter out errors referencing other files
+function! syntastic#postprocess#filterForeignErrors(errors) abort " {{{2
+    return filter(copy(a:errors), 'get(v:val, "bufnr") == ' . bufnr(''))
+endfunction " }}}2
+
+" make sure line numbers are not past end of buffers
+" XXX: this loads all referenced buffers in memory
+function! syntastic#postprocess#guards(errors) abort " {{{2
+    let buffers = syntastic#util#unique(map(filter(copy(a:errors), 'v:val["valid"]'), 'str2nr(v:val["bufnr"])'))
+
+    let guards = {}
+    for b in buffers
+        let guards[b] = len(getbufline(b, 1, '$'))
+    endfor
+
+    for e in a:errors
+        if e['valid'] && e['lnum'] > guards[e['bufnr']]
+            let e['lnum'] = guards[e['bufnr']]
+        endif
+    endfor
+
+    return a:errors
+endfunction " }}}2
+
+" }}}1
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/autoload/syntastic/preprocess.vim b/vim-plugins/bundle/syntastic/autoload/syntastic/preprocess.vim
new file mode 100644
index 0000000..9d25b84
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/autoload/syntastic/preprocess.vim
@@ -0,0 +1,614 @@
+if exists('g:loaded_syntastic_preprocess_autoload') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_preprocess_autoload = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Public functions {{{1
+
+function! syntastic#preprocess#cabal(errors) abort " {{{2
+    let out = []
+    let star = 0
+    for err in a:errors
+        if star
+            if err ==# ''
+                let star = 0
+            else
+                let out[-1] .= ' ' . err
+            endif
+        else
+            call add(out, err)
+            if err =~# '\m^*\s'
+                let star = 1
+            endif
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#checkstyle(errors) abort " {{{2
+    let out = []
+    let fname = expand('%', 1)
+    for err in a:errors
+        if match(err, '\m<error\>') > -1
+            let line = str2nr(matchstr(err, '\m\<line="\zs\d\+\ze"'))
+            if line == 0
+                continue
+            endif
+
+            let col = str2nr(matchstr(err, '\m\<column="\zs\d\+\ze"'))
+
+            let type = matchstr(err, '\m\<severity="\zs.\ze')
+            if type !~? '^[EW]'
+                let type = 'E'
+            endif
+
+            let message = syntastic#util#decodeXMLEntities(matchstr(err, '\m\<message="\zs[^"]\+\ze"'))
+
+            call add(out, join([fname, type, line, col, message], ':'))
+        elseif match(err, '\m<file name="') > -1
+            let fname = syntastic#util#decodeXMLEntities(matchstr(err, '\v\<file name\="\zs[^"]+\ze"'))
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#cppcheck(errors) abort " {{{2
+    return map(copy(a:errors), 'substitute(v:val, ''\v^\[[^]]+\]\zs( -\> \[[^]]+\])+\ze:'', "", "")')
+endfunction " }}}2
+
+function! syntastic#preprocess#dockerfile_lint(errors) abort " {{{2
+    let out = []
+    let json = s:_decode_JSON(join(a:errors, ''))
+
+    if type(json) == type({})
+        try
+            let data = json['error']['data'] + json['warn']['data'] + json['info']['data']
+            for e in data
+                let type = toupper(e['level'][0])
+                if type ==# 'I'
+                    let type = 'W'
+                    let style = 1
+                else
+                    let style = 0
+                endif
+
+                let line = get(e, 'line', 1)
+                let message = e['message']
+                if has_key(e, 'description') && e['description'] !=# 'None'
+                    let message = message . '. ' . e['description']
+                endif
+
+                let msg =
+                    \ type . ':' .
+                    \ style . ':' .
+                    \ line . ':' .
+                    \ message
+                call add(out, msg)
+            endfor
+        catch /\m^Vim\%((\a\+)\)\=:E716/
+            call syntastic#log#warn('checker dockerfile/dockerfile_lint: unrecognized error format (crashed checker?)')
+            let out = []
+        endtry
+    else
+        call syntastic#log#warn('checker dockerfile/dockerfile_lint: unrecognized error format (crashed checker?)')
+    endif
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#flow(errors) abort " {{{2
+    let idx = 0
+    while idx < len(a:errors) && a:errors[idx][0] !=# '{'
+        let idx += 1
+    endwhile
+    let errs = s:_decode_JSON(join(a:errors[idx :], ''))
+
+    let out = []
+    if type(errs) == type({}) && has_key(errs, 'errors') && type(errs['errors']) == type([])
+        for e in errs['errors']
+            if type(e) == type({}) && has_key(e, 'message') && type(e['message']) == type([]) && len(e['message'])
+                let m = e['message'][0]
+                let t = e['message'][1:]
+
+                try
+                    let msg =
+                        \ m['path'] . ':' .
+                        \ m['line'] . ':' .
+                        \ m['start'] . ':' .
+                        \ (m['line'] ==# m['endline'] && str2nr(m['end']) > 0 ? m['end'] . ':' : '') .
+                        \ ' ' . m['descr']
+
+                    if len(t)
+                        let msg .= ' ' . join(map(t,
+                            \ 'v:val["descr"] . " (" . v:val["path"] . ":" . v:val["line"] . ":" . v:val["start"] . ' .
+                            \ '"," . (v:val["line"] !=# v:val["endline"] ? v:val["endline"] . ":" : "") . ' .
+                            \ 'v:val["end"] . ")"'))
+                    endif
+
+                    let msg = substitute(msg, '\r', '', 'g')
+                    let msg = substitute(msg, '\n', ' ', 'g')
+
+                    call add(out, msg)
+                catch /\m^Vim\%((\a\+)\)\=:E716/
+                    call syntastic#log#warn('checker javascript/flow: unrecognized error format (crashed checker?)')
+                    let out = []
+                    break
+                endtry
+            else
+                call syntastic#log#warn('checker javascript/flow: unrecognized error format (crashed checker?)')
+                let out = []
+                break
+            endif
+        endfor
+    else
+        call syntastic#log#warn('checker javascript/flow: unrecognized error format (crashed checker?)')
+    endif
+
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#iconv(errors) abort " {{{2
+    return
+        \ has('iconv') && &encoding !=# '' && &encoding !=# 'utf-8' ?
+        \       map(a:errors, 'iconv(v:val, "utf-8", &encoding)') :
+        \       a:errors
+endfunction " }}}2
+
+function! syntastic#preprocess#jscs(errors) abort " {{{2
+    let errs = join(a:errors, '')
+    if errs ==# ''
+        return []
+    endif
+
+    let json = s:_decode_JSON(errs)
+
+    let out = []
+    if type(json) == type({})
+        for fname in keys(json)
+            if type(json[fname]) == type([])
+                for e in json[fname]
+                    try
+                        let e['message'] = substitute(e['message'], "\n", ' ', 'g')
+                        cal add(out, fname . ':' . e['line'] . ':' . e['column'] . ':' . e['message'])
+                    catch /\m^Vim\%((\a\+)\)\=:E716/
+                        call syntastic#log#warn('checker javascript/jscs: unrecognized error item ' . string(e))
+                        let out = []
+                    endtry
+                endfor
+            else
+                call syntastic#log#warn('checker javascript/jscs: unrecognized error format (crashed checker?)')
+            endif
+        endfor
+    else
+        call syntastic#log#warn('checker javascript/jscs: unrecognized error format (crashed checker?)')
+    endif
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#killEmpty(errors) abort " {{{2
+    return filter(copy(a:errors), 'v:val !=# ""')
+endfunction " }}}2
+
+function! syntastic#preprocess#perl(errors) abort " {{{2
+    let out = []
+
+    for e in a:errors
+        let parts = matchlist(e, '\v^(.*)\sat\s(.{-})\sline\s(\d+)(.*)$')
+        if !empty(parts)
+            call add(out, parts[2] . ':' . parts[3] . ':' . parts[1] . parts[4])
+        endif
+    endfor
+
+    return syntastic#util#unique(out)
+endfunction " }}}2
+
+function! syntastic#preprocess#prospector(errors) abort " {{{2
+    let errs = s:_decode_JSON(join(a:errors, ''))
+
+    let out = []
+    if type(errs) == type({}) && has_key(errs, 'messages')
+        if type(errs['messages']) == type([])
+            for e in errs['messages']
+                if type(e) == type({})
+                    try
+                        if e['source'] ==# 'pylint'
+                            let e['location']['character'] += 1
+                        endif
+
+                        let msg =
+                            \ e['location']['path'] . ':' .
+                            \ e['location']['line'] . ':' .
+                            \ e['location']['character'] . ': ' .
+                            \ e['code'] . ' ' .
+                            \ e['message'] . ' ' .
+                            \ '[' . e['source'] . ']'
+
+                        call add(out, msg)
+                    catch /\m^Vim\%((\a\+)\)\=:E716/
+                        call syntastic#log#warn('checker python/prospector: unrecognized error item ' . string(e))
+                        let out = []
+                        break
+                    endtry
+                else
+                    call syntastic#log#warn('checker python/prospector: unrecognized error item ' . string(e))
+                    let out = []
+                    break
+                endif
+            endfor
+        else
+            call syntastic#log#warn('checker python/prospector: unrecognized error format (crashed checker?)')
+        endif
+    endif
+
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#rparse(errors) abort " {{{2
+    let errlist = copy(a:errors)
+
+    " remove uninteresting lines and handle continuations
+    let i = 0
+    while i < len(errlist)
+        if i > 0 && errlist[i][:1] ==# '  ' && errlist[i] !~# '\m\s\+\^$'
+            let errlist[i-1] .= errlist[i][1:]
+            call remove(errlist, i)
+        elseif errlist[i] !~# '\m^\(Lint:\|Lint checking:\|Error in\) '
+            call remove(errlist, i)
+        else
+            let i += 1
+        endif
+    endwhile
+
+    let out = []
+    let fname = ''
+    for e in errlist
+        if match(e, '\m^Lint: ') == 0
+            let parts = matchlist(e, '\m^Lint: \(.*\): found on lines \([0-9, ]\+\)\(+\(\d\+\) more\)\=')
+            if len(parts) >= 3
+                for line in split(parts[2], '\m,\s*')
+                    call add(out, 'E:' . fname . ':' . line . ': ' . parts[1])
+                endfor
+            endif
+            if len(parts) >= 5 && parts[4] !=# ''
+                call add(out, 'E:' . fname . ':0: ' . parts[1] . ' - ' . parts[4] . ' messages not shown')
+            endif
+        elseif match(e, '\m^Lint checking: ') == 0
+            let fname = matchstr(e, '\m^Lint checking: \zs.*')
+        elseif match(e, '\m^Error in ') == 0
+            call add(out, substitute(e, '\m^Error in .\+ : .\+\ze:\d\+:\d\+: ', 'E:' . fname, ''))
+        endif
+    endfor
+
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#scss_lint(errors) abort " {{{2
+    let errs = join(a:errors, '')
+    if errs ==# ''
+        return []
+    endif
+
+    let json = s:_decode_JSON(errs)
+
+    let out = []
+    if type(json) == type({})
+        for fname in keys(json)
+            if type(json[fname]) == type([])
+                for e in json[fname]
+                    try
+                        cal add(out, fname . ':' .
+                            \ e['severity'][0] . ':' .
+                            \ e['line'] . ':' .
+                            \ e['column'] . ':' .
+                            \ e['length'] . ':' .
+                            \ ( has_key(e, 'linter') ? e['linter'] . ': ' : '' ) .
+                            \ e['reason'])
+                    catch /\m^Vim\%((\a\+)\)\=:E716/
+                        call syntastic#log#warn('checker scss/scss_lint: unrecognized error item ' . string(e))
+                        let out = []
+                    endtry
+                endfor
+            else
+                call syntastic#log#warn('checker scss/scss_lint: unrecognized error format (crashed checker?)')
+            endif
+        endfor
+    else
+        call syntastic#log#warn('checker scss/scss_lint: unrecognized error format (crashed checker?)')
+    endif
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#stylelint(errors) abort " {{{2
+    let out = []
+
+    " CssSyntaxError: /path/to/file.css:2:11: Missed semicolon
+    let parts = matchlist(a:errors[0], '\v^CssSyntaxError: (.{-1,}):(\d+):(\d+): (.+)')
+    if len(parts) > 4
+        call add(out, 'E:' . join(parts[1:4], ':'))
+    else
+        let errs = s:_decode_JSON(join(a:errors, ''))
+
+        let out = []
+        if type(errs) == type([]) && len(errs) == 1 && type(errs[0]) == type({}) &&
+            \ has_key(errs[0], 'source') && has_key(errs[0], 'warnings') && type(errs[0]['warnings']) == type([])
+
+            for e in errs[0]['warnings']
+                try
+                    let severity = type(e['severity']) == type(0) ? ['W', 'E'][e['severity']-1] : e['severity'][0]
+                    let msg =
+                        \ severity . ':' .
+                        \ errs[0]['source'] . ':' .
+                        \ e['line'] . ':' .
+                        \ e['column'] . ':' .
+                        \ e['text']
+                    call add(out, msg)
+                catch /\m^Vim\%((\a\+)\)\=:E716/
+                    call syntastic#log#warn('checker css/stylelint: unrecognized error item ' . string(e))
+                    let out = []
+                    break
+                endtry
+            endfor
+        else
+            call syntastic#log#warn('checker css/stylelint: unrecognized error format (crashed checker?)')
+        endif
+    endif
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#tern_lint(errors) abort " {{{2
+    let errs = join(a:errors, '')
+    let json = s:_decode_JSON(errs)
+
+echomsg string(json)
+    let out = []
+    if type(json) == type({}) && has_key(json, 'messages') && type(json['messages']) == type([])
+        for e in json['messages']
+            try
+                let line_from = byte2line(e['from'] + 1)
+                if line_from > 0
+                    let line = line_from
+                    let column = e['from'] - line2byte(line_from) + 2
+                    let line_to = byte2line(e['from'] + 1)
+                    let hl = line_to == line ? e['to'] - line2byte(line_to) + 1 : 0
+                else
+                    let line = 0
+                    let column = 0
+                    let hl = 0
+                endif
+
+                if column < 0
+                    let column = 0
+                endif
+                if hl < 0
+                    let hl = 0
+                endif
+
+                call add(out,
+                    \ e['file'] . ':' .
+                    \ e['severity'][0] . ':' .
+                    \ line . ':' .
+                    \ column . ':' .
+                    \ hl . ':' .
+                    \ e['message'])
+            catch /\m^Vim\%((\a\+)\)\=:E716/
+                call syntastic#log#warn('checker javascript/tern_lint: unrecognized error item ' . string(e))
+                let out = []
+            endtry
+        endfor
+    else
+        call syntastic#log#warn('checker javascript/tern_lint: unrecognized error format (crashed checker?)')
+    endif
+
+echomsg string(out)
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#tslint(errors) abort " {{{2
+    return map(copy(a:errors), 'substitute(v:val, ''\m^\(([^)]\+)\)\s\(.\+\)$'', ''\2 \1'', "")')
+endfunction " }}}2
+
+function! syntastic#preprocess#validator(errors) abort " {{{2
+    let out = []
+    for e in a:errors
+        let parts = matchlist(e, '\v^"([^"]+)"(.+)')
+        if len(parts) >= 3
+            " URL decode, except leave alone any "+"
+            let parts[1] = substitute(parts[1], '\m%\(\x\x\)', '\=nr2char("0x".submatch(1))', 'g')
+            let parts[1] = substitute(parts[1], '\m\\"', '"', 'g')
+            let parts[1] = substitute(parts[1], '\m\\\\', '\\', 'g')
+            call add(out, '"' . parts[1] . '"' . parts[2])
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#vint(errors) abort " {{{2
+    let errs = s:_decode_JSON(join(a:errors, ''))
+
+    let out = []
+    if type(errs) == type([])
+        for e in errs
+            if type(e) == type({})
+                try
+                    let msg =
+                        \ e['file_path'] . ':' .
+                        \ e['line_number'] . ':' .
+                        \ e['column_number'] . ':' .
+                        \ e['severity'][0] . ': ' .
+                        \ e['description'] . ' (' .
+                        \ e['policy_name'] . ')'
+
+                    call add(out, msg)
+                catch /\m^Vim\%((\a\+)\)\=:E716/
+                    call syntastic#log#warn('checker vim/vint: unrecognized error item ' . string(e))
+                    let out = []
+                    break
+                endtry
+            else
+                call syntastic#log#warn('checker vim/vint: unrecognized error item ' . string(e))
+                let out = []
+                break
+            endif
+        endfor
+    else
+        call syntastic#log#warn('checker vim/vint: unrecognized error format (crashed checker?)')
+    endif
+
+    return out
+endfunction " }}}2
+
+" }}}1
+
+" Workarounds {{{1
+
+" In errorformat, \ or % following %f make it depend on isfname.  The default
+" setting of isfname is crafted to work with completion, rather than general
+" filename matching.  The result for syntastic is that filenames containing
+" spaces (or a few other special characters) can't be matched.
+"
+" Fixing isfname to address this problem would depend on the set of legal
+" characters for filenames on the filesystem the project's files lives on.
+" Inferring the kind of filesystem a file lives on, in advance to parsing the
+" file's name, is an interesting problem (think f.i. a file loaded from a VFAT
+" partition, mounted on Linux).  A problem syntastic is not prepared to solve.
+"
+" As a result, the functions below exist for the only reason to avoid using
+" things like %f\, in errorformat.
+"
+" References:
+" https://groups.google.com/forum/#!topic/vim_dev/pTKmZmouhio
+" https://vimhelp.appspot.com/quickfix.txt.html#error-file-format
+
+function! syntastic#preprocess#basex(errors) abort " {{{2
+    let out = []
+    let idx = 0
+    while idx < len(a:errors)
+        let parts = matchlist(a:errors[idx], '\v^\[\S+\] Stopped at (.+), (\d+)/(\d+):')
+        if len(parts) > 3
+            let err = parts[1] . ':' . parts[2] . ':' . parts[3] . ':'
+            let parts = matchlist(a:errors[idx+1], '\v^\[(.)\D+(\d+)\] (.+)')
+            if len(parts) > 3
+                let err .= (parts[1] ==? 'W' || parts[1] ==? 'E' ? parts[1] : 'E') . ':' . parts[2] . ':' . parts[3]
+                call add(out, err)
+                let idx +=1
+            endif
+        elseif a:errors[idx] =~# '\m^\['
+            " unparseable errors
+            call add(out, a:errors[idx])
+        endif
+        let idx +=1
+    endwhile
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#bro(errors) abort " {{{2
+    let out = []
+    for e in a:errors
+        let parts = matchlist(e, '\v^%(fatal )?(error|warning) in (.{-1,}), line (\d+): (.+)')
+        if len(parts) > 4
+            let parts[1] = parts[1][0]
+            call add(out, join(parts[1:4], ':'))
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#coffeelint(errors) abort " {{{2
+    let out = []
+    for e in a:errors
+        let parts = matchlist(e, '\v^(.{-1,}),(\d+)%(,\d*)?,(error|warn),(.+)')
+        if len(parts) > 4
+            let parts[3] = parts[3][0]
+            call add(out, join(parts[1:4], ':'))
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#mypy(errors) abort " {{{2
+    let out = []
+    for e in a:errors
+        " new format
+        let parts = matchlist(e, '\v^(.{-1,}):(\d+): error: (.+)')
+        if len(parts) > 3
+            call add(out, join(parts[1:3], ':'))
+            continue
+        endif
+
+        " old format
+        let parts = matchlist(e, '\v^(.{-1,}), line (\d+): (.+)')
+        if len(parts) > 3
+            call add(out, join(parts[1:3], ':'))
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+function! syntastic#preprocess#nix(errors) abort " {{{2
+    let out = []
+    for e in a:errors
+        let parts = matchlist(e, '\v^(.{-1,}), at (.{-1,}):(\d+):(\d+)$')
+        if len(parts) > 4
+            call add(out, join(parts[2:4], ':') . ':' . parts[1])
+            continue
+        endif
+
+        let parts = matchlist(e, '\v^(.{-1,}) at (.{-1,}), line (\d+):')
+        if len(parts) > 3
+            call add(out, parts[2] . ':' . parts[3] . ':' . parts[1])
+            continue
+        endif
+
+        let parts = matchlist(e, '\v^error: (.{-1,}), in (.{-1,})$')
+        if len(parts) > 2
+            call add(out, parts[2] . ':' . parts[1])
+        endif
+    endfor
+    return out
+endfunction " }}}2
+
+" }}}1
+
+" Private functions {{{1
+
+" @vimlint(EVL102, 1, l:true)
+" @vimlint(EVL102, 1, l:false)
+" @vimlint(EVL102, 1, l:null)
+function! s:_decode_JSON(json) abort " {{{2
+    if a:json ==# ''
+        return []
+    endif
+
+    " The following is inspired by https://github.com/MarcWeber/vim-addon-manager and
+    " http://stackoverflow.com/questions/17751186/iterating-over-a-string-in-vimscript-or-parse-a-json-file/19105763#19105763
+    " A hat tip to Marc Weber for this trick
+    if substitute(a:json, '\v\"%(\\.|[^"\\])*\"|true|false|null|[+-]?\d+%(\.\d+%([Ee][+-]?\d+)?)?', '', 'g') !~# "[^,:{}[\\] \t]"
+        " JSON artifacts
+        let true = 1
+        let false = 0
+        let null = ''
+
+        try
+            let object = eval(a:json)
+        catch
+            " malformed JSON
+            let object = ''
+        endtry
+    else
+        let object = ''
+    endif
+
+    return object
+endfunction " }}}2
+" @vimlint(EVL102, 0, l:true)
+" @vimlint(EVL102, 0, l:false)
+" @vimlint(EVL102, 0, l:null)
+
+" }}}1
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/autoload/syntastic/util.vim b/vim-plugins/bundle/syntastic/autoload/syntastic/util.vim
new file mode 100644
index 0000000..deeb0f1
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/autoload/syntastic/util.vim
@@ -0,0 +1,622 @@
+if exists('g:loaded_syntastic_util_autoload') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_util_autoload = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Public functions {{{1
+
+function! syntastic#util#isRunningWindows() abort " {{{2
+    return has('win16') || has('win32') || has('win64')
+endfunction " }}}2
+
+function! syntastic#util#DevNull() abort " {{{2
+    if syntastic#util#isRunningWindows()
+        return 'NUL'
+    endif
+    return '/dev/null'
+endfunction " }}}2
+
+" Get directory separator
+function! syntastic#util#Slash() abort " {{{2
+    return (!exists('+shellslash') || &shellslash) ? '/' : '\'
+endfunction " }}}2
+
+function! syntastic#util#CygwinPath(path) abort " {{{2
+    return substitute(syntastic#util#system('cygpath -m ' . syntastic#util#shescape(a:path)), "\n", '', 'g')
+endfunction " }}}2
+
+function! syntastic#util#system(command) abort " {{{2
+    let old_shell = &shell
+    let old_lc_messages = $LC_MESSAGES
+    let old_lc_all = $LC_ALL
+
+    let &shell = syntastic#util#var('shell')
+    let $LC_MESSAGES = 'C'
+    let $LC_ALL = ''
+
+    let crashed = 0
+    let cmd_start = reltime()
+    try
+        let out = system(a:command)
+    catch
+        let crashed = 1
+        call syntastic#log#error('exception running system(' . string(a:command) . '): ' . v:exception)
+        if syntastic#util#isRunningWindows()
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$TMP = ' . string($TMP) . ', $TEMP = ' . string($TEMP))
+        else
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$TERM = ' . string($TERM))
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$TMPDIR = ' . string($TMPDIR))
+        endif
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, '$PATH = ' . string($PATH))
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getcwd() = ' . string(getcwd()))
+        call syntastic#log#debugShowOptions(g:_SYNTASTIC_DEBUG_TRACE, g:_SYNTASTIC_SHELL_OPTIONS)
+        let out = ''
+    endtry
+    let cmd_time = split(reltimestr(reltime(cmd_start)))[0]
+
+    let $LC_ALL = old_lc_all
+    let $LC_MESSAGES = old_lc_messages
+
+    let &shell = old_shell
+
+    if !crashed && exists('g:_SYNTASTIC_DEBUG_TRACE')
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'system: command run in ' . cmd_time . 's')
+    endif
+
+    return out
+endfunction " }}}2
+
+" Create a temporary directory
+function! syntastic#util#tmpdir() abort " {{{2
+    let tempdir = ''
+
+    if (has('unix') || has('mac')) && executable('mktemp') && !has('win32unix')
+        " TODO: option "-t" to mktemp(1) is not portable
+        let tmp = $TMPDIR !=# '' ? $TMPDIR : $TMP !=# '' ? $TMP : '/tmp'
+        let out = split(syntastic#util#system('mktemp -q -d ' . tmp . '/vim-syntastic-' . getpid() . '-XXXXXXXX'), "\n")
+        if v:shell_error == 0 && len(out) == 1
+            let tempdir = out[0]
+        endif
+    endif
+
+    if tempdir ==# ''
+        if has('win32') || has('win64')
+            let tempdir = $TEMP . syntastic#util#Slash() . 'vim-syntastic-' . getpid()
+        elseif has('win32unix')
+            let tempdir = syntastic#util#CygwinPath('/tmp/vim-syntastic-'  . getpid())
+        elseif $TMPDIR !=# ''
+            let tempdir = $TMPDIR . '/vim-syntastic-' . getpid()
+        else
+            let tempdir = '/tmp/vim-syntastic-' . getpid()
+        endif
+
+        try
+            call mkdir(tempdir, 'p', 0700)
+        catch /\m^Vim\%((\a\+)\)\=:E739/
+            call syntastic#log#error(v:exception)
+            let tempdir = '.'
+        endtry
+    endif
+
+    return tempdir
+endfunction " }}}2
+
+" Recursively remove a directory
+function! syntastic#util#rmrf(what) abort " {{{2
+    " try to make sure we don't delete directories we didn't create
+    if a:what !~? 'vim-syntastic-'
+        return
+    endif
+
+    if  getftype(a:what) ==# 'dir'
+        call s:_delete(a:what, 'rf')
+    else
+        silent! call delete(a:what)
+    endif
+endfunction " }}}2
+
+function! syntastic#util#getbufvar(buf, name, ...) abort " {{{2
+    return a:0 ? s:_getbufvar(a:buf, a:name, a:1) : getbufvar(a:buf, a:name)
+endfunction " }}}2
+
+" Search the first 5 lines of the file for a magic number and return a map
+" containing the args and the executable
+"
+" e.g.
+"
+" #!/usr/bin/perl -f -bar
+"
+" returns
+"
+" {'exe': '/usr/bin/perl', 'args': ['-f', '-bar']}
+function! syntastic#util#parseShebang() abort " {{{2
+    for lnum in range(1, 5)
+        let line = getline(lnum)
+        if line =~# '^#!'
+            let line = substitute(line, '\v^#!\s*(\S+/env(\s+-\S+)*\s+)?', '', '')
+            let exe = matchstr(line, '\m^\S*\ze')
+            let args = split(matchstr(line, '\m^\S*\zs.*'))
+            return { 'exe': exe, 'args': args }
+        endif
+    endfor
+
+    return { 'exe': '', 'args': [] }
+endfunction " }}}2
+
+" Get the value of a Vim variable.  Allow buffer variables to override global ones.
+function! syntastic#util#bufRawVar(buf, name, ...) abort " {{{2
+    return s:_getbufvar(a:buf, a:name, get(g:, a:name, a:0 ? a:1 : ''))
+endfunction "}}}2
+
+" Get the value of a syntastic variable.  Allow buffer variables to override global ones.
+function! syntastic#util#bufVar(buf, name, ...) abort " {{{2
+    return call('syntastic#util#bufRawVar', [a:buf, 'syntastic_' . a:name] + a:000)
+endfunction "}}}2
+
+" Get the value of a Vim variable.  Allow local variables to override global ones.
+function! syntastic#util#rawVar(name, ...) abort " {{{2
+    return get(b:, a:name, get(g:, a:name, a:0 ? a:1 : ''))
+endfunction " }}}2
+
+" Get the value of a syntastic variable.  Allow local variables to override global ones.
+function! syntastic#util#var(name, ...) abort " {{{2
+    return call('syntastic#util#rawVar', ['syntastic_' . a:name] + a:000)
+endfunction " }}}2
+
+" Parse a version string.  Return an array of version components.
+function! syntastic#util#parseVersion(version, ...) abort " {{{2
+    return map(split(matchstr( a:version, a:0 ? a:1 : '\v^\D*\zs\d+(\.\d+)+\ze' ), '\m\.'), 'str2nr(v:val)')
+endfunction " }}}2
+
+" Verify that the 'installed' version is at least the 'required' version.
+"
+" 'installed' and 'required' must be arrays. If they have different lengths,
+" the "missing" elements will be assumed to be 0 for the purposes of checking.
+"
+" See http://semver.org for info about version numbers.
+function! syntastic#util#versionIsAtLeast(installed, required) abort " {{{2
+    return syntastic#util#compareLexi(a:installed, a:required) >= 0
+endfunction " }}}2
+
+" Almost lexicographic comparison of two lists of integers. :) If lists
+" have different lengths, the "missing" elements are assumed to be 0.
+function! syntastic#util#compareLexi(a, b) abort " {{{2
+    for idx in range(max([len(a:a), len(a:b)]))
+        let a_element = str2nr(get(a:a, idx, 0))
+        let b_element = str2nr(get(a:b, idx, 0))
+        if a_element != b_element
+            return a_element > b_element ? 1 : -1
+        endif
+    endfor
+    " still here, thus everything matched
+    return 0
+endfunction " }}}2
+
+function! syntastic#util#screenWidth(str, tabstop) abort " {{{2
+    let chunks = split(a:str, "\t", 1)
+    let width = s:_width(chunks[-1])
+    for c in chunks[:-2]
+        let cwidth = s:_width(c)
+        let width += cwidth + a:tabstop - cwidth % a:tabstop
+    endfor
+    return width
+endfunction " }}}2
+
+" Print as much of a:msg as possible without "Press Enter" prompt appearing
+function! syntastic#util#wideMsg(msg) abort " {{{2
+    let old_ruler = &ruler
+    let old_showcmd = &showcmd
+
+    "This is here because it is possible for some error messages to
+    "begin with \n which will cause a "press enter" prompt.
+    let msg = substitute(a:msg, "\n", '', 'g')
+
+    "convert tabs to spaces so that the tabs count towards the window
+    "width as the proper amount of characters
+    let chunks = split(msg, "\t", 1)
+    let msg = join(map(chunks[:-2], 'v:val . repeat(" ", &tabstop - s:_width(v:val) % &tabstop)'), '') . chunks[-1]
+    let msg = strpart(msg, 0, &columns - 1)
+
+    set noruler noshowcmd
+    call syntastic#util#redraw(0)
+
+    echo msg
+
+    let &ruler = old_ruler
+    let &showcmd = old_showcmd
+endfunction " }}}2
+
+" Check whether a buffer is loaded, listed, and not hidden
+function! syntastic#util#bufIsActive(buffer) abort " {{{2
+    " convert to number, or hell breaks loose
+    let buf = str2nr(a:buffer)
+
+    if !bufloaded(buf) || !buflisted(buf)
+        return 0
+    endif
+
+    " get rid of hidden buffers
+    for tab in range(1, tabpagenr('$'))
+        if index(tabpagebuflist(tab), buf) >= 0
+            return 1
+        endif
+    endfor
+
+    return 0
+endfunction " }}}2
+
+" Start in directory a:where and walk up the parent folders until it finds a
+" file named a:what; return path to that file
+function! syntastic#util#findFileInParent(what, where) abort " {{{2
+    let old_suffixesadd = &suffixesadd
+    let &suffixesadd = ''
+    let file = findfile(a:what, escape(a:where, ' ') . ';')
+    let &suffixesadd = old_suffixesadd
+    return file
+endfunction " }}}2
+
+" Start in directory a:where and walk up the parent folders until it finds a
+" file matching a:what; return path to that file
+function! syntastic#util#findGlobInParent(what, where) abort " {{{2
+    let here = fnamemodify(a:where, ':p')
+
+    let root = syntastic#util#Slash()
+    if syntastic#util#isRunningWindows() && here[1] ==# ':'
+        " The drive letter is an ever-green source of fun.  That's because
+        " we don't care about running syntastic on Amiga these days. ;)
+        let root = fnamemodify(root, ':p')
+        let root = here[0] . root[1:]
+    endif
+
+    let old = ''
+    while here !=# ''
+        try
+            " Vim 7.4.279 and later
+            let p = globpath(here, a:what, 1, 1)
+        catch /\m^Vim\%((\a\+)\)\=:E118/
+            let p = split(globpath(here, a:what, 1), "\n")
+        endtry
+
+        if !empty(p)
+            return fnamemodify(p[0], ':p')
+        elseif here ==? root || here ==? old
+            break
+        endif
+
+        let old = here
+
+        " we use ':h:h' rather than ':h' since ':p' adds a trailing '/'
+        " if 'here' is a directory
+        let here = fnamemodify(here, ':p:h:h')
+    endwhile
+
+    return ''
+endfunction " }}}2
+
+" Returns the buffer number of a filename
+" @vimlint(EVL104, 1, l:old_shellslash)
+function! syntastic#util#fname2buf(fname) abort " {{{2
+    if exists('+shellslash')
+        " bufnr() can't cope with backslashes
+        let old_shellslash = &shellslash
+        let &shellslash = 1
+    endif
+
+    " this is a best-effort attempt to escape file patterns (cf. :h file-pattern)
+    " XXX it fails for filenames containing something like \{2,3}
+    for md in [':~:.', ':~', ':p']
+        let buf = bufnr('^' . escape(fnamemodify(a:fname, md), '\*?,{}[') . '$')
+        if buf != -1
+            break
+        endif
+    endfor
+    if buf == -1
+        " XXX definitely wrong, but hope is the last thing to die :)
+        let buf = bufnr(fnamemodify(a:fname, ':p'))
+    endif
+
+    if exists('+shellslash')
+        let &shellslash = old_shellslash
+    endif
+
+    return buf
+endfunction " }}}2
+" @vimlint(EVL104, 0, l:old_shellslash)
+
+" Returns unique elements in a list
+function! syntastic#util#unique(list) abort " {{{2
+    let seen = {}
+    let uniques = []
+    for e in a:list
+        let k = string(e)
+        if !has_key(seen, k)
+            let seen[k] = 1
+            call add(uniques, e)
+        endif
+    endfor
+    return uniques
+endfunction " }}}2
+
+" A less noisy shellescape()
+function! syntastic#util#shescape(string) abort " {{{2
+    return a:string =~# '\m^[A-Za-z0-9_/.-]\+$' ? a:string : shellescape(a:string)
+endfunction " }}}2
+
+" A less noisy shellescape(expand())
+function! syntastic#util#shexpand(string, ...) abort " {{{2
+    return syntastic#util#shescape(a:0 ? expand(a:string, a:1) : expand(a:string, 1))
+endfunction " }}}2
+
+" Escape arguments
+function! syntastic#util#argsescape(opt) abort " {{{2
+    if type(a:opt) == type('') && a:opt !=# ''
+        return [a:opt]
+    elseif type(a:opt) == type([])
+        return map(copy(a:opt), 'syntastic#util#shescape(v:val)')
+    endif
+
+    return []
+endfunction " }}}2
+
+" Decode XML entities
+function! syntastic#util#decodeXMLEntities(string) abort " {{{2
+    let str = a:string
+    let str = substitute(str, '\m&lt;', '<', 'g')
+    let str = substitute(str, '\m&gt;', '>', 'g')
+    let str = substitute(str, '\m&quot;', '"', 'g')
+    let str = substitute(str, '\m&apos;', "'", 'g')
+    let str = substitute(str, '\m&amp;', '\&', 'g')
+    return str
+endfunction " }}}2
+
+function! syntastic#util#redraw(full) abort " {{{2
+    if a:full
+        redraw!
+    else
+        redraw
+    endif
+endfunction " }}}2
+
+function! syntastic#util#dictFilter(errors, filter) abort " {{{2
+    let rules = s:_translateFilter(a:filter)
+    " call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, "applying filter:", rules)
+    try
+        call filter(a:errors, rules)
+    catch /\m^Vim\%((\a\+)\)\=:E/
+        let msg = matchstr(v:exception, '\m^Vim\%((\a\+)\)\=:\zs.*')
+        call syntastic#log#error('quiet_messages: ' . msg)
+    endtry
+endfunction " }}}2
+
+" Return a [seconds, fractions] list of strings, representing the
+" (hopefully high resolution) time since program start
+function! syntastic#util#stamp() abort " {{{2
+    return split( split(reltimestr(reltime(g:_SYNTASTIC_START)))[0], '\.' )
+endfunction " }}}2
+
+function! syntastic#util#setLastTick(buf) abort " {{{2
+    call setbufvar(a:buf, 'syntastic_lasttick', getbufvar(a:buf, 'changedtick'))
+endfunction " }}}2
+
+let s:_wid_base = 'syntastic_' . getpid() . '_' . reltimestr(g:_SYNTASTIC_START) . '_'
+let s:_wid_pool = 0
+
+" Add unique IDs to windows
+function! syntastic#util#setWids() abort " {{{2
+    for tab in range(1, tabpagenr('$'))
+        for win in range(1, tabpagewinnr(tab, '$'))
+            if gettabwinvar(tab, win, 'syntastic_wid') ==# ''
+                call settabwinvar(tab, win, 'syntastic_wid', s:_wid_base . s:_wid_pool)
+                let s:_wid_pool += 1
+            endif
+        endfor
+    endfor
+endfunction " }}}2
+
+function! syntastic#util#str2float(val) abort " {{{2
+    return s:_str2float(a:val)
+endfunction " }}}2
+
+function! syntastic#util#float2str(val) abort " {{{2
+    return s:_float2str(a:val)
+endfunction " }}}2
+
+" Crude printf()-like width formatter.  Handles wide characters.
+function! syntastic#util#wformat(format, str) abort " {{{2
+    if a:format ==# ''
+        return a:str
+    endif
+
+ echomsg string(a:format) . ', ' . string(a:str)
+    let specs = matchlist(a:format, '\v^(-?)(0?)(%([1-9]\d*))?%(\.(\d+))?$')
+    if len(specs) < 5
+        return a:str
+    endif
+
+    let flushleft = specs[1] ==# '-'
+    let lpad = specs[2] ==# '0' ? '0' : ' '
+    let minlen = str2nr(specs[3])
+    let maxlen = str2nr(specs[4])
+    let out = substitute(a:str, "\t", ' ', 'g')
+
+    if maxlen && s:_width(out) > maxlen
+        let chars = filter(split(out, '\zs\ze', 1), 'v:val !=# ""')
+        let out = ''
+
+        if flushleft
+            for c in chars
+                if s:_width(out . c) < maxlen
+                    let out .= c
+                else
+                    let out .= &encoding ==# 'utf-8' && &termencoding ==# 'utf-8' ? "\u2026" : '>'
+                    break
+                endif
+            endfor
+        else
+            call reverse(chars)
+            for c in chars
+                if s:_width(c . out) < maxlen
+                    let out = c . out
+                else
+                    let out = (&encoding ==# 'utf-8' && &termencoding ==# 'utf-8' ? "\u2026" : '<') . out
+                    break
+                endif
+            endfor
+        endif
+    endif
+
+    if minlen && s:_width(out) < minlen
+        if flushleft
+            let out .= repeat(' ', minlen - s:_width(out))
+        else
+            let out = repeat(lpad, minlen - s:_width(out)) . out
+        endif
+    endif
+
+    return out
+endfunction " }}}2
+
+" }}}1
+
+" Private functions {{{1
+
+function! s:_translateFilter(filters) abort " {{{2
+    let conditions = []
+    for k in keys(a:filters)
+        if type(a:filters[k]) == type([])
+            call extend(conditions, map(copy(a:filters[k]), 's:_translateElement(k, v:val)'))
+        else
+            call add(conditions, s:_translateElement(k, a:filters[k]))
+        endif
+    endfor
+
+    if conditions == []
+        let conditions = ['1']
+    endif
+    return len(conditions) == 1 ? conditions[0] : join(map(conditions, '"(" . v:val . ")"'), ' && ')
+endfunction " }}}2
+
+function! s:_translateElement(key, term) abort " {{{2
+    let fkey = a:key
+    if fkey[0] ==# '!'
+        let fkey = fkey[1:]
+        let not = 1
+    else
+        let not = 0
+    endif
+
+    if fkey ==? 'level'
+        let op = not ? ' ==? ' : ' !=? '
+        let ret = 'v:val["type"]' . op . string(a:term[0])
+    elseif fkey ==? 'type'
+        if a:term ==? 'style'
+            let op = not ? ' ==? ' : ' !=? '
+            let ret = 'get(v:val, "subtype", "")' . op . '"style"'
+        else
+            let op = not ? '!' : ''
+            let ret = op . 'has_key(v:val, "subtype")'
+        endif
+    elseif fkey ==? 'regex'
+        let op = not ? ' =~? ' : ' !~? '
+        let ret = 'v:val["text"]' . op . string(a:term)
+    elseif fkey ==? 'file' || fkey[:4] ==? 'file:'
+        let op = not ? ' =~# ' : ' !~# '
+        let ret = 'bufname(str2nr(v:val["bufnr"]))'
+        let mod = fkey[4:]
+        if mod !=# ''
+            let ret = 'fnamemodify(' . ret . ', ' . string(mod) . ')'
+        endif
+        let ret .= op . string(a:term)
+    else
+        call syntastic#log#warn('quiet_messages: ignoring invalid key ' . strtrans(string(fkey)))
+        let ret = '1'
+    endif
+    return ret
+endfunction " }}}2
+
+" strwidth() was added in Vim 7.3; if it doesn't exist, we use strlen()
+" and hope for the best :)
+let s:_width = function(exists('*strwidth') ? 'strwidth' : 'strlen')
+lockvar s:_width
+
+" @vimlint(EVL103, 1, a:flags)
+function! s:_delete_dumb(what, flags) abort " {{{2
+    if !exists('s:rmrf')
+        let s:rmrf =
+            \ has('unix') || has('mac') ? 'rm -rf' :
+            \ has('win32') || has('win64') ? 'rmdir /S /Q' :
+            \ has('win16') || has('win95') || has('dos16') || has('dos32') ? 'deltree /Y' : ''
+    endif
+
+    if s:rmrf !=# ''
+        silent! call syntastic#util#system(s:rmrf . ' ' . syntastic#util#shescape(a:what))
+    else
+        call s:_rmrf(a:what)
+    endif
+endfunction " }}}2
+" @vimlint(EVL103, 0, a:flags)
+
+" delete(dir, 'rf') was added in Vim 7.4.1107, but it didn't become usable until 7.4.1128
+let s:_delete = function(v:version > 704 || (v:version == 704 && has('patch1128')) ? 'delete' : 's:_delete_dumb')
+lockvar s:_delete
+
+function! s:_rmrf(what) abort " {{{2
+    if !exists('s:rmdir')
+        let s:rmdir = syntastic#util#shescape(get(g:, 'netrw_localrmdir', 'rmdir'))
+    endif
+
+    if getftype(a:what) ==# 'dir'
+        if filewritable(a:what) != 2
+            return
+        endif
+
+        try
+            " Vim 7.4.279 and later
+            let entries = globpath(a:what, '*', 1, 1)
+        catch /\m^Vim\%((\a\+)\)\=:E118/
+            let entries = split(globpath(a:what, '*', 1), "\n")
+        endtry
+        for f in entries
+            call s:_rmrf(f)
+        endfor
+        silent! call syntastic#util#system(s:rmdir . ' ' . syntastic#util#shescape(a:what))
+    else
+        silent! call delete(a:what)
+    endif
+endfunction " }}}2
+
+let s:_str2float = function(exists('*str2float') ? 'str2float' : 'str2nr')
+lockvar s:_str2float
+
+function! s:_float2str_smart(val) abort " {{{2
+    return printf('%.1f', a:val)
+endfunction " }}}2
+
+function! s:_float2str_dumb(val) abort " {{{2
+    return a:val
+endfunction " }}}2
+
+let s:_float2str = function(has('float') ? 's:_float2str_smart' : 's:_float2str_dumb')
+lockvar s:_float2str
+
+function! s:_getbufvar_dumb(buf, name, ...) abort " {{{2
+    let ret = getbufvar(a:buf, a:name)
+    if a:0 && type(ret) == type('') && ret ==# ''
+        unlet! ret
+        let ret = a:1
+    endif
+    return ret
+endfunction "}}}2
+
+let s:_getbufvar = function(v:version > 703 || (v:version == 703 && has('patch831')) ? 'getbufvar' : 's:_getbufvar_dumb')
+lockvar s:_getbufvar
+
+" }}}1
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/doc/syntastic-checkers.txt b/vim-plugins/bundle/syntastic/doc/syntastic-checkers.txt
new file mode 100644
index 0000000..d8fb584
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/doc/syntastic-checkers.txt
@@ -0,0 +1,7278 @@
+*syntastic-checkers.txt*	Syntastic checkers
+*syntastic-checkers*
+
+==============================================================================
+SYNTAX CHECKERS BY LANGUAGE                          *syntastic-checkers-lang*
+
+|syntastic| comes with checkers for the following languages:
+
+    ACPI Source Language.....................|syntastic-checkers-asl|
+    ActionScript.............................|syntastic-checkers-actionscript|
+    Ada......................................|syntastic-checkers-ada|
+    Ansible..................................|syntastic-checkers-ansible|
+    API Blueprint............................|syntastic-checkers-apiblueprint|
+    AppleScript..............................|syntastic-checkers-applescript|
+    AsciiDoc.................................|syntastic-checkers-asciidoc|
+    Assembly Languages.......................|syntastic-checkers-asm|
+
+    BEMHTML..................................|syntastic-checkers-bemhtml|
+    Bro......................................|syntastic-checkers-bro|
+
+    C........................................|syntastic-checkers-c|
+    C#.......................................|syntastic-checkers-cs|
+    C++......................................|syntastic-checkers-cpp|
+    Cabal....................................|syntastic-checkers-cabal|
+    Chef.....................................|syntastic-checkers-chef|
+    COBOL....................................|syntastic-checkers-cobol|
+    Coco.....................................|syntastic-checkers-co|
+    CoffeeScript.............................|syntastic-checkers-coffee|
+    Coq......................................|syntastic-checkers-coq|
+    CSS......................................|syntastic-checkers-css|
+    Cucumber.................................|syntastic-checkers-cucumber|
+    CUDA.....................................|syntastic-checkers-cuda|
+
+    D........................................|syntastic-checkers-d|
+    Dart.....................................|syntastic-checkers-dart|
+    DocBook..................................|syntastic-checkers-docbk|
+    Dockerfile...............................|syntastic-checkers-dockerfile|
+    Dust.....................................|syntastic-checkers-dustjs|
+
+    Elixir...................................|syntastic-checkers-elixir|
+    Erlang...................................|syntastic-checkers-erlang|
+    eRuby....................................|syntastic-checkers-eruby|
+
+    Fortran..................................|syntastic-checkers-fortran|
+
+    Gentoo Metadata..........................|syntastic-checkers-gentoo|
+    Gettext PO...............................|syntastic-checkers-po|
+    GLSL.....................................|syntastic-checkers-glsl|
+    Go.......................................|syntastic-checkers-go|
+
+    Haml.....................................|syntastic-checkers-haml|
+    Handlebars...............................|syntastic-checkers-handlebars|
+    Haskell..................................|syntastic-checkers-haskell|
+    Haxe.....................................|syntastic-checkers-haxe|
+    HSS......................................|syntastic-checkers-hss|
+    HTML.....................................|syntastic-checkers-html|
+
+    Java.....................................|syntastic-checkers-java|
+    JavaScript...............................|syntastic-checkers-javascript|
+    JSON.....................................|syntastic-checkers-json|
+
+    LESS.....................................|syntastic-checkers-less|
+    Lex......................................|syntastic-checkers-lex|
+    Limbo....................................|syntastic-checkers-limbo|
+    LISP.....................................|syntastic-checkers-lisp|
+    LLVM.....................................|syntastic-checkers-llvm|
+    Lua......................................|syntastic-checkers-lua|
+
+    Markdown.................................|syntastic-checkers-markdown|
+    MATLAB...................................|syntastic-checkers-matlab|
+    Mercury..................................|syntastic-checkers-mercury|
+
+    NASM.....................................|syntastic-checkers-nasm|
+    Nix......................................|syntastic-checkers-nix|
+    nroff....................................|syntastic-checkers-nroff|
+
+    Objective-C..............................|syntastic-checkers-objc|
+    Objective-C++............................|syntastic-checkers-objcpp|
+    OCaml....................................|syntastic-checkers-ocaml|
+
+    Perl.....................................|syntastic-checkers-perl|
+    PHP......................................|syntastic-checkers-php|
+    POD......................................|syntastic-checkers-pod|
+    Pug (formerly Jade)......................|syntastic-checkers-pug|
+    Puppet...................................|syntastic-checkers-puppet|
+    Python...................................|syntastic-checkers-python|
+
+    QML......................................|syntastic-checkers-qml|
+
+    R........................................|syntastic-checkers-r|
+    R Markdown...............................|syntastic-checkers-rmd|
+    Racket...................................|syntastic-checkers-racket|
+    Relax NG.................................|syntastic-checkers-rnc|
+    reStructuredText.........................|syntastic-checkers-rst|
+    RPM spec.................................|syntastic-checkers-spec|
+    Ruby.....................................|syntastic-checkers-ruby|
+
+    SASS.....................................|syntastic-checkers-sass|
+    Scala....................................|syntastic-checkers-scala|
+    SCSS.....................................|syntastic-checkers-scss|
+    Sh.......................................|syntastic-checkers-sh|
+    Slim.....................................|syntastic-checkers-slim|
+    SML......................................|syntastic-checkers-sml|
+    Solidity.................................|syntastic-checkers-solidity|
+    SQL......................................|syntastic-checkers-sql|
+    Stylus...................................|syntastic-checkers-stylus|
+
+    Tcl......................................|syntastic-checkers-tcl|
+    TeX......................................|syntastic-checkers-tex|
+    Texinfo..................................|syntastic-checkers-texinfo|
+    Text.....................................|syntastic-checkers-text|
+    Turtle...................................|syntastic-checkers-turtle|
+    TriG.....................................|syntastic-checkers-trig|
+    Twig.....................................|syntastic-checkers-twig|
+    TypeScript...............................|syntastic-checkers-typescript|
+
+    Vala.....................................|syntastic-checkers-vala|
+    Verilog..................................|syntastic-checkers-verilog|
+    VHDL.....................................|syntastic-checkers-vhdl|
+    Vim help.................................|syntastic-checkers-help|
+    VimL.....................................|syntastic-checkers-vim|
+
+    xHTML....................................|syntastic-checkers-xhtml|
+    XML......................................|syntastic-checkers-xml|
+    XQuery...................................|syntastic-checkers-xquery|
+    XSLT.....................................|syntastic-checkers-xslt|
+
+    YACC.....................................|syntastic-checkers-yacc|
+    YAML.....................................|syntastic-checkers-yaml|
+    YANG.....................................|syntastic-checkers-yang|
+
+    Z80......................................|syntastic-checkers-z80|
+    Zope Page Templates......................|syntastic-checkers-zpt|
+    Zsh......................................|syntastic-checkers-zsh|
+
+Third-party checkers are available for additional languages.
+
+==============================================================================
+SYNTAX CHECKERS FOR ACPI SOURCE LANGUAGE              *syntastic-checkers-asl*
+
+The following checkers are available for the ACPI Source Language (filetype
+"asl"):
+
+    1. iasl.....................|syntastic-asl-iasl|
+
+------------------------------------------------------------------------------
+1. iasl                                                   *syntastic-asl-iasl*
+
+Name:        iasl
+Maintainer:  Peter Wu <peter@lekensteyn.nl>
+
+"iasl" is a compiler/decompiler for ACPI Source Language (ASL) and ACPI
+Machine Language (AML). See the project's page for details:
+
+    https://acpica.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You probably also need a plugin to set |filetype| for ASL files, such as
+"vim-acpi-asl":
+
+    https://github.com/martinlroth/vim-acpi-asl
+
+==============================================================================
+SYNTAX CHECKERS FOR ACTIONSCRIPT             *syntastic-checkers-actionscript*
+
+The following checkers are available for ActionScript (filetype
+"actionscript"):
+
+    1. mxmlc....................|syntastic-actionscript-mxmlc|
+
+------------------------------------------------------------------------------
+1. mxmlc                                        *syntastic-actionscript-mxmlc*
+
+Name:        mxmlc
+Maintainer:  Andy Earnshaw <andyearnshaw@gmail.com>
+
+"mxmlc" is a compiler for ActionScript. See Apache Flex for details:
+
+    http://flex.apache.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR ADA                               *syntastic-checkers-ada*
+
+The following checkers are available for Ada (filetype "ada"):
+
+    1. GCC......................|syntastic-ada-gcc|
+
+------------------------------------------------------------------------------
+1. GCC                                                     *syntastic-ada-gcc*
+
+Name:        gcc
+Maintainer:  Alfredo Di Napoli <alfredo.dinapoli@gmail.com>
+
+Checker options~
+                                                  *'g:syntastic_ada_compiler'*
+Type: string
+Default: "gcc"
+Compiler executable.
+
+                                               *'g:syntastic_ada_errorformat'*
+Type: string
+Default: unset
+Override for the default |'errorformat'|.
+
+                                     *'g:syntastic_ada_remove_include_errors'*
+Type: boolean
+Default: 0
+By default, errors in files included from the file being checked are shown.
+Set this variable to 1 to remove messages about errors in included files.
+Please note that this means syntastic will silently abort checks if there are
+fatal errors in one of the included files.
+
+                                          *'g:syntastic_ada_compiler_options'*
+Type: string
+Default: unset
+Compilation flags (such as defines or include directories) to be passed to the
+checker.
+
+                                               *'g:syntastic_ada_config_file'*
+Type: string
+Default: ".syntastic_ada_config"
+File containing additional compilation flags to be passed to the checker, one
+option per line (cf. |syntastic-config-files|).
+
+                                              *'g:syntastic_ada_include_dirs'*
+Type: array of strings
+Default: []
+Include directories to be passed to the checker, in addition to the above
+compilation flags. You can set it like this: >
+    let g:syntastic_ada_include_dirs = ["includes", "headers"]
+<
+and the corresponding "-Iincludes -Iheaders" will be added to the compilation
+flags.
+
+                                                    *'b:syntastic_ada_cflags'*
+Type: string
+Default: unset
+Buffer-local variable. Additional compilation flags specific to the current
+buffer.
+
+                                              *'g:syntastic_ada_check_header'*
+Type: boolean
+Default: 0
+If the current file is a header (namely if its extension is "ads"), all checks
+are silently skipped. You can force syntastic to check header files by
+setting the above variable to 1.
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_ada_gcc_<option>' variables. The only exception is
+'g:syntastic_ada_gcc_exec', which can still be used to override the checker's
+executable.
+
+==============================================================================
+SYNTAX CHECKERS FOR ANSIBLE                       *syntastic-checkers-ansible*
+
+The following checkers are available for Ansible (filetype "ansible"):
+
+    1. Ansible-lint.............|syntastic-ansible-ansible_lint|
+
+------------------------------------------------------------------------------
+1. Ansible-lint                               *syntastic-ansible-ansible_lint*
+
+Name:        ansible_lint
+Maintainer:  Erik Zaadi <erik.zaadi@gmail.com>
+
+"Ansible-lint" is a style checker for Ansible playbooks. See the project's
+page at GitHub for details:
+
+    https://github.com/willthames/ansible-lint
+
+Syntastic requires "Ansible-lint" version 2.0.4 or later.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You probably also need a plugin to set |filetype| for Ansible playbooks, such
+as "ansible-vim":
+
+    https://github.com/pearofducks/ansible-vim
+
+==============================================================================
+SYNTAX CHECKERS FOR API BLUEPRINT            *syntastic-checkers-apiblueprint*
+
+The following checkers are available for API Blueprint (filetype "apiblueprint"):
+
+    1. Drafter..................|syntastic-apiblueprint-drafter|
+
+------------------------------------------------------------------------------
+1. Drafter                                    *syntastic-apiblueprint-drafter*
+
+Name:        drafter
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Drafter" is a parser for Apiary's "API Blueprint" (http://apiblueprint.org/).
+See the project's page at GitHub for details:
+
+    https://github.com/apiaryio/drafter
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You probably also need a plugin to set |filetype| for API Blueprint files, such
+as "apiblueprint.vim":
+
+    https://github.com/kylef/apiblueprint.vim
+
+==============================================================================
+SYNTAX CHECKERS FOR APPLESCRIPT               *syntastic-checkers-applescript*
+
+The following checkers are available for AppleScript (filetype "applescript"):
+
+    1. osacompile...............|syntastic-applescript-osacompile|
+
+------------------------------------------------------------------------------
+1. osacompile                               *syntastic-applescript-osacompile*
+
+Name:        osacompile
+Author: Zhao Cai <caizhaoff@gmail.com>
+
+"osacompile" is a compiler for "AppleScript". See the program's manual for
+details:
+
+    https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/osacompile.1.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR ASCIIDOC                     *syntastic-checkers-asciidoc*
+
+The following checkers are available for AsciiDoc (filetype "asciidoc"):
+
+    1. Asciidoc.................|syntastic-asciidoc-asciidoc|
+    2. proselint................|syntastic-asciidoc-proselint|
+
+------------------------------------------------------------------------------
+1. Asciidoc                                      *syntastic-asciidoc-asciidoc*
+
+Name:        asciidoc
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Asciidoc" is a translator for AsciiDoc documents (http://asciidoc.org/).
+
+Note~
+
+If you would prefer to use Asciidoctor (http://asciidoctor.org/) as an
+external checker instead of "Asciidoc", you can do that by pointing
+'g:syntastic_asciidoc_asciidoc_exec' to it: >
+    let g:syntastic_asciidoc_asciidoc_exec = "asciidoctor"
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. proselint                                    *syntastic-asciidoc-proselint*
+
+Name:        proselint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"proselint" is a linter for prose. See the page for details:
+
+    http://proselint.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-help-proselint|, |syntastic-html-proselint|,
+|syntastic-markdown-proselint|, |syntastic-nroff-proselint|,
+|syntastic-pod-proselint|, |syntastic-rst-proselint|,
+|syntastic-tex-proselint|, |syntastic-texinfo-proselint|,
+|syntastic-text-proselint|, |syntastic-xhtml-proselint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR ASSEMBLY LANGUAGES                *syntastic-checkers-asm*
+
+The following checkers are available for assembly languages (filetype "asm"):
+
+    1. GCC......................|syntastic-asm-gcc|
+
+------------------------------------------------------------------------------
+1. GCC                                                     *syntastic-asm-gcc*
+
+Name:        gcc
+Maintainer:  Joshua Rahm <joshuarahm@gmail.com>
+
+This plugin supports both the AT&T and Intel dialects.
+
+Checker Options~
+                                                  *'g:syntastic_asm_compiler'*
+Type: string
+Default: "gcc"
+Compiler executable. Set it to something like "mipsel-linux-gcc": >
+    let g:syntastic_asm_compiler = "mipsel-linux-gcc"
+<
+                                               *'g:syntastic_asm_errorformat'*
+Type: string
+Default: unset
+Override for the default |'errorformat'|.
+
+                                                   *'g:syntastic_asm_dialect'*
+Type: string
+Default: unset
+Normally the assembler will select the dialect to use for checking based on
+the file extension (AT&T for ".s", Intel for ".asm"). If you want to override
+the automatic choice set this variable to either "att" or "intel".
+
+                                     *'g:syntastic_asm_remove_include_errors'*
+Type: boolean
+Default: 0
+By default, errors in files included from the file being checked are shown.
+Set this variable to 1 to remove messages about errors in included files.
+Please note that this means syntastic will silently abort checks if there are
+fatal errors in one of the included files.
+
+                                          *'g:syntastic_asm_compiler_options'*
+Type: string
+Default: unset
+Compilation flags (such as defines or include directories) to be passed to the
+assembler. Set it to something like "-mtune=native": >
+    let g:syntastic_asm_compiler_options = "-mtune=native"
+<
+                                               *'g:syntastic_asm_config_file'*
+Type: string
+Default: ".syntastic_asm_config"
+File containing additional compilation flags to be passed to the assembler,
+one option per line (see |syntastic-config-files|).
+
+                                              *'g:syntastic_asm_include_dirs'*
+Type: array of strings
+Default: []
+Include directories to be passed to the assembler, in addition to the
+above compilation flags. You can set it like this: >
+    let g:syntastic_asm_include_dirs = ["inc", "asm/src/include"]
+<
+and the corresponding "-Iinc -Iasm/src/include" will be added to the
+compilation flags.
+
+                                                    *'b:syntastic_asm_cflags'*
+Type: string
+Default: unset
+Buffer-local variable. Additional compilation flags specific to the current
+buffer.
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_asm_gcc_<option>' variables. The only exception is
+'g:syntastic_asm_gcc_exec', which can still be used to override the checker's
+executable.
+
+==============================================================================
+SYNTAX CHECKERS FOR BEMHTML                       *syntastic-checkers-bemhtml*
+
+The following checkers are available for BEMHTML (filetype "bemhtml"):
+
+    1. bemhtml-lint.............|syntastic-bemhtml-bemhtmllint|
+
+------------------------------------------------------------------------------
+1. bemhtml-lint                                *syntastic-bemhtml-bemhtmllint*
+
+Name:        bemhtmllint
+Maintainer:  Sergej Tatarincev
+
+BEMHTML is a template engine intended for using with the BEM methodology
+(http://bem.info/method/). See the project's page at GitHub for details:
+
+    https://github.com/SevInf/bemhtml-lint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR BRO                               *syntastic-checkers-bro*
+
+The following checkers are available for Bro (filetype "bro"):
+
+    1. Bro......................|syntastic-bro-bro|
+
+------------------------------------------------------------------------------
+1. Bro                                                     *syntastic-bro-bro*
+
+Name:        bro
+Maintainer:  Justin Azoff <justin.azoff@gmail.com>
+
+"Bro" is a network security monitor. See the project's page for details:
+
+    https://www.bro.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR C                                   *syntastic-checkers-c*
+
+The following checkers are available for C (filetype "c"):
+
+    1. AVR-GCC..................|syntastic-c-avrgcc|
+    2. Checkpatch...............|syntastic-c-checkpatch|
+    3. ClangCheck...............|syntastic-c-clang_check|
+    4. Clang-Tidy...............|syntastic-c-clang_tidy|
+    5. Cppcheck.................|syntastic-c-cppcheck|
+    6. GCC......................|syntastic-c-gcc|
+    7. make.....................|syntastic-c-make|
+    8. OClint...................|syntastic-c-oclint|
+    9. PC-Lint..................|syntastic-c-pc_lint|
+    10. Sparse..................|syntastic-c-sparse|
+    11. Splint..................|syntastic-c-splint|
+
+------------------------------------------------------------------------------
+1. AVR-GCC                                                *syntastic-c-avrgcc*
+
+Name:        avrgcc
+Maintainer:  Karel <karelishere@gmail.com>
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                            *'g:syntastic_avrgcc_config_file'*
+Type: string
+Default: ".syntastic_avrgcc_config"
+File containing compilation flags (such as defines or include directories),
+one option per line (cf. |syntastic-config-files|).
+
+------------------------------------------------------------------------------
+2. Checkpatch                                         *syntastic-c-checkpatch*
+
+Name:        checkpatch
+Maintainer:  Daniel Walker <dwalker@fifo99.com>
+
+"Checkpatch" is a style checker for the Linux kernel sources. It's
+distributed along with the Linux kernel sources:
+
+    https://github.com/torvalds/linux/blob/master/scripts/checkpatch.pl
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+3. ClangCheck                                        *syntastic-c-clang_check*
+
+Name:        clang_check
+Maintainer:  Benjamin Bannier <bbannier@gmail.com>
+
+"ClangCheck" is a wrapper around Clang's "LibTooling"
+(http://clang.llvm.org/docs/LibTooling.html). See the official page for
+details:
+
+    http://clang.llvm.org/docs/ClangCheck.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                       *'g:syntastic_clang_check_config_file'*
+Type: string
+Default: ".syntastic_clang_check_config"
+File containing compilation flags (such as defines or include directories),
+one option per line (cf. |syntastic-config-files|).
+
+Note~
+
+By default you can set "ClangCheck" parameters in
+'g:syntastic_c_clang_check_args', and compilation parameters
+(defines, optimisation flags, etc.) in the configuration file.
+
+However, if you want "ClangCheck" to use compilation databases
+(http://clang.llvm.org/docs/JSONCompilationDatabase.html) -- perhaps
+generated by "CMake" (https://github.com/rizsotto/Bear) or "Build EAR"
+(https://github.com/rizsotto/Bear) -- rather than pass compilation flags
+explicitly, set 'g:syntastic_c_clang_check_post_args' to an empty string: >
+    let g:syntastic_c_clang_check_post_args = ""
+<
+Configuration files pointed to by 'g:syntastic_clang_check_config_file' are
+then ignored.
+
+See also: |syntastic-cpp-clang_check|.
+
+------------------------------------------------------------------------------
+4. Clang-Tidy                                         *syntastic-c-clang_tidy*
+
+Name:        clang_tidy
+Maintainer:  Benjamin Bannier <bbannier@gmail.com>
+
+"Clang-Tidy" is a lint tool based on "Clang" (http://clang.llvm.org/). See
+the project's page for details:
+
+    http://clang.llvm.org/extra/clang-tidy.html
+
+Installation~
+
+"Clang-Tidy" is part of the "Clang" (http://clang.llvm.org/) project, but it
+isn't built by default. You need to enable compilation of the "Extra Clang
+Tools" (http://clang.llvm.org/docs/ClangTools.html#extra-clang-tools) to get
+it. See the build tutorial for details:
+
+    http://clang.llvm.org/docs/LibASTMatchersTutorial.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                        *'g:syntastic_clang_tidy_config_file'*
+Type: string
+Default: ".syntastic_clang_tidy_config"
+File containing compilation flags (such as defines or include directories),
+one option per line (cf. |syntastic-config-files|).
+
+Note~
+
+By default you can set "ClangTidy" parameters in
+'g:syntastic_c_clang_tidy_args', and compilation parameters
+(defines, optimisation flags, etc.) in the configuration file.
+
+If you want "ClangTidy" to use compilation databases
+(http://clang.llvm.org/docs/JSONCompilationDatabase.html) --
+perhaps generated by "CMake" (http://cmake.org/) or "Build EAR"
+(https://github.com/rizsotto/Bear) -- rather than pass compilation flags
+explicitly, set 'g:syntastic_c_clang_tidy_post_args' to an empty string: >
+    let g:syntastic_c_clang_tidy_post_args = ""
+<
+Configuration files pointed to by 'g:syntastic_clang_tidy_config_file' are
+then ignored.
+
+See also: |syntastic-cpp-clang_tidy|.
+
+------------------------------------------------------------------------------
+5. Cppcheck                                             *syntastic-c-cppcheck*
+
+Name:        cppcheck
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Cppcheck" is a static analysis tool for C/C++ code. See the project's page
+for details:
+
+    http://cppcheck.sourceforge.net/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                          *'g:syntastic_cppcheck_config_file'*
+Type: string
+Default: ".syntastic_cppcheck_config"
+File containing compilation flags (such as defines or include directories),
+one option per line (cf. |syntastic-config-files|).
+
+See also: |syntastic-cpp-cppcheck|.
+
+------------------------------------------------------------------------------
+6. GCC                                                       *syntastic-c-gcc*
+
+Name:        gcc
+Maintainer:  Gregor Uhlenheuer <kongo2002@gmail.com>
+
+Checker options~
+                                                    *'g:syntastic_c_compiler'*
+Type: string
+Default: "gcc", or "clang" if GCC is not found
+Compiler executable.
+
+                                                 *'g:syntastic_c_errorformat'*
+Type: string
+Default: unset
+Override for the default |'errorformat'|.
+
+                                       *'g:syntastic_c_remove_include_errors'*
+Type: boolean
+Default: 0
+By default, errors in files included from the file being checked are shown.
+Set this variable to 1 to remove messages about errors in included files.
+Please note that this means syntastic will silently abort checks if there are
+fatal errors in one of the included files.
+
+                                            *'g:syntastic_c_compiler_options'*
+Type: string
+Default: "-std=gnu99"
+Compilation flags (such as defines or include directories) to be passed to the
+checker.
+
+                                                 *'g:syntastic_c_config_file'*
+Type: string
+Default: ".syntastic_c_config"
+File containing additional compilation flags to be passed to the checker, one
+option per line (cf. |syntastic-config-files|).
+
+                                                *'g:syntastic_c_include_dirs'*
+Type: array of strings
+Default: []
+Include directories to be passed to the checker, in addition to the above
+compilation flags. You can set it to something like this: >
+    let g:syntastic_c_include_dirs = ["includes", "headers"]
+<
+and the corresponding "-Iincludes -Iheaders" will be added to the compilation
+flags.
+
+                                     *'g:syntastic_c_no_default_include_dirs'*
+Type: boolean
+Default: 0
+By default syntastic adds a number of common include directories to the
+compilation flags, namely: >
+    -I. -I.. -Iinclude -Iincludes -I../include -I../includes
+<
+You can disable this behaviour by setting the above variable to 1.
+
+                                           *'g:syntastic_c_no_include_search'*
+Type: boolean
+Default: 0
+By default syntastic looks at the first 100 lines of the file being checked,
+and tries to determine if it needs to include headers for some common
+libraries, such as "GLib" or "Gtk". It then tries to add the corresponding
+include directories to the compilation flags. You can disable this behaviour
+by setting the above variable to 1.
+
+                                       *'g:syntastic_c_auto_refresh_includes'*
+Type: boolean
+Default: 0
+Used only if "g:syntastic_c_no_include_search" is set to a false value. By
+default syntastic searches for common libraries only the first time the
+current file is checked. Setting the above variable to 1 instructs syntastic
+to refresh the list of common libraries every time the current file is
+checked. You can also force a refresh even when the above variable is 0, by
+`:unlet`-ing the buffer variable 'b:syntastic_c_includes'.
+
+                                                      *'b:syntastic_c_cflags'*
+Type: string
+Default: unset
+Buffer-local variable. When set, no search for common libraries is performed,
+and the contents of the variable are added to the compilation flags.
+
+                                                *'g:syntastic_c_check_header'*
+Type: boolean
+Default: 0
+If the current file is a header (namely if its extension is "h"), all checks
+are silently skipped. You can force syntastic to check header files by
+setting the above variable to 1.
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_c_gcc_<option>' variables. The only exception is
+'g:syntastic_c_gcc_exec', which can still be used to override the checker's
+executable.
+
+See also: |syntastic-cpp-gcc|.
+
+------------------------------------------------------------------------------
+7. make                                                     *syntastic-c-make*
+
+Name:        make
+Maintainer:  Gregor Uhlenheuer <kongo2002@gmail.com>
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+8. OClint                                                 *syntastic-c-oclint*
+
+Name:        oclint
+Maintainer:  "UnCO" Lin <undercooled@lavabit.com>
+
+"OClint" is a static code analysis tool. See the project's page for details:
+
+    http://oclint.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                            'g:syntastic_oclint_config_file'
+Type: string
+Default: ".syntastic_oclint_config"
+File containing compilation flags (such as defines or include directories),
+one option per line (cf. |syntastic-config-files|).
+
+Notes~
+
+By default you can set "OClint" parameters in 'g:syntastic_c_oclint_args', and
+compilation parameters (defines, optimisation flags, etc.) in the config file.
+
+If you want "OClint" to use "Clang"-style compilation databases
+(http://clang.llvm.org/docs/JSONCompilationDatabase.html) --
+perhaps generated by "CMake" (http://cmake.org/) or "Build EAR"
+(https://github.com/rizsotto/Bear) -- rather than pass compilation flags
+explicitly, set 'g:syntastic_c_oclint_post_args' to an empty string: >
+    let g:syntastic_c_oclint_post_args = ""
+<
+Config files pointed to by 'g:syntastic_oclint_config_file' are then ignored.
+
+See also: |syntastic-cpp-oclint|.
+
+------------------------------------------------------------------------------
+9. PC-Lint                                               *syntastic-c-pc_lint*
+
+Name:        pc_lint
+Maintainer:  Steve Bragg <steve@empresseffects.com>
+
+"PC-Lint" is a commercial static code analysis tool for Windows, produced
+by "Gimpel Software" (http://www.gimpel.com/). See the project's page for
+details:
+
+    http://www.gimpel.com/html/pcl.htm
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                           *'g:syntastic_pc_lint_config_file'*
+Type: string
+Default: "options.lnt"
+Name of an indirect (.lnt) file. A file with that name is looked up in the
+current directory and in parent directories; first such file found is used.
+
+See also: |syntastic-cpp-pc_lint|.
+
+------------------------------------------------------------------------------
+10. Sparse                                                *syntastic-c-sparse*
+
+Name:        sparse
+Maintainer:  Daniel Walker <dwalker@fifo99.com>
+
+"Sparse" is a semantic parser for C, see the official wiki for details:
+
+    https://sparse.wiki.kernel.org/index.php/Main_Page
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                            *'g:syntastic_sparse_config_file'*
+Type: string
+Default: ".syntastic_sparse_config"
+File containing compilation flags (such as defines or include directories),
+one option per line (cf. |syntastic-config-files|).
+
+Notes~
+
+If you use "Sparse" with "GCC" you probably want to add something like this to
+your vimrc: >
+    let g:syntastic_c_sparse_post_args="-gcc-base-dir " .
+        \ system("gcc -v 2>&1 | sed -n '/^Reading specs/ { s#.* /#/#; s#/[^/]*$##; p; }'")
+<
+This allows "Sparse" to read "GCC"'s private include files.
+
+------------------------------------------------------------------------------
+11. Splint                                                *syntastic-c-splint*
+
+Name:        splint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Splint" is a tool for statically checking C programs for security
+vulnerabilities, see the project's page for details:
+
+    http://www.splint.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                            *'g:syntastic_splint_config_file'*
+Type: string
+Default: ".syntastic_splint_config"
+File containing project-specific options to be passed to "Splint"
+(such as defines or include directories), one option per line (cf.
+|syntastic-config-files|).
+
+==============================================================================
+SYNTAX CHECKERS FOR C#                                 *syntastic-checkers-cs*
+
+The following checkers are available for C# (filetype "cs"):
+
+    1. mcs......................|syntastic-cs-mcs|
+
+------------------------------------------------------------------------------
+1. mcs                                                      *syntastic-cs-mcs*
+
+Name:        mcs
+Maintainer:  Daniel Walker <dwalker@fifo99.com>
+
+"mcs" is a compiler for C# from the "Mono" project
+(http://www.mono-project.com/Main_Page). See the program's manual for details:
+
+    http://mono.wikia.com/wiki/Man_mcs
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR C++                               *syntastic-checkers-cpp*
+
+The following checkers are available for C++ (filetype "cpp"):
+
+    1. AVR-GCC..................|syntastic-cpp-avrgcc|
+    2. ClangCheck...............|syntastic-cpp-clang_check|
+    3. Clang-Tidy...............|syntastic-cpp-clang_tidy|
+    4. Cppcheck.................|syntastic-cpp-cppcheck|
+    5. Cpplint..................|syntastic-cpp-cpplint|
+    6. GCC......................|syntastic-cpp-gcc|
+    7. OClint...................|syntastic-cpp-oclint|
+    8. PC-Lint..................|syntastic-cpp-pc_lint|
+    9. Vera++...................|syntastic-cpp-verapp|
+
+------------------------------------------------------------------------------
+1. AVR-GCC                                              *syntastic-cpp-avrgcc*
+
+Name:        avrgcc
+Maintainer:  SÅ‚awek Piotrowski <sentinel@atteo.com>
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                            'g:syntastic_avrgcc_config_file'
+Type: string
+Default: ".syntastic_avrgcc_config"
+File containing compilation flags (such as defines or include directories),
+one option per line (cf. |syntastic-config-files|).
+
+See also: |syntastic-c-avrgcc|.
+
+------------------------------------------------------------------------------
+2. ClangCheck                                      *syntastic-cpp-clang_check*
+
+Name:        clang_check
+Maintainer:  Benjamin Bannier <bbannier@gmail.com>
+
+"ClangCheck" is a wrapper around Clang's "LibTooling"
+(http://clang.llvm.org/docs/LibTooling.html). See the official page for
+details:
+
+    http://clang.llvm.org/docs/ClangCheck.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                       'g:syntastic_clang_check_config_file'
+Type: string
+Default: ".syntastic_clang_check_config"
+file containing compilation flags (such as defines or include directories),
+one option per line (cf. |syntastic-config-files|).
+
+Note~
+
+By default you can set "ClangCheck" parameters in
+'g:syntastic_cpp_clang_check_args', and compilation parameters (defines,
+optimisation flags, etc.) in the configuration file.
+
+However, if you want "ClangCheck" to use compilation databases
+(http://clang.llvm.org/docs/JSONCompilationDatabase.html) -- perhaps
+generated by "CMake" (https://github.com/rizsotto/Bear) or "Build EAR"
+(https://github.com/rizsotto/Bear) -- rather than pass compilation flags
+explicitly, set 'g:syntastic_cpp_clang_check_post_args' to an empty string: >
+    let g:syntastic_cpp_clang_check_post_args = ""
+<
+Configuration files pointed to by 'g:syntastic_clang_check_config_file' are
+then ignored.
+
+See also: |syntastic-c-clang_check|.
+
+------------------------------------------------------------------------------
+3. Clang-Tidy                                       *syntastic-cpp-clang_tidy*
+
+Name:        clang_tidy
+Maintainer:  Benjamin Bannier <bbannier@gmail.com>
+
+"Clang-Tidy" is a lint tool based on "Clang" (http://clang.llvm.org/). See
+the project's page for details:
+
+    http://clang.llvm.org/extra/clang-tidy.html
+
+Installation~
+
+"Clang-Tidy" is part of the "Clang" (http://clang.llvm.org/) project, but it
+isn't built by default. You need to enable compilation of the "Extra Clang
+Tools" (http://clang.llvm.org/docs/ClangTools.html#extra-clang-tools) to get
+it. See the build tutorial for details:
+
+    http://clang.llvm.org/docs/LibASTMatchersTutorial.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                        'g:syntastic_clang_tidy_config_file'
+Type: string
+Default: ".syntastic_clang_tidy_config"
+File containing compilation flags (such as defines or include directories),
+one option per line (cf. |syntastic-config-files|).
+
+Note~
+
+By default you can set "ClangTidy" parameters in
+'g:syntastic_ppc_clang_tidy_args', and compilation parameters (defines,
+optimisation flags, etc.) in the configuration file.
+
+If you want "ClangTidy" to use compilation databases
+(http://clang.llvm.org/docs/JSONCompilationDatabase.html) --
+perhaps generated by "CMake" (http://cmake.org/) or "Build EAR"
+(https://github.com/rizsotto/Bear) -- rather than pass compilation flags
+explicitly, set 'g:syntastic_cpp_clang_tidy_post_args' to an empty string: >
+    let g:syntastic_cpp_clang_tidy_post_args = ""
+<
+Configuration files pointed to by 'g:syntastic_clang_tidy_config_file' are
+then ignored.
+
+See also: |syntastic-c-clang_tidy|.
+
+------------------------------------------------------------------------------
+4. Cppcheck                                           *syntastic-cpp-cppcheck*
+
+Name:        cppcheck
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Cppcheck" is a static analysis tool for C/C++ code. See the project's page
+for details:
+
+    http://cppcheck.sourceforge.net/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                          'g:syntastic_cppcheck_config_file'
+Type: string
+Default: ".syntastic_cppcheck_config"
+File containing compilation flags (such as defines or include directories),
+one option per line (cf. |syntastic-config-files|).
+
+See also: |syntastic-c-cppcheck|.
+
+------------------------------------------------------------------------------
+5. Cpplint                                             *syntastic-cpp-cpplint*
+
+Name:        cpplint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+For details about "Cpplint" see the project's page:
+
+    https://code.google.com/p/google-styleguide/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                             *'g:syntastic_cpp_cpplint_thres'*
+Type: integer
+Default: 5
+Error threshold. Policy violations with a severity above this value are
+highlighted as errors, the others are considered warnings by syntastic.
+
+                                              *'g:syntastic_cpp_cpplint_args'*
+Type: string
+Default: "--verbose=3"
+Command line options to pass to "Cpplint"
+
+Note~
+
+By default syntastic expects the "cpplint" script to be named "cpplint.py".
+However, if your "cpplint" was installed with "pip", the script's name is
+"cpplint", and you need to set 'g:syntastic_cpp_cpplint_exec' accordingly:
+>
+    let g:syntastic_cpp_cpplint_exec = "cpplint"
+<
+------------------------------------------------------------------------------
+6. GCC                                                     *syntastic-cpp-gcc*
+
+Name:        gcc
+Maintainer:  Gregor Uhlenheuer <kongo2002@gmail.com>
+
+Checker options~
+                                                  *'g:syntastic_cpp_compiler'*
+Type: string
+Default: "g++", or "clang++" if GCC is not found
+Compiler executable.
+
+                                               *'g:syntastic_cpp_errorformat'*
+Type: string
+Default: unset
+Override for the default |'errorformat'|.
+
+                                     *'g:syntastic_cpp_remove_include_errors'*
+Type: boolean
+Default: 0
+By default, errors in files included from the file being checked are shown.
+Set this variable to 1 to remove messages about errors in included files.
+Please note that this means syntastic will silently abort checks if there are
+fatal errors in one of the included files.
+
+                                          *'g:syntastic_cpp_compiler_options'*
+Type: string
+Default: unset
+Compilation flags (such as defines or include directories) to be passed to the
+checker.
+
+                                               *'g:syntastic_cpp_config_file'*
+Type: string
+Default: ".syntastic_cpp_config"
+File containing additional compilation flags to be passed to the checker, one
+option per line (cf. |syntastic-config-files|).
+
+                                              *'g:syntastic_cpp_include_dirs'*
+Type: array of strings
+Default: []
+Include directories to be passed to the checker, in addition to the above
+compilation flags. You can set it to something like this: >
+    let g:syntastic_cpp_include_dirs = ["includes", "headers"]
+>
+and the corresponding "-Iincludes -Iheaders" will be added to the compilation
+flags.
+
+                                   *'g:syntastic_cpp_no_default_include_dirs'*
+Type: boolean
+Default: 0
+By default syntastic adds a number of common include directories to the
+compilation flags, namely: >
+    -I. -I.. -Iinclude -Iincludes -I../include -I../includes
+<
+You can disable this behaviour by setting the above variable to 1.
+
+                                         *'g:syntastic_cpp_no_include_search'*
+Type: boolean
+Default: 0
+By default syntastic looks at the first 100 lines of the file being checked,
+and tries to determine if it needs to include headers for some common
+libraries, such as "GLib" or "Gtk". It then tries to add the corresponding
+include directories to the compilation flags. You can disable this behaviour
+by setting the above variable to 1.
+
+                                     *'g:syntastic_cpp_auto_refresh_includes'*
+Type: boolean
+Default: 0
+Used only if "g:syntastic_cpp_no_include_search" is set to a false value.
+By default syntastic searches for common libraries only the first time the
+current file is checked. Setting the above variable to 1 instructs syntastic
+to refresh the list of common libraries every time the current file is
+checked. You can also force a refresh even when the above variable is 0, by
+`:unlet`-ing the buffer variable 'b:syntastic_cpp_includes'.
+
+                                                    *'b:syntastic_cpp_cflags'*
+Type: string
+Default: unset
+Buffer-local variable. When set, no search for common libraries is performed,
+and the contents of the variable are added to the compilation flags.
+
+                                              *'g:syntastic_cpp_check_header'*
+Type: boolean
+Default: 0
+If the current file is a header (namely if its extension is "h", "hpp", or
+"hh"), all checks are silently skipped. You can force syntastic to check
+header files by setting the above variable to 1.
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_cpp_gcc_<option>' variables. The only exception is
+'g:syntastic_cpp_gcc_exec', which can still be used to override the checker's
+executable.
+
+See also: |syntastic-c-gcc|.
+
+------------------------------------------------------------------------------
+7. OClint                                               *syntastic-cpp-oclint*
+
+Name:        oclint
+Maintainer:  "UnCO" Lin <undercooled@lavabit.com>
+
+"OClint" is a static code analysis tool. See the project's page for details:
+
+    http://oclint.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                            'g:syntastic_oclint_config_file'
+Type: string
+Default: ".syntastic_oclint_config"
+File containing compilation flags (such as defines or include directories),
+one option per line (cf. |syntastic-config-files|).
+
+Notes~
+
+By default you can set "OClint" parameters in 'g:syntastic_cpp_oclint_args',
+and compilation parameters (defines, optimisation flags, etc.) in the config
+file.
+
+If you want "OClint" to use "Clang"-style compilation databases
+(http://clang.llvm.org/docs/JSONCompilationDatabase.html) --
+perhaps generated by "CMake" (http://cmake.org/) or "Build EAR"
+(https://github.com/rizsotto/Bear) -- rather than pass compilation flags
+explicitly, set 'g:syntastic_c_oclint_post_args' to an empty string: >
+    let g:syntastic_cpp_oclint_post_args = ""
+<
+Config files pointed to by 'g:syntastic_oclint_config_file' are then ignored.
+
+See also: |syntastic-c-oclint|.
+
+------------------------------------------------------------------------------
+8. PC-Lint                                             *syntastic-cpp-pc_lint*
+
+Name:        pc_lint
+Maintainer:  Steve Bragg <steve@empresseffects.com>
+
+"PC-Lint" is a commercial static code analysis tool for Windows, produced
+by "Gimpel Software" (http://www.gimpel.com/). See the project's page for
+details:
+
+    http://www.gimpel.com/html/pcl.htm
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                           'g:syntastic_pc_lint_config_file'
+Type: string
+Default: "options.lnt"
+Name of an indirect (.lnt) file. A file with that name is looked up in the
+current directory and in parent directories; first such file found is used.
+
+See also: |syntastic-c-pc_lint|.
+
+------------------------------------------------------------------------------
+9. Vera++                                               *syntastic-cpp-verapp*
+
+Name:        verapp
+Maintainer:  Lucas Verney <phyks@phyks.me>
+
+"Vera++" is a programmable tool for verification, analysis and transformation
+of C++ source code. See the project's page for details:
+
+    https://bitbucket.org/verateam/vera/wiki/Home
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                            *'g:syntastic_verapp_config_file'*
+Type: string
+Default: ".syntastic_verapp_config"
+File containing additional compilation flags to be passed to the checker, one
+option per line (cf. |syntastic-config-files|).
+
+==============================================================================
+SYNTAX CHECKERS FOR CABAL                           *syntastic-checkers-cabal*
+
+The following checkers are available for Cabal (filetype "cabal"):
+
+    1. Cabal....................|syntastic-cabal-cabal|
+
+------------------------------------------------------------------------------
+1. Cabal                                               *syntastic-cabal-cabal*
+
+Name:        cabal
+Maintainer:  Ian D. Bollinger <ian.bollinger@gmail.com>
+
+This checker runs "cabal check" against Haskell Cabal package descriptions.
+See the project's page for more information:
+
+    http://www.haskell.org/cabal/
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_cabal_cabal_<option>' variables. The only exception
+is 'g:syntastic_cabal_cabal_exec', which can still be used to override the
+checker's executable.
+
+==============================================================================
+SYNTAX CHECKERS FOR CHEF                             *syntastic-checkers-chef*
+
+The following checkers are available for Chef (filetype "chef"):
+
+    1. Foodcritic...............|syntastic-chef-foodcritic|
+
+------------------------------------------------------------------------------
+1. Foodcritic                                      *syntastic-chef-foodcritic*
+
+Name:        foodcritic
+Maintainer:  Doug Ireton
+
+"Foodcritic" is a linter for "Chef" cookbooks (http://www.opscode.com/chef/).
+See the project's page for more information:
+
+    http://acrmp.github.io/foodcritic/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You probably also need a plugin to set |filetype| for Chef files, such as
+"vim-chef":
+
+    https://github.com/dougireton/vim-chef
+
+==============================================================================
+SYNTAX CHECKERS FOR COBOL                           *syntastic-checkers-cobol*
+
+The following checkers are available for COBOL (filetype "cobol"):
+
+    1. OpenCOBOL................|syntastic-cobol-cobc|
+
+------------------------------------------------------------------------------
+1. OpenCOBOL                                            *syntastic-cobol-cobc*
+
+Name:        cobc
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"OpenCOBOL" is a compiler for COBOL. See the project's page for more
+information:
+
+    http://www.opencobol.org/
+
+Checker options~
+                                                *'g:syntastic_cobol_compiler'*
+Type: string
+Default: "cobc"
+Compiler executable.
+
+                                             *'g:syntastic_cobol_errorformat'*
+Type: string
+Default: unset
+Override for the default |'errorformat'|.
+
+                                   *'g:syntastic_cobol_remove_include_errors'*
+Type: boolean
+Default: 0
+By default, errors in files included from the file being checked are shown.
+Set this variable to 1 to remove messages about errors in included files.
+Please note that this means syntastic will silently abort checks if there are
+fatal errors in one of the included files.
+
+                                        *'g:syntastic_cobol_compiler_options'*
+Type: string
+Default: unset
+Compilation flags (such as "-std=cobol2002") to be passed to the checker.
+
+                                             *'g:syntastic_cobol_config_file'*
+Type: string
+Default: ".syntastic_cobol_config"
+File containing additional compilation flags to be passed to the checker, one
+option per line (cf. |syntastic-config-files|).
+
+                                            *'g:syntastic_cobol_include_dirs'*
+Type: array of strings
+Default: []
+Include directories to be passed to the checker, in addition to the above
+compilation flags. You can set it to something like this: >
+    let g:syntastic_cobol_include_dirs = ["includes", "headers"]
+<
+and the corresponding "-Iincludes -Iheaders" will be added to the compilation
+flags.
+
+                                                  *'b:syntastic_cobol_cflags'*
+Type: string
+Default: unset
+Buffer-local variable. Additional compilation flags specific to the current
+buffer.
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_cobol_cobc_<option>' variables. The only exception
+is 'g:syntastic_cobol_cobc_exec', which can still be used to override the
+checker's executable.
+
+==============================================================================
+SYNTAX CHECKERS FOR COCO                               *syntastic-checkers-co*
+
+The following checkers are available for Coco (filetype "co"):
+
+    1. Coco.....................|syntastic-co-coco|
+
+------------------------------------------------------------------------------
+1. Coco                                                    *syntastic-co-coco*
+
+Name:        coco
+Maintainer:  Andrew Kelley <superjoe30@gmail.com>
+
+For details about "Coco" see the project's page:
+
+    https://github.com/satyr/coco/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR COFFEESCRIPT                   *syntastic-checkers-coffee*
+
+The following checkers are available for CoffeeScript (filetype "coffee"):
+
+    1. Coffee...................|syntastic-coffee-coffee|
+    2. CoffeeLint...............|syntastic-coffee-coffeelint|
+
+------------------------------------------------------------------------------
+1. Coffee                                            *syntastic-coffee-coffee*
+
+Name:        coffee
+Maintainer:  Lincoln Stoll <l@lds.li>
+
+"Coffee" is a compiler for CoffeeScript. See the project's page for details:
+
+    http://coffeescript.org/
+
+Syntastic requires "Coffee" version 1.6.2 or later.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. CoffeeLint                                    *syntastic-coffee-coffeelint*
+
+Name:        coffeelint
+Maintainer:  Lincoln Stoll <l@lds.li>
+
+"CoffeeLint" is a style checker for CoffeeScript. See the project's page for
+details:
+
+    http://www.coffeelint.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR COQ                               *syntastic-checkers-coq*
+
+The following checkers are available for Coq (filetype "coq"):
+
+    1. Coqtop...................|syntastic-coq-coqtop|
+
+------------------------------------------------------------------------------
+1. Coqtop                                               *syntastic-coq-coqtop*
+
+Name:        coqtop
+Maintainer:  Matvey Aksenov <matvey.aksenov@gmail.com>
+
+"Coqtop" is the top level interface for Coq. See the project's page for
+details:
+
+    http://coq.inria.fr/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR CSS                               *syntastic-checkers-css*
+
+The following checkers are available for CSS (filetype "css"):
+
+    1. CSSLint..................|syntastic-css-csslint|
+    2. mixedindentlint..........|syntastic-css-mixedindentlint|
+    3. PHP_CodeSniffer..........|syntastic-css-phpcs|
+    4. PrettyCSS................|syntastic-css-prettycss|
+    5. RECESS...................|syntastic-css-recess|
+    6. stylelint................|syntastic-css-stylelint|
+
+------------------------------------------------------------------------------
+1. CSSLint                                             *syntastic-css-csslint*
+
+Name:        csslint
+Maintainer:  Ory Band <oryband@gmail.com>
+
+"CSSLint" is a lint tool for Cascading Stylesheets. See the project's page
+for details:
+
+    http://csslint.net/
+
+Installation~
+
+Install it with "npm": >
+    npm install -g csslint
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. mixedindentlint                             *syntastic-css-mixedindentlint*
+
+Name:        mixedindentlint
+Maintainer:  Payton Swick <payton@foolord.com>
+
+"mixedindentlint" is a general-purpose indentation checker. See the project's
+page at GitHub for more information:
+
+    https://github.com/sirbrillig/mixedindentlint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-javascript-mixedindentlint|, |syntastic-scss-mixedindentlint|.
+
+------------------------------------------------------------------------------
+3. PHP_CodeSniffer                                       *syntastic-css-phpcs*
+
+Name:        phpcs
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"PHP_CodeSniffer" is a style checker for PHP and CSS. See the project's page
+at GitHub for details:
+
+    https://github.com/squizlabs/PHP_CodeSniffer/
+
+Installation~
+
+Install it with: >
+    pear install PHP_CodeSniffer
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+If you're checking files containing tab characters then "PHP_CodeSniffer"'s
+idea of tabstop must match Vim's 'tabstop', otherwise syntastic will highlight
+the errors at shifted positions. By default syntastic does that by adding
+an option "--tab-width=&tabstop" to "PHP_CodeSniffer", but that option
+also instructs "PHP_CodeSniffer" to expand tabs, and some code sniffers
+(f.i. "CakePHP", see https://github.com/cakephp/cakephp-codesniffer) insist on
+indenting lines with tabs. To work around the resulting mess if you're using
+one of these sniffers, set "--tab-width=0" and 'tabstop' to 8: >
+    let g:syntastic_php_phpcs_args = "--tab-width=0"
+    set tabstop=8
+<
+See also: |syntastic-php-phpcs|.
+
+------------------------------------------------------------------------------
+4. PrettyCSS                                         *syntastic-css-prettycss*
+
+Name:        prettycss
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"PrettyCSS" is a beautifier, lint checker, and validator for Cascading
+Stylesheets. For more details see:
+
+PrettyCSS Demo:
+
+    http://fidian.github.io/PrettyCSS/
+
+The project's page at GitHub:
+
+    https://github.com/fidian/PrettyCSS/
+
+Installation~
+
+Install it with: >
+    npm install -g PrettyCSS
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+5. RECESS                                               *syntastic-css-recess*
+
+Name:        recess
+Maintainer:  Tim Carry <tim@pixelastic.com>
+
+"RECESS" is a code quality tool for CSS built on top of LESS. See the
+project's page for details:
+
+    http://twitter.github.io/recess/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-less-recess|.
+
+------------------------------------------------------------------------------
+6. stylelint                                         *syntastic-css-stylelint*
+
+Name:        stylelint
+Maintainer:  Tim Carry <tim@pixelastic.com>
+
+"stylelint" is a style checker for Cascading Stylesheets. See the project's
+page for more information:
+
+    http://stylelint.io/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-scss-stylelint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR CUCUMBER                     *syntastic-checkers-cucumber*
+
+The following checkers are available for Cucumber (filetype "cucumber"):
+
+    1. Cucumber.................|syntastic-cucumber-cucumber|
+
+------------------------------------------------------------------------------
+1. Cucumber                                      *syntastic-cucumber-cucumber*
+
+Name:        cucumber
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"Cucumber" is a tool that executes plain-text functional descriptions as
+automated tests. See the project's page for more information:
+
+    http://cukes.info/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR CUDA                             *syntastic-checkers-cuda*
+
+The following checkers are available for CUDA (filetype "cuda"):
+
+    1. NVCC.....................|syntastic-cuda-nvcc|
+
+------------------------------------------------------------------------------
+1. NVCC                                                  *syntastic-cuda-nvcc*
+
+Name:        nvcc
+Author: Hannes Schulz <schulz@ais.uni-bonn.de>
+
+"NVCC" is a CUDA Compiler from nVidia. See the project's page for details:
+
+    https://developer.nvidia.com/cuda-llvm-compiler
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                             *'g:syntastic_cuda_check_header'*
+Type: boolean
+Default: 0
+Turn this on to check header files.  The checker then creates an empty file
+".syntastic_dummy.cu" in the base directory of the file being checked.
+Example: >
+    let g:syntastic_cuda_check_header = 1
+<
+                                              *'g:syntastic_cuda_config_file'*
+Type: string
+Default: ".syntastic_cuda_config"
+File containing additional compilation flags to be passed to the checker, one
+option per line (cf. |syntastic-config-files|).
+
+==============================================================================
+SYNTAX CHECKERS FOR D                                   *syntastic-checkers-d*
+
+The following checkers are available for D (filetype "d"):
+
+    1. DMD......................|syntastic-d-dmd|
+
+------------------------------------------------------------------------------
+1. DMD                                                       *syntastic-d-dmd*
+
+Name:        dmd
+Maintainer:  Alfredo Di Napoli <alfredo.dinapoli@gmail.com>
+
+Checker options~
+                                                    *'g:syntastic_d_compiler'*
+Type: string
+Default: "dmd"
+Compiler executable.
+
+                                                 *'g:syntastic_d_errorformat'*
+Type: string
+Default: unset
+Override for the default |'errorformat'|.
+
+                                       *'g:syntastic_d_remove_include_errors'*
+Type: boolean
+Default: 0
+By default, errors in files included from the file being checked are shown.
+Set this variable to 1 to remove messages about errors in included files.
+Please note that this means syntastic will silently abort checks if there are
+fatal errors in one of the included files.
+
+                                            *'g:syntastic_d_compiler_options'*
+Type: string
+Default: unset
+Compilation flags (such as defines or include directories) to be passed to the
+checker.
+
+                                                 *'g:syntastic_d_config_file'*
+Type: string
+Default: ".syntastic_d_config"
+File containing additional compilation flags to be passed to the checker, one
+option per line (cf. |syntastic-config-files|).
+
+                                                *'g:syntastic_d_include_dirs'*
+Type: array of strings
+Default: inferred from ".dub/packages"
+Include directories to be passed to the checker, in addition to the above
+compilation flags. You can set it like this: >
+    let g:syntastic_d_include_dirs = ["includes", "headers"]
+<
+and the corresponding "-Iincludes -Iheaders" will be added to the compilation
+flags.
+
+                                                     *'g:syntastic_d_use_dub'*
+Type: boolean
+Default: 1
+Whether to use "dub" to find include directories. This requires "dub" version
+0.9.24 or later.
+
+                                                    *'g:syntastic_d_dub_exec'*
+Type: string
+Default: "dub"
+Path to the "dub" executable. Ignored if |'g:syntastic_d_use_dub'| is unset.
+
+                                                      *'b:syntastic_d_cflags'*
+Type: string
+Default: unset
+Buffer-local variable. Additional compilation flags specific to the current
+buffer.
+
+                                                *'g:syntastic_d_check_header'*
+Type: boolean
+Default: 0
+If the current file is a header (namely if its extension is "di"), all checks
+are silently skipped. You can force syntastic to check header files by setting
+the above variable to 1.
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_d_dmd_<option>' variables. The only exception is
+'g:syntastic_d_dmd_exec', which can still be used to override the checker's
+executable.
+
+==============================================================================
+SYNTAX CHECKERS FOR DART                             *syntastic-checkers-dart*
+
+The following checkers are available for Dart (filetype "dart"):
+
+    1. Analyzer.................|syntastic-dart-dartanalyzer|
+
+------------------------------------------------------------------------------
+1. Analyzer                                      *syntastic-dart-dartanalyzer*
+
+Name:        dartanalyzer
+Maintainer:  Maksim Ryzhikov <rv.maksim@gmail.com>
+
+"Analyzer" is a static analysis tool for Dart (https://www.dartlang.org/).
+See the manual for more information:
+
+    https://www.dartlang.org/tools/analyzer/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR DOCBOOK                         *syntastic-checkers-docbk*
+
+The following checkers are available for DocBook (filetype "docbk"):
+
+    1. Igor.....................|syntastic-docbk-igor|
+    2. xmllint..................|syntastic-docbk-xmllint|
+
+------------------------------------------------------------------------------
+1. Igor                                                 *syntastic-docbk-igor*
+
+Name:        igor
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Igor" is a proofreader for DocBook SGML, man pages, and text files used by
+the FreeBSD project (https://www.freebsd.org/). See the author's presentation
+for details:
+
+    http://www.youtube.com/watch?v=sczHqUPygZY
+
+The latest version can be obtained from Glen Barber's repository:
+
+    http://docscripts.glenbarber.us/tags/igor/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-nroff-igor|, |syntastic-text-igor|.
+
+------------------------------------------------------------------------------
+2. xmllint                                           *syntastic-docbk-xmllint*
+
+Name:        xmllint
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"xmllint" is a checker and transformer tool for XML files, distributed with
+the "libxml" package (http://www.xmlsoft.org/). See the tool's manual for more
+information:
+
+    http://xmlsoft.org/xmllint.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You can use a local installation of DTDs to significantly speed up validation
+and allow you to validate XML data without network access. See the
+"xmlcatalog" manual, and the catalog documentation for more information:
+
+    http://www.xmlsoft.org/xmlcatalog_man.html
+    http://www.xmlsoft.org/catalog.html
+
+For an example of a DTD catalog see f.i. "XMLCatalog":
+
+    https://github.com/darcyparker/XMLCatalog
+
+In order to use it with syntastic you'll have to clone it to a local
+directory, and point the environment variable "XML_CATALOG_FILES" to the file
+"catalog.xml" in the said directory: >
+    XML_CATALOG_FILES=/some/path/XMLCatalog/catalog.xml
+    export XML_CATALOG_FILES
+<
+Otherwise "xmllint" will try to load XML catalogs from "/etc/xml/catalog".
+
+See also: |syntastic-xml-xmllint|, |syntastic-xslt-xmllint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR DOCKERFILE                 *syntastic-checkers-dockerfile*
+
+The following checkers are available for Dockerfile (filetype "dockerfile"):
+
+    1. dockerfile-lint..........|syntastic-dockerfile-dockerfile_lint|
+
+------------------------------------------------------------------------------
+1. dockerfile-lint                      *syntastic-dockerfile-dockerfile_lint*
+
+Name:        dockerfile_lint
+Maintainer:  Tim Carry <tim@pixelastic.com>
+
+"dockerfile-lint" is a linter for Dockerfiles
+(http://docs.docker.com/engine/reference/builder). See the project's page at
+GitHub for details:
+
+    https://github.com/projectatomic/dockerfile_lint
+
+Installation~
+
+Install it with: >
+    npm install -g dockerfile_lint
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR DUST                           *syntastic-checkers-dustjs*
+
+The following checkers are available for Dust (filetype "dustjs"):
+
+    1. Swiffer..................|syntastic-dustjs-swiffer|
+
+------------------------------------------------------------------------------
+1. Swiffer                                          *syntastic-dustjs-swiffer*
+
+Name:        swiffer
+Maintainer:  Steven Foote <smfoote@gmail.com>
+
+"Swiffer" is a command line lint tool for Dust. See the project's page for
+details:
+
+    https://github.com/smfoote/Swiffer.js
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+To enable Dust syntax checking, you must set the filetype of your Dust
+template files to "dustjs". An easy way to do this is by installing the dustjs
+syntax highlighter:
+
+    https://github.com/jimmyhchan/dustjs.vim
+
+==============================================================================
+SYNTAX CHECKERS FOR ELIXIR                         *syntastic-checkers-elixir*
+
+The following checkers are available for Elixir (filetype "elixir"):
+
+    1. elixir...................|syntastic-elixir-elixir|
+
+------------------------------------------------------------------------------
+1. elixir                                            *syntastic-elixir-elixir*
+
+Name:        elixir
+Maintainer:  Richard Ramsden <rramsden@gmail.com>
+
+See the project's page for details:
+
+    http://elixir-lang.org/
+
+Security~
+
+This checker executes the code in the files it checks:
+
+    https://github.com/vim-syntastic/syntastic/issues/1141
+
+This is probably fine if you wrote the files yourself, but it can be a problem
+if you're trying to check third party files. If you are 100% willing to let
+Vim run the code in your files, set 'g:syntastic_enable_elixir_checker' to 1
+in your vimrc to enable this checker: >
+    let g:syntastic_enable_elixir_checker = 1
+<
+There is also a buffer-local version of this variable, that takes precedence
+over a global one in the buffers where it is defined.
+
+Please note that setting this variable doesn't automatically enable the
+checker, you still need to add "elixir" to 'g:syntastic_elixir_checkers' if
+you plan to use it.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR ERLANG                         *syntastic-checkers-erlang*
+
+The following checkers are available for Erlang (filetype "erlang"):
+
+    1. escript..................|syntastic-erlang-escript|
+    2. SyntaxErl................|syntastic-erlang-syntaxerl|
+
+------------------------------------------------------------------------------
+1. escript                                          *syntastic-erlang-escript*
+
+Name:        escript
+Maintainer:  Pawel Salata <rockplayer.pl@gmail.com>
+
+"escript" is an interpreter for Erlang programs. See the tool's manual for
+more information:
+
+    http://www.erlang.org/doc/man/escript.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+If you get warning: "behaviour X undefined" with your customize behaviour, add
+the following line in your vimrc: >
+    let g:syntastic_erlc_include_path = "ebin"
+<
+
+------------------------------------------------------------------------------
+2. SyntaxErl                                      *syntastic-erlang-syntaxerl*
+
+Name:        syntaxerl
+Maintainer:  locojay
+
+"SyntaxErl" is a syntax checker for Erlang. It uses "rebar"
+(https://github.com/basho/rebar) to determine correct dependencies and library
+paths. See the project's page for more information:
+
+    https://github.com/ten0s/syntaxerl
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR ERUBY                           *syntastic-checkers-eruby*
+
+The following checkers are available for eRuby (filetype "eruby"):
+
+    1. Ruby.....................|syntastic-eruby-ruby|
+
+------------------------------------------------------------------------------
+1. Ruby                                                 *syntastic-eruby-ruby*
+
+Name:        ruby
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+Checker options~
+                                                     'g:syntastic_ruby_exec'
+Type: string
+Default: "ruby"
+The Ruby executable to use.
+
+Note~
+
+The variable 'g:syntastic_ruby_exec' is also used by the Ruby
+"MRI" checker (cf. |syntastic-ruby-mri|), and it can be overriden
+by 'g:syntastic_eruby_ruby_exec'. However, this checker doesn't
+call the "makeprgBuild()" function, and thus it ignores all other
+'g:syntastic_eruby_ruby_<option>' variables.
+
+==============================================================================
+SYNTAX CHECKERS FOR FORTRAN                       *syntastic-checkers-fortran*
+
+The following checkers are available for Fortran (filetype "fortran"):
+
+    1. GNU Fortran..............|syntastic-fortran-gfortran|
+
+------------------------------------------------------------------------------
+1. GNU Fortran                                    *syntastic-fortran-gfortran*
+
+Name:        gfortran
+Maintainer:  Karl Yngve Lervåg <karl.yngve@lervag.net>
+
+"GNU Fortran" is a checker for Fortran files using either GNU
+Fortran (https://gcc.gnu.org/fortran/) or Intel Fortran Compilers
+(https://software.intel.com/en-us/fortran-compilers).
+
+Checker options~
+                                              *'g:syntastic_fortran_compiler'*
+Type: string
+Default: "gfortran"
+Compiler executable. Set this to either "gfortran" (to use GNU Fortran), or to
+"ifort" (for Intel Fortran).
+
+                                           *'g:syntastic_fortran_errorformat'*
+Type: string
+Default: unset
+Override for the default |'errorformat'|.
+
+                                 *'g:syntastic_fortran_remove_include_errors'*
+Type: boolean
+Default: 0
+By default, errors in files included from the file being checked are shown.
+Set this variable to 1 to remove messages about errors in included files.
+Please note that this means syntastic will silently abort checks if there are
+fatal errors in one of the included files.
+
+                                      *'g:syntastic_fortran_compiler_options'*
+Type: string
+Default: unset
+Compilation flags (such as "-std=f95") to be passed to the checker.
+
+                                           *'g:syntastic_fortran_config_file'*
+Type: string
+Default: ".syntastic_fortran_config"
+File containing additional compilation flags to be passed to the checker, one
+option per line (cf. |syntastic-config-files|).
+
+                                          *'g:syntastic_fortran_include_dirs'*
+Type: array of strings
+Default: []
+Include directories to be passed to the checker, in addition to the above
+compilation flags. You can set it like this: >
+    let g:syntastic_fortran_include_dirs = ["includes", "headers"]"
+<
+and the corresponding "-Iincludes -Iheaders" will be added to the compilation
+flags.
+
+                                                *'b:syntastic_fortran_cflags'*
+Type: string
+Default: unset
+Buffer-local variable. Additional compilation flags specific to the current
+buffer.
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_fortran_gfortran_<option>' variables. The only
+exception is 'g:syntastic_fortran_gfortran_exec', which can still be used to
+override the checker's executable.
+
+==============================================================================
+SYNTAX CHECKERS FOR GENTOO METADATA                *syntastic-checkers-gentoo*
+
+The following checkers are available for Gentoo Metadata (filetype "gentoo"):
+
+    1. xmllint..................|syntastic-gentoo-xmllint|
+
+------------------------------------------------------------------------------
+1. xmllint                                          *syntastic-gentoo-xmllint*
+
+Name:        xmllint
+Maintainer:  James Rowe <jnrowe@gmail.com>
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+The DTDs required to validate "metadata.xml" files are available in
+"$PORTDIR/metadata/dtd", and these local files can be used to significantly
+speed up validation. You can create a catalog file with: >
+    xmlcatalog --create --add rewriteURI http://www.gentoo.org/dtd/ \
+        ${PORTDIR:-/usr/portage}/metadata/dtd/ /etc/xml/gentoo
+<
+See "xmlcatalog" for more information:
+
+    http://www.xmlsoft.org/catalog.html
+
+==============================================================================
+SYNTAX CHECKERS FOR GETTEXT PO                         *syntastic-checkers-po*
+
+The following checkers are available for gettext .po files (filetype "po"):
+
+    1. msgfmt...................|syntastic-po-msgfmt|
+
+------------------------------------------------------------------------------
+1. msgfmt                                                *syntastic-po-msgfmt*
+
+Name:        msgfmt
+Maintainer:  Ryo Okubo <syucream1031@gmail.com>
+
+"msgfmt" is a compiler for gettext Portable Object
+(http://www.gnu.org/software/gettext/manual/html_node/PO-Files.html)
+translation files.  See the program's manual for details:
+
+    http://www.gnu.org/software/gettext/manual/html_node/msgfmt-Invocation.html#msgfmt-Invocation
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR GLSL                             *syntastic-checkers-glsl*
+
+The following checkers are available for GLSL (filetype "glsl"):
+
+    1. cgc......................|syntastic-glsl-cgc|
+
+------------------------------------------------------------------------------
+1. cgc                                                    *syntastic-glsl-cgc*
+
+Name:        cgc
+Maintainer:  Joshua Rahm <joshuarahm@gmail.com>
+
+"cgc" is a compiler that translates Cg or GLSL programs into OpenGL or DirectX
+code. See the manual for more details:
+
+    http://http.developer.nvidia.com/Cg/cgc.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                               *'g:syntastic_glsl_extensions'*
+Type: dictionary
+Default: unset
+
+You can control the profiles used by "cgc" with magic comments: put the magic
+comment "// profile:" followed by the profile for "cgc" to use.  For example
+use >
+    // profile: glslf
+<
+to force the fragment shader profile.
+
+If the magic comment does not exist, then the dictionary
+'g:syntastic_glsl_extensions' is used to infer the appropriate profile from
+the current file's extension. If this dictionary does not exist either, a
+default dictionary is used instead. Finally, if the current file's extension
+cannot be found in these dictionaries, the checker assumes a vertex shader
+profile.
+
+                                                  *'g:syntastic_glsl_options'*
+Type: string
+Default: unset
+Additional arguments to pass to "cgc".
+
+Note~
+
+You probably also need a plugin to set |filetype| for OpenGL files, such as
+"vim-glsl":
+
+    https://github.com/tikhomirov/vim-glsl
+
+==============================================================================
+SYNTAX CHECKERS FOR GO                                 *syntastic-checkers-go*
+
+The following checkers are available for Go (filetype "go"):
+
+    1. go.......................|syntastic-go-go|
+    2. gofmt....................|syntastic-go-gofmt|
+    3. Golint...................|syntastic-go-golint|
+    4. Go Meta Linter...........|syntastic-go-gometalinter|
+    5. gotype...................|syntastic-go-gotype|
+    6. vet......................|syntastic-go-govet|
+
+------------------------------------------------------------------------------
+1. go                                                        *syntastic-go-go*
+
+Name:        go
+Maintainer:  Kamil Kisiel <kamil@kamilkisiel.net>
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                              *'g:syntastic_go_go_build_args'*
+Type: string
+Default: "-buildmode=archive"
+arguments passed to "go build"
+
+                                               *'g:syntastic_go_go_test_args'*
+Type: string
+Default: "-buildmode=archive"
+arguments passed to "go test".
+
+Note~
+
+This syntax checker does not reformat your source code.  Use a |BufWritePre|
+autocommand towards that end: >
+    autocmd FileType go autocmd BufWritePre <buffer> Fmt
+<
+------------------------------------------------------------------------------
+2. gofmt                                                  *syntastic-go-gofmt*
+
+Name:        gofmt
+Maintainer:  Brandon Thomson <bt@brandonthomson.com>
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+This syntax checker does not reformat your source code.  Use a |BufWritePre|
+autocommand towards that end: >
+    autocmd FileType go autocmd BufWritePre <buffer> Fmt
+<
+------------------------------------------------------------------------------
+3. Golint                                                *syntastic-go-golint*
+
+Name:        golint
+Maintainer: Hiroshi Ioka <hirochachacha@gmail.com>
+
+"Golint" is a linter for Go. See the project's page for details:
+
+    https://github.com/golang/lint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+4. Go Meta Linter                                  *syntastic-go-gometalinter*
+
+Name:        gometalinter
+Maintainer: Joshua Rubin <joshua@rubixconsulting.com>
+
+"Go Meta Linter" is a linter for Go. It runs a number of other linters
+against your files, and normalises their output to a standard format.
+See the project's page at GitHub for details:
+
+    https://github.com/alecthomas/gometalinter
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+5. gotype                                                *syntastic-go-gotype*
+
+Name:        gotype
+Maintainer:  luz <ne.tetewi@gmail.com>
+
+See the tool's documentation for details:
+
+    https://godoc.org/golang.org/x/tools/cmd/gotype
+
+------------------------------------------------------------------------------
+6. vet                                                    *syntastic-go-govet*
+
+Name:        govet
+Maintainer:  Kamil Kisiel <kamil@kamilkisiel.net>
+
+See the tool's documentation for details:
+
+    https://godoc.org/cmd/vet
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_go_govet_<option>' variables.
+
+==============================================================================
+SYNTAX CHECKERS FOR HAML                             *syntastic-checkers-haml*
+
+The following checkers are available for Haml (filetype "haml"):
+
+    1. Haml.....................|syntastic-haml-haml|
+    2. HAML-Lint................|syntastic-haml-haml_lint|
+
+------------------------------------------------------------------------------
+1. Haml                                                  *syntastic-haml-haml*
+
+Name:        haml
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+See the project's page for details:
+
+    http://haml.info/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. HAML-Lint                                        *syntastic-haml-haml_lint*
+
+Name:        haml_lint
+Maintainer:  Shane da Silva <shane@dasilva.io>
+
+"HAML-Lint" is a checker for HAML files. See the project's page for details:
+
+    https://github.com/causes/haml-lint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR HANDLEBARS                 *syntastic-checkers-handlebars*
+
+The following checkers are available for Handlebars (filetype "handlebars"):
+
+    1. Handlebars...............|syntastic-handlebars-handlebars|
+
+------------------------------------------------------------------------------
+1. Handlebars                                *syntastic-handlebars-handlebars*
+
+Name:        handlebars
+Maintainer:  Jeremy Mack
+
+"Handlebars" is a JavaScript library for building semantic templates. See the
+project's page for details:
+
+    http://handlebarsjs.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You probably also need a plugin to set |filetype| for Handlebars files, such as
+"vim-mustache-handlebars":
+
+    https://github.com/mustache/vim-mustache-handlebars
+
+==============================================================================
+SYNTAX CHECKERS FOR HASKELL                       *syntastic-checkers-haskell*
+
+The following checkers are available for Haskell (filetype "haskell"):
+
+    1. hdevtools................|syntastic-haskell-hdevtools|
+    2. HLint....................|syntastic-haskell-hlint|
+    3. Style scanner............|syntastic-haskell-scan|
+
+------------------------------------------------------------------------------
+1. hdevtools                                     *syntastic-haskell-hdevtools*
+
+Name:        hdevtools
+Maintainer:  Anthony Carapetis <anthony.carapetis@gmail.com>
+
+"hdevtools" is a backend for text editor plugins. See the project's page at
+GitHub for details:
+
+    https://github.com/bitc/hdevtools/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+If you're checking files containing tab characters, then Vim's 'tabstop'
+must match "hdevtools"'s idea of tabstop, otherwise column numbers will be
+shifted. At the time of this writing, "hdevtools"'s tabstop is hardcoded to 8,
+so you should probably add something like this to your vimrc: >
+    set tabstop=8
+<
+------------------------------------------------------------------------------
+2. HLint                                             *syntastic-haskell-hlint*
+
+Name:        hlint
+Maintainer:  Nicolas Wu <nicolas.wu@gmail.com>
+
+"HLint" is a linter and style checker for Haskell. See the project's page for
+details:
+
+    http://community.haskell.org/~ndm/hlint/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+If you're checking files containing tab characters, Vim's 'tabstop' must
+match "HLint"'s idea of tabstop, otherwise column numbers will be shifted. At
+the time of this writing "HLint"'s tabstop is hardcoded to 8, so you should
+probably add something like this to your vimrc: >
+    set tabstop=8
+<
+------------------------------------------------------------------------------
+3. Style scanner                                      *syntastic-haskell-scan*
+
+Name:        scan
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Style scanner" is a style checker for Haskell. See the project's page for
+details:
+
+    http://projects.haskell.org/style-scanner/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+If you're checking files containing tab characters, Vim's 'tabstop' must
+match "Style scanner"'s idea of tabstop, otherwise column numbers will be
+shifted. At the time of this writing "Style scanner"'s tabstop is hardcoded to
+8, so you should probably add something like this to your vimrc: >
+    set tabstop=8
+<
+==============================================================================
+SYNTAX CHECKERS FOR HAXE                             *syntastic-checkers-haxe*
+
+The following checkers are available for Haxe (filetype "haxe"):
+
+    1. Haxe.....................|syntastic-haxe-haxe|
+
+------------------------------------------------------------------------------
+1. Haxe                                                  *syntastic-haxe-haxe*
+
+Name:        haxe
+Maintainer:  David Bernard <david.bernard.31@gmail.com>
+
+"Haxe" is a programming language and compiler that can produce applications
+and source code for multiple different platforms from a single code-base. See
+the project's page for details:
+
+    http://haxe.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                                               *'g:vaxe_hxml'*
+                                                               *'b:vaxe_hxml'*
+Type: string
+Default: unset
+By default the checker will search parent folders for "hxml" files, and
+use the first one it finds. You can override that behaviour by pointing
+'g:vaxe_hxml' or 'b:vaxe_hxml' to a specific build file. Those variables can
+also be set by Vaxe:
+
+    https://github.com/jdonaldson/vaxe
+
+==============================================================================
+SYNTAX CHECKERS FOR HSS                               *syntastic-checkers-hss*
+
+The following checkers are available for HSS (filetype "hss"):
+
+    1. HSS......................|syntastic-hss-hss|
+
+------------------------------------------------------------------------------
+1. HSS                                                     *syntastic-hss-hss*
+
+Name:        hss
+Maintainer:  Justin Donaldson <jdonaldson@gmail.com>
+
+"HSS" is a tool that extends the CSS syntax with features such as variables
+and nested blocks. See the project's page for details:
+
+    http://ncannasse.fr/projects/hss
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR HTML                             *syntastic-checkers-html*
+
+The following checkers are available for HTML (filetype "html"):
+
+    1. ESLint...................|syntastic-html-eslint|
+    2. gjslint..................|syntastic-html-gjslint|
+    3. HTML tidy................|syntastic-html-tidy|
+    4. HTMLHint.................|syntastic-html-htmlhint|
+    5. JSHint...................|syntastic-html-jshint|
+    6. proselint................|syntastic-html-proselint|
+    7. textlint.................|syntastic-html-textlint|
+    8. Validator................|syntastic-html-validator|
+    9. W3.......................|syntastic-html-w3|
+
+------------------------------------------------------------------------------
+1. ESLint                                              *syntastic-html-eslint*
+
+Name:        eslint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"ESLint" is a tool for identifying and reporting on patterns found in
+ECMAScript/JavaScript code. It can also detect problems in JavaScript code
+embedded in HTML files. See the project's page for details:
+
+    https://github.com/nzakas/eslint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You can also use "eslint_d" (https://github.com/mantoni/eslint_d.js), version
+2.1.0 or later, instead of "ESLint". Just point 'g:syntastic_html_eslint_exec'
+to it:
+
+    https://github.com/mantoni/eslint_d.js#editor-integration
+
+See also: |syntastic-javascript-eslint|, |syntastic-typescript-eslint|.
+
+------------------------------------------------------------------------------
+2. gjslint                                            *syntastic-html-gjslint*
+
+Name:        gjslint
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"Closure Linter", or "gjslint", is a style checker for JavaScript. It can also
+detect problems in HTML files. See the project's page for more information:
+
+    https://developers.google.com/closure/utilities/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-javascript-gjslint|.
+
+------------------------------------------------------------------------------
+3. HTML tidy                                             *syntastic-html-tidy*
+
+Name:        tidy
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"HTML Tidy" is a syntax checker and formatter for HTML. See the project's page
+for more information:
+
+    http://www.html-tidy.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                       *'g:syntastic_html_tidy_ignore_errors'*
+Type: array of strings
+Default: []
+List of errors to ignore. Case-sensitive patterns matched as substrings
+(not regular expressions) against the error messages. See also
+|'syntastic_quiet_messages'|.
+
+                                     *'g:syntastic_html_tidy_blocklevel_tags'*
+Type: array of strings
+Default: []
+List of additional blocklevel tags to be added to "--new-blocklevel-tags".
+
+                                         *'g:syntastic_html_tidy_inline_tags'*
+Type: array of strings
+Default: []
+List of additional inline tags to be added to "--new-inline-tags".
+
+                                          *'g:syntastic_html_tidy_empty_tags'*
+Type: array of strings
+Default: []
+List of additional empty tags, to be added to "--new-empty-tags".
+
+See also: |syntastic-xhtml-tidy|.
+
+------------------------------------------------------------------------------
+4. HTMLHint                                          *syntastic-html-htmlhint*
+
+Name:        HTMLHint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"JSHint" is a static code analysis tool for HTML. See the project's page for
+details:
+
+    http://htmlhint.com/
+
+Syntastic requires "HTMLHint" version 0.9.13 or later.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+5. jshint                                              *syntastic-html-jshint*
+
+Name:        JSHint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"JSHint" can detect JavaScript errors and potential problems in HTML
+files. See the project's page for details:
+
+    http://jshint.com/
+
+Syntastic requires "JSHint" version 2.4.0 or later.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+If you're checking files containing tab characters then "JSHint"'s idea of
+tabstop must match Vim's 'tabstop', otherwise syntastic will highlight the
+errors at shifted positions. By default "JSHint"'s tabstop is 4, while Vim's
+default 'tabstop' is 8.
+
+In order to change "JSHint"'s tabstop you have to change its "indent" config
+option (cf. http://jshint.com/docs/options/#indent). One way to do that is
+to put it in a file named ".jshintrc" in the current directory, the parent
+directories, or your home directory. The file is supposed to be in JSON
+format. For example: >
+    {
+        "indent": 8
+    }
+<
+See JSHint documentation for more details:
+
+    http://jshint.com/docs/
+
+Please note however that setting "indent" also triggers the indentation checks
+in "JSHint". If that is undesirable, your only other option is to leave
+"JSHint"'s tabstop alone, and change Vim's 'tabstop' to 4. To change Vim's
+'tabstop', you can add this to your vimrc: >
+    set tabstop=4
+<
+See also: |syntastic-javascript-jshint|, |syntastic-xhtml-jshint|.
+
+------------------------------------------------------------------------------
+6. proselint                                        *syntastic-html-proselint*
+
+Name:        proselint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"proselint" is a linter for prose. See the page for details:
+
+    http://proselint.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-asciidoc-proselint|, |syntastic-help-proselint|,
+|syntastic-markdown-proselint|, |syntastic-nroff-proselint|,
+|syntastic-pod-proselint|, |syntastic-rst-proselint|,
+|syntastic-tex-proselint|, |syntastic-texinfo-proselint|,
+|syntastic-text-proselint|, |syntastic-xhtml-proselint|.
+
+------------------------------------------------------------------------------
+7. textlint                                          *syntastic-html-textlint*
+
+Name:        textlint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"textlint" is a natural language linter for text, Markdown, and HTML files.
+See the project's page for details:
+
+    https://textlint.github.io/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You need to install both "textlint" and the "textlint HTML" plugin for this to
+work:
+
+    https://github.com/textlint/textlint-plugin-html
+
+See also: |syntastic-markdown-textlint|, |syntastic-text-textlint|.
+
+------------------------------------------------------------------------------
+8. Validator                                        *syntastic-html-validator*
+
+Name:        validator
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Validator" is a non-DTD-based HTML checker.  See the project's page for
+details:
+
+    http://validator.github.io/validator/
+
+As a syntastic checker, you can validate your files against the online service
+(see https://validator.nu/), or you can install "vnu.jar":
+
+    https://github.com/validator/validator/releases/latest
+
+then run it as a HTTP server: >
+    $ java -Xss512k -cp /path/to/vnu.jar nu.validator.servlet.Main 8888
+<
+Requirement~
+
+This checker uses cURL:
+
+    http://curl.haxx.se/
+
+Checker options~
+
+                                            *'g:syntastic_html_validator_api'*
+Type: string
+Default: "http://validator.nu/"
+URL of the service to use for checking. Leave it to the default to run the
+checks against "https://validator.nu/", or set it to "http://localhost:8888/"
+if you have "vnu.jar" installed, and you're running it as a standalone HTTP
+server. See:
+
+    http://validator.github.io/validator/#standalone
+
+                                         *'g:syntastic_html_validator_parser'*
+Type: string
+Default: empty
+Parser to use. Legal values are: "xml", "xmldtd", "html", "html5", "html4",
+and "html4tr". Set it to "html5" to check HTML5 files. References:
+
+    https://wiki.whatwg.org/wiki/Validator.nu_Common_Input_Parameters#parser
+
+                                       *'g:syntastic_html_validator_nsfilter'*
+Type: string
+Default: empty
+Sets the "nsfilter" for the parser. See:
+
+    https://wiki.whatwg.org/wiki/Validator.nu_Common_Input_Parameters#nsfilter
+
+                                           *'g:syntastic_html_validator_exec'*
+Type: string
+Default: "curl"
+Path to the "cURL" executable. Override it with a full path if your "cURL" is
+not installed in a standard location.
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_html_validator_<option>' variables. The only exception
+is 'g:syntastic_html_validator_exec', which can be used to override the path
+to the "cURL" executable.
+
+Note~
+
+Non-zero exit codes from "cURL" are typically network errors, and are signaled
+by syntastic with messages such as: >
+    syntastic: error: checker html/validator returned abnormal status 26
+<
+You can lookup the meaning of these codes in cURL's manual:
+    
+    http://curl.haxx.se/docs/manpage.html#EXIT
+
+------------------------------------------------------------------------------
+9. W3                                                      *syntastic-html-w3*
+
+Name:        w3
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"W3" is the W3C Markup Validator for HTML.  See the project's page for
+details:
+
+    https://validator.w3.org/source/
+
+As a syntastic checker, you can validate your files against the online service
+(see http://validator.w3.org/), or you can install it from sources and run it
+as a local service:
+
+    https://github.com/w3c/markup-validator/
+
+Requirement~
+
+This checker uses cURL:
+
+    http://curl.haxx.se/
+
+Checker options~
+
+                                                   *'g:syntastic_html_w3_api'*
+Type: string
+Default: "http://validator.w3.org/check"
+URL of the service to use for checking. Leave it to the default to
+run the checks against "http://validator.w3.org/", or set it to
+"http://localhost/w3c-validator/check" if you're running a local service.
+
+                                                  *'g:syntastic_html_w3_exec'*
+Type: string
+Default: "curl"
+Path to the "cURL" executable. Override it with a full path if your "cURL" is
+not installed in a standard location.
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_html_w3_<option>' variables. The only exception is
+'g:syntastic_html_w3_exec', which can be used to override the path to the
+"cURL" executable.
+
+Note~
+
+Non-zero exit codes from "cURL" are typically network errors, and are signaled
+by syntastic with messages such as: >
+    syntastic: error: checker html/validator returned abnormal status 26
+<
+You can lookup the meaning of these codes in cURL's manual:
+    
+    http://curl.haxx.se/docs/manpage.html#EXIT
+
+==============================================================================
+SYNTAX CHECKERS FOR JAVA                             *syntastic-checkers-java*
+
+The following checkers are available for Java (filetype "java"):
+
+    1. checkstyle...............|syntastic-java-checkstyle|
+    2. javac....................|syntastic-java-javac|
+
+------------------------------------------------------------------------------
+1. checkstyle                                      *syntastic-java-checkstyle*
+
+Name:        checkstyle
+Maintainer:  Dmitry Geurkov <d.geurkov@gmail.com>
+
+"Checkstyle" is a style checker for Java.  See the project's page for details:
+
+    http://checkstyle.sourceforge.net/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                     *'g:syntastic_java_checkstyle_classpath'*
+Type: string
+Default: "checkstyle-6.10.1-all.jar"
+Classpath to use. Multiple files are allowed.
+
+                                     *'g:syntastic_java_checkstyle_conf_file'*
+Type: string
+Default: "sun_checks.xml"
+Path to the configuration file for the "-c" option (cf.
+http://checkstyle.sourceforge.net/cmdline.html#Command_line_usage).
+
+
+Notes~
+
+1. The checker was tested with "checkstyle" version 5.5. If you're using
+it with version 5.6 or later you should remove DoubleCheckedLocking from
+your configuration file:
+
+    http://stackoverflow.com/a/12798807/1658042
+
+2. At the time of this writing, the "checkstyle" checker doesn't distinguish
+between error severity levels. All messages are treated as errors, regardless
+of their severity defined in the "checkstyle" config file.
+
+3. You can specify a property file: >
+    let g:syntastic_java_checkstyle_post_args =
+        \ ["-p", "/path/to/checkstyle.properties"]
+<
+4. You probably want to download the "fat jar" "checkstyle-*-all.jar" and
+point |'g:syntastic_java_checkstyle_classpath'| to it:
+
+    http://iweb.dl.sourceforge.net/project/checkstyle/checkstyle/
+    http://checkstyle.sourceforge.net/cmdline.html#Usage_by_Classpath_update
+
+Current builds at Maven Central do not package "checkstyle" with its
+dependencies:
+
+    http://search.maven.org/#search|gav|1|g%3A%22com.puppycrawl.tools%22%20AND%20a%3A%22checkstyle%22
+
+However, |'g:syntastic_java_checkstyle_classpath'| accepts multiple files if
+you want to include the "checkstyle" jar and all of its dependencies.
+
+------------------------------------------------------------------------------
+2. javac                                                *syntastic-java-javac*
+
+Name:        javac
+Maintainers: Jochen Keil <jochen.keil@gmail.com>
+             Dmitry Geurkov <d.geurkov@gmail.com>
+
+Note~
+
+This checker is not suitable for use with large Java projects. The design
+of "javac" makes this checker prone to running into various limitations of
+your shell, Vim, and your Java compiler. You are strongly advised to use
+something like Eclim (http://eclim.org/) instead of syntastic for projects of
+any substantial size or complexity.
+
+Commands~
+
+The following commands are available:
+
+                                                *:SyntasticJavacEditClasspath*
+This opens a new window where you can specify a classpath. Individual paths
+may be specified one per line, or separated by colons ":" on UNIX, or by
+semicolons ";" on Windows.
+
+                                                   *:SyntasticJavacEditConfig*
+This command relevant only if |'g:syntastic_java_javac_config_file_enabled'|
+is set. It opens a buffer where you can specify project-specific options from
+the list below. These options will be saved in a file pointed to by
+|'g:syntastic_java_javac_config_file'| (".syntastic_javac_config" by default).
+Set |'g:syntastic_java_javac_config_file'| to a full path to use a
+project-wide configuration file, rather than a file in the current directory.
+The settings have to be specified as Vim commands.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                         *'g:syntastic_java_javac_executable'*
+Type: string
+Default: "javac"
+Compiler executable used for checking files.
+
+                                         *'g:syntastic_java_maven_executable'*
+Type: string
+Default: "mvn"
+Maven executable used for loading classpath for "maven" projects.
+
+                                            *'g:syntastic_java_javac_options'*
+Type: string
+Default: "-Xlint"
+Options for "javac".
+
+                                          *'g:syntastic_java_javac_classpath'*
+Type: string
+Default: ""
+Classpath. It can be changed by running the `:SyntasticJavacEditClasspath`
+command.
+
+                                      *'g:syntastic_java_javac_delete_output'*
+Type: boolean
+Default: 1
+When set the checker will delete the ".class" files created by "javac".
+
+                           *'g:syntastic_java_javac_autoload_maven_classpath'*
+Type: boolean
+Default: 1
+If enabled and a file "pom.xml" is found in the current working directory,
+"maven" is used to load classpath.
+
+                                        *'g:syntastic_java_javac_config_file'*
+Type: string
+Default: ".syntastic_javac_config"
+Path to the configuration file used by "javac". As usual, if a filename is
+specified rather than a full path, the file is created and looked for in the
+current directory.
+
+                                *'g:syntastic_java_javac_config_file_enabled'*
+Type: boolean
+Default: 0
+When enabled, the classpath is written to the file pointed to by
+|'g:syntastic_java_javac_config_file'|. The file is created as needed.
+You can edit this file with the `:SyntasticJavacEditClasspath` command.
+The change will take effect next time you run the checker.
+
+                           *'g:syntastic_java_javac_custom_classpath_command'*
+Type: string
+Default: ""
+Custom command to run in order to get the classpath. The command classpath
+output can be in traditional Java form, or specified on separate lines.
+"%file_path%", "%FILE_NAME%", and "%FILE_DIR%" are expanded to the current
+file's full path, filename, and base directory respectively, all of them
+escaped for use in a shell command.
+
+Using Ant~
+
+When using "ant" (http://ant.apache.org/) you can have a custom build target
+(named for example "path") that will output your project's classpath. You can
+then use `:SyntasticJavacEditConfig` and add the following line to use it with
+"javac" checker: >
+    let g:syntastic_java_javac_custom_classpath_command =
+        \ "ant -q path | grep echo | cut -f2- -d] | tr -d ' ' | tr ':' '\n'"
+<
+Using Gradle~
+
+For "Gradle" projects (http://gradle.org/) you might consider using
+"gradle-syntastic-plugin":
+
+    https://github.com/Scuilion/gradle-syntastic-plugin
+
+This will write the relevant classpath to a file ".syntastic_javac_config".
+
+==============================================================================
+SYNTAX CHECKERS FOR JAVASCRIPT                 *syntastic-checkers-javascript*
+
+The following checkers are available for JavaScript (filetype "javascript"):
+
+    1. Closure Compiler.........|syntastic-javascript-closurecompiler|
+    2. ESLint...................|syntastic-javascript-eslint|
+    3. Flow.....................|syntastic-javascript-flow|
+    4. gjslint..................|syntastic-javascript-gjslint|
+    5. JavaScript Lint..........|syntastic-javascript-jsl|
+    6. JSCS.....................|syntastic-javascript-jscs|
+    7. JSHint...................|syntastic-javascript-jshint|
+    8. JSLint...................|syntastic-javascript-jslint|
+    9. JSXHint..................|syntastic-javascript-jsxhint|
+    10. mixedindentlint.........|syntastic-javascript-mixedindentlint|
+    11. standard................|syntastic-javascript-standard|
+    12. tern-lint...............|syntastic-javascript-tern_lint|
+
+------------------------------------------------------------------------------
+1. Closure Compiler                     *syntastic-javascript-closurecompiler*
+
+Name:        closurecompiler
+Maintainer:  Motohiro Takayama <mootoh@gmail.com>
+
+"Closure Compiler" is a compiler for JavaScript maintained by Google. See the
+project's page for details:
+
+    https://developers.google.com/closure/compiler/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                               *'g:syntastic_javascript_closurecompiler_path'*
+Type: string
+Default: unset
+Path to "google-closure-compiler.jar"
+
+                             *'g:syntastic_javascript_closurecompiler_script'*
+Type: string
+Default: unset
+Path to a "closurecompiler" executable script.
+
+Note~
+
+In order to enable the checker you have to set exactly one of the options
+above. If you have a package manager (such as "Homebrew") that installs a
+shell script that runs "Closure Compiler", point
+|'g:syntastic_javascript_closurecompiler_script'| to that script. Otherwise
+set |'g:syntastic_javascript_closurecompiler_path'| to point to the "Closure
+Compiler" jar file.
+
+------------------------------------------------------------------------------
+2. ESLint                                        *syntastic-javascript-eslint*
+
+Name:        eslint
+Maintainer:  Maksim Ryzhikov <rv.maksim@gmail.com>
+
+"ESLint" is a tool for identifying and reporting on patterns found in
+ECMAScript/JavaScript code. See the project's page for details:
+
+    https://github.com/nzakas/eslint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You can also use "eslint_d" (https://github.com/mantoni/eslint_d.js),
+version 2.1.0 or later, instead of "ESLint". Just point
+'g:syntastic_javascript_eslint_exec' to it:
+
+    https://github.com/mantoni/eslint_d.js#editor-integration
+
+See also: |syntastic-html-eslint|, |syntastic-typescript-eslint|.
+
+------------------------------------------------------------------------------
+3. Flow                                            *syntastic-javascript-flow*
+
+Name:        flow
+Maintainer:  Michael Robinson <mike@pagesofinterest.net>
+
+"Flow" is a static type checker for JavaScript, written by Facebook. See the
+project's page for details:
+
+    http://flowtype.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Notes~
+
+Syntastic requires "Flow" version 0.18.1 or later.
+
+To use "Flow" with your projects, you must:
+
+a. Install it:
+
+    https://github.com/flowtype/flow-bin
+
+b. Configure your project:
+>
+    cd /path/to/your/project
+    flow init
+<
+c. Read the docs to find out more. It won't work out of the box.
+
+    http://flowtype.org/docs/existing.html
+
+------------------------------------------------------------------------------
+4. gjslint                                      *syntastic-javascript-gjslint*
+
+Name:        gjslint
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"Closure Linter", or "gjslint", is a style checker for JavaScript. See the
+project's page for more information:
+
+    https://developers.google.com/closure/utilities/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-html-gjslint|.
+
+------------------------------------------------------------------------------
+5. JavaScript Lint                                  *syntastic-javascript-jsl*
+
+Name:        jsl
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+For details about "JavaScript Lint" see the project's page:
+
+    http://www.javascriptlint.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+6. JSCS                                            *syntastic-javascript-jscs*
+
+Name:        jscs
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"JSCS" is a code style checker for JavaScript. See the project's page for
+more information:
+
+    https://github.com/mdevils/node-jscs
+
+Syntastic requires "JSCS" version 0.2.0 or later.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+7. JSHint                                        *syntastic-javascript-jshint*
+
+Name:        jshint
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"JSHint" is a tool to detect errors and potential problems in JavaScript
+files. See the project's page for details:
+
+    http://jshint.com/
+
+Syntastic requires "JSHint" version 1.0.0 or later.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Notes~
+
+If you're checking files containing tab characters then "JSHint"'s idea of
+tabstop must match Vim's 'tabstop', otherwise syntastic will highlight the
+errors at shifted positions. By default "JSHint"'s tabstop is 4, while Vim's
+default 'tabstop' is 8.
+
+In order to change "JSHint"'s tabstop you have to change its "indent" config
+option (cf. http://jshint.com/docs/options/#indent). One way to do that is
+to put it in a file named ".jshintrc" in the current directory, the parent
+directories, or your home directory. The file is supposed to be in JSON
+format. For example: >
+    {
+        "indent": 8
+    }
+<
+See JSHint documentation for more details:
+
+    http://jshint.com/docs/
+
+Please note however that setting "indent" also triggers the indentation checks
+in "JSHint". If that is undesirable, your only other option is to leave
+"JSHint"'s tabstop alone, and change Vim's 'tabstop' to 4. To change Vim's
+'tabstop', you can add this to your vimrc: >
+    set tabstop=4
+<
+See also: |syntastic-html-jshint|, |syntastic-xhtml-jshint|.
+
+------------------------------------------------------------------------------
+8. JSLint                                        *syntastic-javascript-jslint*
+
+Name:        jslint
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"JSLint" is a code quality checker for JavaScript. See the program's page for
+details:
+
+    http://www.jslint.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+By default the checker calls "JSLint" with these options: >
+    --white --nomen --regexp --plusplus --bitwise --newcap --sloppy --vars
+<
+This can be changed by setting 'g:syntastic_javascript_jslint_args' in your
+vimrc to your own list of options, for example: >
+    let g:syntastic_javascript_jslint_args = 
+        \ "--nomen --regexp --browser --devel --windows --sloppy --vars"
+<
+Setting this variable to the empty string "" is allowed, and instructs
+syntastic to call "JSLint" with no options.
+
+------------------------------------------------------------------------------
+9. JSXHint                                      *syntastic-javascript-jsxhint*
+
+Name:        JSXHint
+Maintainer:  Thomas Boyt <me@thomasboyt.com>
+
+"JSXHint" is a wrapper around JSHint (http://jshint.com/) for
+linting JSX syntax, which is inline markup-in-JS used by React
+(http://facebook.github.io/react/docs/getting-started.html).
+
+See the project's page for details:
+
+    https://github.com/strml/jsxhint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Installation~
+
+Install it with "npm": >
+    npm install -g jsxhint
+<
+Syntastic requires "JSXHint" version v0.4.1 or later. You also need "JSHint"
+v1.1.0 or later.
+
+Note~
+
+Since "JSXHint" is a wrapper around JSHint, the following note relevant to
+the latter still applies:
+
+If you're checking files containing tab characters then JSHint's idea of
+tabstop must match Vim's 'tabstop', otherwise syntastic will highlight the
+errors at shifted positions. By default JSHint's tabstop is 4, while Vim's
+default 'tabstop' is 8.
+
+In order to change "JSHint"'s tabstop you have to change its "indent" config
+option (http://jshint.com/docs/options/#indent). One way to do that is to
+put it in a file named ".jshintrc" in the current directory, the parent
+directories, or your home directory. The file is supposed to be in JSON
+format. For example: >
+    {
+        "indent": 8
+    }
+<
+See JSHint documentation for more details:
+
+    http://jshint.com/docs/
+
+Please note however that setting "indent" also triggers the indentation checks
+in JSHint. If that is undesirable, your only other option is to leave JSHint's
+tabstop alone, and change Vim's 'tabstop' to 4. To change Vim's 'tabstop', you
+can add this to your 'vimrc': >
+    set tabstop=4
+<
+Alternative~
+
+"JSXHint" will not show JSX-related errors in syntastic, because failed JSX
+compiles will result in the uncompiled data being passed to JSHint:
+
+    https://github.com/STRML/JSXHint/issues/45
+
+To get around this, "Syntastic-React" can be used as a replacement for
+"JSXHint":
+
+    https://github.com/jaxbot/syntastic-react
+
+------------------------------------------------------------------------------
+10. mixedindentlint                     *syntastic-javascript-mixedindentlint*
+
+Name:        mixedindentlint
+Maintainer:  Payton Swick <payton@foolord.com>
+
+"mixedindentlint" is a general-purpose indentation checker. See the project's
+page at GitHub for more information:
+
+    https://github.com/sirbrillig/mixedindentlint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-css-mixedindentlint|, |syntastic-scss-mixedindentlint|.
+
+------------------------------------------------------------------------------
+11. standard                                   *syntastic-javascript-standard*
+
+Name:        standard
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Standard" is a code style checker for JavaScript.  See the project's page for
+more information:
+
+    https://github.com/feross/standard
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                   *'g:syntastic_javascript_standard_generic'*
+Type: boolean
+Default: 0
+Flag that can be used to disable version checks for "standard".
+
+Note~
+
+Most forks of "standard" can also be used with syntastic. Just
+set 'g:syntastic_javascript_standard_generic' to 1, and point
+'g:syntastic_javascript_standard_exec' to the fork's executable.  For
+example to use happiness (https://github.com/JedWatson/happiness) instead of
+"standard": >
+    let g:syntastic_javascript_checkers = ["standard"]
+    let g:syntastic_javascript_standard_exec = "happiness"
+    let g:syntastic_javascript_standard_generic = 1
+<
+------------------------------------------------------------------------------
+12. tern-lint                                 *syntastic-javascript-tern_lint*
+
+Name:        tern_lint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"tern-lint" is a static type checker for JavaScript.  See the project's page
+for more information:
+
+    https://github.com/angelozerr/tern-lint
+
+Syntastic requires a version of Vim compiled with the |+byte_offset| feature
+to use this checker.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+"tern-lint" recursively scans files starting from (Vim's idea of) the current
+directory, regardless of the current file.
+
+==============================================================================
+SYNTAX CHECKERS FOR JSON                             *syntastic-checkers-json*
+
+The following checkers are available for JSON (filetype "json"):
+
+    1. JSONLint.................|syntastic-json-jsonlint|
+    2. jsonval..................|syntastic-json-jsonval|
+
+------------------------------------------------------------------------------
+1. JSONLint                                          *syntastic-json-jsonlint*
+
+Name:        jsonlint
+Maintainer:  Miller Medeiros <contact@millermedeiros.com>
+
+"JSONLint" is a validator for JSON. See the project's page for details:
+
+    http://jsonlint.com/
+
+Installation~
+
+Install it with: >
+    npm install -g jsonlint
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. jsonval                                            *syntastic-json-jsonval*
+
+Name:        jsonval
+Maintainer:  Miller Medeiros <contact@millermedeiros.com>
+
+"jsonval" is a validator for JSON. See the project's page at GitHub for
+details:
+
+    https://github.com/dangerousben/jsonval
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR LESS                             *syntastic-checkers-less*
+
+The following checkers are available for LESS (filetype "less"):
+
+    1. lessc....................|syntastic-less-lessc|
+    2. RECESS...................|syntastic-less-recess|
+
+------------------------------------------------------------------------------
+1. lessc                                                *syntastic-less-lessc*
+
+Name:        lessc
+Maintainer:  Julien Blanchard <julien@sideburns.eu>
+
+"lessc" is a compiler for LESS. See the project's page for details:
+
+    http://lesscss.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+                                            *'g:syntastic_less_use_less_lint'*
+Type: boolean
+Default: 0
+Flag that can be set to instruct syntastic to run "less-lint" instead of
+"less".
+
+------------------------------------------------------------------------------
+2. RECESS                                              *syntastic-less-recess*
+
+Name:        recess
+Maintainer:  Tim Carry <tim@pixelastic.com>
+
+"RECESS" is a code quality tool for CSS built on top of LESS. See the
+project's page for details:
+
+    http://twitter.github.io/recess/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-css-recess|.
+
+==============================================================================
+SYNTAX CHECKERS FOR LEX                               *syntastic-checkers-lex*
+
+The following checkers are available for Lex (filetype "lex"):
+
+    1. flex.....................|syntastic-lex-flex|
+
+------------------------------------------------------------------------------
+1. flex                                                   *syntastic-lex-flex*
+
+Name:        flex
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Flex" is the GNU implementation of the standard UNIX lexical analyzer "lex"
+(http://en.wikipedia.org/wiki/Lex_programming_tool). See the project's page
+for more information:
+
+    http://flex.sourceforge.net/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR LIMBO                           *syntastic-checkers-limbo*
+
+The following checkers are available for Limbo (filetype "limbo"):
+
+    1. Limbo....................|syntastic-limbo-limbo|
+
+------------------------------------------------------------------------------
+1. Limbo                                               *syntastic-limbo-limbo*
+
+Name:        limbo
+Maintainer:  Alex Efros <powerman-asdf@ya.ru>
+
+"Limbo" is a compiler for the Limbo language
+(http://doc.cat-v.org/inferno/4th_edition/limbo_language/), the
+language used to write applications for the "Inferno" operating system
+(http://doc.cat-v.org/inferno/). See the "Inferno" project's page for
+a reference implementation:
+
+    http://code.google.com/p/inferno-os/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR LISP                             *syntastic-checkers-lisp*
+
+The following checkers are available for LISP (filetype "lisp"):
+
+    1. CLISP....................|syntastic-lisp-clisp|
+
+------------------------------------------------------------------------------
+1. CLISP                                                *syntastic-lisp-clisp*
+
+Name:        clisp
+Maintainer:  Karl Yngve Lervåg <karl.yngve@lervag.net>
+
+"CLISP" is an interpreter for LISP programs. See the project's page for
+details:
+
+    http://www.clisp.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR LLVM                             *syntastic-checkers-llvm*
+
+The following checkers are available for LLVM (filetype "llvm"):
+
+    1. LLVM.....................|syntastic-llvm-llvm|
+
+------------------------------------------------------------------------------
+1. LLVM                                                  *syntastic-llvm-llvm*
+
+Name:        llvm
+Maintainer:  Andrew Kelley <superjoe30@gmail.com>
+
+"LLVM" is the intermediate language for the LLVM compilers (http://llvm.org/).
+See the reference manual for details:
+
+    http://llvm.org/docs/LangRef.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR LUA                               *syntastic-checkers-lua*
+
+The following checkers are available for Lua (filetype "lua"):
+
+    1. luac.....................|syntastic-lua-luac|
+    2. luacheck.................|syntastic-lua-luacheck|
+
+------------------------------------------------------------------------------
+1. luac                                                   *syntastic-lua-luac*
+
+Name:        luac
+Maintainer:  Gregor Uhlenheuer <kongo2002@gmail.com>
+
+"luac" is a compiler for Lua. See the tool's manual for details:
+
+    http://www.lua.org/manual/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+"luac" truncates filenames when the full path of the files involved is longer
+than a certain fixed amount. Syntastic can't detect this situation, and will
+silently ignore error messages with truncated filenames.
+
+------------------------------------------------------------------------------
+2. luacheck                                           *syntastic-lua-luacheck*
+
+Name:        luacheck
+Maintainer:  Thiago Bastos <tbastos@tbastos.com>
+
+"Luacheck" is a tool for static analysis of Lua code. See the project's page
+for details:
+
+    https://github.com/mpeterv/luacheck
+
+In contrast to "luac" (see |syntastic-lua-luac|) which only flags syntax
+errors, this checker detects code smells, so you probably want to enable both
+when available.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+A sensible set of options for LUA projects might be something like this: >
+    let g:syntastic_check_on_open = 1
+    let g:syntastic_lua_checkers = ["luac", "luacheck"]
+    let g:syntastic_lua_luacheck_args = "--no-unused-args" 
+<
+==============================================================================
+SYNTAX CHECKERS FOR MARKDOWN                     *syntastic-checkers-markdown*
+
+The following checkers are available for Markdown (filetype "markdown"):
+
+    1. Markdown lint tool.......|syntastic-markdown-mdl|
+    2. proselint................|syntastic-markdown-proselint|
+    3. textlint.................|syntastic-markdown-textlint|
+
+------------------------------------------------------------------------------
+1. Markdown lint tool                                 *syntastic-markdown-mdl*
+
+Name:        mdl
+Maintainer:  Charles Beynon <etothepiipower@gmail.com>
+
+"Markdown lint tool" is a style checker for Markdown files. See the project's
+page at GitHub for details:
+
+    https://github.com/mivok/markdownlint
+
+Installation~
+
+Install it with: >
+    gem install mdl
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You can also use the "Node.js"-based "markdownlint-cli" as a checker instead
+of "mdl":
+
+    https://github.com/igorshubovych/markdownlint-cli
+
+To do that, you have to point 'g:syntastic_markdown_mdl_exec' to
+"markdownlint", and set 'g:syntastic_markdown_mdl_args' to an empty string (or
+to a set of valid "markdownlint-cli" options): >
+    let g:syntastic_markdown_mdl_exec = "markdownlint"
+    let g:syntastic_markdown_mdl_args = ""
+<
+------------------------------------------------------------------------------
+2. proselint                                    *syntastic-markdown-proselint*
+
+Name:        proselint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"proselint" is a linter for prose. See the page for details:
+
+    http://proselint.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-asciidoc-proselint|, |syntastic-help-proselint|,
+|syntastic-html-proselint|, |syntastic-nroff-proselint|,
+|syntastic-pod-proselint|, |syntastic-rst-proselint|,
+|syntastic-tex-proselint|, |syntastic-texinfo-proselint|,
+|syntastic-text-proselint|, |syntastic-xhtml-proselint|.
+
+------------------------------------------------------------------------------
+3. textlint                                      *syntastic-markdown-textlint*
+
+Name:        textlint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"textlint" is a natural language linter for text, Markdown, and HTML files.
+See the project's page for details:
+
+    https://textlint.github.io/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-html-textlint|, |syntastic-text-textlint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR MATLAB                         *syntastic-checkers-matlab*
+
+The following checkers are available for MATLAB (filetype "matlab"):
+
+    1. mlint....................|syntastic-matlab-mlint|
+
+------------------------------------------------------------------------------
+1. mlint                                              *syntastic-matlab-mlint*
+
+Name:        mlint
+Maintainer:  Jason Graham <jason@the-graham.com>
+
+"mlint" is a code checker for MATLAB. The "mlint" binary is distributed with
+the "MATLAB" package:
+
+    http://www.mathworks.com/help/matlab/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR MERCURY                       *syntastic-checkers-mercury*
+
+The following checkers are available for Mercury (filetype "mercury"):
+
+    1. mmc......................|syntastic-mercury-mmc|
+
+------------------------------------------------------------------------------
+1. mmc                                                 *syntastic-mercury-mmc*
+
+Name:        mmc
+Maintainer:  Joshua Rahm <joshuarahm@gmail.com>
+
+"mmc" is a compiler for Mercury. See Mercury's page for more details:
+
+    http://www.mercurylang.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR NASM                             *syntastic-checkers-nasm*
+
+The following checkers are available for NASM (filetype "nasm"):
+
+    1. nasm.....................|syntastic-nasm-nasm|
+
+------------------------------------------------------------------------------
+1. nasm                                                  *syntastic-nasm-nasm*
+
+Name:        nasm
+Maintainer:  HĂĽvard Pettersson <haavard.pettersson@gmail.com>
+
+"NASM" is an assembler and disassembler for the Intel x86 architecture. See
+the project's page for details:
+
+    http://www.nasm.us/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR NIX                               *syntastic-checkers-nix*
+
+The following checkers are available for Nix (filetype "nix"):
+
+    1. Nix......................|syntastic-nix-nix|
+
+------------------------------------------------------------------------------
+1. Nix                                                     *syntastic-nix-nix*
+
+Name:        nix
+Maintainer:  Tim Cuthbertson <tim@gfxmonk.net>
+
+"Nix" is a checker for language "Nix" using "nix-instantiate". See the
+project's page for details:
+
+    http://nixos.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR NROFF                           *syntastic-checkers-nroff*
+
+The following checkers are available for nroff (filetype "nroff"):
+
+    1. Igor.....................|syntastic-nroff-igor|
+    2. mandoc...................|syntastic-nroff-mandoc|
+    3. proselint................|syntastic-nroff-proselint|
+
+------------------------------------------------------------------------------
+1. Igor                                                 *syntastic-nroff-igor*
+
+Name:        igor
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Igor" is a proofreader for DocBook SGML, man pages, and text files used by
+the FreeBSD project (https://www.freebsd.org/). See the author's presentation
+for details:
+
+    http://www.youtube.com/watch?v=sczHqUPygZY
+
+The latest version can be obtained from Glen Barber's repository:
+
+    http://docscripts.glenbarber.us/tags/igor/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-docbk-igor|, |syntastic-text-igor|.
+
+------------------------------------------------------------------------------
+2. mandoc                                             *syntastic-nroff-mandoc*
+
+Name:        mandoc
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+See the project's page for details:
+
+    http://mdocml.bsd.lv/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+3. proselint                                       *syntastic-nroff-proselint*
+
+Name:        proselint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"proselint" is a linter for prose. See the page for details:
+
+    http://proselint.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-asciidoc-proselint|, |syntastic-help-proselint|,
+|syntastic-html-proselint|, |syntastic-markdown-proselint|,
+|syntastic-pod-proselint|, |syntastic-rst-proselint|,
+|syntastic-tex-proselint|, |syntastic-texinfo-proselint|,
+|syntastic-text-proselint|, |syntastic-xhtml-proselint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR OBJECTIVE-C                      *syntastic-checkers-objc*
+
+The following checkers are available for Objective-C (filetype "objc"):
+
+    1. GCC......................|syntastic-objc-gcc|
+    2. OClint...................|syntastic-objc-oclint|
+
+------------------------------------------------------------------------------
+1. GCC                                                    *syntastic-objc-gcc*
+
+Name:        gcc
+Maintainer:  Gregor Uhlenheuer <kongo2002@gmail.com>
+
+Checker options~
+                                                 *'g:syntastic_objc_compiler'*
+Type: string
+Default: "gcc", or "clang" if GCC is not found
+Compiler executable.
+
+                                              *'g:syntastic_objc_errorformat'*
+Type: string
+Default: unset
+Override for the default |'errorformat'|.
+
+                                    *'g:syntastic_objc_remove_include_errors'*
+Type: boolean
+Default: 0
+By default, errors in files included from the file being checked are shown.
+Set this variable to 1 to remove messages about errors in included files.
+Please note that this means syntastic will silently abort checks if there are
+fatal errors in one of the included files.
+
+                                         *'g:syntastic_objc_compiler_options'*
+Type: string
+Default: unset
+Compilation flags (such as defines or include directories) to be passed to the
+checker.
+
+                                              *'g:syntastic_objc_config_file'*
+Type: string
+Default: ".syntastic_objc_config"
+File containing additional compilation flags to be passed to the checker, one
+option per line (cf. |syntastic-config-files|).
+
+                                             *'g:syntastic_objc_include_dirs'*
+Type: array of strings
+Default: []
+Include directories to be passed to the checker, in addition to the above
+compilation flags. You can set it like this: >
+    let g:syntastic_objc_include_dirs = ["includes", "headers"]
+<
+and the corresponding "-Iincludes -Iheaders" will be added to the compilation
+flags.
+
+                                  *'g:syntastic_objc_no_default_include_dirs'*
+Type: boolean
+Default: 0
+By default syntastic adds a number of common include directories to the
+compilation flags, namely: >
+    -I. -I.. -Iinclude -Iincludes -I../include -I../includes
+<
+You can disable this behaviour by setting the above variable to 1.
+
+                                                   *'b:syntastic_objc_cflags'*
+Type: string
+Default: unset
+Buffer-local variable. Additional compilation flags specific to the current
+buffer.
+
+                                             *'g:syntastic_objc_check_header'*
+Type: boolean
+Default: 0
+If the current file is a header (namely if its extension is "h"), all checks
+are silently skipped. You can force syntastic to check header files by
+setting the above variable to 1.
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_objc_gcc_<option>' variables. The only exception is
+'g:syntastic_objc_gcc_exec', which can still be used to override the checker's
+executable.
+
+See also: |syntastic-objcpp-gcc|.
+
+------------------------------------------------------------------------------
+2. OClint                                              *syntastic-objc-oclint*
+
+Name:        oclint
+Maintainer:  "UnCO" Lin <undercooled@lavabit.com>
+
+"OClint" is a static code analysis tool. See the project's page for details:
+
+    http://oclint.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                            'g:syntastic_oclint_config_file'
+Type: string
+Default: ".syntastic_oclint_config"
+File containing compilation flags (such as defines or include directories),
+one option per line (cf. |syntastic-config-files|).
+
+See also: |syntastic-objcpp-oclint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR OBJECTIVE-C++                  *syntastic-checkers-objcpp*
+
+The following checkers are available for Objective-C++ (filetype "objcpp"):
+
+    1. GCC......................|syntastic-objcpp-gcc|
+    2. OClint...................|syntastic-objcpp-oclint|
+
+------------------------------------------------------------------------------
+1. GCC                                                  *syntastic-objcpp-gcc*
+
+Name:        gcc
+Maintainer:  Gregor Uhlenheuer <kongo2002@gmail.com>
+
+Checker options~
+                                               *'g:syntastic_objcpp_compiler'*
+Type: string
+Default: "gcc", or "clang" if GCC is not found
+Compiler executable.
+
+                                            *'g:syntastic_objcpp_errorformat'*
+Type: string
+Default: unset
+Override for the default |'errorformat'|.
+
+                                  *'g:syntastic_objcpp_remove_include_errors'*
+Type: boolean
+Default: 0
+By default, errors in files included from the file being checked are shown.
+Set this variable to 1 to remove messages about errors in included files.
+Please note that this means syntastic will silently abort checks if there are
+fatal errors in one of the included files.
+
+                                       *'g:syntastic_objcpp_compiler_options'*
+Type: string
+Default: unset
+Compilation flags (such as defines or include directories) to be passed to the
+checker.
+
+                                            *'g:syntastic_objcpp_config_file'*
+Type: string
+Default: ".syntastic_objcpp_config"
+File containing additional compilation flags to be passed to the checker, one
+option per line (cf. |syntastic-config-files|).
+
+                                           *'g:syntastic_objcpp_include_dirs'*
+Type: array of strings
+Default: []
+Include directories to be passed to the checker, in addition to the above
+compilation flags. You can set it like this: >
+    let g:syntastic_objcpp_include_dirs = ["includes", "headers"]
+<
+and the corresponding "-Iincludes -Iheaders" will be added to the compilation
+flags.
+
+                                *'g:syntastic_objcpp_no_default_include_dirs'*
+Type: boolean
+Default: 0
+By default syntastic adds a number of common include directories to the
+compilation flags, namely: >
+    -I. -I.. -Iinclude -Iincludes -I../include -I../includes
+<
+You can disable this behaviour by setting the above variable to 1.
+
+                                                 *'b:syntastic_objcpp_cflags'*
+Type: string
+Default: unset
+Buffer-local variable. Additional compilation flags specific to the current
+buffer.
+
+                                           *'g:syntastic_objcpp_check_header'*
+Type: boolean
+Default: 0
+If the current file is a header (namely if its extension is "h"), all checks
+are silently skipped. You can force syntastic to check header files by
+setting the above variable to 1.
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_objcpp_gcc_<option>' variables. The only exception
+is 'g:syntastic_objcpp_gcc_exec', which can still be used to override the
+checker's executable.
+
+See also: |syntastic-objc-gcc|.
+
+------------------------------------------------------------------------------
+2. OClint                                            *syntastic-objcpp-oclint*
+
+Name:        oclint
+Maintainer:  "UnCO" Lin <undercooled@lavabit.com>
+
+"OClint" is a static code analysis tool. See the project's page for details:
+
+    http://oclint.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                            'g:syntastic_oclint_config_file'
+Type: string
+Default: ".syntastic_oclint_config"
+File containing compilation flags (such as defines or include directories),
+one option per line (cf. |syntastic-config-files|).
+
+See also: |syntastic-objc-oclint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR OCAML                           *syntastic-checkers-ocaml*
+
+The following checkers are available for OCaml (filetype "ocaml"):
+
+    1. camlp4o..................|syntastic-ocaml-camlp4o|
+
+------------------------------------------------------------------------------
+1. camlp4o                                           *syntastic-ocaml-camlp4o*
+
+Name:        camlp4o
+Maintainer:  Tőrők Edwin <edwintorok@gmail.com>
+
+"ocamlc" is a compiler for Caml. See the project's page for details:
+
+    http://caml.inria.fr/
+
+Checker options~
+                                              *'g:syntastic_ocaml_use_ocamlc'*
+Type: boolean
+Default: 0
+Enable this variable to use "ocamlc".
+
+                                     *'g:syntastic_ocaml_use_janestreet_core'*
+Type: boolean
+Default: 0
+It's possible to use "ocamlc" in conjunction with Jane Street's "core". In
+order to do that you have to set the above variable.
+
+                                     *'g:syntastic_ocaml_janestreet_core_dir'*
+Type: string
+Default: "."
+Path to Jane Street's "core".
+
+                                                 *'g:syntastic_ocaml_camlp4r'*
+Type: boolean                                                                 
+Default: 0
+By default, .ml and .mli files are checked with the "camlp4o" preprocessor,
+.mll with "ocamllex", and .mly with "menhir". If your source code requires
+"camlp4r" you can set this variable.
+
+                                          *'g:syntastic_ocaml_use_ocamlbuild'*
+Type: boolean                                                                 
+Default: 0
+Whether to enable typechecking and syntax extensions. This tells syntastic to
+run "ocamlbuild <name>.inferred.mli". It writes object files to the "_build"
+directory, and possibly rebuilds your "myocamlbuild.ml" plugin.  If you are
+using syntax extensions / external libraries and have a properly set up
+"_tags" (and "myocamlbuild.ml" file), setting this flag should just work.  For
+best results your current directory should be the project root (same situation
+if you want useful output from `:make`).
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_ocaml_camlp4o_<option>' variables.
+
+Note~
+
+You might consider using the checkers packaged with Merlin instead of this
+one. They provide type errors and let you use packages outside core:
+
+    https://github.com/the-lambda-church/merlin
+
+==============================================================================
+SYNTAX CHECKERS FOR PERL                             *syntastic-checkers-perl*
+
+The following checkers are available for Perl (filetype "perl"):
+
+    1. perl.....................|syntastic-perl-perl|
+    2. Perl::Critic.............|syntastic-perl-perlcritic|
+    3. Pod::Checker.............|syntastic-perl-podchecker|
+
+------------------------------------------------------------------------------
+1. perl                                                  *syntastic-perl-perl*
+
+Name:        perl
+Maintainers: Anthony Carapetis <anthony.carapetis@gmail.com>
+             Eric Harmon
+
+Security~
+
+This checker runs "perl -c" against your files, which in turn executes any
+"BEGIN", "UNITCHECK", and "CHECK" blocks, and any "use" statements in your
+file (cf. http://perldoc.perl.org/perlrun.html#*-c*). This is probably fine if
+you wrote the file yourself, but it can be a problem if you're trying to check
+third party files. If you are 100% willing to let Vim run the code in your
+file, set 'g:syntastic_enable_perl_checker' to 1 in your vimrc to enable this
+checker: >
+    let g:syntastic_enable_perl_checker = 1
+<
+There is also a buffer-local version of this variable, that takes precedence
+over it in the buffers where it is defined.
+
+Please note that setting this variable doesn't automatically enable the
+checker, you still need to add it to 'g:syntastic_perl_checkers' if you plan
+to use it.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                              *'g:syntastic_perl_interpreter'*
+Type: string
+Default: "perl"
+The perl interpreter to use.
+
+                                                 *'g:syntastic_perl_lib_path'*
+Type: list os strings
+Default: []
+List of include directories to be added to the perl command line. Example: >
+    let g:syntastic_perl_lib_path = [ "./lib", "./lib/auto" ]
+<
+Note~
+
+The variable |'g:syntastic_perl_interpreter'| is shared with the YAML::XS
+checker (cf. |syntastic-yaml-yamlxs|). If for some reasons you don't want to
+use the same interpreter for both checkers, you can override it locally by
+setting 'g:syntastic_perl_perl_exec'.
+
+------------------------------------------------------------------------------
+2. Perl::Critic                                    *syntastic-perl-perlcritic*
+
+Name:        perlcritic
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Perl::Critic" is a static analyzer for Perl. See the project's page for
+details:
+
+    http://perlcritic.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                         *'g:syntastic_perl_perlcritic_thres'*
+Type: integer
+Default: 5
+Error threshold: policy violations with a severity above this value are
+highlighted as errors, the others are warnings.
+
+Note~
+
+You can override the format of "perlcritic" messages, for example: >
+    let g:syntastic_perl_perlcritic_post_args =
+        \ '--verbose "\%s:\%f:\%l:\%c: \%p: \%m\n"'
+<
+Just make sure to leave alone the leading "\%s:\%f:\%l:\%c:".
+
+------------------------------------------------------------------------------
+3. Pod::Checker                                    *syntastic-perl-podchecker*
+
+Name:        podchecker
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Pod::Checker" is a checker for pod documents. See the module's manual for
+details:
+
+    http://perldoc.perl.org/Pod/Checker.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-pod-podchecker|.
+
+==============================================================================
+SYNTAX CHECKERS FOR PHP                               *syntastic-checkers-php*
+
+The following checkers are available for PHP (filetype "php"):
+
+    1. PHP......................|syntastic-php-php|
+    2. PHP_CodeSniffer..........|syntastic-php-phpcs|
+    3. PHPLint..................|syntastic-php-phplint|
+    4. PHP Mess Detector........|syntastic-php-phpmd|
+
+------------------------------------------------------------------------------
+1. PHP                                                     *syntastic-php-php*
+
+Name:        php
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. PHP_CodeSniffer                                       *syntastic-php-phpcs*
+
+Name:        phpcs
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"PHP_CodeSniffer" is a style checker for PHP and CSS. See the project's page
+at GitHub for details:
+
+    https://github.com/squizlabs/PHP_CodeSniffer/
+
+Installation~
+
+Install it with: >
+    pear install PHP_CodeSniffer
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+If you're checking files containing tab characters then "PHP_CodeSniffer"'s
+idea of tabstop must match Vim's 'tabstop', otherwise syntastic will highlight
+the errors at shifted positions. By default syntastic does that by adding
+an option "--tab-width=&tabstop" to "PHP_CodeSniffer", but that option
+also instructs "PHP_CodeSniffer" to expand tabs, and some code sniffers
+(f.i. "CakePHP", see https://github.com/cakephp/cakephp-codesniffer) insist on
+indenting lines with tabs. To work around the resulting mess if you're using
+one of these sniffers, set "--tab-width=0" and 'tabstop' to 8: >
+    let g:syntastic_php_phpcs_args = "--tab-width=0"
+    set tabstop=8
+<
+See also: |syntastic-css-phpcs|.
+
+------------------------------------------------------------------------------
+3. PHPLint                                             *syntastic-php-phplint*
+
+Name:        phplint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"PHPLint" is a style checker for PHP. See the project's page for details:
+
+    http://www.icosaedro.it/phplint/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+4. PHP Mess Detector                                     *syntastic-php-phpmd*
+
+Name:        phpmd
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"PHP Mess Detector" is a code analyzer for PHP. See the project's page for
+details:
+
+    http://phpmd.org
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR POD                               *syntastic-checkers-pod*
+
+The following checkers are available for POD (filetype "pod"):
+
+    1. Pod::Checker.............|syntastic-pod-podchecker|
+    2. proselint................|syntastic-pod-proselint|
+
+------------------------------------------------------------------------------
+1. Pod::Checker                                     *syntastic-pod-podchecker*
+
+Name:        podchecker
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Pod::Checker" is a checker for pod documents.  See the module's manual for
+details:
+
+    http://perldoc.perl.org/Pod/Checker.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-perl-podchecker|.
+
+------------------------------------------------------------------------------
+2. proselint                                         *syntastic-pod-proselint*
+
+Name:        proselint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"proselint" is a linter for prose. See the page for details:
+
+    http://proselint.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-asciidoc-proselint|, |syntastic-help-proselint|,
+|syntastic-html-proselint|, |syntastic-markdown-proselint|,
+|syntastic-nroff-proselint|, |syntastic-rst-proselint|,
+|syntastic-tex-proselint|, |syntastic-texinfo-proselint|,
+|syntastic-text-proselint|, |syntastic-xhtml-proselint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR PUG (FORMERLY JADE)               *syntastic-checkers-pug*
+
+The following checkers are available for Pug (formerly Jade; filetype "pug"):
+
+    1. pug_lint.................|syntastic-pug-pug_lint|
+
+------------------------------------------------------------------------------
+1. pug_lint                                           *syntastic-pug-pug_lint*
+
+Name:        pug_lint
+Maintainer:  Ben Parnell <benjaminparnell.94@gmail.com>
+
+"pug-lint" is a linter and style checker for Pug (formerly known as "Jade";
+http://jade-lang.com/). See the project's page at GitHub for details:
+
+    https://github.com/pugjs/pug-lint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR PUPPET                         *syntastic-checkers-puppet*
+
+The following checkers are available for Puppet (filetype "puppet"):
+
+    1. puppet...................|syntastic-puppet-puppet|
+    2. puppet-lint..............|syntastic-puppet-puppetlint|
+
+------------------------------------------------------------------------------
+1. puppet                                            *syntastic-puppet-puppet*
+
+Name:        puppet
+Maintainer:  Eivind Uggedal <eivind@uggedal.com>
+
+"Puppet" is an automated administrative engine for UNIX systems.  See the
+project's page for details:
+
+    http://projects.puppetlabs.com/projects/puppet
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. puppet-lint                                   *syntastic-puppet-puppetlint*
+
+Name:        puppetlint
+Maintainer:  Eivind Uggedal <eivind@uggedal.com>
+
+"puppet-lint" is a style checker for puppet manifests
+(http://projects.puppetlabs.com/projects/puppet).  See the project's page for
+details:
+
+    http://puppet-lint.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR PYTHON                         *syntastic-checkers-python*
+
+The following checkers are available for Python (filetype "python"):
+
+    1. flake8...................|syntastic-python-flake8|
+    2. Frosted..................|syntastic-python-frosted|
+    3. mypy.....................|syntastic-python-mypy|
+    4. Prospector...............|syntastic-python-prospector|
+    5. py3kwarn.................|syntastic-python-py3kwarn|
+    6. pycodestyle..............|syntastic-python-pycodestyle|
+    7. pydocstyle...............|syntastic-python-pydocstyle|
+    8. Pyflakes.................|syntastic-python-pyflakes|
+    9. Pylama...................|syntastic-python-pylama|
+    10. Pylint..................|syntastic-python-pylint|
+    11. python..................|syntastic-python-python|
+
+------------------------------------------------------------------------------
+1. flake8                                            *syntastic-python-flake8*
+
+Name:        flake8
+Maintainers: Sylvain Soliman <Sylvain.Soliman+git@gmail.com>
+             kstep <me@kstep.me>
+
+"Flake8" is a wrapper around PyFlakes (https://launchpad.net/pyflakes), pep8
+(https://github.com/jcrocholl/pep8), and Ned Batchelder's McCabe script
+(http://nedbatchelder.com/blog/200803/python_code_complexity_microtool.html). 
+See the project's page and the official docs for details:
+
+    https://gitlab.com/pycqa/flake8
+    http://flake8.readthedocs.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. Frosted                                          *syntastic-python-frosted*
+
+Name:        frosted
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Frosted" is a fork of pyflakes (https://launchpad.net/pyflakes). See the
+project's page for details:
+
+    https://github.com/timothycrosley/frosted
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+3. mypy                                                *syntastic-python-mypy*
+
+Name:        mypy
+Maintainer:  Russ Hewgill <Russ.Hewgill@gmail.com>
+
+"mypy" is a static type checker for Python. See the project's page for
+details:
+
+    http://www.mypy-lang.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+4. Prospector                                    *syntastic-python-prospector*
+
+Name:        prospector
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Prospector" is a static analysis tool for Python. It brings
+together the functionality of other tools such as pylint
+(http://www.pylint.org/), pyflakes (https://launchpad.net/pyflakes),
+pep8 (https://github.com/jcrocholl/pep8), pydocstyle (formerly
+"pep257"; https://github.com/PyCQA/pydocstyle), and McCabe complexity
+(http://nedbatchelder.com/blog/200803/python_code_complexity_microtool.html).
+See the project's official documentation for details:
+
+    http://prospector.readthedocs.org/en/latest/
+
+Syntastic supports "Prospector" versions 0.7 and later.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+5. py3kwarn                                        *syntastic-python-py3kwarn*
+
+Name:        py3kwarn
+Author: Liam Curry <liam@curry.name>
+
+"Py3kwarn" is a code checker for Python that detects incompatibilities with
+Python 3. See the project's page for details:
+
+    https://github.com/liamcurry/py3kwarn
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+6. pycodestyle                                  *syntastic-python-pycodestyle*
+
+Name:        pycodestyle
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"pycodestyle" (formerly "pep8") is a style checker for Python, derived from
+the conventions in PEP 8 (http://www.python.org/dev/peps/pep-0008/). See the
+project's page for details:
+
+    https://github.com/PyCQA/pycodestyle
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+7. pydocstyle                                    *syntastic-python-pydocstyle*
+
+Name:        pydocstyle
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"pydocstyle" (formerly "pep257") is a docstring style checker
+for Python, derived from the conventions established in PEP 257
+(http://www.python.org/dev/peps/pep-0257/). See the project's page for
+details:
+
+    https://github.com/PyCQA/pydocstyle
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+8. Pyflakes                                        *syntastic-python-pyflakes*
+
+Name:        pyflakes
+Authors:     Martin Grenfell <martin.grenfell@gmail.com>
+             kstep <me@kstep.me>
+             Parantapa Bhattacharya <parantapa@gmail.com>
+
+"Pyflakes" is a simple code checker for Python.  See the project's page for
+more information:
+
+    https://launchpad.net/pyflakes
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+9. Pylama                                            *syntastic-python-pylama*
+
+Name:        pylama
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Pylama" is a wrapper around pep8 (https://github.com/jcrocholl/pep8),
+pydocstyle (formerly "pep257"; https://github.com/PyCQA/pydocstyle),
+Pyflakes (https://launchpad.net/pyflakes),
+Pylint (http://www.pylint.org/), and Ned Batchelder's McCabe script
+(http://nedbatchelder.com/blog/200803/python_code_complexity_microtool.html).
+See the project's page for details:
+
+    https://github.com/klen/pylama
+
+Note~
+
+The Pylint backend requires you to install "pylama_pylint":
+
+    https://github.com/klen/pylama_pylint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+10. Pylint                                           *syntastic-python-pylint*
+
+Name:        pylint
+Author: Parantapa Bhattacharya <parantapa@gmail.com>
+
+"Pylint" is a code checker for Python. See the project's page for details:
+
+    http://www.pylint.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Notes~
+
+On OS X you need to set the environment variable "LC_CTYPE" to "UTF-8"
+before running Vim: >
+    LC_CTYPE=en_US.UTF-8
+    export LC_CTYPE
+<
+Several people have expressed interest in showing the old message IDs
+along with the error messages. You can override the message format in
+'g:syntastic_python_pylint_post_args'. Please note that the new format must
+start with "{path}:{line}:{column}:{C}: ", otherwise syntastic will not
+recognise any messages. Example: >
+    let g:syntastic_python_pylint_post_args =
+        \ '--msg-template="{path}:{line}:{column}:{C}: [{symbol} {msg_id}] {msg}"'
+<
+------------------------------------------------------------------------------
+11. python                                           *syntastic-python-python*
+
+Name:        python
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+This checker uses Python's builtin "compile()" function for detecting syntax
+errors.
+
+Syntastic requires Python version 2.6 or later.
+
+Codecs~
+
+In Python you have the ability to specify a particular codec at the top of
+the file with a special comment that looks something like this: >
+    # coding: spec
+<
+Further references:
+
+    https://docs.python.org/reference/lexical_analysis.html#encoding-declarations
+
+Python will see this comment at import time and use the corresponding codec to
+transform the file before using it. The "python" checker has an option
+|'g:syntastic_python_python_use_codec'| that will make syntastic aware of such
+comments before running compiler checks on the file.
+
+Please note that transforming a file like this affects line numbers and
+column numbers, and syntastic has no way to make the necessary adjustments.
+Consequently, errors might appear on surprising lines if you enable this
+feature and the transformed file has code on different lines than the raw
+file. For this reason the use of these transformations should be limited
+to codecs that preserve line numbers, such as the "spec" codec provided by
+"NoseOfYeti":
+
+    https://noseofyeti.readthedocs.org/en/latest/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                       *'g:syntastic_python_python_use_codec'*
+Type: boolean
+Default: 0
+Enables handling of "# coding: spec" comments.
+
+==============================================================================
+SYNTAX CHECKERS FOR QML                               *syntastic-checkers-qml*
+
+The following checkers are available for QML (filetype "qml"):
+
+    1. qmllint..................|syntastic-qml-qmllint|
+
+------------------------------------------------------------------------------
+1. qmllint                                             *syntastic-qml-qmllint*
+
+Name:        qmllint
+Maintainer:  Peter Wu <peter@lekensteyn.nl>
+
+"qmllint" is a QML syntax verifier. It was introduced with Qt 5.4 (cf.
+https://www.kdab.com/kdab-contributions-qt-5-4-qmllint/) as part of Qt
+Declarative:
+
+    https://code.qt.io/cgit/qt/qtdeclarative.git/tree/tools/qmllint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR R                                   *syntastic-checkers-r*
+
+The following checkers are available for R (filetype "r"):
+
+    1. lint.....................|syntastic-r-lint|
+    2. lintr....................|syntastic-r-lintr|
+    3. svtools..................|syntastic-r-svtools|
+
+------------------------------------------------------------------------------
+1. lint                                                     *syntastic-r-lint*
+
+Name:        lint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+This is a style checker for R files, using the R package "lint":
+
+    http://cran.r-project.org/web/packages/lint/
+
+Checker option~
+
+                                                 *'g:syntastic_r_lint_styles'*
+Type: string
+Default: "lint.style"
+R list of style tests to apply.
+
+Set 'g:syntastic_r_lint_styles' to something like this: >
+    let g:syntastic_r_lint_styles =
+        \ 'list(spacing.indentation.notabs, spacing.indentation.evenindent)'
+<
+See "lint"'s manual for possible values:
+
+    http://cran.r-project.org/web/packages/lint/lint.pdf
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_r_lint_<option>' variables. The only exception is
+'g:syntastic_r_lint_exec', which can still be used to override the "R"
+executable.
+
+Limitations~
+
+The checker uses column numbers only when running into syntax errors.  If
+you're checking files containing tab characters, then Vim's 'tabstop' must
+match R's idea of tabstop, otherwise column numbers will be shifted. At the
+time of this writing R's tabstop is hardcoded to 8, so you should probably
+add something like this to your vimrc: >
+    set tabstop=8
+<
+The "lint" package will only show at most 5 messages of a kind. At the time of
+this writing this is not configurable.
+
+Beware also that the checker is pretty slow when using the default style
+setting of "lint.style".
+
+------------------------------------------------------------------------------
+2. lintr                                                   *syntastic-r-lintr*
+
+Name:        lintr
+Maintainer:  Jim Hester <james.f.hester@gmail.com>
+
+"lintr" is a static code analysis tool for R files. See the project's page at
+GitHub for details:
+
+    https://github.com/jimhester/lintr
+
+Security~
+
+This checker executes parts of the files it checks. This is probably fine if
+you wrote the file yourself, but it can be a problem if you're trying to check
+third party files. If you are 100% willing to let Vim run the code in your
+file, set 'g:syntastic_enable_r_lintr_checker' to 1 in your vimrc to enable
+this checker: >
+    let g:syntastic_enable_r_lintr_checker = 1
+<
+There is also a buffer-local version of this variable, that takes precedence
+over it in the buffers where it is defined.
+
+Please note that setting this variable doesn't automatically enable the
+checker, you still need to add "lintr" to 'g:syntastic_r_checkers' if you plan
+to use it.
+
+Checker Options~
+                                               *'g:syntastic_r_lintr_linters'*
+Type: string
+Default: "default_linters"
+Which "lintr" linters to apply to your code.
+
+                                                 *'g:syntastic_r_lintr_cache'*
+Type: string
+Default: "FALSE"
+Whether to use the lintr cache. This speeds up linting time, but can introduce
+false positives in some cases.
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_r_lintr_<option>' variables. The only exception is
+'g:syntastic_r_lintr_exec', which can still be used to override the "R"
+executable.
+
+See also: |syntastic-rmd-lintr|.
+
+------------------------------------------------------------------------------
+3. svtools                                               *syntastic-r-svtools*
+
+Name:        svtools
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+This is a checker for R files, using the R package "svTools":
+
+    http://cran.r-project.org/web/packages/svTools/
+
+In turn, this package delegates most of the work to the "checkUsage()"
+function in the "codetools" package:
+
+    http://cran.r-project.org/web/packages/codetools/
+
+Security~
+
+This checker executes parts of the files it checks. This is probably fine if
+you wrote the file yourself, but it can be a problem if you're trying to check
+third party files. If you are 100% willing to let Vim run the code in your
+file, set 'g:syntastic_enable_r_svtools_checker' to 1 in your vimrc to enable
+this checker: >
+    let g:syntastic_enable_r_svtools_checker = 1
+<
+There is also a buffer-local version of this variable, that takes precedence
+over it in the buffers where it is defined.
+
+Please note that setting this variable doesn't automatically enable the
+checker, you still need to add "svtools" to 'g:syntastic_r_checkers' if you
+plan to use it.
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_r_svtools_<option>' variables. The only exception is
+'g:syntastic_r_svtools_exec', which can still be used to override the "R"
+executable.
+
+Limitations~
+
+"svTools" version 0.9-4 (current at the time of this writing) has a number
+of problems that prevents it from checking most sources. You might consider
+applying this patch as a workaround:
+
+    https://gist.github.com/lcd047/9988687#file-svtools-patch
+
+At the time of this writing "svTools" doesn't produce meaningful column
+numbers (the column numbers are always set to 1). The patch mentioned above
+enables "svTools" to produce more useful column numbers, but only for syntax
+errors. If you apply the said patch and you're checking files containing
+tab characters Vim's 'tabstop' must match "R"'s idea of tabstop, otherwise
+column numbers will be shifted. At the time of this writing "R"'s tabstop is
+hardcoded to 8, so you should probably add something like this to your vimrc: >
+    set tabstop=8
+<
+==============================================================================
+SYNTAX CHECKERS FOR R MARKDOWN                        *syntastic-checkers-rmd*
+
+The following checkers are available for R Markdown (filetype "rmd"):
+
+    1. lintr....................|syntastic-rmd-lintr|
+
+------------------------------------------------------------------------------
+1. lintr                                                 *syntastic-rmd-lintr*
+
+Name:        lintr
+Maintainer:  Jim Hester <james.f.hester@gmail.com>
+
+"lintr" is a static code analysis tool for R files.  See the project's page at
+GitHub for details:
+
+    https://github.com/jimhester/lintr
+
+Security~
+
+This checker executes parts of the files it checks. This is probably fine if
+you wrote the file yourself, but it can be a problem if you're trying to check
+third party files. If you are 100% willing to let Vim run the code in your
+file, set 'g:syntastic_enable_r_lintr_checker' to 1 in your vimrc to enable
+this checker: >
+    let g:syntastic_enable_r_lintr_checker = 1
+<
+There is also a buffer-local version of this variable, that takes precedence
+over it in the buffers where it is defined.
+
+Please note that setting this variable doesn't automatically enable the
+checker, you still need to add "lintr" to 'g:syntastic_rmd_checkers' if you
+plan to use it.
+
+Checker Options~
+                                               'g:syntastic_r_lintr_linters'
+Type: string
+Default: "default_linters"
+Which "lintr" linters to apply to your code.
+
+                                                 'g:syntastic_r_lintr_cache'
+Type: string
+Default: "FALSE"
+Whether to use the lintr cache. This speeds up linting time, but can introduce
+false positives in some cases.
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_rmd_lintr_<option>' variables. The only exception is
+'g:syntastic_rmd_lintr_exec', which can still be used to override the "R"
+executable.
+
+See also: |syntastic-r-lintr|.
+
+==============================================================================
+SYNTAX CHECKERS FOR RACKET                         *syntastic-checkers-racket*
+
+The following checkers are available for Racket (filetype "racket"):
+
+    1. code-ayatollah...........|syntastic-racket-code-ayatollah|
+    2. racket...................|syntastic-racket-racket|
+
+------------------------------------------------------------------------------
+1. code-ayatollah                            *syntastic-racket-code-ayatollah*
+
+Name:        code_ayatollah
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+Installation~
+
+Download "code-ayatollah.rkt" (http://tmp.barzilay.org/code-ayatollah.rkt)
+and point 'g:syntastic_racket_code_ayatollah_script' to it: >
+    let g:syntastic_racket_code_ayatollah_script = "/path/to/code-ayatollah.rkt"
+<
+Of course, you also need "racket" (http://racket-lang.org/).
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. racket                                            *syntastic-racket-racket*
+
+Name:        racket
+Maintainer:  Steve Bragg <steve@empresseffects.com>
+
+Security~
+
+This checker executes the code in the files it checks:
+
+    https://github.com/vim-syntastic/syntastic/issues/1773
+
+This is probably fine if you wrote the files yourself, but it can be a problem
+if you're trying to check third party files. If you are 100% willing to let
+Vim run the code in your files, set 'g:syntastic_enable_racket_racket_checker'
+to 1 in your vimrc to enable this checker: >
+    let g:syntastic_enable_racket_racket_checker = 1
+<
+There is also a buffer-local version of this variable, that takes precedence
+over a global one in the buffers where it is defined.
+
+Please note that setting this variable doesn't automatically enable the
+checker, you still need to add "racket" to 'g:syntastic_racket_checkers' if
+you plan to use it.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR RELAX NG                          *syntastic-checkers-rnc*
+
+The following checkers are available for Relax NG (filetype "rnc"):
+
+    1. rnv......................|syntastic-rnc-rnv|
+
+------------------------------------------------------------------------------
+1. rnv                                                     *syntastic-rnc-rnv*
+
+Name:        rnv
+Maintainer:  Remko Tronçon <remko@el-tramo.be>
+
+"RNV" is an implementation of Relax NG Compact Syntax validator (cf.
+http://relaxng.org/compact-20021121.html). See the project's page for
+details:
+
+    http://www.davidashen.net/rnv.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR RESTRUCTUREDTEXT                  *syntastic-checkers-rst*
+
+The following checkers are available for reStructuredText (filetype "rst"):
+
+    1. proselint................|syntastic-rst-proselint|
+    2. rst2pseudoxml............|syntastic-rst-rst2pseudoxml|
+    3. rstcheck.................|syntastic-rst-rstcheck|
+    4. Sphinx...................|syntastic-rst-sphinx|
+
+------------------------------------------------------------------------------
+1. proselint                                         *syntastic-rst-proselint*
+
+Name:        proselint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"proselint" is a linter for prose. See the page for details:
+
+    http://proselint.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-asciidoc-proselint|, |syntastic-help-proselint|,
+|syntastic-html-proselint|, |syntastic-markdown-proselint|,
+|syntastic-nroff-proselint|, |syntastic-pod-proselint|,
+|syntastic-tex-proselint|, |syntastic-texinfo-proselint|,
+|syntastic-text-proselint|, |syntastic-xhtml-proselint|.
+
+------------------------------------------------------------------------------
+2. rst2pseudoxml                                 *syntastic-rst-rst2pseudoxml*
+
+Name:        rst2pseudoxml
+Maintainer:  James Rowe <jnrowe@gmail.com>
+
+"rst2pseudoxml" is part of the Python package Docutils:
+
+    http://docutils.sourceforge.net/
+
+We use "rst2pseudoxml", as it is ever so marginally faster than the other
+"rst2${x}" tools in docutils.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+3. rstcheck                                           *syntastic-rst-rstcheck*
+
+Name:        rstcheck
+Maintainer:  Steven Myint <git@stevenmyint.com>
+
+"rstcheck" is a checker for reStructuredText files. See the project's page at
+GitHub for details:
+
+    https://github.com/myint/rstcheck
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+4. Sphinx                                               *syntastic-rst-sphinx*
+
+Name:        sphinx
+Maintainer:  Buck Evan <buck@yelp.com>
+
+"Sphinx" is a checker for documentation files written in the Sphinx dialect
+of reStructuredText, using the "pseudoxml" builder of "sphinx-build". See the
+project's page for details:
+
+    http://sphinx-doc.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                         *'g:syntastic_rst_sphinx_source_dir'*
+Type: string
+Default: unset
+Base directory of the project being checked.
+
+                                         *'g:syntastic_rst_sphinx_config_dir'*
+Type: string
+Default: unset
+Directory containing the "conf.py" file.
+
+Notes~
+
+The checker needs to know two paths to run: the source directory where the
+project's files are located, and the directory where the configuration file
+"conf.py" is located. By default it looks for "conf.py" in the base directory
+of the current file, then upwards in parent directories. If a configuration
+file is found and the file is readable, its base directory is assumed to be
+both the source directory and the configuration directory of the project.
+
+If syntastic can't determine the source directory or the configuration
+directory, or if you want to override the autodetected paths, options
+|'g:syntastic_rst_sphinx_source_dir'| and |'g:syntastic_rst_sphinx_config_dir'|
+take precedence over the detected values.
+
+Please note also that the checker creates output files in a temporary directory
+that is created upon the first run in the current session, and is removed when
+Vim exits. If you need to change the location of this directory you can do
+so by exporting the environment variables "TMPDIR" or "TMP" (on UNIX and Mac
+OS-X), or "TEMP" (on Windows) before running Vim. Various index files are also
+cached in this directory, so it might be advantageous to avoid quitting Vim
+between checker runs.
+
+==============================================================================
+SYNTAX CHECKERS FOR RPM SPEC                         *syntastic-checkers-spec*
+
+The following checkers are available for Linux RPM packages (filetype "spec"):
+
+    1. rpmlint..................|syntastic-spec-rpmlint|
+
+------------------------------------------------------------------------------
+1. rpmlint                                            *syntastic-spec-rpmlint*
+
+Name:        rpmlint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"rpmlint" is a tool for checking Linux RPM packages. See the project's page
+for details:
+
+    http://sourceforge.net/projects/rpmlint/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR RUBY                             *syntastic-checkers-ruby*
+
+The following checkers are available for Ruby (filetype "ruby"):
+
+    1. Flog.....................|syntastic-ruby-flog|
+    2. JRuby....................|syntastic-ruby-jruby|
+    3. MacRuby..................|syntastic-ruby-macruby|
+    4. MRI......................|syntastic-ruby-mri|
+    5. reek.....................|syntastic-ruby-reek|
+    6. RuboCop..................|syntastic-ruby-rubocop|
+    7. Ruby-lint................|syntastic-ruby-rubylint|
+
+------------------------------------------------------------------------------
+1. Flog                                                  *syntastic-ruby-flog*
+
+Name:        flog
+Maintainer:  Tim Carry <tim@pixelastic.com>
+
+"Flog" is a complexity checker for Ruby files. See the project's page for
+details:
+
+    http://ruby.sadi.st/Flog.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                   *'g:syntastic_ruby_flog_threshold_warning'*
+Type: number
+Default: 45
+Threshold for warnings. Functions with complexity below this number are not
+flagged as either errors or warnings.
+
+                                     *'g:syntastic_ruby_flog_threshold_error'*
+Type: number
+Default: 90
+Threshold for errors. Functions with complexity above this number are flagged
+as errors.
+
+
+Note~
+
+"Flog" reports complexity values as floating point numbers. If your Vim is
+not compiled with the "+float" feature, both the numbers reported by flog and
+the two options above are rounded by syntastic towards zero (that is, "39.9"
+is taken as "39").
+
+------------------------------------------------------------------------------
+2. JRuby                                                *syntastic-ruby-jruby*
+
+Name:        jruby
+Maintainer:  Leonid Shevtsov <leonid@shevtsov.me>
+
+"JRuby" is a Java implementation of the Ruby programming language. See the
+project's page for details:
+
+    http://jruby.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+3. MacRuby                                            *syntastic-ruby-macruby*
+
+Name:        macruby
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"MacRuby" is an implementation of Ruby for Mac OS X. See the project's
+page for details:
+
+    http://www.macruby.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+4. MRI                                                    *syntastic-ruby-mri*
+
+Name:        mri
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                                     *'g:syntastic_ruby_exec'*
+Type: string
+Default: unset
+Ruby executable. This is a convenience variable shared with the eRuby checker
+"Ruby" (cf. |syntastic-eruby-ruby|). Used only if 'g:syntastic_ruby_mri_exec'
+is unset.
+
+------------------------------------------------------------------------------
+5. Reek                                                  *syntastic-ruby-reek*
+
+Name:        reek
+Maintainer:  Mindaugas Mozūras
+
+"Reek" is a code smell detection tool for Ruby. See the project's page at
+GitHub for details:
+
+    https://github.com/troessner/reek
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+6. RuboCop                                            *syntastic-ruby-rubocop*
+
+Name:        rubocop
+Maintainer:  Recai OktaÅŸ <roktas@bil.omu.edu.tr>
+
+"RuboCop" is a style checker for Ruby. See the project's page for details:
+
+    https://github.com/bbatsov/rubocop
+
+Syntastic requires "RuboCop" version 0.12.0 or later.
+
+Running "RuboCop" under development versions of "Ruby" is explicitly NOT
+supported.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Notes~
+
+Most issues returned by "rubocop" are warnings, so for best results your
+|'syntastic_quiet_messages'| should not filter out warnings.
+
+If the "RuboCop" checker is not enabled automatically by syntastic try
+running "rubocop --version" from the shell. If it complains about "Parser"
+(see https://github.com/whitequark/parser) expecting a different version of
+"Ruby" than you are running, your configuration is not directly supported by
+syntastic.
+
+While passing around the blame for this does have a certain entertaining value
+(cf. https://github.com/bbatsov/rubocop/issues/1819), the problem is real,
+since "Ruby" syntax did change between versions. The solution is to run a
+system such as "rbenv" (http://rbenv.org/) or "rvm" (https://rvm.io/), that
+allows you to run multiple versions of "Ruby" without conflicts: >
+    $ rbenv version
+    2.1.3 (set by /usr/local/var/rbenv/version)
+    
+    $ rubocop --version
+    warning: parser/current is loading parser/ruby21, which recognizes
+    warning: 2.1.2-compliant syntax, but you are running 2.1.3.
+    0.26.1
+    
+    $ rbenv shell 2.1.2
+    
+    $ rubocop --version
+    0.26.1
+<
+Alternatively, if you absolutely must do it the wrong way, you can
+also install a wrapper script that kills the version warning and point
+'g:syntastic_ruby_rubocop_exec' to it:
+
+    https://gist.github.com/lcd047/96138909015f2f8d2d36
+
+------------------------------------------------------------------------------
+7. Ruby-lint                                         *syntastic-ruby-rubylint*
+
+Name:        rubylint
+Maintainer:  Yorick Peterse <yorickpeterse@gmail.com>
+
+"Ruby-lint" is a linter and static code analysis tool for Ruby. See the
+project's page for details:
+
+    https://github.com/YorickPeterse/ruby-lint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+If the "rubylint" checker is not enabled automatically by syntastic, try
+running "ruby-lint --version" from the shell. If it complains about "Parser"
+(see https://github.com/whitequark/parser) expecting a different version of
+"Ruby" than you are running, your configuration is not directly supported by
+syntastic.
+
+While passing around the blame for this does have a certain entertaining value
+(cf. https://github.com/bbatsov/rubocop/issues/1819), the problem is real,
+since "Ruby" syntax did change between versions. The solution is to run a
+system such as "rbenv" (http://rbenv.org/) or "rvm" (https://rvm.io/), that
+allows you to run multiple versions of "Ruby" without conflicts: >
+    $ rbenv version
+    2.1.3 (set by /usr/local/var/rbenv/version)
+    
+    $ ruby-lint --version
+    warning: parser/current is loading parser/ruby21, which recognizes
+    warning: 2.1.2-compliant syntax, but you are running 2.1.3.
+    ruby-lint v2.0.4 on ruby 2.1.3 [i486-linux]
+    
+    $ rbenv shell 2.1.2
+    
+    $ ruby-lint --version
+    ruby-lint v2.0.4 on ruby 2.1.2 [i486-linux]
+<
+Alternatively, if you absolutely must do it the wrong way, you can
+also install a wrapper script that kills the version warning and point
+'g:syntastic_ruby_rubylint_exec' to it:
+
+    https://gist.github.com/lcd047/492245d9923af45fb964
+
+==============================================================================
+SYNTAX CHECKERS FOR SASS                             *syntastic-checkers-sass*
+
+The following checkers are available for SASS (filetype "sass"):
+
+    1. Sass.....................|syntastic-sass-sass|
+    2. Sass Lint................|syntastic-sass-sass_lint|
+    3. SassC....................|syntastic-sass-sassc|
+
+------------------------------------------------------------------------------
+1. Sass                                                  *syntastic-sass-sass*
+
+Name:        sass
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"Sass" is a translator for SASS. See the project's page for details:
+
+    http://sass-lang.com/
+
+Installation~
+
+Install it with "gem": >
+    gem install sass
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-scss-sass|.
+
+------------------------------------------------------------------------------
+2. Sass Lint                                        *syntastic-sass-sass_lint*
+
+Name:        sass_lint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Sass Lint" is a checker for SASS and SCSS files. See the project's page for
+details:
+
+    https://github.com/sasstools/sass-lint
+
+Syntastic requires "Sass Lint" version 1.5.0 or later.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-scss-sass_lint|.
+
+------------------------------------------------------------------------------
+3. SassC                                                *syntastic-sass-sassc*
+
+Name:        sassc
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"SassC" is a checker for SASS and SCSS files, based on the "libsass" library
+(https://github.com/hcatlin/libsass). See the project's page for details:
+
+    https://github.com/hcatlin/sassc
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-scss-sassc|.
+
+==============================================================================
+SYNTAX CHECKERS FOR SCALA                           *syntastic-checkers-scala*
+
+The following checkers are available for Scala (filetype "scala"):
+
+    1. fsc......................|syntastic-scala-fsc|
+    2. scalac...................|syntastic-scala-scalac|
+    3. Scalastyle...............|syntastic-scala-scalastyle|
+
+------------------------------------------------------------------------------
+1. fsc                                                   *syntastic-scala-fsc*
+
+Name:        fsc
+Maintainer:  Gregor Uhlenheuer <kongo2002@gmail.com>
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. scalac                                             *syntastic-scala-scalac*
+
+Name:        scalac
+Maintainer:  Rickey Visinski <rickeyvisinski@gmail.com>
+
+"scalac" is a compiler for Scala. See the project's page for more information:
+
+    http://docs.scala-lang.org
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+3. Scalastyle                                     *syntastic-scala-scalastyle*
+
+Name:        scalastyle
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Scalastyle" is a style checker for Scala. See the project's page for
+details:
+
+    http://www.scalastyle.org/
+
+Syntastic uses the command line version of "Scalastyle":
+
+    http://www.scalastyle.org/command-line.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                          *'g:syntastic_scala_scalastyle_jar'*
+Type: string
+Default: "scalastyle-batch_2.10.jar"
+Path to the "scalastyle-batch" jar file. You might want to set this to a full
+path.
+
+                                  *'g:syntastic_scala_scalastyle_config_file'*
+Type: string
+Default: "scalastyle_config.xml"
+Path to the configuration file to use. You might want to also set this to a
+full path.
+
+==============================================================================
+SYNTAX CHECKERS FOR SCSS                             *syntastic-checkers-scss*
+
+The following checkers are available for SCSS (filetype "scss"):
+
+    1. mixedindentlint..........|syntastic-scss-mixedindentlint|
+    2. Sass.....................|syntastic-scss-sass|
+    3. Sass Lint................|syntastic-scss-sass_lint|
+    4. SassC....................|syntastic-scss-sassc|
+    5. SCSS-lint................|syntastic-scss-scss_lint|
+    6. stylelint................|syntastic-scss-stylelint|
+
+------------------------------------------------------------------------------
+1. mixedindentlint                            *syntastic-scss-mixedindentlint*
+
+Name:        mixedindentlint
+Maintainer:  Payton Swick <payton@foolord.com>
+
+"mixedindentlint" is a general-purpose indentation checker. See the project's
+page at GitHub for more information:
+
+    https://github.com/sirbrillig/mixedindentlint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-css-mixedindentlint|, |syntastic-javascript-mixedindentlint|.
+
+------------------------------------------------------------------------------
+2. Sass                                                  *syntastic-scss-sass*
+
+Name:        sass
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"Sass" is a translator for SASS. See the project's page for details:
+
+    http://sass-lang.com/
+
+Installation~
+
+Install it with "gem": >
+    gem install sass
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-sass-sass|.
+
+------------------------------------------------------------------------------
+3. Sass Lint                                        *syntastic-scss-sass_lint*
+
+Name:        sass_lint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Sass Lint" is a checker for SASS and SCSS files. See the project's page for
+details:
+
+    https://github.com/sasstools/sass-lint
+
+Syntastic requires "Sass Lint" version 1.5.0 or later.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-sass-sass_lint|.
+
+------------------------------------------------------------------------------
+4. SassC                                                *syntastic-scss-sassc*
+
+Name:        sassc
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+
+"SassC" is a checker for SASS and SCSS files, based on the "libsass" library
+(https://github.com/hcatlin/libsass). See the project's page for details:
+
+    https://github.com/hcatlin/sassc
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-sass-sassc|.
+
+------------------------------------------------------------------------------
+5. SCSS-lint                                        *syntastic-scss-scss_lint*
+
+Name:        scss_lint
+Maintainer:  Shane da Silva <shane@dasilva.io>
+
+"SCSS-Lint" is a lint tool for SCSS. See the project's page for details:
+
+    https://github.com/brigade/scss-lint
+
+Syntastic requires "SCSS-Lint" version 0.29.0 or later.
+
+Installation~
+
+Install it with "gem": >
+    gem install scss_lint
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+6. stylelint                                        *syntastic-scss-stylelint*
+
+Name:        stylelint
+Maintainer:  Tim Carry <tim@pixelastic.com>
+
+"stylelint" is a style checker for Cascading Stylesheets. See the project's
+page for more information:
+
+    http://stylelint.io/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-css-stylelint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR SH                                 *syntastic-checkers-sh*
+
+The following checkers are available for Sh (filetype "sh"):
+
+    1. Bashate..................|syntastic-sh-bashate|
+    2. checkbashisms............|syntastic-sh-checkbashisms|
+    3. sh.......................|syntastic-sh-sh|
+    4. ShellCheck...............|syntastic-sh-shellcheck|
+
+------------------------------------------------------------------------------
+1. Bashate                                              *syntastic-sh-bashate*
+
+Name:        bashate
+Maintainer:  aswna
+
+"Bashate" is a style checker for bash scripts used by the OpenStack
+(http://www.openstack.org/). See the project's page at GitHub for details:
+
+    https://github.com/openstack-dev/bashate
+
+Installation~
+
+Install it with "pip": >
+    pip install bashate
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. checkbashisms                                  *syntastic-sh-checkbashisms*
+
+Name:        checkbashisms
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"checkbashisms" is part of the Linux "devscripts" package. It can be obtained
+from the Debian source archive:
+
+    http://packages.qa.debian.org/d/devscripts.html
+
+For FreeBSD and OpenBSD you can also install the "devel/checkbashisms" port.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+3. sh                                                        *syntastic-sh-sh*
+
+Name:        sh
+Maintainer:  Gregor Uhlenheuer <kongo2002@gmail.com>
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+4. ShellCheck                                        *syntastic-sh-shellcheck*
+
+Name:        shellcheck
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"ShellCheck" is a static analysis tool for Bourne shell scripts. See the
+project's page for details:
+
+    http://www.shellcheck.net/about.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR SLIM                             *syntastic-checkers-slim*
+
+The following checkers are available for Slim (filetype "slim"):
+
+    1. Slim-Lint................|syntastic-slim-slim_lint|
+    2. Slimrb...................|syntastic-slim-slimrb|
+
+------------------------------------------------------------------------------
+1. Slim-Lint                                        *syntastic-slim-slim_lint*
+
+Name:        slim_lint
+Maintainer:  Vasily Kolesnikov <re.vkolesnikov@gmail.com>
+
+"Slim-Lint" is a style checker for Slim files (http://slim-lang.com/).  See
+the project's page at GitHub for details:
+
+    https://github.com/sds/slim-lint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Installation~
+
+You can install "Slim-Lint" with "gem": >
+    gem install slim_lint
+<
+------------------------------------------------------------------------------
+2. Slimrb                                              *syntastic-slim-slimrb*
+
+Name:        slimrb
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"Slimrb" is a processor for the template language Slim
+(http://slim-lang.com/). See the project's page for details:
+
+    https://github.com/slim-template/slim
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR SML                               *syntastic-checkers-sml*
+
+The following checkers are available for SML (filetype "sml"):
+
+    1. smlnj....................|syntastic-sml-smlnj|
+
+------------------------------------------------------------------------------
+1. smlnj                                                 *syntastic-sml-smlnj*
+
+Name:        smlnj
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"smlnj" is a compiler for Standard ML '97. See the project's page for details:
+
+    http://www.smlnj.org/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR SOLIDITY                     *syntastic-checkers-solidity*
+
+The following checkers are available for Solidity (filetype "solidity"):
+
+    1. solc.....................|syntastic-solidity-solc|
+
+------------------------------------------------------------------------------
+1. solc                                              *syntastic-solidity-solc*
+
+Name:        solc 
+Maintainer:  Jacob Cholewa <jacob@cholewa.dk>
+
+"solc" is a compiler for Ethereum's smart-contract language "Solidity"
+(https://solidity.readthedocs.io/). See the project's page for details:
+
+    https://github.com/ethereum/solidity
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You probably also need a plugin to set |filetype| for Solidity files, such as
+"vim-solidity":
+
+    https://github.com/tomlion/vim-solidity
+
+
+==============================================================================
+SYNTAX CHECKERS FOR SQL                               *syntastic-checkers-sql*
+
+The following checkers are available for SQL (filetype "sql"):
+
+    1. sqlint...................|syntastic-sql-sqlint|
+
+------------------------------------------------------------------------------
+1. sqlint                                               *syntastic-sql-sqlint*
+
+Name:        sqlint
+Maintainer:  Steve Purcell <steve@sanityinc.com>
+
+"sqlint" is a lint checker for ANSI SQL. See the project's page at GitHub for
+details:
+
+    https://github.com/purcell/sqlint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR STYLUS                         *syntastic-checkers-stylus*
+
+The following checkers are available for Stylus (filetype "stylus"):
+
+    1. Stylint..................|syntastic-stylus-stylint|
+
+------------------------------------------------------------------------------
+1. Stylint                                          *syntastic-stylus-stylint*
+
+Name:        stylint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Stylint" is a linter for Stylus (http://learnboost.github.io/stylus). See
+the project's page at GitHub for details:
+
+    https://github.com/SimenB/stylint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You might also find useful the "vim-stylus" plugin:
+
+    https://github.com/wavded/vim-stylus
+
+==============================================================================
+SYNTAX CHECKERS FOR TCL                               *syntastic-checkers-tcl*
+
+The following checkers are available for Tcl (filetype "tcl"):
+
+    1. nagelfar.................|syntastic-tcl-nagelfar|
+
+------------------------------------------------------------------------------
+1. nagelfar                                           *syntastic-tcl-nagelfar*
+
+Name:        nagelfar
+Maintainer:  James Pickard <james.pickard@gmail.com>
+
+"Nagelfar" is a syntax checker for Tcl. See the project's page for details:
+
+    http://nagelfar.sourceforge.net/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR TEX                               *syntastic-checkers-tex*
+
+The following checkers are available for TeX (filetype "tex"):
+
+    1. ChkTeX...................|syntastic-tex-chktex|
+    2. lacheck..................|syntastic-tex-lacheck|
+    3. proselint................|syntastic-tex-proselint|
+
+------------------------------------------------------------------------------
+1. ChkTeX                                               *syntastic-tex-chktex*
+
+Name:        chktex
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"ChkTeX" is a checker for TeX and LaTeX. See the project's page for details:
+
+    http://baruch.ev-en.org/proj/chktex/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                           *'g:syntastic_tex_chktex_showmsgs'*
+Type: boolean
+Default: 1
+Whether to show informational messages ("chktex" option "-m"). By default
+informational messages are shown as warnings.
+
+------------------------------------------------------------------------------
+2. lacheck                                             *syntastic-tex-lacheck*
+
+Name:        lacheck
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"lacheck" is a style checker for LaTeX documents. See the project's page for
+details:
+
+    http://www.ctan.org/tex-archive/support/lacheck
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Limitations~
+
+At the time of this writing "lacheck" can't expand "\def" commands. As a
+result, most "\input" commands using macros are signaled as errors.
+
+------------------------------------------------------------------------------
+3. proselint                                         *syntastic-tex-proselint*
+
+Name:        proselint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"proselint" is a linter for prose. See the page for details:
+
+    http://proselint.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-asciidoc-proselint|, |syntastic-help-proselint|,
+|syntastic-html-proselint|, |syntastic-markdown-proselint|,
+|syntastic-nroff-proselint|, |syntastic-pod-proselint|,
+|syntastic-rst-proselint|, |syntastic-texinfo-proselint|,
+|syntastic-text-proselint|, |syntastic-xhtml-proselint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR TEXINFO                       *syntastic-checkers-texinfo*
+
+The following checkers are available for Texinfo (filetype "texinfo"):
+
+    1. Makeinfo.................|syntastic-texinfo-makeinfo|
+    2. proselint................|syntastic-texinfo-proselint|
+
+------------------------------------------------------------------------------
+1. Makeinfo                                       *syntastic-texinfo-makeinfo*
+
+Name:        makeinfo
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Makeinfo" is a converter for Texinfo files. It is distributed together with
+the GNU package "texinfo":
+
+    http://www.gnu.org/software/texinfo/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. proselint                                     *syntastic-texinfo-proselint*
+
+Name:        proselint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"proselint" is a linter for prose. See the page for details:
+
+    http://proselint.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-asciidoc-proselint|, |syntastic-help-proselint|,
+|syntastic-html-proselint|, |syntastic-markdown-proselint|,
+|syntastic-nroff-proselint|, |syntastic-pod-proselint|,
+|syntastic-rst-proselint|, |syntastic-tex-proselint|,
+|syntastic-text-proselint|, |syntastic-xhtml-proselint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR TEXT                             *syntastic-checkers-text*
+
+The following checkers are available for plain text (filetype "text"):
+
+    1. atdtool..................|syntastic-text-atdtool|
+    2. Igor.....................|syntastic-text-igor|
+    3. language-check...........|syntastic-text-language_check|
+    4. proselint................|syntastic-text-proselint|
+    5. textlint.................|syntastic-text-textlint|
+
+------------------------------------------------------------------------------
+1. atdtool                                            *syntastic-text-atdtool*
+
+Name:        atdtool
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"atdtool" is a script that runs a text file through the "After the Deadline"
+language service (http://www.afterthedeadline.com/) and returns a list of
+spelling, style, and grammar errors. See the project's page for details:
+
+    https://github.com/lpenz/atdtool
+
+See also the list of features of "After the Deadline":
+
+    http://www.afterthedeadline.com/features.slp
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. Igor                                                  *syntastic-text-igor*
+
+Name:        igor
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Igor" is a proofreader for DocBook SGML, man pages, and text files used by
+the FreeBSD (https://www.freebsd.org/). See the author's presentation for
+details:
+
+    http://www.youtube.com/watch?v=sczHqUPygZY
+
+The latest version can be obtained from Glen Barber's repository:
+
+    http://docscripts.glenbarber.us/tags/igor/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-docbk-igor|, |syntastic-nroff-igor|.
+
+------------------------------------------------------------------------------
+3. language-check                              *syntastic-text-language_check*
+
+Name:        language_check
+Maintainer:  Steven Myint <git@stevenmyint.com>
+
+"language-check" is a wrapper for the LanguageTool grammar checker
+(https://www.languagetool.org/). See the project's page for details:
+
+    https://github.com/myint/language-check
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+4. proselint                                        *syntastic-text-proselint*
+
+Name:        proselint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"proselint" is a linter for prose. See the page for details:
+
+    http://proselint.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-asciidoc-proselint|, |syntastic-help-proselint|,
+|syntastic-html-proselint|, |syntastic-markdown-proselint|,
+|syntastic-nroff-proselint|, |syntastic-pod-proselint|,
+|syntastic-rst-proselint|, |syntastic-tex-proselint|,
+|syntastic-texinfo-proselint|, |syntastic-xhtml-proselint|.
+
+------------------------------------------------------------------------------
+5. textlint                                          *syntastic-text-textlint*
+
+Name:        textlint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"textlint" is a natural language linter for text, Markdown, and HTML files.
+See the project's page for details:
+
+    https://textlint.github.io/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-html-textlint|, |syntastic-markdown-textlint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR TRIG                             *syntastic-checkers-trig*
+
+The following checkers are available for TriG (filetype "trig"):
+
+    1. rapper...................|syntastic-trig-rapper|
+
+------------------------------------------------------------------------------
+1. rapper                                              *syntastic-trig-rapper*
+
+Name:        rapper
+Maintainer:  Sebastian Tramp <mail@sebastian.tramp.name>
+
+"rapper" is an RDF parsing and serializing utility. See the project's page for
+details:
+
+    http://librdf.org/raptor/rapper.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You probably also need a plugin to set |filetype| for TriG files, such as
+"Vim-RDF":
+
+    https://github.com/niklasl/vim-rdf
+
+See also: |syntastic-turtle-rapper|.
+
+==============================================================================
+SYNTAX CHECKERS FOR TURTLE                         *syntastic-checkers-turtle*
+
+The following checkers are available for Turtle (filetype "turtle"):
+
+    1. rapper...................|syntastic-turtle-rapper|
+    2. ttl......................|syntastic-turtle-ttl|
+
+------------------------------------------------------------------------------
+1. rapper                                            *syntastic-turtle-rapper*
+
+Name:        rapper
+Maintainer:  Sebastian Tramp <mail@sebastian.tramp.name>
+
+"rapper" is an RDF parsing and serializing utility. See the project's page
+for details:
+
+    http://librdf.org/raptor/rapper.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You probably also need a plugin to set |filetype| for Turtle files, such as
+"Vim-RDF":
+
+    https://github.com/niklasl/vim-rdf
+
+See also: |syntastic-trig-rapper|.
+
+------------------------------------------------------------------------------
+2. ttl                                                  *syntastic-turtle-ttl*
+
+Name:        ttl
+Maintainer:  Antoine Reilles <tonio@NetBSD.org>
+
+"ttl" is an RDF validator. See the project's page at GitHub for details:
+
+    https://github.com/mmlab/TurtleValidator
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You probably also need a plugin to set |filetype| for Turtle files, such as
+"Vim-RDF":
+
+    https://github.com/niklasl/vim-rdf
+
+==============================================================================
+SYNTAX CHECKERS FOR TWIG                             *syntastic-checkers-twig*
+
+The following checkers are available for Twig (filetype "twig"):
+
+    1. twig-lint................|syntastic-twig-twiglint|
+
+------------------------------------------------------------------------------
+1. twig-lint                                         *syntastic-twig-twiglint*
+
+Name:        twiglint
+Maintainer:  Alexander <iam.asm89@gmail.com>
+
+"twig-lint" is a lint tool for Twig templates. See the project's page at
+GitHub for details:
+
+    https://github.com/asm89/twig-lint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Notes~
+
+For the standalone executable, add the following to your vimrc file: >
+    let g:syntastic_twig_twiglint_exec = "php"
+    let g:syntastic_twig_twiglint_exe = "php /path/to/twig-lint.phar"
+<
+For the "Composer" (https://getcomposer.org/) dependency "twig-lint" must be
+in your "$PATH". No further configuration is needed.
+
+==============================================================================
+SYNTAX CHECKERS FOR TYPESCRIPT                 *syntastic-checkers-typescript*
+
+The following checkers are available for TypeScript (filetype "typescript"):
+
+    1. ESLint...................|syntastic-typescript-eslint|
+    2. TSLint...................|syntastic-typescript-tslint|
+
+------------------------------------------------------------------------------
+1. ESLint                                        *syntastic-typescript-eslint*
+
+Name:        eslint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"ESLint" is a tool for identifying and reporting on patterns found
+in ECMAScript/JavaScript code. With the "babel-eslint" plugin
+(https://github.com/babel/babel-eslint) "ESLint" can also be
+used to check TypeScript files. See the project's page for details:
+
+    https://github.com/nzakas/eslint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You probably also need a plugin to set |filetype| for TypeScript files, such
+as "typescript-vim":
+
+    https://github.com/leafgarland/typescript-vim
+
+See also: |syntastic-html-eslint|, |syntastic-javascript-eslint|.
+
+------------------------------------------------------------------------------
+2. TSLint                                        *syntastic-typescript-tslint*
+
+Name:        tslint
+Maintainer:  Seon-Wook Park <seon.wook@swook.net>
+
+"TSLint" is a lint checker for TypeScript. See the project's page for
+details:
+
+    https://github.com/palantir/tslint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You probably also need a plugin to set |filetype| for TypeScript files, such
+as "typescript-vim":
+
+    https://github.com/leafgarland/typescript-vim
+
+==============================================================================
+SYNTAX CHECKERS FOR VALA                             *syntastic-checkers-vala*
+
+The following checkers are available for Vala (filetype "vala"):
+
+    1. Valac....................|syntastic-vala-valac|
+
+------------------------------------------------------------------------------
+1. Valac                                                *syntastic-vala-valac*
+
+Name:        valac
+Maintainer:  Konstantin Stepanov (me@kstep.me)
+
+"valac" is a compiler for Vala. See the project's page for details:
+
+        https://wiki.gnome.org/Projects/Vala
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                                  *'g:syntastic_vala_modules'*
+Type: string or array of strings
+Default: unset
+Space-separated list of Vala modules to be passed as "--pkg" arguments.
+
+                                                *'g:syntastic_vala_vapi_dirs'*
+Type: string or array of strings
+Default: unset
+Space-separated list of "vapi" directories to be passed as "--vapidirs"
+arguments.
+
+Notes~
+
+If |'g:syntastic_vala_modules'| is unset, you can also specify a list of
+module to load for the current file by adding a special comment starting with
+"// modules: " and containing a space-delimited list of names.
+
+If |'g:syntastic_vala_vapi_dirs'| is unset, you can also specify a list of
+"vapi" directories for the current file by adding a special comment starting
+with "// vapidirs:" and containing a space-delimited list of names.
+
+==============================================================================
+SYNTAX CHECKERS FOR VERILOG                       *syntastic-checkers-verilog*
+
+The following checkers are available for Verilog (filetype "verilog"):
+
+    1. Icarus Verilog...........|syntastic-verilog-iverilog|
+    2. Verilator................|syntastic-verilog-verilator|
+
+------------------------------------------------------------------------------
+1. Icarus Verilog                                 *syntastic-verilog-iverilog*
+
+Name:        iverilog
+Maintainer:  Psidium <psiidium@gmail.com>
+
+"Icarus Verilog" is a Verilog simulation and synthesis tool. See the
+project's page for details:
+
+    http://iverilog.icarus.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. Verilator                                     *syntastic-verilog-verilator*
+
+Name:        verilator
+Maintainer:  Kocha <kocha.lsifrontend@gmail.com>
+
+Checker options~
+
+                                              *'g:syntastic_verilog_compiler'*
+Type: string
+Default: "verilator"
+Compiler executable.
+
+                                           *'g:syntastic_verilog_errorformat'*
+Type: string
+Default: unset
+Override for the default |'errorformat'|.
+
+                                 *'g:syntastic_verilog_remove_include_errors'*
+Type: boolean
+Default: 0
+By default, errors in files included from the file being checked are shown.
+Set this variable to 1 to remove messages about errors in included files.
+Please note that this means syntastic will silently abort checks if there are
+fatal errors in one of the included files.
+
+                                      *'g:syntastic_verilog_compiler_options'*
+Type: string
+Default: unset
+Compilation flags (such as defines or include directories) to be passed to the
+checker.
+
+                                           *'g:syntastic_verilog_config_file'*
+Type: string
+Default: ".syntastic_verilog_config"
+File containing additional compilation flags to be passed to the checker, one
+option per line (cf. |syntastic-config-files|).
+
+                                          *'g:syntastic_verilog_include_dirs'*
+Type: array of strings
+Default: []
+Include directories to be passed to the checker, in addition to the
+above compilation flags. You can set it like this: >
+    let g:syntastic_verilog_include_dirs = ["includes", "headers"]
+<
+and the corresponding "-Iincludes -Iheaders" will be added to the compilation
+flags.
+
+                                                *'b:syntastic_verilog_cflags'*
+Type: string
+Default: unset
+Buffer-local variable. Additional compilation flags specific to the current
+buffer.
+
+Note~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_verilog_verilator_<option>' variables. The only
+exception is 'g:syntastic_verilog_verilator_exec', which can still be used to
+override the checker's executable.
+
+==============================================================================
+SYNTAX CHECKERS FOR VHDL                             *syntastic-checkers-vhdl*
+
+The following checkers are available for VHDL (filetype "vhdl"):
+
+    1. GHDL.....................|syntastic-vhdl-ghdl|
+    2. vcom.....................|syntastic-vhdl-vcom|
+
+------------------------------------------------------------------------------
+1. GHDL                                                  *syntastic-vhdl-ghdl*
+
+Name:        ghdl
+Maintainer:  Jan Wagner <jaydyou@janidom.de>
+
+"GHDL" is a VHDL simulator. See the project's page for details:
+
+    http://gna.org/projects/ghdl/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. vcom                                                  *syntastic-vhdl-vcom*
+
+Name:        vcom
+Maintainer:  Jim Vogel <jim.e.vogel@gmail.com>
+
+"vcom" is compiler for VHDL files distributed with the "ModelSim" HDL
+simulation environment:
+
+    https://www.mentor.com/products/fpga/model/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR VIM HELP                         *syntastic-checkers-help*
+
+The following checkers are available for Vim help (filetype "help"):
+
+    1. proselint................|syntastic-help-proselint|
+
+------------------------------------------------------------------------------
+1. proselint                                        *syntastic-help-proselint*
+
+Name:        proselint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"proselint" is a linter for prose. See the page for details:
+
+    http://proselint.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-asciidoc-proselint|, |syntastic-html-proselint|,
+|syntastic-markdown-proselint|, |syntastic-nroff-proselint|,
+|syntastic-pod-proselint|, |syntastic-rst-proselint|,
+|syntastic-tex-proselint|, |syntastic-texinfo-proselint|,
+|syntastic-text-proselint|, |syntastic-xhtml-proselint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR VIML                              *syntastic-checkers-vim*
+
+The following checkers are available for VimL (filetype "vim"):
+
+    1. Vimlint..................|syntastic-vim-vimlint|
+    2. Vint.....................|syntastic-vim-vint|
+
+------------------------------------------------------------------------------
+1. Vimlint                                             *syntastic-vim-vimlint*
+
+Name:        vimlint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Vimlint" is a lint checker for VimL written in pure VimL, based on Yukihiro
+Nakadaira's "vimlparser" (https://github.com/ynkdir/vim-vimlparser/). See the
+project's page for details:
+
+    https://github.com/syngan/vim-vimlint/
+
+Installation~
+
+You need to install the Vim plugins "vim-vimlint" and "vim-vimlparser"
+mentioned above.
+
+Checker Options~
+
+                                               *'g:syntastic_vimlint_options'*
+Type: dictionary
+Default: |EVL102|, |EVL103|, |EVL104|, |EVL105|, |EVL106|, |EVL201|, |EVL204|, and |EVL205|
+    are warnings.
+Dictionary of "Vimlint" options, with the same syntax as |g:vimlint#config|.
+See |g:vimlint#config| and |vimlint-errorcode| for more details.
+
+"Vimlint" does not call the "makeprgBuild()" function, and thus ignores the
+usual 'g:syntastic_vim_vimlint_<option>' variables.
+
+Note~
+
+The values of |'g:syntastic_vimlint_options'| useful for syntastic are those
+that ignore or change the severity of some "EVLxxx" messages.  For example
+to ignore warnings about unused arguments: >
+    let g:syntastic_vimlint_options = { "EVL103": 1 }
+<
+Limitation~
+
+Certain error messages can't be turned off by |'g:syntastic_vimlint_options'|.
+This is a misfeature of "Vimlint" rather than a limitation of syntastic. You
+can still ignore these messages using the standard mechanism of
+|'syntastic_quiet_messages'|: >
+    let g:syntastic_vim_vimlint_quiet_messages = { "regex": '\v\[EVL%(105|205)\]' }
+<
+At the time of this writing the messages that can't be turned off by setting
+|'g:syntastic_vimlint_options'| are:
+
+    |EVL105| - global variable defined without 'g:'
+    |EVL202| - missing call
+    |EVL203| - parse error in command
+    |EVL205| - missing 'scriptencoding'
+    |EVL901| - unknown type
+    |EVL902| - assert error.
+
+------------------------------------------------------------------------------
+2. Vint                                                   *syntastic-vim-vint*
+
+Name:        vint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Vint" is a lint checker for VimL. See the project's page at GitHub for
+details:
+
+    https://github.com/Kuniwak/vint
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR XHTML                           *syntastic-checkers-xhtml*
+
+The following checkers are available for xHTML (filetype "xhtml"):
+
+    1. HTML Tidy................|syntastic-xhtml-tidy|
+    2. jshint...................|syntastic-xhtml-jshint|
+    3. proselint................|syntastic-xhtml-proselint|
+
+------------------------------------------------------------------------------
+1. HTML tidy                                            *syntastic-xhtml-tidy*
+
+Name:        tidy
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"HTML Tidy" is a syntax checker and formatter for HTML. See the HTML Tidy
+Library Project for more information:
+
+    http://tidy.sourceforge.net/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                      *'g:syntastic_xhtml_tidy_ignore_errors'*
+Type: array of strings
+Default: []
+List of errors to ignore. Case-sensitive patterns matched as substrings
+(not regular expressions) against the error messages. See also
+|'syntastic_quiet_messages'|.
+
+See also: |syntastic-html-tidy|.
+
+------------------------------------------------------------------------------
+2. jshint                                             *syntastic-xhtml-jshint*
+
+Name:        JSHint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"JSHint" can detect JavaScript errors and potential problems in HTML
+files. See the project's page for details:
+
+    http://jshint.com/
+
+Syntastic requires "JSHint" version 2.4.0 or later.
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+If you're checking files containing tab characters then "JSHint"'s idea of
+tabstop must match Vim's 'tabstop', otherwise syntastic will highlight the
+errors at shifted positions. By default "JSHint"'s tabstop is 4, while Vim's
+default 'tabstop' is 8.
+
+In order to change "JSHint"'s tabstop you have to change its "indent" config
+option (cf. http://jshint.com/docs/options/#indent). One way to do that is
+to put it in a file named ".jshintrc" in the current directory, the parent
+directories, or your home directory. The file is supposed to be in JSON
+format. For example: >
+    {
+        "indent": 8
+    }
+<
+See JSHint documentation for more details:
+
+    http://jshint.com/docs/
+
+Please note however that setting "indent" also triggers the indentation checks
+in "JSHint". If that is undesirable, your only other option is to leave
+"JSHint"'s tabstop alone, and change Vim's 'tabstop' to 4. To change Vim's
+'tabstop', you can add this to your vimrc: >
+    set tabstop=4
+<
+See also: |syntastic-html-jshint|, |syntastic-javascript-jshint|.
+
+------------------------------------------------------------------------------
+3. proselint                                       *syntastic-xhtml-proselint*
+
+Name:        proselint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"proselint" is a linter for prose. See the page for details:
+
+    http://proselint.com/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-asciidoc-proselint|, |syntastic-help-proselint|,
+|syntastic-html-proselint|, |syntastic-markdown-proselint|,
+|syntastic-nroff-proselint|, |syntastic-pod-proselint|,
+|syntastic-rst-proselint|, |syntastic-tex-proselint|,
+|syntastic-texinfo-proselint|, |syntastic-text-proselint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR XML                               *syntastic-checkers-xml*
+
+The following checkers are available for XML (filetype "xml"):
+
+    1. plutil...................|syntastic-xml-plutil|
+    2. xmllint..................|syntastic-xml-xmllint|
+
+------------------------------------------------------------------------------
+1. plutil                                               *syntastic-xml-plutil*
+
+Name:        plutil
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"plutil" is a checker for OS X and iOS property list files. See the "plist(5)"
+and "plutil(1)" manual pages for details:
+
+    https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man5/plist.5.html
+    https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/plutil.1.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. xmllint                                             *syntastic-xml-xmllint*
+
+Name:        xmllint
+Maintainer:  Sebastian Kusnier <sebastian@kusnier.net>
+
+"xmllint" is a checker and transformer tool for XML files, distributed with
+the "libxml" package (http://www.xmlsoft.org/). See the tool's manual for more
+information:
+
+    http://xmlsoft.org/xmllint.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You can use a local installation of DTDs to significantly speed up validation
+and allow you to validate XML data without network access. See the
+"xmlcatalog" manual, and the catalog documentation for more information:
+
+    http://www.xmlsoft.org/xmlcatalog_man.html
+    http://www.xmlsoft.org/catalog.html
+
+For an example of a DTD catalog see f.i. "XMLCatalog":
+
+    https://github.com/darcyparker/XMLCatalog
+
+In order to use it with syntastic you'll have to clone it to a local
+directory, and point the environment variable "XML_CATALOG_FILES" to the file
+"catalog.xml" in the said directory: >
+    XML_CATALOG_FILES=/some/path/XMLCatalog/catalog.xml
+    export XML_CATALOG_FILES
+<
+Otherwise "xmllint" will try to load XML catalogs from "/etc/xml/catalog".
+
+See also: |syntastic-docbk-xmllint|, |syntastic-xslt-xmllint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR XQUERY                         *syntastic-checkers-xquery*
+
+The following checkers are available for XQuery (filetype "xquery"):
+
+    1. BaseX....................|syntastic-xquery-basex|
+
+------------------------------------------------------------------------------
+1. BaseX                                              *syntastic-xquery-basex*
+
+Name:        basex
+Maintainer:  James Wright <james.jw@hotmail.com>
+
+"BaseX" is an XML database engine and XPath`/`XQuery processor. See the
+project's page for details:
+
+    http://basex.org/
+
+Installation~
+
+1. Install "BaseX"
+2. Add the "basex/bin" folder to your "$PATH".
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR XSLT                             *syntastic-checkers-xslt*
+
+The following checkers are available for XSLT (filetype "xslt"):
+
+    1. xmllint..................|syntastic-xslt-xmllint|
+
+------------------------------------------------------------------------------
+1. xmllint                                            *syntastic-xslt-xmllint*
+
+Name:        xmllint
+Maintainer:  Sebastian Kusnier <sebastian@kusnier.net>
+
+"xmllint" is a checker and transformer tool for XML files, distributed with
+the "libxml" package (http://www.xmlsoft.org/). See the tool's manual for more
+information:
+
+    http://xmlsoft.org/xmllint.html
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+See also: |syntastic-docbk-xmllint|, |syntastic-xml-xmllint|.
+
+==============================================================================
+SYNTAX CHECKERS FOR YACC                             *syntastic-checkers-yacc*
+
+The following checkers are available for YACC (filetype "yacc"):
+
+    1. Bison....................|syntastic-yacc-bison|
+
+------------------------------------------------------------------------------
+1. Bison                                                *syntastic-yacc-bison*
+
+Name:        bison
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Bison" is the GNU implementation of the standard UNIX parser generator
+"yacc" (http://en.wikipedia.org/wiki/Yacc). See the project's page for more
+information:
+
+    http://www.gnu.org/software/bison/
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR YAML                             *syntastic-checkers-yaml*
+
+The following checkers are available for YAML (filetype "yaml"):
+
+    1. JavaScript YAML..........|syntastic-yaml-jsyaml|
+    2. yamllint.................|syntastic-yaml-yamllint|
+    3. YAML::XS.................|syntastic-yaml-yamlxs|
+
+------------------------------------------------------------------------------
+1. JavaScript YAML                                     *syntastic-yaml-jsyaml*
+
+Name:        jsyaml
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+"JavaScript YAML" is a parser for YAML. See the project's page at GitHub for
+details:
+
+    https://github.com/nodeca/js-yaml
+
+Installation~
+
+Install it with "npm": >
+    npm install -g js-yaml
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. yamllint                                          *syntastic-yaml-yamllint*
+
+Name:        yamllint
+Maintainer:  Adrien VergĂŠ
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+"yamllint" is a linter and style checker for YAML.
+See the project's page at GitHub for details:
+
+    https://github.com/adrienverge/yamllint
+
+Installation~
+
+Install it with "pip": >
+    pip install yamllint
+<
+------------------------------------------------------------------------------
+3. YAML::XS                                            *syntastic-yaml-yamlxs*
+
+Name:        yamlxs
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+This is a syntax checker for YAML 1.1 using the Perl module "YAML::XS":
+
+    https://metacpan.org/pod/YAML::XS
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Additionally:
+
+                                              'g:syntastic_perl_interpreter'
+Type: string
+Default: "perl"
+The perl interpreter to use.
+
+                                                 'g:syntastic_perl_lib_path'
+Type: list
+Default: []
+List of include directories to be added to the perl command line. Example: >
+    let g:syntastic_perl_lib_path = [ "/usr/local/lib/perl5/auto" ]
+<
+Note~
+
+The variable |'g:syntastic_perl_interpreter'| is shared with the "perl" checker
+(cf. |syntastic-perl-perl|). If for some reasons you don't want to use the same
+interpreter for both checkers, you can override it locally by setting
+'g:syntastic_yaml_yamlxs_exec'.
+
+==============================================================================
+SYNTAX CHECKERS FOR YANG                             *syntastic-checkers-yang*
+
+The following checkers are available for YANG data models (filetype "yang"):
+
+    1. pyang....................|syntastic-yang-pyang|
+
+------------------------------------------------------------------------------
+1. pyang                                                *syntastic-yang-pyang*
+
+Name:        pyang
+Maintainer:  Joshua Downer <joshua.downer@gmail.com>
+
+"pyang" is a validator for YANG data models (http://www.yang-central.org/).
+See the project's page at GitHub for more information:
+
+    https://github.com/mbj4668/pyang
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You probably also need a plugin to set |filetype| for YANG files, such as
+"yang.vim":
+
+    https://github.com/nathanalderson/yang.vim
+
+==============================================================================
+SYNTAX CHECKERS FOR Z80                               *syntastic-checkers-z80*
+
+The following checkers are available for Z80 (filetype "z80"):
+
+    1. Z80syntaxchecker.........|syntastic-z80-z80syntaxchecker|
+
+------------------------------------------------------------------------------
+1. Z80syntaxchecker                           *syntastic-z80-z80syntaxchecker*
+
+Name:        z80syntaxchecker
+Maintainer:  Romain Giot <giot.romain@gmail.com>
+
+"Z80syntaxchecker" is a syntax checker for Z80 assembly files.
+
+Installation~
+
+To install "Z80syntaxchecker" either install "pycpcdemotools"
+(https://github.com/cpcsdk/pycpcdemotools), or copy the following script to a
+directory in your "$PATH":
+
+    https://raw.githubusercontent.com/rgiot/pycpcdemotools/master/cpcdemotools/source_checker/z80_syntax_checker.py
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+SYNTAX CHECKERS FOR ZOPE PAGE TEMPLATES               *syntastic-checkers-zpt*
+
+The following checkers are available for Zope Page Templates (filetype "zpt"):
+
+    1. zptlint..................|syntastic-zpt-zptlint|
+
+------------------------------------------------------------------------------
+1. zptlint                                             *syntastic-zpt-zptlint*
+
+Name:        zptlint
+Maintainer:  claytron <robots@claytron.com>
+
+"zptlint" is a checker for Zope Page Templates. See the project's README for
+more information:
+
+    https://trac.bubblenet.be/browser/bubblenet/pythoncode/zptlint/trunk/README.txt?format=txt
+
+Installation~
+
+Install it with "pip": >
+    pip install zptlint
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+You probably also need to set |filetype| for Zope Page Templates to "zpt".
+You can do that with an `:autocmd`: >
+    autocmd BufNewFile,BufRead *.pt,*.cpt,*.zpt set filetype=zpt syntax=xml
+<
+==============================================================================
+SYNTAX CHECKERS FOR ZSH                               *syntastic-checkers-zsh*
+
+The following checkers are available for Zsh (filetype "zsh"):
+
+    1. zsh......................|syntastic-zsh-zsh|
+
+------------------------------------------------------------------------------
+1. zsh                                                     *syntastic-zsh-zsh*
+
+Name:        zsh
+Maintainer:  Martin Grenfell <martin.grenfell@gmail.com>
+
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+==============================================================================
+CONFIGURATION FILES                                   *syntastic-config-files*
+
+    Supported checkers..........|syntastic-config-checkers|
+    Naming......................|syntastic-config-naming|
+    Location....................|syntastic-config-location|
+    Format......................|syntastic-config-format|
+
+                                                   *syntastic-config-checkers*
+Currently, the following checkers can read some of their options from
+syntastic-specific configuration files:
+
+    ADA~
+        GCC (|syntastic-ada-gcc|)
+
+    Assembly Languages~
+        GCC (|syntastic-asm-gcc|)
+
+    C~
+        AVR-GCC (|syntastic-c-avrgcc|)
+        ClangCheck (|syntastic-c-clang_check|)
+        Clang-Tidy (|syntastic-c-clang_tidy|)
+        Cppcheck (|syntastic-c-cppcheck|)
+        GCC (|syntastic-c-gcc|)
+        OCLint (|syntastic-c-oclint|)
+        Sparse (|syntastic-c-sparse|)
+        Splint (|syntastic-c-splint|)
+
+    COBOL~
+        OpenCOBOL (|syntastic-cobol-cobc|)
+
+    C++~
+        AVR-GCC (|syntastic-cpp-avrgcc|)
+        ClangCheck (|syntastic-cpp-clang_check|)
+        Clang-Tidy (|syntastic-cpp-clang_tidy|)
+        Cppcheck (|syntastic-cpp-cppcheck|)
+        GCC (|syntastic-cpp-gcc|)
+        OCLint (|syntastic-cpp-oclint|)
+        Vera++ (|syntastic-cpp-verapp|)
+
+    D~
+        DMD (|syntastic-d-dmd|)
+
+    Fortran~
+        GNU Fortran (|syntastic-fortran-gfortran|)
+
+    Objective-C~
+        GCC (|syntastic-objc-gcc|)
+        OCLint (|syntastic-objc-oclint|)
+
+    Objective-C++~
+        GCC (|syntastic-objcpp-gcc|)
+        OCLint (|syntastic-objcpp-oclint|)
+
+    Verilog~
+        Verilator (|syntastic-verilog-verilator|)
+
+                                                     *syntastic-config-naming*
+Naming~
+
+Depending on checker, the filename of the corresponding configuration file
+can be specified by setting either 'g:syntastic_<filetype>_config_file' or
+'g:syntastic_<checker>_config_file'. Refer to the docs for the particular
+checkers above for the exact names.
+                                                   *syntastic-config-location*
+Location~
+
+A configuration file is looked up in the directory of the file being checked,
+then upwards in parent directories.  The search stops either when a file with
+the right name is found, or when the root of the filesystem is reached.
+
+Consequently, you would normally put a configuration file in the top directory
+of your project, and you would override it when needed with other configuration
+files placed in subdirectories.
+                                                     *syntastic-config-format*
+Format~
+
+The file is expected to contain one option per line.  Empty lines and lines
+starting with `#` are removed.  On each line, leading and trailing spaces are
+also removed.  Each option is then escaped, so you don't have to worry about
+special characters.
+
+Lines starting with `-I` are assumed to be include paths, and are handled
+specially.  If the path following an `-I` is relative, it's treated as
+being relative to the current configuration file, and is replaced by the
+corresponding absolute path.  If the path is absolute to begin with, it is
+left unchanged.
+
+Please note that, aside from `-I`, syntastic doesn't try to keep track of
+options with arguments.  If you need to pass f.i. `-aux-info filename` to your
+compiler you have to write `-aux-info` and `filename` on separate lines in the
+configuration file, otherwise syntastic will quote the space and merge them in
+a single string, which is probably not what you mean: >
+    -aux-info
+    filename
+<
+In the same vein, `=` in options not special in any way.  As stated
+above, everything on a line (except lines starting with `-I`, as noted)
+is considered an "option" and escaped.
+
+ vim:tw=78:sw=4:ft=help:norl:
diff --git a/vim-plugins/bundle/syntastic/doc/syntastic.txt b/vim-plugins/bundle/syntastic/doc/syntastic.txt
new file mode 100644
index 0000000..db3e99e
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/doc/syntastic.txt
@@ -0,0 +1,1207 @@
+*syntastic.txt*   Syntax checking on the fly has never been so pimp.
+*syntastic*
+
+
+                    It's a bird! It's a plane! ZOMG It's ... ~
+
+                   _____             __             __  _      ~
+                  / ___/__  ______  / /_____ ______/ /_(_)____ ~
+                  \__ \/ / / / __ \/ __/ __ `/ ___/ __/ / ___/ ~
+                 ___/ / /_/ / / / / /_/ /_/ (__  ) /_/ / /__   ~
+                /____/\__, /_/ /_/\__/\__,_/____/\__/_/\___/   ~
+                     /____/                                    ~
+
+
+
+                              Reference Manual~
+
+
+==============================================================================
+CONTENTS                                                  *syntastic-contents*
+
+    1.Intro........................................|syntastic-intro|
+        1.1.Quick start............................|syntastic-quickstart|
+        1.2.Recommended settings...................|syntastic-recommended|
+    2.Functionality provided.......................|syntastic-functionality|
+        2.1.The statusline flag....................|syntastic-statusline-flag|
+        2.2.Error signs............................|syntastic-error-signs|
+        2.3.Error window...........................|syntastic-error-window|
+        2.4.Error highlighting.....................|syntastic-highlighting|
+        2.5.Aggregating errors.....................|syntastic-aggregating-errors|
+        2.6.Filtering errors.......................|syntastic-filtering-errors|
+    3.Commands.....................................|syntastic-commands|
+    4.Global Options...............................|syntastic-global-options|
+    5.Checker Options..............................|syntastic-checker-options|
+        5.1.Choosing which checkers to use.........|syntastic-filetype-checkers|
+        5.2.Choosing the executable................|syntastic-config-exec|
+        5.3.Configuring specific checkers..........|syntastic-config-makeprg|
+        5.4.Sorting errors.........................|syntastic-config-sort|
+        5.5.Filtering errors.......................|syntastic-config-filtering|
+        5.6.Debugging..............................|syntastic-config-debug|
+        5.7.Profiling..............................|syntastic-profiling|
+    6.Notes........................................|syntastic-notes|
+        6.1.Handling of composite filetypes........|syntastic-composite|
+        6.2.Editing files over network.............|syntastic-netrw|
+        6.3.The 'shellslash' option................|syntastic-shellslash|
+        6.4.Saving Vim sessions....................|syntastic-sessions|
+        6.5.The location list callback.............|syntastic-loclist-callback|
+    7.Compatibility with other software............|syntastic-compatibility|
+        7.1.airline................................|syntastic-airline|
+        7.2.The csh and tcsh shells................|syntastic-csh|
+        7.3.EasyGrep...............................|syntastic-easygrep|
+        7.4.Eclim..................................|syntastic-eclim|
+        7.5.ferret.................................|syntastic-ferret|
+        7.6.The fish shell.........................|syntastic-fish|
+        7.7.The fizsh shell........................|syntastic-fizsh|
+        7.8.flagship...............................|syntastic-flagship|
+        7.9.powerline..............................|syntastic-powerline|
+        7.10.The PowerShell shell..................|syntastic-powershell|
+        7.11.python-mode...........................|syntastic-pymode|
+        7.12.vim-auto-save.........................|syntastic-vim-auto-save|
+        7.13.vim-go................................|syntastic-vim-go|
+        7.14.vim-virtualenv........................|syntastic-vim-virtualenv|
+        7.15.YouCompleteMe.........................|syntastic-ycm|
+        7.16.The zsh shell and MacVim..............|syntastic-zsh|
+    8.About........................................|syntastic-about|
+    9.License......................................|syntastic-license|
+
+
+==============================================================================
+1. Intro                                                     *syntastic-intro*
+
+Syntastic is a syntax checking plugin that runs files through external syntax
+checkers. This can be done on demand, or automatically as files are saved
+and opened. If syntax errors are detected, the user is notified and is happy
+because they didn't have to compile their code or execute their script to find
+them.
+
+Syntastic comes in two parts: the syntax checker plugins, and the core. The
+syntax checker plugins are defined on a per-filetype basis where each one wraps
+up an external syntax checking program. The core script delegates off to these
+plugins and uses their output to provide the syntastic functionality.
+
+Take a look at the list of supported filetypes and checkers: |syntastic-checkers|.
+
+Note: This doc only deals with using syntastic. To learn how to write syntax
+checker integrations, see the guide on the GitHub wiki:
+
+    https://github.com/vim-syntastic/syntastic/wiki/Syntax-Checker-Guide
+
+------------------------------------------------------------------------------
+1.1. Quick start                                        *syntastic-quickstart*
+
+Syntastic comes preconfigured with a default list of enabled checkers per
+|filetype|. This list is kept reasonably short to prevent slowing down Vim or
+trying to use conflicting checkers.
+
+You can see the list of checkers available for the current filetype with the
+`:SyntasticInfo` command.
+
+You probably want to override the configured list of checkers for the
+filetypes you use, and also change the arguments passed to specific checkers
+to suit your needs. See |syntastic-checker-options| below for details.
+
+Use `:SyntasticCheck` to manually check right now. Use `:Errors` to open the
+|location-list| window, and `:lclose` to close it. You can clear the error
+list with `:SyntasticReset`, and you can use `:SyntasticToggleMode` to switch
+between active (checking on writing the buffer) and passive (manual) checking.
+
+You don't have to switch focus to the |location-list| window to jump to the
+different errors. Vim provides several built-in commands for this, for
+example `:lnext` and `:lprevious`. You may want to add shortcut mappings for
+these commands, or perhaps install a plugin such as Tim Pope's "unimpaired"
+(see https://github.com/tpope/vim-unimpaired) that provides such mappings.
+
+------------------------------------------------------------------------------
+1.2. Recommended settings                              *syntastic-recommended*
+
+Syntastic has numerous options that can be configured, and the defaults are
+not particularly well suitable for new users. It is recommended that you start
+by adding the following lines to your vimrc, and return to them later as
+needed: >
+    set statusline+=%#warningmsg#
+    set statusline+=%{SyntasticStatuslineFlag()}
+    set statusline+=%*
+
+    let g:syntastic_always_populate_loc_list = 1
+    let g:syntastic_auto_loc_list = 1
+    let g:syntastic_check_on_open = 1
+    let g:syntastic_check_on_wq = 0
+<
+==============================================================================
+2. Functionality provided                            *syntastic-functionality*
+
+Syntax checking can be done automatically or on demand (see
+|'syntastic_mode_map'| and `:SyntasticToggleMode` for configuring this).
+
+When syntax checking is done, the features below can be used to notify the
+user of errors. See |syntastic-global-options| for how to configure and
+activate/deactivate these features.
+
+    * A statusline flag
+    * Signs beside lines with errors
+    * The |location-list| can be populated with the errors for the associated
+      buffer
+    * Erroneous parts of lines can be highlighted (this functionality is only
+      provided by some syntax checkers)
+    * Balloons (if the |+balloon_eval| feature is compiled in) can be used to
+      display error messages for erroneous lines when hovering the mouse over
+      them
+    * Error messages from multiple checkers can be aggregated in a single list
+
+------------------------------------------------------------------------------
+2.1. The statusline flag                           *syntastic-statusline-flag*
+
+To use the statusline flag, this must appear in your |'statusline'| setting >
+    %{SyntasticStatuslineFlag()}
+<
+Something like this could be more useful: >
+    set statusline+=%#warningmsg#
+    set statusline+=%{SyntasticStatuslineFlag()}
+    set statusline+=%*
+<
+When syntax errors are detected a flag will be shown. The content of the flag
+is derived from the |'syntastic_stl_format'| option.
+
+Please note that these settings might conflict with other Vim plugins that
+change the way statusline works. Refer to the |syntastic-compatibility| notes
+below and to the respective plugins' documentation for possible solutions.
+
+In particular see |syntastic-airline| below if you're using the "airline" Vim
+plugin (https://github.com/vim-airline/vim-airline). See |syntastic-flagship|
+if you're using "flagship" (https://github.com/tpope/vim-flagship). See also
+|syntastic-powerline| if you're using the "powerline" Vim plugin
+(https://github.com/powerline/powerline).
+
+------------------------------------------------------------------------------
+2.2. Error signs                                       *syntastic-error-signs*
+
+Syntastic uses the `:sign` commands (provided that the |+signs| feature is
+compiled in) to mark lines with errors and warnings in the sign column. To
+enable this feature, use the |'syntastic_enable_signs'| option.
+
+Signs are colored using the Error and Todo syntax highlight groups by default
+(see |group-name|). If you wish to customize the colors for the signs, you
+can use the following groups:
+    SyntasticErrorSign - For syntax errors, links to "error" by default
+    SyntasticWarningSign - For syntax warnings, links to "todo" by default
+    SyntasticStyleErrorSign - For style errors, links to "SyntasticErrorSign"
+                              by default
+    SyntasticStyleWarningSign - For style warnings, links to
+                                "SyntasticWarningSign" by default
+
+Example: >
+    highlight SyntasticErrorSign guifg=white guibg=red
+<
+To set up highlighting for the line where a sign resides, you can use the
+following highlight groups:
+    SyntasticErrorLine
+    SyntasticWarningLine
+    SyntasticStyleErrorLine - Links to "SyntasticErrorLine" by default
+    SyntasticStyleWarningLine - Links to "SyntasticWarningLine" by default
+
+Example: >
+    highlight SyntasticErrorLine guibg=#2f0000
+<
+With Vim 8.0 or later you can ask Vim not to turn off the sign column when no
+errors are found, by setting 'signcolumn' to "yes": >
+    set signcolumn=yes
+<
+------------------------------------------------------------------------------
+2.3. The error window                                   *syntastic-error-window*
+
+You can use the `:Errors` command to display the errors for the current buffer
+in the |location-list|.
+
+By default syntastic doesn't fill the |location-list| with the errors found by
+the checkers, in order to reduce clashes with other plugins. Consequently, if
+you run `:lopen` or `:lwindow` rather than `:Errors` to open the error window
+you wouldn't see syntastic's list of errors. If you insist on using `:lopen`
+or `:lwindow` you should either run `:SyntasticSetLoclist` after running the
+checks, or set |'syntastic_always_populate_loc_list'| which tells syntastic to
+update the |location-list| automatically.
+
+------------------------------------------------------------------------------
+2.4. Error highlighting                               *syntastic-highlighting*
+
+Some checkers provide enough information for syntastic to be able to highlight
+errors. By default the SpellBad syntax highlight group is used to color errors,
+and the SpellCap group is used for warnings. If you wish to customize the
+colors for highlighting you can use the following groups:
+    SyntasticError - Links to "SpellBad" by default (see |hl-SpellBad|)
+    SyntasticWarning - Links to "SpellCap" by default (see |hl-SpellCap|)
+    SyntasticStyleError - Links to "SyntasticError" by default
+    SyntasticStyleWarning - Links to "SyntasticWarning" by default
+
+Example: >
+    highlight SyntasticError guibg=#2f0000
+<
+------------------------------------------------------------------------------
+2.5. Aggregating errors                         *syntastic-aggregating-errors*
+
+By default, namely if |'syntastic_aggregate_errors'| is unset, syntastic runs
+in turn the checkers corresponding to the filetype of the current file (see
+|syntastic-filetype-checkers|), and stops as soon as a checker reports any
+errors. It then notifies you of the errors using the notification mechanisms
+above. In this mode error lists are always produced by a single checker, and,
+if you open the error window, the name of the checker that generated the errors
+is shown on the statusline of the error window.
+
+If |'syntastic_aggregate_errors'| is set, syntastic runs all checkers that
+apply (still cf. |syntastic-filetype-checkers|), then aggregates errors found
+by all checkers in a single list, and notifies you. In this mode each error
+message is labeled with the name of the checker that generated it, but you can
+disable generation of these labels by turning off |'syntastic_id_checkers'|.
+
+If |'syntastic_sort_aggregated_errors'| is set (which is the default), messages
+in the aggregated list are grouped by file, then sorted by line number, then
+type, then column number. Otherwise messages produced by the same checker are
+grouped together, and sorting within each group is decided by the variables
+|'syntastic_<filetype>_<checker>_sort'|.
+
+------------------------------------------------------------------------------
+2.6. Filtering errors                             *syntastic-filtering-errors*
+
+You can selectively disable some of the errors found by checkers either
+using |'syntastic_quiet_messages'|, or by specifying a list of patterns in
+|'syntastic_ignore_files'|.
+
+See also: |'syntastic_<filetype>_<checker>_quiet_messages'| and
+|'b:syntastic_skip_checks'|.
+
+==============================================================================
+3. Commands                                               *syntastic-commands*
+
+:Errors                                                              *:Errors*
+
+When errors have been detected, use this command to pop up the |location-list|
+and display the error messages.
+
+Please note that the `:Errors` command overwrites the current location list with
+syntastic's own location list.
+
+:SyntasticToggleMode                                    *:SyntasticToggleMode*
+
+Toggles syntastic between active and passive mode. See |'syntastic_mode_map'|
+for more info.
+
+:SyntasticCheck                                              *:SyntasticCheck*
+
+Manually cause a syntax check to be done. By default the checkers in the
+|'g:syntastic_<filetype>_checkers'| or |'b:syntastic_checkers'| lists are run,
+cf. |syntastic-filetype-checkers|. If |'syntastic_aggregate_errors'| is unset
+(which is the default), checking stops the first time a checker reports any
+errors; if |'syntastic_aggregate_errors'| is set, all checkers that apply are
+run in turn, and all errors found are aggregated in a single list.
+
+The command may be followed by a (space separated) list of checkers. In this
+case |'g:syntastic_<filetype>_checkers'| and |'b:syntastic_checkers'| are
+ignored, and the checkers named by the command's arguments are run instead, in
+the order specified. The set by |'syntastic_aggregate_errors'| still apply.
+
+Example: >
+    :SyntasticCheck flake8 pylint
+<
+You can also run checkers for filetypes different from the current filetype
+by qualifying their names with their respective filetypes, like this:
+"<filetype>/<checker>".
+
+Example: >
+    :SyntasticCheck lacheck text/language_check
+<
+:SyntasticInfo                                                *:SyntasticInfo*
+
+The command takes an optional argument, and outputs information about the
+checkers available for the filetype named by said argument, or for the current
+filetype if no argument was provided.
+
+Example: >
+    :SyntasticInfo python
+<
+:SyntasticReset                                              *:SyntasticReset*
+
+Resets the list of errors and turns off all error notifiers.
+
+:SyntasticSetLoclist                                    *:SyntasticSetLoclist*
+
+If |'syntastic_always_populate_loc_list'| is not set, the |location-list| is
+not filled in automatically with the list of errors detected by the checkers.
+This is useful if you run syntastic along with other plugins that use location
+lists. The `:SyntasticSetLoclist` command allows you to stick the errors into
+the location list explicitly.
+
+==============================================================================
+4. Global Options                                   *syntastic-global-options*
+
+                                                   *'syntastic_check_on_open'*
+Type: boolean
+Default: 0
+If this variable is enabled, syntastic in active mode will run syntax checks
+when buffers are first loaded, as well as on saving: >
+    let g:syntastic_check_on_open = 1
+<
+                                                     *'syntastic_check_on_wq'*
+Type: boolean
+Default: 1
+In active mode syntax checks are normally run whenever buffers are written to
+disk, even when the writes happen just before quitting Vim. If you want to
+skip checks when you issue `:wq`, `:x`, and `:ZZ`, set this variable to 0: >
+    let g:syntastic_check_on_wq = 0
+<
+                                                *'syntastic_aggregate_errors'*
+Type: boolean
+Default: 0
+When enabled, syntastic runs all checkers that apply to the current filetype,
+then aggregates errors found by all checkers and displays them. When disabled,
+syntastic runs each checker in turn, and stops to display the results the first
+time a checker finds any errors. >
+    let g:syntastic_aggregate_errors = 1
+<
+                                                     *'syntastic_id_checkers'*
+Type: boolean
+Default: 1
+When results from multiple checkers are aggregated in a single error list
+(that is either when |'syntastic_aggregate_errors'| is enabled, or when
+checking a file with a composite filetype, cf. |syntastic-composite|), it
+might not be immediately obvious which checker has produced a given error
+message. This variable instructs syntastic to label error messages with the
+names of the checkers that created them. >
+    let g:syntastic_id_checkers = 0
+<
+                                          *'syntastic_sort_aggregated_errors'*
+Type: boolean
+Default: 1
+By default, when results from multiple checkers are aggregated in a single
+error list (that is either when |'syntastic_aggregate_errors'| is enabled, or
+when checking a file with a composite filetype, cf. |syntastic-composite|),
+errors are grouped by file, then sorted by line number, then grouped by type
+(namely errors take precedence over warnings), then they are sorted by column
+number. If you want to leave messages grouped by checker output, set this
+variable to 0: >
+    let g:syntastic_sort_aggregated_errors = 0
+<
+                                              *'syntastic_echo_current_error'*
+Type: boolean
+Default: 1
+If enabled, syntastic will echo current error to the command window. If
+multiple errors are found on the same line, |'syntastic_cursor_columns'| is
+used to decide which one is shown. >
+    let g:syntastic_echo_current_error = 1
+<
+                                                  *'syntastic_cursor_columns'*
+Type: boolean
+Default: 1
+This option controls which errors are echoed to the command window if
+|'syntastic_echo_current_error'| is set and multiple errors are found on the
+same line. When the option is enabled, the first error corresponding to the
+current column is shown. Otherwise, the first error on the current line is
+echoed, regardless of the cursor position on the current line.
+
+When dealing with very large lists of errors, disabling this option can speed
+up navigation significantly: >
+    let g:syntastic_cursor_column = 0
+<
+                                                    *'syntastic_enable_signs'*
+Type: boolean
+Default: 1
+Use this option to tell syntastic whether to use the `:sign` interface to mark
+syntax errors: >
+    let g:syntastic_enable_signs = 1
+<
+                     *'syntastic_error_symbol'* *'syntastic_style_error_symbol'*
+                 *'syntastic_warning_symbol'* *'syntastic_style_warning_symbol'*
+Type: string
+Use these options to control what the syntastic `:sign` text contains. Several
+error symbols can be customized:
+    syntastic_error_symbol - For syntax errors, defaults to ">>"
+    syntastic_style_error_symbol - For style errors, defaults to "S>"
+    syntastic_warning_symbol - For syntax warnings, defaults to ">>"
+    syntastic_style_warning_symbol - For style warnings, defaults to "S>"
+
+Example: >
+    let g:syntastic_error_symbol = "\u2717"
+    let g:syntastic_warning_symbol = "\u26A0"
+<
+                                                 *'syntastic_enable_balloons'*
+Type: boolean
+Default: 1
+Use this option to tell syntastic whether to display error messages in balloons
+when the mouse is hovered over erroneous lines: >
+    let g:syntastic_enable_balloons = 1
+<
+Note that Vim must be compiled with |+balloon_eval|.
+
+                                             *'syntastic_enable_highlighting'*
+Type: boolean
+Default: 1
+Use this option to tell syntastic whether to use syntax highlighting to mark
+errors (where possible). Highlighting can be turned off with the following >
+    let g:syntastic_enable_highlighting = 0
+<
+                                        *'syntastic_always_populate_loc_list'*
+Type: boolean
+Default: 0
+By default syntastic doesn't fill the |location-list| with the errors found
+by the checkers, in order to reduce clashes with other plugins. Enable this
+option to tell syntastic to always stick any detected errors into the
+|location-list|: >
+    let g:syntastic_always_populate_loc_list = 1
+<
+Please note that if |'syntastic_auto_jump'| is set to a non-zero value the
+location list is overwritten with Syntastic's own list when taking a jump,
+regardless of the value of |'syntastic_always_populate_loc_list'|. The
+location list is also overwritten when running the `:Errors` command.
+
+                                                       *'syntastic_auto_jump'*
+Type: integer
+Default: 0
+Enable this option if you want the cursor to jump to the first detected issue
+when saving or opening a file.
+
+When set to 0 the cursor won't jump automatically. >
+    let g:syntastic_auto_jump = 0
+<
+When set to 1 the cursor will always jump to the first issue detected,
+regardless of type. >
+    let g:syntastic_auto_jump = 1
+<
+When set to 2 the cursor will jump to the first issue detected, but only if
+this issue is an error. >
+    let g:syntastic_auto_jump = 2
+<
+When set to 3 the cursor will jump to the first error detected, if any. If
+all issues detected are warnings, the cursor won't jump. >
+    let g:syntastic_auto_jump = 3
+<
+Please note that in either situation taking the jump also has the side effect
+of the location list being overwritten with Syntastic's own location list,
+regardless of the value of |'syntastic_always_populate_loc_list'|.
+
+                                                   *'syntastic_auto_loc_list'*
+Type: integer
+Default: 2
+Use this option to tell syntastic to automatically open and/or close the
+|location-list| (see |syntastic-error-window|).
+
+When set to 0 the error window will be neither opened nor closed
+automatically. >
+    let g:syntastic_auto_loc_list = 0
+<
+When set to 1 the error window will be automatically opened when errors are
+detected, and closed when none are detected. >
+    let g:syntastic_auto_loc_list = 1
+<
+When set to 2 the error window will be automatically closed when no errors are
+detected, but not opened automatically. >
+    let g:syntastic_auto_loc_list = 2
+<
+When set to 3 the error window will be automatically opened when errors are
+detected, but not closed automatically. >
+    let g:syntastic_auto_loc_list = 3
+<
+                                                 *'syntastic_loc_list_height'*
+Type: integer
+Default: 10
+Use this option to specify the height of the location lists that syntastic
+opens. >
+    let g:syntastic_loc_list_height = 5
+<
+                                                    *'syntastic_ignore_files'*
+Type: list of strings
+Default: []
+Use this option to specify files that syntastic should never check. It's a
+list of |regular-expression| patterns. The full paths of files (see |::p|) are
+matched against these patterns, and the matches are case-sensitive. Use |\c|
+to specify case-insensitive patterns. Example: >
+    let g:syntastic_ignore_files = ['\m^/usr/include/', '\m\c\.h$']
+<
+                                                    *'syntastic_filetype_map'*
+Type: dictionary
+Default: {}
+Use this option to map non-standard filetypes to standard ones.  Corresponding
+checkers are mapped accordingly, which allows syntastic to check files with
+non-standard filetypes: >
+    let g:syntastic_filetype_map = {
+        \ "plaintex": "tex",
+        \ "gentoo-metadata": "xml" }
+<
+Composite filetypes (cf. |syntastic-composite|) can also be mapped to simple
+types, which disables the default behaviour of running both checkers against
+the input file: >
+    let g:syntastic_filetype_map = { "handlebars.html": "handlebars" }
+<
+                                                        *'syntastic_mode_map'*
+Type: dictionary
+Default: { "mode": "active",
+           "active_filetypes": [],
+           "passive_filetypes": [] }
+Use this option to fine tune when automatic syntax checking is done (or not
+done).
+
+The option should be set to something like: >
+    let g:syntastic_mode_map = {
+        \ "mode": "active",
+        \ "active_filetypes": ["ruby", "php"],
+        \ "passive_filetypes": ["puppet"] }
+<
+"mode" can be mapped to one of two values - "active" or "passive". When set
+to "active", syntastic does automatic checking whenever a buffer is saved or
+initially opened. When set to "passive" syntastic only checks when the user
+calls `:SyntasticCheck`.
+
+The exceptions to these rules are defined with "active_filetypes" and
+"passive_filetypes". In passive mode, automatic checks are still done for
+filetypes in the "active_filetypes" array (and "passive_filetypes" is
+ignored). In active mode, automatic checks are not done for any filetypes in
+the "passive_filetypes" array ("active_filetypes" is ignored).
+
+If any of "mode", "active_filetypes", or "passive_filetypes" are left
+unspecified, they default to values above.
+
+If local variable |'b:syntastic_mode'| is defined its value takes precedence
+over all calculations involving |'syntastic_mode_map'| for the corresponding
+buffer.
+
+At runtime, the `:SyntasticToggleMode` command can be used to switch between
+active and passive modes.
+
+                                                          *'b:syntastic_mode'*
+Type: string
+Default: unset
+Only the local form |'b:syntastic_mode'| is used. When set to either "active"
+or "passive", it takes precedence over |'syntastic_mode_map'| when deciding
+whether the corresponding buffer should be checked automatically.
+
+                                                  *'syntastic_quiet_messages'*
+Type: dictionary
+Default: {}
+Use this option to filter out some of the messages produced by checkers. The
+option should be set to something like: >
+    let g:syntastic_quiet_messages = {
+        \ "!level":  "errors",
+        \ "type":    "style",
+        \ "regex":   '\m\[C03\d\d\]',
+        \ "file:p":  ['\m^/usr/include/', '\m\c\.h$'] }
+<
+Each element turns off messages matching the patterns specified by the
+corresponding value. Values are lists, but if a list consists of a single
+element you may omit the brackets (e.g. you may write "style" instead of
+["style"]). Elements with values [] or "" are ignored (this is useful for
+overriding filters, cf. |filter-overrides|).
+
+    "level" - takes one of two values, "warnings" or "errors"
+    "type"  - can be either "syntax" or "style"
+    "regex" - each item in list is matched against the messages' text as a
+              case-insensitive |regular-expression|
+    "file"  - each item in list is matched against the filenames the messages
+              refer to, as a case-sensitive |regular-expression|.
+
+If a key is prefixed by an exclamation mark "!", the corresponding filter is
+negated (i.e. the above example silences all messages that are NOT errors).
+
+The "file" key may be followed by one or more filename modifiers (see
+|filename-modifiers|). The modifiers are applied to the filenames the messages
+refer to before matching against the value (i.e. in the above example the full
+path of the issues are matched against '\m^/usr/include/' and '\m\c\.h$').
+
+If |'syntastic_id_checkers'| is set, filters are applied before error messages
+are labeled with the names of the checkers that created them.
+
+There are also checker-specific variants of this option, providing finer
+control. They are named |'syntastic_<filetype>_<checker>_quiet_messages'|.
+
+For a particular checker, if both a |'syntastic_quiet_messages'| filter and
+a checker-specific filter are present, they are both applied (to the list of
+errors produced by the said checker). In case of conflicting values for the
+same keys, the values of the checker-specific filters take precedence.
+
+                                                            *filter-overrides*
+Since filter elements with values [] or "" are ignored, you can disable global
+filters for particular checkers, by setting the values of the corresponding
+elements in |'syntastic_<filetype>_<checker>_quiet_messages'| to [] or "". For
+example, the following setting will silence all warnings, except for the
+ones produced by "pylint": >
+    let g:syntastic_quiet_messages = { "level": "warnings" }
+    let g:syntastic_python_pylint_quiet_messages = { "level" : [] }
+<
+                                                      *'syntastic_stl_format'*
+Type: string
+Default: "[Syntax: line:%F (%t)]"
+Use this option to control what the syntastic statusline text contains. Several
+magic flags are available to insert information:
+    %e  - number of errors
+    %w  - number of warnings
+    %t  - total number of warnings and errors
+    %ne - filename of file containing first error
+    %nw - filename of file containing first warning
+    %N  - filename of file containing first warning or error
+    %pe - filename with path of file containing first error
+    %pw - filename with path of file containing first warning
+    %P  - filename with path of file containing first warning or error
+    %fe - line number of first error
+    %fw - line number of first warning
+    %F  - line number of first warning or error
+
+These flags accept width and alignment controls similar to the ones used by
+|'statusline'| flags:
+    %-0{minwid}.{maxwid}{flag}
+
+All fields except {flag} are optional. A single percent sign can be given as
+"%%".
+
+Several additional flags are available to hide text under certain conditions:
+    %E{...} - hide the text in the brackets unless there are errors
+    %W{...} - hide the text in the brackets unless there are warnings
+    %B{...} - hide the text in the brackets unless there are both warnings AND
+              errors
+These flags can't be nested.
+
+Example: >
+    let g:syntastic_stl_format = "[%E{Err: %fe #%e}%B{, }%W{Warn: %fw #%w}]"
+<
+If this format is used and the current buffer has 5 errors and 1 warning
+starting on lines 20 and 10 respectively then this would appear on the
+statusline: >
+    [Err: 20 #5, Warn: 10 #1]
+<
+If the buffer had 2 warnings, starting on line 5 then this would appear: >
+    [Warn: 5 #2]
+<
+                                                   *'b:syntastic_skip_checks'*
+Type: boolean
+Default: unset
+Only the local form |'b:syntastic_skip_checks'| is used. When set to a true
+value, no checks are run against the corresponding buffer. Example: >
+    let b:syntastic_skip_checks = 1
+<
+                                                    *'syntastic_full_redraws'*
+Type: boolean
+Default: 0 in GUI Vim and MacVim, 1 otherwise
+Controls whether syntastic calls `:redraw` or `:redraw!` for screen redraws.
+Changing it can in principle make screen redraws smoother, but it can also
+cause screen to flicker, or cause ghost characters. Leaving it to the default
+should be safe.
+
+                                                     *'syntastic_exit_checks'*
+Type: boolean
+Default: 0 when running under "cmd.exe" on Windows, 1 otherwise
+Syntastic attempts to catch abnormal termination conditions from checkers by
+looking at their exit codes. The "cmd.exe" shell on Windows make these checks
+meaningless, by returning 1 to Vim when the checkers exit with non-zero codes.
+The above variable can be used to disable exit code checks in syntastic.
+
+                                                           *'syntastic_shell'*
+Type: string
+Default: Vim's 'shell'
+This is the (full path to) the shell syntastic will use to run the checkers.
+On UNIX and Mac OS-X this shell must accept Bourne-compatible syntax for
+file "stdout" and "stderr" redirections ">file" and "2>file". Examples of
+compatible shells are "zsh", "bash", "ksh", and of course the original Bourne
+"sh".
+
+This shell is independent of Vim's 'shell', and it isn't used for interactive
+operations. It must take care to initialize all environment variables needed
+by the checkers you're using. Example: >
+    let g:syntastic_shell = "/bin/sh"
+<
+                                             *'syntastic_nested_autocommands'*
+Type: boolean
+Default: 0
+Controls whether syntastic's autocommands |BufReadPost| and |BufWritePost|
+are called from other |BufReadPost| and |BufWritePost| autocommands (see
+|autocmd-nested|). This is known to trigger interoperability problems with
+other plugins, so only enable it if you actually need that functionality.
+
+                                                           *'syntastic_debug'*
+Type: integer
+Default: 0
+Set this to the sum of one or more of the following flags to enable
+debugging:
+
+     1 - trace general workflow
+     2 - dump location lists
+     4 - trace notifiers
+     8 - trace autocommands
+    16 - dump options
+    32 - trace running of specific checkers
+
+Example: >
+    let g:syntastic_debug = 1
+<
+Syntastic will then add debugging messages to Vim's |message-history|. You can
+examine these messages with `:mes`.
+
+                                                      *'syntastic_debug_file'*
+Type: string
+Default: unset
+When set, debugging messages are written to the file named by its value, in
+addition to being added to Vim's |message-history|: >
+    let g:syntastic_debug_file = "~/syntastic.log"
+<
+                                                 *'syntastic_extra_filetypes'*
+Type: list of strings
+Default: []
+List of filetypes handled by checkers external to syntastic. If you have a Vim
+plugin that adds a checker for syntastic, and if the said checker deals with a
+filetype that is unknown to syntastic, you might consider adding that filetype
+to this list: >
+    let g:syntastic_extra_filetypes = [ "make", "gitcommit" ]
+<
+This will allow `:SyntasticInfo` to do proper tab completion for the new
+filetypes.
+
+==============================================================================
+5. Checker Options                                 *syntastic-checker-options*
+
+------------------------------------------------------------------------------
+5.1. Choosing which checkers to use              *syntastic-filetype-checkers*
+
+                                           *'g:syntastic_<filetype>_checkers'*
+You can tell syntastic which checkers to run for a given filetype by setting a
+variable 'g:syntastic_<filetype>_checkers' to a list of checkers, e.g. >
+    let g:syntastic_php_checkers = ["php", "phpcs", "phpmd"]
+<
+                                                      *'b:syntastic_checkers'*
+There is also a per-buffer version of this setting, |'b:syntastic_checkers'|.
+When set, it takes precedence over |'g:syntastic_<filetype>_checkers'|. You can
+use this in an autocmd to configure specific checkers for particular paths: >
+    autocmd FileType python if stridx(expand("%:p"), "/some/path/") == 0 |
+        \ let b:syntastic_checkers = ["pylint"] | endif
+<
+If neither |'g:syntastic_<filetype>_checkers'| nor |'b:syntastic_checkers'|
+is set, a default list of checker is used. Beware however that this list
+deliberately kept minimal, for performance reasons.
+
+You can specify checkers for other filetypes anywhere in these lists, by
+qualifying their names with their respective filetypes: >
+    let g:syntastic_tex_checkers = ["lacheck", "text/language_check"]
+<
+Take a look elsewhere in this manual to find out what checkers and filetypes
+are supported by syntastic: |syntastic-checkers|.
+
+Use `:SyntasticInfo` to see which checkers are available for a given filetype.
+
+------------------------------------------------------------------------------
+5.2. Choosing the executable                           *syntastic-config-exec*
+
+                                       *'syntastic_<filetype>_<checker>_exec'*
+The executable run by a checker is normally defined automatically, when the
+checker is registered. You can however override it, by setting the variable
+'g:syntastic_<filetype>_<checker>_exec': >
+    let g:syntastic_ruby_mri_exec = "~/bin/ruby2"
+<
+This variable has a local version, 'b:syntastic_<filetype>_<checker>_exec',
+which takes precedence over the global one in the corresponding buffer.
+
+                                                *'b:syntastic_<checker>_exec'*
+There is also a local variable named 'b:syntastic_<checker>_exec', which
+takes precedence over both 'b:syntastic_<filetype>_<checker>_exec' and
+'g:syntastic_<filetype>_<checker>_exec' in the buffers where it is defined.
+
+------------------------------------------------------------------------------
+5.3. Configuring specific checkers                  *syntastic-config-makeprg*
+
+Checkers are run by constructing a command line and by passing it to a shell
+(see |'shell'| and |'syntastic_shell'|). In most cases this command line is
+built using an internal function named "makeprgBuild()", which provides a
+number of options that allow you to customise every part of the command that
+gets called.
+
+                                   *'syntastic_<filetype>_<checker>_<option>'*
+Checkers that use "makeprgBuild()" construct the corresponding command line
+like this: >
+    let makeprg = self.makeprgBuild({
+                \ "exe": self.getExec(),
+                \ "args": "-a -b -c",
+                \ "fname": shellescape(expand("%", 1)),
+                \ "post_args": "--more --args",
+                \ "tail": "2>/dev/null" })
+<
+The result is a command line of the form: >
+    <exe> <args> <fname> <post_args> <tail>
+<
+All fields above are optional, and can be overridden by setting global
+variables 'g:syntastic_<filetype>_<checker-name>_<option-name>' - even
+parameters not specified in the call to "makeprgBuild()". For example to
+override the arguments and the tail: >
+    let g:syntastic_c_pc_lint_args = "-w5 -Iz:/usr/include/linux"
+    let g:syntastic_c_pc_lint_tail = "2>/dev/null"
+<
+These variables also have buffer-local versions named
+'b:syntastic_<filetype>_<checker-name>_<option-name>', which takes precedence
+over the global ones in the corresponding buffers.
+
+You can see the final outcome of setting these variables in the debug logs
+(cf. |syntastic-config-debug|).
+
+Special characters need to be escaped, so that they can survive shell
+expansions. Vim function |shellescape()| can help you with escaping: >
+    let g:syntastic_c_cppcheck_args =
+        \ "-DBUILD_BASENAME=my-module " . shellescape("-DBUILD_STR(s)=#s")
+<
+Alternatively, you can tell syntastic to escape special characters by turning
+the value into a list: >
+    let g:syntastic_c_cppcheck_args =
+        \ ["-DBUILD_BASENAME=my-module", "-DBUILD_STR(s)=#s"]
+<
+Each element of this list is then escaped as needed, and turned into a
+separate argument for the shell.
+
+                                                      *syntastic-config-empty*
+If one of the above variables has a non-empty default and you want it to be
+empty, you can set it to an empty string, e.g.: >
+    let g:syntastic_javascript_jslint_args = ""
+<
+                                        *'syntastic_<filetype>_<checker>_exe'*
+The 'exe' option is special. Normally it is the same as the 'exec' attribute
+described above, but you can use it to add environment variables to the
+command line, or to change the way the checker is run. For example this setup
+allows you to run PC-Lint on Linux, under Wine emulation: >
+    let  g:syntastic_c_pc_lint_exec = "wine"
+    let  g:syntastic_c_pc_lint_exe = "wine c:/path/to/lint-nt.exe"
+<
+                                      *'syntastic_<filetype>_<checker>_fname'*
+
+The 'fname' option is also special. Normally it is automatically set by
+syntastic to the name of the current file, but you can change that as needed.
+For example you can tell the SML/NJ compiler to use Compilation Manager by
+omitting the filename from the command line: >
+    let g:syntastic_sml_smlnj_fname = ""
+<
+                                            *syntastic-config-no-makeprgbuild*
+For checkers that do not use the "makeprgBuild()" function any specific
+options that can be set should be documented in this manual (see
+|syntastic-checkers|).
+
+------------------------------------------------------------------------------
+5.4. Sorting errors                                    *syntastic-config-sort*
+
+                                       *'syntastic_<filetype>_<checker>_sort'*
+Syntastic may decide to group the errors produced by some checkers by file,
+then sort them by line number, then by type, then by column number. If you'd
+prefer to see the errors in the order in which they are output by the external
+checker you can set the variable |'g:syntastic_<filetype>_<checker>_sort'| to 0.
+
+Alternatively, if syntastic doesn't reorder the errors produced by a checker
+but you'd like it to sort them, you can set the same variable to 1.
+
+There is also a local version |'b:syntastic_<filetype>_<checker>_sort'| of
+this variable, that takes precedence over it in the buffers where it is
+defined.
+
+For aggregated lists (see |syntastic-aggregating-errors|) these variables are
+ignored if |'syntastic_sort_aggregated_errors'| is set (which is the default).
+
+------------------------------------------------------------------------------
+5.5. Filtering errors                             *syntastic-config-filtering*
+
+                             *'syntastic_<filetype>_<checker>_quiet_messages'*
+Finally, variables 'g:syntastic_<filetype>_<checker-name>_quiet_messages' can
+be used to filter out some of the messages produced by specific checkers. The
+effect is identical to that of |syntastic_quiet_messages|, except only messages
+from the corresponding checkers are filtered. Example: >
+    let g:syntastic_python_pylama_quiet_messages = {
+        \ "type":  "style",
+        \ "regex": '\m\[C03\d\d\]' }
+<
+The syntax is of course identical to that of |syntastic_quiet_messages|.
+
+------------------------------------------------------------------------------
+5.6. Debugging                                        *syntastic-config-debug*
+                                                             *syntastic-debug*
+
+Syntastic can log a trace of its working to Vim's |message-history|. To verify
+the command line constructed by syntastic to run a checker, set the variable
+|'syntastic_debug'| to a non-zero value, run the checker, then run `:mes` to
+display the messages, and look for "makeprg" in the output.
+
+From a user's perspective, the useful values for |'syntastic_debug'| are 1, 3,
+and 33:
+
+     1 - logs syntastic's workflow
+     3 - logs workflow, checker's output, and |location-list| manipulations
+    33 - logs workflow and checker-specific details (such as version checks).
+
+Debug logs can be saved to a file; see |'syntastic_debug_file'| for details.
+
+Setting |'syntastic_debug'| to 0 turns off logging.
+
+------------------------------------------------------------------------------
+5.7. Profiling                                           *syntastic-profiling*
+
+A very useful tool for debugging performance problems is Vim's built-in
+|profiler|. In order to enable profiling for syntastic you need to add two lines
+to your vimrc (not to gvimrc): >
+    profile start syntastic.log
+    profile! file */syntastic/*
+<
+(assuming your copy of syntastic lives in a directory creatively named
+"syntastic"). These lines must be executed before syntastic is loaded, so you
+need to put them before package managers such as "pathogen" or "Vundle", and
+(in newer Vim versions) before any commands related to |packages|.
+
+A log file is created in the current directory, and is updated when you quit
+Vim.
+
+==============================================================================
+6. Notes                                                     *syntastic-notes*
+
+------------------------------------------------------------------------------
+6.1. Handling of composite filetypes                     *syntastic-composite*
+
+Some Vim plugins use composite filetypes, such as "django.python" or
+"handlebars.html". Normally syntastic deals with this situation by splitting
+the filetype in its simple components, and calling all checkers that apply.
+If this behaviour is not desirable, you can disable it by mapping the
+composite filetypes to simple ones using |'syntastic_filetype_map'|, e.g.: >
+    let g:syntastic_filetype_map = { "handlebars.html": "handlebars" }
+<
+------------------------------------------------------------------------------
+6.2. Editing files over network                              *syntastic-netrw*
+
+The standard plugin |netrw| allows Vim to transparently edit files over
+network and inside archives. Currently syntastic doesn't support this mode
+of operation. It can only check files that can be accessed directly by local
+checkers, without any translation or conversion.
+
+------------------------------------------------------------------------------
+6.3. The 'shellslash' option                            *syntastic-shellslash*
+
+The 'shellslash' option is relevant only on Windows systems. This option
+determines (among other things) the rules for quoting command lines, and there
+is no easy way for syntastic to make sure its state is appropriate for your
+shell. It should be turned off if your 'shell' (or |'syntastic_shell'|) is
+"cmd.exe", and on for shells that expect an UNIX-like syntax, such as Cygwin's
+"sh". Most checkers will stop working if 'shellslash' is set to the wrong
+value.
+
+------------------------------------------------------------------------------
+6.4. Saving Vim sessions                                  *syntastic-sessions*
+
+If you use `:mksession` to save Vim sessions you should probably make sure to
+remove option "blank" from 'sessionoptions': >
+    set sessionoptions-=blank
+<
+This will prevent `:mksession` from saving |syntastic-error-window| as empty
+quickfix windows.
+
+------------------------------------------------------------------------------
+6.5. The location list callback                   *syntastic-loclist-callback*
+
+                                                        *SyntasticCheckHook()*
+Syntastic also gives you direct access to the list of errors.  A function
+named |SyntasticCheckHook()| is called by syntastic (if it exists) right
+before populating the |location-list| and enabling the notifiers. The function
+takes exactly one argument, the list of errors in |location-list| format (see
+|getqflist()| for details). format. You can do essentially anything with this
+list, as long as you don't change its format, and you don't add or remove
+elements.
+
+For example the following function will make the error window smaller if fewer
+than 10 errors are found: >
+    function! SyntasticCheckHook(errors)
+        if !empty(a:errors)
+            let g:syntastic_loc_list_height = min([len(a:errors), 10])
+        endif
+    endfunction
+<
+(Please keep in mind however that Vim options |winheight| and |winminheight|
+also affect window sizes.)
+
+==============================================================================
+7. Compatibility with other software                 *syntastic-compatibility*
+
+------------------------------------------------------------------------------
+7.1. airline                                               *syntastic-airline*
+
+The "airline" Vim plugin (https://github.com/vim-airline/vim-airline) comes
+packaged with a mechanism of showing flags on the |'statusline'| according
+to your |'syntastic_stl_format'|. When using this plugin you do NOT need to
+follow the recommendation outlined in the |syntastic-statusline-flag| section
+above to modify your |'statusline'|; "airline" will make all necessary changes
+automatically.
+
+------------------------------------------------------------------------------
+7.2. The csh and tcsh shells                                   *syntastic-csh*
+
+The "csh" and "tcsh" shells are mostly compatible with syntastic. However,
+some checkers assume Bourne shell syntax for redirecting "stderr". For this
+reason, you should point |'syntastic_shell'| to a Bourne-compatible shell,
+such as "zsh", "bash", "ksh", or even the original Bourne "sh": >
+    let g:syntastic_shell = "/bin/sh"
+<
+------------------------------------------------------------------------------
+7.3. EasyGrep                                             *syntastic-easygrep*
+
+The "EasyGrep" Vim plugin (https://github.com/dkprice/vim-easygrep) can use
+either |quickfix| lists, or location lists (see |location-list|). Syntastic can
+be run along with "EasyGrep" provided that the latter is configured to use
+|quickfix| lists (which is the default at the time of this writing): >
+    let g:EasyGrepWindow = 0
+<
+------------------------------------------------------------------------------
+7.4. Eclim                                                   *syntastic-eclim*
+
+Syntastic can be used together with "Eclim" (see http://eclim.org/). However,
+by default Eclim disables syntastic's checks for the filetypes it supports, in
+order to run its own validation. If you'd prefer to use Eclim but still run
+syntastic's checks, set |g:EclimFileTypeValidate| to 0: >
+    let g:EclimFileTypeValidate = 0
+<
+It is also possible to re-enable syntastic checks only for some filetypes, and
+run Eclim's validation for others. Please consult Eclim's documentation for
+details.
+
+------------------------------------------------------------------------------
+7.5. ferret                                                 *syntastic-ferret*
+
+At the time of this writing syntastic conflicts with the "ferret" Vim plugin
+(https://github.com/wincent/ferret). The "ferret" plugin assumes control over
+loclist windows even when configured to use |quickfix| lists. This interferes
+with syntastic's functioning.
+
+------------------------------------------------------------------------------
+7.6. The fish shell                                           *syntastic-fish*
+
+At the time of this writing the "fish" shell (see http://fishshell.com/)
+doesn't support the standard UNIX syntax for file redirections, and thus it
+can't be used together with syntastic. You can however set |'syntastic_shell'|
+to a more traditional shell, such as "zsh", "bash", "ksh", or even the
+original Bourne "sh": >
+    let g:syntastic_shell = "/bin/sh"
+<
+------------------------------------------------------------------------------
+7.7. The fizsh shell                                         *syntastic-fizsh*
+
+Using syntastic with the "fizsh" shell (see https://github.com/zsh-users/fizsh)
+is possible, but potentially problematic. In order to do it you'll need to set
+'shellredir' like this: >
+    set shellredir=>%s\ 2>&1
+<
+Please keep in mind however that Vim can't take advantage of any of the
+interactive features of "fizsh". Using a more traditional shell such as "zsh",
+"bash", "ksh", or the original Bourne "sh" might be a better choice: >
+    let g:syntastic_shell = "/bin/sh"
+<
+------------------------------------------------------------------------------
+7.8. flagship                                             *syntastic-flagship*
+
+The "flagship" Vim plugin (https://github.com/tpope/vim-flagship) has its
+own mechanism of showing flags on the |'statusline'|. To allow "flagship"
+to manage syntastic's statusline flag add the following |autocommand| to
+your vimrc, rather than explicitly adding the flag to your |'statusline'| as
+described in the |syntastic-statusline-flag| section above: >
+    autocmd User Flags call Hoist("window", "SyntasticStatuslineFlag")
+<
+------------------------------------------------------------------------------
+7.9. powerline                                           *syntastic-powerline*
+
+The "powerline" Vim plugin (https://github.com/powerline/powerline) comes
+packaged with a syntastic segment. To customize this segment create a file
+"~/.config/powerline/themes/vim/default.json", with a content like this: >
+    {
+        "segment_data" : {
+            "powerline.segments.vim.plugin.syntastic.syntastic" : {
+                "args" : {
+                    "err_format" : "Err: {first_line} #{num} ",
+                    "warn_format" : "Warn: {first_line} #{num} "
+                }
+            }
+        }
+    }
+<
+------------------------------------------------------------------------------
+7.10. The PowerShell shell                              *syntastic-powershell*
+
+At the time of this writing syntastic is not compatible with using
+"PowerShell" (https://msdn.microsoft.com/en-us/powershell) as Vim's 'shell'.
+You may still run Vim from "PowerShell", but you do have to point Vim's
+'shell' to a more traditional program, such as "cmd.exe" on Windows, or
+"/bin/sh" on UNIX: >
+    set shell=c:\Windows\system32\cmd.exe
+    set shell=/bin/sh
+<
+------------------------------------------------------------------------------
+7.11. python-mode                                           *syntastic-pymode*
+
+Syntastic can be used along with the "python-mode" Vim plugin (see
+https://github.com/klen/python-mode). However, they both run syntax checks by
+default when you save buffers to disk, and this is probably not what you want.
+To avoid both plugins opening error windows, you can either set passive mode
+for python in syntastic (see |'syntastic_mode_map'|), or disable lint checks in
+"python-mode", by setting |pymode_lint_on_write| to 0. E.g.: >
+    let g:pymode_lint_on_write = 0
+<
+------------------------------------------------------------------------------
+7.12. vim-auto-save                                  *syntastic-vim-auto-save*
+
+Syntastic can be used together with the "vim-auto-save" Vim plugin (see
+https://github.com/907th/vim-auto-save). However, syntastic checks in active
+mode only work with "vim-auto-save" version 0.1.7 or later.
+
+------------------------------------------------------------------------------
+7.13. vim-go                                                *syntastic-vim-go*
+
+Syntastic can be used along with the "vim-go" Vim plugin (see
+https://github.com/fatih/vim-go). However, both "vim-go" and syntastic run
+syntax checks by default when you save buffers to disk. To avoid conflicts,
+you have to either set passive mode in syntastic for the "go" filetype (see
+|syntastic_mode_map|), or prevent "vim-go" from showing a quickfix window when
+|g:go_fmt_command| fails, by setting |g:go_fmt_fail_silently| to 1. E.g.: >
+    let g:go_fmt_fail_silently = 1
+<
+"vim-go" version 1.4 and earlier always uses |quickfix| lists. Starting with
+version 1.5, "vim-go" can also use location lists (see |location-list|). To
+avoid conflicts with syntastic, you probably want to configure "vim-go" to
+stick with |quickfix| lists: >
+    let g:go_list_type = "quickfix"
+<
+------------------------------------------------------------------------------
+7.14. vim-virtualenv                                *syntastic-vim-virtualenv*
+
+At the time of this writing, syntastic can't run checkers installed
+in Python virtual environments activated by "vim-virtualenv" (see
+https://github.com/jmcantrell/vim-virtualenv). This is a limitation of
+"vim-virtualenv".
+
+------------------------------------------------------------------------------
+7.15. YouCompleteMe                                            *syntastic-ycm*
+
+Syntastic can be used together with the "YouCompleteMe" Vim plugin (see
+http://valloric.github.io/YouCompleteMe/). However, by default "YouCompleteMe"
+disables syntastic's checkers for the "c", "cpp", "objc", and "objcpp"
+filetypes, in order to allow its own checkers to run. If you want to use YCM's
+identifier completer but still run syntastic's checkers for those filetypes you
+have to set |g:ycm_show_diagnostics_ui| to 0. E.g.: >
+    let g:ycm_show_diagnostics_ui = 0
+<
+------------------------------------------------------------------------------
+7.16. The zsh shell and MacVim                                 *syntastic-zsh*
+
+If you're running MacVim together with the "zsh" shell (http://www.zsh.org/)
+you need to be aware that MacVim does not source your .zshrc file, but will
+source a .zshenv file. Consequently you have to move any setup steps relevant
+to the checkers you're using from .zshrc to .zshenv, otherwise your checkers
+will misbehave when run by syntastic. This is particularly important for
+programs such as "rvm" (https://rvm.io/) or "rbenv" (http://rbenv.org/), that
+rely on setting environment variables.
+
+==============================================================================
+8. About                                                     *syntastic-about*
+
+The core maintainers of syntastic are:
+    Martin Grenfell (GitHub: scrooloose)
+    Gregor Uhlenheuer (GitHub: kongo2002)
+    LCD 047 (GitHub: lcd047)
+
+Find the latest version of syntastic at:
+
+    http://github.com/vim-syntastic/syntastic
+
+==============================================================================
+9. License                                                 *syntastic-license*
+
+Syntastic is released under the WTFPL.
+See http://sam.zoy.org/wtfpl/COPYING.
+
+ vim:tw=78:sw=4:ft=help:norl:
diff --git a/vim-plugins/bundle/syntastic/doc/tags b/vim-plugins/bundle/syntastic/doc/tags
new file mode 100644
index 0000000..e9924b9
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/doc/tags
@@ -0,0 +1,598 @@
+'b:syntastic_<checker>_exec'	syntastic.txt	/*'b:syntastic_<checker>_exec'*
+'b:syntastic_ada_cflags'	syntastic-checkers.txt	/*'b:syntastic_ada_cflags'*
+'b:syntastic_asm_cflags'	syntastic-checkers.txt	/*'b:syntastic_asm_cflags'*
+'b:syntastic_c_cflags'	syntastic-checkers.txt	/*'b:syntastic_c_cflags'*
+'b:syntastic_checkers'	syntastic.txt	/*'b:syntastic_checkers'*
+'b:syntastic_cobol_cflags'	syntastic-checkers.txt	/*'b:syntastic_cobol_cflags'*
+'b:syntastic_cpp_cflags'	syntastic-checkers.txt	/*'b:syntastic_cpp_cflags'*
+'b:syntastic_d_cflags'	syntastic-checkers.txt	/*'b:syntastic_d_cflags'*
+'b:syntastic_fortran_cflags'	syntastic-checkers.txt	/*'b:syntastic_fortran_cflags'*
+'b:syntastic_mode'	syntastic.txt	/*'b:syntastic_mode'*
+'b:syntastic_objc_cflags'	syntastic-checkers.txt	/*'b:syntastic_objc_cflags'*
+'b:syntastic_objcpp_cflags'	syntastic-checkers.txt	/*'b:syntastic_objcpp_cflags'*
+'b:syntastic_skip_checks'	syntastic.txt	/*'b:syntastic_skip_checks'*
+'b:syntastic_verilog_cflags'	syntastic-checkers.txt	/*'b:syntastic_verilog_cflags'*
+'b:vaxe_hxml'	syntastic-checkers.txt	/*'b:vaxe_hxml'*
+'g:syntastic_<filetype>_checkers'	syntastic.txt	/*'g:syntastic_<filetype>_checkers'*
+'g:syntastic_ada_check_header'	syntastic-checkers.txt	/*'g:syntastic_ada_check_header'*
+'g:syntastic_ada_compiler'	syntastic-checkers.txt	/*'g:syntastic_ada_compiler'*
+'g:syntastic_ada_compiler_options'	syntastic-checkers.txt	/*'g:syntastic_ada_compiler_options'*
+'g:syntastic_ada_config_file'	syntastic-checkers.txt	/*'g:syntastic_ada_config_file'*
+'g:syntastic_ada_errorformat'	syntastic-checkers.txt	/*'g:syntastic_ada_errorformat'*
+'g:syntastic_ada_include_dirs'	syntastic-checkers.txt	/*'g:syntastic_ada_include_dirs'*
+'g:syntastic_ada_remove_include_errors'	syntastic-checkers.txt	/*'g:syntastic_ada_remove_include_errors'*
+'g:syntastic_asm_compiler'	syntastic-checkers.txt	/*'g:syntastic_asm_compiler'*
+'g:syntastic_asm_compiler_options'	syntastic-checkers.txt	/*'g:syntastic_asm_compiler_options'*
+'g:syntastic_asm_config_file'	syntastic-checkers.txt	/*'g:syntastic_asm_config_file'*
+'g:syntastic_asm_dialect'	syntastic-checkers.txt	/*'g:syntastic_asm_dialect'*
+'g:syntastic_asm_errorformat'	syntastic-checkers.txt	/*'g:syntastic_asm_errorformat'*
+'g:syntastic_asm_include_dirs'	syntastic-checkers.txt	/*'g:syntastic_asm_include_dirs'*
+'g:syntastic_asm_remove_include_errors'	syntastic-checkers.txt	/*'g:syntastic_asm_remove_include_errors'*
+'g:syntastic_avrgcc_config_file'	syntastic-checkers.txt	/*'g:syntastic_avrgcc_config_file'*
+'g:syntastic_c_auto_refresh_includes'	syntastic-checkers.txt	/*'g:syntastic_c_auto_refresh_includes'*
+'g:syntastic_c_check_header'	syntastic-checkers.txt	/*'g:syntastic_c_check_header'*
+'g:syntastic_c_compiler'	syntastic-checkers.txt	/*'g:syntastic_c_compiler'*
+'g:syntastic_c_compiler_options'	syntastic-checkers.txt	/*'g:syntastic_c_compiler_options'*
+'g:syntastic_c_config_file'	syntastic-checkers.txt	/*'g:syntastic_c_config_file'*
+'g:syntastic_c_errorformat'	syntastic-checkers.txt	/*'g:syntastic_c_errorformat'*
+'g:syntastic_c_include_dirs'	syntastic-checkers.txt	/*'g:syntastic_c_include_dirs'*
+'g:syntastic_c_no_default_include_dirs'	syntastic-checkers.txt	/*'g:syntastic_c_no_default_include_dirs'*
+'g:syntastic_c_no_include_search'	syntastic-checkers.txt	/*'g:syntastic_c_no_include_search'*
+'g:syntastic_c_remove_include_errors'	syntastic-checkers.txt	/*'g:syntastic_c_remove_include_errors'*
+'g:syntastic_clang_check_config_file'	syntastic-checkers.txt	/*'g:syntastic_clang_check_config_file'*
+'g:syntastic_clang_tidy_config_file'	syntastic-checkers.txt	/*'g:syntastic_clang_tidy_config_file'*
+'g:syntastic_cobol_compiler'	syntastic-checkers.txt	/*'g:syntastic_cobol_compiler'*
+'g:syntastic_cobol_compiler_options'	syntastic-checkers.txt	/*'g:syntastic_cobol_compiler_options'*
+'g:syntastic_cobol_config_file'	syntastic-checkers.txt	/*'g:syntastic_cobol_config_file'*
+'g:syntastic_cobol_errorformat'	syntastic-checkers.txt	/*'g:syntastic_cobol_errorformat'*
+'g:syntastic_cobol_include_dirs'	syntastic-checkers.txt	/*'g:syntastic_cobol_include_dirs'*
+'g:syntastic_cobol_remove_include_errors'	syntastic-checkers.txt	/*'g:syntastic_cobol_remove_include_errors'*
+'g:syntastic_cpp_auto_refresh_includes'	syntastic-checkers.txt	/*'g:syntastic_cpp_auto_refresh_includes'*
+'g:syntastic_cpp_check_header'	syntastic-checkers.txt	/*'g:syntastic_cpp_check_header'*
+'g:syntastic_cpp_compiler'	syntastic-checkers.txt	/*'g:syntastic_cpp_compiler'*
+'g:syntastic_cpp_compiler_options'	syntastic-checkers.txt	/*'g:syntastic_cpp_compiler_options'*
+'g:syntastic_cpp_config_file'	syntastic-checkers.txt	/*'g:syntastic_cpp_config_file'*
+'g:syntastic_cpp_cpplint_args'	syntastic-checkers.txt	/*'g:syntastic_cpp_cpplint_args'*
+'g:syntastic_cpp_cpplint_thres'	syntastic-checkers.txt	/*'g:syntastic_cpp_cpplint_thres'*
+'g:syntastic_cpp_errorformat'	syntastic-checkers.txt	/*'g:syntastic_cpp_errorformat'*
+'g:syntastic_cpp_include_dirs'	syntastic-checkers.txt	/*'g:syntastic_cpp_include_dirs'*
+'g:syntastic_cpp_no_default_include_dirs'	syntastic-checkers.txt	/*'g:syntastic_cpp_no_default_include_dirs'*
+'g:syntastic_cpp_no_include_search'	syntastic-checkers.txt	/*'g:syntastic_cpp_no_include_search'*
+'g:syntastic_cpp_remove_include_errors'	syntastic-checkers.txt	/*'g:syntastic_cpp_remove_include_errors'*
+'g:syntastic_cppcheck_config_file'	syntastic-checkers.txt	/*'g:syntastic_cppcheck_config_file'*
+'g:syntastic_cuda_check_header'	syntastic-checkers.txt	/*'g:syntastic_cuda_check_header'*
+'g:syntastic_cuda_config_file'	syntastic-checkers.txt	/*'g:syntastic_cuda_config_file'*
+'g:syntastic_d_check_header'	syntastic-checkers.txt	/*'g:syntastic_d_check_header'*
+'g:syntastic_d_compiler'	syntastic-checkers.txt	/*'g:syntastic_d_compiler'*
+'g:syntastic_d_compiler_options'	syntastic-checkers.txt	/*'g:syntastic_d_compiler_options'*
+'g:syntastic_d_config_file'	syntastic-checkers.txt	/*'g:syntastic_d_config_file'*
+'g:syntastic_d_dub_exec'	syntastic-checkers.txt	/*'g:syntastic_d_dub_exec'*
+'g:syntastic_d_errorformat'	syntastic-checkers.txt	/*'g:syntastic_d_errorformat'*
+'g:syntastic_d_include_dirs'	syntastic-checkers.txt	/*'g:syntastic_d_include_dirs'*
+'g:syntastic_d_remove_include_errors'	syntastic-checkers.txt	/*'g:syntastic_d_remove_include_errors'*
+'g:syntastic_d_use_dub'	syntastic-checkers.txt	/*'g:syntastic_d_use_dub'*
+'g:syntastic_fortran_compiler'	syntastic-checkers.txt	/*'g:syntastic_fortran_compiler'*
+'g:syntastic_fortran_compiler_options'	syntastic-checkers.txt	/*'g:syntastic_fortran_compiler_options'*
+'g:syntastic_fortran_config_file'	syntastic-checkers.txt	/*'g:syntastic_fortran_config_file'*
+'g:syntastic_fortran_errorformat'	syntastic-checkers.txt	/*'g:syntastic_fortran_errorformat'*
+'g:syntastic_fortran_include_dirs'	syntastic-checkers.txt	/*'g:syntastic_fortran_include_dirs'*
+'g:syntastic_fortran_remove_include_errors'	syntastic-checkers.txt	/*'g:syntastic_fortran_remove_include_errors'*
+'g:syntastic_glsl_extensions'	syntastic-checkers.txt	/*'g:syntastic_glsl_extensions'*
+'g:syntastic_glsl_options'	syntastic-checkers.txt	/*'g:syntastic_glsl_options'*
+'g:syntastic_go_go_build_args'	syntastic-checkers.txt	/*'g:syntastic_go_go_build_args'*
+'g:syntastic_go_go_test_args'	syntastic-checkers.txt	/*'g:syntastic_go_go_test_args'*
+'g:syntastic_html_tidy_blocklevel_tags'	syntastic-checkers.txt	/*'g:syntastic_html_tidy_blocklevel_tags'*
+'g:syntastic_html_tidy_empty_tags'	syntastic-checkers.txt	/*'g:syntastic_html_tidy_empty_tags'*
+'g:syntastic_html_tidy_ignore_errors'	syntastic-checkers.txt	/*'g:syntastic_html_tidy_ignore_errors'*
+'g:syntastic_html_tidy_inline_tags'	syntastic-checkers.txt	/*'g:syntastic_html_tidy_inline_tags'*
+'g:syntastic_html_validator_api'	syntastic-checkers.txt	/*'g:syntastic_html_validator_api'*
+'g:syntastic_html_validator_exec'	syntastic-checkers.txt	/*'g:syntastic_html_validator_exec'*
+'g:syntastic_html_validator_nsfilter'	syntastic-checkers.txt	/*'g:syntastic_html_validator_nsfilter'*
+'g:syntastic_html_validator_parser'	syntastic-checkers.txt	/*'g:syntastic_html_validator_parser'*
+'g:syntastic_html_w3_api'	syntastic-checkers.txt	/*'g:syntastic_html_w3_api'*
+'g:syntastic_html_w3_exec'	syntastic-checkers.txt	/*'g:syntastic_html_w3_exec'*
+'g:syntastic_java_checkstyle_classpath'	syntastic-checkers.txt	/*'g:syntastic_java_checkstyle_classpath'*
+'g:syntastic_java_checkstyle_conf_file'	syntastic-checkers.txt	/*'g:syntastic_java_checkstyle_conf_file'*
+'g:syntastic_java_javac_autoload_maven_classpath'	syntastic-checkers.txt	/*'g:syntastic_java_javac_autoload_maven_classpath'*
+'g:syntastic_java_javac_classpath'	syntastic-checkers.txt	/*'g:syntastic_java_javac_classpath'*
+'g:syntastic_java_javac_config_file'	syntastic-checkers.txt	/*'g:syntastic_java_javac_config_file'*
+'g:syntastic_java_javac_config_file_enabled'	syntastic-checkers.txt	/*'g:syntastic_java_javac_config_file_enabled'*
+'g:syntastic_java_javac_custom_classpath_command'	syntastic-checkers.txt	/*'g:syntastic_java_javac_custom_classpath_command'*
+'g:syntastic_java_javac_delete_output'	syntastic-checkers.txt	/*'g:syntastic_java_javac_delete_output'*
+'g:syntastic_java_javac_executable'	syntastic-checkers.txt	/*'g:syntastic_java_javac_executable'*
+'g:syntastic_java_javac_options'	syntastic-checkers.txt	/*'g:syntastic_java_javac_options'*
+'g:syntastic_java_maven_executable'	syntastic-checkers.txt	/*'g:syntastic_java_maven_executable'*
+'g:syntastic_javascript_closurecompiler_path'	syntastic-checkers.txt	/*'g:syntastic_javascript_closurecompiler_path'*
+'g:syntastic_javascript_closurecompiler_script'	syntastic-checkers.txt	/*'g:syntastic_javascript_closurecompiler_script'*
+'g:syntastic_javascript_standard_generic'	syntastic-checkers.txt	/*'g:syntastic_javascript_standard_generic'*
+'g:syntastic_less_use_less_lint'	syntastic-checkers.txt	/*'g:syntastic_less_use_less_lint'*
+'g:syntastic_objc_check_header'	syntastic-checkers.txt	/*'g:syntastic_objc_check_header'*
+'g:syntastic_objc_compiler'	syntastic-checkers.txt	/*'g:syntastic_objc_compiler'*
+'g:syntastic_objc_compiler_options'	syntastic-checkers.txt	/*'g:syntastic_objc_compiler_options'*
+'g:syntastic_objc_config_file'	syntastic-checkers.txt	/*'g:syntastic_objc_config_file'*
+'g:syntastic_objc_errorformat'	syntastic-checkers.txt	/*'g:syntastic_objc_errorformat'*
+'g:syntastic_objc_include_dirs'	syntastic-checkers.txt	/*'g:syntastic_objc_include_dirs'*
+'g:syntastic_objc_no_default_include_dirs'	syntastic-checkers.txt	/*'g:syntastic_objc_no_default_include_dirs'*
+'g:syntastic_objc_remove_include_errors'	syntastic-checkers.txt	/*'g:syntastic_objc_remove_include_errors'*
+'g:syntastic_objcpp_check_header'	syntastic-checkers.txt	/*'g:syntastic_objcpp_check_header'*
+'g:syntastic_objcpp_compiler'	syntastic-checkers.txt	/*'g:syntastic_objcpp_compiler'*
+'g:syntastic_objcpp_compiler_options'	syntastic-checkers.txt	/*'g:syntastic_objcpp_compiler_options'*
+'g:syntastic_objcpp_config_file'	syntastic-checkers.txt	/*'g:syntastic_objcpp_config_file'*
+'g:syntastic_objcpp_errorformat'	syntastic-checkers.txt	/*'g:syntastic_objcpp_errorformat'*
+'g:syntastic_objcpp_include_dirs'	syntastic-checkers.txt	/*'g:syntastic_objcpp_include_dirs'*
+'g:syntastic_objcpp_no_default_include_dirs'	syntastic-checkers.txt	/*'g:syntastic_objcpp_no_default_include_dirs'*
+'g:syntastic_objcpp_remove_include_errors'	syntastic-checkers.txt	/*'g:syntastic_objcpp_remove_include_errors'*
+'g:syntastic_ocaml_camlp4r'	syntastic-checkers.txt	/*'g:syntastic_ocaml_camlp4r'*
+'g:syntastic_ocaml_janestreet_core_dir'	syntastic-checkers.txt	/*'g:syntastic_ocaml_janestreet_core_dir'*
+'g:syntastic_ocaml_use_janestreet_core'	syntastic-checkers.txt	/*'g:syntastic_ocaml_use_janestreet_core'*
+'g:syntastic_ocaml_use_ocamlbuild'	syntastic-checkers.txt	/*'g:syntastic_ocaml_use_ocamlbuild'*
+'g:syntastic_ocaml_use_ocamlc'	syntastic-checkers.txt	/*'g:syntastic_ocaml_use_ocamlc'*
+'g:syntastic_pc_lint_config_file'	syntastic-checkers.txt	/*'g:syntastic_pc_lint_config_file'*
+'g:syntastic_perl_interpreter'	syntastic-checkers.txt	/*'g:syntastic_perl_interpreter'*
+'g:syntastic_perl_lib_path'	syntastic-checkers.txt	/*'g:syntastic_perl_lib_path'*
+'g:syntastic_perl_perlcritic_thres'	syntastic-checkers.txt	/*'g:syntastic_perl_perlcritic_thres'*
+'g:syntastic_python_python_use_codec'	syntastic-checkers.txt	/*'g:syntastic_python_python_use_codec'*
+'g:syntastic_r_lint_styles'	syntastic-checkers.txt	/*'g:syntastic_r_lint_styles'*
+'g:syntastic_r_lintr_cache'	syntastic-checkers.txt	/*'g:syntastic_r_lintr_cache'*
+'g:syntastic_r_lintr_linters'	syntastic-checkers.txt	/*'g:syntastic_r_lintr_linters'*
+'g:syntastic_rst_sphinx_config_dir'	syntastic-checkers.txt	/*'g:syntastic_rst_sphinx_config_dir'*
+'g:syntastic_rst_sphinx_source_dir'	syntastic-checkers.txt	/*'g:syntastic_rst_sphinx_source_dir'*
+'g:syntastic_ruby_exec'	syntastic-checkers.txt	/*'g:syntastic_ruby_exec'*
+'g:syntastic_ruby_flog_threshold_error'	syntastic-checkers.txt	/*'g:syntastic_ruby_flog_threshold_error'*
+'g:syntastic_ruby_flog_threshold_warning'	syntastic-checkers.txt	/*'g:syntastic_ruby_flog_threshold_warning'*
+'g:syntastic_scala_scalastyle_config_file'	syntastic-checkers.txt	/*'g:syntastic_scala_scalastyle_config_file'*
+'g:syntastic_scala_scalastyle_jar'	syntastic-checkers.txt	/*'g:syntastic_scala_scalastyle_jar'*
+'g:syntastic_sparse_config_file'	syntastic-checkers.txt	/*'g:syntastic_sparse_config_file'*
+'g:syntastic_splint_config_file'	syntastic-checkers.txt	/*'g:syntastic_splint_config_file'*
+'g:syntastic_tex_chktex_showmsgs'	syntastic-checkers.txt	/*'g:syntastic_tex_chktex_showmsgs'*
+'g:syntastic_vala_modules'	syntastic-checkers.txt	/*'g:syntastic_vala_modules'*
+'g:syntastic_vala_vapi_dirs'	syntastic-checkers.txt	/*'g:syntastic_vala_vapi_dirs'*
+'g:syntastic_verapp_config_file'	syntastic-checkers.txt	/*'g:syntastic_verapp_config_file'*
+'g:syntastic_verilog_compiler'	syntastic-checkers.txt	/*'g:syntastic_verilog_compiler'*
+'g:syntastic_verilog_compiler_options'	syntastic-checkers.txt	/*'g:syntastic_verilog_compiler_options'*
+'g:syntastic_verilog_config_file'	syntastic-checkers.txt	/*'g:syntastic_verilog_config_file'*
+'g:syntastic_verilog_errorformat'	syntastic-checkers.txt	/*'g:syntastic_verilog_errorformat'*
+'g:syntastic_verilog_include_dirs'	syntastic-checkers.txt	/*'g:syntastic_verilog_include_dirs'*
+'g:syntastic_verilog_remove_include_errors'	syntastic-checkers.txt	/*'g:syntastic_verilog_remove_include_errors'*
+'g:syntastic_vimlint_options'	syntastic-checkers.txt	/*'g:syntastic_vimlint_options'*
+'g:syntastic_xhtml_tidy_ignore_errors'	syntastic-checkers.txt	/*'g:syntastic_xhtml_tidy_ignore_errors'*
+'g:vaxe_hxml'	syntastic-checkers.txt	/*'g:vaxe_hxml'*
+'syntastic_<filetype>_<checker>_<option>'	syntastic.txt	/*'syntastic_<filetype>_<checker>_<option>'*
+'syntastic_<filetype>_<checker>_exe'	syntastic.txt	/*'syntastic_<filetype>_<checker>_exe'*
+'syntastic_<filetype>_<checker>_exec'	syntastic.txt	/*'syntastic_<filetype>_<checker>_exec'*
+'syntastic_<filetype>_<checker>_fname'	syntastic.txt	/*'syntastic_<filetype>_<checker>_fname'*
+'syntastic_<filetype>_<checker>_quiet_messages'	syntastic.txt	/*'syntastic_<filetype>_<checker>_quiet_messages'*
+'syntastic_<filetype>_<checker>_sort'	syntastic.txt	/*'syntastic_<filetype>_<checker>_sort'*
+'syntastic_aggregate_errors'	syntastic.txt	/*'syntastic_aggregate_errors'*
+'syntastic_always_populate_loc_list'	syntastic.txt	/*'syntastic_always_populate_loc_list'*
+'syntastic_auto_jump'	syntastic.txt	/*'syntastic_auto_jump'*
+'syntastic_auto_loc_list'	syntastic.txt	/*'syntastic_auto_loc_list'*
+'syntastic_check_on_open'	syntastic.txt	/*'syntastic_check_on_open'*
+'syntastic_check_on_wq'	syntastic.txt	/*'syntastic_check_on_wq'*
+'syntastic_cursor_columns'	syntastic.txt	/*'syntastic_cursor_columns'*
+'syntastic_debug'	syntastic.txt	/*'syntastic_debug'*
+'syntastic_debug_file'	syntastic.txt	/*'syntastic_debug_file'*
+'syntastic_echo_current_error'	syntastic.txt	/*'syntastic_echo_current_error'*
+'syntastic_enable_balloons'	syntastic.txt	/*'syntastic_enable_balloons'*
+'syntastic_enable_highlighting'	syntastic.txt	/*'syntastic_enable_highlighting'*
+'syntastic_enable_signs'	syntastic.txt	/*'syntastic_enable_signs'*
+'syntastic_error_symbol'	syntastic.txt	/*'syntastic_error_symbol'*
+'syntastic_exit_checks'	syntastic.txt	/*'syntastic_exit_checks'*
+'syntastic_extra_filetypes'	syntastic.txt	/*'syntastic_extra_filetypes'*
+'syntastic_filetype_map'	syntastic.txt	/*'syntastic_filetype_map'*
+'syntastic_full_redraws'	syntastic.txt	/*'syntastic_full_redraws'*
+'syntastic_id_checkers'	syntastic.txt	/*'syntastic_id_checkers'*
+'syntastic_ignore_files'	syntastic.txt	/*'syntastic_ignore_files'*
+'syntastic_loc_list_height'	syntastic.txt	/*'syntastic_loc_list_height'*
+'syntastic_mode_map'	syntastic.txt	/*'syntastic_mode_map'*
+'syntastic_nested_autocommands'	syntastic.txt	/*'syntastic_nested_autocommands'*
+'syntastic_quiet_messages'	syntastic.txt	/*'syntastic_quiet_messages'*
+'syntastic_shell'	syntastic.txt	/*'syntastic_shell'*
+'syntastic_sort_aggregated_errors'	syntastic.txt	/*'syntastic_sort_aggregated_errors'*
+'syntastic_stl_format'	syntastic.txt	/*'syntastic_stl_format'*
+'syntastic_style_error_symbol'	syntastic.txt	/*'syntastic_style_error_symbol'*
+'syntastic_style_warning_symbol'	syntastic.txt	/*'syntastic_style_warning_symbol'*
+'syntastic_warning_symbol'	syntastic.txt	/*'syntastic_warning_symbol'*
+/syntastic/	syntastic.txt	/*\/syntastic\/*
+:Errors	syntastic.txt	/*:Errors*
+:SyntasticCheck	syntastic.txt	/*:SyntasticCheck*
+:SyntasticInfo	syntastic.txt	/*:SyntasticInfo*
+:SyntasticJavacEditClasspath	syntastic-checkers.txt	/*:SyntasticJavacEditClasspath*
+:SyntasticJavacEditConfig	syntastic-checkers.txt	/*:SyntasticJavacEditConfig*
+:SyntasticReset	syntastic.txt	/*:SyntasticReset*
+:SyntasticSetLoclist	syntastic.txt	/*:SyntasticSetLoclist*
+:SyntasticToggleMode	syntastic.txt	/*:SyntasticToggleMode*
+SyntasticCheckHook()	syntastic.txt	/*SyntasticCheckHook()*
+filter-overrides	syntastic.txt	/*filter-overrides*
+syntastic	syntastic.txt	/*syntastic*
+syntastic-about	syntastic.txt	/*syntastic-about*
+syntastic-actionscript-mxmlc	syntastic-checkers.txt	/*syntastic-actionscript-mxmlc*
+syntastic-ada-gcc	syntastic-checkers.txt	/*syntastic-ada-gcc*
+syntastic-aggregating-errors	syntastic.txt	/*syntastic-aggregating-errors*
+syntastic-airline	syntastic.txt	/*syntastic-airline*
+syntastic-ansible-ansible_lint	syntastic-checkers.txt	/*syntastic-ansible-ansible_lint*
+syntastic-apiblueprint-drafter	syntastic-checkers.txt	/*syntastic-apiblueprint-drafter*
+syntastic-applescript-osacompile	syntastic-checkers.txt	/*syntastic-applescript-osacompile*
+syntastic-asciidoc-asciidoc	syntastic-checkers.txt	/*syntastic-asciidoc-asciidoc*
+syntastic-asciidoc-proselint	syntastic-checkers.txt	/*syntastic-asciidoc-proselint*
+syntastic-asl-iasl	syntastic-checkers.txt	/*syntastic-asl-iasl*
+syntastic-asm-gcc	syntastic-checkers.txt	/*syntastic-asm-gcc*
+syntastic-bemhtml-bemhtmllint	syntastic-checkers.txt	/*syntastic-bemhtml-bemhtmllint*
+syntastic-bro-bro	syntastic-checkers.txt	/*syntastic-bro-bro*
+syntastic-c-avrgcc	syntastic-checkers.txt	/*syntastic-c-avrgcc*
+syntastic-c-checkpatch	syntastic-checkers.txt	/*syntastic-c-checkpatch*
+syntastic-c-clang_check	syntastic-checkers.txt	/*syntastic-c-clang_check*
+syntastic-c-clang_tidy	syntastic-checkers.txt	/*syntastic-c-clang_tidy*
+syntastic-c-cppcheck	syntastic-checkers.txt	/*syntastic-c-cppcheck*
+syntastic-c-gcc	syntastic-checkers.txt	/*syntastic-c-gcc*
+syntastic-c-make	syntastic-checkers.txt	/*syntastic-c-make*
+syntastic-c-oclint	syntastic-checkers.txt	/*syntastic-c-oclint*
+syntastic-c-pc_lint	syntastic-checkers.txt	/*syntastic-c-pc_lint*
+syntastic-c-sparse	syntastic-checkers.txt	/*syntastic-c-sparse*
+syntastic-c-splint	syntastic-checkers.txt	/*syntastic-c-splint*
+syntastic-cabal-cabal	syntastic-checkers.txt	/*syntastic-cabal-cabal*
+syntastic-checker-options	syntastic.txt	/*syntastic-checker-options*
+syntastic-checkers	syntastic-checkers.txt	/*syntastic-checkers*
+syntastic-checkers-actionscript	syntastic-checkers.txt	/*syntastic-checkers-actionscript*
+syntastic-checkers-ada	syntastic-checkers.txt	/*syntastic-checkers-ada*
+syntastic-checkers-ansible	syntastic-checkers.txt	/*syntastic-checkers-ansible*
+syntastic-checkers-apiblueprint	syntastic-checkers.txt	/*syntastic-checkers-apiblueprint*
+syntastic-checkers-applescript	syntastic-checkers.txt	/*syntastic-checkers-applescript*
+syntastic-checkers-asciidoc	syntastic-checkers.txt	/*syntastic-checkers-asciidoc*
+syntastic-checkers-asl	syntastic-checkers.txt	/*syntastic-checkers-asl*
+syntastic-checkers-asm	syntastic-checkers.txt	/*syntastic-checkers-asm*
+syntastic-checkers-bemhtml	syntastic-checkers.txt	/*syntastic-checkers-bemhtml*
+syntastic-checkers-bro	syntastic-checkers.txt	/*syntastic-checkers-bro*
+syntastic-checkers-c	syntastic-checkers.txt	/*syntastic-checkers-c*
+syntastic-checkers-cabal	syntastic-checkers.txt	/*syntastic-checkers-cabal*
+syntastic-checkers-chef	syntastic-checkers.txt	/*syntastic-checkers-chef*
+syntastic-checkers-co	syntastic-checkers.txt	/*syntastic-checkers-co*
+syntastic-checkers-cobol	syntastic-checkers.txt	/*syntastic-checkers-cobol*
+syntastic-checkers-coffee	syntastic-checkers.txt	/*syntastic-checkers-coffee*
+syntastic-checkers-coq	syntastic-checkers.txt	/*syntastic-checkers-coq*
+syntastic-checkers-cpp	syntastic-checkers.txt	/*syntastic-checkers-cpp*
+syntastic-checkers-cs	syntastic-checkers.txt	/*syntastic-checkers-cs*
+syntastic-checkers-css	syntastic-checkers.txt	/*syntastic-checkers-css*
+syntastic-checkers-cucumber	syntastic-checkers.txt	/*syntastic-checkers-cucumber*
+syntastic-checkers-cuda	syntastic-checkers.txt	/*syntastic-checkers-cuda*
+syntastic-checkers-d	syntastic-checkers.txt	/*syntastic-checkers-d*
+syntastic-checkers-dart	syntastic-checkers.txt	/*syntastic-checkers-dart*
+syntastic-checkers-docbk	syntastic-checkers.txt	/*syntastic-checkers-docbk*
+syntastic-checkers-dockerfile	syntastic-checkers.txt	/*syntastic-checkers-dockerfile*
+syntastic-checkers-dustjs	syntastic-checkers.txt	/*syntastic-checkers-dustjs*
+syntastic-checkers-elixir	syntastic-checkers.txt	/*syntastic-checkers-elixir*
+syntastic-checkers-erlang	syntastic-checkers.txt	/*syntastic-checkers-erlang*
+syntastic-checkers-eruby	syntastic-checkers.txt	/*syntastic-checkers-eruby*
+syntastic-checkers-fortran	syntastic-checkers.txt	/*syntastic-checkers-fortran*
+syntastic-checkers-gentoo	syntastic-checkers.txt	/*syntastic-checkers-gentoo*
+syntastic-checkers-glsl	syntastic-checkers.txt	/*syntastic-checkers-glsl*
+syntastic-checkers-go	syntastic-checkers.txt	/*syntastic-checkers-go*
+syntastic-checkers-haml	syntastic-checkers.txt	/*syntastic-checkers-haml*
+syntastic-checkers-handlebars	syntastic-checkers.txt	/*syntastic-checkers-handlebars*
+syntastic-checkers-haskell	syntastic-checkers.txt	/*syntastic-checkers-haskell*
+syntastic-checkers-haxe	syntastic-checkers.txt	/*syntastic-checkers-haxe*
+syntastic-checkers-help	syntastic-checkers.txt	/*syntastic-checkers-help*
+syntastic-checkers-hss	syntastic-checkers.txt	/*syntastic-checkers-hss*
+syntastic-checkers-html	syntastic-checkers.txt	/*syntastic-checkers-html*
+syntastic-checkers-java	syntastic-checkers.txt	/*syntastic-checkers-java*
+syntastic-checkers-javascript	syntastic-checkers.txt	/*syntastic-checkers-javascript*
+syntastic-checkers-json	syntastic-checkers.txt	/*syntastic-checkers-json*
+syntastic-checkers-lang	syntastic-checkers.txt	/*syntastic-checkers-lang*
+syntastic-checkers-less	syntastic-checkers.txt	/*syntastic-checkers-less*
+syntastic-checkers-lex	syntastic-checkers.txt	/*syntastic-checkers-lex*
+syntastic-checkers-limbo	syntastic-checkers.txt	/*syntastic-checkers-limbo*
+syntastic-checkers-lisp	syntastic-checkers.txt	/*syntastic-checkers-lisp*
+syntastic-checkers-llvm	syntastic-checkers.txt	/*syntastic-checkers-llvm*
+syntastic-checkers-lua	syntastic-checkers.txt	/*syntastic-checkers-lua*
+syntastic-checkers-markdown	syntastic-checkers.txt	/*syntastic-checkers-markdown*
+syntastic-checkers-matlab	syntastic-checkers.txt	/*syntastic-checkers-matlab*
+syntastic-checkers-mercury	syntastic-checkers.txt	/*syntastic-checkers-mercury*
+syntastic-checkers-nasm	syntastic-checkers.txt	/*syntastic-checkers-nasm*
+syntastic-checkers-nix	syntastic-checkers.txt	/*syntastic-checkers-nix*
+syntastic-checkers-nroff	syntastic-checkers.txt	/*syntastic-checkers-nroff*
+syntastic-checkers-objc	syntastic-checkers.txt	/*syntastic-checkers-objc*
+syntastic-checkers-objcpp	syntastic-checkers.txt	/*syntastic-checkers-objcpp*
+syntastic-checkers-ocaml	syntastic-checkers.txt	/*syntastic-checkers-ocaml*
+syntastic-checkers-perl	syntastic-checkers.txt	/*syntastic-checkers-perl*
+syntastic-checkers-php	syntastic-checkers.txt	/*syntastic-checkers-php*
+syntastic-checkers-po	syntastic-checkers.txt	/*syntastic-checkers-po*
+syntastic-checkers-pod	syntastic-checkers.txt	/*syntastic-checkers-pod*
+syntastic-checkers-pug	syntastic-checkers.txt	/*syntastic-checkers-pug*
+syntastic-checkers-puppet	syntastic-checkers.txt	/*syntastic-checkers-puppet*
+syntastic-checkers-python	syntastic-checkers.txt	/*syntastic-checkers-python*
+syntastic-checkers-qml	syntastic-checkers.txt	/*syntastic-checkers-qml*
+syntastic-checkers-r	syntastic-checkers.txt	/*syntastic-checkers-r*
+syntastic-checkers-racket	syntastic-checkers.txt	/*syntastic-checkers-racket*
+syntastic-checkers-rmd	syntastic-checkers.txt	/*syntastic-checkers-rmd*
+syntastic-checkers-rnc	syntastic-checkers.txt	/*syntastic-checkers-rnc*
+syntastic-checkers-rst	syntastic-checkers.txt	/*syntastic-checkers-rst*
+syntastic-checkers-ruby	syntastic-checkers.txt	/*syntastic-checkers-ruby*
+syntastic-checkers-sass	syntastic-checkers.txt	/*syntastic-checkers-sass*
+syntastic-checkers-scala	syntastic-checkers.txt	/*syntastic-checkers-scala*
+syntastic-checkers-scss	syntastic-checkers.txt	/*syntastic-checkers-scss*
+syntastic-checkers-sh	syntastic-checkers.txt	/*syntastic-checkers-sh*
+syntastic-checkers-slim	syntastic-checkers.txt	/*syntastic-checkers-slim*
+syntastic-checkers-sml	syntastic-checkers.txt	/*syntastic-checkers-sml*
+syntastic-checkers-solidity	syntastic-checkers.txt	/*syntastic-checkers-solidity*
+syntastic-checkers-spec	syntastic-checkers.txt	/*syntastic-checkers-spec*
+syntastic-checkers-sql	syntastic-checkers.txt	/*syntastic-checkers-sql*
+syntastic-checkers-stylus	syntastic-checkers.txt	/*syntastic-checkers-stylus*
+syntastic-checkers-tcl	syntastic-checkers.txt	/*syntastic-checkers-tcl*
+syntastic-checkers-tex	syntastic-checkers.txt	/*syntastic-checkers-tex*
+syntastic-checkers-texinfo	syntastic-checkers.txt	/*syntastic-checkers-texinfo*
+syntastic-checkers-text	syntastic-checkers.txt	/*syntastic-checkers-text*
+syntastic-checkers-trig	syntastic-checkers.txt	/*syntastic-checkers-trig*
+syntastic-checkers-turtle	syntastic-checkers.txt	/*syntastic-checkers-turtle*
+syntastic-checkers-twig	syntastic-checkers.txt	/*syntastic-checkers-twig*
+syntastic-checkers-typescript	syntastic-checkers.txt	/*syntastic-checkers-typescript*
+syntastic-checkers-vala	syntastic-checkers.txt	/*syntastic-checkers-vala*
+syntastic-checkers-verilog	syntastic-checkers.txt	/*syntastic-checkers-verilog*
+syntastic-checkers-vhdl	syntastic-checkers.txt	/*syntastic-checkers-vhdl*
+syntastic-checkers-vim	syntastic-checkers.txt	/*syntastic-checkers-vim*
+syntastic-checkers-xhtml	syntastic-checkers.txt	/*syntastic-checkers-xhtml*
+syntastic-checkers-xml	syntastic-checkers.txt	/*syntastic-checkers-xml*
+syntastic-checkers-xquery	syntastic-checkers.txt	/*syntastic-checkers-xquery*
+syntastic-checkers-xslt	syntastic-checkers.txt	/*syntastic-checkers-xslt*
+syntastic-checkers-yacc	syntastic-checkers.txt	/*syntastic-checkers-yacc*
+syntastic-checkers-yaml	syntastic-checkers.txt	/*syntastic-checkers-yaml*
+syntastic-checkers-yang	syntastic-checkers.txt	/*syntastic-checkers-yang*
+syntastic-checkers-z80	syntastic-checkers.txt	/*syntastic-checkers-z80*
+syntastic-checkers-zpt	syntastic-checkers.txt	/*syntastic-checkers-zpt*
+syntastic-checkers-zsh	syntastic-checkers.txt	/*syntastic-checkers-zsh*
+syntastic-checkers.txt	syntastic-checkers.txt	/*syntastic-checkers.txt*
+syntastic-chef-foodcritic	syntastic-checkers.txt	/*syntastic-chef-foodcritic*
+syntastic-co-coco	syntastic-checkers.txt	/*syntastic-co-coco*
+syntastic-cobol-cobc	syntastic-checkers.txt	/*syntastic-cobol-cobc*
+syntastic-coffee-coffee	syntastic-checkers.txt	/*syntastic-coffee-coffee*
+syntastic-coffee-coffeelint	syntastic-checkers.txt	/*syntastic-coffee-coffeelint*
+syntastic-commands	syntastic.txt	/*syntastic-commands*
+syntastic-compatibility	syntastic.txt	/*syntastic-compatibility*
+syntastic-composite	syntastic.txt	/*syntastic-composite*
+syntastic-config-checkers	syntastic-checkers.txt	/*syntastic-config-checkers*
+syntastic-config-debug	syntastic.txt	/*syntastic-config-debug*
+syntastic-config-empty	syntastic.txt	/*syntastic-config-empty*
+syntastic-config-exec	syntastic.txt	/*syntastic-config-exec*
+syntastic-config-files	syntastic-checkers.txt	/*syntastic-config-files*
+syntastic-config-filtering	syntastic.txt	/*syntastic-config-filtering*
+syntastic-config-format	syntastic-checkers.txt	/*syntastic-config-format*
+syntastic-config-location	syntastic-checkers.txt	/*syntastic-config-location*
+syntastic-config-makeprg	syntastic.txt	/*syntastic-config-makeprg*
+syntastic-config-naming	syntastic-checkers.txt	/*syntastic-config-naming*
+syntastic-config-no-makeprgbuild	syntastic.txt	/*syntastic-config-no-makeprgbuild*
+syntastic-config-sort	syntastic.txt	/*syntastic-config-sort*
+syntastic-contents	syntastic.txt	/*syntastic-contents*
+syntastic-coq-coqtop	syntastic-checkers.txt	/*syntastic-coq-coqtop*
+syntastic-cpp-avrgcc	syntastic-checkers.txt	/*syntastic-cpp-avrgcc*
+syntastic-cpp-clang_check	syntastic-checkers.txt	/*syntastic-cpp-clang_check*
+syntastic-cpp-clang_tidy	syntastic-checkers.txt	/*syntastic-cpp-clang_tidy*
+syntastic-cpp-cppcheck	syntastic-checkers.txt	/*syntastic-cpp-cppcheck*
+syntastic-cpp-cpplint	syntastic-checkers.txt	/*syntastic-cpp-cpplint*
+syntastic-cpp-gcc	syntastic-checkers.txt	/*syntastic-cpp-gcc*
+syntastic-cpp-oclint	syntastic-checkers.txt	/*syntastic-cpp-oclint*
+syntastic-cpp-pc_lint	syntastic-checkers.txt	/*syntastic-cpp-pc_lint*
+syntastic-cpp-verapp	syntastic-checkers.txt	/*syntastic-cpp-verapp*
+syntastic-cs-mcs	syntastic-checkers.txt	/*syntastic-cs-mcs*
+syntastic-csh	syntastic.txt	/*syntastic-csh*
+syntastic-css-csslint	syntastic-checkers.txt	/*syntastic-css-csslint*
+syntastic-css-mixedindentlint	syntastic-checkers.txt	/*syntastic-css-mixedindentlint*
+syntastic-css-phpcs	syntastic-checkers.txt	/*syntastic-css-phpcs*
+syntastic-css-prettycss	syntastic-checkers.txt	/*syntastic-css-prettycss*
+syntastic-css-recess	syntastic-checkers.txt	/*syntastic-css-recess*
+syntastic-css-stylelint	syntastic-checkers.txt	/*syntastic-css-stylelint*
+syntastic-cucumber-cucumber	syntastic-checkers.txt	/*syntastic-cucumber-cucumber*
+syntastic-cuda-nvcc	syntastic-checkers.txt	/*syntastic-cuda-nvcc*
+syntastic-d-dmd	syntastic-checkers.txt	/*syntastic-d-dmd*
+syntastic-dart-dartanalyzer	syntastic-checkers.txt	/*syntastic-dart-dartanalyzer*
+syntastic-debug	syntastic.txt	/*syntastic-debug*
+syntastic-docbk-igor	syntastic-checkers.txt	/*syntastic-docbk-igor*
+syntastic-docbk-xmllint	syntastic-checkers.txt	/*syntastic-docbk-xmllint*
+syntastic-dockerfile-dockerfile_lint	syntastic-checkers.txt	/*syntastic-dockerfile-dockerfile_lint*
+syntastic-dustjs-swiffer	syntastic-checkers.txt	/*syntastic-dustjs-swiffer*
+syntastic-easygrep	syntastic.txt	/*syntastic-easygrep*
+syntastic-eclim	syntastic.txt	/*syntastic-eclim*
+syntastic-elixir-elixir	syntastic-checkers.txt	/*syntastic-elixir-elixir*
+syntastic-erlang-escript	syntastic-checkers.txt	/*syntastic-erlang-escript*
+syntastic-erlang-syntaxerl	syntastic-checkers.txt	/*syntastic-erlang-syntaxerl*
+syntastic-error-signs	syntastic.txt	/*syntastic-error-signs*
+syntastic-error-window	syntastic.txt	/*syntastic-error-window*
+syntastic-eruby-ruby	syntastic-checkers.txt	/*syntastic-eruby-ruby*
+syntastic-ferret	syntastic.txt	/*syntastic-ferret*
+syntastic-filetype-checkers	syntastic.txt	/*syntastic-filetype-checkers*
+syntastic-filtering-errors	syntastic.txt	/*syntastic-filtering-errors*
+syntastic-fish	syntastic.txt	/*syntastic-fish*
+syntastic-fizsh	syntastic.txt	/*syntastic-fizsh*
+syntastic-flagship	syntastic.txt	/*syntastic-flagship*
+syntastic-fortran-gfortran	syntastic-checkers.txt	/*syntastic-fortran-gfortran*
+syntastic-functionality	syntastic.txt	/*syntastic-functionality*
+syntastic-gentoo-xmllint	syntastic-checkers.txt	/*syntastic-gentoo-xmllint*
+syntastic-global-options	syntastic.txt	/*syntastic-global-options*
+syntastic-glsl-cgc	syntastic-checkers.txt	/*syntastic-glsl-cgc*
+syntastic-go-go	syntastic-checkers.txt	/*syntastic-go-go*
+syntastic-go-gofmt	syntastic-checkers.txt	/*syntastic-go-gofmt*
+syntastic-go-golint	syntastic-checkers.txt	/*syntastic-go-golint*
+syntastic-go-gometalinter	syntastic-checkers.txt	/*syntastic-go-gometalinter*
+syntastic-go-gotype	syntastic-checkers.txt	/*syntastic-go-gotype*
+syntastic-go-govet	syntastic-checkers.txt	/*syntastic-go-govet*
+syntastic-haml-haml	syntastic-checkers.txt	/*syntastic-haml-haml*
+syntastic-haml-haml_lint	syntastic-checkers.txt	/*syntastic-haml-haml_lint*
+syntastic-handlebars-handlebars	syntastic-checkers.txt	/*syntastic-handlebars-handlebars*
+syntastic-haskell-hdevtools	syntastic-checkers.txt	/*syntastic-haskell-hdevtools*
+syntastic-haskell-hlint	syntastic-checkers.txt	/*syntastic-haskell-hlint*
+syntastic-haskell-scan	syntastic-checkers.txt	/*syntastic-haskell-scan*
+syntastic-haxe-haxe	syntastic-checkers.txt	/*syntastic-haxe-haxe*
+syntastic-help-proselint	syntastic-checkers.txt	/*syntastic-help-proselint*
+syntastic-highlighting	syntastic.txt	/*syntastic-highlighting*
+syntastic-hss-hss	syntastic-checkers.txt	/*syntastic-hss-hss*
+syntastic-html-eslint	syntastic-checkers.txt	/*syntastic-html-eslint*
+syntastic-html-gjslint	syntastic-checkers.txt	/*syntastic-html-gjslint*
+syntastic-html-htmlhint	syntastic-checkers.txt	/*syntastic-html-htmlhint*
+syntastic-html-jshint	syntastic-checkers.txt	/*syntastic-html-jshint*
+syntastic-html-proselint	syntastic-checkers.txt	/*syntastic-html-proselint*
+syntastic-html-textlint	syntastic-checkers.txt	/*syntastic-html-textlint*
+syntastic-html-tidy	syntastic-checkers.txt	/*syntastic-html-tidy*
+syntastic-html-validator	syntastic-checkers.txt	/*syntastic-html-validator*
+syntastic-html-w3	syntastic-checkers.txt	/*syntastic-html-w3*
+syntastic-intro	syntastic.txt	/*syntastic-intro*
+syntastic-java-checkstyle	syntastic-checkers.txt	/*syntastic-java-checkstyle*
+syntastic-java-javac	syntastic-checkers.txt	/*syntastic-java-javac*
+syntastic-javascript-closurecompiler	syntastic-checkers.txt	/*syntastic-javascript-closurecompiler*
+syntastic-javascript-eslint	syntastic-checkers.txt	/*syntastic-javascript-eslint*
+syntastic-javascript-flow	syntastic-checkers.txt	/*syntastic-javascript-flow*
+syntastic-javascript-gjslint	syntastic-checkers.txt	/*syntastic-javascript-gjslint*
+syntastic-javascript-jscs	syntastic-checkers.txt	/*syntastic-javascript-jscs*
+syntastic-javascript-jshint	syntastic-checkers.txt	/*syntastic-javascript-jshint*
+syntastic-javascript-jsl	syntastic-checkers.txt	/*syntastic-javascript-jsl*
+syntastic-javascript-jslint	syntastic-checkers.txt	/*syntastic-javascript-jslint*
+syntastic-javascript-jsxhint	syntastic-checkers.txt	/*syntastic-javascript-jsxhint*
+syntastic-javascript-mixedindentlint	syntastic-checkers.txt	/*syntastic-javascript-mixedindentlint*
+syntastic-javascript-standard	syntastic-checkers.txt	/*syntastic-javascript-standard*
+syntastic-javascript-tern_lint	syntastic-checkers.txt	/*syntastic-javascript-tern_lint*
+syntastic-json-jsonlint	syntastic-checkers.txt	/*syntastic-json-jsonlint*
+syntastic-json-jsonval	syntastic-checkers.txt	/*syntastic-json-jsonval*
+syntastic-less-lessc	syntastic-checkers.txt	/*syntastic-less-lessc*
+syntastic-less-recess	syntastic-checkers.txt	/*syntastic-less-recess*
+syntastic-lex-flex	syntastic-checkers.txt	/*syntastic-lex-flex*
+syntastic-license	syntastic.txt	/*syntastic-license*
+syntastic-limbo-limbo	syntastic-checkers.txt	/*syntastic-limbo-limbo*
+syntastic-lisp-clisp	syntastic-checkers.txt	/*syntastic-lisp-clisp*
+syntastic-llvm-llvm	syntastic-checkers.txt	/*syntastic-llvm-llvm*
+syntastic-loclist-callback	syntastic.txt	/*syntastic-loclist-callback*
+syntastic-lua-luac	syntastic-checkers.txt	/*syntastic-lua-luac*
+syntastic-lua-luacheck	syntastic-checkers.txt	/*syntastic-lua-luacheck*
+syntastic-markdown-mdl	syntastic-checkers.txt	/*syntastic-markdown-mdl*
+syntastic-markdown-proselint	syntastic-checkers.txt	/*syntastic-markdown-proselint*
+syntastic-markdown-textlint	syntastic-checkers.txt	/*syntastic-markdown-textlint*
+syntastic-matlab-mlint	syntastic-checkers.txt	/*syntastic-matlab-mlint*
+syntastic-mercury-mmc	syntastic-checkers.txt	/*syntastic-mercury-mmc*
+syntastic-nasm-nasm	syntastic-checkers.txt	/*syntastic-nasm-nasm*
+syntastic-netrw	syntastic.txt	/*syntastic-netrw*
+syntastic-nix-nix	syntastic-checkers.txt	/*syntastic-nix-nix*
+syntastic-notes	syntastic.txt	/*syntastic-notes*
+syntastic-nroff-igor	syntastic-checkers.txt	/*syntastic-nroff-igor*
+syntastic-nroff-mandoc	syntastic-checkers.txt	/*syntastic-nroff-mandoc*
+syntastic-nroff-proselint	syntastic-checkers.txt	/*syntastic-nroff-proselint*
+syntastic-objc-gcc	syntastic-checkers.txt	/*syntastic-objc-gcc*
+syntastic-objc-oclint	syntastic-checkers.txt	/*syntastic-objc-oclint*
+syntastic-objcpp-gcc	syntastic-checkers.txt	/*syntastic-objcpp-gcc*
+syntastic-objcpp-oclint	syntastic-checkers.txt	/*syntastic-objcpp-oclint*
+syntastic-ocaml-camlp4o	syntastic-checkers.txt	/*syntastic-ocaml-camlp4o*
+syntastic-perl-perl	syntastic-checkers.txt	/*syntastic-perl-perl*
+syntastic-perl-perlcritic	syntastic-checkers.txt	/*syntastic-perl-perlcritic*
+syntastic-perl-podchecker	syntastic-checkers.txt	/*syntastic-perl-podchecker*
+syntastic-php-php	syntastic-checkers.txt	/*syntastic-php-php*
+syntastic-php-phpcs	syntastic-checkers.txt	/*syntastic-php-phpcs*
+syntastic-php-phplint	syntastic-checkers.txt	/*syntastic-php-phplint*
+syntastic-php-phpmd	syntastic-checkers.txt	/*syntastic-php-phpmd*
+syntastic-po-msgfmt	syntastic-checkers.txt	/*syntastic-po-msgfmt*
+syntastic-pod-podchecker	syntastic-checkers.txt	/*syntastic-pod-podchecker*
+syntastic-pod-proselint	syntastic-checkers.txt	/*syntastic-pod-proselint*
+syntastic-powerline	syntastic.txt	/*syntastic-powerline*
+syntastic-powershell	syntastic.txt	/*syntastic-powershell*
+syntastic-profiling	syntastic.txt	/*syntastic-profiling*
+syntastic-pug-pug_lint	syntastic-checkers.txt	/*syntastic-pug-pug_lint*
+syntastic-puppet-puppet	syntastic-checkers.txt	/*syntastic-puppet-puppet*
+syntastic-puppet-puppetlint	syntastic-checkers.txt	/*syntastic-puppet-puppetlint*
+syntastic-pymode	syntastic.txt	/*syntastic-pymode*
+syntastic-python-flake8	syntastic-checkers.txt	/*syntastic-python-flake8*
+syntastic-python-frosted	syntastic-checkers.txt	/*syntastic-python-frosted*
+syntastic-python-mypy	syntastic-checkers.txt	/*syntastic-python-mypy*
+syntastic-python-prospector	syntastic-checkers.txt	/*syntastic-python-prospector*
+syntastic-python-py3kwarn	syntastic-checkers.txt	/*syntastic-python-py3kwarn*
+syntastic-python-pycodestyle	syntastic-checkers.txt	/*syntastic-python-pycodestyle*
+syntastic-python-pydocstyle	syntastic-checkers.txt	/*syntastic-python-pydocstyle*
+syntastic-python-pyflakes	syntastic-checkers.txt	/*syntastic-python-pyflakes*
+syntastic-python-pylama	syntastic-checkers.txt	/*syntastic-python-pylama*
+syntastic-python-pylint	syntastic-checkers.txt	/*syntastic-python-pylint*
+syntastic-python-python	syntastic-checkers.txt	/*syntastic-python-python*
+syntastic-qml-qmllint	syntastic-checkers.txt	/*syntastic-qml-qmllint*
+syntastic-quickstart	syntastic.txt	/*syntastic-quickstart*
+syntastic-r-lint	syntastic-checkers.txt	/*syntastic-r-lint*
+syntastic-r-lintr	syntastic-checkers.txt	/*syntastic-r-lintr*
+syntastic-r-svtools	syntastic-checkers.txt	/*syntastic-r-svtools*
+syntastic-racket-code-ayatollah	syntastic-checkers.txt	/*syntastic-racket-code-ayatollah*
+syntastic-racket-racket	syntastic-checkers.txt	/*syntastic-racket-racket*
+syntastic-recommended	syntastic.txt	/*syntastic-recommended*
+syntastic-rmd-lintr	syntastic-checkers.txt	/*syntastic-rmd-lintr*
+syntastic-rnc-rnv	syntastic-checkers.txt	/*syntastic-rnc-rnv*
+syntastic-rst-proselint	syntastic-checkers.txt	/*syntastic-rst-proselint*
+syntastic-rst-rst2pseudoxml	syntastic-checkers.txt	/*syntastic-rst-rst2pseudoxml*
+syntastic-rst-rstcheck	syntastic-checkers.txt	/*syntastic-rst-rstcheck*
+syntastic-rst-sphinx	syntastic-checkers.txt	/*syntastic-rst-sphinx*
+syntastic-ruby-flog	syntastic-checkers.txt	/*syntastic-ruby-flog*
+syntastic-ruby-jruby	syntastic-checkers.txt	/*syntastic-ruby-jruby*
+syntastic-ruby-macruby	syntastic-checkers.txt	/*syntastic-ruby-macruby*
+syntastic-ruby-mri	syntastic-checkers.txt	/*syntastic-ruby-mri*
+syntastic-ruby-reek	syntastic-checkers.txt	/*syntastic-ruby-reek*
+syntastic-ruby-rubocop	syntastic-checkers.txt	/*syntastic-ruby-rubocop*
+syntastic-ruby-rubylint	syntastic-checkers.txt	/*syntastic-ruby-rubylint*
+syntastic-sass-sass	syntastic-checkers.txt	/*syntastic-sass-sass*
+syntastic-sass-sass_lint	syntastic-checkers.txt	/*syntastic-sass-sass_lint*
+syntastic-sass-sassc	syntastic-checkers.txt	/*syntastic-sass-sassc*
+syntastic-scala-fsc	syntastic-checkers.txt	/*syntastic-scala-fsc*
+syntastic-scala-scalac	syntastic-checkers.txt	/*syntastic-scala-scalac*
+syntastic-scala-scalastyle	syntastic-checkers.txt	/*syntastic-scala-scalastyle*
+syntastic-scss-mixedindentlint	syntastic-checkers.txt	/*syntastic-scss-mixedindentlint*
+syntastic-scss-sass	syntastic-checkers.txt	/*syntastic-scss-sass*
+syntastic-scss-sass_lint	syntastic-checkers.txt	/*syntastic-scss-sass_lint*
+syntastic-scss-sassc	syntastic-checkers.txt	/*syntastic-scss-sassc*
+syntastic-scss-scss_lint	syntastic-checkers.txt	/*syntastic-scss-scss_lint*
+syntastic-scss-stylelint	syntastic-checkers.txt	/*syntastic-scss-stylelint*
+syntastic-sessions	syntastic.txt	/*syntastic-sessions*
+syntastic-sh-bashate	syntastic-checkers.txt	/*syntastic-sh-bashate*
+syntastic-sh-checkbashisms	syntastic-checkers.txt	/*syntastic-sh-checkbashisms*
+syntastic-sh-sh	syntastic-checkers.txt	/*syntastic-sh-sh*
+syntastic-sh-shellcheck	syntastic-checkers.txt	/*syntastic-sh-shellcheck*
+syntastic-shellslash	syntastic.txt	/*syntastic-shellslash*
+syntastic-slim-slim_lint	syntastic-checkers.txt	/*syntastic-slim-slim_lint*
+syntastic-slim-slimrb	syntastic-checkers.txt	/*syntastic-slim-slimrb*
+syntastic-sml-smlnj	syntastic-checkers.txt	/*syntastic-sml-smlnj*
+syntastic-solidity-solc	syntastic-checkers.txt	/*syntastic-solidity-solc*
+syntastic-spec-rpmlint	syntastic-checkers.txt	/*syntastic-spec-rpmlint*
+syntastic-sql-sqlint	syntastic-checkers.txt	/*syntastic-sql-sqlint*
+syntastic-statusline-flag	syntastic.txt	/*syntastic-statusline-flag*
+syntastic-stylus-stylint	syntastic-checkers.txt	/*syntastic-stylus-stylint*
+syntastic-tcl-nagelfar	syntastic-checkers.txt	/*syntastic-tcl-nagelfar*
+syntastic-tex-chktex	syntastic-checkers.txt	/*syntastic-tex-chktex*
+syntastic-tex-lacheck	syntastic-checkers.txt	/*syntastic-tex-lacheck*
+syntastic-tex-proselint	syntastic-checkers.txt	/*syntastic-tex-proselint*
+syntastic-texinfo-makeinfo	syntastic-checkers.txt	/*syntastic-texinfo-makeinfo*
+syntastic-texinfo-proselint	syntastic-checkers.txt	/*syntastic-texinfo-proselint*
+syntastic-text-atdtool	syntastic-checkers.txt	/*syntastic-text-atdtool*
+syntastic-text-igor	syntastic-checkers.txt	/*syntastic-text-igor*
+syntastic-text-language_check	syntastic-checkers.txt	/*syntastic-text-language_check*
+syntastic-text-proselint	syntastic-checkers.txt	/*syntastic-text-proselint*
+syntastic-text-textlint	syntastic-checkers.txt	/*syntastic-text-textlint*
+syntastic-trig-rapper	syntastic-checkers.txt	/*syntastic-trig-rapper*
+syntastic-turtle-rapper	syntastic-checkers.txt	/*syntastic-turtle-rapper*
+syntastic-turtle-ttl	syntastic-checkers.txt	/*syntastic-turtle-ttl*
+syntastic-twig-twiglint	syntastic-checkers.txt	/*syntastic-twig-twiglint*
+syntastic-typescript-eslint	syntastic-checkers.txt	/*syntastic-typescript-eslint*
+syntastic-typescript-tslint	syntastic-checkers.txt	/*syntastic-typescript-tslint*
+syntastic-vala-valac	syntastic-checkers.txt	/*syntastic-vala-valac*
+syntastic-verilog-iverilog	syntastic-checkers.txt	/*syntastic-verilog-iverilog*
+syntastic-verilog-verilator	syntastic-checkers.txt	/*syntastic-verilog-verilator*
+syntastic-vhdl-ghdl	syntastic-checkers.txt	/*syntastic-vhdl-ghdl*
+syntastic-vhdl-vcom	syntastic-checkers.txt	/*syntastic-vhdl-vcom*
+syntastic-vim-auto-save	syntastic.txt	/*syntastic-vim-auto-save*
+syntastic-vim-go	syntastic.txt	/*syntastic-vim-go*
+syntastic-vim-vimlint	syntastic-checkers.txt	/*syntastic-vim-vimlint*
+syntastic-vim-vint	syntastic-checkers.txt	/*syntastic-vim-vint*
+syntastic-vim-virtualenv	syntastic.txt	/*syntastic-vim-virtualenv*
+syntastic-xhtml-jshint	syntastic-checkers.txt	/*syntastic-xhtml-jshint*
+syntastic-xhtml-proselint	syntastic-checkers.txt	/*syntastic-xhtml-proselint*
+syntastic-xhtml-tidy	syntastic-checkers.txt	/*syntastic-xhtml-tidy*
+syntastic-xml-plutil	syntastic-checkers.txt	/*syntastic-xml-plutil*
+syntastic-xml-xmllint	syntastic-checkers.txt	/*syntastic-xml-xmllint*
+syntastic-xquery-basex	syntastic-checkers.txt	/*syntastic-xquery-basex*
+syntastic-xslt-xmllint	syntastic-checkers.txt	/*syntastic-xslt-xmllint*
+syntastic-yacc-bison	syntastic-checkers.txt	/*syntastic-yacc-bison*
+syntastic-yaml-jsyaml	syntastic-checkers.txt	/*syntastic-yaml-jsyaml*
+syntastic-yaml-yamllint	syntastic-checkers.txt	/*syntastic-yaml-yamllint*
+syntastic-yaml-yamlxs	syntastic-checkers.txt	/*syntastic-yaml-yamlxs*
+syntastic-yang-pyang	syntastic-checkers.txt	/*syntastic-yang-pyang*
+syntastic-ycm	syntastic.txt	/*syntastic-ycm*
+syntastic-z80-z80syntaxchecker	syntastic-checkers.txt	/*syntastic-z80-z80syntaxchecker*
+syntastic-zpt-zptlint	syntastic-checkers.txt	/*syntastic-zpt-zptlint*
+syntastic-zsh	syntastic.txt	/*syntastic-zsh*
+syntastic-zsh-zsh	syntastic-checkers.txt	/*syntastic-zsh-zsh*
+syntastic.txt	syntastic.txt	/*syntastic.txt*
diff --git a/vim-plugins/bundle/syntastic/plugin/syntastic.vim b/vim-plugins/bundle/syntastic/plugin/syntastic.vim
new file mode 100644
index 0000000..2c8bdba
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/plugin/syntastic.vim
@@ -0,0 +1,792 @@
+"============================================================================
+"File:        syntastic.vim
+"Description: Vim plugin for on the fly syntax checking.
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_plugin') || &compatible
+    finish
+endif
+let g:loaded_syntastic_plugin = 1
+
+if has('reltime')
+    let g:_SYNTASTIC_START = reltime()
+    lockvar! g:_SYNTASTIC_START
+endif
+
+let g:_SYNTASTIC_VERSION = '3.8.0-10'
+lockvar g:_SYNTASTIC_VERSION
+
+" Sanity checks {{{1
+
+if v:version < 700 || (v:version == 700 && !has('patch175'))
+    call syntastic#log#error('need Vim version 7.0.175 or later')
+    finish
+endif
+
+for s:feature in [
+            \ 'autocmd',
+            \ 'eval',
+            \ 'file_in_path',
+            \ 'modify_fname',
+            \ 'quickfix',
+            \ 'reltime',
+            \ 'user_commands'
+        \ ]
+    if !has(s:feature)
+        call syntastic#log#error('need Vim compiled with feature ' . s:feature)
+        finish
+    endif
+endfor
+
+let s:_running_windows = syntastic#util#isRunningWindows()
+lockvar s:_running_windows
+
+if !exists('g:syntastic_shell')
+    let g:syntastic_shell = &shell
+endif
+
+if s:_running_windows
+    let g:_SYNTASTIC_UNAME = 'Windows'
+elseif executable('uname')
+    try
+        let g:_SYNTASTIC_UNAME = split(syntastic#util#system('uname'), "\n")[0]
+    catch /\m^Vim\%((\a\+)\)\=:E484/
+        call syntastic#log#error("can't run external programs (misconfigured shell options?)")
+        finish
+    catch /\m^Vim\%((\a\+)\)\=:E684/
+        let g:_SYNTASTIC_UNAME = 'Unknown'
+    endtry
+else
+    let g:_SYNTASTIC_UNAME = 'Unknown'
+endif
+lockvar g:_SYNTASTIC_UNAME
+
+" }}}1
+
+" Defaults {{{1
+
+let g:_SYNTASTIC_DEFAULTS = {
+        \ 'aggregate_errors':         0,
+        \ 'always_populate_loc_list': 0,
+        \ 'auto_jump':                0,
+        \ 'auto_loc_list':            2,
+        \ 'check_on_open':            0,
+        \ 'check_on_wq':              1,
+        \ 'cursor_columns':           1,
+        \ 'debug':                    0,
+        \ 'echo_current_error':       1,
+        \ 'enable_balloons':          1,
+        \ 'enable_highlighting':      1,
+        \ 'enable_signs':             1,
+        \ 'error_symbol':             '>>',
+        \ 'exit_checks':              !(s:_running_windows && syntastic#util#var('shell', &shell) =~? '\m\<cmd\.exe$'),
+        \ 'filetype_map':             {},
+        \ 'full_redraws':             !(has('gui_running') || has('gui_macvim')),
+        \ 'id_checkers':              1,
+        \ 'ignore_extensions':        '\c\v^([gx]?z|lzma|bz2)$',
+        \ 'ignore_files':             [],
+        \ 'loc_list_height':          10,
+        \ 'nested_autocommands':      0,
+        \ 'quiet_messages':           {},
+        \ 'reuse_loc_lists':          1,
+        \ 'shell':                    &shell,
+        \ 'sort_aggregated_errors':   1,
+        \ 'stl_format':               '[Syntax: line:%F (%t)]',
+        \ 'style_error_symbol':       'S>',
+        \ 'style_warning_symbol':     'S>',
+        \ 'warning_symbol':           '>>'
+    \ }
+lockvar! g:_SYNTASTIC_DEFAULTS
+
+for s:key in keys(g:_SYNTASTIC_DEFAULTS)
+    if !exists('g:syntastic_' . s:key)
+        let g:syntastic_{s:key} = copy(g:_SYNTASTIC_DEFAULTS[s:key])
+    endif
+endfor
+
+if exists('g:syntastic_quiet_warnings')
+    call syntastic#log#oneTimeWarn("variable g:syntastic_quiet_warnings is deprecated, please use let g:syntastic_quiet_messages = {'level': 'warnings'} instead")
+    if g:syntastic_quiet_warnings
+        let s:quiet_warnings = get(g:syntastic_quiet_messages, 'type', [])
+        if type(s:quiet_warnings) != type([])
+            let s:quiet_warnings = [s:quiet_warnings]
+        endif
+        call add(s:quiet_warnings, 'warnings')
+        let g:syntastic_quiet_messages['type'] = s:quiet_warnings
+    endif
+endif
+
+" }}}1
+
+" Debug {{{1
+
+let g:_SYNTASTIC_SHELL_OPTIONS = [
+        \ 'shell',
+        \ 'shellcmdflag',
+        \ 'shellpipe',
+        \ 'shellquote',
+        \ 'shellredir',
+        \ 'shelltemp',
+        \ 'shellxquote'
+    \ ]
+for s:feature in [
+        \ 'autochdir',
+        \ 'shellslash',
+        \ 'shellxescape',
+    \ ]
+
+    if exists('+' . s:feature)
+        call add(g:_SYNTASTIC_SHELL_OPTIONS, s:feature)
+    endif
+endfor
+lockvar! g:_SYNTASTIC_SHELL_OPTIONS
+
+" debug constants
+let     g:_SYNTASTIC_DEBUG_TRACE         = 1
+lockvar g:_SYNTASTIC_DEBUG_TRACE
+let     g:_SYNTASTIC_DEBUG_LOCLIST       = 2
+lockvar g:_SYNTASTIC_DEBUG_LOCLIST
+let     g:_SYNTASTIC_DEBUG_NOTIFICATIONS = 4
+lockvar g:_SYNTASTIC_DEBUG_NOTIFICATIONS
+let     g:_SYNTASTIC_DEBUG_AUTOCOMMANDS  = 8
+lockvar g:_SYNTASTIC_DEBUG_AUTOCOMMANDS
+let     g:_SYNTASTIC_DEBUG_VARIABLES     = 16
+lockvar g:_SYNTASTIC_DEBUG_VARIABLES
+let     g:_SYNTASTIC_DEBUG_CHECKERS      = 32
+lockvar g:_SYNTASTIC_DEBUG_CHECKERS
+
+" }}}1
+
+runtime! plugin/syntastic/*.vim
+
+let s:registry = g:SyntasticRegistry.Instance()
+let s:notifiers = g:SyntasticNotifiers.Instance()
+let s:modemap = g:SyntasticModeMap.Instance()
+
+let s:_check_stack = []
+let s:_quit_pre = []
+
+" Commands {{{1
+
+" @vimlint(EVL103, 1, a:cursorPos)
+" @vimlint(EVL103, 1, a:cmdLine)
+" @vimlint(EVL103, 1, a:argLead)
+function! s:CompleteCheckerName(argLead, cmdLine, cursorPos) abort " {{{2
+    let names = []
+
+    let sep_idx = stridx(a:argLead, '/')
+    if sep_idx >= 1
+        let ft = a:argLead[: sep_idx-1]
+        call extend(names, map( s:registry.getNamesOfAvailableCheckers(ft), 'ft . "/" . v:val' ))
+    else
+        for ft in s:registry.resolveFiletypes(&filetype)
+            call extend(names, s:registry.getNamesOfAvailableCheckers(ft))
+        endfor
+        call extend(names, map( copy(s:registry.getKnownFiletypes()), 'v:val . "/"' ))
+    endif
+
+    return join(names, "\n")
+endfunction " }}}2
+" @vimlint(EVL103, 0, a:cursorPos)
+" @vimlint(EVL103, 0, a:cmdLine)
+" @vimlint(EVL103, 0, a:argLead)
+
+
+" @vimlint(EVL103, 1, a:cursorPos)
+" @vimlint(EVL103, 1, a:cmdLine)
+" @vimlint(EVL103, 1, a:argLead)
+function! s:CompleteFiletypes(argLead, cmdLine, cursorPos) abort " {{{2
+    return join(s:registry.getKnownFiletypes(), "\n")
+endfunction " }}}2
+" @vimlint(EVL103, 0, a:cursorPos)
+" @vimlint(EVL103, 0, a:cmdLine)
+" @vimlint(EVL103, 0, a:argLead)
+
+command! -bar -nargs=* -complete=custom,s:CompleteCheckerName SyntasticCheck call SyntasticCheck(<f-args>)
+command! -bar -nargs=? -complete=custom,s:CompleteFiletypes   SyntasticInfo  call SyntasticInfo(<f-args>)
+command! -bar Errors              call SyntasticErrors()
+command! -bar SyntasticReset      call SyntasticReset()
+command! -bar SyntasticToggleMode call SyntasticToggleMode()
+command! -bar SyntasticSetLoclist call SyntasticSetLoclist()
+
+command! SyntasticJavacEditClasspath runtime! syntax_checkers/java/*.vim | SyntasticJavacEditClasspath
+command! SyntasticJavacEditConfig    runtime! syntax_checkers/java/*.vim | SyntasticJavacEditConfig
+
+" }}}1
+
+" Public API {{{1
+
+function! SyntasticCheck(...) abort " {{{2
+    call s:UpdateErrors(bufnr(''), 0, a:000)
+    call syntastic#util#redraw(g:syntastic_full_redraws)
+endfunction " }}}2
+
+function! SyntasticInfo(...) abort " {{{2
+    call s:modemap.modeInfo(a:000)
+    call s:registry.echoInfoFor(a:000)
+    call s:_explain_skip(a:000)
+    call syntastic#log#debugShowOptions(g:_SYNTASTIC_DEBUG_TRACE, g:_SYNTASTIC_SHELL_OPTIONS)
+    call syntastic#log#debugDump(g:_SYNTASTIC_DEBUG_VARIABLES)
+endfunction " }}}2
+
+function! SyntasticErrors() abort " {{{2
+    call g:SyntasticLoclist.current().show()
+endfunction " }}}2
+
+function! SyntasticReset() abort " {{{2
+    call s:ClearCache(bufnr(''))
+    call s:notifiers.refresh(g:SyntasticLoclist.New([]))
+endfunction " }}}2
+
+function! SyntasticToggleMode() abort " {{{2
+    call s:modemap.toggleMode()
+    call s:ClearCache(bufnr(''))
+    call s:notifiers.refresh(g:SyntasticLoclist.New([]))
+    call s:modemap.echoMode()
+endfunction " }}}2
+
+function! SyntasticSetLoclist() abort " {{{2
+    call g:SyntasticLoclist.current().setloclist(0)
+endfunction " }}}2
+
+" }}}1
+
+" Autocommands {{{1
+
+augroup syntastic
+    autocmd!
+    autocmd VimEnter    * call s:VimEnterHook()
+    autocmd BufEnter    * call s:BufEnterHook(expand('<afile>', 1))
+    autocmd BufWinEnter * call s:BufWinEnterHook(expand('<afile>', 1))
+augroup END
+
+if g:syntastic_nested_autocommands
+    augroup syntastic
+        autocmd BufReadPost  * nested call s:BufReadPostHook(expand('<afile>', 1))
+        autocmd BufWritePost * nested call s:BufWritePostHook(expand('<afile>', 1))
+    augroup END
+else
+    augroup syntastic
+        autocmd BufReadPost  * call s:BufReadPostHook(expand('<afile>', 1))
+        autocmd BufWritePost * call s:BufWritePostHook(expand('<afile>', 1))
+    augroup END
+endif
+
+if exists('##QuitPre')
+    " QuitPre was added in Vim 7.3.544
+    augroup syntastic
+        autocmd QuitPre * call s:QuitPreHook(expand('<afile>', 1))
+    augroup END
+endif
+
+function! s:BufReadPostHook(fname) abort " {{{2
+    let buf = syntastic#util#fname2buf(a:fname)
+    if g:syntastic_check_on_open && buf > 0
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
+            \ 'autocmd: BufReadPost, buffer ' . buf . ' = ' . string(a:fname))
+        if index(s:_check_stack, buf) == -1
+            call add(s:_check_stack, buf)
+        endif
+    endif
+endfunction " }}}2
+
+function! s:BufWritePostHook(fname) abort " {{{2
+    let buf = syntastic#util#fname2buf(a:fname)
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
+        \ 'autocmd: BufWritePost, buffer ' . buf . ' = ' . string(a:fname))
+    call s:UpdateErrors(buf, 1, [])
+endfunction " }}}2
+
+function! s:BufEnterHook(fname) abort " {{{2
+    let buf = syntastic#util#fname2buf(a:fname)
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
+        \ 'autocmd: BufEnter, buffer ' . buf . ' = ' . string(a:fname) . ', &buftype = ' . string(&buftype))
+    if buf > 0 && getbufvar(buf, '&buftype') ==# ''
+        let idx = index(reverse(copy(s:_check_stack)), buf)
+        if idx >= 0
+            if !has('vim_starting')
+                call remove(s:_check_stack, -idx - 1)
+                call s:UpdateErrors(buf, 1, [])
+            endif
+        elseif &buftype ==# ''
+            call s:notifiers.refresh(g:SyntasticLoclist.current())
+        endif
+    elseif &buftype ==# 'quickfix'
+        " TODO: this is needed because in recent versions of Vim lclose
+        " can no longer be called from BufWinLeave
+        " TODO: at this point there is no b:syntastic_loclist
+        let loclist = filter(copy(getloclist(0)), 'v:val["valid"]')
+        let owner = str2nr(getbufvar(buf, 'syntastic_owner_buffer'))
+        let buffers = syntastic#util#unique(map(loclist, 'v:val["bufnr"]') + (owner ? [owner] : []))
+        if !empty(get(w:, 'syntastic_loclist_set', [])) && !empty(loclist) && empty(filter( buffers, 'syntastic#util#bufIsActive(v:val)' ))
+            call SyntasticLoclistHide()
+        endif
+    endif
+endfunction " }}}2
+
+function! s:BufWinEnterHook(fname) abort " {{{2
+    let buf = syntastic#util#fname2buf(a:fname)
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
+        \ 'autocmd: BufWinEnter, buffer ' . buf . ' = ' . string(a:fname) . ', &buftype = ' . string(&buftype))
+    if buf > 0 && getbufvar(buf, '&buftype') ==# ''
+        let idx = index(reverse(copy(s:_check_stack)), buf)
+        if idx >= 0 && !has('vim_starting')
+            call remove(s:_check_stack, -idx - 1)
+            call s:UpdateErrors(buf, 1, [])
+        endif
+    endif
+endfunction " }}}2
+
+function! s:VimEnterHook() abort " {{{2
+    let g:syntastic_version =
+        \ g:_SYNTASTIC_VERSION .
+        \ ' (Vim ' . v:version . (has('nvim') ? ', Neovim' : '') . ', ' .
+        \ g:_SYNTASTIC_UNAME .
+        \ (has('gui') ? ', GUI' : '') . ')'
+    lockvar g:syntastic_version
+
+    let buf = bufnr('')
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS,
+        \ 'autocmd: VimEnter, buffer ' . buf . ' = ' . string(bufname(buf)) . ', &buftype = ' . string(&buftype))
+    let idx = index(reverse(copy(s:_check_stack)), buf)
+    if idx >= 0 && getbufvar(buf, '&buftype') ==# ''
+        call remove(s:_check_stack, -idx - 1)
+        call s:UpdateErrors(buf, 1, [])
+    endif
+endfunction " }}}2
+
+function! s:QuitPreHook(fname) abort " {{{2
+    let buf = syntastic#util#fname2buf(a:fname)
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_AUTOCOMMANDS, 'autocmd: QuitPre, buffer ' . buf . ' = ' . string(a:fname))
+
+    if !syntastic#util#var('check_on_wq')
+        call syntastic#util#setWids()
+        call add(s:_quit_pre, buf . '_' . getbufvar(buf, 'changetick') . '_' . w:syntastic_wid)
+    endif
+
+    if !empty(get(w:, 'syntastic_loclist_set', []))
+        call SyntasticLoclistHide()
+    endif
+endfunction " }}}2
+
+" }}}1
+
+" Main {{{1
+
+"refresh and redraw all the error info for this buf when saving or reading
+function! s:UpdateErrors(buf, auto_invoked, checker_names) abort " {{{2
+    call syntastic#log#debugShowVariables(g:_SYNTASTIC_DEBUG_TRACE, 'version')
+    call syntastic#log#debugShowOptions(g:_SYNTASTIC_DEBUG_TRACE, g:_SYNTASTIC_SHELL_OPTIONS)
+    call syntastic#log#debugDump(g:_SYNTASTIC_DEBUG_VARIABLES)
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'UpdateErrors' . (a:auto_invoked ? ' (auto)' : '') .
+        \ ': ' . (len(a:checker_names) ? join(a:checker_names) : 'default checkers'))
+
+    call s:modemap.synch()
+
+    if s:_skip_file(a:buf)
+        return
+    endif
+
+    let run_checks = !a:auto_invoked || s:modemap.doAutoChecking(a:buf)
+    if run_checks
+        call s:CacheErrors(a:buf, a:checker_names)
+        call syntastic#util#setLastTick(a:buf)
+    elseif a:auto_invoked
+        return
+    endif
+
+    let loclist = g:SyntasticLoclist.current(a:buf)
+
+    if exists('*SyntasticCheckHook')
+        call SyntasticCheckHook(loclist.getRaw())
+    endif
+
+    " populate loclist and jump {{{3
+    let do_jump = syntastic#util#var('auto_jump') + 0
+    if do_jump == 2
+        let do_jump = loclist.getFirstError(1)
+    elseif do_jump == 3
+        let do_jump = loclist.getFirstError()
+    elseif 0 > do_jump || do_jump > 3
+        let do_jump = 0
+    endif
+
+    if syntastic#util#var('always_populate_loc_list') || do_jump
+        call loclist.setloclist(1)
+        if run_checks && do_jump && !loclist.isEmpty()
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: jump')
+            execute 'silent! lrewind ' . do_jump
+
+            " XXX: Vim doesn't call autocmd commands in a predictible
+            " order, which can lead to missing filetype when jumping
+            " to a new file; the following is a workaround for the
+            " resulting brain damage
+            if &filetype ==# ''
+                silent! filetype detect
+            endif
+        endif
+    endif
+    " }}}3
+
+    call s:notifiers.refresh(loclist)
+endfunction " }}}2
+
+"clear the loc list for the buffer
+function! s:ClearCache(buf) abort " {{{2
+    let loclist = g:SyntasticLoclist.current(a:buf)
+    call s:notifiers.reset(loclist)
+    call loclist.destroy()
+endfunction " }}}2
+
+"detect and cache all syntax errors in this buffer
+function! s:CacheErrors(buf, checker_names) abort " {{{2
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'CacheErrors: ' .
+        \ (len(a:checker_names) ? join(a:checker_names) : 'default checkers'))
+    call s:ClearCache(a:buf)
+    let newLoclist = g:SyntasticLoclist.New([])
+    call newLoclist.setOwner(a:buf)
+
+    if !s:_skip_file(a:buf)
+        " debug logging {{{3
+        call syntastic#log#debugShowVariables(g:_SYNTASTIC_DEBUG_TRACE, 'aggregate_errors')
+        if syntastic#util#isRunningWindows()
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$TMP = ' . string($TMP) . ', $TEMP = ' . string($TEMP))
+        else
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$TERM = ' . string($TERM))
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$TMPDIR = ' . string($TMPDIR))
+        endif
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, '$PATH = ' . string($PATH))
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getcwd() = ' . string(getcwd()))
+        " }}}3
+
+        let clist = s:registry.getCheckers(getbufvar(a:buf, '&filetype'), a:checker_names)
+
+        let aggregate_errors =
+            \ syntastic#util#var('aggregate_errors') || len(syntastic#util#unique(map(copy(clist), 'v:val.getFiletype()'))) > 1
+        let decorate_errors = aggregate_errors && syntastic#util#var('id_checkers')
+        let sort_aggregated_errors = aggregate_errors && syntastic#util#var('sort_aggregated_errors')
+
+        let names = []
+        let unavailable_checkers = 0
+        for checker in clist
+            let cname = checker.getCName()
+            if !checker.isAvailable()
+                call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'CacheErrors: Checker ' . cname . ' is not available')
+                let unavailable_checkers += 1
+                continue
+            endif
+
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'CacheErrors: Invoking checker: ' . cname)
+
+            let loclist = checker.getLocList()
+
+            if !loclist.isEmpty()
+                if decorate_errors
+                    call loclist.decorate(cname)
+                endif
+                call add(names, cname)
+                if checker.wantSort() && !sort_aggregated_errors
+                    call loclist.sort()
+                    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'sorted:', loclist)
+                endif
+
+                call newLoclist.extend(loclist)
+
+                if !aggregate_errors
+                    break
+                endif
+            endif
+        endfor
+
+        " set names {{{3
+        if !empty(names)
+            if len(syntastic#util#unique(map( copy(names), 'substitute(v:val, "\\m/.*", "", "")' ))) == 1
+                let type = substitute(names[0], '\m/.*', '', '')
+                let name = join(map( names, 'substitute(v:val, "\\m.\\{-}/", "", "")' ), ', ')
+                call newLoclist.setName( name . ' ('. type . ')' )
+            else
+                " checkers from mixed types
+                call newLoclist.setName(join(names, ', '))
+            endif
+        endif
+        " }}}3
+
+        " issue warning about no active checkers {{{3
+        if len(clist) == unavailable_checkers
+            if !empty(a:checker_names)
+                if len(a:checker_names) == 1
+                    call syntastic#log#warn('checker ' . a:checker_names[0] . ' is not available')
+                else
+                    call syntastic#log#warn('checkers ' . join(a:checker_names, ', ') . ' are not available')
+                endif
+            else
+                call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'CacheErrors: no checkers available for ' . &filetype)
+            endif
+        endif
+        " }}}3
+
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'aggregated:', newLoclist)
+        if sort_aggregated_errors
+            call newLoclist.sort()
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'sorted:', newLoclist)
+        endif
+    endif
+
+    call newLoclist.deploy()
+endfunction " }}}2
+
+"Emulates the :lmake command. Sets up the make environment according to the
+"options given, runs make, resets the environment, returns the location list
+"
+"a:options can contain the following keys:
+"    'makeprg'
+"    'errorformat'
+"
+"The corresponding options are set for the duration of the function call. They
+"are set with :let, so dont escape spaces.
+"
+"a:options may also contain:
+"   'defaults' - a dict containing default values for the returned errors
+"   'subtype' - all errors will be assigned the given subtype
+"   'preprocess' - a function to be applied to the error file before parsing errors
+"   'postprocess' - a list of functions to be applied to the error list
+"   'cwd' - change directory to the given path before running the checker
+"   'env' - environment variables to set before running the checker
+"   'returns' - a list of valid exit codes for the checker
+" @vimlint(EVL102, 1, l:env_save)
+function! SyntasticMake(options) abort " {{{2
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'SyntasticMake: called with options:', a:options)
+
+    " save options and locale env variables {{{3
+    let old_local_errorformat = &l:errorformat
+    let old_errorformat = &errorformat
+    let old_cwd = getcwd()
+    " }}}3
+
+    if has_key(a:options, 'errorformat')
+        let &errorformat = a:options['errorformat']
+        set errorformat<
+    endif
+
+    if has_key(a:options, 'cwd')
+        execute 'lcd ' . fnameescape(a:options['cwd'])
+    endif
+
+    " set environment variables {{{3
+    let env_save = {}
+    if has_key(a:options, 'env') && len(a:options['env'])
+        for key in keys(a:options['env'])
+            if key =~? '\m^[a-z_][a-z0-9_]*$'
+                execute 'let env_save[' . string(key) . '] = $' . key
+                execute 'let $' . key . ' = ' . string(a:options['env'][key])
+            endif
+        endfor
+    endif
+    " }}}3
+
+    let err_lines = split(syntastic#util#system(a:options['makeprg']), "\n", 1)
+
+    " restore environment variables {{{3
+    if len(env_save)
+        for key in keys(env_save)
+            execute 'let $' . key . ' = ' . string(env_save[key])
+        endfor
+    endif
+    " }}}3
+
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'checker output:', err_lines)
+
+    " Does it still make sense to go on?
+    let bailout =
+        \ syntastic#util#var('exit_checks') &&
+        \ has_key(a:options, 'returns') &&
+        \ index(a:options['returns'], v:shell_error) == -1
+
+    if !bailout
+        if has_key(a:options, 'Preprocess')
+            let err_lines = call(a:options['Preprocess'], [err_lines])
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'preprocess (external):', err_lines)
+        elseif has_key(a:options, 'preprocess')
+            let err_lines = call('syntastic#preprocess#' . a:options['preprocess'], [err_lines])
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'preprocess:', err_lines)
+        endif
+        noautocmd lgetexpr err_lines
+
+        let errors = deepcopy(getloclist(0))
+
+        if has_key(a:options, 'cwd')
+            execute 'lcd ' . fnameescape(old_cwd)
+        endif
+
+        try
+            silent lolder
+        catch /\m^Vim\%((\a\+)\)\=:E380/
+            " E380: At bottom of quickfix stack
+            call setloclist(0, [], 'r')
+            try
+                " Vim 7.4.2200 or later
+                call setloclist(0, [], 'r', { 'title': '' })
+            catch /\m^Vim\%((\a\+)\)\=:E\%(118\|731\)/
+                " do nothing
+            endtry
+        catch /\m^Vim\%((\a\+)\)\=:E776/
+            " E776: No location list
+            " do nothing
+        endtry
+    else
+        let errors = []
+    endif
+
+    " restore options {{{3
+    let &errorformat = old_errorformat
+    let &l:errorformat = old_local_errorformat
+    " }}}3
+
+    if !s:_running_windows && (s:_os_name() =~? 'FreeBSD' || s:_os_name() =~? 'OpenBSD')
+        call syntastic#util#redraw(g:syntastic_full_redraws)
+    endif
+
+    if bailout
+        call syntastic#log#ndebug(g:_SYNTASTIC_DEBUG_LOCLIST, 'checker output:', err_lines)
+        throw 'Syntastic: checker error'
+    endif
+
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'raw loclist:', errors)
+
+    if has_key(a:options, 'defaults')
+        call s:_add_to_errors(errors, a:options['defaults'])
+    endif
+
+    " Add subtype info if present.
+    if has_key(a:options, 'subtype')
+        call s:_add_to_errors(errors, { 'subtype': a:options['subtype'] })
+    endif
+
+    if has_key(a:options, 'Postprocess') && !empty(a:options['Postprocess'])
+        for rule in a:options['Postprocess']
+            let errors = call(rule, [errors])
+        endfor
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'postprocess (external):', errors)
+    elseif has_key(a:options, 'postprocess') && !empty(a:options['postprocess'])
+        for rule in a:options['postprocess']
+            let errors = call('syntastic#postprocess#' . rule, [errors])
+        endfor
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'postprocess:', errors)
+    endif
+
+    return errors
+endfunction " }}}2
+" @vimlint(EVL102, 0, l:env_save)
+
+"return a string representing the state of buffer according to
+"g:syntastic_stl_format
+"
+"return '' if no errors are cached for the buffer
+function! SyntasticStatuslineFlag() abort " {{{2
+    return g:SyntasticLoclist.current().getStatuslineFlag()
+endfunction " }}}2
+
+" }}}1
+
+" Utilities {{{1
+
+function! s:_ignore_file(filename) abort " {{{2
+    let fname = fnamemodify(a:filename, ':p')
+    for pattern in g:syntastic_ignore_files
+        if fname =~# pattern
+            return 1
+        endif
+    endfor
+    return 0
+endfunction " }}}2
+
+function! s:_is_quitting(buf) abort " {{{2
+    let quitting = 0
+    if exists('w:syntastic_wid')
+        let key = a:buf . '_' . getbufvar(a:buf, 'changetick') . '_' . w:syntastic_wid
+        let idx = index(s:_quit_pre, key)
+        if idx >= 0
+            call remove(s:_quit_pre, idx)
+            let quitting = 1
+        endif
+    endif
+
+    return quitting
+endfunction " }}}2
+
+" Skip running in special buffers
+function! s:_skip_file(buf) abort " {{{2
+    let fname = bufname(a:buf)
+    let skip = s:_is_quitting(a:buf) || getbufvar(a:buf, 'syntastic_skip_checks') ||
+        \ (getbufvar(a:buf, '&buftype') !=# '') || !filereadable(fname) || getwinvar(0, '&diff') ||
+        \ getwinvar(0, '&previewwindow') || s:_ignore_file(fname) ||
+        \ fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
+    if skip
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, '_skip_file: skipping checks')
+    endif
+    return skip
+endfunction " }}}2
+
+" Explain why checks will be skipped for the current file
+function! s:_explain_skip(filetypes) abort " {{{2
+    let buf = bufnr('')
+    if empty(a:filetypes) && s:_skip_file(buf)
+        let why = []
+        let fname = bufname(buf)
+        let bt = getbufvar(buf, '&buftype')
+
+        if s:_is_quitting(buf)
+            call add(why, 'quitting buffer')
+        endif
+        if getbufvar(buf, 'syntastic_skip_checks')
+            call add(why, 'b:syntastic_skip_checks set')
+        endif
+        if bt !=# ''
+            call add(why, 'buftype = ' . string(&buftype))
+        endif
+        if !filereadable(fname)
+            call add(why, 'file not readable / not local')
+        endif
+        if getwinvar(0, '&diff')
+            call add(why, 'diff mode')
+        endif
+        if getwinvar(0, '&previewwindow')
+            call add(why, 'preview window')
+        endif
+        if s:_ignore_file(fname)
+            call add(why, 'filename matching g:syntastic_ignore_files')
+        endif
+        if fnamemodify(fname, ':e') =~? g:syntastic_ignore_extensions
+            call add(why, 'extension matching g:syntastic_ignore_extensions')
+        endif
+
+        echomsg 'The current file will not be checked (' . join(why, ', ') . ')'
+    endif
+endfunction " }}}2
+
+" Take a list of errors and add default values to them from a:options
+function! s:_add_to_errors(errors, options) abort " {{{2
+    for err in a:errors
+        for key in keys(a:options)
+            if !has_key(err, key) || empty(err[key])
+                let err[key] = a:options[key]
+            endif
+        endfor
+    endfor
+
+    return a:errors
+endfunction " }}}2
+
+function! s:_os_name() abort " {{{2
+    return g:_SYNTASTIC_UNAME
+endfunction " }}}2
+
+" }}}1
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/plugin/syntastic/autoloclist.vim b/vim-plugins/bundle/syntastic/plugin/syntastic/autoloclist.vim
new file mode 100644
index 0000000..415d5ab
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/plugin/syntastic/autoloclist.vim
@@ -0,0 +1,55 @@
+if exists('g:loaded_syntastic_notifier_autoloclist') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_notifier_autoloclist = 1
+
+let g:SyntasticAutoloclistNotifier = {}
+
+" Public methods {{{1
+"
+function! g:SyntasticAutoloclistNotifier.New() abort " {{{2
+    let newObj = copy(self)
+    return newObj
+endfunction " }}}2
+
+function! g:SyntasticAutoloclistNotifier.refresh(loclist) abort " {{{2
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'autoloclist: refresh')
+    call g:SyntasticAutoloclistNotifier.AutoToggle(a:loclist)
+endfunction " }}}2
+
+function! g:SyntasticAutoloclistNotifier.AutoToggle(loclist) abort " {{{2
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'autoloclist: toggle')
+    let auto_loc_list = syntastic#util#var('auto_loc_list')
+    if !a:loclist.isEmpty()
+        if auto_loc_list == 1 || auto_loc_list == 3
+            call a:loclist.show()
+        endif
+    else
+        if (auto_loc_list == 1 || auto_loc_list == 2) && !empty(get(w:, 'syntastic_loclist_set', []))
+            try
+                " Vim 7.4.2200 or later
+                let title = get(getloclist(0, { 'title': 1 }), 'title', ':SyntasticCheck ')
+            catch /\m^Vim\%((\a\+)\)\=:E\%(118\|731\)/
+                let title = ':SyntasticCheck '
+            endtry
+
+            if strpart(title, 0, 16) ==# ':SyntasticCheck '
+                " TODO: this will close the loc list window if one was opened
+                " by something other than syntastic
+                call SyntasticLoclistHide()
+
+                try
+                    " Vim 7.4.2200 or later
+                    call setloclist(0, [], 'r', { 'title': '' })
+                catch /\m^Vim\%((\a\+)\)\=:E\%(118\|731\)/
+                    " do nothing
+                endtry
+                let w:syntastic_loclist_set = []
+            endif
+        endif
+    endif
+endfunction " }}}2
+
+" }}}1
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/plugin/syntastic/balloons.vim b/vim-plugins/bundle/syntastic/plugin/syntastic/balloons.vim
new file mode 100644
index 0000000..fdd70bf
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/plugin/syntastic/balloons.vim
@@ -0,0 +1,59 @@
+if exists('g:loaded_syntastic_notifier_balloons') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_notifier_balloons = 1
+
+if !has('balloon_eval')
+    let g:syntastic_enable_balloons = 0
+endif
+
+let g:SyntasticBalloonsNotifier = {}
+
+" Public methods {{{1
+
+function! g:SyntasticBalloonsNotifier.New() abort " {{{2
+    let newObj = copy(self)
+    return newObj
+endfunction " }}}2
+
+function! g:SyntasticBalloonsNotifier.enabled() abort " {{{2
+    return has('balloon_eval') && syntastic#util#var('enable_balloons')
+endfunction " }}}2
+
+" Update the error balloons
+function! g:SyntasticBalloonsNotifier.refresh(loclist) abort " {{{2
+    unlet! b:syntastic_private_balloons
+    if self.enabled() && !a:loclist.isEmpty()
+        let b:syntastic_private_balloons = a:loclist.balloons()
+        if !empty(b:syntastic_private_balloons)
+            set ballooneval balloonexpr=SyntasticBalloonsExprNotifier()
+        endif
+    endif
+endfunction " }}}2
+
+" Reset the error balloons
+" @vimlint(EVL103, 1, a:loclist)
+function! g:SyntasticBalloonsNotifier.reset(loclist) abort " {{{2
+    let b:syntastic_private_balloons = {}
+    if has('balloon_eval')
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'balloons: reset')
+        unlet! b:syntastic_private_balloons
+        set noballooneval
+    endif
+endfunction " }}}2
+" @vimlint(EVL103, 0, a:loclist)
+
+" }}}1
+
+" Private functions {{{1
+
+function! SyntasticBalloonsExprNotifier() abort " {{{2
+    if !exists('b:syntastic_private_balloons')
+        return ''
+    endif
+    return get(b:syntastic_private_balloons, v:beval_lnum, '')
+endfunction " }}}2
+
+" }}}1
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/plugin/syntastic/checker.vim b/vim-plugins/bundle/syntastic/plugin/syntastic/checker.vim
new file mode 100644
index 0000000..345d2f0
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/plugin/syntastic/checker.vim
@@ -0,0 +1,282 @@
+if exists('g:loaded_syntastic_checker') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_checker = 1
+
+let g:SyntasticChecker = {}
+
+" Public methods {{{1
+
+function! g:SyntasticChecker.New(args, ...) abort " {{{2
+    let newObj = copy(self)
+
+    let newObj._filetype = a:args['filetype']
+    let newObj._name = a:args['name']
+
+    if a:0
+        " redirected checker
+        let newObj._exec_default = get(a:args, 'exec', a:1['_exec_default'])
+
+        let filetype = a:1['_filetype']
+        let name = a:1['_name']
+        let prefix = 'SyntaxCheckers_' . filetype . '_' . name . '_'
+
+        if exists('g:syntastic_' . filetype . '_' . name . '_sort') && !exists('g:syntastic_' . newObj._filetype . '_' . newObj._name . '_sort')
+            let g:syntastic_{newObj._filetype}_{newObj._name}_sort = g:syntastic_{filetype}_{name}_sort
+        endif
+
+        if has_key(a:args, 'enable')
+            let newObj._enable = a:args['enable']
+        elseif has_key(a:1, '_enable')
+            let newObj._enable = a:1['_enable']
+        endif
+    else
+        let newObj._exec_default = get(a:args, 'exec', newObj._name)
+        if newObj._exec_default ==# ''
+            let newObj._exec_default = '<dummy>'
+        endif
+        let prefix = 'SyntaxCheckers_' . newObj._filetype . '_' . newObj._name . '_'
+
+        if has_key(a:args, 'enable')
+            let newObj._enable = a:args['enable']
+        endif
+    endif
+
+    let newObj._locListFunc = function(prefix . 'GetLocList')
+
+    if exists('*' . prefix . 'IsAvailable')
+        let newObj._isAvailableFunc = function(prefix . 'IsAvailable')
+    else
+        let newObj._isAvailableFunc = function('s:_isAvailableDefault')
+    endif
+
+    if exists('*' . prefix . 'GetHighlightRegex')
+        let newObj._highlightRegexFunc = function(prefix . 'GetHighlightRegex')
+    endif
+
+    return newObj
+endfunction " }}}2
+
+function! g:SyntasticChecker.getFiletype() abort " {{{2
+    return self._filetype
+endfunction " }}}2
+
+function! g:SyntasticChecker.getName() abort " {{{2
+    return self._name
+endfunction " }}}2
+
+function! g:SyntasticChecker.getCName() abort " {{{2
+    return self._filetype . '/' . self._name
+endfunction " }}}2
+
+" Synchronise _exec with user's setting.  Force re-validation if needed.
+"
+" XXX: This function must be called at least once before calling either
+" getExec() or getExecEscaped().  Normally isAvailable() does that for you
+" automatically, but you should keep still this in mind if you change the
+" current checker workflow.
+function! g:SyntasticChecker.syncExec(...) abort " {{{2
+    if a:0
+        let self._exec = a:1
+    else
+        let suffix = self._name . '_exec'
+        let self._exec = expand(
+            \ syntastic#util#var(self._filetype . '_' . suffix,
+            \ syntastic#util#var(suffix, self._exec_default)), 1 )
+    endif
+endfunction " }}}2
+
+function! g:SyntasticChecker.getExec() abort " {{{2
+    return self._exec
+endfunction " }}}2
+
+function! g:SyntasticChecker.getExecEscaped() abort " {{{2
+    return syntastic#util#shescape(self._exec)
+endfunction " }}}2
+
+function! g:SyntasticChecker.getLocListRaw() abort " {{{2
+    let checker_start = reltime()
+    let name = self.getCName()
+
+    if has_key(self, '_enable')
+        let status = syntastic#util#var(self._enable, -1)
+        if type(status) != type(0)
+            call syntastic#log#error('checker ' . name . ': invalid value ' . strtrans(string(status)) .
+                \ ' for g:syntastic_' . self._enable . '; try 0 or 1 instead')
+            return []
+        endif
+        if status < 0
+            call syntastic#log#error('checker ' . name . ': checks disabled for security reasons; ' .
+                \ 'set g:syntastic_' . self._enable . ' to 1 to override')
+        endif
+        if status <= 0
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getLocList: checker ' . name . ' enabled but not forced')
+            return []
+        else
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getLocList: checker ' . name . ' forced')
+        endif
+    endif
+
+    try
+        let list = self._locListFunc()
+        if self._exec !=# ''
+            call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE, 'getLocList: checker ' . name . ' returned ' . v:shell_error)
+        endif
+    catch /\m\C^Syntastic: checker error$/
+        let list = []
+        if self._exec !=# ''
+            call syntastic#log#error('checker ' . name . ' returned abnormal status ' . v:shell_error)
+        else
+            call syntastic#log#error('checker ' . name . ' aborted')
+        endif
+    endtry
+    call self._populateHighlightRegexes(list)
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, name . ' raw:', list)
+    call self._quietMessages(list)
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_TRACE,
+        \ 'getLocList: checker ' . name . ' run in ' . split(reltimestr(reltime(checker_start)))[0] . 's')
+    return list
+endfunction " }}}2
+
+function! g:SyntasticChecker.getLocList() abort " {{{2
+    return g:SyntasticLoclist.New(self.getLocListRaw())
+endfunction " }}}2
+
+function! g:SyntasticChecker.getVersion(...) abort " {{{2
+    if !exists('self._version')
+        let command = a:0 ? a:1 : self.getExecEscaped() . ' --version'
+        let version_output = syntastic#util#system(command)
+        call self.log('getVersion: ' . string(command) . ': ' .
+            \ string(split(version_output, "\n", 1)) .
+            \ (v:shell_error ? ' (exit code ' . v:shell_error . ')' : '') )
+        let parsed_ver = syntastic#util#parseVersion(version_output)
+        if len(parsed_ver)
+            call self.setVersion(parsed_ver)
+        else
+            call syntastic#log#ndebug(g:_SYNTASTIC_DEBUG_LOCLIST, 'checker output:', split(version_output, "\n", 1))
+            call syntastic#log#error("checker " . self.getCName() . ": can't parse version string (abnormal termination?)")
+        endif
+    endif
+    return get(self, '_version', [])
+endfunction " }}}2
+
+function! g:SyntasticChecker.setVersion(version) abort " {{{2
+    if len(a:version)
+        let self._version = copy(a:version)
+        call self.log(self.getExec() . ' version =', a:version)
+    endif
+endfunction " }}}2
+
+function! g:SyntasticChecker.log(msg, ...) abort " {{{2
+    let leader = self.getCName() . ': '
+    if a:0
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, leader . a:msg, a:1)
+    else
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_CHECKERS, leader . a:msg)
+    endif
+endfunction " }}}2
+
+function! g:SyntasticChecker.makeprgBuild(opts) abort " {{{2
+    let basename = self._filetype . '_' . self._name . '_'
+
+    let parts = []
+    call extend(parts, self._getOpt(a:opts, basename, 'exe', self.getExecEscaped()))
+    call extend(parts, self._getOpt(a:opts, basename, 'args', ''))
+    call extend(parts, self._getOpt(a:opts, basename, 'fname', syntastic#util#shexpand('%')))
+    call extend(parts, self._getOpt(a:opts, basename, 'post_args', ''))
+    call extend(parts, self._getOpt(a:opts, basename, 'tail', ''))
+
+    return join(parts)
+endfunction " }}}2
+
+function! g:SyntasticChecker.isAvailable() abort " {{{2
+    call self.syncExec()
+
+    if !has_key(self, '_available')
+        let self._available = {}
+    endif
+    if !has_key(self._available, self._exec)
+        let self._available[self._exec] = self._isAvailableFunc()
+    endif
+
+    return self._available[self._exec]
+endfunction " }}}2
+
+function! g:SyntasticChecker.isDisabled() abort " {{{2
+    return has_key(self, '_enable') && syntastic#util#var(self._enable, -1) <= 0
+endfunction " }}}2
+
+function! g:SyntasticChecker.wantSort() abort " {{{2
+    return syntastic#util#var(self._filetype . '_' . self._name . '_sort', 0)
+endfunction " }}}2
+
+" This method is no longer used by syntastic.  It's here only to maintain
+" backwards compatibility with external checkers which might depend on it.
+function! g:SyntasticChecker.setWantSort(val) abort " {{{2
+    if !exists('g:syntastic_' . self._filetype . '_' . self._name . '_sort')
+        let g:syntastic_{self._filetype}_{self._name}_sort = a:val
+    endif
+endfunction " }}}2
+
+" }}}1
+
+" Private methods {{{1
+
+function! g:SyntasticChecker._quietMessages(errors) abort " {{{2
+    " wildcard quiet_messages
+    let quiet_filters = copy(syntastic#util#var('quiet_messages', {}))
+    if type(quiet_filters) != type({})
+        call syntastic#log#warn('ignoring invalid syntastic_quiet_messages')
+        unlet quiet_filters
+        let quiet_filters = {}
+    endif
+
+    " per checker quiet_messages
+    let name = self._filetype . '_' . self._name
+    try
+        call extend( quiet_filters, copy(syntastic#util#var(name . '_quiet_messages', {})), 'force' )
+    catch /\m^Vim\%((\a\+)\)\=:E712/
+        call syntastic#log#warn('ignoring invalid syntastic_' . name . '_quiet_messages')
+    endtry
+
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'quiet_messages filter:', quiet_filters)
+
+    if !empty(quiet_filters)
+        call syntastic#util#dictFilter(a:errors, quiet_filters)
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_LOCLIST, 'filtered by quiet_messages:', a:errors)
+    endif
+endfunction " }}}2
+
+function! g:SyntasticChecker._populateHighlightRegexes(errors) abort " {{{2
+    if has_key(self, '_highlightRegexFunc')
+        for e in a:errors
+            if e['valid']
+                let term = self._highlightRegexFunc(e)
+                if term !=# ''
+                    let e['hl'] = term
+                endif
+            endif
+        endfor
+    endif
+endfunction " }}}2
+
+function! g:SyntasticChecker._getOpt(opts, basename, name, default) abort " {{{2
+    let ret = []
+    call extend( ret, syntastic#util#argsescape(get(a:opts, a:name . '_before', '')) )
+    call extend( ret, syntastic#util#argsescape(syntastic#util#var( a:basename . a:name, get(a:opts, a:name, a:default) )) )
+    call extend( ret, syntastic#util#argsescape(get(a:opts, a:name . '_after', '')) )
+
+    return ret
+endfunction " }}}2
+
+" }}}1
+
+" Private functions {{{1
+
+function! s:_isAvailableDefault() dict " {{{2
+    return executable(self.getExec())
+endfunction " }}}2
+
+" }}}1
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/plugin/syntastic/cursor.vim b/vim-plugins/bundle/syntastic/plugin/syntastic/cursor.vim
new file mode 100644
index 0000000..f59d87b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/plugin/syntastic/cursor.vim
@@ -0,0 +1,138 @@
+if exists('g:loaded_syntastic_notifier_cursor') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_notifier_cursor = 1
+
+let g:SyntasticCursorNotifier = {}
+
+" Public methods {{{1
+
+function! g:SyntasticCursorNotifier.New() abort " {{{2
+    let newObj = copy(self)
+    return newObj
+endfunction " }}}2
+
+function! g:SyntasticCursorNotifier.enabled() abort " {{{2
+    return syntastic#util#var('echo_current_error')
+endfunction " }}}2
+
+function! g:SyntasticCursorNotifier.refresh(loclist) abort " {{{2
+    if self.enabled() && !a:loclist.isEmpty()
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'cursor: refresh')
+        let b:syntastic_private_messages = copy(a:loclist.messages(bufnr('')))
+        let b:syntastic_private_line = -1
+        let b:syntastic_cursor_columns = a:loclist.getCursorColumns()
+        autocmd! syntastic CursorMoved
+        autocmd syntastic CursorMoved * call SyntasticRefreshCursor()
+    endif
+endfunction " }}}2
+
+" @vimlint(EVL103, 1, a:loclist)
+function! g:SyntasticCursorNotifier.reset(loclist) abort " {{{2
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'cursor: reset')
+    autocmd! syntastic CursorMoved
+    unlet! b:syntastic_private_messages
+    let b:syntastic_private_line = -1
+endfunction " }}}2
+" @vimlint(EVL103, 0, a:loclist)
+
+" }}}1
+
+" Private functions {{{1
+
+function! SyntasticRefreshCursor() abort " {{{2
+    if !exists('b:syntastic_private_messages') || empty(b:syntastic_private_messages)
+        " file not checked
+        return
+    endif
+
+    if !exists('b:syntastic_private_line')
+        let b:syntastic_private_line = -1
+    endif
+    let l = line('.')
+    let current_messages = get(b:syntastic_private_messages, l, {})
+
+    if !exists('b:syntastic_cursor_columns')
+        let b:syntastic_cursor_columns = g:syntastic_cursor_columns
+    endif
+
+    if b:syntastic_cursor_columns
+        let c = virtcol('.')
+        if !exists('b:syntastic_private_idx')
+            let b:syntastic_private_idx = -1
+        endif
+
+        if s:_is_same_index(l, b:syntastic_private_line, c, b:syntastic_private_idx, current_messages)
+            return
+        else
+            let b:syntastic_private_line = l
+        endif
+
+        if !empty(current_messages)
+            let b:syntastic_private_idx = s:_find_index(c, current_messages)
+            call syntastic#util#wideMsg(current_messages[b:syntastic_private_idx].text)
+        else
+            let b:syntastic_private_idx = -1
+            echo
+        endif
+    else
+        if l == b:syntastic_private_line
+            return
+        endif
+        let b:syntastic_private_line = l
+
+        if !empty(current_messages)
+            call syntastic#util#wideMsg(current_messages[0].text)
+        else
+            echo
+        endif
+    endif
+endfunction " }}}2
+
+" }}}1
+
+" Utilities {{{1
+
+function! s:_is_same_index(line, old_line, column, idx, messages) abort " {{{2
+    if a:old_line >= 0 && a:line == a:old_line && a:idx >= 0
+        if len(a:messages) <= 1
+            return 1
+        endif
+
+        if a:messages[a:idx].scol <= a:column || a:idx == 0
+            if a:idx == len(a:messages) - 1 || a:column < a:messages[a:idx + 1].scol
+                return 1
+            else
+                return 0
+            endif
+        else
+            return 0
+        endif
+    else
+        return 0
+    endif
+endfunction " }}}2
+
+function! s:_find_index(column, messages) abort " {{{2
+    let max = len(a:messages) - 1
+    if max == 0
+        return 0
+    endif
+    let min = 0
+
+    " modified binary search: assign index 0 to columns to the left of the first error
+    while min < max - 1
+        let mid = (min + max) / 2
+        if a:column < a:messages[mid].scol
+            let max = mid
+        else
+            let min = mid
+        endif
+    endwhile
+
+    return a:column < a:messages[max].scol ? min : max
+endfunction " }}}2
+
+" }}}1
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/plugin/syntastic/highlighting.vim b/vim-plugins/bundle/syntastic/plugin/syntastic/highlighting.vim
new file mode 100644
index 0000000..a9e1a08
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/plugin/syntastic/highlighting.vim
@@ -0,0 +1,104 @@
+if exists('g:loaded_syntastic_notifier_highlighting') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_notifier_highlighting = 1
+
+" Highlighting requires getmatches introduced in 7.1.040
+let s:has_highlighting = v:version > 701 || (v:version == 701 && has('patch040'))
+lockvar s:has_highlighting
+
+let g:SyntasticHighlightingNotifier = {}
+
+let s:setup_done = 0
+
+" Public methods {{{1
+
+function! g:SyntasticHighlightingNotifier.New() abort " {{{2
+    let newObj = copy(self)
+
+    if !s:setup_done
+        call self._setup()
+        let s:setup_done = 1
+        lockvar s:setup_done
+    endif
+
+    return newObj
+endfunction " }}}2
+
+function! g:SyntasticHighlightingNotifier.enabled() abort " {{{2
+    return s:has_highlighting && syntastic#util#var('enable_highlighting')
+endfunction " }}}2
+
+" Sets error highlights in the current window
+function! g:SyntasticHighlightingNotifier.refresh(loclist) abort " {{{2
+    if self.enabled()
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'highlighting: refresh')
+        call self._reset()
+        let buf = bufnr('')
+        let issues = filter(a:loclist.copyRaw(), 'v:val["bufnr"] == buf')
+        for item in issues
+            let group = 'Syntastic' . get(item, 'subtype', '') . ( item['type'] ==? 'E' ? 'Error' : 'Warning' )
+
+            " The function `Syntastic_{filetype}_{checker}_GetHighlightRegex` is
+            " used to override default highlighting.
+            if has_key(item, 'hl')
+                call matchadd(group, '\%' . item['lnum'] . 'l' . item['hl'])
+            elseif get(item, 'col', 0)
+                if get(item, 'vcol', 0)
+                    let lastcol = virtcol([item['lnum'], '$'])
+                    let coltype = 'v'
+                else
+                    let lastcol = col([item['lnum'], '$'])
+                    let coltype = 'c'
+                endif
+                let lcol = min([lastcol, item['col']])
+
+                call matchadd(group, '\%' . item['lnum'] . 'l\%' . lcol . coltype)
+            endif
+        endfor
+    endif
+endfunction " }}}2
+
+" Remove all error highlights from the window
+" @vimlint(EVL103, 1, a:loclist)
+function! g:SyntasticHighlightingNotifier.reset(loclist) abort " {{{2
+    if s:has_highlighting
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'highlighting: reset')
+        call self._reset()
+    endif
+endfunction " }}}2
+" @vimlint(EVL103, 0, a:loclist)
+
+" }}}1
+
+" Private methods {{{1
+
+" One time setup: define our own highlighting
+function! g:SyntasticHighlightingNotifier._setup() abort " {{{2
+    if s:has_highlighting
+        if !hlexists('SyntasticError')
+            highlight link SyntasticError SpellBad
+        endif
+        if !hlexists('SyntasticWarning')
+            highlight link SyntasticWarning SpellCap
+        endif
+        if !hlexists('SyntasticStyleError')
+            highlight link SyntasticStyleError SyntasticError
+        endif
+        if !hlexists('SyntasticStyleWarning')
+            highlight link SyntasticStyleWarning SyntasticWarning
+        endif
+    endif
+endfunction " }}}2
+
+function! g:SyntasticHighlightingNotifier._reset() abort " {{{2
+    for match in getmatches()
+        if stridx(match['group'], 'Syntastic') == 0
+            call matchdelete(match['id'])
+        endif
+    endfor
+endfunction " }}}2
+
+" }}}1
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/plugin/syntastic/loclist.vim b/vim-plugins/bundle/syntastic/plugin/syntastic/loclist.vim
new file mode 100644
index 0000000..3ad9375
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/plugin/syntastic/loclist.vim
@@ -0,0 +1,445 @@
+if exists('g:loaded_syntastic_loclist') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_loclist = 1
+
+let g:SyntasticLoclist = {}
+
+" Public methods {{{1
+
+function! g:SyntasticLoclist.New(rawLoclist) abort " {{{2
+    let newObj = copy(self)
+
+    let llist = filter(copy(a:rawLoclist), 'v:val["valid"]')
+
+    for e in llist
+        if get(e, 'type', '') ==# ''
+            let e['type'] = 'E'
+        endif
+    endfor
+
+    let newObj._rawLoclist = llist
+    let newObj._name = ''
+    let newObj._owner = bufnr('')
+    let newObj._sorted = 0
+    let newObj._columns = g:syntastic_cursor_columns
+
+    return newObj
+endfunction " }}}2
+
+function! g:SyntasticLoclist.current(...) abort " {{{2
+    let buf = a:0 ? a:1 : bufnr('')
+    let loclist = syntastic#util#getbufvar(buf, 'syntastic_loclist', {})
+    if type(loclist) != type({}) || empty(loclist)
+        unlet! loclist
+        let loclist = g:SyntasticLoclist.New([])
+    endif
+    return loclist
+endfunction " }}}2
+
+function! g:SyntasticLoclist.extend(other) abort " {{{2
+    call extend(self._rawLoclist, a:other.copyRaw())
+endfunction " }}}2
+
+function! g:SyntasticLoclist.sort() abort " {{{2
+    if !self._sorted
+        for e in self._rawLoclist
+            call s:_set_screen_column(e)
+        endfor
+
+        call sort(self._rawLoclist, self._columns ? 's:_compare_error_items_by_columns' : 's:_compare_error_items_by_lines')
+
+        let self._sorted = 1
+    endif
+endfunction " }}}2
+
+function! g:SyntasticLoclist.isEmpty() abort " {{{2
+    return empty(self._rawLoclist)
+endfunction " }}}2
+
+function! g:SyntasticLoclist.isNewerThan(stamp) abort " {{{2
+    if !exists('self._stamp')
+        let self._stamp = []
+        return 0
+    endif
+    return syntastic#util#compareLexi(self._stamp, a:stamp) > 0
+endfunction " }}}2
+
+function! g:SyntasticLoclist.copyRaw() abort " {{{2
+    return copy(self._rawLoclist)
+endfunction " }}}2
+
+function! g:SyntasticLoclist.getRaw() abort " {{{2
+    return self._rawLoclist
+endfunction " }}}2
+
+function! g:SyntasticLoclist.getBuffers() abort " {{{2
+    return syntastic#util#unique(map(copy(self._rawLoclist), 'str2nr(v:val["bufnr"])') + [self._owner])
+endfunction " }}}2
+
+function! g:SyntasticLoclist.getCursorColumns() abort " {{{2
+    return self._columns
+endfunction " }}}2
+
+function! g:SyntasticLoclist.getStatuslineFlag() abort " {{{2
+    if !exists('self._stl_format')
+        let self._stl_format = ''
+    endif
+    if !exists('self._stl_flag')
+        let self._stl_flag = ''
+    endif
+
+    if g:syntastic_stl_format !=# self._stl_format
+        let self._stl_format = g:syntastic_stl_format
+
+        if !empty(self._rawLoclist)
+            let errors = self.errors()
+            let warnings = self.warnings()
+
+            let num_errors = len(errors)
+            let num_warnings = len(warnings)
+            let num_issues = len(self._rawLoclist)
+
+            let output = self._stl_format
+
+            "hide stuff wrapped in %E(...) unless there are errors
+            let output = substitute(output, '\m\C%E{\([^}]*\)}', num_errors ? '\1' : '' , 'g')
+
+            "hide stuff wrapped in %W(...) unless there are warnings
+            let output = substitute(output, '\m\C%W{\([^}]*\)}', num_warnings ? '\1' : '' , 'g')
+
+            "hide stuff wrapped in %B(...) unless there are both errors and warnings
+            let output = substitute(output, '\m\C%B{\([^}]*\)}', (num_warnings && num_errors) ? '\1' : '' , 'g')
+
+            let flags = {
+                \ '%':  '%',
+                \ 't':  num_issues,
+                \ 'e':  num_errors,
+                \ 'w':  num_warnings,
+                \ 'N':  (num_issues ? fnamemodify( bufname(self._rawLoclist[0]['bufnr']), ':t') : ''),
+                \ 'P':  (num_issues ? fnamemodify( bufname(self._rawLoclist[0]['bufnr']), ':p:~:.') : ''),
+                \ 'F':  (num_issues ? self._rawLoclist[0]['lnum'] : ''),
+                \ 'ne': (num_errors ? fnamemodify( bufname(errors[0]['bufnr']), ':t') : ''),
+                \ 'pe': (num_errors ? fnamemodify( bufname(errors[0]['bufnr']), ':p:~:.') : ''),
+                \ 'fe': (num_errors ? errors[0]['lnum'] : ''),
+                \ 'nw': (num_warnings ? fnamemodify( bufname(warnings[0]['bufnr']), ':t') : ''),
+                \ 'pw': (num_warnings ? fnamemodify( bufname(warnings[0]['bufnr']), ':p:~:.') : ''),
+                \ 'fw': (num_warnings ? warnings[0]['lnum'] : '') }
+            let output = substitute(output, '\v\C\%(-?\d*%(\.\d+)?)([npf][ew]|[NPFtew%])', '\=syntastic#util#wformat(submatch(1), flags[submatch(2)])', 'g')
+
+            let self._stl_flag = output
+        else
+            let self._stl_flag = ''
+        endif
+    endif
+
+    return self._stl_flag
+endfunction " }}}2
+
+function! g:SyntasticLoclist.getFirstError(...) abort " {{{2
+    let max_issues = len(self._rawLoclist)
+    if a:0 && a:1 < max_issues
+        let max_issues = a:1
+    endif
+
+    for idx in range(max_issues)
+        if get(self._rawLoclist[idx], 'type', '') ==? 'E'
+            return idx + 1
+        endif
+    endfor
+
+    return 0
+endfunction " }}}2
+
+function! g:SyntasticLoclist.getName() abort " {{{2
+    return len(self._name)
+endfunction " }}}2
+
+function! g:SyntasticLoclist.setName(name) abort " {{{2
+    let self._name = a:name
+endfunction " }}}2
+
+function! g:SyntasticLoclist.getOwner() abort " {{{2
+    return self._owner
+endfunction " }}}2
+
+function! g:SyntasticLoclist.setOwner(buffer) abort " {{{2
+    let self._owner = type(a:buffer) == type(0) ? a:buffer : str2nr(a:buffer)
+endfunction " }}}2
+
+function! g:SyntasticLoclist.deploy() abort " {{{2
+    let self._stamp = syntastic#util#stamp()
+    for buf in self.getBuffers()
+        call setbufvar(buf, 'syntastic_loclist', self)
+    endfor
+endfunction " }}}2
+
+function! g:SyntasticLoclist.destroy() abort " {{{2
+    for buf in self.getBuffers()
+        call setbufvar(buf, 'syntastic_loclist', {})
+    endfor
+endfunction " }}}2
+
+function! g:SyntasticLoclist.decorate(tag) abort " {{{2
+    for e in self._rawLoclist
+        let e['text'] .= ' [' . a:tag . ']'
+    endfor
+endfunction " }}}2
+
+function! g:SyntasticLoclist.balloons() abort " {{{2
+    if !exists('self._cachedBalloons')
+        let sep = has('balloon_multiline') ? "\n" : ' | '
+
+        let self._cachedBalloons = {}
+        for e in self._rawLoclist
+            let buf = e['bufnr']
+
+            if !has_key(self._cachedBalloons, buf)
+                let self._cachedBalloons[buf] = {}
+            endif
+
+            if has_key(self._cachedBalloons[buf], e['lnum'])
+                let self._cachedBalloons[buf][e['lnum']] .= sep . e['text']
+            else
+                let self._cachedBalloons[buf][e['lnum']] = e['text']
+            endif
+        endfor
+    endif
+
+    return get(self._cachedBalloons, bufnr(''), {})
+endfunction " }}}2
+
+function! g:SyntasticLoclist.errors() abort " {{{2
+    if !exists('self._cachedErrors')
+        let self._cachedErrors = self.filter({'type': 'E'})
+    endif
+    return self._cachedErrors
+endfunction " }}}2
+
+function! g:SyntasticLoclist.warnings() abort " {{{2
+    if !exists('self._cachedWarnings')
+        let self._cachedWarnings = self.filter({'type': 'W'})
+    endif
+    return self._cachedWarnings
+endfunction " }}}2
+
+" Legacy function.  Syntastic no longer calls it, but we keep it
+" around because other plugins (f.i. powerline) depend on it.
+function! g:SyntasticLoclist.hasErrorsOrWarningsToDisplay() abort " {{{2
+    return !self.isEmpty()
+endfunction " }}}2
+
+" cache used by EchoCurrentError()
+function! g:SyntasticLoclist.messages(buf) abort " {{{2
+    if !exists('self._cachedMessages')
+        let self._cachedMessages = {}
+
+        let errors = self.errors() + self.warnings()
+        for e in errors
+            let b = e['bufnr']
+            let l = e['lnum']
+
+            if !has_key(self._cachedMessages, b)
+                let self._cachedMessages[b] = {}
+            endif
+
+            if !has_key(self._cachedMessages[b], l)
+                let self._cachedMessages[b][l] = [e]
+            elseif self._columns
+                call add(self._cachedMessages[b][l], e)
+            endif
+        endfor
+
+        if self._columns
+            if !self._sorted
+                for b in keys(self._cachedMessages)
+                    for l in keys(self._cachedMessages[b])
+                        if len(self._cachedMessages[b][l]) > 1
+                            for e in self._cachedMessages[b][l]
+                                call s:_set_screen_column(e)
+                            endfor
+                            call sort(self._cachedMessages[b][l], 's:_compare_error_items_by_columns')
+                        endif
+                    endfor
+                endfor
+            endif
+
+            for b in keys(self._cachedMessages)
+                for l in keys(self._cachedMessages[b])
+                    call s:_remove_shadowed_items(self._cachedMessages[b][l])
+                endfor
+            endfor
+        endif
+    endif
+
+    return get(self._cachedMessages, a:buf, {})
+endfunction " }}}2
+
+"Filter the list and return new native loclist
+"e.g.
+"  .filter({'bufnr': 10, 'type': 'e'})
+"
+"would return all errors for buffer 10.
+"
+"Note that all string comparisons are done with ==?
+function! g:SyntasticLoclist.filter(filters) abort " {{{2
+    let conditions = values(map(copy(a:filters), 's:_translate(v:key, v:val)'))
+    let filter = len(conditions) == 1 ?
+        \ conditions[0] : join(map(conditions, '"(" . v:val . ")"'), ' && ')
+    return filter(copy(self._rawLoclist), filter)
+endfunction " }}}2
+
+function! g:SyntasticLoclist.setloclist(new) abort " {{{2
+    if !exists('w:syntastic_loclist_set')
+        let w:syntastic_loclist_set = []
+    endif
+    if a:new || empty(w:syntastic_loclist_set) || w:syntastic_loclist_set != [self._owner, getbufvar(self._owner, 'changedtick')]
+        let replace = !a:new && g:syntastic_reuse_loc_lists && !empty(w:syntastic_loclist_set)
+        call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: setloclist ' . (replace ? '(replace)' : '(new)'))
+        call setloclist(0, self.getRaw(), replace ? 'r' : ' ')
+        try
+            " Vim 7.4.2200 or later
+            call setloclist(0, [], 'r', { 'title': ':SyntasticCheck ' . self._name })
+        catch /\m^Vim\%((\a\+)\)\=:E\%(118\|731\)/
+            " do nothing
+        endtry
+        call syntastic#util#setLastTick(self._owner)
+        let w:syntastic_loclist_set = [self._owner, getbufvar(self._owner, 'syntastic_lasttick')]
+    endif
+endfunction " }}}2
+
+"display the cached errors for this buf in the location list
+function! g:SyntasticLoclist.show() abort " {{{2
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: show')
+    call self.setloclist(0)
+
+    if !self.isEmpty()
+        let num = winnr()
+        execute 'lopen ' . syntastic#util#var('loc_list_height')
+        if num != winnr()
+            execute num . 'wincmd w'
+        endif
+
+        " try to find the loclist window and set w:quickfix_title
+        let errors = getloclist(0)
+        for buf in tabpagebuflist()
+            if buflisted(buf) && bufloaded(buf) && getbufvar(buf, '&buftype') ==# 'quickfix'
+                let win = bufwinnr(buf)
+                let title = getwinvar(win, 'quickfix_title')
+
+                " TODO: try to make sure we actually own this window; sadly,
+                " errors == getloclist(0) is the only somewhat safe way to
+                " achieve that
+                if strpart(title, 0, 16) ==# ':SyntasticCheck ' ||
+                            \ ( (title ==# '' || title ==# ':setloclist()') && errors == getloclist(0) )
+                    call setwinvar(win, 'quickfix_title', ':SyntasticCheck ' . self._name)
+                    call setbufvar(buf, 'syntastic_owner_buffer', self._owner)
+                endif
+            endif
+        endfor
+    endif
+endfunction " }}}2
+
+" }}}1
+
+" Public functions {{{1
+
+function! SyntasticLoclistHide() abort " {{{2
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'loclist: hide')
+    silent! lclose
+endfunction " }}}2
+
+" }}}1
+
+" Utilities {{{1
+
+function! s:_translate(key, val) abort " {{{2
+    return 'get(v:val, ' . string(a:key) . ', "") ==? ' . string(a:val)
+endfunction " }}}2
+
+function! s:_set_screen_column(item) abort " {{{2
+    if !has_key(a:item, 'scol')
+        let col = get(a:item, 'col', 0)
+        if col != 0 && get(a:item, 'vcol', 0) == 0
+            let buf = str2nr(a:item['bufnr'])
+            try
+                let line = getbufline(buf, a:item['lnum'])[0]
+            catch  /\m^Vim\%((\a\+)\)\=:E684/
+                let line = ''
+            endtry
+            let a:item['scol'] = syntastic#util#screenWidth(strpart(line, 0, col), getbufvar(buf, '&tabstop'))
+        else
+            let a:item['scol'] = col
+        endif
+    endif
+endfunction " }}}2
+
+function! s:_remove_shadowed_items(errors) abort " {{{2
+    " keep only the first message at a given column
+    let i = 0
+    while i < len(a:errors) - 1
+        let j = i + 1
+        let dupes = 0
+        while j < len(a:errors) && a:errors[j].scol == a:errors[i].scol
+            let dupes = 1
+            let j += 1
+        endwhile
+        if dupes
+            call remove(a:errors, i + 1, j - 1)
+        endif
+        let i += 1
+    endwhile
+
+    " merge messages with the same text
+    let i = 0
+    while i < len(a:errors) - 1
+        let j = i + 1
+        let dupes = 0
+        while j < len(a:errors) && a:errors[j].text == a:errors[i].text
+            let dupes = 1
+            let j += 1
+        endwhile
+        if dupes
+            call remove(a:errors, i + 1, j - 1)
+        endif
+        let i += 1
+    endwhile
+endfunction " }}}2
+
+function! s:_compare_error_items_by_columns(a, b) abort " {{{2
+    if a:a['bufnr'] != a:b['bufnr']
+        " group by file
+        return a:a['bufnr'] - a:b['bufnr']
+    elseif a:a['lnum'] != a:b['lnum']
+        " sort by line
+        return a:a['lnum'] - a:b['lnum']
+    elseif a:a['scol'] != a:b['scol']
+        " sort by screen column
+        return a:a['scol'] - a:b['scol']
+    elseif a:a['type'] !=? a:b['type']
+        " errors take precedence over warnings
+        return a:a['type'] ==? 'E' ? -1 : 1
+    else
+        return 0
+    endif
+endfunction " }}}2
+
+function! s:_compare_error_items_by_lines(a, b) abort " {{{2
+    if a:a['bufnr'] != a:b['bufnr']
+        " group by file
+        return a:a['bufnr'] - a:b['bufnr']
+    elseif a:a['lnum'] != a:b['lnum']
+        " sort by line
+        return a:a['lnum'] - a:b['lnum']
+    elseif a:a['type'] !=? a:b['type']
+        " errors take precedence over warnings
+        return a:a['type'] ==? 'E' ? -1 : 1
+    else
+        " sort by screen column
+        return a:a['scol'] - a:b['scol']
+    endif
+endfunction " }}}2
+
+" }}}1
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/plugin/syntastic/modemap.vim b/vim-plugins/bundle/syntastic/plugin/syntastic/modemap.vim
new file mode 100644
index 0000000..74b09a7
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/plugin/syntastic/modemap.vim
@@ -0,0 +1,118 @@
+if exists('g:loaded_syntastic_modemap') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_modemap = 1
+
+let g:SyntasticModeMap = {}
+
+" Public methods {{{1
+
+function! g:SyntasticModeMap.Instance() abort " {{{2
+    if !exists('s:SyntasticModeMapInstance')
+        let s:SyntasticModeMapInstance = copy(self)
+        call s:SyntasticModeMapInstance.synch()
+    endif
+
+    return s:SyntasticModeMapInstance
+endfunction " }}}2
+
+function! g:SyntasticModeMap.synch() abort " {{{2
+    if exists('g:syntastic_mode_map')
+        let self._mode = get(g:syntastic_mode_map, 'mode', 'active')
+        let self._activeFiletypes = copy(get(g:syntastic_mode_map, 'active_filetypes', []))
+        let self._passiveFiletypes = copy(get(g:syntastic_mode_map, 'passive_filetypes', []))
+    else
+        let self._mode = 'active'
+        let self._activeFiletypes = []
+        let self._passiveFiletypes = []
+    endif
+endfunction " }}}2
+
+function! g:SyntasticModeMap.allowsAutoChecking(filetype) abort " {{{2
+    let registry = g:SyntasticRegistry.Instance()
+    let fts = registry.resolveFiletypes(a:filetype)
+
+    if self.isPassive()
+        return self._isOneFiletypeActive(fts)
+    else
+        return self._noFiletypesArePassive(fts)
+    endif
+endfunction " }}}2
+
+function! g:SyntasticModeMap.doAutoChecking(buf) abort " {{{2
+    let local_mode = getbufvar(a:buf, 'syntastic_mode')
+    if local_mode ==# 'active' || local_mode ==# 'passive'
+        return local_mode ==# 'active'
+    endif
+
+    return self.allowsAutoChecking(getbufvar(a:buf, '&filetype'))
+endfunction " }}}2
+
+function! g:SyntasticModeMap.isPassive() abort " {{{2
+    return self._mode ==# 'passive'
+endfunction " }}}2
+
+function! g:SyntasticModeMap.toggleMode() abort " {{{2
+    call self.synch()
+
+    if self._mode ==# 'active'
+        let self._mode = 'passive'
+    else
+        let self._mode = 'active'
+    endif
+
+    "XXX Changing a global variable.  Tsk, tsk...
+    if !exists('g:syntastic_mode_map')
+        let g:syntastic_mode_map = {}
+    endif
+    let g:syntastic_mode_map['mode'] = self._mode
+endfunction " }}}2
+
+function! g:SyntasticModeMap.echoMode() abort " {{{2
+    echo 'Syntastic: ' . self._mode . ' mode enabled'
+endfunction " }}}2
+
+function! g:SyntasticModeMap.modeInfo(filetypes) abort " {{{2
+    echomsg 'Syntastic version: ' . g:syntastic_version
+    let type = len(a:filetypes) ? a:filetypes[0] : &filetype
+    echomsg 'Info for filetype: ' . type
+
+    call self.synch()
+    echomsg 'Global mode: ' . self._mode
+    if self._mode ==# 'active'
+        if len(self._passiveFiletypes)
+            let plural = len(self._passiveFiletypes) != 1 ? 's' : ''
+            echomsg 'Passive filetype' . plural . ': ' . join(sort(copy(self._passiveFiletypes)))
+        endif
+    else
+        if len(self._activeFiletypes)
+            let plural = len(self._activeFiletypes) != 1 ? 's' : ''
+            echomsg 'Active filetype' . plural . ': ' . join(sort(copy(self._activeFiletypes)))
+        endif
+    endif
+    echomsg 'Filetype ' . type . ' is ' . (self.allowsAutoChecking(type) ? 'active' : 'passive')
+
+    if !len(a:filetypes)
+        if exists('b:syntastic_mode') && (b:syntastic_mode ==# 'active' || b:syntastic_mode ==# 'passive')
+            echomsg 'Local mode: ' . b:syntastic_mode
+        endif
+
+        echomsg 'The current file will ' . (self.doAutoChecking(bufnr('')) ? '' : 'not ') . 'be checked automatically'
+    endif
+endfunction " }}}2
+
+" }}}1
+
+" Private methods {{{1
+
+function! g:SyntasticModeMap._isOneFiletypeActive(filetypes) abort " {{{2
+    return !empty(filter(copy(a:filetypes), 'index(self._activeFiletypes, v:val) != -1'))
+endfunction " }}}2
+
+function! g:SyntasticModeMap._noFiletypesArePassive(filetypes) abort " {{{2
+    return empty(filter(copy(a:filetypes), 'index(self._passiveFiletypes, v:val) != -1'))
+endfunction " }}}2
+
+" }}}1
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/plugin/syntastic/notifiers.vim b/vim-plugins/bundle/syntastic/plugin/syntastic/notifiers.vim
new file mode 100644
index 0000000..6a3b823
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/plugin/syntastic/notifiers.vim
@@ -0,0 +1,86 @@
+if exists('g:loaded_syntastic_notifiers') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_notifiers = 1
+
+let g:SyntasticNotifiers = {}
+
+let s:_NOTIFIER_TYPES = ['signs', 'balloons', 'highlighting', 'cursor', 'autoloclist']
+lockvar! s:_NOTIFIER_TYPES
+
+let s:_PERSISTENT_NOTIFIERS = ['signs', 'balloons']
+lockvar! s:_PERSISTENT_NOTIFIERS
+
+" Public methods {{{1
+
+function! g:SyntasticNotifiers.Instance() abort " {{{2
+    if !exists('s:SyntasticNotifiersInstance')
+        let s:SyntasticNotifiersInstance = copy(self)
+        call s:SyntasticNotifiersInstance._initNotifiers()
+    endif
+
+    return s:SyntasticNotifiersInstance
+endfunction " }}}2
+
+function! g:SyntasticNotifiers.refresh(loclist) abort " {{{2
+    if !syntastic#util#bufIsActive(bufnr('')) || (!a:loclist.isEmpty() && !a:loclist.isNewerThan([]))
+        " loclist not fully constructed yet
+        return
+    endif
+
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'notifiers: refresh')
+    for type in self._enabled_types
+        let class = substitute(type, '\m.*', 'Syntastic\u&Notifier', '')
+        if !has_key(g:{class}, 'enabled') || self._notifier[type].enabled()
+            if index(s:_PERSISTENT_NOTIFIERS, type) > -1
+                " refresh only if loclist has changed since last call
+                if !exists('b:syntastic_private_' . type . '_stamp')
+                    let b:syntastic_private_{type}_stamp = []
+                endif
+                if a:loclist.isNewerThan(b:syntastic_private_{type}_stamp) || a:loclist.isEmpty()
+                    call self._notifier[type].refresh(a:loclist)
+                    let b:syntastic_private_{type}_stamp = syntastic#util#stamp()
+                endif
+            else
+                call self._notifier[type].refresh(a:loclist)
+            endif
+        endif
+    endfor
+endfunction " }}}2
+
+function! g:SyntasticNotifiers.reset(loclist) abort " {{{2
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'notifiers: reset')
+    for type in self._enabled_types
+        let class = substitute(type, '\m.*', 'Syntastic\u&Notifier', '')
+
+        " reset notifiers regardless if they are enabled or not, since
+        " the user might have disabled them since the last refresh();
+        " notifiers MUST be prepared to deal with reset() when disabled
+        if has_key(g:{class}, 'reset')
+            call self._notifier[type].reset(a:loclist)
+        endif
+
+        " also reset stamps
+        if index(s:_PERSISTENT_NOTIFIERS, type) > -1
+            let b:syntastic_private_{type}_stamp = []
+        endif
+    endfor
+endfunction " }}}2
+
+" }}}1
+
+" Private methods {{{1
+
+function! g:SyntasticNotifiers._initNotifiers() abort " {{{2
+    let self._notifier = {}
+    for type in s:_NOTIFIER_TYPES
+        let class = substitute(type, '\m.*', 'Syntastic\u&Notifier', '')
+        let self._notifier[type] = g:{class}.New()
+    endfor
+
+    let self._enabled_types = copy(s:_NOTIFIER_TYPES)
+endfunction " }}}2
+
+" }}}1
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/plugin/syntastic/registry.vim b/vim-plugins/bundle/syntastic/plugin/syntastic/registry.vim
new file mode 100644
index 0000000..69ef581
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/plugin/syntastic/registry.vim
@@ -0,0 +1,439 @@
+if exists('g:loaded_syntastic_registry') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_registry = 1
+
+" Initialisation {{{1
+
+let s:_DEFAULT_CHECKERS = {
+        \ 'actionscript':  ['mxmlc'],
+        \ 'ada':           ['gcc'],
+        \ 'ansible':       ['ansible_lint'],
+        \ 'apiblueprint':  ['drafter'],
+        \ 'applescript':   ['osacompile'],
+        \ 'asciidoc':      ['asciidoc'],
+        \ 'asl':           ['iasl'],
+        \ 'asm':           ['gcc'],
+        \ 'bro':           ['bro'],
+        \ 'bemhtml':       ['bemhtmllint'],
+        \ 'c':             ['gcc'],
+        \ 'cabal':         ['cabal'],
+        \ 'chef':          ['foodcritic'],
+        \ 'co':            ['coco'],
+        \ 'cobol':         ['cobc'],
+        \ 'coffee':        ['coffee', 'coffeelint'],
+        \ 'coq':           ['coqtop'],
+        \ 'cpp':           ['gcc'],
+        \ 'cs':            ['mcs'],
+        \ 'css':           ['csslint'],
+        \ 'cucumber':      ['cucumber'],
+        \ 'cuda':          ['nvcc'],
+        \ 'd':             ['dmd'],
+        \ 'dart':          ['dartanalyzer'],
+        \ 'docbk':         ['xmllint'],
+        \ 'dockerfile':    ['dockerfile_lint'],
+        \ 'dustjs':        ['swiffer'],
+        \ 'elixir':        [],
+        \ 'erlang':        ['escript'],
+        \ 'eruby':         ['ruby'],
+        \ 'fortran':       ['gfortran'],
+        \ 'glsl':          ['cgc'],
+        \ 'go':            [],
+        \ 'haml':          ['haml'],
+        \ 'handlebars':    ['handlebars'],
+        \ 'haskell':       ['hdevtools', 'hlint'],
+        \ 'haxe':          ['haxe'],
+        \ 'help':          [],
+        \ 'hss':           ['hss'],
+        \ 'html':          ['tidy'],
+        \ 'jade':          ['jade_lint'],
+        \ 'java':          ['javac'],
+        \ 'javascript':    ['jshint', 'jslint'],
+        \ 'json':          ['jsonlint', 'jsonval'],
+        \ 'less':          ['lessc'],
+        \ 'lex':           ['flex'],
+        \ 'limbo':         ['limbo'],
+        \ 'lisp':          ['clisp'],
+        \ 'llvm':          ['llvm'],
+        \ 'lua':           ['luac'],
+        \ 'markdown':      ['mdl'],
+        \ 'matlab':        ['mlint'],
+        \ 'mercury':       ['mmc'],
+        \ 'nasm':          ['nasm'],
+        \ 'nix':           ['nix'],
+        \ 'nroff':         ['mandoc'],
+        \ 'objc':          ['gcc'],
+        \ 'objcpp':        ['gcc'],
+        \ 'ocaml':         ['camlp4o'],
+        \ 'perl':          ['perlcritic'],
+        \ 'php':           ['php', 'phpcs', 'phpmd'],
+        \ 'po':            ['msgfmt'],
+        \ 'pod':           ['podchecker'],
+        \ 'puppet':        ['puppet', 'puppetlint'],
+        \ 'pug':           ['pug_lint'],
+        \ 'python':        ['python', 'flake8', 'pylint'],
+        \ 'qml':           ['qmllint'],
+        \ 'r':             [],
+        \ 'rmd':           [],
+        \ 'racket':        ['racket'],
+        \ 'rnc':           ['rnv'],
+        \ 'rst':           ['rst2pseudoxml'],
+        \ 'ruby':          ['mri'],
+        \ 'sass':          ['sass'],
+        \ 'scala':         ['fsc', 'scalac'],
+        \ 'scss':          ['sass', 'scss_lint'],
+        \ 'sh':            ['sh', 'shellcheck'],
+        \ 'slim':          ['slimrb'],
+        \ 'sml':           ['smlnj'],
+        \ 'spec':          ['rpmlint'],
+        \ 'solidity':      ['solc'],
+        \ 'sql':           ['sqlint'],
+        \ 'stylus':        ['stylint'],
+        \ 'tcl':           ['nagelfar'],
+        \ 'tex':           ['lacheck', 'chktex'],
+        \ 'texinfo':       ['makeinfo'],
+        \ 'text':          [],
+        \ 'trig':          ['rapper'],
+        \ 'turtle':        ['rapper'],
+        \ 'twig':          ['twiglint'],
+        \ 'typescript':    [],
+        \ 'vala':          ['valac'],
+        \ 'verilog':       ['verilator'],
+        \ 'vhdl':          ['ghdl'],
+        \ 'vim':           ['vimlint'],
+        \ 'xhtml':         ['tidy'],
+        \ 'xml':           ['xmllint'],
+        \ 'xslt':          ['xmllint'],
+        \ 'xquery':        ['basex'],
+        \ 'yacc':          ['bison'],
+        \ 'yaml':          ['jsyaml'],
+        \ 'yang':          ['pyang'],
+        \ 'z80':           ['z80syntaxchecker'],
+        \ 'zpt':           ['zptlint'],
+        \ 'zsh':           ['zsh'],
+    \ }
+lockvar! s:_DEFAULT_CHECKERS
+
+let s:_DEFAULT_FILETYPE_MAP = {
+        \ 'gentoo-metadata': 'xml',
+        \ 'groff': 'nroff',
+        \ 'lhaskell': 'haskell',
+        \ 'litcoffee': 'coffee',
+        \ 'mail': 'text',
+        \ 'mkd': 'markdown',
+        \ 'pe-puppet': 'puppet',
+        \ 'sgml': 'docbk',
+        \ 'sgmllnx': 'docbk',
+    \ }
+lockvar! s:_DEFAULT_FILETYPE_MAP
+
+let s:_ECLIM_TYPES = [
+        \ 'c',
+        \ 'cpp',
+        \ 'html',
+        \ 'java',
+        \ 'php',
+        \ 'python',
+        \ 'ruby',
+    \ ]
+lockvar! s:_ECLIM_TYPES
+
+let s:_YCM_TYPES = [
+        \ 'c',
+        \ 'cpp',
+        \ 'objc',
+        \ 'objcpp',
+    \ ]
+lockvar! s:_YCM_TYPES
+
+let g:SyntasticRegistry = {}
+
+" }}}1
+
+" Public methods {{{1
+
+" Note: Handling of filetype aliases: all public methods take aliases as
+" parameters, all private methods take normalized filetypes.  Public methods
+" are thus supposed to normalize filetypes before calling private methods.
+
+function! g:SyntasticRegistry.Instance() abort " {{{2
+    if !exists('s:SyntasticRegistryInstance')
+        let s:SyntasticRegistryInstance = copy(self)
+        let s:SyntasticRegistryInstance._checkerMap = {}
+    endif
+
+    return s:SyntasticRegistryInstance
+endfunction " }}}2
+
+function! g:SyntasticRegistry.CreateAndRegisterChecker(args) abort " {{{2
+    let registry = g:SyntasticRegistry.Instance()
+
+    if has_key(a:args, 'redirect')
+        let [ft, name] = split(a:args['redirect'], '/')
+        call registry._loadCheckersFor(ft, 1)
+
+        let clone = get(registry._checkerMap[ft], name, {})
+        if empty(clone)
+            throw 'Syntastic: Checker ' . a:args['redirect'] . ' redirects to unregistered checker ' . ft . '/' . name
+        endif
+
+        let checker = g:SyntasticChecker.New(a:args, clone)
+    else
+        let checker = g:SyntasticChecker.New(a:args)
+    endif
+    call registry._registerChecker(checker)
+endfunction " }}}2
+
+" Given a list of checker names hints_list, return a map name --> checker.
+" If hints_list is empty, user settings are are used instead. Checkers are
+" not checked for availability (that is, the corresponding IsAvailable() are
+" not run).
+function! g:SyntasticRegistry.getCheckers(ftalias, hints_list) abort " {{{2
+    let ftlist = self.resolveFiletypes(a:ftalias)
+
+    let names =
+        \ !empty(a:hints_list) ? a:hints_list :
+        \ exists('b:syntastic_checkers') ? b:syntastic_checkers : []
+
+    let cnames = []
+    if !empty(names)
+        for name in names
+            if name !~# '/'
+                for ft in ftlist
+                    call add(cnames, ft . '/' . name)
+                endfor
+            else
+                call add(cnames, name)
+            endif
+        endfor
+    else
+        for ft in ftlist
+            call self._sanityCheck(ft)
+            let defs =
+                \ exists('g:syntastic_' . ft . '_checkers') ? g:syntastic_{ft}_checkers :
+                \ get(s:_DEFAULT_CHECKERS, ft, [])
+            call extend(cnames, map(copy(defs), 'stridx(v:val, "/") < 0 ? ft . "/" . v:val : v:val' ))
+        endfor
+    endif
+    let cnames = syntastic#util#unique(cnames)
+
+    for ft in syntastic#util#unique(map( copy(cnames), 'v:val[: stridx(v:val, "/")-1]' ))
+        call self._loadCheckersFor(ft, 0)
+    endfor
+
+    return self._filterCheckersByName(cnames)
+endfunction " }}}2
+
+" Same as getCheckers(), but keep only the available checkers.  This runs the
+" corresponding IsAvailable() functions for all checkers.
+function! g:SyntasticRegistry.getCheckersAvailable(ftalias, hints_list) abort " {{{2
+    return filter(self.getCheckers(a:ftalias, a:hints_list), 'v:val.isAvailable()')
+endfunction " }}}2
+
+" Same as getCheckers(), but keep only the checkers that are available and
+" disabled.  This runs the corresponding IsAvailable() functions for all checkers.
+function! g:SyntasticRegistry.getCheckersDisabled(ftalias, hints_list) abort " {{{2
+    return filter(self.getCheckers(a:ftalias, a:hints_list), 'v:val.isDisabled() && v:val.isAvailable()')
+endfunction " }}}2
+
+function! g:SyntasticRegistry.getKnownFiletypes() abort " {{{2
+    let types = keys(s:_DEFAULT_CHECKERS)
+
+    call extend(types, keys(s:_DEFAULT_FILETYPE_MAP))
+
+    if exists('g:syntastic_filetype_map')
+        call extend(types, keys(g:syntastic_filetype_map))
+    endif
+
+    if exists('g:syntastic_extra_filetypes') && type(g:syntastic_extra_filetypes) == type([])
+        call extend(types, g:syntastic_extra_filetypes)
+    endif
+
+    return syntastic#util#unique(types)
+endfunction " }}}2
+
+function! g:SyntasticRegistry.getNamesOfAvailableCheckers(ftalias) abort " {{{2
+    let ft = s:_normalise_filetype(a:ftalias)
+    call self._loadCheckersFor(ft, 0)
+    return keys(filter( copy(self._checkerMap[ft]), 'v:val.isAvailable()' ))
+endfunction " }}}2
+
+function! g:SyntasticRegistry.resolveFiletypes(ftalias) abort " {{{2
+    return map(split( get(g:syntastic_filetype_map, a:ftalias, a:ftalias), '\m\.' ), 's:_normalise_filetype(v:val)')
+endfunction " }}}2
+
+function! g:SyntasticRegistry.echoInfoFor(ftalias_list) abort " {{{2
+    let ft_list = syntastic#util#unique(self.resolveFiletypes(empty(a:ftalias_list) ? &filetype : a:ftalias_list[0]))
+    if len(ft_list) != 1
+        let available = []
+        let active = []
+        let disabled = []
+
+        for ft in ft_list
+            call extend(available, map( self.getNamesOfAvailableCheckers(ft), 'ft . "/" . v:val' ))
+            call extend(active, map( self.getCheckersAvailable(ft, []), 'ft . "/" . v:val.getName()' ))
+            call extend(disabled, map( self.getCheckersDisabled(ft, []), 'ft . "/" . v:val.getName()' ))
+        endfor
+    else
+        let ft = ft_list[0]
+        let available = self.getNamesOfAvailableCheckers(ft)
+        let active = map(self.getCheckersAvailable(ft, []), 'ft ==# v:val.getFiletype() ? v:val.getName() : v:val.getCName()')
+        let disabled = map(self.getCheckersDisabled(ft, []), 'ft ==# v:val.getFiletype() ? v:val.getName() : v:val.getCName()')
+    endif
+
+    let cnt = len(available)
+    let plural = cnt != 1 ? 's' : ''
+    let cklist = cnt ? join(sort(available)) : '-'
+    echomsg 'Available checker' . plural . ': ' . cklist
+
+    let cnt = len(active)
+    let plural = cnt != 1 ? 's' : ''
+    let cklist = cnt ? join(active) : '-'
+    echomsg 'Currently enabled checker' . plural . ': ' . cklist
+
+    let cnt = len(disabled)
+    let plural = cnt != 1 ? 's' : ''
+    if len(disabled)
+        let cklist = join(sort(disabled, 's:_compare_checker_names'))
+        echomsg 'Checker' . plural . ' disabled for security reasons: ' . cklist
+    endif
+
+    " Eclim feels entitled to mess with syntastic's variables {{{3
+    if exists(':EclimValidate') && get(g:, 'EclimFileTypeValidate', 1)
+        let disabled = filter(copy(ft_list), 's:_disabled_by_eclim(v:val)')
+        let cnt = len(disabled)
+        if cnt
+            let plural = cnt != 1 ? 's' : ''
+            let cklist = join(disabled, ', ')
+            echomsg 'Checkers for filetype' . plural . ' ' . cklist . ' possibly disabled by Eclim'
+        endif
+    endif
+    " }}}3
+
+    " So does YouCompleteMe {{{3
+    if exists('g:loaded_youcompleteme') && get(g:, 'ycm_show_diagnostics_ui', get(g:, 'ycm_register_as_syntastic_checker', 1))
+        let disabled = filter(copy(ft_list), 's:_disabled_by_ycm(v:val)')
+        let cnt = len(disabled)
+        if cnt
+            let plural = cnt != 1 ? 's' : ''
+            let cklist = join(disabled, ', ')
+            echomsg 'Checkers for filetype' . plural . ' ' . cklist . ' possibly disabled by YouCompleteMe'
+        endif
+    endif
+    " }}}3
+endfunction " }}}2
+
+" }}}1
+
+" Private methods {{{1
+
+function! g:SyntasticRegistry._registerChecker(checker) abort " {{{2
+    let ft = a:checker.getFiletype()
+    if !has_key(self._checkerMap, ft)
+        let self._checkerMap[ft] = {}
+    endif
+
+    let name = a:checker.getName()
+    if has_key(self._checkerMap[ft], name)
+        throw 'Syntastic: Duplicate syntax checker name: ' . ft . '/' . name
+    endif
+
+    let self._checkerMap[ft][name] = a:checker
+endfunction " }}}2
+
+function! g:SyntasticRegistry._findChecker(cname) abort " {{{2
+    let sep_idx = stridx(a:cname, '/')
+    if sep_idx > 0
+        let ft = a:cname[: sep_idx-1]
+        let name = a:cname[sep_idx+1 :]
+    else
+        let ft = &filetype
+        let name = a:cname
+    endif
+    return get(self._checkerMap[ft], name, {})
+endfunction "}}}2
+
+function! g:SyntasticRegistry._filterCheckersByName(cnames) abort " {{{2
+    return filter( map(copy(a:cnames), 'self._findChecker(v:val)'), '!empty(v:val)' )
+endfunction " }}}2
+
+function! g:SyntasticRegistry._loadCheckersFor(filetype, force) abort " {{{2
+    if !a:force && has_key(self._checkerMap, a:filetype)
+        return
+    endif
+
+    execute 'runtime! syntax_checkers/' . a:filetype . '/*.vim'
+
+    if !has_key(self._checkerMap, a:filetype)
+        let self._checkerMap[a:filetype] = {}
+    endif
+endfunction " }}}2
+
+" Check for obsolete variable g:syntastic_<filetype>_checker
+function! g:SyntasticRegistry._sanityCheck(filetype) abort " {{{2
+    if exists('g:syntastic_' . a:filetype . '_checkers') &&
+        \ type(g:syntastic_{a:filetype}_checkers) != type([])
+
+        unlet! g:syntastic_{a:filetype}_checkers
+        call syntastic#log#error('variable g:syntastic_' . a:filetype . '_checkers has to be a list of strings')
+    endif
+
+    if exists('g:syntastic_' . a:filetype . '_checker') &&
+        \ !exists('g:syntastic_' . a:filetype . '_checkers') &&
+        \ type(g:syntastic_{a:filetype}_checker) == type('')
+
+        let g:syntastic_{a:filetype}_checkers = [g:syntastic_{a:filetype}_checker]
+        call syntastic#log#oneTimeWarn('variable g:syntastic_' . a:filetype . '_checker is deprecated')
+    endif
+endfunction " }}}2
+
+" }}}1
+
+" Utilities {{{1
+
+"resolve filetype aliases, and replace - with _ otherwise we cant name
+"syntax checker functions legally for filetypes like "gentoo-metadata"
+function! s:_normalise_filetype(ftalias) abort " {{{2
+    let ft = get(s:_DEFAULT_FILETYPE_MAP, a:ftalias, a:ftalias)
+    let ft = get(g:syntastic_filetype_map, ft, ft)
+    let ft = substitute(ft, '\m-', '_', 'g')
+    return ft
+endfunction " }}}2
+
+function! s:_disabled_by_eclim(filetype) abort " {{{2
+    if index(s:_ECLIM_TYPES, a:filetype) >= 0
+        let lang = toupper(a:filetype[0]) . a:filetype[1:]
+        let ft = a:filetype !=# 'cpp' ? lang : 'C'
+        return get(g:, 'Eclim' . lang . 'Validate', 1) && !get(g:, 'Eclim' . ft . 'SyntasticEnabled', 0)
+    endif
+
+    return 0
+endfunction " }}}2
+
+function! s:_disabled_by_ycm(filetype) abort " {{{2
+    return index(s:_YCM_TYPES, a:filetype) >= 0
+endfunction " }}}2
+
+function! s:_compare_checker_names(a, b) abort " {{{2
+    if a:a ==# a:b
+        return 0
+    endif
+
+    if stridx(a:a, '/') < 0
+        if stridx(a:b, '/') < 0
+            return a:a < a:b ? -1 : 1
+        else
+            return -1
+        endif
+    else
+        if stridx(a:b, '/') < 0
+            return 1
+        else
+            return a:a < a:b ? -1 : 1
+        endif
+    endif
+endfunction " }}}2
+
+" }}}1
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/plugin/syntastic/signs.vim b/vim-plugins/bundle/syntastic/plugin/syntastic/signs.vim
new file mode 100644
index 0000000..e3bafa0
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/plugin/syntastic/signs.vim
@@ -0,0 +1,138 @@
+if exists('g:loaded_syntastic_notifier_signs') || !exists('g:loaded_syntastic_plugin')
+    finish
+endif
+let g:loaded_syntastic_notifier_signs = 1
+
+" Initialisation {{{1
+
+" start counting sign ids at 5000, start here to hopefully avoid conflicting
+" with any other code that places signs (not sure if this precaution is
+" actually needed)
+let s:first_sign_id = 5000
+let s:next_sign_id = s:first_sign_id
+
+let g:SyntasticSignsNotifier = {}
+
+let s:setup_done = 0
+
+" }}}1
+
+" Public methods {{{1
+
+function! g:SyntasticSignsNotifier.New() abort " {{{2
+    let newObj = copy(self)
+    return newObj
+endfunction " }}}2
+
+function! g:SyntasticSignsNotifier.enabled() abort " {{{2
+    return has('signs') && syntastic#util#var('enable_signs')
+endfunction " }}}2
+
+function! g:SyntasticSignsNotifier.refresh(loclist) abort " {{{2
+    call syntastic#log#debug(g:_SYNTASTIC_DEBUG_NOTIFICATIONS, 'signs: refresh')
+
+    let old_signs = copy(self._bufSignIds())
+    if self.enabled()
+        if !s:setup_done
+            call self._setup()
+            let s:setup_done = 1
+            lockvar s:setup_done
+        endif
+
+        call self._signErrors(a:loclist)
+    endif
+    call self._removeSigns(old_signs)
+endfunction " }}}2
+
+" }}}1
+
+" Private methods {{{1
+
+" One time setup: define our own sign types and highlighting
+function! g:SyntasticSignsNotifier._setup() abort " {{{2
+    if has('signs')
+        if !hlexists('SyntasticErrorSign')
+            highlight link SyntasticErrorSign error
+        endif
+        if !hlexists('SyntasticWarningSign')
+            highlight link SyntasticWarningSign todo
+        endif
+        if !hlexists('SyntasticStyleErrorSign')
+            highlight link SyntasticStyleErrorSign SyntasticErrorSign
+        endif
+        if !hlexists('SyntasticStyleWarningSign')
+            highlight link SyntasticStyleWarningSign SyntasticWarningSign
+        endif
+        if !hlexists('SyntasticStyleErrorLine')
+            highlight link SyntasticStyleErrorLine SyntasticErrorLine
+        endif
+        if !hlexists('SyntasticStyleWarningLine')
+            highlight link SyntasticStyleWarningLine SyntasticWarningLine
+        endif
+
+        " define the signs used to display syntax and style errors/warns
+        execute 'sign define SyntasticError text=' . g:syntastic_error_symbol .
+            \ ' texthl=SyntasticErrorSign linehl=SyntasticErrorLine'
+        execute 'sign define SyntasticWarning text=' . g:syntastic_warning_symbol .
+            \ ' texthl=SyntasticWarningSign linehl=SyntasticWarningLine'
+        execute 'sign define SyntasticStyleError text=' . g:syntastic_style_error_symbol .
+            \ ' texthl=SyntasticStyleErrorSign linehl=SyntasticStyleErrorLine'
+        execute 'sign define SyntasticStyleWarning text=' . g:syntastic_style_warning_symbol .
+            \ ' texthl=SyntasticStyleWarningSign linehl=SyntasticStyleWarningLine'
+    endif
+endfunction " }}}2
+
+" Place signs by all syntax errors in the buffer
+function! g:SyntasticSignsNotifier._signErrors(loclist) abort " {{{2
+    let loclist = a:loclist
+    if !loclist.isEmpty()
+
+        let buf = bufnr('')
+        if !bufloaded(buf)
+            " signs can be placed only in loaded buffers
+            return
+        endif
+
+        " errors come first, so that they are not masked by warnings
+        let issues = copy(loclist.errors())
+        call extend(issues, loclist.warnings())
+        call filter(issues, 'v:val["bufnr"] == buf')
+        let seen = {}
+
+        for i in issues
+            if i['lnum'] > 0 && !has_key(seen, i['lnum'])
+                let seen[i['lnum']] = 1
+
+                let sign_severity = i['type'] ==? 'W' ? 'Warning' : 'Error'
+                let sign_subtype = get(i, 'subtype', '')
+                let sign_type = 'Syntastic' . sign_subtype . sign_severity
+
+                execute 'sign place ' . s:next_sign_id . ' line=' . i['lnum'] . ' name=' . sign_type . ' buffer=' . i['bufnr']
+                call add(self._bufSignIds(), s:next_sign_id)
+                let s:next_sign_id += 1
+            endif
+        endfor
+    endif
+endfunction " }}}2
+
+" Remove the signs with the given ids from this buffer
+function! g:SyntasticSignsNotifier._removeSigns(ids) abort " {{{2
+    if has('signs')
+        for s in reverse(copy(a:ids))
+            execute 'sign unplace ' . s
+            call remove(self._bufSignIds(), index(self._bufSignIds(), s))
+        endfor
+    endif
+endfunction " }}}2
+
+" Get all the ids of the SyntaxError signs in the buffer
+function! g:SyntasticSignsNotifier._bufSignIds() abort " {{{2
+    if !exists('b:syntastic_private_sign_ids')
+        let b:syntastic_private_sign_ids = []
+    endif
+    return b:syntastic_private_sign_ids
+endfunction " }}}2
+
+" }}}1
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/actionscript/mxmlc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/actionscript/mxmlc.vim
new file mode 100644
index 0000000..1066769
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/actionscript/mxmlc.vim
@@ -0,0 +1,67 @@
+"============================================================================
+"File:        mxmlc.vim
+"Description: ActionScript syntax checker - using mxmlc
+"Maintainer:  Andy Earnshaw <andyearnshaw@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_actionscript_mxmlc_checker')
+    finish
+endif
+let g:loaded_syntastic_actionscript_mxmlc_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_actionscript_mxmlc_GetHighlightRegex(item)
+    let term = ''
+
+    if match(a:item['text'], '\mvariable ''') > -1
+        let term = matchstr(a:item['text'], '\m''\zs[^'']\+\ze''')
+
+    elseif match(a:item['text'], 'expected a definition keyword') > -1
+        let term = matchstr(a:item['text'], '\mnot \zs[^.]\+\ze\.')
+
+    elseif match(a:item['text'], '\mundefined \%(property\|method\)') > -1
+        let term = matchstr(a:item['text'], '\mundefined \%(property\|method\) \zs[^. ]\+\ze')
+
+    elseif match(a:item['text'], 'could not be found') > -1
+        let term = matchstr(a:item['text'], '\m \zs\S\+\ze could not be found')
+
+    elseif match(a:item['text'], 'Type was not found') > -1
+        let term = matchstr(a:item['text'], '\m: \zs[^.]\+\zs\.')
+
+    endif
+
+    return term !=# '' ? '\V\<' . escape(term, '\') . '\>' : ''
+endfunction
+
+function! SyntaxCheckers_actionscript_mxmlc_GetLocList() dict
+    call syntastic#log#deprecationWarn('actionscript_mxmlc_conf', 'actionscript_mxmlc_args',
+        \ "'-load-config+=' . syntastic#util#shexpand(OLD_VAR)")
+
+    let makeprg = self.makeprgBuild({ 'args_after': '-output=' . syntastic#util#DevNull() })
+
+    let errorformat =
+        \ '%f(%l): col: %c %trror: %m,' .
+        \ '%f(%l): col: %c %tarning: %m,' .
+        \ '%f: %trror: %m,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'actionscript',
+    \ 'name': 'mxmlc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/ada/gcc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/ada/gcc.vim
new file mode 100644
index 0000000..6072ae4
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/ada/gcc.vim
@@ -0,0 +1,47 @@
+"============================================================================
+"File:        ada.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Alfredo Di Napoli <alfredo.dinapoli@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_ada_gcc_checker')
+    finish
+endif
+let g:loaded_syntastic_ada_gcc_checker = 1
+
+if !exists('g:syntastic_ada_compiler_options')
+    let g:syntastic_ada_compiler_options = ''
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ada_gcc_IsAvailable() dict
+    if !exists('g:syntastic_ada_compiler')
+        let g:syntastic_ada_compiler = self.getExec()
+    endif
+    return executable(expand(g:syntastic_ada_compiler, 1))
+endfunction
+
+function! SyntaxCheckers_ada_gcc_GetLocList() dict
+    return syntastic#c#GetLocList('ada', 'gcc', {
+        \ 'errorformat':
+        \     '%-G%f:%s:,' .
+        \     '%f:%l:%c: %m,' .
+        \     '%f:%l: %m',
+        \ 'main_flags': '-c -x ada -gnats -gnatef',
+        \ 'header_flags': '-x ada -gnats -gnatef',
+        \ 'header_names': '\.ads$' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ada',
+    \ 'name': 'gcc' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/ansible/ansible_lint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/ansible/ansible_lint.vim
new file mode 100644
index 0000000..fe62581
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/ansible/ansible_lint.vim
@@ -0,0 +1,54 @@
+"============================================================================
+"File:        ansible_lint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Erik Zaadi <erik.zaadi at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_ansible_ansible_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_ansible_ansible_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ansible_ansible_lint_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [2, 0, 4])
+endfunction
+
+function! SyntaxCheckers_ansible_ansible_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-p' })
+
+    let errorformat =
+        \ '%f:%l: [EANSIBLE%n] %m,' .
+        \ '%f:%l: [ANSIBLE%n] %m'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'defaults': {'type': 'E'},
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ansible',
+    \ 'name': 'ansible_lint',
+    \ 'exec': 'ansible-lint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/apiblueprint/drafter.vim b/vim-plugins/bundle/syntastic/syntax_checkers/apiblueprint/drafter.vim
new file mode 100644
index 0000000..e404a4f
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/apiblueprint/drafter.vim
@@ -0,0 +1,66 @@
+"============================================================================
+"File:        drafter.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_apiblueprint_drafter_checker')
+    finish
+endif
+let g:loaded_syntastic_apiblueprint_drafter_checker = 1
+
+if !exists('g:syntastic_apiblueprint_drafter_sort')
+    let g:syntastic_apiblueprint_drafter_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_apiblueprint_drafter_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'post_args': '-u -l' })
+
+    let errorformat =
+        \ '%trror: (%n)  %m,' .
+        \ '%tarning: (%n)  %m,' .
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 2, 3, 4] })
+
+    for e in loclist
+        let matches = matchlist(e['text'], '\v^(.+); line (\d+), column (\d+) - line (\d+), column (\d+)$')
+        if len(matches) > 5
+            let e['lnum'] = str2nr(matches[2])
+            let e['col']  = str2nr(matches[3])
+            let e['vcol'] = 0
+
+            if matches[2] == matches[4]
+                let e['hl'] = '\%>' . (e['col'] - 1) . 'c\%<' . matches[5] . 'c'
+            endif
+
+            let e['text'] = matches[1]
+        else
+            let e['valid'] = 0
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'apiblueprint',
+    \ 'name': 'drafter'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/applescript/osacompile.vim b/vim-plugins/bundle/syntastic/syntax_checkers/applescript/osacompile.vim
new file mode 100644
index 0000000..406e029
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/applescript/osacompile.vim
@@ -0,0 +1,49 @@
+"==============================================================================
+"       FileName: applescript.vim
+"           Desc: Syntax checking plugin for syntastic.vim
+"         Author: Zhao Cai
+"          Email: caizhaoff@gmail.com
+"        Version: 0.2.1
+"   Date Created: Thu 09 Sep 2011 10:30:09 AM EST
+"  Last Modified: Fri 09 Dec 2011 01:10:24 PM EST
+"
+"        History: 0.1.0 - working, but it will run the script everytime to check
+"                 syntax. Should use osacompile but strangely it does not give
+"                 errors.
+"
+"                 0.2.0 - switch to osacompile, it gives less errors compared
+"                 with osascript.
+"
+"                 0.2.1 - remove g:syntastic_applescript_tempfile. use
+"                 tempname() instead.
+"
+"        License: This program is free software. It comes without any
+"        warranty, to the extent permitted by applicable law. You can
+"        redistribute it and/or modify it under the terms of the Do What The
+"        Fuck You Want To Public License, Version 2, as published by Sam
+"        Hocevar.  See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_applescript_osacompile_checker')
+    finish
+endif
+let g:loaded_syntastic_applescript_osacompile_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_applescript_osacompile_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-o ' . tempname() . '.scpt' })
+    let errorformat = '%f:%l:%m'
+    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'applescript',
+    \ 'name': 'osacompile' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/asciidoc/asciidoc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/asciidoc/asciidoc.vim
new file mode 100644
index 0000000..bc64e6a
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/asciidoc/asciidoc.vim
@@ -0,0 +1,47 @@
+"============================================================================
+"File:        asciidoc.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_asciidoc_asciidoc_checker')
+    finish
+endif
+let g:loaded_syntastic_asciidoc_asciidoc_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_asciidoc_asciidoc_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': syntastic#c#NullOutput() })
+
+    let errorformat =
+        \ '%E%\w%\+: %tRROR: %f: line %l: %m,' .
+        \ '%E%\w%\+: %tRROR: %f: %m,' .
+        \ '%E%\w%\+: FAILED: %f: line %l: %m,' .
+        \ '%E%\w%\+: FAILED: %f: %m,' .
+        \ '%W%\w%\+: %tARNING: %f: line %l: %m,' .
+        \ '%W%\w%\+: %tARNING: %f: %m,' .
+        \ '%W%\w%\+: DEPRECATED: %f: line %l: %m,' .
+        \ '%W%\w%\+: DEPRECATED: %f: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'asciidoc',
+    \ 'name': 'asciidoc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/asciidoc/proselint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/asciidoc/proselint.vim
new file mode 100644
index 0000000..7bc719f
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/asciidoc/proselint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        proselint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_asciidoc_proselint_checker')
+    finish
+endif
+let g:loaded_syntastic_asciidoc_proselint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'asciidoc',
+    \ 'name': 'proselint',
+    \ 'redirect': 'text/proselint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/asl/iasl.vim b/vim-plugins/bundle/syntastic/syntax_checkers/asl/iasl.vim
new file mode 100644
index 0000000..0aae5d2
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/asl/iasl.vim
@@ -0,0 +1,59 @@
+"============================================================================
+"File:        iasl.vim
+"Description: Syntax checking plugin for syntastic using iasl
+"Maintainer:  Peter Wu <peter@lekensteyn.nl>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_asl_iasl_checker')
+    finish
+endif
+let g:loaded_syntastic_asl_iasl_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_asl_iasl_GetLocList() dict
+    let tmpdir = syntastic#util#tmpdir() . syntastic#util#Slash()
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-vi',
+        \ 'args_after': ['-p', tmpdir] })
+
+    let errorformat =
+        \ '%f(%l) : %trror    %n - %m,' .
+        \ '%f(%l) : %tarning  %n - %m,' .
+        \ '%f(%l) : %temark   %n - %m,' .
+        \ '%f(%l) : %tptimize %n - %m,' .
+        \ '%f(%l) : %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 255] })
+
+    for e in loclist
+        if e['type'] =~? 'r'
+            let e['type'] = 'W'
+        elseif e['type'] =~? 'o'
+            let e['type'] = 'W'
+            let e['subtype'] = 'Style'
+        endif
+    endfor
+
+    call syntastic#util#rmrf(tmpdir)
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'asl',
+    \ 'name': 'iasl'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/asm/gcc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/asm/gcc.vim
new file mode 100644
index 0000000..d352eee
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/asm/gcc.vim
@@ -0,0 +1,61 @@
+"============================================================================
+"File:        gcc.vim
+"Description: Syntax checking for at&t and intel assembly files with gcc
+"Maintainer:  Josh Rahm <joshuarahm@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_asm_gcc_checker')
+    finish
+endif
+let g:loaded_syntastic_asm_gcc_checker = 1
+
+if !exists('g:syntastic_asm_compiler_options')
+    let g:syntastic_asm_compiler_options = ''
+endif
+
+if !exists('g:syntastic_asm_generic')
+    let g:syntastic_asm_generic = 0
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_asm_gcc_IsAvailable() dict " {{{1
+    if !exists('g:syntastic_asm_compiler')
+        let g:syntastic_asm_compiler = self.getExec()
+    endif
+    return executable(expand(g:syntastic_asm_compiler, 1))
+endfunction " }}}1
+
+function! SyntaxCheckers_asm_gcc_GetLocList() dict " {{{1
+    return syntastic#c#GetLocList('asm', 'gcc', {
+        \ 'errorformat':
+        \     '%-G%f:%s:,' .
+        \     '%f:%l:%c: %trror: %m,' .
+        \     '%f:%l:%c: %tarning: %m,' .
+        \     '%f:%l: %m',
+        \ 'main_flags': '-x assembler -fsyntax-only' . (g:syntastic_asm_generic ? '' : ' -masm=' . s:GetDialect()) })
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:GetDialect() " {{{2
+    return syntastic#util#var('asm_dialect', expand('%:e', 1) ==? 'asm' ? 'intel' : 'att')
+endfunction " }}}2
+
+" }}}1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'asm',
+    \ 'name': 'gcc' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
new file mode 100644
index 0000000..1837067
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
@@ -0,0 +1,35 @@
+"============================================================================
+"File:        bemhtmllint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Sergej Tatarincev <s.tatarincev at yandex.ua>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_bemhtml_bemhtmllint_checker')
+    finish
+endif
+
+let g:loaded_syntastic_bemhtml_bemhtmllint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function SyntaxCheckers_bemhtml_bemhtmllint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+    let errorformat = '%f:%l:%c: %m'
+    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'bemhtml',
+    \ 'name': 'bemhtmllint',
+    \ 'exec': 'bemhtml-lint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/bro/bro.vim b/vim-plugins/bundle/syntastic/syntax_checkers/bro/bro.vim
new file mode 100644
index 0000000..cea441b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/bro/bro.vim
@@ -0,0 +1,58 @@
+"============================================================================
+"File:        bro.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Justin Azoff <justin.azoff@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_bro_bro_checker')
+    finish
+endif
+let g:loaded_syntastic_bro_bro_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_bro_bro_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\m at or near "\zs[^"]\+\ze"')
+    return term !=# '' ? '\V\<' . escape(term, '\') . '\>' : ''
+endfunction
+
+function! SyntaxCheckers_bro_bro_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    if syntastic#util#system(self.getExecEscaped() . ' --help') !~# '--parse-only'
+        call self.log('unknown option "--parse-only"')
+        return 0
+    endif
+
+    return 1
+endfunction
+
+function! SyntaxCheckers_bro_bro_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_before': '--parse-only' })
+
+    "example: error in ./foo.bro, line 3: unknown identifier banana, at or near "banana"
+    let errorformat = '%t:%f:%l:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'bro' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'bro',
+    \ 'name': 'bro'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/c/avrgcc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/c/avrgcc.vim
new file mode 100644
index 0000000..a412497
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/c/avrgcc.vim
@@ -0,0 +1,59 @@
+"============================================================================
+"File:        avrgcc.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  Karel <karelishere at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_c_avrgcc_checker')
+    finish
+endif
+let g:loaded_syntastic_c_avrgcc_checker = 1
+
+if !exists('g:syntastic_avrgcc_config_file')
+    let g:syntastic_avrgcc_config_file = '.syntastic_avrgcc_config'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:opt_x = { 'c': 'c', 'cpp': 'c++' }
+
+function! SyntaxCheckers_c_avrgcc_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': syntastic#c#ReadConfig(g:syntastic_avrgcc_config_file),
+        \ 'args_after': '-x ' . get(s:opt_x, self.getFiletype(), '')  . ' -fsyntax-only' })
+
+    let errorformat =
+        \ '%-G%f:%s:,' .
+        \ '%-G%f:%l: %#error: %#(Each undeclared identifier is reported only%.%#,' .
+        \ '%-G%f:%l: %#error: %#for each function it appears%.%#,' .
+        \ '%-GIn file included%.%#,' .
+        \ '%-G %#from %f:%l\,,' .
+        \ '%f:%l:%c: %trror: %m,' .
+        \ '%f:%l:%c: %tarning: %m,' .
+        \ '%f:%l:%c: %m,' .
+        \ '%f:%l: %trror: %m,' .
+        \ '%f:%l: %tarning: %m,'.
+        \ '%f:%l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['compressWhitespace'] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'avrgcc',
+    \ 'exec': 'avr-gcc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/c/checkpatch.vim b/vim-plugins/bundle/syntastic/syntax_checkers/c/checkpatch.vim
new file mode 100644
index 0000000..43b047c
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/c/checkpatch.vim
@@ -0,0 +1,60 @@
+"============================================================================
+"File:        checkpatch.vim
+"Description: Syntax checking plugin for syntastic.vim using checkpatch.pl
+"Maintainer:  Daniel Walker <dwalker at fifo99 dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_c_checkpatch_checker')
+    finish
+endif
+let g:loaded_syntastic_c_checkpatch_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_checkpatch_IsAvailable() dict
+    call syntastic#log#deprecationWarn('c_checker_checkpatch_location', 'c_checkpatch_exec')
+
+    if !exists('g:syntastic_c_checkpatch_exec') && !executable(self.getExec())
+        if executable('checkpatch')
+            let g:syntastic_c_checkpatch_exec = 'checkpatch'
+        elseif executable('./scripts/checkpatch.pl')
+            let g:syntastic_c_checkpatch_exec = fnamemodify('./scripts/checkpatch.pl', ':p')
+        elseif executable('./scripts/checkpatch')
+            let g:syntastic_c_checkpatch_exec = fnamemodify('./scripts/checkpatch', ':p')
+        endif
+    endif
+
+    call self.log('exec =', self.getExec())
+
+    return executable(self.getExec())
+endfunction
+
+function! SyntaxCheckers_c_checkpatch_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '--no-summary --no-tree --terse --file' })
+
+    let errorformat =
+        \ '%f:%l: %tARNING: %m,' .
+        \ '%f:%l: %tRROR: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1],
+        \ 'subtype': 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'checkpatch',
+    \ 'exec': 'checkpatch.pl'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/c/clang_check.vim b/vim-plugins/bundle/syntastic/syntax_checkers/c/clang_check.vim
new file mode 100644
index 0000000..4c3677a
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/c/clang_check.vim
@@ -0,0 +1,64 @@
+"============================================================================
+"File:        clang_check.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Benjamin Bannier <bbannier at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_c_clang_check_checker')
+    finish
+endif
+let g:loaded_syntastic_c_clang_check_checker = 1
+
+if !exists('g:syntastic_clang_check_config_file')
+    let g:syntastic_clang_check_config_file = '.syntastic_clang_check_config'
+endif
+
+if !exists('g:syntastic_c_clang_check_sort')
+    let g:syntastic_c_clang_check_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_clang_check_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'post_args':
+        \   '-- ' .
+        \   syntastic#c#ReadConfig(g:syntastic_clang_check_config_file) . ' ' .
+        \   '-fshow-column ' .
+        \   '-fshow-source-location ' .
+        \   '-fno-caret-diagnostics ' .
+        \   '-fno-color-diagnostics ' .
+        \   '-fdiagnostics-format=clang' })
+
+    let errorformat =
+        \ '%E%f:%l:%c: fatal error: %m,' .
+        \ '%E%f:%l:%c: error: %m,' .
+        \ '%W%f:%l:%c: warning: %m,' .
+        \ '%-G%\m%\%%(LLVM ERROR:%\|No compilation database found%\)%\@!%.%#,' .
+        \ '%E%m'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'clang_check',
+    \ 'exec': 'clang-check'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/c/clang_tidy.vim b/vim-plugins/bundle/syntastic/syntax_checkers/c/clang_tidy.vim
new file mode 100644
index 0000000..6d8cbfe
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/c/clang_tidy.vim
@@ -0,0 +1,64 @@
+"============================================================================
+"File:        clang_tidy.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Benjamin Bannier <bbannier at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_c_clang_tidy_checker')
+    finish
+endif
+let g:loaded_syntastic_c_clang_tidy_checker = 1
+
+if !exists('g:syntastic_clang_tidy_config_file')
+    let g:syntastic_clang_tidy_config_file = '.syntastic_clang_tidy_config'
+endif
+
+if !exists('g:syntastic_c_clang_tidy_sort')
+    let g:syntastic_c_clang_tidy_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_clang_tidy_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'post_args':
+        \   '-- ' .
+        \   syntastic#c#ReadConfig(g:syntastic_clang_tidy_config_file) . ' ' .
+        \   '-fshow-column ' .
+        \   '-fshow-source-location ' .
+        \   '-fno-caret-diagnostics ' .
+        \   '-fno-color-diagnostics ' .
+        \   '-fdiagnostics-format=clang' })
+
+    let errorformat =
+        \ '%E%f:%l:%c: fatal error: %m,' .
+        \ '%E%f:%l:%c: error: %m,' .
+        \ '%W%f:%l:%c: warning: %m,' .
+        \ '%-G%\m%\%%(LLVM ERROR:%\|No compilation database found%\)%\@!%.%#,' .
+        \ '%E%m'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'clang_tidy',
+    \ 'exec': 'clang-tidy'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/c/cppcheck.vim b/vim-plugins/bundle/syntastic/syntax_checkers/c/cppcheck.vim
new file mode 100644
index 0000000..cd802a8
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/c/cppcheck.vim
@@ -0,0 +1,62 @@
+"============================================================================
+"File:        cppcheck.vim
+"Description: Syntax checking plugin for syntastic.vim using cppcheck.pl
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_c_cppcheck_checker')
+    finish
+endif
+let g:loaded_syntastic_c_cppcheck_checker = 1
+
+if !exists('g:syntastic_cppcheck_config_file')
+    let g:syntastic_cppcheck_config_file = '.syntastic_cppcheck_config'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_cppcheck_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': syntastic#c#ReadConfig(g:syntastic_cppcheck_config_file),
+        \ 'args_after': '-q --enable=style' })
+
+    let errorformat =
+        \ '[%f:%l]: (%trror) %m,' .
+        \ '[%f:%l]: (%tarning) %m,' .
+        \ '[%f:%l]: (%ttyle) %m,' .
+        \ '[%f:%l]: (%terformance) %m,' .
+        \ '[%f:%l]: (%tortability) %m,' .
+        \ '[%f:%l]: (%tnformation) %m,' .
+        \ '[%f:%l]: (%tnconclusive) %m,' .
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'cppcheck',
+        \ 'returns': [0] })
+
+    for e in loclist
+        if e['type'] =~? '\m^[SPI]'
+            let e['type'] = 'w'
+            let e['subtype'] = 'Style'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'cppcheck'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/c/gcc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/c/gcc.vim
new file mode 100644
index 0000000..4fa9216
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/c/gcc.vim
@@ -0,0 +1,59 @@
+"============================================================================
+"File:        c.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_c_gcc_checker')
+    finish
+endif
+let g:loaded_syntastic_c_gcc_checker = 1
+
+if !exists('g:syntastic_c_compiler_options')
+    let g:syntastic_c_compiler_options = '-std=gnu99'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_gcc_IsAvailable() dict
+    if !exists('g:syntastic_c_compiler')
+        let g:syntastic_c_compiler = executable(self.getExec()) ? self.getExec() : 'clang'
+    endif
+    call self.log('g:syntastic_c_compiler =', g:syntastic_c_compiler)
+    return executable(expand(g:syntastic_c_compiler, 1))
+endfunction
+
+function! SyntaxCheckers_c_gcc_GetLocList() dict
+    return syntastic#c#GetLocList('c', 'gcc', {
+        \ 'errorformat':
+        \     '%-G%f:%s:,' .
+        \     '%-G%f:%l: %#error: %#(Each undeclared identifier is reported only%.%#,' .
+        \     '%-G%f:%l: %#error: %#for each function it appears%.%#,' .
+        \     '%-GIn file included%.%#,' .
+        \     '%-G %#from %f:%l\,,' .
+        \     '%f:%l:%c: %trror: %m,' .
+        \     '%f:%l:%c: %tarning: %m,' .
+        \     '%f:%l:%c: %m,' .
+        \     '%f:%l: %trror: %m,' .
+        \     '%f:%l: %tarning: %m,'.
+        \     '%f:%l: %m',
+        \ 'main_flags': '-x c -fsyntax-only',
+        \ 'header_flags': '-x c',
+        \ 'header_names': '\m\.h$' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'gcc' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/c/make.vim b/vim-plugins/bundle/syntastic/syntax_checkers/c/make.vim
new file mode 100644
index 0000000..e477994
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/c/make.vim
@@ -0,0 +1,61 @@
+"============================================================================
+"File:        make.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_c_make_checker')
+    finish
+endif
+let g:loaded_syntastic_c_make_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_make_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args': '-sk', 'fname': '' })
+
+    let errorformat =
+        \ '%-G%f:%s:,' .
+        \ '%-G%f:%l: %#error: %#(Each undeclared identifier is reported only%.%#,' .
+        \ '%-G%f:%l: %#error: %#for each function it appears%.%#,' .
+        \ '%-GIn file included%.%#,' .
+        \ '%-G %#from %f:%l\,,' .
+        \ '%f:%l:%c: %trror: %m,' .
+        \ '%f:%l:%c: %tarning: %m,' .
+        \ '%f:%l:%c: %m,' .
+        \ '%f:%l: %trror: %m,' .
+        \ '%f:%l: %tarning: %m,'.
+        \ '%f:%l: %m'
+
+    if exists('g:syntastic_c_errorformat')
+        let errorformat = g:syntastic_c_errorformat
+    endif
+
+    " process makeprg
+    let errors = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+
+    " filter the processed errors if desired
+    if exists('g:syntastic_c_remove_include_errors') && g:syntastic_c_remove_include_errors != 0
+        return filter(errors, 'has_key(v:val, "bufnr") && v:val["bufnr"] == ' . bufnr(''))
+    else
+        return errors
+    endif
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'make'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/c/oclint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/c/oclint.vim
new file mode 100644
index 0000000..f172a11
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/c/oclint.vim
@@ -0,0 +1,65 @@
+"============================================================================
+"File:        oclint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  "UnCO" Lin <undercooled aT lavabit com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_c_oclint_checker')
+    finish
+endif
+let g:loaded_syntastic_c_oclint_checker = 1
+
+if !exists('g:syntastic_oclint_config_file')
+    let g:syntastic_oclint_config_file = '.syntastic_oclint_config'
+endif
+
+if !exists('g:syntastic_c_oclint_sort')
+    let g:syntastic_c_oclint_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_oclint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'post_args': '-- -c ' . syntastic#c#ReadConfig(g:syntastic_oclint_config_file) })
+
+    let errorformat =
+        \ '%E%f:%l:%c: fatal error: %m,' .
+        \ '%E%f:%l:%c: error: %m,' .
+        \ '%W%f:%l:%c: warning: %m,' .
+        \ '%E%f:%l:%c: %m,' .
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'postprocess': ['compressWhitespace'],
+        \ 'returns': [0, 3, 5] })
+
+    for e in loclist
+        if e['text'] =~# '\v P3( |$)'
+            let e['type'] = 'W'
+        endif
+
+        let e['text'] = substitute(e['text'], '\m\C P[1-3]$', '', '')
+        let e['text'] = substitute(e['text'], '\m\C P[1-3] ', ': ', '')
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'oclint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/c/pc_lint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/c/pc_lint.vim
new file mode 100644
index 0000000..6efd17a
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/c/pc_lint.vim
@@ -0,0 +1,66 @@
+"============================================================================
+"File:        pc_lint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Steve Bragg <steve at empresseffects dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_c_pc_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_c_pc_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+if !exists('g:syntastic_pc_lint_config_file')
+    let g:syntastic_pc_lint_config_file = 'options.lnt'
+endif
+
+function! SyntaxCheckers_c_pc_lint_GetLocList() dict
+    let config = syntastic#util#findFileInParent(g:syntastic_pc_lint_config_file, expand('%:p:h', 1))
+    call self.log('config =', config)
+
+    " -hFs1         - show filename, add space after messages, try to make message 1 line
+    " -width(0,0)   - make sure there are no line breaks
+    " -t            - set tab size
+    " -v            - turn off verbosity
+    let makeprg = self.makeprgBuild({
+        \ 'args': (filereadable(config) ? syntastic#util#shescape(fnamemodify(config, ':p')) : ''),
+        \ 'args_after': ['-hFs1', '-width(0,0)', '-t' . &tabstop, '-format=%f:%l:%C:%t:%n:%m'] })
+
+    let errorformat =
+        \ '%E%f:%l:%v:Error:%n:%m,' .
+        \ '%W%f:%l:%v:Warning:%n:%m,' .
+        \ '%I%f:%l:%v:Info:%n:%m,' .
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['cygwinRemoveCR'] })
+
+    for e in loclist
+        if e['type'] ==? 'I'
+            let e['type'] = 'W'
+            let e['subtype'] = 'Style'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'pc_lint',
+    \ 'exec': 'lint-nt'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/c/sparse.vim b/vim-plugins/bundle/syntastic/syntax_checkers/c/sparse.vim
new file mode 100644
index 0000000..ca831c0
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/c/sparse.vim
@@ -0,0 +1,48 @@
+"============================================================================
+"File:        sparse.vim
+"Description: Syntax checking plugin for syntastic.vim using sparse.pl
+"Maintainer:  Daniel Walker <dwalker at fifo99 dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_c_sparse_checker')
+    finish
+endif
+let g:loaded_syntastic_c_sparse_checker = 1
+
+if !exists('g:syntastic_sparse_config_file')
+    let g:syntastic_sparse_config_file = '.syntastic_sparse_config'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_sparse_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': syntastic#c#ReadConfig(g:syntastic_sparse_config_file),
+        \ 'args_after': '-ftabstop=' . &ts })
+
+    let errorformat =
+        \ '%f:%l:%v: %trror: %m,' .
+        \ '%f:%l:%v: %tarning: %m,'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 1] })
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'sparse'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/c/splint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/c/splint.vim
new file mode 100644
index 0000000..a4e19f0
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/c/splint.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"File:        splint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_c_splint_checker')
+    finish
+endif
+let g:loaded_syntastic_c_splint_checker = 1
+
+if !exists('g:syntastic_splint_config_file')
+    let g:syntastic_splint_config_file = '.syntastic_splint_config'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_splint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': syntastic#c#ReadConfig(g:syntastic_splint_config_file),
+        \ 'args_after': '-showfunc -hints +quiet' })
+
+    let errorformat =
+        \ '%-G%f:%l:%v: %[%#]%[%#]%[%#] Internal Bug %.%#,' .
+        \ '%-G%f(%l\,%v): %[%#]%[%#]%[%#] Internal Bug %.%#,' .
+        \ '%W%f:%l:%v: %m,' .
+        \ '%W%f(%l\,%v): %m,' .
+        \ '%W%f:%l: %m,' .
+        \ '%W%f(%l): %m,' .
+        \ '%-C %\+In file included from %.%#,' .
+        \ '%-C %\+from %.%#,' .
+        \ '%+C %.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'postprocess': ['compressWhitespace'],
+        \ 'defaults': {'type': 'W'} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'splint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/cabal/cabal.vim b/vim-plugins/bundle/syntastic/syntax_checkers/cabal/cabal.vim
new file mode 100644
index 0000000..e43aefa
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/cabal/cabal.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"File:        cabal.vim
+"Description: Haskell package description (.cabal file) linting and syntax
+"             validation via 'cabal check'
+"Maintainer: Ian D. Bollinger <ian.bollinger@gmail.com>
+"License:    This program is free software. It comes without any warranty,
+"            to the extent permitted by applicable law. You can redistribute
+"            it and/or modify it under the terms of the Do What The Fuck You
+"            Want To Public License, Version 2, as published by Sam Hocevar.
+"            See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_cabal_cabal_checker')
+    finish
+endif
+let g:loaded_syntastic_cabal_cabal_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_cabal_cabal_GetHighlightRegex(item)
+    let field = matchstr(a:item['text'], "\\vParse of field '\\zs[^']+")
+    if field !=# ''
+        return '\v\c^\s*' . field . '\s*:\s*\zs.*$'
+    endif
+    let field = matchstr(a:item['text'], "\\v(^|\\s)'\\zs[^']+\\ze'")
+    if field !=# ''
+        return '\V\c\<' . escape(field, '\') . '\>'
+    endif
+    return ''
+endfunction
+
+function! SyntaxCheckers_cabal_cabal_GetLocList() dict
+    let makeprg = self.getExecEscaped() . ' check'
+
+    let errorformat =
+        \ '%Ecabal: %f:%l: %m,' .
+        \ '%W* %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'cwd': expand('%:p:h', 1),
+        \ 'preprocess': 'cabal',
+        \ 'defaults': {'bufnr': bufnr('')} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cabal',
+    \ 'name': 'cabal'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/chef/foodcritic.vim b/vim-plugins/bundle/syntastic/syntax_checkers/chef/foodcritic.vim
new file mode 100644
index 0000000..84d9af1
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/chef/foodcritic.vim
@@ -0,0 +1,39 @@
+"============================================================================
+"File:        foodcritic.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Doug Ireton <dougireton@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_chef_foodcritic_checker')
+    finish
+endif
+let g:loaded_syntastic_chef_foodcritic_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_chef_foodcritic_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    " FC023: Prefer conditional attributes: ./recipes/config.rb:49
+    let errorformat = 'FC%n: %m: %f:%l'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'chef',
+    \ 'name': 'foodcritic'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/co/coco.vim b/vim-plugins/bundle/syntastic/syntax_checkers/co/coco.vim
new file mode 100644
index 0000000..9be5d7d
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/co/coco.vim
@@ -0,0 +1,47 @@
+"============================================================================
+"File:        co.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Andrew Kelley <superjoe30@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_co_coco_checker')
+    finish
+endif
+let g:loaded_syntastic_co_coco_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_co_coco_GetLocList() dict
+    let tmpdir = syntastic#util#tmpdir()
+    let makeprg = self.makeprgBuild({ 'args_after': '-c -o ' . tmpdir })
+
+    let errorformat =
+        \ '%EFailed at: %f,' .
+        \ '%ZSyntax%trror: %m on line %l,'.
+        \ '%EFailed at: %f,'.
+        \ '%Z%trror: Parse error on line %l: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+
+    call syntastic#util#rmrf(tmpdir)
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'co',
+    \ 'name': 'coco'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/cobol/cobc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/cobol/cobc.vim
new file mode 100644
index 0000000..0cff0cc
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/cobol/cobc.vim
@@ -0,0 +1,47 @@
+"============================================================================
+"File:        cobc.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+
+if exists('g:loaded_syntastic_cobol_cobc_checker')
+    finish
+endif
+let g:loaded_syntastic_cobol_cobc_checker = 1
+
+if !exists('g:syntastic_cobol_compiler_options')
+    let g:syntastic_cobol_compiler_options = ''
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_cobol_cobc_IsAvailable() dict
+    if !exists('g:syntastic_cobol_compiler')
+        let g:syntastic_cobol_compiler = self.getExec()
+    endif
+    call self.log('g:syntastic_cobol_compiler =', g:syntastic_cobol_compiler)
+    return executable(expand(g:syntastic_cobol_compiler, 1))
+endfunction
+
+function! SyntaxCheckers_cobol_cobc_GetLocList() dict
+    return syntastic#c#GetLocList('cobol', 'cobc', {
+        \ 'errorformat': '%f:%l: %trror: %m',
+        \ 'main_flags': '-fsyntax-only' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cobol',
+    \ 'name': 'cobc' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/coffee/coffee.vim b/vim-plugins/bundle/syntastic/syntax_checkers/coffee/coffee.vim
new file mode 100644
index 0000000..3b521fc
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/coffee/coffee.vim
@@ -0,0 +1,58 @@
+"============================================================================
+"File:        coffee.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Lincoln Stoll <l@lds.li>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+"
+" Note: this script requires CoffeeScript version 1.6.2 or newer.
+"
+
+if exists('g:loaded_syntastic_coffee_coffee_checker')
+    finish
+endif
+let g:loaded_syntastic_coffee_coffee_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_coffee_coffee_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    let ver = self.getVersion(self.getExecEscaped() . ' --version 2>' . syntastic#util#DevNull())
+    return syntastic#util#versionIsAtLeast(ver, [1, 6, 2])
+endfunction
+
+function! SyntaxCheckers_coffee_coffee_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-cp' })
+
+    let errorformat =
+        \ '%E%f:%l:%c: %trror: %m,' .
+        \ 'Syntax%trror: In %f\, %m on line %l,' .
+        \ '%EError: In %f\, Parse error on line %l: %m,' .
+        \ '%EError: In %f\, %m on line %l,' .
+        \ '%W%f(%l): lint warning: %m,' .
+        \ '%W%f(%l): warning: %m,' .
+        \ '%E%f(%l): SyntaxError: %m,' .
+        \ '%-Z%p^,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'coffee',
+    \ 'name': 'coffee'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/coffee/coffeelint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/coffee/coffeelint.vim
new file mode 100644
index 0000000..befdbc8
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/coffee/coffeelint.vim
@@ -0,0 +1,44 @@
+"============================================================================
+"File:        coffeelint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Lincoln Stoll <l@lds.li>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_coffee_coffeelint_checker')
+    finish
+endif
+let g:loaded_syntastic_coffee_coffeelint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_coffee_coffeelint_GetLocList() dict
+    if !exists('s:coffeelint_new')
+        let s:coffeelint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [1, 4])
+    endif
+    let makeprg = self.makeprgBuild({ 'args_after': (s:coffeelint_new ? '--reporter csv' : '--csv') })
+
+    let errorformat = '%f:%l:%t:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1],
+        \ 'preprocess': 'coffeelint' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'coffee',
+    \ 'name': 'coffeelint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/coq/coqtop.vim b/vim-plugins/bundle/syntastic/syntax_checkers/coq/coqtop.vim
new file mode 100644
index 0000000..6385554
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/coq/coqtop.vim
@@ -0,0 +1,40 @@
+"============================================================================
+"File:        coqtop.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Matvey Aksenov <matvey.aksenov at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_coq_coqtop_checker')
+    finish
+endif
+let g:loaded_syntastic_coq_coqtop_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_coq_coqtop_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-noglob -batch -load-vernac-source' })
+
+    let errorformat =
+        \ '%AFile "%f"\, line %l\, characters %c-%.%#\:,'.
+        \ '%C%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'coq',
+    \ 'name': 'coqtop'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/cpp/avrgcc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/avrgcc.vim
new file mode 100644
index 0000000..cc48b74
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/avrgcc.vim
@@ -0,0 +1,24 @@
+"============================================================================
+"File:        avrgcc.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  SÅ‚awek Piotrowski <sentinel at atteo dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_cpp_avrgcc_checker')
+    finish
+endif
+let g:loaded_syntastic_cpp_avrgcc_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'avrgcc',
+    \ 'exec': 'avr-g++',
+    \ 'redirect': 'c/avrgcc'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/cpp/clang_check.vim b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/clang_check.vim
new file mode 100644
index 0000000..cf9ec0c
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/clang_check.vim
@@ -0,0 +1,22 @@
+"============================================================================
+"File:        clang_check.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Benjamin Bannier <bbannier at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_cpp_clang_check_checker')
+    finish
+endif
+let g:loaded_syntastic_cpp_clang_check_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'clang_check',
+    \ 'redirect': 'c/clang_check'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/cpp/clang_tidy.vim b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/clang_tidy.vim
new file mode 100644
index 0000000..770d1f6
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/clang_tidy.vim
@@ -0,0 +1,22 @@
+"============================================================================
+"File:        clang_tidy.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Benjamin Bannier <bbannier at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_cpp_clang_tidy_checker')
+    finish
+endif
+let g:loaded_syntastic_cpp_clang_tidy_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'clang_tidy',
+    \ 'redirect': 'c/clang_tidy'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/cpp/cppcheck.vim b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/cppcheck.vim
new file mode 100644
index 0000000..4e0eb86
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/cppcheck.vim
@@ -0,0 +1,22 @@
+"============================================================================
+"File:        cppcheck.vim
+"Description: Syntax checking plugin for syntastic.vim using cppcheck.pl
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_cpp_cppcheck_checker')
+    finish
+endif
+let g:loaded_syntastic_cpp_cppcheck_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'cppcheck',
+    \ 'redirect': 'c/cppcheck'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/cpp/cpplint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/cpplint.vim
new file mode 100644
index 0000000..54984bb
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/cpplint.vim
@@ -0,0 +1,52 @@
+"============================================================================
+"File:        cpplint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_cpp_cpplint_checker')
+    finish
+endif
+let g:loaded_syntastic_cpp_cpplint_checker = 1
+
+if !exists('g:syntastic_cpp_cpplint_thres')
+    let g:syntastic_cpp_cpplint_thres = 5
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_cpp_cpplint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args': '--verbose=3' })
+
+    let errorformat = '%A%f:%l:  %m [%t],%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1] })
+
+    " change error types according to the prescribed threshold
+    for e in loclist
+        let e['type'] = e['type'] < g:syntastic_cpp_cpplint_thres ? 'W' : 'E'
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'cpplint',
+    \ 'exec': 'cpplint.py'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/cpp/gcc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/gcc.vim
new file mode 100644
index 0000000..1243980
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/gcc.vim
@@ -0,0 +1,56 @@
+"============================================================================
+"File:        cpp.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_cpp_gcc_checker')
+    finish
+endif
+let g:loaded_syntastic_cpp_gcc_checker = 1
+
+if !exists('g:syntastic_cpp_compiler_options')
+    let g:syntastic_cpp_compiler_options = ''
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_cpp_gcc_IsAvailable() dict
+    if !exists('g:syntastic_cpp_compiler')
+        let g:syntastic_cpp_compiler = executable(self.getExec()) ? self.getExec() : 'clang++'
+    endif
+    call self.log('g:syntastic_cpp_compiler =', g:syntastic_cpp_compiler)
+    return executable(expand(g:syntastic_cpp_compiler, 1))
+endfunction
+
+function! SyntaxCheckers_cpp_gcc_GetLocList() dict
+    return syntastic#c#GetLocList('cpp', 'gcc', {
+        \ 'errorformat':
+        \     '%-G%f:%s:,' .
+        \     '%f:%l:%c: %trror: %m,' .
+        \     '%f:%l:%c: %tarning: %m,' .
+        \     '%f:%l:%c: %m,'.
+        \     '%f:%l: %trror: %m,'.
+        \     '%f:%l: %tarning: %m,'.
+        \     '%f:%l: %m',
+        \ 'main_flags': '-x c++ -fsyntax-only',
+        \ 'header_flags': '-x c++',
+        \ 'header_names': '\m\.\(h\|hpp\|hh\)$' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'gcc',
+    \ 'exec': 'g++' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/cpp/oclint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/oclint.vim
new file mode 100644
index 0000000..8217769
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/oclint.vim
@@ -0,0 +1,22 @@
+"============================================================================
+"File:        oclint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  "UnCO" Lin <undercooled aT lavabit com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_cpp_oclint_checker')
+    finish
+endif
+let g:loaded_syntastic_cpp_oclint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'oclint',
+    \ 'redirect': 'c/oclint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/cpp/pc_lint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/pc_lint.vim
new file mode 100644
index 0000000..a7c95e8
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/pc_lint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        pc_lint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Steve Bragg <steve at empresseffects dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_cpp_pc_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_cpp_pc_lint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'pc_lint',
+    \ 'redirect': 'c/pc_lint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/cpp/verapp.vim b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/verapp.vim
new file mode 100644
index 0000000..af1fd8c
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/cpp/verapp.vim
@@ -0,0 +1,48 @@
+"============================================================================
+"File:        verapp.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Lucas Verney <phyks@phyks.me>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+" Tested with Vera++ 1.3.0
+"============================================================================
+
+if exists('g:loaded_syntastic_cpp_verapp_checker')
+    finish
+endif
+let g:loaded_syntastic_cpp_verapp_checker = 1
+
+if !exists('g:syntastic_verapp_config_file')
+    let g:syntastic_verapp_config_file = '.syntastic_verapp_config'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_cpp_verapp_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': syntastic#c#ReadConfig(g:syntastic_verapp_config_file),
+        \ 'args_after': '--show-rule --no-duplicate -S -c -' })
+
+    let errorformat = '%f:%t:%l:%c:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'checkstyle',
+        \ 'subtype': 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'verapp',
+    \ 'exec': 'vera++'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/cs/mcs.vim b/vim-plugins/bundle/syntastic/syntax_checkers/cs/mcs.vim
new file mode 100644
index 0000000..4544a93
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/cs/mcs.vim
@@ -0,0 +1,39 @@
+"============================================================================
+"File:        cs.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Daniel Walker <dwalker@fifo99.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_cs_mcs_checker')
+    finish
+endif
+let g:loaded_syntastic_cs_mcs_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_cs_mcs_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '--parse' })
+
+    let errorformat = '%f(%l\,%c): %trror %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cs',
+    \ 'name': 'mcs'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/css/csslint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/css/csslint.vim
new file mode 100644
index 0000000..2d3702b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/css/csslint.vim
@@ -0,0 +1,47 @@
+"============================================================================
+"File:        css.vim
+"Description: Syntax checking plugin for syntastic.vim using `csslint` CLI tool (http://csslint.net).
+"Maintainer:  Ory Band <oryband at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_css_csslint_checker')
+    finish
+endif
+let g:loaded_syntastic_css_csslint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_css_csslint_GetLocList() dict
+    call syntastic#log#deprecationWarn('csslint_options', 'css_csslint_args')
+
+    let makeprg = self.makeprgBuild({ 'args_after': '--format=compact' })
+
+    " Print CSS Lint's error/warning messages from compact format. Ignores blank lines.
+    let errorformat =
+        \ '%-G,' .
+        \ '%-G%f: lint free!,' .
+        \ '%f: line %l\, col %c\, %trror - %m,' .
+        \ '%f: line %l\, col %c\, %tarning - %m,'.
+        \ '%f: line %l\, col %c\, %m,'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')} })
+
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'css',
+    \ 'name': 'csslint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/css/mixedindentlint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/css/mixedindentlint.vim
new file mode 100644
index 0000000..a0ce3ba
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/css/mixedindentlint.vim
@@ -0,0 +1,22 @@
+"============================================================================
+"File:        mixedindentlint.vim
+"Description: Mixed indentation linter for vim
+"Maintainer:  Payton Swick <payton@foolord.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_css_mixedindentlint_checker')
+    finish
+endif
+let g:loaded_syntastic_css_mixedindentlint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'css',
+    \ 'name': 'mixedindentlint',
+    \ 'redirect': 'javascript/mixedindentlint'})
+
+" vim: set et sts=4 sw=4:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/css/phpcs.vim b/vim-plugins/bundle/syntastic/syntax_checkers/css/phpcs.vim
new file mode 100644
index 0000000..a065f0e
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/css/phpcs.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        phpcs.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_css_phpcs_checker')
+    finish
+endif
+let g:loaded_syntastic_css_phpcs_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'css',
+    \ 'name': 'phpcs',
+    \ 'redirect': 'php/phpcs'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/css/prettycss.vim b/vim-plugins/bundle/syntastic/syntax_checkers/css/prettycss.vim
new file mode 100644
index 0000000..b531f49
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/css/prettycss.vim
@@ -0,0 +1,61 @@
+"============================================================================
+"File:        prettycss.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_css_prettycss_checker')
+    finish
+endif
+let g:loaded_syntastic_css_prettycss_checker = 1
+
+if !exists('g:syntastic_css_prettycss_sort')
+    let g:syntastic_css_prettycss_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_css_prettycss_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\m (\zs[^)]\+\ze)$')
+    if term !=# ''
+        let term = '\V' . escape(term, '\')
+    endif
+    return term
+endfunction
+
+function! SyntaxCheckers_css_prettycss_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    " Print CSS Lint's error/warning messages from compact format. Ignores blank lines.
+    let errorformat =
+        \ '%EError:  %m\, line %l\, char %c),' .
+        \ '%WWarning:  %m\, line %l\, char %c),' .
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')} })
+
+    for e in loclist
+        let e['text'] .= ')'
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'css',
+    \ 'name': 'prettycss'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/css/recess.vim b/vim-plugins/bundle/syntastic/syntax_checkers/css/recess.vim
new file mode 100644
index 0000000..ce6d5ae
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/css/recess.vim
@@ -0,0 +1,24 @@
+"============================================================================
+"File:        recess.vim
+"Description: Syntax checking plugin for syntastic.vim using `recess`
+"             (http://twitter.github.io/recess/).
+"Maintainer:  Tim Carry <tim at pixelastic dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_css_recess_checker')
+    finish
+endif
+let g:loaded_syntastic_css_recess_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'css',
+    \ 'name': 'recess',
+    \ 'redirect': 'less/recess'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/css/stylelint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/css/stylelint.vim
new file mode 100644
index 0000000..58c7dec
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/css/stylelint.vim
@@ -0,0 +1,47 @@
+"============================================================================
+"File:        stylelint.vim
+"Description: Syntax checking plugin for syntastic.vim using `stylelint`
+"             (https://github.com/stylelint/stylelint).
+"Maintainer:  Tim Carry <tim at pixelastic dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_css_stylelint_checker')
+    finish
+endif
+let g:loaded_syntastic_css_stylelint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:args_after = {
+    \ 'css':  '-f json',
+    \ 'scss': '-f json -s scss' }
+
+function! SyntaxCheckers_css_stylelint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': get(s:args_after, self.getFiletype(), '') })
+
+    let errorformat = '%t:%f:%l:%c:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'preprocess': 'stylelint',
+        \ 'returns': [0, 1, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'css',
+    \ 'name': 'stylelint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
+
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/cucumber/cucumber.vim b/vim-plugins/bundle/syntastic/syntax_checkers/cucumber/cucumber.vim
new file mode 100644
index 0000000..8a48690
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/cucumber/cucumber.vim
@@ -0,0 +1,42 @@
+"============================================================================
+"File:        cucumber.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_cucumber_cucumber_checker')
+    finish
+endif
+let g:loaded_syntastic_cucumber_cucumber_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_cucumber_cucumber_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '--dry-run --quiet --strict --format pretty' })
+
+    let errorformat =
+        \ '%f:%l:%c:%m,' .
+        \ '%W      %.%# (%m),' .
+        \ '%-Z%f:%l:%.%#,'.
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cucumber',
+    \ 'name': 'cucumber'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/cuda/nvcc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/cuda/nvcc.vim
new file mode 100644
index 0000000..3476039
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/cuda/nvcc.vim
@@ -0,0 +1,81 @@
+"============================================================================
+"File:        cuda.vim
+"Description: Syntax checking plugin for syntastic
+"Author:      Hannes Schulz <schulz at ais dot uni-bonn dot de>
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_cuda_nvcc_checker')
+    finish
+endif
+let g:loaded_syntastic_cuda_nvcc_checker = 1
+
+if !exists('g:syntastic_cuda_config_file')
+    let g:syntastic_cuda_config_file = '.syntastic_cuda_config'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_cuda_nvcc_GetLocList() dict
+    let arch_flag = syntastic#util#var('cuda_arch')
+    if arch_flag !=# ''
+        let arch_flag = '-arch=' . arch_flag
+        call syntastic#log#oneTimeWarn('variable g:syntastic_cuda_arch is deprecated, ' .
+            \ 'please add ' . string(arch_flag) . ' to g:syntastic_cuda_nvcc_args instead')
+    endif
+
+    let build_opts = {}
+    let dummy = ''
+    if index(['h', 'hpp', 'cuh'], expand('%:e', 1), 0, 1) >= 0
+        if syntastic#util#var('cuda_check_header', 0)
+            let dummy = expand('%:p:h', 1) . syntastic#util#Slash() . '.syntastic_dummy.cu'
+            let build_opts = {
+                \ 'exe_before': 'echo > ' . syntastic#util#shescape(dummy) . ' ;',
+                \ 'fname_before': '.syntastic_dummy.cu -include' }
+        else
+            return []
+        endif
+    endif
+
+    call extend(build_opts, {
+        \ 'args_before': arch_flag . ' --cuda -O0 -I .',
+        \ 'args': syntastic#c#ReadConfig(g:syntastic_cuda_config_file),
+        \ 'args_after': '-Xcompiler -fsyntax-only',
+        \ 'tail_after': syntastic#c#NullOutput() })
+
+    let makeprg = self.makeprgBuild(build_opts)
+
+    let errorformat =
+        \ '%*[^"]"%f"%*\D%l: %m,'.
+        \ '"%f"%*\D%l: %m,'.
+        \ '%-G%f:%l: (Each undeclared identifier is reported only once,'.
+        \ '%-G%f:%l: for each function it appears in.),'.
+        \ '%f:%l:%c:%m,'.
+        \ '%f(%l):%m,'.
+        \ '%f:%l:%m,'.
+        \ '"%f"\, line %l%*\D%c%*[^ ] %m,'.
+        \ '%D%*\a[%*\d]: Entering directory `%f'','.
+        \ '%X%*\a[%*\d]: Leaving directory `%f'','.
+        \ '%D%*\a: Entering directory `%f'','.
+        \ '%X%*\a: Leaving directory `%f'','.
+        \ '%DMaking %*\a in %f,'.
+        \ '%f|%l| %m'
+
+    let loclist = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
+
+    if dummy !=# ''
+        call delete(dummy)
+    endif
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cuda',
+    \ 'name': 'nvcc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/d/dmd.vim b/vim-plugins/bundle/syntastic/syntax_checkers/d/dmd.vim
new file mode 100644
index 0000000..8897995
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/d/dmd.vim
@@ -0,0 +1,132 @@
+"============================================================================
+"File:        d.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Alfredo Di Napoli <alfredo dot dinapoli at gmail dot com>
+"License:     Based on the original work of Gregor Uhlenheuer and his
+"             cpp.vim checker so credits are dued.
+"             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_syntastic_d_dmd_checker')
+    finish
+endif
+let g:loaded_syntastic_d_dmd_checker = 1
+
+if !exists('g:syntastic_d_compiler_options')
+    let g:syntastic_d_compiler_options = ''
+endif
+
+if !exists('g:syntastic_d_use_dub')
+    let g:syntastic_d_use_dub = 1
+endif
+
+if !exists('g:syntastic_d_dub_exec')
+    let g:syntastic_d_dub_exec = 'dub'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_d_dmd_IsAvailable() dict " {{{1
+    if !exists('g:syntastic_d_compiler')
+        let g:syntastic_d_compiler = self.getExec()
+    endif
+    call self.log('g:syntastic_d_compiler =', g:syntastic_d_compiler)
+    return executable(expand(g:syntastic_d_compiler, 1))
+endfunction " }}}1
+
+function! SyntaxCheckers_d_dmd_GetLocList() dict " {{{1
+    if !exists('g:syntastic_d_include_dirs')
+        let g:syntastic_d_include_dirs = s:GetIncludes(self, expand('%:p:h'))
+    endif
+
+    return syntastic#c#GetLocList('d', 'dmd', {
+        \ 'errorformat':
+        \     '%-G%f:%s:,%f(%l): %m,' .
+        \     '%f:%l: %m',
+        \ 'main_flags': '-c -of' . syntastic#util#DevNull(),
+        \ 'header_names': '\m\.di$' })
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:GetIncludes(checker, base) " {{{2
+    let includes = []
+
+    if g:syntastic_d_use_dub && !exists('s:dub_ok')
+        let s:dub_ok = s:ValidateDub(a:checker)
+    endif
+
+    if g:syntastic_d_use_dub && s:dub_ok
+        let where = escape(a:base, ' ') . ';'
+
+        let old_suffixesadd = &suffixesadd
+        let dirs = syntastic#util#unique(map(filter(
+            \   findfile('dub.json', where, -1) +
+            \   findfile('dub.sdl', where, -1) +
+            \   findfile('package.json', where, -1),
+            \ 'filereadable(v:val)'), 'fnamemodify(v:val, ":h")'))
+        let &suffixesadd = old_suffixesadd
+        call a:checker.log('using dub: looking for includes in', dirs)
+
+        for dir in dirs
+            try
+                execute 'silent lcd ' . fnameescape(dir)
+                let paths = split(syntastic#util#system(syntastic#util#shescape(g:syntastic_d_dub_exec) . ' describe --import-paths'), "\n")
+                silent lcd -
+                if v:shell_error == 0
+                    call extend(includes, paths)
+                    call a:checker.log('using dub: found includes', paths)
+                endif
+            catch /\m^Vim\%((\a\+)\)\=:E472/
+                " evil directory is evil
+            endtry
+        endfor
+    endif
+
+    if empty(includes)
+        let includes = filter(glob($HOME . '/.dub/packages/*', 1, 1), 'isdirectory(v:val)')
+        call map(includes, 'isdirectory(v:val . "/source") ? v:val . "/source" : v:val')
+        call add(includes, './source')
+    endif
+
+    return syntastic#util#unique(includes)
+endfunction " }}}2
+
+function! s:ValidateDub(checker) " {{{2
+    let ok = 0
+
+    if executable(g:syntastic_d_dub_exec)
+        let command = syntastic#util#shescape(g:syntastic_d_dub_exec) . ' --version'
+        let version_output = syntastic#util#system(command)
+        call a:checker.log('getVersion: ' . string(command) . ': ' .
+            \ string(split(version_output, "\n", 1)) .
+            \ (v:shell_error ? ' (exit code ' . v:shell_error . ')' : '') )
+        let parsed_ver = syntastic#util#parseVersion(version_output)
+        call a:checker.log(g:syntastic_d_dub_exec . ' version =', parsed_ver)
+        if len(parsed_ver)
+            let ok =  syntastic#util#versionIsAtLeast(parsed_ver, [0, 9, 24])
+        endif
+    endif
+
+    return ok
+endfunction " }}}2
+
+" }}}1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'd',
+    \ 'name': 'dmd' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/dart/dartanalyzer.vim b/vim-plugins/bundle/syntastic/syntax_checkers/dart/dartanalyzer.vim
new file mode 100644
index 0000000..63b8267
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/dart/dartanalyzer.vim
@@ -0,0 +1,76 @@
+"============================================================================
+"File:        dartanalyzer.vim
+"Description: Dart syntax checker - using dartanalyzer
+"Maintainer:  Maksim Ryzhikov <rv.maksim at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_dart_dartanalyzer_checker')
+    finish
+endif
+let g:loaded_syntastic_dart_dartanalyzer_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_dart_dartanalyzer_GetHighlightRegex(error)
+    if a:error['len']
+        let lcol = a:error['col'] - 1
+        let rcol = a:error['col'] + a:error['len']
+        let ret = '\%>' . lcol . 'c\%<' . rcol . 'c'
+    else
+        let ret = ''
+    endif
+
+    return ret
+endfunction
+
+function! SyntaxCheckers_dart_dartanalyzer_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '--machine' })
+
+    " Machine readable format looks like:
+    " SEVERITY|TYPE|ERROR_CODE|FILENAME|LINE_NUMBER|COLUMN|LENGTH|MESSAGE
+    " SEVERITY: (WARNING|ERROR)
+    " TYPE: (RESOLVER|STATIC_TYPE|...)
+    " ERROR_CODE: (NO_SUCH_TYPE|...)
+    " FILENAME: String
+    " LINE_NUMBER: int
+    " COLUMN: int
+    " LENGTH: int
+    " MESSAGE: String
+
+    " We use %n to grab the error length, for the syntax highlighter
+    let commonformat = '|%.%#|%.%#|%f|%l|%c|%n|%m'
+
+    let errorformat =
+        \ '%EERROR'   . commonformat . ',' .
+        \ '%WWARNING' . commonformat
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1, 2, 3] })
+
+    for e in loclist
+        let e['text'] = substitute(e['text'], '\m\\\([\\|]\)', '\1', 'g')
+
+        " Undo the %n hack
+        let e['len'] = e['nr']
+        call remove(e, 'nr')
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'dart',
+    \ 'name': 'dartanalyzer' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/docbk/igor.vim b/vim-plugins/bundle/syntastic/syntax_checkers/docbk/igor.vim
new file mode 100644
index 0000000..5448861
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/docbk/igor.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"File:        igor.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_docbk_igor_checker')
+    finish
+endif
+let g:loaded_syntastic_docbk_igor_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_docbk_igor_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l:%m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': { 'type': 'W' },
+        \ 'subtype': 'Style',
+        \ 'returns': [0] })
+
+    let buf = bufnr('')
+    for e in loclist
+        " XXX: igor strips directories from filenames
+        let e['bufnr'] = buf
+
+        let e['hl'] = '\V' . escape( substitute(e['text'], '\m[^:]*:', '', ''), '\' )
+        let e['hl'] = substitute(e['hl'], '\V[', '\\zs', 'g')
+        let e['hl'] = substitute(e['hl'], '\V]', '\\ze', 'g')
+
+        " let e['text'] = substitute(e['text'], '\m:.*$', '', '')
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'docbk',
+    \ 'name': 'igor'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/docbk/xmllint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/docbk/xmllint.vim
new file mode 100644
index 0000000..30d66d2
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/docbk/xmllint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        docbk.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_docbk_xmllint_checker')
+    finish
+endif
+let g:loaded_syntastic_docbk_xmllint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'docbk',
+    \ 'name': 'xmllint',
+    \ 'redirect': 'xml/xmllint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/dockerfile/dockerfile_lint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/dockerfile/dockerfile_lint.vim
new file mode 100644
index 0000000..4858a6b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/dockerfile/dockerfile_lint.vim
@@ -0,0 +1,53 @@
+"============================================================================
+"File:        dockerfile_lint.vim
+"Description: Syntax checking plugin for syntastic.vim using dockerfile-lint
+"             (https://github.com/projectatomic/dockerfile_lint).
+"Maintainer:  Tim Carry <tim at pixelastic dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_dockerfile_dockerfile_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_dockerfile_dockerfile_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_dockerfile_dockerfile_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-j',
+        \ 'fname_before': '-f' })
+
+    let errorformat = '%t:%n:%l:%m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'dockerfile_lint',
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 1] })
+
+    for e in loclist
+        if e['nr']
+            let e['subtype'] = 'Style'
+        endif
+        call remove(e, 'nr')
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'dockerfile',
+    \ 'name': 'dockerfile_lint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/dustjs/swiffer.vim b/vim-plugins/bundle/syntastic/syntax_checkers/dustjs/swiffer.vim
new file mode 100644
index 0000000..8edf1d5
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/dustjs/swiffer.vim
@@ -0,0 +1,38 @@
+"============================================================================
+"File:        swiffer.vim
+"Description: Dust.js syntax checker - using swiffer
+"Maintainer:  Steven Foote <smfoote at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_dustjs_swiffer_checker')
+    finish
+endif
+
+let g:loaded_syntastic_dustjs_swiffer_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_dustjs_swiffer_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%E%f - Line %l\, Column %c: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+ endfunction
+
+call SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'dustjs',
+    \ 'name': 'swiffer'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/elixir/elixir.vim b/vim-plugins/bundle/syntastic/syntax_checkers/elixir/elixir.vim
new file mode 100644
index 0000000..f2ffe67
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/elixir/elixir.vim
@@ -0,0 +1,56 @@
+"============================================================================
+"File:        elixir.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Richard Ramsden <rramsden at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_elixir_elixir_checker')
+    finish
+endif
+let g:loaded_syntastic_elixir_elixir_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" TODO: we should probably split this into separate checkers
+function! SyntaxCheckers_elixir_elixir_IsAvailable() dict
+    call self.log(
+        \ 'executable("elixir") = ' . executable('elixir') . ', ' .
+        \ 'executable("mix") = ' . executable('mix'))
+    return executable('elixir') && executable('mix')
+endfunction
+
+function! SyntaxCheckers_elixir_elixir_GetLocList() dict
+    let make_options = {}
+    let compile_command = 'elixir'
+    let mix_file = syntastic#util#findFileInParent('mix.exs', expand('%:p:h', 1))
+
+    if filereadable(mix_file)
+        let compile_command = 'mix compile'
+        let make_options['cwd'] = fnamemodify(mix_file, ':p:h')
+    endif
+
+    let make_options['makeprg'] = self.makeprgBuild({ 'exe': compile_command })
+
+    let make_options['errorformat'] =
+        \ '%E** %*[^\ ] %f:%l: %m,' .
+        \ '%W%f:%l: warning: %m'
+
+    return SyntasticMake(make_options)
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'elixir',
+    \ 'name': 'elixir',
+    \ 'enable': 'enable_elixir_checker'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/erlang/erlang_check_file.erl b/vim-plugins/bundle/syntastic/syntax_checkers/erlang/erlang_check_file.erl
new file mode 100755
index 0000000..730e600
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/erlang/erlang_check_file.erl
@@ -0,0 +1,95 @@
+#!/usr/bin/env escript
+
+main([File]) ->
+    Dir = get_root(filename:dirname(File)),
+    Defs = [strong_validation,
+            warn_export_all,
+            warn_export_vars,
+            warn_shadow_vars,
+            warn_obsolete_guard,
+            warn_unused_import,
+            report,
+            {i, Dir ++ "/include"}],
+    %% `rebar.config` is looked for,
+    %% but it is not necessarily the one in the project root.
+    %% I.e. it may be one deeper in the project file hierarchy.
+    RebarFile = rebar_file(Dir),
+    %% `rebar.config` might contain relative paths.
+    %% They are relative to the file! Not to the project root.
+    RebarOpts = rebar_opts(Dir ++ "/" ++ RebarFile),
+    code:add_patha(filename:absname("ebin")),
+    %% `compile:file/2` requires the `{i, Path}` to be relative
+    %% to CWD - no surprise here.
+    compile:file(File, Defs ++ translate_paths(Dir, RebarOpts));
+
+main(_) ->
+    io:format("Usage: ~s <file>~n", [escript:script_name()]),
+    halt(1).
+
+rebar_file(Dir) ->
+    DirList = filename:split(Dir),
+    case lists:last(DirList) of
+        "test" ->
+            "rebar.test.config";
+        _ ->
+            "rebar.config"
+    end.
+
+rebar_opts(RebarFile) ->
+    Dir = get_root(filename:dirname(RebarFile)),
+    case file:consult(RebarFile) of
+        {ok, Terms} ->
+            RebarLibDirs = proplists:get_value(lib_dirs, Terms, []),
+            lists:foreach(
+                fun(LibDir) ->
+                        code:add_pathsa(filelib:wildcard(LibDir ++ "/*/ebin"))
+                end, RebarLibDirs),
+            RebarDepsDir = proplists:get_value(deps_dir, Terms, "deps"),
+            code:add_pathsa(filelib:wildcard(RebarDepsDir ++ "/*/ebin")),
+            IncludeDeps = {i, filename:join(Dir, RebarDepsDir)},
+            proplists:get_value(erl_opts, Terms, []) ++ [IncludeDeps];
+        {error, _} when RebarFile == "rebar.config" ->
+          fallback_opts();
+        {error, _} ->
+            rebar_opts("rebar.config")
+    end.
+
+fallback_opts() ->
+    code:add_pathsa(filelib:wildcard("deps/*/ebin")),
+    code:add_pathsa(nested_app_ebins()),
+    [
+     { i, filename:absname("apps") }, { i, filename:absname("deps") } | [ { i, filename:absname(Path) } || Path <- filelib:wildcard("deps/*/apps")]
+    ].
+
+nested_app_ebins() ->
+    DetectedAppSrcFiles = filelib:wildcard("deps/*/apps/**/*.app.src"),
+    [apps_dir_from_src(AppSrcFile)||AppSrcFile<-DetectedAppSrcFiles].
+
+apps_dir_from_src(SrcFile) ->
+    SrcDir = filename:dirname(SrcFile),
+    filename:join(SrcDir, "../../ebin").
+
+get_root(Dir) ->
+    Path = filename:split(filename:absname(Dir)),
+    filename:join(get_root(lists:reverse(Path), Path)).
+
+get_root([], Path) ->
+    Path;
+get_root(["src" | Tail], _Path) ->
+    lists:reverse(Tail);
+get_root(["test" | Tail], _Path) ->
+    lists:reverse(Tail);
+get_root([_ | Tail], Path) ->
+    get_root(Tail, Path).
+
+translate_paths(Dir, RebarOpts) ->
+    [ translate_path(Dir, Opt) || Opt <- RebarOpts ].
+
+translate_path(Dir, {i, Path}) ->
+    case Path of
+        %% absolute
+        "/" ++ _ -> {i, Path};
+        %% relative -> make absolute taking rebar.config location into account
+        _ -> {i, filename:join([Dir, Path])}
+    end;
+translate_path(_, Other) -> Other.
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/erlang/escript.vim b/vim-plugins/bundle/syntastic/syntax_checkers/erlang/escript.vim
new file mode 100644
index 0000000..9fd869f
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/erlang/escript.vim
@@ -0,0 +1,61 @@
+"============================================================================
+"File:        erlang.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Pawel Salata <rockplayer.pl at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_erlang_erlang_checker')
+    finish
+endif
+let g:loaded_syntastic_erlang_erlang_checker = 1
+
+if !exists('g:syntastic_erlc_include_path')
+    let g:syntastic_erlc_include_path = ''
+endif
+
+let s:check_file = syntastic#util#shescape(expand('<sfile>:p:h', 1) . syntastic#util#Slash() . 'erlang_check_file.erl')
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_erlang_escript_GetLocList() dict
+    if expand('%:e', 1) ==# 'hrl'
+        return []
+    endif
+
+    let shebang = syntastic#util#parseShebang()
+    if shebang['exe'] ==# 'escript'
+        let args = '-s'
+        let post_args = ''
+    else
+        let args = s:check_file
+        let post_args = g:syntastic_erlc_include_path
+    endif
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': args,
+        \ 'fname': syntastic#util#shexpand('%:p'),
+        \ 'post_args_after': post_args })
+
+    let errorformat =
+        \ '%W%f:%l: warning: %m,'.
+        \ '%E%f:%l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'erlang',
+    \ 'name': 'escript'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/erlang/syntaxerl.vim b/vim-plugins/bundle/syntastic/syntax_checkers/erlang/syntaxerl.vim
new file mode 100644
index 0000000..45f4735
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/erlang/syntaxerl.vim
@@ -0,0 +1,42 @@
+"============================================================================
+"File:        syntaxerl.vim
+"Description: Syntax checking plugin for syntastic.
+"Maintainer:  locojay
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_erlang_syntaxerl_checker')
+    finish
+endif
+
+let g:loaded_syntastic_erlang_syntaxerl_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+function! SyntaxCheckers_erlang_syntaxerl_GetLocList() dict
+
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%W%f:%l: warning: %m,'.
+        \ '%E%f:%l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'erlang',
+    \ 'name': 'syntaxerl'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/eruby/ruby.vim b/vim-plugins/bundle/syntastic/syntax_checkers/eruby/ruby.vim
new file mode 100644
index 0000000..16eed62
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/eruby/ruby.vim
@@ -0,0 +1,82 @@
+"============================================================================
+"File:        ruby.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_eruby_ruby_checker')
+    finish
+endif
+let g:loaded_syntastic_eruby_ruby_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_eruby_ruby_IsAvailable() dict
+    if !exists('g:syntastic_eruby_ruby_exec') && exists('g:syntastic_ruby_exec')
+        let g:syntastic_eruby_ruby_exec = g:syntastic_ruby_exec
+        call self.log('g:syntastic_eruby_ruby_exec =', g:syntastic_eruby_ruby_exec)
+    endif
+    return executable(self.getExec())
+endfunction
+
+function! SyntaxCheckers_eruby_ruby_GetLocList() dict
+    if !exists('s:ruby_new')
+        let s:ruby_new = syntastic#util#versionIsAtLeast(self.getVersion(), [1, 9])
+    endif
+
+    let fname = "'" . escape(expand('%', 1), "\\'") . "'"
+
+    " TODO: encodings became useful in ruby 1.9 :)
+    if s:ruby_new
+        let enc = &fileencoding !=# '' ? &fileencoding : &encoding
+        let encoding_spec = ', :encoding => "' . (enc ==? 'utf-8' ? 'UTF-8' : 'BINARY') . '"'
+    else
+        let encoding_spec = ''
+    endif
+
+    "gsub fixes issue #7, rails has it's own eruby syntax
+    let makeprg =
+        \ self.getExecEscaped() . ' -rerb -e ' .
+        \ syntastic#util#shescape('puts ERB.new(File.read(' .
+        \     fname . encoding_spec .
+        \     ').gsub(''<%='',''<%''), nil, ''-'').src') .
+        \ ' | ' . self.getExecEscaped() . ' -w -c'
+
+    let errorformat = '%-G%\m%.%#warning: %\%%(possibly %\)%\?useless use of a literal in void context,'
+
+    " filter out lines starting with ...
+    " long lines are truncated and wrapped in ... %p then returns the wrong
+    " column offset
+    let errorformat .= '%-G%\%.%\%.%\%.%.%#,'
+
+    let errorformat .=
+        \ '%-GSyntax OK,'.
+        \ '%E-:%l: syntax error\, %m,%Z%p^,'.
+        \ '%W-:%l: warning: %m,'.
+        \ '%Z%p^,'.
+        \ '%-C%.%#'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'RUBYOPT': '' }
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'defaults': { 'bufnr': bufnr(''), 'vcol': 1 } })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'eruby',
+    \ 'name': 'ruby'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/fortran/gfortran.vim b/vim-plugins/bundle/syntastic/syntax_checkers/fortran/gfortran.vim
new file mode 100644
index 0000000..fffaf30
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/fortran/gfortran.vim
@@ -0,0 +1,99 @@
+"============================================================================
+"File:        fortran.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Karl Yngve Lervåg <karl.yngve@lervag.net>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_fortran_gfortran_checker')
+    finish
+endif
+let g:loaded_syntastic_fortran_gfortran_checker = 1
+
+if !exists('g:syntastic_fortran_compiler_options')
+    let g:syntastic_fortran_compiler_options = ''
+endif
+
+let s:type_map = {}
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_fortran_gfortran_IsAvailable() dict " {{{1
+    if !exists('g:syntastic_fortran_compiler')
+        let g:syntastic_fortran_compiler = self.getExec()
+    endif
+    call self.log('g:syntastic_fortran_compiler = ', g:syntastic_fortran_compiler)
+    return executable(expand(g:syntastic_fortran_compiler, 1))
+endfunction " }}}1
+
+" @vimlint(EVL104, 1, l:errorformat)
+function! SyntaxCheckers_fortran_gfortran_GetLocList() dict " {{{1
+    call s:SetCompilerType(g:syntastic_fortran_compiler)
+    if !has_key(s:type_map, g:syntastic_fortran_compiler)
+        call syntastic#log#error("checker fortran/gfortran: can't parse version string (abnormal termination?)")
+        return []
+    endif
+
+    if s:type_map[g:syntastic_fortran_compiler] ==# 'gfortran'
+        let errorformat =
+            \ '%-C %#,'.
+            \ '%-C  %#%.%#,'.
+            \ '%A%f:%l%[.:]%c:,'.
+            \ '%Z%\m%\%%(Fatal %\)%\?%trror: %m,'.
+            \ '%Z%tarning: %m,'.
+            \ '%-G%.%#'
+        if !exists('g:syntastic_fortran_gfortran_sort')
+            let g:syntastic_fortran_gfortran_sort = 0
+        endif
+    elseif s:type_map[g:syntastic_fortran_compiler] ==# 'ifort'
+        let errorformat =
+            \ '%E%f(%l): error #%n: %m,'.
+            \ '%W%f(%l): warning #%n: %m,'.
+            \ '%W%f(%l): remark #%n: %m,'.
+            \ '%-Z%p^,'.
+            \ '%-G%.%#'
+        if !exists('g:syntastic_fortran_gfortran_sort')
+            let g:syntastic_fortran_gfortran_sort = 1
+        endif
+    endif
+
+    return syntastic#c#GetLocList('fortran', 'gfortran', {
+        \ 'errorformat': errorformat,
+        \ 'main_flags': '-fsyntax-only' })
+endfunction " }}}1
+" @vimlint(EVL104, 0, l:errorformat)
+
+" Utilities {{{1
+
+function! s:SetCompilerType(exe) " {{{2
+    if !has_key(s:type_map, a:exe)
+        try
+            let ver = filter( split(syntastic#util#system(syntastic#util#shescape(a:exe) . ' --version'), '\n'),
+                \ 'v:val =~# "\\v^%(GNU Fortran|ifort) "' )[0]
+            if ver =~# '\m^GNU Fortran '
+                let s:type_map[a:exe] = 'gfortran'
+            elseif ver =~# '\m^ifort '
+                let s:type_map[a:exe] = 'ifort'
+            endif
+        catch /\m^Vim\%((\a\+)\)\=:E684/
+            " do nothing
+        endtry
+    endif
+endfunction " }}}2
+
+" }}}
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'fortran',
+    \ 'name': 'gfortran' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/glsl/cgc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/glsl/cgc.vim
new file mode 100644
index 0000000..602399d
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/glsl/cgc.vim
@@ -0,0 +1,81 @@
+"============================================================================
+"File:        glsl.vim
+"Description: Syntax checker for OpenGL Shading Language
+"Maintainer:  Joshua Rahm <joshuarahm@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_glsl_cgc_checker')
+    finish
+endif
+let g:loaded_syntastic_glsl_cgc_checker = 1
+
+let s:glsl_extensions = {
+        \ 'glslf': 'gpu_fp',
+        \ 'glslv': 'gpu_vp',
+        \ 'frag':  'gpu_fp',
+        \ 'vert':  'gpu_vp',
+        \ 'fp':    'gpu_fp',
+        \ 'vp':    'gpu_vp'
+    \ }
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_glsl_cgc_GetLocList() dict " {{{1
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': '-oglsl -profile ' . s:GetProfile(),
+        \ 'args': (exists('g:syntastic_glsl_options') ? ' ' . g:syntastic_glsl_options : '') })
+
+    let errorformat =
+        \ '%E%f(%l) : error %m,' .
+        \ '%W%f(%l) : warning %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:GetProfile() " {{{2
+    let save_view = winsaveview()
+    let old_foldenable = &foldenable
+    let old_lazyredraw = &lazyredraw
+
+    let &lazyredraw = 1
+    let &foldenable = 0
+    call cursor(1, 1)
+
+    let magic = '\m\C^// profile:\s*'
+    let line = search(magic, 'c')
+
+    call winrestview(save_view)
+    let &foldenable = old_foldenable
+    let &lazyredraw = old_lazyredraw
+
+    if line
+        let profile = matchstr(getline(line), magic . '\zs.*')
+    else
+        let extensions = exists('g:syntastic_glsl_extensions') ? g:syntastic_glsl_extensions : s:glsl_extensions
+        let profile = get(extensions, tolower(expand('%:e', 1)), 'gpu_vert')
+    endif
+
+    return profile
+endfunction " }}}2
+
+" }}}1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \'filetype': 'glsl',
+    \'name': 'cgc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/go/go.vim b/vim-plugins/bundle/syntastic/syntax_checkers/go/go.vim
new file mode 100644
index 0000000..f32f505
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/go/go.vim
@@ -0,0 +1,103 @@
+"============================================================================
+"File:        go.vim
+"Description: Check go syntax using 'gofmt -l' followed by 'go [build|test]'
+"Maintainer:  Kamil Kisiel <kamil@kamilkisiel.net>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+"
+" This syntax checker does not reformat your source code.
+" Use a BufWritePre autocommand to that end:
+"   autocmd FileType go autocmd BufWritePre <buffer> Fmt
+
+if exists('g:loaded_syntastic_go_go_checker')
+    finish
+endif
+let g:loaded_syntastic_go_go_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_go_go_IsAvailable() dict
+    return executable(self.getExec()) && executable('gofmt')
+endfunction
+
+function! SyntaxCheckers_go_go_GetLocList() dict
+    if !exists('s:go_new')
+        let s:go_new = syntastic#util#versionIsAtLeast(self.getVersion(self.getExecEscaped() . ' version'), [1, 5])
+    endif
+
+    " Check with gofmt first, since `go build` and `go test` might not report
+    " syntax errors in the current file if another file with syntax error is
+    " compiled first.
+    let makeprg = self.makeprgBuild({
+        \ 'exe': 'gofmt',
+        \ 'args': '-l',
+        \ 'tail': '> ' . syntastic#util#DevNull() })
+
+    let errorformat =
+        \ '%f:%l:%c: %m,' .
+        \ '%-G%.%#'
+
+    let errors = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'type': 'e'} })
+    if !empty(errors)
+        return errors
+    endif
+
+    " Test files, i.e. files with a name ending in `_test.go`, are not
+    " compiled by `go build`, therefore `go test` must be called for those.
+    if match(expand('%', 1), '\m_test\.go$') == -1
+        let cmd = 'build'
+        let opts = syntastic#util#var('go_go_build_args', s:go_new ? '-buildmode=archive' : '')
+        let cleanup = 0
+    else
+        let cmd = 'test -c'
+        let opts = syntastic#util#var('go_go_test_args', s:go_new ? '-buildmode=archive' : '')
+        let cleanup = 1
+    endif
+    let opt_str = (type(opts) != type('') || opts !=# '') ? join(syntastic#util#argsescape(opts)) : opts
+    let makeprg = self.getExecEscaped() . ' ' . cmd . ' ' . opt_str
+
+    " The first pattern is for warnings from C compilers.
+    let errorformat =
+        \ '%W%f:%l: warning: %m,' .
+        \ '%E%f:%l:%c:%m,' .
+        \ '%E%f:%l:%m,' .
+        \ '%C%\s%\+%m,' .
+        \ '%+Ecan''t load package: %m,' .
+        \ '%+Einternal error: %m,' .
+        \ '%-G#%.%#'
+
+    " The go compiler needs to either be run with an import path as an
+    " argument or directly from the package directory. Since figuring out
+    " the proper import path is fickle, just cwd to the package.
+
+    let errors = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'cwd': expand('%:p:h', 1),
+        \ 'env': {'GOGC': 'off'},
+        \ 'defaults': {'type': 'e'} })
+
+    if cleanup
+        call delete(expand('%:p:h', 1) . syntastic#util#Slash() . expand('%:p:h:t', 1) . '.test')
+    endif
+
+    return errors
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'go',
+    \ 'name': 'go'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/go/gofmt.vim b/vim-plugins/bundle/syntastic/syntax_checkers/go/gofmt.vim
new file mode 100644
index 0000000..bdb6218
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/go/gofmt.vim
@@ -0,0 +1,45 @@
+"============================================================================
+"File:        gofmt.vim
+"Description: Check go syntax using 'gofmt -l'
+"Maintainer:  Brandon Thomson <bt@brandonthomson.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+"
+" This syntax checker does not reformat your source code.
+" Use a BufWritePre autocommand to that end:
+"   autocmd FileType go autocmd BufWritePre <buffer> Fmt
+
+if exists('g:loaded_syntastic_go_gofmt_checker')
+    finish
+endif
+let g:loaded_syntastic_go_gofmt_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_go_gofmt_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-l',
+        \ 'tail_after': '> ' . syntastic#util#DevNull() })
+
+    let errorformat = '%f:%l:%c: %m,%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'type': 'e'} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'go',
+    \ 'name': 'gofmt'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/go/golint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/go/golint.vim
new file mode 100644
index 0000000..29eee0c
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/go/golint.vim
@@ -0,0 +1,42 @@
+"============================================================================
+"File:        golint.vim
+"Description: Check go syntax using 'golint'
+"Maintainer:  Hiroshi Ioka <hirochachacha@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_go_golint_checker')
+    finish
+endif
+let g:loaded_syntastic_go_golint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_go_golint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%f:%l:%c: %m,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'type': 'w'},
+        \ 'subtype': 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'go',
+    \ 'name': 'golint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/go/gometalinter.vim b/vim-plugins/bundle/syntastic/syntax_checkers/go/gometalinter.vim
new file mode 100644
index 0000000..780f49b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/go/gometalinter.vim
@@ -0,0 +1,53 @@
+"============================================================================
+"File:        gometalinter.vim
+"Description: Check go syntax using 'gometalint'
+"Maintainer:  Joshua Rubin <joshua@rubixconsulting.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_go_gometalinter_checker')
+    finish
+endif
+let g:loaded_syntastic_go_gometalinter_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_go_gometalinter_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-t',
+        \ 'fname': syntastic#util#shexpand('%:p:h') })
+
+    let errorformat =
+        \ '%f:%l:%c:%trror: %m,' .
+        \ '%f:%l:%c:%tarning: %m,' .
+        \ '%f:%l::%trror: %m,' .
+        \ '%f:%l::%tarning: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1] })
+
+    for e in loclist
+        if e['text'] =~# '\v\(%(deadcode|gocyclo|golint|defercheck|varcheck|structcheck|errcheck|dupl)\)$'
+            let e['subtype'] = 'Style'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'go',
+    \ 'name': 'gometalinter'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/go/gotype.vim b/vim-plugins/bundle/syntastic/syntax_checkers/go/gotype.vim
new file mode 100644
index 0000000..37472ee
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/go/gotype.vim
@@ -0,0 +1,48 @@
+"============================================================================
+"File:        gotype.vim
+"Description: Perform syntactic and semantic checking of Go code using 'gotype'
+"Maintainer:  luz <ne.tetewi@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_go_gotype_checker')
+    finish
+endif
+let g:loaded_syntastic_go_gotype_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_go_gotype_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': (expand('%', 1) =~# '\m_test\.go$' ? '-a' : ''),
+        \ 'fname': '.' })
+
+    let errorformat =
+        \ '%f:%l:%c: %m,' .
+        \ '%-G%.%#'
+
+    " gotype needs the full go package to test types properly. Just cwd to
+    " the package for the same reasons specified in go.vim ("figuring out
+    " the import path is fickle").
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'cwd': expand('%:p:h', 1),
+        \ 'defaults': {'type': 'e'} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'go',
+    \ 'name': 'gotype'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/go/govet.vim b/vim-plugins/bundle/syntastic/syntax_checkers/go/govet.vim
new file mode 100644
index 0000000..6c30631
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/go/govet.vim
@@ -0,0 +1,48 @@
+"============================================================================
+"File:        govet.vim
+"Description: Perform static analysis of Go code with the vet tool
+"Maintainer:  Kamil Kisiel <kamil@kamilkisiel.net>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_go_govet_checker')
+    finish
+endif
+let g:loaded_syntastic_go_govet_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_go_govet_GetLocList() dict
+    let makeprg = self.getExecEscaped() . ' vet'
+
+    let errorformat =
+        \ '%Evet: %.%\+: %f:%l:%c: %m,' .
+        \ '%W%f:%l: %m,' .
+        \ '%-G%.%#'
+
+    " The go compiler needs to either be run with an import path as an
+    " argument or directly from the package directory. Since figuring out
+    " the proper import path is fickle, just cwd to the package.
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'cwd': expand('%:p:h', 1),
+        \ 'defaults': {'type': 'w'} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'go',
+    \ 'name': 'govet',
+    \ 'exec': 'go' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/haml/haml.vim b/vim-plugins/bundle/syntastic/syntax_checkers/haml/haml.vim
new file mode 100644
index 0000000..c0c7318
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/haml/haml.vim
@@ -0,0 +1,46 @@
+"============================================================================
+"File:        haml.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_haml_haml_checker')
+    finish
+endif
+let g:loaded_syntastic_haml_haml_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_haml_haml_IsAvailable() dict
+    call syntastic#log#deprecationWarn('haml_interpreter', 'haml_haml_exec')
+    return executable(self.getExec())
+endfunction
+
+function! SyntaxCheckers_haml_haml_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-c' })
+
+    let errorformat =
+        \ 'Haml error on line %l: %m,' .
+        \ 'Syntax error on line %l: %m,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'haml',
+    \ 'name': 'haml'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/haml/haml_lint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/haml/haml_lint.vim
new file mode 100644
index 0000000..60b3db3
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/haml/haml_lint.vim
@@ -0,0 +1,37 @@
+"============================================================================
+"File:        haml_lint.vim
+"Description: HAML style and syntax checker plugin for Syntastic
+"Maintainer:  Shane da Silva <shane@dasilva.io>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_haml_haml_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_haml_haml_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_haml_haml_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+    let errorformat = '%f:%l [%t] %m'
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style'})
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'haml',
+    \ 'name': 'haml_lint',
+    \ 'exec': 'haml-lint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/handlebars/handlebars.vim b/vim-plugins/bundle/syntastic/syntax_checkers/handlebars/handlebars.vim
new file mode 100644
index 0000000..f5ae742
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/handlebars/handlebars.vim
@@ -0,0 +1,43 @@
+"============================================================================
+"File:        handlebars.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_handlebars_handlebars_checker')
+    finish
+endif
+let g:loaded_syntastic_handlebars_handlebars_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_handlebars_handlebars_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-f ' . syntastic#util#DevNull() })
+
+    let errorformat =
+        \ '%EError: %m on line %l:,' .
+        \ '%EError: %m,' .
+        \ '%Z%p^,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['guards'],
+        \ 'defaults': {'bufnr': bufnr('')} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'handlebars',
+    \ 'name': 'handlebars'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/haskell/hdevtools.vim b/vim-plugins/bundle/syntastic/syntax_checkers/haskell/hdevtools.vim
new file mode 100644
index 0000000..f2313b3
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/haskell/hdevtools.vim
@@ -0,0 +1,56 @@
+"============================================================================
+"File:        hdevtools.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Anthony Carapetis <anthony.carapetis at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_haskell_hdevtools_checker')
+    finish
+endif
+let g:loaded_syntastic_haskell_hdevtools_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_haskell_hdevtools_GetLocList() dict
+    if !exists('g:syntastic_haskell_hdevtools_args') && exists('g:hdevtools_options')
+        call syntastic#log#oneTimeWarn('variable g:hdevtools_options is deprecated, ' .
+            \ 'please use g:syntastic_haskell_hdevtools_args instead')
+        let g:syntastic_haskell_hdevtools_args = g:hdevtools_options
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe_after': 'check',
+        \ 'fname': syntastic#util#shexpand('%:p') })
+
+    let errorformat =
+        \ '%-Z %#,'.
+        \ '%W%\m%f:%l:%v%\%%(-%\d%\+%\)%\=: Warning: %m,'.
+        \ '%W%\m%f:%l:%v%\%%(-%\d%\+%\)%\=: Warning:,'.
+        \ '%E%\m%f:%l:%v%\%%(-%\d%\+%\)%\=: %m,'.
+        \ '%E%>%\m%f:%l:%v%\%%(-%\d%\+%\)%\=:,'.
+        \ '%+C  %#%m,'.
+        \ '%W%>%\m%f:%l:%v%\%%(-%\d%\+%\)%\=:,'.
+        \ '%+C  %#%tarning: %m,'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'vcol': 1},
+        \ 'postprocess': ['compressWhitespace'] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'haskell',
+    \ 'name': 'hdevtools'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/haskell/hlint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/haskell/hlint.vim
new file mode 100644
index 0000000..c75ea8b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/haskell/hlint.vim
@@ -0,0 +1,41 @@
+"============================================================================
+"File:        hlint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Nicolas Wu <nicolas.wu at gmail dot com>
+"License:     BSD
+"============================================================================
+
+if exists('g:loaded_syntastic_haskell_hlint_checker')
+    finish
+endif
+let g:loaded_syntastic_haskell_hlint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_haskell_hlint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'fname': syntastic#util#shexpand('%:p')})
+
+    let errorformat =
+        \ '%E%f:%l:%v: Error while reading hint file\, %m,' .
+        \ '%E%f:%l:%v: Error: %m,' .
+        \ '%W%f:%l:%v: Warning: %m,' .
+        \ '%W%f:%l:%v: Suggestion: %m,' .
+        \ '%C%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'vcol': 1},
+        \ 'postprocess': ['compressWhitespace'] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'haskell',
+    \ 'name': 'hlint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/haskell/scan.vim b/vim-plugins/bundle/syntastic/syntax_checkers/haskell/scan.vim
new file mode 100644
index 0000000..7cf7e7b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/haskell/scan.vim
@@ -0,0 +1,43 @@
+"============================================================================
+"File:        scan.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_haskell_scan_checker')
+    finish
+endif
+let g:loaded_syntastic_haskell_scan_checker = 1
+
+if !exists('g:syntastic_haskell_scan_sort')
+    let g:syntastic_haskell_scan_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_haskell_scan_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l:%v: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'haskell',
+    \ 'name': 'scan'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/haxe/haxe.vim b/vim-plugins/bundle/syntastic/syntax_checkers/haxe/haxe.vim
new file mode 100644
index 0000000..789e9f3
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/haxe/haxe.vim
@@ -0,0 +1,63 @@
+"============================================================================
+"File:        haxe.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  David Bernard <david.bernard.31 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_haxe_haxe_checker')
+    finish
+endif
+let g:loaded_syntastic_haxe_haxe_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_haxe_haxe_GetLocList() dict
+    if exists('b:vaxe_hxml')
+        let hxml = b:vaxe_hxml
+    elseif exists('g:vaxe_hxml')
+        let hxml = g:vaxe_hxml
+    else
+        let hxml = syntastic#util#findGlobInParent('*.hxml', expand('%:p:h', 1))
+    endif
+    let hxml = fnamemodify(hxml, ':p')
+
+    call self.log('hxml =', hxml)
+
+    if hxml !=# ''
+        let makeprg = self.makeprgBuild({
+            \ 'fname': syntastic#util#shescape(fnamemodify(hxml, ':t')) })
+
+        let errorformat = '%E%f:%l: characters %c-%n : %m'
+
+        let loclist = SyntasticMake({
+            \ 'makeprg': makeprg,
+            \ 'errorformat': errorformat,
+            \ 'cwd': fnamemodify(hxml, ':h') })
+
+        for e in loclist
+            let e['hl'] = '\%>' . e['col'] . 'c\%<' . (e['nr'] + 1) . 'c'
+            let e['col'] += 1
+            let e['nr'] = 0
+        endfor
+
+        return loclist
+    endif
+
+    return []
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'haxe',
+    \ 'name': 'haxe'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/help/proselint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/help/proselint.vim
new file mode 100644
index 0000000..53ea385
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/help/proselint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        proselint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_help_proselint_checker')
+    finish
+endif
+let g:loaded_syntastic_help_proselint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'help',
+    \ 'name': 'proselint',
+    \ 'redirect': 'text/proselint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/hss/hss.vim b/vim-plugins/bundle/syntastic/syntax_checkers/hss/hss.vim
new file mode 100644
index 0000000..d988615
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/hss/hss.vim
@@ -0,0 +1,38 @@
+"============================================================================
+"File:        hss.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Justin Donaldson (jdonaldson@gmail.com)
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_hss_hss_checker')
+    finish
+endif
+let g:loaded_syntastic_hss_hss_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_hss_hss_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after' : '-output ' . syntastic#util#DevNull() })
+
+    let errorformat = '%E%f:%l: %m'
+
+    return SyntasticMake({
+	\ 'makeprg': makeprg,
+	\ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'hss',
+    \ 'name': 'hss'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/html/eslint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/html/eslint.vim
new file mode 100644
index 0000000..3e91931
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/html/eslint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        eslint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_html_eslint_checker')
+    finish
+endif
+let g:loaded_syntastic_html_eslint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'html',
+    \ 'name': 'eslint',
+    \ 'redirect': 'javascript/eslint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/html/gjslint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/html/gjslint.vim
new file mode 100644
index 0000000..a26e2f3
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/html/gjslint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        gjslint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_html_gjslint_checker')
+    finish
+endif
+let g:loaded_syntastic_html_gjslint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'html',
+    \ 'name': 'gjslint',
+    \ 'redirect': 'javascript/gjslint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/html/htmlhint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/html/htmlhint.vim
new file mode 100644
index 0000000..3518b7e
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/html/htmlhint.vim
@@ -0,0 +1,46 @@
+"============================================================================
+"File:        html.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_html_htmlhint_checker')
+    finish
+endif
+let g:loaded_syntastic_html_htmlhint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_html_htmlhint_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 9, 13])
+endfunction
+
+function! SyntaxCheckers_html_htmlhint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_before': '--format unix' })
+
+    let errorformat = '%f:%l:%c: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'html',
+    \ 'name': 'htmlhint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/html/jshint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/html/jshint.vim
new file mode 100644
index 0000000..a7af758
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/html/jshint.vim
@@ -0,0 +1,50 @@
+"============================================================================
+"File:        jshint.vim
+"Description: Javascript syntax checker for HTML - using jshint
+"Maintainer:  LCD 47 <lcd047@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_html_jshint_checker')
+    finish
+endif
+let g:loaded_syntastic_html_jshint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_html_jshint_IsAvailable() dict
+    call syntastic#log#deprecationWarn('jshint_exec', 'html_jshint_exec')
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [2, 4])
+endfunction
+
+function! SyntaxCheckers_html_jshint_GetLocList() dict
+    call syntastic#log#deprecationWarn('html_jshint_conf', 'html_jshint_args',
+        \ "'--config ' . syntastic#util#shexpand(OLD_VAR)")
+
+    let makeprg = self.makeprgBuild({ 'args_after': '--verbose --extract always' })
+
+    let errorformat = '%A%f: line %l\, col %v\, %m \(%t%*\d\)'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'html',
+    \ 'name': 'jshint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/html/proselint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/html/proselint.vim
new file mode 100644
index 0000000..fc364df
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/html/proselint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        proselint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_html_proselint_checker')
+    finish
+endif
+let g:loaded_syntastic_html_proselint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'html',
+    \ 'name': 'proselint',
+    \ 'redirect': 'text/proselint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/html/textlint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/html/textlint.vim
new file mode 100644
index 0000000..b95d8be
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/html/textlint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        textlint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_html_textlint_checker')
+    finish
+endif
+let g:loaded_syntastic_html_textlint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'html',
+    \ 'name': 'textlint',
+    \ 'redirect': 'text/textlint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/html/tidy.vim b/vim-plugins/bundle/syntastic/syntax_checkers/html/tidy.vim
new file mode 100644
index 0000000..3075a7d
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/html/tidy.vim
@@ -0,0 +1,212 @@
+"============================================================================
+"File:        tidy.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_html_tidy_checker')
+    finish
+endif
+let g:loaded_syntastic_html_tidy_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Checker options {{{1
+
+if !exists('g:syntastic_html_tidy_ignore_errors')
+    let g:syntastic_html_tidy_ignore_errors = []
+endif
+
+if !exists('g:syntastic_html_tidy_blocklevel_tags')
+    let g:syntastic_html_tidy_blocklevel_tags = []
+endif
+
+if !exists('g:syntastic_html_tidy_inline_tags')
+    let g:syntastic_html_tidy_inline_tags = []
+endif
+
+if !exists('g:syntastic_html_tidy_empty_tags')
+    let g:syntastic_html_tidy_empty_tags = []
+endif
+
+" }}}1
+
+" Constants {{{1
+
+let s:IGNORE_ERRORS = [
+        \ "<table> lacks \"summary\" attribute",
+        \ "not approved by W3C",
+        \ "<input> proprietary attribute \"placeholder\"",
+        \ "<meta> proprietary attribute \"charset\"",
+        \ "<meta> lacks \"content\" attribute",
+        \ "inserting \"type\" attribute",
+        \ "proprietary attribute \"data-",
+        \ "missing <!DOCTYPE> declaration",
+        \ "inserting implicit <body>",
+        \ "inserting missing 'title' element",
+        \ "unescaped & or unknown entity",
+        \ "<input> attribute \"type\" has invalid value",
+        \ "proprietary attribute \"role\"",
+        \ "proprietary attribute \"aria-activedescendant\"",
+        \ "proprietary attribute \"aria-atomic\"",
+        \ "proprietary attribute \"aria-autocomplete\"",
+        \ "proprietary attribute \"aria-busy\"",
+        \ "proprietary attribute \"aria-checked\"",
+        \ "proprietary attribute \"aria-controls\"",
+        \ "proprietary attribute \"aria-describedby\"",
+        \ "proprietary attribute \"aria-disabled\"",
+        \ "proprietary attribute \"aria-dropeffect\"",
+        \ "proprietary attribute \"aria-expanded\"",
+        \ "proprietary attribute \"aria-flowto\"",
+        \ "proprietary attribute \"aria-grabbed\"",
+        \ "proprietary attribute \"aria-haspopup\"",
+        \ "proprietary attribute \"aria-hidden\"",
+        \ "proprietary attribute \"aria-invalid\"",
+        \ "proprietary attribute \"aria-label\"",
+        \ "proprietary attribute \"aria-labelledby\"",
+        \ "proprietary attribute \"aria-level\"",
+        \ "proprietary attribute \"aria-live\"",
+        \ "proprietary attribute \"aria-multiline\"",
+        \ "proprietary attribute \"aria-multiselectable\"",
+        \ "proprietary attribute \"aria-orientation\"",
+        \ "proprietary attribute \"aria-owns\"",
+        \ "proprietary attribute \"aria-posinset\"",
+        \ "proprietary attribute \"aria-pressed\"",
+        \ "proprietary attribute \"aria-readonly\"",
+        \ "proprietary attribute \"aria-relevant\"",
+        \ "proprietary attribute \"aria-relevant\"",
+        \ "proprietary attribute \"aria-required\"",
+        \ "proprietary attribute \"aria-selected\"",
+        \ "proprietary attribute \"aria-setsize\"",
+        \ "proprietary attribute \"aria-sort\"",
+        \ "proprietary attribute \"aria-valuemax\"",
+        \ "proprietary attribute \"aria-valuemin\"",
+        \ "proprietary attribute \"aria-valuenow\"",
+        \ "proprietary attribute \"aria-valuetext\""
+    \ ]
+lockvar! s:IGNORE_ERRORS
+
+let s:BLOCKLEVEL_TAGS = [
+        \ 'main',
+        \ 'section',
+        \ 'article',
+        \ 'aside',
+        \ 'header',
+        \ 'footer',
+        \ 'nav',
+        \ 'figure',
+        \ 'figcaption'
+    \ ]
+lockvar! s:BLOCKLEVEL_TAGS
+
+let s:INLINE_TAGS = [
+        \ 'video',
+        \ 'audio',
+        \ 'source',
+        \ 'embed',
+        \ 'mark',
+        \ 'progress',
+        \ 'meter',
+        \ 'time',
+        \ 'ruby',
+        \ 'rt',
+        \ 'rp',
+        \ 'canvas',
+        \ 'command',
+        \ 'details',
+        \ 'datalist'
+    \ ]
+lockvar! s:INLINE_TAGS
+
+let s:EMPTY_TAGS = [
+        \ 'wbr',
+        \ 'keygen'
+    \ ]
+lockvar! s:EMPTY_TAGS
+
+" }}}1
+
+function! SyntaxCheckers_html_tidy_GetLocList() dict " {{{1
+    let makeprg = self.makeprgBuild({ 'args_after': s:Args() })
+
+    let errorformat =
+        \ '%Wline %l column %v - Warning: %m,' .
+        \ '%Eline %l column %v - Error: %m,' .
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 1, 2] })
+
+    " filter out valid HTML5 from the errors
+    for e in loclist
+        if e['valid'] && s:IgnoreError(e['text']) == 1
+            let e['valid'] = 0
+        endif
+    endfor
+
+    return loclist
+endfunction " }}}1
+
+" Utilities {{{1
+
+" TODO: join this with xhtml.vim for DRY's sake?
+function! s:TidyEncOptByFenc() " {{{2
+    let TIDY_OPTS = {
+            \ 'utf-8':        '-utf8',
+            \ 'ascii':        '-ascii',
+            \ 'latin1':       '-latin1',
+            \ 'iso-2022-jp':  '-iso-2022',
+            \ 'cp1252':       '-win1252',
+            \ 'macroman':     '-mac',
+            \ 'utf-16le':     '-utf16le',
+            \ 'utf-16':       '-utf16',
+            \ 'big5':         '-big5',
+            \ 'cp932':        '-shiftjis',
+            \ 'sjis':         '-shiftjis',
+            \ 'cp850':        '-ibm858',
+        \ }
+    return get(TIDY_OPTS, &fileencoding, '-utf8')
+endfunction " }}}2
+
+function! s:IgnoreError(text) " {{{2
+    for item in s:IGNORE_ERRORS + g:syntastic_html_tidy_ignore_errors
+        if stridx(a:text, item) != -1
+            return 1
+        endif
+    endfor
+    return 0
+endfunction " }}}2
+
+function! s:NewTags(name) " {{{2
+    return syntastic#util#shescape(join( s:{toupper(a:name)} + g:syntastic_html_tidy_{a:name}, ',' ))
+endfunction " }}}2
+
+function! s:Args() " {{{2
+    let args = s:TidyEncOptByFenc() .
+        \ ' --new-blocklevel-tags ' . s:NewTags('blocklevel_tags') .
+        \ ' --new-inline-tags ' . s:NewTags('inline_tags') .
+        \ ' --new-empty-tags ' . s:NewTags('empty_tags') .
+        \ ' -e'
+    return args
+endfunction " }}}2
+
+" }}}1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'html',
+    \ 'name': 'tidy'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/html/validator.vim b/vim-plugins/bundle/syntastic/syntax_checkers/html/validator.vim
new file mode 100644
index 0000000..14a4c64
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/html/validator.vim
@@ -0,0 +1,69 @@
+"============================================================================
+"File:        validator.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_html_validator_checker')
+    finish
+endif
+let g:loaded_syntastic_html_validator_checker=1
+
+if !exists('g:syntastic_html_validator_api')
+    let g:syntastic_html_validator_api = 'https://validator.nu/'
+endif
+
+if !exists('g:syntastic_html_validator_parser')
+    let g:syntastic_html_validator_parser = ''
+endif
+
+if !exists('g:syntastic_html_validator_nsfilter')
+    let g:syntastic_html_validator_nsfilter = ''
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_html_validator_GetLocList() dict
+    let fname = syntastic#util#shexpand('%')
+    let makeprg = self.getExecEscaped() . ' -q -L -s --compressed -F out=gnu -F asciiquotes=yes' .
+        \ (g:syntastic_html_validator_parser !=# '' ? ' -F parser=' . g:syntastic_html_validator_parser : '') .
+        \ (g:syntastic_html_validator_nsfilter !=# '' ? ' -F nsfilter=' . g:syntastic_html_validator_nsfilter : '') .
+        \ ' -F doc=@' . fname . '\;type=text/html\;filename=' . fname . ' ' . g:syntastic_html_validator_api
+
+    let errorformat =
+        \ '%E"%f":%l: %trror: %m,' .
+        \ '%E"%f":%l-%\d%\+: %trror: %m,' .
+        \ '%E"%f":%l%\%.%c: %trror: %m,' .
+        \ '%E"%f":%l%\%.%c-%\d%\+%\%.%\d%\+: %trror: %m,' .
+        \ '%E"%f":%l: %trror fatal: %m,' .
+        \ '%E"%f":%l-%\d%\+: %trror fatal: %m,' .
+        \ '%E"%f":%l%\%.%c: %trror fatal: %m,' .
+        \ '%E"%f":%l%\%.%c-%\d%\+%\%.%\d%\+: %trror fatal: %m,' .
+        \ '%W"%f":%l: info %tarning: %m,' .
+        \ '%W"%f":%l-%\d%\+: info %tarning: %m,' .
+        \ '%W"%f":%l%\%.%c: info %tarning: %m,' .
+        \ '%W"%f":%l%\%.%c-%\d%\+%\%.%\d%\+: info %tarning: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'validator',
+        \ 'returns': [0] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'html',
+    \ 'name': 'validator',
+    \ 'exec': 'curl' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/html/w3.vim b/vim-plugins/bundle/syntastic/syntax_checkers/html/w3.vim
new file mode 100644
index 0000000..37ff11a
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/html/w3.vim
@@ -0,0 +1,62 @@
+"============================================================================
+"File:        w3.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_html_w3_checker')
+    finish
+endif
+let g:loaded_syntastic_html_w3_checker = 1
+
+if !exists('g:syntastic_html_w3_api')
+    let g:syntastic_html_w3_api = 'http://validator.w3.org/check'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_html_w3_GetLocList() dict
+    let makeprg = self.getExecEscaped() . ' -q -L -s -F output=json ' .
+        \ '-F uploaded_file=@' . syntastic#util#shexpand('%:p') . '\;type=text/html ' .
+        \ g:syntastic_html_w3_api
+
+    let errorformat =
+        \ '%A %\+{,' .
+        \ '%C %\+"lastLine": %l\,%\?,' .
+        \ '%C %\+"lastColumn": %c\,%\?,' .
+        \ '%C %\+"message": "%m"\,%\?,' .
+        \ '%C %\+"type": "%trror"\,%\?,' .
+        \ '%-G %\+"type": "%tnfo"\,%\?,' .
+        \ '%C %\+"subtype": "%tarning"\,%\?,' .
+        \ '%Z %\+}\,,' .
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0] })
+
+    for e in loclist
+        let e['text'] = substitute(e['text'], '\m\\\([\"]\)', '\1', 'g')
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'html',
+    \ 'name': 'w3',
+    \ 'exec': 'curl' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/jade/jade_lint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/jade/jade_lint.vim
new file mode 100644
index 0000000..32cc808
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/jade/jade_lint.vim
@@ -0,0 +1,24 @@
+"============================================================================
+"File:        jade_lint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_jade_jade_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_jade_jade_lint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'jade',
+    \ 'name': 'jade_lint',
+    \ 'exec': 'jade-lint',
+    \ 'redirect': 'pug/pug_lint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/java/checkstyle.vim b/vim-plugins/bundle/syntastic/syntax_checkers/java/checkstyle.vim
new file mode 100644
index 0000000..f4eee5e
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/java/checkstyle.vim
@@ -0,0 +1,85 @@
+"============================================================================
+"File:        checkstyle.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Dmitry Geurkov <d.geurkov at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+" Tested with checkstyle 5.5
+"============================================================================
+
+if exists('g:loaded_syntastic_java_checkstyle_checker')
+    finish
+endif
+let g:loaded_syntastic_java_checkstyle_checker = 1
+
+if !exists('g:syntastic_java_checkstyle_classpath')
+    let g:syntastic_java_checkstyle_classpath = 'checkstyle-6.10.1-all.jar'
+endif
+
+if !exists('g:syntastic_java_checkstyle_conf_file')
+    let g:syntastic_java_checkstyle_conf_file = 'sun_checks.xml'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_java_checkstyle_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let conf_file = expand(g:syntastic_java_checkstyle_conf_file, 1)
+    call self.log('filereadable(' . string(conf_file) . ') = ' . filereadable(conf_file))
+
+    return filereadable(conf_file)
+endfunction
+
+function! SyntaxCheckers_java_checkstyle_GetLocList() dict
+
+    " classpath
+    if !exists('s:sep')
+        let s:sep = syntastic#util#isRunningWindows() || has('win32unix') ? ';' : ':'
+    endif
+    let classpath = join(map( split(g:syntastic_java_checkstyle_classpath, s:sep, 1), 'expand(v:val, 1)' ), s:sep)
+    call self.log('classpath =', classpath)
+
+    " forced options
+    let opts = []
+    if classpath !=# ''
+        call extend(opts, ['-cp', classpath])
+    endif
+    call extend(opts, [
+        \ 'com.puppycrawl.tools.checkstyle.Main',
+        \ '-c', expand(g:syntastic_java_checkstyle_conf_file, 1),
+        \ '-f', 'xml' ])
+
+    " filename
+    let fname = syntastic#util#shescape( expand('%:p:h', 1) . syntastic#util#Slash() . expand('%:t', 1) )
+    if has('win32unix')
+        let fname = substitute(syntastic#util#system('cygpath -m ' . fname), '\m\%x00', '', 'g')
+    endif
+
+    let makeprg = self.makeprgBuild({ 'args_after': opts, 'fname': fname })
+
+    let errorformat = '%f:%t:%l:%c:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'checkstyle',
+        \ 'subtype': 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'java',
+    \ 'name': 'checkstyle',
+    \ 'exec': 'java'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/java/javac.vim b/vim-plugins/bundle/syntastic/syntax_checkers/java/javac.vim
new file mode 100644
index 0000000..948c244
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/java/javac.vim
@@ -0,0 +1,427 @@
+"============================================================================
+"File:        javac.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Jochen Keil <jochen.keil at gmail dot com>
+"             Dmitry Geurkov <d.geurkov at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_java_javac_checker')
+    finish
+endif
+let g:loaded_syntastic_java_javac_checker = 1
+let g:syntastic_java_javac_maven_pom_tags = ['build', 'properties']
+let g:syntastic_java_javac_maven_pom_properties = {}
+let s:has_maven = 0
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Checker options {{{1
+
+if !exists('g:syntastic_java_javac_executable')
+    let g:syntastic_java_javac_executable = 'javac'
+endif
+
+if !exists('g:syntastic_java_maven_executable')
+    let g:syntastic_java_maven_executable = 'mvn'
+endif
+
+if !exists('g:syntastic_java_javac_options')
+    let g:syntastic_java_javac_options = '-Xlint'
+endif
+
+if !exists('g:syntastic_java_maven_options')
+    let g:syntastic_java_maven_options = ''
+endif
+
+if !exists('g:syntastic_java_javac_classpath')
+    let g:syntastic_java_javac_classpath = ''
+endif
+
+if !exists('g:syntastic_java_javac_delete_output')
+    let g:syntastic_java_javac_delete_output = 1
+endif
+
+if !exists('g:syntastic_java_javac_autoload_maven_classpath')
+    let g:syntastic_java_javac_autoload_maven_classpath = 1
+endif
+
+if !exists('g:syntastic_java_javac_config_file_enabled')
+    let g:syntastic_java_javac_config_file_enabled = 0
+endif
+
+if !exists('g:syntastic_java_javac_config_file')
+    let g:syntastic_java_javac_config_file = '.syntastic_javac_config'
+endif
+
+if !exists('g:syntastic_java_javac_custom_classpath_command')
+    let g:syntastic_java_javac_custom_classpath_command = ''
+endif
+
+if !exists('g:syntastic_java_javac_maven_pom_ftime')
+    let g:syntastic_java_javac_maven_pom_ftime = {}
+endif
+
+if !exists('g:syntastic_java_javac_maven_pom_classpath')
+    let g:syntastic_java_javac_maven_pom_classpath = {}
+endif
+
+" }}}1
+
+" Constants {{{1
+
+let s:_FILE_SHORTCUTS = {
+        \ '%FILE_PATH%':  '%:p',
+        \ '%FILE_NAME%':  '%:t',
+        \ '%FILE_DIR%':   '%:p:h',
+    \ }
+lockvar! s:_FILE_SHORTCUTS
+
+" }}}1
+
+" Commands {{{1
+
+command! SyntasticJavacEditClasspath call s:EditClasspath()
+command! SyntasticJavacEditConfig    call s:EditConfig()
+
+" }}}1
+
+function! SyntaxCheckers_java_javac_IsAvailable() dict " {{{1
+    let s:has_maven = executable(expand(g:syntastic_java_maven_executable, 1))
+    return executable(expand(g:syntastic_java_javac_executable, 1))
+endfunction " }}}1
+
+function! SyntaxCheckers_java_javac_GetLocList() dict " {{{1
+    let javac_opts = g:syntastic_java_javac_options
+
+    let output_dir = ''
+    if g:syntastic_java_javac_delete_output
+        let output_dir = syntastic#util#tmpdir()
+        let javac_opts .= ' -d ' . syntastic#util#shescape(output_dir)
+    endif
+
+    " load classpath from config file
+    if g:syntastic_java_javac_config_file_enabled
+        call s:LoadConfigFile()
+    endif
+
+
+    " add classpathes to javac_classpath {{{2
+    let javac_classpath = ''
+
+    for path in split(g:syntastic_java_javac_classpath, s:ClassSep())
+        if path !=# ''
+            try
+                let ps = glob(path, 1, 1)
+            catch
+                let ps = split(glob(path, 1), "\n")
+            endtry
+            if type(ps) == type([])
+                for p in ps
+                    let javac_classpath = s:AddToClasspath(javac_classpath, p)
+                endfor
+            else
+                let javac_classpath = s:AddToClasspath(javac_classpath, ps)
+            endif
+        endif
+    endfor
+
+    if s:has_maven && g:syntastic_java_javac_autoload_maven_classpath
+        if !g:syntastic_java_javac_delete_output
+            let javac_opts .= ' -d ' . syntastic#util#shescape(s:MavenOutputDirectory())
+        endif
+        let javac_classpath = s:AddToClasspath(javac_classpath, s:GetMavenClasspath())
+    endif
+    " }}}2
+
+    " load custom classpath {{{2
+    if g:syntastic_java_javac_custom_classpath_command !=# ''
+        " Pre-process the classpath command string a little.
+        let classpath_command = g:syntastic_java_javac_custom_classpath_command
+        for [key, val] in items(s:_FILE_SHORTCUTS)
+            let classpath_command = substitute(classpath_command, '\V' . key, syntastic#util#shexpand(val), 'g')
+        endfor
+        let lines = syntastic#util#system(classpath_command)
+        if syntastic#util#isRunningWindows() || has('win32unix')
+            let lines = substitute(lines, "\r\n", "\n", 'g')
+        endif
+        for l in split(lines, "\n")
+            let javac_classpath = s:AddToClasspath(javac_classpath, l)
+        endfor
+    endif
+
+    if javac_classpath !=# ''
+        let javac_opts .= ' -cp ' . syntastic#util#shexpand(javac_classpath)
+    endif
+    " }}}2
+
+    let fname = expand('%:p:h', 1) . syntastic#util#Slash() . expand ('%:t', 1)
+
+    if has('win32unix')
+        let fname = syntastic#util#CygwinPath(fname)
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'args': javac_opts,
+        \ 'fname': syntastic#util#shescape(fname) })
+
+    " unashamedly stolen from *errorformat-javac* (quickfix.txt) and modified to include error types
+    let errorformat =
+        \ '%E%f:%l: error: %m,'.
+        \ '%W%f:%l: warning: %m,'.
+        \ '%E%f:%l: %m,'.
+        \ '%Z%p^,'.
+        \ '%-G%.%#'
+
+    if output_dir !=# ''
+        silent! call mkdir(output_dir, 'p')
+    endif
+    let errors = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['cygwinRemoveCR'] })
+
+    if output_dir !=# ''
+        call syntastic#util#rmrf(output_dir)
+    endif
+    return errors
+
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:RemoveCarriageReturn(line) " {{{2
+    return substitute(a:line, "\r", '', 'g')
+endfunction " }}}2
+
+function! s:ClassSep() " {{{2
+    return (syntastic#util#isRunningWindows() || has('win32unix')) ? ';' : ':'
+endfunction " }}}2
+
+function! s:AddToClasspath(classpath, path) " {{{2
+    if a:path ==# ''
+        return a:classpath
+    endif
+    return (a:classpath !=# '') ? a:classpath . s:ClassSep() . a:path : a:path
+endfunction " }}}2
+
+function! s:SplitClasspath(classpath) " {{{2
+    return split(a:classpath, s:ClassSep())
+endfunction " }}}2
+
+function! s:LoadConfigFile() " {{{2
+    if filereadable(expand(g:syntastic_java_javac_config_file, 1))
+        execute 'source ' . fnameescape(expand(g:syntastic_java_javac_config_file, 1))
+    endif
+endfunction " }}}2
+
+function! s:SaveClasspath() " {{{2
+    " build classpath from lines
+    let path = ''
+    let lines = getline(1, line('$'))
+    for l in lines
+        let path = s:AddToClasspath(path, l)
+    endfor
+    " save classpath to config file
+    if g:syntastic_java_javac_config_file_enabled
+        if filereadable(expand(g:syntastic_java_javac_config_file, 1))
+            " load lines from config file
+            let lines = readfile(expand(g:syntastic_java_javac_config_file, 1))
+            " strip g:syntastic_java_javac_classpath options from config file lines
+            let i = 0
+            while i < len(lines)
+                if match(lines[i], 'g:syntastic_java_javac_classpath') != -1
+                    call remove(lines, i)
+                else
+                    let i += 1
+                endif
+            endwhile
+        else
+            let lines = []
+        endif
+        " add new g:syntastic_java_javac_classpath option to config
+        call add(lines, 'let g:syntastic_java_javac_classpath = ' . string(path))
+        " save config file lines
+        call writefile(lines, expand(g:syntastic_java_javac_config_file, 1))
+    endif
+    " set new classpath
+    let g:syntastic_java_javac_classpath = path
+    let &modified = 0
+endfunction " }}}2
+
+function! s:EditClasspath() " {{{2
+    let command = 'syntastic javac classpath'
+    let winnr = bufwinnr('^' . command . '$')
+    if winnr < 0
+        let path = []
+        let pathlines = split(g:syntastic_java_javac_classpath, "\n")
+        for p in pathlines
+            call extend(path, s:SplitClasspath(p))
+        endfor
+        execute (len(path) + 5) . 'sp ' . fnameescape(command)
+
+        augroup syntastic
+            autocmd BufWriteCmd <buffer> call s:SaveClasspath() | bwipeout
+        augroup END
+
+        setlocal buftype=acwrite bufhidden=wipe nobuflisted noswapfile nowrap number
+        for p in path
+            call append(line('$') - 1, p)
+        endfor
+        let &modified = 0
+    else
+        execute winnr . 'wincmd w'
+    endif
+endfunction " }}}2
+
+function! s:SaveConfig() " {{{2
+    " get lines
+    let lines = getline(1, line('$'))
+    if g:syntastic_java_javac_config_file_enabled
+        " save config file lines
+        call writefile(lines, expand(g:syntastic_java_javac_config_file, 1))
+    endif
+    let &modified = 0
+endfunction " }}}2
+
+function! s:EditConfig() " {{{2
+    if !g:syntastic_java_javac_config_file_enabled
+        return
+    endif
+
+    let command = 'syntastic javac config'
+    let winnr = bufwinnr('^' . command . '$')
+    if winnr < 0
+        let lines = []
+        if filereadable(expand(g:syntastic_java_javac_config_file, 1))
+            let lines = readfile(expand(g:syntastic_java_javac_config_file, 1))
+        endif
+        execute (len(lines) + 5) . 'sp ' . fnameescape(command)
+
+        augroup syntastic
+            autocmd BufWriteCmd <buffer> call s:SaveConfig() | bwipeout
+        augroup END
+
+        setlocal ft=vim buftype=acwrite bufhidden=wipe nobuflisted noswapfile nowrap number
+        for l in lines
+            call append(line('$') - 1, l)
+        endfor
+        let &modified = 0
+    else
+        execute winnr . 'wincmd w'
+    endif
+endfunction " }}}2
+
+function! s:GetMavenProperties() " {{{2
+    let mvn_properties = {}
+    let pom = syntastic#util#findFileInParent('pom.xml', expand('%:p:h', 1))
+    if s:has_maven && filereadable(pom)
+        if !has_key(g:syntastic_java_javac_maven_pom_properties, pom)
+            let mvn_cmd = syntastic#util#shexpand(g:syntastic_java_maven_executable) .
+                \ ' -f ' . syntastic#util#shescape(pom) .
+                \ ' ' . g:syntastic_java_maven_options
+            let mvn_is_managed_tag = 1
+            let mvn_settings_output = split(syntastic#util#system(mvn_cmd . ' help:effective-pom'), "\n")
+            let current_path = 'project'
+            for line in mvn_settings_output
+                let matches = matchlist(line, '\m^\s*<\([a-zA-Z0-9\-\.]\+\)>\s*$')
+                if mvn_is_managed_tag && !empty(matches)
+                    let mvn_is_managed_tag = index(g:syntastic_java_javac_maven_pom_tags, matches[1]) >= 0
+                    let current_path .= '.' . matches[1]
+                else
+                    let matches = matchlist(line, '\m^\s*</\([a-zA-Z0-9\-\.]\+\)>\s*$')
+                    if !empty(matches)
+                        let mvn_is_managed_tag = index(g:syntastic_java_javac_maven_pom_tags, matches[1]) < 0
+                        let current_path  = substitute(current_path, '\m\.' . matches[1] . '$', '', '')
+                    else
+                        let matches = matchlist(line, '\m^\s*<\([a-zA-Z0-9\-\.]\+\)>\(.\+\)</[a-zA-Z0-9\-\.]\+>\s*$')
+                        if mvn_is_managed_tag && !empty(matches)
+                            let mvn_properties[current_path . '.' . matches[1]] = matches[2]
+                        endif
+                    endif
+                endif
+            endfor
+            let g:syntastic_java_javac_maven_pom_properties[pom] = mvn_properties
+        endif
+        return g:syntastic_java_javac_maven_pom_properties[pom]
+    endif
+    return mvn_properties
+endfunction " }}}2
+
+function! s:GetMavenClasspath() " {{{2
+    let pom = syntastic#util#findFileInParent('pom.xml', expand('%:p:h', 1))
+    if s:has_maven && filereadable(pom)
+        if !has_key(g:syntastic_java_javac_maven_pom_ftime, pom) || g:syntastic_java_javac_maven_pom_ftime[pom] != getftime(pom)
+            let mvn_cmd = syntastic#util#shexpand(g:syntastic_java_maven_executable) .
+                \ ' -f ' . syntastic#util#shescape(pom) .
+                \ ' ' . g:syntastic_java_maven_options
+            let mvn_classpath_output = split(syntastic#util#system(mvn_cmd . ' dependency:build-classpath -DincludeScope=test'), "\n")
+            let mvn_classpath = ''
+            let class_path_next = 0
+
+            for line in mvn_classpath_output
+                if class_path_next == 1
+                    let mvn_classpath = s:RemoveCarriageReturn(line)
+                    break
+                endif
+                if stridx(line, 'Dependencies classpath:') >= 0
+                    let class_path_next = 1
+                endif
+            endfor
+
+            let mvn_properties = s:GetMavenProperties()
+
+            let sep = syntastic#util#Slash()
+            let output_dir = get(mvn_properties, 'project.build.outputDirectory', join(['target', 'classes'], sep))
+            let mvn_classpath = s:AddToClasspath(mvn_classpath, output_dir)
+
+            let test_output_dir = get(mvn_properties, 'project.build.testOutputDirectory', join(['target', 'test-classes'], sep))
+            let mvn_classpath = s:AddToClasspath(mvn_classpath, test_output_dir)
+
+            let g:syntastic_java_javac_maven_pom_ftime[pom] = getftime(pom)
+            let g:syntastic_java_javac_maven_pom_classpath[pom] = mvn_classpath
+        endif
+        return g:syntastic_java_javac_maven_pom_classpath[pom]
+    endif
+    return ''
+endfunction " }}}2
+
+function! s:MavenOutputDirectory() " {{{2
+    let pom = syntastic#util#findFileInParent('pom.xml', expand('%:p:h', 1))
+    if s:has_maven && filereadable(pom)
+        let mvn_properties = s:GetMavenProperties()
+        let output_dir = get(mvn_properties, 'project.properties.build.dir', getcwd())
+
+        let sep = syntastic#util#Slash()
+        let src_main_dir = get(mvn_properties, 'project.build.sourceDirectory', join(['src', 'main', 'java'], sep))
+        let src_test_dir = get(mvn_properties, 'project.build.testsourceDirectory', join(['src', 'test', 'java'], sep))
+        if stridx(expand('%:p:h', 1), src_main_dir) >= 0
+            let output_dir = get(mvn_properties, 'project.build.outputDirectory', join ([output_dir, 'target', 'classes'], sep))
+        endif
+        if stridx(expand('%:p:h', 1), src_test_dir) >= 0
+            let output_dir = get(mvn_properties, 'project.build.testOutputDirectory', join([output_dir, 'target', 'test-classes'], sep))
+        endif
+
+        if has('win32unix')
+            let output_dir = syntastic#util#CygwinPath(output_dir)
+        endif
+        return output_dir
+    endif
+    return '.'
+endfunction " }}}2
+
+" }}}1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'java',
+    \ 'name': 'javac'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/javascript/closurecompiler.vim b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/closurecompiler.vim
new file mode 100644
index 0000000..8c4190a
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/closurecompiler.vim
@@ -0,0 +1,76 @@
+"============================================================================
+"File:        closurecompiler.vim
+"Description: Javascript syntax checker - using Google Closure Compiler
+"Maintainer:  Motohiro Takayama <mootoh at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_closurecompiler_checker')
+    finish
+endif
+let g:loaded_syntastic_javascript_closurecompiler_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_closurecompiler_IsAvailable() dict
+    call syntastic#log#deprecationWarn('javascript_closure_compiler_path', 'javascript_closurecompiler_path')
+
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let s:has_script = exists('g:syntastic_javascript_closurecompiler_script')
+    if s:has_script
+        return 1
+    endif
+
+    let cp = get(g:, 'syntastic_javascript_closurecompiler_path', '')
+    call self.log('g:syntastic_javascript_closurecompiler_path =', cp)
+
+    let jar = expand(cp, 1)
+    call self.log('filereadable(' . string(jar) . ') = ' . filereadable(jar))
+
+    return filereadable(jar)
+endfunction
+
+function! SyntaxCheckers_javascript_closurecompiler_GetLocList() dict
+    call syntastic#log#deprecationWarn('javascript_closure_compiler_options', 'javascript_closurecompiler_args')
+    call syntastic#log#deprecationWarn('javascript_closure_compiler_file_list', 'javascript_closurecompiler_file_list')
+
+    let flist = expand(get(g:, 'syntastic_javascript_closurecompiler_file_list', ''), 1)
+    if filereadable(flist)
+        let file_list = map( readfile(flist), 'expand(v:var, 1)' )
+    else
+        let file_list = [expand('%', 1)]
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe_after': (s:has_script ? [] : ['-jar', expand(g:syntastic_javascript_closurecompiler_path, 1)]),
+        \ 'args_after': '--js',
+        \ 'fname': file_list })
+
+    let errorformat =
+        \ '%-GOK,'.
+        \ '%E%f:%l: ERROR - %m,'.
+        \ '%W%f:%l: WARNING - %m,'.
+        \ '%Z%p^'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'closurecompiler',
+    \ 'exec': get(g:, 'syntastic_javascript_closurecompiler_script', 'java')})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/javascript/eslint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/eslint.vim
new file mode 100644
index 0000000..437bc55
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/eslint.vim
@@ -0,0 +1,78 @@
+"============================================================================
+"File:        eslint.vim
+"Description: Javascript syntax checker - using eslint
+"Maintainer:  Maksim Ryzhikov <rv.maksim at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_eslint_checker')
+    finish
+endif
+let g:loaded_syntastic_javascript_eslint_checker = 1
+
+if !exists('g:syntastic_javascript_eslint_sort')
+    let g:syntastic_javascript_eslint_sort = 1
+endif
+
+if !exists('g:syntastic_javascript_eslint_generic')
+    let g:syntastic_javascript_eslint_generic = 0
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_eslint_IsAvailable() dict
+    if g:syntastic_javascript_eslint_generic
+        call self.log('generic eslint, exec =', self.getExec())
+    endif
+
+    if !executable(self.getExec())
+        return 0
+    endif
+    return g:syntastic_javascript_eslint_generic || syntastic#util#versionIsAtLeast(self.getVersion(), [0, 1])
+endfunction
+
+function! SyntaxCheckers_javascript_eslint_GetLocList() dict
+    if !g:syntastic_javascript_eslint_generic
+        call syntastic#log#deprecationWarn('javascript_eslint_conf', 'javascript_eslint_args',
+            \ "'--config ' . syntastic#util#shexpand(OLD_VAR)")
+    endif
+
+    let makeprg = self.makeprgBuild({ 'args_before': (g:syntastic_javascript_eslint_generic ? '' : '-f compact') })
+
+    let errorformat =
+        \ '%E%f: line %l\, col %c\, Error - %m,' .
+        \ '%W%f: line %l\, col %c\, Warning - %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['guards'] })
+
+    if !g:syntastic_javascript_eslint_generic
+        if !exists('s:eslint_new')
+            let s:eslint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [1])
+        endif
+
+        if !s:eslint_new
+            for e in loclist
+                let e['col'] += 1
+            endfor
+        endif
+    endif
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'eslint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/javascript/flow.vim b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/flow.vim
new file mode 100644
index 0000000..0282654
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/flow.vim
@@ -0,0 +1,67 @@
+"============================================================================
+"File:        flow.vim
+"Description: Javascript syntax checker - using flow
+"Maintainer:  Michael Robinson <mike@pagesofinterest.net>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_flow_checker')
+    finish
+endif
+let g:loaded_syntastic_javascript_flow_checker = 1
+
+if !exists('g:syntastic_javascript_flow_sort')
+    let g:syntastic_javascript_flow_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_flow_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(self.getExecEscaped() . ' version'), [0, 18, 1])
+endfunction
+
+function! SyntaxCheckers_javascript_flow_GetLocList() dict
+    if syntastic#util#findFileInParent('.flowconfig', expand('%:p:h', 1)) ==# ''
+        return []
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe': self.getExecEscaped() . ' check',
+        \ 'args_after': '--show-all-errors --json' })
+
+    let errorformat =
+        \ '%f:%l:%c:%n: %m,' .
+        \ '%f:%l:%c: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'flow',
+        \ 'defaults': {'type': 'E'} })
+
+    for e in loclist
+        if get(e, 'col', 0) && get(e, 'nr', 0)
+            let e['hl'] = '\%>' . (e['col'] - 1) . 'c\%<' . (e['nr'] + 1) . 'c'
+            let e['nr'] = 0
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'flow'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/javascript/gjslint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/gjslint.vim
new file mode 100644
index 0000000..3368905
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/gjslint.vim
@@ -0,0 +1,46 @@
+"============================================================================
+"File:        gjslint.vim
+"Description: Javascript syntax checker - using gjslint
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_gjslint_checker')
+    finish
+endif
+let g:loaded_syntastic_javascript_gjslint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_gjslint_GetLocList() dict
+    call syntastic#log#deprecationWarn('javascript_gjslint_conf', 'javascript_gjslint_args')
+
+    let makeprg = self.makeprgBuild({
+        \ 'args': '--nodebug_indentation',
+        \ 'args_after': '--check_html --nosummary --unix_mode --nobeep' })
+
+    let errorformat =
+        \ "%f:%l:(New Error -%\\?\%n) %m," .
+        \ "%f:%l:(-%\\?%n) %m," .
+        \ "%-G1 files checked," .
+        \ " no errors found.," .
+        \ "%-G%.%#"
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'gjslint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jscs.vim b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jscs.vim
new file mode 100644
index 0000000..d259086
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jscs.vim
@@ -0,0 +1,53 @@
+"============================================================================
+"File:        jscs.vim
+"Description: Javascript syntax checker - using jscs
+"Maintainer:  LCD 47 <lcd047@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_jscs_checker')
+    finish
+endif
+let g:loaded_syntastic_javascript_jscs_checker = 1
+
+if !exists('g:syntastic_javascript_jscs_sort')
+    let g:syntastic_javascript_jscs_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_jscs_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [2, 1])
+endfunction
+
+function! SyntaxCheckers_javascript_jscs_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '--no-colors --max-errors -1 --reporter json' })
+
+    let errorformat = '%f:%l:%c:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'preprocess': 'jscs',
+        \ 'defaults': {'type': 'E'},
+        \ 'returns': [0, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'jscs'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jshint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jshint.vim
new file mode 100644
index 0000000..492aa69
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jshint.vim
@@ -0,0 +1,60 @@
+"============================================================================
+"File:        jshint.vim
+"Description: Javascript syntax checker - using jshint
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_jshint_checker')
+    finish
+endif
+let g:loaded_syntastic_javascript_jshint_checker = 1
+
+if !exists('g:syntastic_javascript_jshint_sort')
+    let g:syntastic_javascript_jshint_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_jshint_IsAvailable() dict
+    call syntastic#log#deprecationWarn('jshint_exec', 'javascript_jshint_exec')
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let ver = self.getVersion()
+    let s:jshint_new = syntastic#util#versionIsAtLeast(ver, [1, 1])
+
+    return syntastic#util#versionIsAtLeast(ver, [1])
+endfunction
+
+function! SyntaxCheckers_javascript_jshint_GetLocList() dict
+    call syntastic#log#deprecationWarn('javascript_jshint_conf', 'javascript_jshint_args',
+        \ "'--config ' . syntastic#util#shexpand(OLD_VAR)")
+
+    let makeprg = self.makeprgBuild({ 'args_after': (s:jshint_new ? '--verbose ' : '') })
+
+    let errorformat = s:jshint_new ?
+        \ '%A%f: line %l\, col %v\, %m \(%t%*\d\)' :
+        \ '%E%f: line %l\, col %v\, %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'jshint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jsl.vim b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jsl.vim
new file mode 100644
index 0000000..aa9862b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jsl.vim
@@ -0,0 +1,48 @@
+"============================================================================
+"File:        jsl.vim
+"Description: Javascript syntax checker - using jsl
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_jsl_checker')
+    finish
+endif
+let g:loaded_syntastic_javascript_jsl_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_jsl_GetLocList() dict
+    call syntastic#log#deprecationWarn('javascript_jsl_conf', 'javascript_jsl_args',
+        \ "'-conf ' . syntastic#util#shexpand(OLD_VAR)")
+
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-nologo -nofilelisting -nosummary -nocontext -process' })
+
+    let errorformat =
+        \ '%W%f(%l): lint warning: %m,'.
+        \ '%-Z%p^,'.
+        \ '%W%f(%l): warning: %m,'.
+        \ '%-Z%p^,'.
+        \ '%E%f(%l): SyntaxError: %m,'.
+        \ '%-Z%p^,'.
+        \ '%-G'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'jsl'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jslint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jslint.vim
new file mode 100644
index 0000000..e2ce76c
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jslint.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"File:        jslint.vim
+"Description: Javascript syntax checker - using jslint
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_jslint_checker')
+    finish
+endif
+
+let g:loaded_syntastic_javascript_jslint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_jslint_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\mExpected .* and instead saw ''\zs.*\ze''')
+    if term !=# ''
+        let term = '\V\<' . escape(term, '\') . '\>'
+    endif
+    return term
+endfunction
+
+function! SyntaxCheckers_javascript_jslint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args': '--white --nomen --regexp --plusplus --bitwise --newcap --sloppy --vars' })
+
+    let errorformat =
+        \ '%E %##%\d%\+ %m,'.
+        \ '%-Z%.%#Line %l\, Pos %c,'.
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'jslint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jsxhint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jsxhint.vim
new file mode 100644
index 0000000..e29ce06
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/jsxhint.vim
@@ -0,0 +1,56 @@
+"============================================================================
+"File:        jsxhint.vim
+"Description: Javascript syntax checker - using jsxhint
+"Maintainer:  Thomas Boyt <me@thomasboyt.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_jsxhint_checker')
+    finish
+endif
+let g:loaded_syntastic_javascript_jsxhint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_jsxhint_IsAvailable() dict " {{{1
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let version_output = syntastic#util#system(self.getExecEscaped() . ' --version')
+    let parsed_ver = !v:shell_error && (version_output =~# '\m^JSXHint\>') ? syntastic#util#parseVersion(version_output) : []
+    if len(parsed_ver)
+        call self.setVersion(parsed_ver)
+    else
+        call syntastic#log#ndebug(g:_SYNTASTIC_DEBUG_LOCLIST, 'checker output:', split(version_output, "\n", 1))
+        call syntastic#log#error("checker javascript/jsxhint: can't parse version string (abnormal termination?)")
+    endif
+
+    return syntastic#util#versionIsAtLeast(parsed_ver, [0, 4, 1])
+endfunction " }}}1
+
+function! SyntaxCheckers_javascript_jsxhint_GetLocList() dict " {{{1
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '--verbose' })
+
+    let errorformat = '%A%f: line %l\, col %v\, %m \(%t%*\d\)'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')} })
+endfunction " }}}1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'jsxhint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/javascript/mixedindentlint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/mixedindentlint.vim
new file mode 100644
index 0000000..2995409
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/mixedindentlint.vim
@@ -0,0 +1,40 @@
+"============================================================================
+"File:        mixedindentlint.vim
+"Description: Mixed indentation linter for vim
+"Maintainer:  Payton Swick <payton@foolord.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_mixedindentlint_checker')
+    finish
+endif
+let g:loaded_syntastic_javascript_mixedindentlint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_mixedindentlint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = 'Line %l in "%f" %.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'defaults': { 'text': 'Indentation differs from rest of file' },
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'mixedindentlint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/javascript/standard.vim b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/standard.vim
new file mode 100644
index 0000000..e652bd0
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/standard.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"File:        standard.vim
+"Description: JavaScript syntax checker - using standard
+"Maintainer:  LCD 47 <lcd047@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_standard_checker')
+    finish
+endif
+let g:loaded_syntastic_javascript_standard_checker = 1
+
+if !exists('g:syntastic_javascript_standard_generic')
+    let g:syntastic_javascript_standard_generic = 0
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_standard_IsAvailable() dict
+    if g:syntastic_javascript_standard_generic
+        call self.log('generic standard, exec =', self.getExec())
+    endif
+
+    if !executable(self.getExec())
+        return 0
+    endif
+    return g:syntastic_javascript_standard_generic || syntastic#util#versionIsAtLeast(self.getVersion(), [2, 6, 1])
+endfunction
+
+function! SyntaxCheckers_javascript_standard_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args': '-v' })
+
+    let errorformat = '  %f:%l:%c: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'defaults': {'type': 'W'},
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'standard'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/javascript/tern_lint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/tern_lint.vim
new file mode 100644
index 0000000..547942b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/javascript/tern_lint.vim
@@ -0,0 +1,53 @@
+"============================================================================
+"File:        tern_lint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_javascript_tern_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_javascript_tern_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_javascript_tern_lint_IsAvailable() dict
+    return has('byte_offset') && executable(self.getExec())
+endfunction
+
+function! SyntaxCheckers_javascript_tern_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%t:%l:%c:%n:%m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'tern_lint',
+        \ 'returns': [0] })
+
+    for e in loclist
+        if get(e, 'col', 0) && get(e, 'nr', 0)
+            let e['hl'] = '\%>' . (e['col'] - 1) . 'c\%<' . (e['nr'] + 1) . 'c'
+        endif
+        let e['nr'] = 0
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'javascript',
+    \ 'name': 'tern_lint',
+    \ 'exec': 'tern-lint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/json/jsonlint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/json/jsonlint.vim
new file mode 100644
index 0000000..9a89c78
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/json/jsonlint.vim
@@ -0,0 +1,43 @@
+"============================================================================
+"File:        jsonlint.vim
+"Description: JSON syntax checker - using jsonlint
+"Maintainer:  Miller Medeiros <contact at millermedeiros dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_json_jsonlint_checker')
+    finish
+endif
+let g:loaded_syntastic_json_jsonlint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_json_jsonlint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'post_args_after': '--compact' })
+
+    let errorformat =
+        \ '%ELine %l:%c,'.
+        \ '%Z\\s%#Reason: %m,'.
+        \ '%C%.%#,'.
+        \ '%f: line %l\, col %c\, %m,'.
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'json',
+    \ 'name': 'jsonlint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/json/jsonval.vim b/vim-plugins/bundle/syntastic/syntax_checkers/json/jsonval.vim
new file mode 100644
index 0000000..2a756b6
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/json/jsonval.vim
@@ -0,0 +1,41 @@
+"============================================================================
+"File:        jsonval.vim
+"Description: JSON syntax checker - using jsonval
+"Maintainer:  Miller Medeiros <contact at millermedeiros dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_json_jsonval_checker')
+    finish
+endif
+let g:loaded_syntastic_json_jsonval_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_json_jsonval_GetLocList() dict
+    " based on https://gist.github.com/1196345
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%E%f: %m at line %l,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'json',
+    \ 'name': 'jsonval'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/less/less-lint.coffee b/vim-plugins/bundle/syntastic/syntax_checkers/less/less-lint.coffee
new file mode 100644
index 0000000..0b05e4a
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/less/less-lint.coffee
@@ -0,0 +1,41 @@
+#!/usr/bin/env node
+
+fs = require 'fs'
+less = require 'less'
+args = process.argv.slice(1)
+options = {}
+
+args = args.filter (arg) ->
+    match = arg.match(/^-I(.+)$/)
+    if match
+        options.paths.push(match[1]);
+        return false
+
+    match = arg.match(/^--?([a-z][\-0-9a-z]*)(?:=([^\s]+))?$/i)
+    if match
+        arg = match[1]
+    else
+        return arg
+
+    switch arg
+        when 'strict-imports' then options.strictImports = true
+        when 'include-path'
+            options.paths = match[2].split(if os.type().match(/Windows/) then ';' else ':')
+                .map (p) ->
+                    if p
+                        return path.resolve(process.cwd(), p)
+        when 'O0' then options.optimization = 0
+        when 'O1' then options.optimization = 1
+        when 'O2' then options.optimization = 2
+
+options.filename = args[1]
+
+parser = new(less.Parser) options
+
+fs.readFile(options.filename, 'utf-8', (err,data) ->
+    parser.parse(data, (err, tree) ->
+        if err
+            less.writeError err
+            process.exit(1)
+    )
+)
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/less/less-lint.js b/vim-plugins/bundle/syntastic/syntax_checkers/less/less-lint.js
new file mode 100644
index 0000000..5abc653
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/less/less-lint.js
@@ -0,0 +1,57 @@
+// Generated by CoffeeScript 1.3.3
+(function() {
+  var args, fs, less, options, parser;
+
+  fs = require('fs');
+
+  less = require('less');
+
+  args = process.argv.slice(1);
+
+  options = {};
+
+  args = args.filter(function(arg) {
+    var match;
+    match = arg.match(/^-I(.+)$/);
+    if (match) {
+      options.paths.push(match[1]);
+      return false;
+    }
+    match = arg.match(/^--?([a-z][\-0-9a-z]*)(?:=([^\s]+))?$/i);
+    if (match) {
+      arg = match[1];
+    } else {
+      return arg;
+    }
+    switch (arg) {
+      case 'strict-imports':
+        return options.strictImports = true;
+      case 'include-path':
+        return options.paths = match[2].split(os.type().match(/Windows/) ? ';' : ':').map(function(p) {
+          if (p) {
+            return path.resolve(process.cwd(), p);
+          }
+        });
+      case 'O0':
+        return options.optimization = 0;
+      case 'O1':
+        return options.optimization = 1;
+      case 'O2':
+        return options.optimization = 2;
+    }
+  });
+
+  options.filename = args[1];
+
+  parser = new less.Parser(options);
+
+  fs.readFile(options.filename, 'utf-8', function(err, data) {
+    return parser.parse(data, function(err, tree) {
+      if (err) {
+        less.writeError(err);
+        return process.exit(1);
+      }
+    });
+  });
+
+}).call(this);
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/less/lessc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/less/lessc.vim
new file mode 100644
index 0000000..ad4035e
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/less/lessc.vim
@@ -0,0 +1,59 @@
+"============================================================================
+"File:        less.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Julien Blanchard <julien at sideburns dot eu>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_less_lessc_checker')
+    finish
+endif
+let g:loaded_syntastic_less_lessc_checker = 1
+
+if !exists('g:syntastic_less_use_less_lint')
+    let g:syntastic_less_use_less_lint = 0
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:node_file = 'node ' . syntastic#util#shescape(expand('<sfile>:p:h', 1) . syntastic#util#Slash() . 'less-lint.js')
+
+function! SyntaxCheckers_less_lessc_IsAvailable() dict
+    call self.log('g:syntastic_less_use_less_lint =', g:syntastic_less_use_less_lint)
+    return g:syntastic_less_use_less_lint ? executable('node') : executable(self.getExec())
+endfunction
+
+function! SyntaxCheckers_less_lessc_GetLocList() dict
+    call syntastic#log#deprecationWarn('less_options', 'less_lessc_args')
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe': (g:syntastic_less_use_less_lint ? s:node_file : self.getExecEscaped()),
+        \ 'args_after': '--no-color',
+        \ 'tail': '> ' . syntastic#util#DevNull() })
+
+    let errorformat =
+        \ '%m in %f on line %l\, column %c:,' .
+        \ '%m in %f:%l:%c,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['guards'],
+        \ 'defaults': {'bufnr': bufnr(''), 'text': 'Syntax error'} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'less',
+    \ 'name': 'lessc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/less/recess.vim b/vim-plugins/bundle/syntastic/syntax_checkers/less/recess.vim
new file mode 100644
index 0000000..1a8d876
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/less/recess.vim
@@ -0,0 +1,44 @@
+"============================================================================
+"File:        recess.vim
+"Description: Syntax checking plugin for syntastic.vim using `recess`
+"             (http://twitter.github.io/recess/).
+"Maintainer:  Tim Carry <tim at pixelastic dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_less_recess_checker')
+    finish
+endif
+let g:loaded_syntastic_less_recess_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_less_recess_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'post_args_after': '--format=compact --stripColors' })
+
+    let errorformat =
+        \ '%E%m in %f,' .
+        \ '%Z %#%l.%.%#,' .
+        \ '%f:%l:%m,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'less',
+    \ 'name': 'recess'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/lex/flex.vim b/vim-plugins/bundle/syntastic/syntax_checkers/lex/flex.vim
new file mode 100644
index 0000000..82cbf10
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/lex/flex.vim
@@ -0,0 +1,50 @@
+"============================================================================
+"File:        lex.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_lex_flex_checker')
+    finish
+endif
+let g:loaded_syntastic_lex_flex_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_lex_flex_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'],
+        \ '\m^\(unrecognized %option\|bad <start condition>\|bad character\( class expression\)\=\): \zs.*')
+    if term ==# ''
+        let term = matchstr(a:item['text'],
+            \ '\m^\(Definition value for\|undefined definition\) \zs{[^}]\+}\ze')
+    endif
+
+    return term !=# '' ? '\V' . escape(term, '\') : ''
+endfunction
+
+function! SyntaxCheckers_lex_flex_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': syntastic#c#NullOutput() })
+
+    let errorformat = '%f:%l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'lex',
+    \ 'name': 'flex'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/limbo/limbo.vim b/vim-plugins/bundle/syntastic/syntax_checkers/limbo/limbo.vim
new file mode 100644
index 0000000..0dfe03c
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/limbo/limbo.vim
@@ -0,0 +1,46 @@
+"============================================================================
+"File:        limbo.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Alex Efros <powerman-asdf@ya.ru>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_limbo_limbo_checker')
+    finish
+endif
+let g:loaded_syntastic_limbo_limbo_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_limbo_limbo_GetLocList() dict
+    let include = $INFERNO_HOME !=# '' ? '-I$INFERNO_HOME ' : ''
+    " don't generate .dis in current dir while checking syntax,
+    " .dis should be generated by `mk`
+    let output = filereadable('mkfile') ? (' ' . syntastic#c#NullOutput()) : ''
+
+    let makeprg = self.makeprgBuild({ 'args_before': include . '-w' . output })
+
+    let errorformat = '%E%f:%l:%m'
+    if expand('%', 1) =~# '\m\.m$'
+        let errorformat = '%-G%f:%l: near ` EOF ` : no implementation module,' . errorformat
+    endif
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'limbo',
+    \ 'name': 'limbo' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/lisp/clisp.vim b/vim-plugins/bundle/syntastic/syntax_checkers/lisp/clisp.vim
new file mode 100644
index 0000000..26de435
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/lisp/clisp.vim
@@ -0,0 +1,57 @@
+"============================================================================
+"File:        lisp.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Karl Yngve Lervåg <karl.yngve@lervag.net>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_lisp_clisp_checker')
+    finish
+endif
+let g:loaded_syntastic_lisp_clisp_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_lisp_clisp_GetLocList() dict
+    let tmpdir = syntastic#util#tmpdir()
+    let out = tmpdir !=# '.' ? ('-o ' . syntastic#util#shescape(tmpdir . syntastic#util#Slash() . 'syntastic_' . getpid())) : ''
+
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-q',
+        \ 'fname_before': '-c',
+        \ 'post_args_after': out })
+
+    let errorformat  =
+        \ '%-G;%.%#,' .
+        \ '%W%>WARNING:%.%# line %l : %m,' .
+        \ '%Z  %#%m,' .
+        \ '%W%>WARNING:%.%# lines %l%\%.%\%.%\d%\+ : %m,' .
+        \ '%Z  %#%m,' .
+        \ '%E%>The following functions were %m,' .
+        \ '%Z %m,' .
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')} })
+
+    call syntastic#util#rmrf(tmpdir)
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'lisp',
+    \ 'name': 'clisp'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/llvm/llvm.vim b/vim-plugins/bundle/syntastic/syntax_checkers/llvm/llvm.vim
new file mode 100644
index 0000000..7e90314
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/llvm/llvm.vim
@@ -0,0 +1,39 @@
+"============================================================================
+"File:        llvm.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Andrew Kelley <superjoe30@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_llvm_llvm_checker')
+    finish
+endif
+let g:loaded_syntastic_llvm_llvm_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_llvm_llvm_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': syntastic#c#NullOutput() })
+
+    let errorformat = 'llc: %f:%l:%c: %trror: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'llvm',
+    \ 'name': 'llvm',
+    \ 'exec': 'llc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/lua/luac.vim b/vim-plugins/bundle/syntastic/syntax_checkers/lua/luac.vim
new file mode 100644
index 0000000..f37e923
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/lua/luac.vim
@@ -0,0 +1,65 @@
+"============================================================================
+"File:        lua.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_lua_luac_checker')
+    finish
+endif
+let g:loaded_syntastic_lua_luac_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_lua_luac_GetHighlightRegex(pos)
+    let result = ''
+    let near = matchstr(a:pos['text'], '\mnear ''\zs[^'']\+\ze''')
+    if near !=# ''
+        if near ==# '<eof>'
+            let p = getpos('$')
+            let a:pos['lnum'] = p[1]
+            let a:pos['col'] = p[2]
+            let result = '\%' . p[2] . 'c'
+        else
+            let result = '\V' . escape(near, '\')
+        endif
+
+        " XXX the following piece of code is evil, and is likely to break
+        " in future versions of syntastic; enable it at your own risk :)
+
+        "let open = matchstr(a:pos['text'], '\m(to close ''\zs[^'']\+\ze'' at line [0-9]\+)')
+        "if open != ''
+        "    let line = str2nr(matchstr(a:pos['text'], '\m(to close ''[^'']\+'' at line \zs[0-9]\+\ze)'))
+        "    let group = a:pos['type'] ==? 'E' ? 'SyntasticError' : 'SyntasticWarning'
+        "    call matchadd(group, '\%' . line . 'l\V' . escape(open, '\'))
+        "endif
+    endif
+    return result
+endfunction
+
+function! SyntaxCheckers_lua_luac_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-p' })
+
+    let errorformat = '%*\f: %#%f:%l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': { 'bufnr': bufnr(''), 'type': 'E' } })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'lua',
+    \ 'name': 'luac'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/lua/luacheck.vim b/vim-plugins/bundle/syntastic/syntax_checkers/lua/luacheck.vim
new file mode 100644
index 0000000..5c8521d
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/lua/luacheck.vim
@@ -0,0 +1,67 @@
+"============================================================================
+"File:        luacheck.vim
+"Description: Lua static analysis using luacheck
+"Maintainer:  Thiago Bastos <tbastos@tbastos.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_lua_luacheck_checker')
+    finish
+endif
+let g:loaded_syntastic_lua_luacheck_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_lua_luacheck_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\m''\zs\S\+\ze''')
+    if term !=# ''
+        return '\V\<' . escape(term, '\') . '\>'
+    endif
+
+    let term = matchstr(a:item['text'], '\m\(accessing undefined\|setting non-standard global\|' .
+                \ 'setting non-module global\|unused global\) variable \zs\S\+')
+    if term ==# ''
+        let term = matchstr(a:item['text'], '\mvariable \zs\S\+\ze was previously defined')
+    endif
+    if term ==# ''
+        let term = matchstr(a:item['text'], '\munused \(variable\|argument\|loop variable\) \zs\S\+')
+    endif
+    if term ==# ''
+        let term = matchstr(a:item['text'], '\m\(value assigned to variable\|value of argument\|' .
+                \ 'value of loop variable\) \zs\S\+')
+    endif
+    if term ==# ''
+        let term = matchstr(a:item['text'], '\mvariable \zs\S\+\ze is never set')
+    endif
+
+    return term !=# '' ? '\V\<' . escape(term, '\') . '\>' : ''
+endfunction
+
+function! SyntaxCheckers_lua_luacheck_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '--no-color' })
+
+    let errorformat =
+        \ '%f:%l:%c: %m,'.
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'defaults': { 'type': 'W' },
+        \ 'returns': [0, 1, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'lua',
+    \ 'name': 'luacheck' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/markdown/mdl.vim b/vim-plugins/bundle/syntastic/syntax_checkers/markdown/mdl.vim
new file mode 100644
index 0000000..17dc86d
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/markdown/mdl.vim
@@ -0,0 +1,45 @@
+"============================================================================
+"File:        mdl.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Charles Beynon <etothepiipower at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_markdown_mdl_checker')
+    finish
+endif
+let g:loaded_syntastic_markdown_mdl_checker = 1
+
+if !exists('g:syntastic_markdown_mdl_sort')
+    let g:syntastic_markdown_mdl_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_markdown_mdl_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args': '--warnings' })
+
+    let errorformat =
+        \ '%E%f:%\s%\=%l: %m,'.
+        \ '%W%f: Kramdown Warning: %m found on line %l'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'markdown',
+    \ 'name': 'mdl'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/markdown/proselint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/markdown/proselint.vim
new file mode 100644
index 0000000..3f27574
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/markdown/proselint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        proselint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_markdown_proselint_checker')
+    finish
+endif
+let g:loaded_syntastic_markdown_proselint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'markdown',
+    \ 'name': 'proselint',
+    \ 'redirect': 'text/proselint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/markdown/textlint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/markdown/textlint.vim
new file mode 100644
index 0000000..3419d4d
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/markdown/textlint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        textlint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_markdown_textlint_checker')
+    finish
+endif
+let g:loaded_syntastic_markdown_textlint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'markdown',
+    \ 'name': 'textlint',
+    \ 'redirect': 'text/textlint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/matlab/mlint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/matlab/mlint.vim
new file mode 100644
index 0000000..dfb1593
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/matlab/mlint.vim
@@ -0,0 +1,41 @@
+"============================================================================
+"File:        matlab.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Jason Graham <jason at the-graham dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_matlab_mlint_checker')
+    finish
+endif
+let g:loaded_syntastic_matlab_mlint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_matlab_mlint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-id' })
+
+    let errorformat =
+        \ 'L %l (C %c): %*[a-zA-Z0-9]: %m,'.
+        \ 'L %l (C %c-%*[0-9]): %*[a-zA-Z0-9]: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'matlab',
+    \ 'name': 'mlint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/mercury/mmc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/mercury/mmc.vim
new file mode 100644
index 0000000..75ee654
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/mercury/mmc.vim
@@ -0,0 +1,49 @@
+"============================================================================
+"File:        mercury.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Joshua Rahm (joshuarahm@gmail.com)
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_mercury_mmc_checker')
+    finish
+endif
+let g:loaded_syntastic_mercury_mmc_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_mercury_mmc_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_before': '-e' })
+
+    let errorformat =
+        \ '%C%f:%l:  %m,' .
+        \ '%E%f:%l: %m,' .
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+
+    for e in loclist
+        if stridx(e['text'], ' warning:') >= 0
+            let e['type'] = 'W'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'mercury',
+    \ 'name': 'mmc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/nasm/nasm.vim b/vim-plugins/bundle/syntastic/syntax_checkers/nasm/nasm.vim
new file mode 100644
index 0000000..7ea86d1
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/nasm/nasm.vim
@@ -0,0 +1,41 @@
+"============================================================================
+"File:        nasm.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  HÃ¥vard Pettersson <haavard.pettersson at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_nasm_nasm_checker')
+    finish
+endif
+let g:loaded_syntastic_nasm_nasm_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_nasm_nasm_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-X gnu' .
+        \       ' -I ' . syntastic#util#shescape(expand('%:p:h', 1) . syntastic#util#Slash()) .
+        \       ' ' . syntastic#c#NullOutput() })
+
+    let errorformat = '%f:%l: %t%*[^:]: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'nasm',
+    \ 'name': 'nasm'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/nix/nix.vim b/vim-plugins/bundle/syntastic/syntax_checkers/nix/nix.vim
new file mode 100644
index 0000000..f3c449d
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/nix/nix.vim
@@ -0,0 +1,45 @@
+"============================================================================
+"File:        nix.vim
+"Description: Check nix syntax using 'nix-instantiate --eval-only'
+"Maintainer:  Tim Cuthbertson <tim@gfxmonk.net>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+"
+"
+if exists('g:loaded_syntastic_nix_nix_checker')
+    finish
+endif
+let g:loaded_syntastic_nix_nix_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_nix_nix_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '--parse-only' })
+
+    let errorformat =
+        \ '%f:%l:%c:%m,' .
+        \ '%f:%l:%m,' .
+        \ '%f:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'type': 'e'},
+        \ 'preprocess': 'nix' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'nix',
+    \ 'name': 'nix',
+    \ 'exec': 'nix-instantiate' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/nroff/igor.vim b/vim-plugins/bundle/syntastic/syntax_checkers/nroff/igor.vim
new file mode 100644
index 0000000..dcad8c5
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/nroff/igor.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        igor.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_nroff_igor_checker')
+    finish
+endif
+let g:loaded_syntastic_nroff_igor_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'nroff',
+    \ 'name': 'igor',
+    \ 'redirect': 'docbk/igor'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/nroff/mandoc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/nroff/mandoc.vim
new file mode 100644
index 0000000..8efc4ce
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/nroff/mandoc.vim
@@ -0,0 +1,41 @@
+"============================================================================
+"File:        mandoc.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_nroff_mandoc_checker')
+    finish
+endif
+let g:loaded_syntastic_nroff_mandoc_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_nroff_mandoc_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-Tlint' })
+
+    let errorformat =
+        \ '%E%f:%l:%c: %tRROR: %m,' .
+        \ '%W%f:%l:%c: %tARNING: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 2, 3, 4] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'nroff',
+    \ 'name': 'mandoc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/nroff/proselint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/nroff/proselint.vim
new file mode 100644
index 0000000..d969490
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/nroff/proselint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        proselint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_nroff_proselint_checker')
+    finish
+endif
+let g:loaded_syntastic_nroff_proselint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'nroff',
+    \ 'name': 'proselint',
+    \ 'redirect': 'text/proselint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/objc/gcc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/objc/gcc.vim
new file mode 100644
index 0000000..73da7f8
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/objc/gcc.vim
@@ -0,0 +1,59 @@
+"============================================================================
+"File:        objc.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_objc_gcc_checker')
+    finish
+endif
+let g:loaded_syntastic_objc_gcc_checker = 1
+
+if !exists('g:syntastic_objc_compiler_options')
+    let g:syntastic_objc_compiler_options = '-std=gnu99'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_objc_gcc_IsAvailable() dict
+    if !exists('g:syntastic_objc_compiler')
+        let g:syntastic_objc_compiler = executable(self.getExec()) ? self.getExec() : 'clang'
+    endif
+    call self.log('g:syntastic_objc_compiler =', g:syntastic_objc_compiler)
+    return executable(expand(g:syntastic_objc_compiler, 1))
+endfunction
+
+function! SyntaxCheckers_objc_gcc_GetLocList() dict
+    return syntastic#c#GetLocList('objc', 'gcc', {
+        \ 'errorformat':
+        \     '%-G%f:%s:,' .
+        \     '%-G%f:%l: %#error: %#(Each undeclared identifier is reported only%.%#,' .
+        \     '%-G%f:%l: %#error: %#for each function it appears%.%#,' .
+        \     '%-GIn file included%.%#,'.
+        \     '%-G %#from %f:%l\,,' .
+        \     '%f:%l:%c: %trror: %m,' .
+        \     '%f:%l:%c: %tarning: %m,' .
+        \     '%f:%l:%c: %m,' .
+        \     '%f:%l: %trror: %m,' .
+        \     '%f:%l: %tarning: %m,' .
+        \     '%f:%l: %m',
+        \ 'main_flags': '-x objective-c -fsyntax-only',
+        \ 'header_flags': '-x objective-c-header -lobjc',
+        \ 'header_names': '\m\.h$' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'objc',
+    \ 'name': 'gcc' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/objc/oclint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/objc/oclint.vim
new file mode 100644
index 0000000..534d82b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/objc/oclint.vim
@@ -0,0 +1,22 @@
+"============================================================================
+"File:        oclint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  "UnCO" Lin <undercooled aT lavabit com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_objc_oclint_checker')
+    finish
+endif
+let g:loaded_syntastic_objc_oclint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'objc',
+    \ 'name': 'oclint',
+    \ 'redirect': 'c/oclint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/objcpp/gcc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/objcpp/gcc.vim
new file mode 100644
index 0000000..6ae7ba5
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/objcpp/gcc.vim
@@ -0,0 +1,59 @@
+"============================================================================
+"File:        objcpp.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_objcpp_gcc_checker')
+    finish
+endif
+let g:loaded_syntastic_objcpp_gcc_checker = 1
+
+if !exists('g:syntastic_objcpp_compiler_options')
+    let g:syntastic_objcpp_compiler_options = '-std=gnu99'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_objcpp_gcc_IsAvailable() dict
+    if !exists('g:syntastic_c_compiler')
+        let g:syntastic_objcpp_compiler = executable(self.getExec()) ? self.getExec() : 'clang'
+    endif
+    call self.log('g:syntastic_objcpp_compiler =', g:syntastic_objcpp_compiler)
+    return executable(expand(g:syntastic_objcpp_compiler, 1))
+endfunction
+
+function! SyntaxCheckers_objcpp_gcc_GetLocList() dict
+    return syntastic#c#GetLocList('objcpp', 'gcc', {
+        \ 'errorformat':
+        \     '%-G%f:%s:,' .
+        \     '%-G%f:%l: %#error: %#(Each undeclared identifier is reported only%.%#,' .
+        \     '%-G%f:%l: %#error: %#for each function it appears%.%#,' .
+        \     '%-GIn file included%.%#,'.
+        \     '%-G %#from %f:%l\,,' .
+        \     '%f:%l:%c: %trror: %m,' .
+        \     '%f:%l:%c: %tarning: %m,' .
+        \     '%f:%l:%c: %m,' .
+        \     '%f:%l: %trror: %m,' .
+        \     '%f:%l: %tarning: %m,' .
+        \     '%f:%l: %m',
+        \ 'main_flags': '-x objective-c++ -fsyntax-only',
+        \ 'header_flags': '-x objective-c++-header -lobjc',
+        \ 'header_names': '\m\.h$' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'objcpp',
+    \ 'name': 'gcc' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/objcpp/oclint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/objcpp/oclint.vim
new file mode 100644
index 0000000..5528258
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/objcpp/oclint.vim
@@ -0,0 +1,22 @@
+"============================================================================
+"File:        oclint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  "UnCO" Lin <undercooled aT lavabit com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_objcpp_oclint_checker')
+    finish
+endif
+let g:loaded_syntastic_objcpp_oclint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'objcpp',
+    \ 'name': 'oclint',
+    \ 'redirect': 'c/oclint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/ocaml/camlp4o.vim b/vim-plugins/bundle/syntastic/syntax_checkers/ocaml/camlp4o.vim
new file mode 100644
index 0000000..f7f34e7
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/ocaml/camlp4o.vim
@@ -0,0 +1,130 @@
+"============================================================================
+"File:        ocaml.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Török Edwin <edwintorok at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_ocaml_camlp4o_checker')
+    finish
+endif
+let g:loaded_syntastic_ocaml_camlp4o_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Checker options {{{1
+
+if !exists('g:syntastic_ocaml_use_ocamlc') || !executable('ocamlc')
+    let g:syntastic_ocaml_use_ocamlc = 0
+endif
+
+if !exists('g:syntastic_ocaml_use_janestreet_core')
+    let g:syntastic_ocaml_use_janestreet_core = 0
+endif
+
+if !exists('g:syntastic_ocaml_janestreet_core_dir')
+    let g:syntastic_ocaml_janestreet_core_dir = '.'
+endif
+
+if !exists('g:syntastic_ocaml_use_ocamlbuild') || !executable('ocamlbuild')
+    let g:syntastic_ocaml_use_ocamlbuild = 0
+endif
+
+" }}}1
+
+function! SyntaxCheckers_ocaml_camlp4o_IsAvailable() dict " {{{1
+    let s:ocamlpp = get(g:, 'syntastic_ocaml_camlp4r', 0) ? 'camlp4r' : 'camlp4o'
+    return executable(s:ocamlpp)
+endfunction " }}}1
+
+function! SyntaxCheckers_ocaml_camlp4o_GetLocList() dict " {{{1
+    let makeprg = s:GetMakeprg()
+    if makeprg ==# ''
+        return []
+    endif
+
+    let errorformat =
+        \ '%WWarning: File "%f"\, line %l\, chars %c-%n:,'.
+        \ '%WWarning: line %l\, chars %c-%n:,'.
+        \ '%AFile "%f"\, line %l\, characters %c-%n:,'.
+        \ '%AFile "%f"\, line %l\, characters %c-%*\d (end at line %*\d\, character %*\d):,'.
+        \ '%AFile "%f"\, line %l\, character %c:,'.
+        \ '%AFile "%f"\, line %l\, character %c:%m,'.
+        \ '%-GPreprocessing error %.%#,'.
+        \ '%-GCommand exited %.%#,'.
+        \ '%C%tarning %*\d: %m,'.
+        \ '%C%m,'.
+        \ '%-G+%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')} })
+
+    for e in loclist
+        if get(e, 'col', 0) && get(e, 'nr', 0)
+            let e['hl'] = '\%>' . (e['col'] - 1) . 'c\%<' . (e['nr'] + 1) . 'c'
+            let e['nr'] = 0
+        endif
+    endfor
+
+    return loclist
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:GetMakeprg() " {{{2
+    return
+        \ g:syntastic_ocaml_use_ocamlc ? g:syntastic_ocaml_use_ocamlc :
+        \ (g:syntastic_ocaml_use_ocamlbuild && isdirectory('_build')) ? s:GetOcamlcMakeprg() :
+        \ s:GetOtherMakeprg()
+endfunction " }}}2
+
+function! s:GetOcamlcMakeprg() " {{{2
+    let build_cmd = g:syntastic_ocaml_use_janestreet_core ?
+        \ 'ocamlc -I ' . syntastic#util#shexpand(g:syntastic_ocaml_janestreet_core_dir) : 'ocamlc'
+    let build_cmd .= ' -c ' . syntastic#util#shexpand('%')
+    return build_cmd
+endfunction " }}}2
+
+function! s:GetOcamlBuildMakeprg() " {{{2
+    return 'ocamlbuild -quiet -no-log -tag annot,' . s:ocamlpp . ' -no-links -no-hygiene -no-sanitize ' .
+        \ syntastic#util#shexpand('%:r') . '.cmi'
+endfunction " }}}2
+
+function! s:GetOtherMakeprg() " {{{2
+    "TODO: give this function a better name?
+    "
+    "TODO: should use throw/catch instead of returning an empty makeprg
+
+    let extension = expand('%:e', 1)
+    let makeprg = ''
+
+    if stridx(extension, 'mly') >= 0 && executable('menhir')
+        " ocamlyacc output can't be redirected, so use menhir
+        let makeprg = 'menhir --only-preprocess ' . syntastic#util#shexpand('%') . ' >' . syntastic#util#DevNull()
+    elseif stridx(extension,'mll') >= 0 && executable('ocamllex')
+        let makeprg = 'ocamllex -q ' . syntastic#c#NullOutput() . ' ' . syntastic#util#shexpand('%')
+    else
+        let makeprg = 'camlp4o ' . syntastic#c#NullOutput() . ' ' . syntastic#util#shexpand('%')
+    endif
+
+    return makeprg
+endfunction " }}}2
+
+" }}}1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ocaml',
+    \ 'name': 'camlp4o'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/perl/perl.vim b/vim-plugins/bundle/syntastic/syntax_checkers/perl/perl.vim
new file mode 100644
index 0000000..ca3d0d7
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/perl/perl.vim
@@ -0,0 +1,94 @@
+"============================================================================
+"File:        perl.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  Anthony Carapetis <anthony.carapetis at gmail dot com>,
+"             Eric Harmon <http://eharmon.net>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+"
+" Security:
+"
+" This checker runs 'perl -c' against your file, which in turn executes
+" any BEGIN, UNITCHECK, and CHECK blocks, and any use statements in
+" your file.  This is probably fine if you wrote the file yourself,
+" but it can be a problem if you're trying to check third party files.
+" If you are 100% willing to let Vim run the code in your file, set
+" g:syntastic_enable_perl_checker to 1 in your vimrc to enable this
+" checker:
+"
+"   let g:syntastic_enable_perl_checker = 1
+"
+" Reference:
+"
+" - http://perldoc.perl.org/perlrun.html#*-c*
+
+if exists('g:loaded_syntastic_perl_perl_checker')
+    finish
+endif
+let g:loaded_syntastic_perl_perl_checker = 1
+
+if !exists('g:syntastic_perl_lib_path')
+    let g:syntastic_perl_lib_path = []
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_perl_perl_IsAvailable() dict " {{{1
+    if !exists('g:syntastic_perl_perl_exec') && exists('g:syntastic_perl_interpreter')
+        let g:syntastic_perl_perl_exec = g:syntastic_perl_interpreter
+    endif
+
+    " don't call executable() here, to allow things like
+    " let g:syntastic_perl_interpreter='/usr/bin/env perl'
+    silent! call syntastic#util#system(self.getExecEscaped() . ' -e ' . syntastic#util#shescape('exit(0)'))
+    return v:shell_error == 0
+endfunction " }}}1
+
+function! SyntaxCheckers_perl_perl_GetLocList() dict " {{{1
+    if type(g:syntastic_perl_lib_path) == type('')
+        call syntastic#log#oneTimeWarn('variable g:syntastic_perl_lib_path should be a list')
+        let includes = split(g:syntastic_perl_lib_path, ',')
+    else
+        let includes = copy(syntastic#util#var('perl_lib_path', []))
+    endif
+    let shebang = syntastic#util#parseShebang()
+    let extra = map(includes, '"-I" . v:val') +
+        \ (index(shebang['args'], '-T') >= 0 ? ['-T'] : []) +
+        \ (index(shebang['args'], '-t') >= 0 ? ['-t'] : [])
+    let errorformat = '%f:%l:%m'
+
+    let makeprg = self.makeprgBuild({ 'args_before': ['-c', '-X '] + extra })
+
+    let errors = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'perl',
+        \ 'defaults': {'type': 'E'} })
+    if !empty(errors)
+        return errors
+    endif
+
+    let makeprg = self.makeprgBuild({ 'args_before': ['-c', '-Mwarnings'] + extra })
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'perl',
+        \ 'defaults': {'type': 'W'} })
+endfunction " }}}1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'perl',
+    \ 'name': 'perl',
+    \ 'enable': 'enable_perl_checker'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/perl/perlcritic.vim b/vim-plugins/bundle/syntastic/syntax_checkers/perl/perlcritic.vim
new file mode 100644
index 0000000..abe9f43
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/perl/perlcritic.vim
@@ -0,0 +1,52 @@
+"============================================================================
+"File:        perlcritic.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_perl_perlcritic_checker')
+    finish
+endif
+let g:loaded_syntastic_perl_perlcritic_checker = 1
+
+if !exists('g:syntastic_perl_perlcritic_thres')
+    let g:syntastic_perl_perlcritic_thres = 5
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_perl_perlcritic_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '--quiet --nocolor --verbose "\%s:\%f:\%l:\%c:(\%s) \%m (\%e)\n"' })
+
+    let errorformat = '%t:%f:%l:%c:%m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 2],
+        \ 'subtype': 'Style' })
+
+    " change error types according to the prescribed threshold
+    for e in loclist
+        let e['type'] = e['type'] < g:syntastic_perl_perlcritic_thres ? 'W' : 'E'
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'perl',
+    \ 'name': 'perlcritic'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/perl/podchecker.vim b/vim-plugins/bundle/syntastic/syntax_checkers/perl/podchecker.vim
new file mode 100644
index 0000000..cad39bd
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/perl/podchecker.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        podchecker.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_perl_podchecker_checker')
+    finish
+endif
+let g:loaded_syntastic_perl_podchecker_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'perl',
+    \ 'name': 'podchecker',
+    \ 'redirect': 'pod/podchecker'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/php/php.vim b/vim-plugins/bundle/syntastic/syntax_checkers/php/php.vim
new file mode 100644
index 0000000..5b118f6
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/php/php.vim
@@ -0,0 +1,52 @@
+"============================================================================
+"File:        php.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_php_php_checker')
+    finish
+endif
+let g:loaded_syntastic_php_php_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_php_php_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], "\\munexpected '\\zs[^']\\+\\ze'")
+    return term !=# '' ? '\V' . escape(term, '\') : ''
+endfunction
+
+function! SyntaxCheckers_php_php_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-d error_reporting=E_ALL',
+        \ 'args_after': '-l -d display_errors=1 -d log_errors=0 -d xdebug.cli_color=0' })
+
+    let errorformat =
+        \ '%-GNo syntax errors detected in%.%#,'.
+        \ 'Parse error: %#syntax %trror\, %m in %f on line %l,'.
+        \ 'Parse %trror: %m in %f on line %l,'.
+        \ 'Fatal %trror: %m in %f on line %l,'.
+        \ '%-G\s%#,'.
+        \ '%-GErrors parsing %.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['guards'] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'php',
+    \ 'name': 'php'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/php/phpcs.vim b/vim-plugins/bundle/syntastic/syntax_checkers/php/phpcs.vim
new file mode 100644
index 0000000..1bd8f98
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/php/phpcs.vim
@@ -0,0 +1,41 @@
+"============================================================================
+"File:        phpcs.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_php_phpcs_checker')
+    finish
+endif
+let g:loaded_syntastic_php_phpcs_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_php_phpcs_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '--report=csv' })
+
+    let errorformat =
+        \ '%-GFile\,Line\,Column\,Type\,Message\,Source\,Severity%.%#,'.
+        \ '"%f"\,%l\,%c\,%t%*[a-zA-Z]\,"%m"\,%*[a-zA-Z0-9_.-]\,%*[0-9]%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'php',
+    \ 'name': 'phpcs' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/php/phplint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/php/phplint.vim
new file mode 100644
index 0000000..d04f3ba
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/php/phplint.vim
@@ -0,0 +1,91 @@
+"============================================================================
+"File:        phplint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_php_phplint_checker')
+    finish
+endif
+let g:loaded_syntastic_php_phplint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_php_phplint_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\munresolved function \zs\S\+\ze')
+    if term !=# ''
+        return '\V' . escape(term, '\')
+    endif
+    let term = matchstr(a:item['text'], '\m\(class\|function\|method\) \zs\S\+\ze was declared as')
+    if term !=# ''
+        return '\V' . escape(term, '\')
+    endif
+    let term = matchstr(a:item['text'], '\maccess forbidden to \(private\|protected\) \(class\|constant\|method\|variable\|\(private\|protected\) property\) \zs\S\+\ze')
+    if term !=# ''
+        return '\V' . escape(term, '\')
+    endif
+    let term = matchstr(a:item['text'], '\musing deprecated \(class\|constant\|method\|property\|variable\) \zs\S\+\ze')
+    if term !=# ''
+        return '\V' . escape(term, '\')
+    endif
+    let term = matchstr(a:item['text'], '\munresolved function \zs\S\+\ze')
+    if term !=# ''
+        return '\V' . escape(term, '\')
+    endif
+    let term = matchstr(a:item['text'], '\munresolved function \zs\S\+\ze')
+    if term !=# ''
+        return '\V' . escape(term, '\')
+    endif
+    let term = matchstr(a:item['text'], '\munresolved function \zs\S\+\ze')
+    return term !=# '' ? '\V' . escape(term, '\') : ''
+endfunction
+
+function! SyntaxCheckers_php_phplint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after':
+        \   '--print-file-name ' .
+        \   '--print-line-numbers ' .
+        \   '--print-column-number ' .
+        \   '--print-errors ' .
+        \   '--print-warnings ' .
+        \   '--no-print-notices ' .
+        \   '--no-print-context ' .
+        \   '--no-print-source ' .
+        \   '--tab-size ' . &tabstop })
+
+    let errorformat =
+        \ '%E%f:%l:%v: %tRROR: %m,' .
+        \ '%W%f:%l:%v: %tarning: %m,' .
+        \ '%+C%\t%.%#,' .
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['compressWhitespace'],
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1] })
+
+    for e in loclist
+        let e['text'] = substitute(e['text'], '\m \(Hint\|Examples\):.*', '', '')
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'php',
+    \ 'name': 'phplint',
+    \ 'exec': 'phpl' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/php/phpmd.vim b/vim-plugins/bundle/syntastic/syntax_checkers/php/phpmd.vim
new file mode 100644
index 0000000..5207d3d
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/php/phpmd.vim
@@ -0,0 +1,77 @@
+"============================================================================
+"File:        phpmd.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_php_phpmd_checker')
+    finish
+endif
+let g:loaded_syntastic_php_phpmd_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_php_phpmd_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\m\C^The \S\+ \w\+\(()\)\= \(has\|is not\|utilizes\)')
+    if term !=# ''
+        return '\V'.substitute(term, '\m\C^The \S\+ \(\w\+\)\(()\)\= .*', '\1', '')
+    endif
+    let term = matchstr(a:item['text'], '\m\C^Avoid \(variables with short\|excessively long variable\) names like \S\+\.')
+    if term !=# ''
+        return '\V'.substitute(term, '\m\C^Avoid \(variables with short\|excessively long variable\) names like \(\S\+\)\..*', '\2', '')
+    endif
+    let term = matchstr(a:item['text'], '\m\C^Avoid using short method names like \S\+::\S\+()\.')
+    if term !=# ''
+        return '\V'.substitute(term, '\m\C^Avoid using short method names like \S\+::\(\S\+\)()\..*', '\1', '')
+    endif
+    let term = matchstr(a:item['text'], '\m\C^\S\+ accesses the super-global variable ')
+    if term !=# ''
+        return '\V'.substitute(term, '\m\C accesses the super-global variable .*$', '', '')
+    endif
+    let term = matchstr(a:item['text'], '\m\C^Constant \S\+ should be defined in uppercase')
+    if term !=# ''
+        return '\V'.substitute(term, '\m\C^Constant \(\S\+\) should be defined in uppercase', '\1', '')
+    endif
+    let term = matchstr(a:item['text'], "\\m\\C^The '\\S\\+()' method which returns ")
+    if term !=# ''
+        return '\V'.substitute(term, "\\m\\C^The '\\(\\S\\+\\)()' method which returns.*", '\1', '')
+    endif
+    let term = matchstr(a:item['text'], '\m\C variable \S\+ should begin with ')
+    if term !=# ''
+        return '\V'.substitute(term, '\m\C.* variable \(\S\+\) should begin with .*', '\1', '')
+    endif
+    let term = matchstr(a:item['text'], "\\m\\C^Avoid unused \\(private fields\\|local variables\\|private methods\\|parameters\\) such as '\\S\\+'")
+    if term !=# ''
+        return '\V'.substitute(term, "\\m\\C^Avoid unused \\(private fields\\|local variables\\|private methods\\|parameters\\) such as '\\(\\S\\+\\)'.*", '\2', '')
+    endif
+    return ''
+endfunction
+
+function! SyntaxCheckers_php_phpmd_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'post_args_before': 'text',
+        \ 'post_args': 'codesize,design,unusedcode,naming' })
+
+    let errorformat = '%E%f:%l%\s%#%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype' : 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'php',
+    \ 'name': 'phpmd'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/po/msgfmt.vim b/vim-plugins/bundle/syntastic/syntax_checkers/po/msgfmt.vim
new file mode 100644
index 0000000..1d09733
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/po/msgfmt.vim
@@ -0,0 +1,50 @@
+"============================================================================
+"File:        msgfmt.vim
+"Description: Syntax checking plugin for po files of gettext
+"Maintainer:  Ryo Okubo <syucream1031@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_po_msgfmt_checker')
+    finish
+endif
+let g:loaded_syntastic_po_msgfmt_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_po_msgfmt_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\mkeyword "\zs[^"]\+\ze" unknown')
+    return term !=# '' ? '\V' . escape(term, '\') : ''
+endfunction
+
+function! SyntaxCheckers_po_msgfmt_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-c ' . syntastic#c#NullOutput() })
+
+    let errorformat =
+        \ '%W%f:%l: warning: %m,' .
+        \ '%E%f:%l:%v: %m,' .
+        \ '%E%f:%l: %m,' .
+        \ '%+C %.%#,' .
+        \ '%Z%p^,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['compressWhitespace'] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'po',
+    \ 'name': 'msgfmt'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/pod/podchecker.vim b/vim-plugins/bundle/syntastic/syntax_checkers/pod/podchecker.vim
new file mode 100644
index 0000000..9ef5dca
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/pod/podchecker.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"File:        podchecker.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_pod_podchecker_checker')
+    finish
+endif
+let g:loaded_syntastic_pod_podchecker_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_pod_podchecker_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%W%[%#]%[%#]%[%#] WARNING: %m at line %l in file %f,' .
+        \ '%W%[%#]%[%#]%[%#] WARNING: %m at line EOF in file %f,' .
+        \ '%E%[%#]%[%#]%[%#] ERROR: %m at line %l in file %f,' .
+        \ '%E%[%#]%[%#]%[%#] ERROR: %m at line EOF in file %f'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1, 2] })
+
+    for e in loclist
+        if e['valid'] && e['lnum'] == 0
+            let e['lnum'] = str2nr(matchstr(e['text'], '\m\<line \zs\d\+\ze'))
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'pod',
+    \ 'name': 'podchecker'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/pod/proselint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/pod/proselint.vim
new file mode 100644
index 0000000..bcb67b2
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/pod/proselint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        proselint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_pod_proselint_checker')
+    finish
+endif
+let g:loaded_syntastic_pod_proselint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'pod',
+    \ 'name': 'proselint',
+    \ 'redirect': 'text/proselint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/pug/pug_lint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/pug/pug_lint.vim
new file mode 100644
index 0000000..880838e
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/pug/pug_lint.vim
@@ -0,0 +1,40 @@
+"============================================================================
+"File:        pug_lint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Ben Parnell <benjaminparnell.94@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_pug_pug_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_pug_pug_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_pug_pug_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-r inline' })
+
+    let errorformat = '%f:%l:%c %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'pug',
+    \ 'name': 'pug_lint',
+    \ 'exec': 'pug-lint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/puppet/puppet.vim b/vim-plugins/bundle/syntastic/syntax_checkers/puppet/puppet.vim
new file mode 100644
index 0000000..83077c7
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/puppet/puppet.vim
@@ -0,0 +1,47 @@
+"============================================================================
+"File:        puppet.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Eivind Uggedal <eivind at uggedal dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_puppet_puppet_checker')
+    finish
+endif
+let g:loaded_syntastic_puppet_puppet_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_puppet_puppet_GetLocList() dict
+    if !exists('s:puppet_new')
+        let s:puppet_new = syntastic#util#versionIsAtLeast(self.getVersion(), [2, 7, 0])
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': (s:puppet_new ? 'parser validate --color=false' : '--color=false --parseonly') })
+
+    let errorformat =
+        \ '%-Gerr: Try ''puppet help parser validate'' for usage,' .
+        \ '%-GError: Try ''puppet help parser validate'' for usage,' .
+        \ '%A%t%*[a-zA-Z]: %m at %f:%l:%c,' .
+        \ '%A%t%*[a-zA-Z]: %m at %f:%l'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'puppet',
+    \ 'name': 'puppet'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/puppet/puppetlint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/puppet/puppetlint.vim
new file mode 100644
index 0000000..a492db6
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/puppet/puppetlint.vim
@@ -0,0 +1,52 @@
+"============================================================================
+"File:        puppetlint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Eivind Uggedal <eivind at uggedal dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_puppet_puppetlint_checker')
+    finish
+endif
+let g:loaded_syntastic_puppet_puppetlint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_puppet_puppetlint_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    let s:puppetlint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [1])
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 2])
+endfunction
+
+function! SyntaxCheckers_puppet_puppetlint_GetLocList() dict
+    call syntastic#log#deprecationWarn('puppet_lint_arguments', 'puppet_puppetlint_args')
+
+    let makeprg = self.makeprgBuild({
+        \ 'args_after':
+        \       '--log-format "%{KIND} [%{check}] %{message} at %{fullpath}:' .
+        \       (s:puppetlint_new ? '%{line}' : '%{linenumber}') . '"' })
+
+    let errorformat = '%t%*[a-zA-Z] %m at %f:%l'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'puppet',
+    \ 'name': 'puppetlint',
+    \ 'exec': 'puppet-lint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/codec.py b/vim-plugins/bundle/syntastic/syntax_checkers/python/codec.py
new file mode 100755
index 0000000..6e980c7
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/codec.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+from sys import argv, exit
+
+import codecs
+import re
+import os
+
+
+if len(argv) != 2:
+    exit(1)
+
+try:
+    with open(argv[1]) as fle:
+        text = fle.readlines()
+
+    if text:
+        match = re.match(r"#\s*coding\s*:\s*(?P<coding>\w+)", text[0])
+        if match:
+            text = codecs.lookup(match.groupdict()["coding"]).incrementaldecoder().decode(
+                ''.join(text).encode('utf-8')).encode('utf-8')
+
+    if isinstance(text, list):
+        text = ''.join(text).encode('utf-8')
+
+    compile(text, argv[1], 'exec', 0, 1)
+except SyntaxError as err:
+    print('%s:%s:%s: %s' % (err.filename, err.lineno, err.offset, err.msg))
+except Exception as err:
+    print('%s:%s:%s: %s' % (os.path.abspath(argv[1]), 1, 0, err))
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/compile.py b/vim-plugins/bundle/syntastic/syntax_checkers/python/compile.py
new file mode 100755
index 0000000..32f1413
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/compile.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+from sys import argv, exit
+
+
+if len(argv) != 2:
+    exit(1)
+
+try:
+    compile(open(argv[1]).read(), argv[1], 'exec', 0, 1)
+except SyntaxError as err:
+    print('%s:%s:%s: %s' % (err.filename, err.lineno, err.offset, err.msg))
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/flake8.vim b/vim-plugins/bundle/syntastic/syntax_checkers/python/flake8.vim
new file mode 100644
index 0000000..257b69d
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/flake8.vim
@@ -0,0 +1,72 @@
+"============================================================================
+"File:        flake8.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Authors:     Sylvain Soliman <Sylvain dot Soliman+git at gmail dot com>
+"             kstep <me@kstep.me>
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_python_flake8_checker')
+    finish
+endif
+let g:loaded_syntastic_python_flake8_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_python_flake8_GetHighlightRegex(item)
+    return SyntaxCheckers_python_pyflakes_GetHighlightRegex(a:item)
+endfunction
+
+function! SyntaxCheckers_python_flake8_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%E%f:%l: could not compile,%-Z%p^,' .
+        \ '%A%f:%l:%c: %t%n %m,' .
+        \ '%A%f:%l: %t%n %m,' .
+        \ '%-G%.%#'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env })
+
+    for e in loclist
+        " E*** and W*** are pep8 errors
+        " F*** are PyFlakes codes
+        " C*** are McCabe complexity messages
+        " N*** are naming conventions from pep8-naming
+
+        if has_key(e, 'nr')
+            let e['text'] .= printf(' [%s%03d]', e['type'], e['nr'])
+            " E901 are syntax errors
+            " E902 are I/O errors
+            if e['type'] ==? 'E' && e['nr'] !~# '\m^9'
+                let e['subtype'] = 'Style'
+            endif
+            call remove(e, 'nr')
+        endif
+
+        if e['type'] =~? '\m^[CNW]'
+            let e['subtype'] = 'Style'
+        endif
+
+        let e['type'] = e['type'] =~? '\m^[EFC]' ? 'E' : 'W'
+    endfor
+
+    return loclist
+endfunction
+
+runtime! syntax_checkers/python/pyflakes.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'flake8'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/frosted.vim b/vim-plugins/bundle/syntastic/syntax_checkers/python/frosted.vim
new file mode 100644
index 0000000..d642795
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/frosted.vim
@@ -0,0 +1,63 @@
+"============================================================================
+"File:        frosted.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_python_frosted_checker')
+    finish
+endif
+let g:loaded_syntastic_python_frosted_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_python_frosted_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-vb' })
+
+    let errorformat =
+        \ '%f:%l:%c:%m,' .
+        \ '%E%f:%l: %m,' .
+        \ '%-Z%p^,' .
+        \ '%-G%.%#'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'returns': [0, 1] })
+
+    for e in loclist
+        let e['col'] += 1
+
+        let parts = matchlist(e.text, '\v^([EW]\d+):([^:]*):(.+)')
+        if len(parts) >= 4
+            let e['type'] = parts[1][0]
+            let e['text'] = parts[3] . ' [' . parts[1] . ']'
+            let e['hl'] = '\V\<' . escape(parts[2], '\') . '\>'
+        elseif e['text'] =~? '\v^I\d+:'
+            let e['valid'] = 0
+        else
+            let e['vcol'] = 0
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'frosted' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/mypy.vim b/vim-plugins/bundle/syntastic/syntax_checkers/python/mypy.vim
new file mode 100644
index 0000000..19ca1fd
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/mypy.vim
@@ -0,0 +1,36 @@
+"============================================================================
+"File:        mypy.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Author:      Russ Hewgill <Russ dot Hewgill at gmail dot com>
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_python_mypy_checker')
+    finish
+endif
+let g:loaded_syntastic_python_mypy_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_python_mypy_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': { 'type': 'E' },
+        \ 'returns': [0, 1],
+        \ 'preprocess': 'mypy' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'mypy'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/pep257.vim b/vim-plugins/bundle/syntastic/syntax_checkers/python/pep257.vim
new file mode 100644
index 0000000..e59166b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/pep257.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        pep257.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_python_pep257_checker')
+    finish
+endif
+let g:loaded_syntastic_python_pep257_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'pep257',
+    \ 'redirect': 'python/pydocstyle'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/pep8.vim b/vim-plugins/bundle/syntastic/syntax_checkers/python/pep8.vim
new file mode 100644
index 0000000..80ab980
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/pep8.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        pep8.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_python_pep8_checker')
+    finish
+endif
+let g:loaded_syntastic_python_pep8_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'pep8',
+    \ 'redirect': 'python/pycodestyle'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/prospector.vim b/vim-plugins/bundle/syntastic/syntax_checkers/python/prospector.vim
new file mode 100644
index 0000000..c5e4735
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/prospector.vim
@@ -0,0 +1,73 @@
+"============================================================================
+"File:        prospector.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_python_prospector_checker')
+    finish
+endif
+let g:loaded_syntastic_python_prospector_checker = 1
+
+if !exists('g:syntastic_python_prospector_sort')
+    let g:syntastic_python_prospector_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_python_prospector_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 7])
+endfunction
+
+function! SyntaxCheckers_python_prospector_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '--messages-only --absolute-paths --die-on-tool-error --zero-exit --output-format json' })
+
+    let errorformat = '%f:%l:%c: %m'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'preprocess': 'prospector',
+        \ 'returns': [0] })
+
+    for e in loclist
+        if e['text'] =~# '\v\[%(dodgy|mccabe|pep8|pep257|pyroma)\]$'
+            let e['subtype'] = 'Style'
+        endif
+
+        if e['text'] =~# '\v\[pylint\]$'
+            let e['type'] = e['text'] =~? '\m^[CRW]' ? 'W' : 'E'
+        elseif e['text'] =~# '\v\[%(frosted|pep8)\]$'
+            let e['type'] = e['text'] =~? '\m^W' ? 'W' : 'E'
+        elseif e['text'] =~# '\v\[%(dodgy|pyroma|vulture)\]$'
+            let e['type'] = 'W'
+        else
+            let e['type'] = 'E'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'prospector'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/py3kwarn.vim b/vim-plugins/bundle/syntastic/syntax_checkers/python/py3kwarn.vim
new file mode 100644
index 0000000..b0e7771
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/py3kwarn.vim
@@ -0,0 +1,36 @@
+"============================================================================
+"File:        py3kwarn.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Authors:     Liam Curry <liam@curry.name>
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_python_py3kwarn_checker')
+    finish
+endif
+let g:loaded_syntastic_python_py3kwarn_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_python_py3kwarn_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%W%f:%l:%c: %m'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'py3kwarn'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/pycodestyle.vim b/vim-plugins/bundle/syntastic/syntax_checkers/python/pycodestyle.vim
new file mode 100644
index 0000000..3b1e705
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/pycodestyle.vim
@@ -0,0 +1,48 @@
+"============================================================================
+"File:        pycodestyle.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_python_pycodestyle_checker')
+    finish
+endif
+let g:loaded_syntastic_python_pycodestyle_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_python_pycodestyle_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l:%c: %m'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'subtype': 'Style' })
+
+    for e in loclist
+        let e['type'] = e['text'] =~? '^W' ? 'W' : 'E'
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'pycodestyle'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/pydocstyle.vim b/vim-plugins/bundle/syntastic/syntax_checkers/python/pydocstyle.vim
new file mode 100644
index 0000000..05ea6b3
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/pydocstyle.vim
@@ -0,0 +1,66 @@
+"============================================================================
+"File:        pydocstyle.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_python_pydocstyle_checker')
+    finish
+endif
+let g:loaded_syntastic_python_pydocstyle_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_python_pydocstyle_GetLocList() dict
+    if !exists('s:pydocstyle_new')
+        let s:pydocstyle_new = syntastic#util#versionIsAtLeast(self.getVersion(), [0, 3])
+    endif
+
+    let makeprg = self.makeprgBuild({})
+
+    if s:pydocstyle_new
+        let errorformat =
+            \ '%E%f:%l %.%#:,' .
+            \ '%+C        %m'
+    else
+        let errorformat =
+            \ '%E%f:%l:%c%\%.%\%.%\d%\+:%\d%\+: %m,' .
+            \ '%E%f:%l:%c: %m,' .
+            \ '%+C    %m'
+    endif
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'subtype': 'Style',
+        \ 'preprocess': 'killEmpty',
+        \ 'postprocess': ['compressWhitespace'] })
+
+    if s:pydocstyle_new == 0
+        " byte offsets rather than column numbers
+        for e in loclist
+            let e['col'] = get(e, 'col', 0) + 1
+        endfor
+    endif
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'pydocstyle'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/pyflakes.vim b/vim-plugins/bundle/syntastic/syntax_checkers/python/pyflakes.vim
new file mode 100644
index 0000000..d403135
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/pyflakes.vim
@@ -0,0 +1,74 @@
+"============================================================================
+"File:        pyflakes.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Authors:     Martin Grenfell <martin.grenfell@gmail.com>
+"             kstep <me@kstep.me>
+"             Parantapa Bhattacharya <parantapa@gmail.com>
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_python_pyflakes_checker')
+    finish
+endif
+let g:loaded_syntastic_python_pyflakes_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_python_pyflakes_GetHighlightRegex(i)
+    if stridx(a:i['text'], 'is assigned to but never used') >= 0
+        \ || stridx(a:i['text'], 'imported but unused') >= 0
+        \ || stridx(a:i['text'], 'undefined name') >= 0
+        \ || stridx(a:i['text'], 'redefinition of') >= 0
+        \ || stridx(a:i['text'], 'referenced before assignment') >= 0
+        \ || stridx(a:i['text'], 'duplicate argument') >= 0
+        \ || stridx(a:i['text'], 'after other statements') >= 0
+        \ || stridx(a:i['text'], 'shadowed by loop variable') >= 0
+
+        " fun with Python's %r: try "..." first, then '...'
+        let term = matchstr(a:i['text'], '\m^.\{-}"\zs.\{-1,}\ze"')
+        if term !=# ''
+            return '\V\<' . escape(term, '\') . '\>'
+        endif
+
+        let term = matchstr(a:i['text'], '\m^.\{-}''\zs.\{-1,}\ze''')
+        if term !=# ''
+            return '\V\<' . escape(term, '\') . '\>'
+        endif
+    endif
+    return ''
+endfunction
+
+function! SyntaxCheckers_python_pyflakes_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%E%f:%l: could not compile,'.
+        \ '%-Z%p^,'.
+        \ '%E%f:%l:%c: %m,'.
+        \ '%E%f:%l: %m,'.
+        \ '%-G%.%#'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'defaults': {'text': 'Syntax error'} })
+
+    for e in loclist
+        let e['vcol'] = 0
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'pyflakes'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/pylama.vim b/vim-plugins/bundle/syntastic/syntax_checkers/python/pylama.vim
new file mode 100644
index 0000000..d4aab0a
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/pylama.vim
@@ -0,0 +1,79 @@
+"============================================================================
+"File:        pylama.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_python_pylama_checker')
+    finish
+endif
+let g:loaded_syntastic_python_pylama_checker = 1
+
+if !exists('g:syntastic_python_pylama_sort')
+    let g:syntastic_python_pylama_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_python_pylama_GetHighlightRegex(item)
+    return SyntaxCheckers_python_pyflakes_GetHighlightRegex(a:item)
+endfunction
+
+function! SyntaxCheckers_python_pylama_GetLocList() dict
+    if !exists('s:pylama_new')
+        let s:pylama_new = syntastic#util#versionIsAtLeast(self.getVersion(), [4])
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-f pep8' . (s:pylama_new ? ' --force' : '') })
+
+    " TODO: "WARNING:pylama:..." messages are probably a logging bug
+    let errorformat =
+        \ '%-GWARNING:pylama:%.%#,' .
+        \ '%A%f:%l:%c: %m'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env })
+
+    " adjust for weirdness in each checker
+    for e in loclist
+        let e['type'] = e['text'] =~? '\m^[RCW]' ? 'W' : 'E'
+        if e['text'] =~# '\v\[%(isort|mccabe|pep257|pylint)\]$'
+            if has_key(e, 'col')
+                let e['col'] += 1
+            endif
+        endif
+        if e['text'] =~# '\v\[pylint\]$'
+            if has_key(e, 'vcol')
+                let e['vcol'] = 0
+            endif
+        endif
+        if e['text'] =~# '\v\[%(isort|mccabe|pep257|pep8)\]$'
+            let e['subtype'] = 'Style'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+runtime! syntax_checkers/python/pyflakes.vim
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'pylama' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/pylint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/python/pylint.vim
new file mode 100644
index 0000000..884d07a
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/pylint.vim
@@ -0,0 +1,98 @@
+"============================================================================
+"File:        pylint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Parantapa Bhattacharya <parantapa at gmail dot com>
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_python_pylint_checker')
+    finish
+endif
+let g:loaded_syntastic_python_pylint_checker = 1
+
+if !exists('g:syntastic_python_pylint_sort')
+    let g:syntastic_python_pylint_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:pylint_new = -1
+
+function! SyntaxCheckers_python_pylint_IsAvailable() dict " {{{1
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    try
+        " On Windows the version is shown as "pylint-script.py 1.0.0".
+        " On Gentoo Linux it's "pylint-python2.7 0.28.0".
+        " On NixOS, that would be ".pylint-wrapped 0.26.0".
+        " On Arch Linux it's "pylint2 1.1.0".
+        " On new-ish Fedora it's "python3-pylint 1.2.0".
+        " Have you guys considered switching to creative writing yet? ;)
+
+        let version_output = syntastic#util#system(self.getExecEscaped() . ' --version')
+        let pylint_version = filter( split(version_output, '\m, \=\|\n'), 'v:val =~# ''\m^\(python[-0-9]*-\|\.\)\=pylint[-0-9]*\>''' )[0]
+        let parsed_ver = syntastic#util#parseVersion(substitute(pylint_version, '\v^\S+\s+', '', ''))
+        call self.setVersion(parsed_ver)
+
+        let s:pylint_new = syntastic#util#versionIsAtLeast(parsed_ver, [1])
+    catch /\m^Vim\%((\a\+)\)\=:E684/
+        call syntastic#log#ndebug(g:_SYNTASTIC_DEBUG_LOCLIST, 'checker output:', split(version_output, "\n", 1))
+        call syntastic#log#error("checker python/pylint: can't parse version string (abnormal termination?)")
+        let s:pylint_new = -1
+    endtry
+
+    return s:pylint_new >= 0
+endfunction " }}}1
+
+function! SyntaxCheckers_python_pylint_GetLocList() dict " {{{1
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': (s:pylint_new ?
+        \       '-f text --msg-template="{path}:{line}:{column}:{C}: [{symbol}] {msg}" -r n' :
+        \       '-f parseable -r n -i y') })
+
+    let errorformat =
+        \ '%A%f:%l:%c:%t: %m,' .
+        \ '%A%f:%l: %m,' .
+        \ '%A%f:(%l): %m,' .
+        \ '%-Z%p^%.%#,' .
+        \ '%-G%.%#'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'returns': range(32) })
+
+    for e in loclist
+        if !s:pylint_new
+            let e['type'] = e['text'][1]
+        endif
+
+        if e['type'] =~? '\m^[EF]'
+            let e['type'] = 'E'
+        elseif e['type'] =~? '\m^[CRW]'
+            let e['type'] = 'W'
+        else
+            let e['valid'] = 0
+        endif
+
+        let e['col'] += 1
+        let e['vcol'] = 0
+    endfor
+
+    return loclist
+endfunction " }}}1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'pylint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/python/python.vim b/vim-plugins/bundle/syntastic/syntax_checkers/python/python.vim
new file mode 100644
index 0000000..17ad2c9
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/python/python.vim
@@ -0,0 +1,57 @@
+"============================================================================
+"File:        python.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_python_python_checker')
+    finish
+endif
+let g:loaded_syntastic_python_python_checker = 1
+
+if !exists('g:syntastic_python_python_use_codec')
+    let g:syntastic_python_python_use_codec = 0
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:base_path = expand('<sfile>:p:h', 1) . syntastic#util#Slash()
+
+function! SyntaxCheckers_python_python_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [2, 6])
+endfunction
+
+function! SyntaxCheckers_python_python_GetLocList() dict
+    let compiler = s:base_path . (g:syntastic_python_python_use_codec ? 'codec.py' : 'compile.py')
+    call self.log('using compiler script', compiler)
+    let makeprg = self.makeprgBuild({ 'exe': [self.getExec(), compiler] })
+
+    let errorformat = '%E%f:%l:%c: %m'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'returns': [0] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'python',
+    \ 'name': 'python'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/qml/qmllint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/qml/qmllint.vim
new file mode 100644
index 0000000..0aef61c
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/qml/qmllint.vim
@@ -0,0 +1,39 @@
+"============================================================================
+"File:        qmllint.vim
+"Description: Syntax checking plugin for syntastic.vim using qmllint
+"Maintainer:  Peter Wu <peter@lekensteyn.nl>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_qml_qmllint_checker')
+    finish
+endif
+let g:loaded_syntastic_qml_qmllint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_qml_qmllint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l : %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['guards'],
+        \ 'returns': [0, 255] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'qml',
+    \ 'name': 'qmllint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/r/lint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/r/lint.vim
new file mode 100644
index 0000000..854c170
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/r/lint.vim
@@ -0,0 +1,82 @@
+"============================================================================
+"File:        lint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_r_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_r_lint_checker = 1
+
+if !exists('g:syntastic_r_lint_styles')
+    let g:syntastic_r_lint_styles = 'lint.style'
+endif
+
+if !exists('g:syntastic_r_lint_sort')
+    let g:syntastic_r_lint_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_r_lint_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\m`\zs[^`]\+\ze`')
+    if term ==# ''
+        let term = matchstr(a:item['text'], "\\m'\\zs[^']\\+\\ze'")
+    endif
+    return term !=# '' ? '\V' . escape(term, '\') : ''
+endfunction
+
+function! SyntaxCheckers_r_lint_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    call syntastic#util#system(self.getExecEscaped() . ' --slave --restore --no-save -e ' . syntastic#util#shescape('library(lint)'))
+    return v:shell_error == 0
+endfunction
+
+function! SyntaxCheckers_r_lint_GetLocList() dict
+    let setwd = syntastic#util#isRunningWindows() ? 'setwd("' . escape(getcwd(), '"\') . '"); ' : ''
+    let makeprg = self.getExecEscaped() . ' --slave --restore --no-save' .
+        \ ' -e ' . syntastic#util#shescape(setwd . 'library(lint); ' .
+        \       'try(lint(commandArgs(TRUE), ' . g:syntastic_r_lint_styles . '))') .
+        \ ' --args ' . syntastic#util#shexpand('%')
+
+    let errorformat =
+        \ '%t:%f:%l:%v: %m,' .
+        \ '%t:%f:%l: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'preprocess': 'rparse',
+        \ 'returns': [0] })
+
+    for e in loclist
+        if e['type'] ==? 'F'
+            " parse error
+            let e['type'] = 'E'
+            call remove(e, 'subtype')
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'r',
+    \ 'name': 'lint',
+    \ 'exec': 'R' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/r/lintr.vim b/vim-plugins/bundle/syntastic/syntax_checkers/r/lintr.vim
new file mode 100644
index 0000000..7c71ec0
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/r/lintr.vim
@@ -0,0 +1,81 @@
+"============================================================================
+"File:        lintr.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Jim Hester <james.f.hester at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+"
+" Security:
+"
+" This checker runs the code in your file.  This is probably fine if you
+" wrote the file yourself, but it can be a problem if you're trying to
+" check third party files.  If you are 100% willing to let Vim run the
+" code in your file, set g:syntastic_enable_r_lintr_checker to 1 in
+" your vimrc to enable this checker:
+"
+" let g:syntastic_enable_r_lintr_checker = 1
+
+if exists("g:loaded_syntastic_r_lintr_checker")
+    finish
+endif
+let g:loaded_syntastic_r_lintr_checker = 1
+
+if !exists('g:syntastic_r_lintr_linters')
+    let g:syntastic_r_lintr_linters = 'default_linters'
+endif
+
+if !exists('g:syntastic_r_lintr_cache')
+    let g:syntastic_r_lintr_cache = 'FALSE'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_r_lintr_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], "\\m'\\zs[^']\\+\\ze'")
+    return term != '' ? '\V' . escape(term, '\') : ''
+endfunction
+
+function! SyntaxCheckers_r_lintr_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    call system(self.getExecEscaped() . ' --slave --no-restore --no-save -e ' . syntastic#util#shescape('library(lintr)'))
+    return v:shell_error == 0
+endfunction
+
+function! SyntaxCheckers_r_lintr_GetLocList() dict
+    let setwd = syntastic#util#isRunningWindows() ? 'setwd("' . escape(getcwd(), '"\') . '"); ' : ''
+    let makeprg = self.getExecEscaped() . ' --slave --no-restore --no-save' .
+        \ ' -e ' . syntastic#util#shescape(setwd . 'suppressPackageStartupMessages(library(lintr)); ' .
+        \       'lint(cache = ' . g:syntastic_r_lintr_cache . ', commandArgs(TRUE), ' . g:syntastic_r_lintr_linters . ')') .
+        \ ' --args ' . syntastic#util#shexpand('%')
+
+    let errorformat =
+        \ '%W%f:%l:%c: style: %m,' .
+        \ '%W%f:%l:%c: warning: %m,' .
+        \ '%E%f:%l:%c: error: %m,'
+
+    call self.setWantSort(1)
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'r',
+    \ 'name': 'lintr',
+    \ 'exec': 'R',
+    \ 'enable': 'enable_r_lintr_checker'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/r/svtools.vim b/vim-plugins/bundle/syntastic/syntax_checkers/r/svtools.vim
new file mode 100644
index 0000000..d2a6a74
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/r/svtools.vim
@@ -0,0 +1,74 @@
+"============================================================================
+"File:        svtools.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+"
+" Security:
+"
+" This checker runs the code in your file.  This is probably fine if you
+" wrote the file yourself, but it can be a problem if you're trying to
+" check third party files.  If you are 100% willing to let Vim run the
+" code in your file, set g:syntastic_enable_r_svtools_checker to 1 in
+" your vimrc to enable this checker:
+"
+"   let g:syntastic_enable_r_svtools_checker = 1
+
+if exists('g:loaded_syntastic_r_svtools_checker')
+    finish
+endif
+let g:loaded_syntastic_r_svtools_checker = 1
+
+if !exists('g:syntastic_r_svtools_styles')
+    let g:syntastic_r_svtools_styles = 'lint.style'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_r_svtools_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], "\\m'\\zs[^']\\+\\ze'")
+    return term !=# '' ? '\V' . escape(term, '\') : ''
+endfunction
+
+function! SyntaxCheckers_r_svtools_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    call syntastic#util#system(self.getExecEscaped() . ' --slave --restore --no-save -e ' . syntastic#util#shescape('library(svTools)'))
+    return v:shell_error == 0
+endfunction
+
+function! SyntaxCheckers_r_svtools_GetLocList() dict
+    let setwd = syntastic#util#isRunningWindows() ? 'setwd("' . escape(getcwd(), '"\') . '"); ' : ''
+    let makeprg = self.getExecEscaped() . ' --slave --restore --no-save' .
+        \ ' -e ' . syntastic#util#shescape(setwd . 'library(svTools); ' .
+        \       'try(lint(commandArgs(TRUE), filename = commandArgs(TRUE), type = "flat", sep = ":"))') .
+        \ ' --args ' . syntastic#util#shexpand('%')
+
+    let errorformat =
+        \ '%trror:%f:%\s%#%l:%\s%#%v:%m,' .
+        \ '%tarning:%f:%\s%#%l:%\s%#%v:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'r',
+    \ 'name': 'svtools',
+    \ 'exec': 'R',
+    \ 'enable': 'enable_r_svtools_checker'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/racket/code-ayatollah.vim b/vim-plugins/bundle/syntastic/syntax_checkers/racket/code-ayatollah.vim
new file mode 100644
index 0000000..14463c4
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/racket/code-ayatollah.vim
@@ -0,0 +1,62 @@
+"============================================================================
+"File:        code-ayatollah.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_racket_code_ayatollah_checker')
+    finish
+endif
+let g:loaded_syntastic_racket_code_ayatollah_checker = 1
+
+if !exists('g:syntastic_racket_code_ayatollah_script')
+    let g:syntastic_racket_code_ayatollah_script = 'code-ayatollah.rkt'
+endif
+
+if !exists('g:syntastic_racket_code_ayatollah_sort')
+    let g:syntastic_racket_code_ayatollah_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_racket_code_ayatollah_IsAvailable() dict
+    let s:script = expand(g:syntastic_racket_code_ayatollah_script, 1)
+    return executable(self.getExec()) && filereadable(s:script)
+endfunction
+
+function! SyntaxCheckers_racket_code_ayatollah_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'exe': [self.getExec(), s:script] })
+
+    let errorformat =
+        \ '  %l:%v: %m,' .
+        \ '%PErrors in %f:,' .
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style' })
+
+    for e in loclist
+        let e['col'] += 1
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'racket',
+    \ 'name': 'code_ayatollah',
+    \ 'exec': 'racket' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/racket/racket.vim b/vim-plugins/bundle/syntastic/syntax_checkers/racket/racket.vim
new file mode 100644
index 0000000..b563a5b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/racket/racket.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"File:        racket.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Author:      Steve Bragg <steve at empresseffects dot com>
+"
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_racket_racket_checker')
+    finish
+endif
+let g:loaded_syntastic_racket_racket_checker=1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_racket_racket_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    " example of error message
+    "eval-apply.rkt:460:30: the-empty-environment: unbound identifier in module
+    "  in: the-empty-environment
+    let errorformat = '%f:%l:%v: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+
+    for e in loclist
+        if has_key(e, 'col')
+            let e['col'] += 1
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'racket',
+    \ 'name': 'racket',
+    \ 'enable': 'enable_racket_racket_checker' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/rmd/lintr.vim b/vim-plugins/bundle/syntastic/syntax_checkers/rmd/lintr.vim
new file mode 100644
index 0000000..dcc235f
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/rmd/lintr.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        lintr.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Jim Hester <james.f.hester at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_rmd_lintr_checker')
+    finish
+endif
+let g:loaded_syntastic_rmd_lintr_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'rmd',
+    \ 'name': 'lintr',
+    \ 'redirect': 'r/lintr'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/rnc/rnv.vim b/vim-plugins/bundle/syntastic/syntax_checkers/rnc/rnv.vim
new file mode 100644
index 0000000..848d60c
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/rnc/rnv.vim
@@ -0,0 +1,38 @@
+"============================================================================
+"File:        rnv.vim
+"Description: RelaxNG RNV syntax checking plugin for syntastic.vim
+"Maintainer:  Remko Tronçon <remko at el-tramo dot be>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_rnc_rnv_checker')
+    finish
+endif
+let g:loaded_syntastic_rnc_rnv_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_rnc_rnv_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args': '-c' })
+
+    let errorformat =
+        \ '%f:%l:%c: %trror: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'rnc',
+    \ 'name': 'rnv'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/rst/proselint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/rst/proselint.vim
new file mode 100644
index 0000000..07e8b64
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/rst/proselint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        proselint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_rst_proselint_checker')
+    finish
+endif
+let g:loaded_syntastic_rst_proselint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'rst',
+    \ 'name': 'proselint',
+    \ 'redirect': 'text/proselint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/rst/rst2pseudoxml.vim b/vim-plugins/bundle/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
new file mode 100644
index 0000000..532c75c
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
@@ -0,0 +1,65 @@
+"============================================================================
+"File:        rst.vim
+"Description: Syntax checking plugin for docutils' reStructuredText files
+"Maintainer:  James Rowe <jnrowe at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+" We use rst2pseudoxml.py, as it is ever so marginally faster than the other
+" rst2${x} tools in docutils.
+
+if exists('g:loaded_syntastic_rst_rst2pseudoxml_checker')
+    finish
+endif
+let g:loaded_syntastic_rst_rst2pseudoxml_checker = 1
+
+let s:rst2pseudoxml = (executable('rst2pseudoxml.py') && !syntastic#util#isRunningWindows()) ? 'rst2pseudoxml.py' : 'rst2pseudoxml'
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_rst_rst2pseudoxml_IsAvailable() dict
+    call self.log('exec =', self.getExec())
+    return executable(self.getExec())
+endfunction
+
+function! SyntaxCheckers_rst_rst2pseudoxml_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '--report=2 --exit-status=1',
+        \ 'tail': syntastic#util#DevNull() })
+
+    let errorformat =
+        \ '%f:%l: (%t%\w%\+/%\d%\+) %m,'.
+        \ '%f:: (%t%\w%\+/%\d%\+) %m,'.
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+
+    for e in loclist
+        if e['type'] ==? 'I'
+            let e['type'] = 'W'
+            let e['subtype'] = 'Style'
+        else
+            let e['type'] = 'E'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'rst',
+    \ 'name': 'rst2pseudoxml',
+    \ 'exec': s:rst2pseudoxml })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/rst/rstcheck.vim b/vim-plugins/bundle/syntastic/syntax_checkers/rst/rstcheck.vim
new file mode 100644
index 0000000..3c3b8c4
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/rst/rstcheck.vim
@@ -0,0 +1,50 @@
+"============================================================================
+"File:        rstcheck.vim
+"Description: Syntax checking for reStructuredText and embedded code blocks
+"Authors:     Steven Myint <git@stevenmyint.com>
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_rst_rstcheck_checker')
+    finish
+endif
+let g:loaded_syntastic_rst_rstcheck_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_rst_rstcheck_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%f:%l: (%tNFO/1) %m,'.
+        \ '%f:%l: (%tARNING/2) %m,'.
+        \ '%f:%l: (%tRROR/3) %m,'.
+        \ '%f:%l: (%tEVERE/4) %m,'.
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1] })
+
+    for e in loclist
+        if e['type'] ==? 'S'
+            let e['type'] = 'E'
+        elseif e['type'] ==? 'I'
+            let e['type'] = 'W'
+            let e['subtype'] = 'Style'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'rst',
+    \ 'name': 'rstcheck'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/rst/sphinx.vim b/vim-plugins/bundle/syntastic/syntax_checkers/rst/sphinx.vim
new file mode 100644
index 0000000..3c211f4
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/rst/sphinx.vim
@@ -0,0 +1,80 @@
+"============================================================================
+"File:        sphinx.vim
+"Description: Syntax checking plugin for Sphinx reStructuredText files
+"Maintainer:  Buck Evan <buck dot 2019 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists("g:loaded_syntastic_rst_sphinx_checker")
+    finish
+endif
+let g:loaded_syntastic_rst_sphinx_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:sphinx_cache_location = syntastic#util#tmpdir()
+lockvar s:sphinx_cache_location
+
+augroup syntastic
+    autocmd VimLeave * call syntastic#util#rmrf(s:sphinx_cache_location)
+augroup END
+
+function! SyntaxCheckers_rst_sphinx_GetLocList() dict
+
+    let srcdir = syntastic#util#var('rst_sphinx_source_dir')
+    call self.log('g:syntastic_rst_sphinx_source_dir =', srcdir)
+    if srcdir ==# ''
+        let config = syntastic#util#findFileInParent('conf.py',  expand('%:p:h', 1))
+        if config ==# '' || !filereadable(config)
+            call self.log('conf.py file not found')
+            return []
+        endif
+        let srcdir = fnamemodify(config, ':p:h')
+    endif
+
+    let confdir = syntastic#util#var('rst_sphinx_config_dir')
+    call self.log('g:syntastic_rst_sphinx_config_dir =', confdir)
+    if confdir ==# ''
+        let config = syntastic#util#findFileInParent('conf.py',  expand('%:p:h', 1))
+        let confdir = (config !=# '' && filereadable(config)) ? fnamemodify(config, ':p:h') : srcdir
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-n -E',
+        \ 'args_after': '-q -N -b pseudoxml -c ' . syntastic#util#shescape(confdir),
+        \ 'fname': syntastic#util#shescape(srcdir),
+        \ 'fname_after': syntastic#util#shescape(s:sphinx_cache_location) })
+
+    let errorformat =
+        \ '%E%f:%l: SEVER%t: %m,' .
+        \ '%f:%l: %tRROR: %m,' .
+        \ '%f:%l: %tARNING: %m,' .
+        \ '%E%f:: SEVER%t: %m,' .
+        \ '%f:: %tRROR: %m,' .
+        \ '%f:: %tARNING: %m,' .
+        \ '%trror: %m,' .
+        \ '%+C%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0] })
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'rst',
+    \ 'name': 'sphinx',
+    \ 'exec': 'sphinx-build' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/ruby/flog.vim b/vim-plugins/bundle/syntastic/syntax_checkers/ruby/flog.vim
new file mode 100644
index 0000000..127cdbd
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/ruby/flog.vim
@@ -0,0 +1,72 @@
+"============================================================================
+"File:        flog.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Tim Carry <tim at pixelastic dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_ruby_flog_checker')
+    finish
+endif
+let g:loaded_syntastic_ruby_flog_checker = 1
+
+if !exists('g:syntastic_ruby_flog_threshold_warning')
+    let g:syntastic_ruby_flog_threshold_warning = 45
+endif
+
+if !exists('g:syntastic_ruby_flog_threshold_error')
+    let g:syntastic_ruby_flog_threshold_error = 90
+endif
+
+if !exists('g:syntastic_ruby_flog_sort')
+    let g:syntastic_ruby_flog_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ruby_flog_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args': '-a' })
+
+    " Example output:
+    "   93.25: MyClass::my_method my_file:42
+    let errorformat = '%\m%\s%#%m: %.%# %f:%l'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style' })
+
+    let trail_w = syntastic#util#float2str(g:syntastic_ruby_flog_threshold_warning) . ')'
+    let trail_e = syntastic#util#float2str(g:syntastic_ruby_flog_threshold_error) . ')'
+    for e in loclist
+      let score = syntastic#util#str2float(e['text'])
+
+      let e['text'] = 'Complexity is too high (' . syntastic#util#float2str(score) . '/'
+      if score < g:syntastic_ruby_flog_threshold_warning
+          let e['valid'] = 0
+      elseif score < g:syntastic_ruby_flog_threshold_error
+          let e['type'] = 'W'
+          let e['text'] .= trail_w
+      else
+          let e['type'] = 'E'
+          let e['text'] .= trail_e
+      endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ruby',
+    \ 'name': 'flog'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/ruby/jruby.vim b/vim-plugins/bundle/syntastic/syntax_checkers/ruby/jruby.vim
new file mode 100644
index 0000000..d9d2aee
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/ruby/jruby.vim
@@ -0,0 +1,50 @@
+"============================================================================
+"File:        jruby.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Leonid Shevtsov <leonid at shevtsov dot me>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_ruby_jruby_checker')
+    finish
+endif
+let g:loaded_syntastic_ruby_jruby_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ruby_jruby_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': (syntastic#util#isRunningWindows() ? '-T1 -W1' : '-W1'),
+        \ 'args_after': '-c' })
+
+    let errorformat =
+        \ '%-GSyntax OK for %f,'.
+        \ '%ESyntaxError in %f:%l: syntax error\, %m,'.
+        \ '%Z%p^,'.
+        \ '%W%f:%l: warning: %m,'.
+        \ '%Z%p^,'.
+        \ '%W%f:%l: %m,'.
+        \ '%-C%.%#'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'RUBYOPT': '' }
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ruby',
+    \ 'name': 'jruby'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/ruby/macruby.vim b/vim-plugins/bundle/syntastic/syntax_checkers/ruby/macruby.vim
new file mode 100644
index 0000000..c51188f
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/ruby/macruby.vim
@@ -0,0 +1,49 @@
+"============================================================================
+"File:        macruby.vim
+"Description: Syntax checking plugin for syntastic.vim
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_ruby_macruby_checker')
+    finish
+endif
+let g:loaded_syntastic_ruby_macruby_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ruby_macruby_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-W1',
+        \ 'args_after': '-c' })
+
+    let errorformat =
+        \ '%-GSyntax OK,'.
+        \ '%E%f:%l: syntax error\, %m,'.
+        \ '%Z%p^,'.
+        \ '%W%f:%l: warning: %m,'.
+        \ '%Z%p^,'.
+        \ '%W%f:%l: %m,'.
+        \ '%-C%.%#'
+
+    let env = { 'RUBYOPT': '' }
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ruby',
+    \ 'name': 'macruby'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/ruby/mri.vim b/vim-plugins/bundle/syntastic/syntax_checkers/ruby/mri.vim
new file mode 100644
index 0000000..563ed4f
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/ruby/mri.vim
@@ -0,0 +1,82 @@
+"============================================================================
+"File:        mri.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_ruby_mri_checker')
+    finish
+endif
+let g:loaded_syntastic_ruby_mri_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ruby_mri_IsAvailable() dict
+    if !exists('g:syntastic_ruby_mri_exec') && exists('g:syntastic_ruby_exec')
+        let g:syntastic_ruby_mri_exec = g:syntastic_ruby_exec
+        call self.log('g:syntastic_ruby_exec =', g:syntastic_ruby_exec)
+    endif
+    return executable(self.getExec())
+endfunction
+
+function! SyntaxCheckers_ruby_mri_GetHighlightRegex(i)
+    if stridx(a:i['text'], 'assigned but unused variable') >= 0
+        let term = split(a:i['text'], ' - ')[1]
+        return '\V\<' . escape(term, '\') . '\>'
+    endif
+
+    return ''
+endfunction
+
+function! SyntaxCheckers_ruby_mri_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-w -T1',
+        \ 'args_after': '-c' })
+
+    "this is a hack to filter out a repeated useless warning in rspec files
+    "containing lines like
+    "
+    "  foo.should == 'bar'
+    "
+    "Which always generate the warning below. Note that ruby >= 1.9.3 includes
+    "the word "possibly" in the warning
+    let errorformat = '%-G%\m%.%#warning: %\%%(possibly %\)%\?useless use of == in void context,'
+
+    " filter out lines starting with ...
+    " long lines are truncated and wrapped in ... %p then returns the wrong
+    " column offset
+    let errorformat .= '%-G%\%.%\%.%\%.%.%#,'
+
+    let errorformat .=
+        \ '%-GSyntax OK,'.
+        \ '%E%f:%l: syntax error\, %m,'.
+        \ '%Z%p^,'.
+        \ '%W%f:%l: warning: %m,'.
+        \ '%Z%p^,'.
+        \ '%W%f:%l: %m,'.
+        \ '%-C%.%#'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'RUBYOPT': '' }
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ruby',
+    \ 'name': 'mri',
+    \ 'exec': 'ruby'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/ruby/reek.vim b/vim-plugins/bundle/syntastic/syntax_checkers/ruby/reek.vim
new file mode 100644
index 0000000..d9a564a
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/ruby/reek.vim
@@ -0,0 +1,56 @@
+"============================================================================
+"File:        reek.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Mindaugas Mozūras
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_ruby_reek_checker')
+    finish
+endif
+let g:loaded_syntastic_ruby_reek_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ruby_reek_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [1, 3, 0])
+endfunction
+
+function! SyntaxCheckers_ruby_reek_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_before': '--no-color --line-number --single-line' })
+
+    let errorformat =
+        \ '%E%.%#: Racc::ParseError: %f:%l :: %m,' .
+        \ '%W%f:%l: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 2] })
+
+    for e in loclist
+        if e['type'] ==? 'W'
+            let e['subtype'] = 'Style'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ruby',
+    \ 'name': 'reek'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/ruby/rubocop.vim b/vim-plugins/bundle/syntastic/syntax_checkers/ruby/rubocop.vim
new file mode 100644
index 0000000..56f54bf
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/ruby/rubocop.vim
@@ -0,0 +1,57 @@
+"============================================================================
+"File:        rubocop.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Recai OktaÅŸ <roktas@bil.omu.edu.tr>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_ruby_rubocop_checker')
+    finish
+endif
+let g:loaded_syntastic_ruby_rubocop_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ruby_rubocop_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 12, 0])
+endfunction
+
+function! SyntaxCheckers_ruby_rubocop_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '--format emacs' })
+
+    let errorformat = '%f:%l:%c: %t: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style'})
+
+    " convert rubocop severities to error types recognized by syntastic
+    for e in loclist
+        if e['type'] ==# 'F'
+            let e['type'] = 'E'
+        elseif e['type'] !=# 'W' && e['type'] !=# 'E'
+            let e['type'] = 'W'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ruby',
+    \ 'name': 'rubocop'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/ruby/rubylint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/ruby/rubylint.vim
new file mode 100644
index 0000000..2e74f87
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/ruby/rubylint.vim
@@ -0,0 +1,45 @@
+"============================================================================
+"File:        rubylint.vim
+"Description: Checks Ruby source code using ruby-lint
+"Maintainer:  Yorick Peterse <yorickpeterse@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_ruby_rubylint_checker')
+    finish
+endif
+
+let g:loaded_syntastic_ruby_rubylint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_ruby_rubylint_GetLocList() dict
+    if !exists('s:rubylint_new')
+        let s:rubylint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [2])
+    endif
+    let makeprg = self.makeprgBuild({
+        \ 'args': (s:rubylint_new ? '' : 'analyze '),
+        \ 'args_after': '--presenter=syntastic' })
+
+    let errorformat = '%f:%t:%l:%c: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'ruby',
+    \ 'name': 'rubylint',
+    \ 'exec': 'ruby-lint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/sass/sass.vim b/vim-plugins/bundle/syntastic/syntax_checkers/sass/sass.vim
new file mode 100644
index 0000000..5f6194f
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/sass/sass.vim
@@ -0,0 +1,84 @@
+"============================================================================
+"File:        sass.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_sass_sass_checker')
+    finish
+endif
+let g:loaded_syntastic_sass_sass_checker = 1
+
+"sass caching for large files drastically speeds up the checking, but store it
+"in a temp location otherwise sass puts .sass_cache dirs in the users project
+let s:sass_cache_location = syntastic#util#tmpdir()
+lockvar s:sass_cache_location
+
+augroup syntastic
+    autocmd VimLeave * call syntastic#util#rmrf(s:sass_cache_location)
+augroup END
+
+"By default do not check partials as unknown variables are a syntax error
+if !exists('g:syntastic_sass_check_partials')
+    let g:syntastic_sass_check_partials = 0
+endif
+
+"use compass imports if available
+let s:imports = ''
+if executable('compass')
+    let s:imports = '--compass'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_sass_sass_GetLocList() dict
+    if !g:syntastic_sass_check_partials && expand('%:t', 1)[0] ==# '_'
+        return []
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': '--cache-location ' . s:sass_cache_location . ' ' . s:imports . ' --check' })
+
+    let errorformat =
+        \ '%E%\m%\%%(Syntax %\)%\?%trror: %m,' .
+        \ '%+C              %.%#,' .
+        \ '%C        on line %l of %f\, %.%#,' .
+        \ '%C        on line %l of %f,' .
+        \ '%-G %\+from line %.%#,' .
+        \ '%-G %\+Use --trace for backtrace.,' .
+        \ '%W%>DEPRECATION WARNING on line %l of %f:,' .
+        \ '%+C%>  %.%#,' .
+        \ '%W%>WARNING: on line %l of %f:,' .
+        \ '%+C%>  %.%#,' .
+        \ '%W%>WARNING on line %l of %f: %m,' .
+        \ '%+C%>  %.%#,' .
+        \ '%W%>WARNING on line %l of %f:,' .
+        \ '%Z%m,' .
+        \ '%W%>WARNING: %m,' .
+        \ '%C         on line %l of %f\, %.%#,' .
+        \ '%C         on line %l of %f,' .
+        \ '%-G %\+from line %.%#,' .
+        \ 'Syntax %trror on line %l: %m,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['compressWhitespace'] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'sass',
+    \ 'name': 'sass'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/sass/sass_lint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/sass/sass_lint.vim
new file mode 100644
index 0000000..e87da29
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/sass/sass_lint.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"File:        sass_lint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_sass_sass_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_sass_sass_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_sass_sass_lint_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [1, 5])
+endfunction
+
+function! SyntaxCheckers_sass_sass_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-v',
+        \ 'args_after': '-q -f compact' })
+
+    let errorformat =
+        \ '%f: line %l\, col %c\, %trror - %m,' .
+        \ '%f: line %l\, col %c\, %tarning - %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'sass',
+    \ 'name': 'sass_lint',
+    \ 'exec': 'sass-lint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/sass/sassc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/sass/sassc.vim
new file mode 100644
index 0000000..699e04e
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/sass/sassc.vim
@@ -0,0 +1,38 @@
+"============================================================================
+"File:        sassc.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_sass_sassc_checker')
+    finish
+endif
+let g:loaded_syntastic_sass_sassc_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_sass_sassc_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'fname_after': syntastic#util#DevNull() })
+
+    let errorformat = '%f:%l: %trror: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'sass',
+    \ 'name': 'sassc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/scala/fsc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/scala/fsc.vim
new file mode 100644
index 0000000..0398e7a
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/scala/fsc.vim
@@ -0,0 +1,49 @@
+"============================================================================
+"File:        fsc.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_scala_fsc_checker')
+    finish
+endif
+let g:loaded_syntastic_scala_fsc_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_scala_fsc_GetLocList() dict
+    call syntastic#log#deprecationWarn('scala_options', 'scala_fsc_args')
+
+    " fsc has some serious problems with the
+    " working directory changing after being started
+    " that's why we better pass an absolute path
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-Ystop-after:parser',
+        \ 'fname': syntastic#util#shexpand('%:p') })
+
+    let errorformat =
+        \ '%E%f:%l: %trror: %m,' .
+        \ '%W%f:%l: %tarning:%m,' .
+        \ '%Z%p^,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'scala',
+    \ 'name': 'fsc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/scala/scalac.vim b/vim-plugins/bundle/syntastic/syntax_checkers/scala/scalac.vim
new file mode 100644
index 0000000..854876b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/scala/scalac.vim
@@ -0,0 +1,43 @@
+"============================================================================
+"File:        scala.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Rickey Visinski <rickeyvisinski at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_scala_scalac_checker')
+    finish
+endif
+let g:loaded_syntastic_scala_scalac_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_scala_scalac_GetLocList() dict
+    call syntastic#log#deprecationWarn('scala_options', 'scala_scalac_args')
+
+    let makeprg = self.makeprgBuild({ 'args_after': '-Ystop-after:parser' })
+
+    let errorformat =
+        \ '%E%f:%l: %trror: %m,' .
+        \ '%Z%p^,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'scala',
+    \ 'name': 'scalac'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/scala/scalastyle.vim b/vim-plugins/bundle/syntastic/syntax_checkers/scala/scalastyle.vim
new file mode 100644
index 0000000..60d2163
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/scala/scalastyle.vim
@@ -0,0 +1,77 @@
+"============================================================================
+"File:        scalastyle.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_scala_scalastyle_checker')
+    finish
+endif
+let g:loaded_syntastic_scala_scalastyle_checker = 1
+
+if !exists('g:syntastic_scala_scalastyle_jar')
+    let g:syntastic_scala_scalastyle_jar = 'scalastyle-batch_2.10.jar'
+endif
+
+if !exists('g:syntastic_scala_scalastyle_config_file')
+    let g:syntastic_scala_scalastyle_config_file = 'scalastyle_config.xml'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_scala_scalastyle_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+
+    let jar = expand(g:syntastic_scala_scalastyle_jar, 1)
+    let conf_file = expand(g:syntastic_scala_scalastyle_config_file, 1)
+    call self.log('filereadable(' . string(jar) . ') = ' . filereadable(jar) . ', ' .
+        \ 'filereadable(' . string(conf_file) . ') = ' . filereadable(conf_file))
+
+    return filereadable(jar) && filereadable(conf_file)
+endfunction
+
+function! SyntaxCheckers_scala_scalastyle_GetLocList() dict
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe_after': ['-jar', expand(g:syntastic_scala_scalastyle_jar, 1)],
+        \ 'args_before': ['-c', expand(g:syntastic_scala_scalastyle_config_file, 1)] })
+
+    let errorformat =
+        \ '%trror file=%f message=%m line=%l column=%c,' .
+        \ '%trror file=%f message=%m line=%l,' .
+        \ '%tarning file=%f message=%m line=%l column=%c,' .
+        \ '%tarning file=%f message=%m line=%l'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1] })
+
+    for e in loclist
+        if has_key(e, 'col')
+            let e['col'] += 1
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'scala',
+    \ 'name': 'scalastyle',
+    \ 'exec': 'java'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/scss/mixedindentlint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/scss/mixedindentlint.vim
new file mode 100644
index 0000000..04a1fec
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/scss/mixedindentlint.vim
@@ -0,0 +1,22 @@
+"============================================================================
+"File:        mixedindentlint.vim
+"Description: Mixed indentation linter for vim
+"Maintainer:  Payton Swick <payton@foolord.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_scss_mixedindentlint_checker')
+    finish
+endif
+let g:loaded_syntastic_scss_mixedindentlint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'scss',
+    \ 'name': 'mixedindentlint',
+    \ 'redirect': 'javascript/mixedindentlint'})
+
+" vim: set et sts=4 sw=4:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/scss/sass.vim b/vim-plugins/bundle/syntastic/syntax_checkers/scss/sass.vim
new file mode 100644
index 0000000..3df8c80
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/scss/sass.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        scss.vim
+"Description: scss syntax checking plugin for syntastic
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_scss_sass_checker')
+    finish
+endif
+let g:loaded_syntastic_scss_sass_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'scss',
+    \ 'name': 'sass',
+    \ 'redirect': 'sass/sass'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/scss/sass_lint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/scss/sass_lint.vim
new file mode 100644
index 0000000..c50dac4
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/scss/sass_lint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        sass_lint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_scss_sass_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_scss_sass_lint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'scss',
+    \ 'name': 'sass_lint',
+    \ 'redirect': 'sass/sass_lint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/scss/sassc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/scss/sassc.vim
new file mode 100644
index 0000000..f1b2372
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/scss/sassc.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        sassc.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_scss_sassc_checker')
+    finish
+endif
+let g:loaded_syntastic_scss_sassc_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'scss',
+    \ 'name': 'sassc',
+    \ 'redirect': 'sass/sassc'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/scss/scss_lint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/scss/scss_lint.vim
new file mode 100644
index 0000000..c0f921a
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/scss/scss_lint.vim
@@ -0,0 +1,64 @@
+"============================================================================
+"File:        scss_lint.vim
+"Description: SCSS style and syntax checker plugin for Syntastic
+"Maintainer:  Shane da Silva <shane@dasilva.io>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_scss_scss_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_scss_scss_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_scss_scss_lint_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 29])
+endfunction
+
+function! SyntaxCheckers_scss_scss_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-f JSON' })
+
+    let errorformat = '%f:%t:%l:%c:%n:%m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'scss_lint',
+        \ 'postprocess': ['guards'],
+        \ 'returns': [0, 1, 2, 65, 66] })
+
+    let cutoff = strlen('Syntax Error: ')
+    for e in loclist
+        if e['nr'] > 1
+            let e['hl'] = '\%>' . (e['col'] - 1) . 'c\%<' . (e['col'] + e['nr']) . 'c'
+        endif
+        let e['nr'] = 0
+
+        if e['text'][: cutoff-1] ==# 'Syntax Error: '
+            let e['text'] = e['text'][cutoff :]
+        else
+            let e['subtype'] = 'Style'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'scss',
+    \ 'name': 'scss_lint',
+    \ 'exec': 'scss-lint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/scss/stylelint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/scss/stylelint.vim
new file mode 100644
index 0000000..1962916
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/scss/stylelint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        stylelint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_scss_stylelint_checker')
+    finish
+endif
+let g:loaded_syntastic_scss_stylelint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'scss',
+    \ 'name': 'stylelint',
+    \ 'redirect': 'css/stylelint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/sh/bashate.vim b/vim-plugins/bundle/syntastic/syntax_checkers/sh/bashate.vim
new file mode 100644
index 0000000..c7888ad
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/sh/bashate.vim
@@ -0,0 +1,48 @@
+"============================================================================
+"File:        bashate.vim
+"Description: Bash script style checking plugin for syntastic.vim
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_sh_bashate_checker')
+    finish
+endif
+let g:loaded_syntastic_sh_bashate_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_sh_bashate_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%EE%n: %m,' .
+        \ '%Z - %f%\s%\+: L%l,' .
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1] })
+
+    for e in loclist
+        let e['text'] = substitute(e['text'], "\\m: '.*", '', '')
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'sh',
+    \ 'name': 'bashate' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/sh/checkbashisms.vim b/vim-plugins/bundle/syntastic/syntax_checkers/sh/checkbashisms.vim
new file mode 100644
index 0000000..2ed0717
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/sh/checkbashisms.vim
@@ -0,0 +1,42 @@
+"============================================================================
+"File:        checkbashisms.vim
+"Description: Shell script syntax/style checking plugin for syntastic.vim
+"Notes:       checkbashisms.pl can be downloaded from
+"             http://debian.inode.at/debian/pool/main/d/devscripts/
+"             as part of the devscripts package.
+"============================================================================
+
+if exists('g:loaded_syntastic_sh_checkbashisms_checker')
+    finish
+endif
+let g:loaded_syntastic_sh_checkbashisms_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_sh_checkbashisms_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args': '-fx' })
+
+    let errorformat =
+        \ '%-Gscript %f is already a bash script; skipping,' .
+        \ '%Eerror: %f: %m\, opened in line %l,' .
+        \ '%Eerror: %f: %m,' .
+        \ '%Ecannot open script %f for reading: %m,' .
+        \ '%Wscript %f %m,%C%.# lines,' .
+        \ '%Wpossible bashism in %f line %l (%m):,%C%.%#,%Z.%#,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'sh',
+    \ 'name': 'checkbashisms' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/sh/sh.vim b/vim-plugins/bundle/syntastic/syntax_checkers/sh/sh.vim
new file mode 100644
index 0000000..395b81b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/sh/sh.vim
@@ -0,0 +1,93 @@
+"============================================================================
+"File:        sh.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Gregor Uhlenheuer <kongo2002 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_sh_sh_checker')
+    finish
+endif
+let g:loaded_syntastic_sh_sh_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_sh_sh_IsAvailable() dict " {{{1
+    call self.log('shell =', s:GetShell())
+    return s:IsShellValid()
+endfunction " }}}1
+
+function! SyntaxCheckers_sh_sh_GetLocList() dict " {{{1
+    if s:GetShell() ==# 'zsh'
+        return s:ForwardToZshChecker()
+    endif
+
+    if !s:IsShellValid()
+        return []
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe': s:GetShell(),
+        \ 'args_after': '-n' })
+
+    let errorformat = '%f: line %l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:GetShell() " {{{2
+    if !exists('b:shell') || b:shell ==# ''
+        let b:shell = ''
+        let shebang = syntastic#util#parseShebang()['exe']
+        if shebang !=# ''
+            if shebang[-strlen('bash'):-1] ==# 'bash'
+                let b:shell = 'bash'
+            elseif shebang[-strlen('zsh'):-1] ==# 'zsh'
+                let b:shell = 'zsh'
+            elseif shebang[-strlen('sh'):-1] ==# 'sh'
+                let b:shell = 'sh'
+            endif
+        endif
+        " try to use env variable in case no shebang could be found
+        if b:shell ==# ''
+            let b:shell = fnamemodify($SHELL, ':t')
+        endif
+    endif
+    return b:shell
+endfunction " }}}2
+
+function! s:IsShellValid() " {{{2
+    let shell = s:GetShell()
+    return shell !=# '' && executable(shell)
+endfunction " }}}2
+
+function! s:ForwardToZshChecker() " {{{2
+    let registry = g:SyntasticRegistry.Instance()
+    let zsh_checkers = registry.getCheckersAvailable('zsh', ['zsh'])
+    if !empty(zsh_checkers)
+        return zsh_checkers[0].getLocListRaw()
+    else
+        return []
+    endif
+endfunction " }}}2
+
+" }}}1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'sh',
+    \ 'name': 'sh' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/sh/shellcheck.vim b/vim-plugins/bundle/syntastic/syntax_checkers/sh/shellcheck.vim
new file mode 100644
index 0000000..5189e19
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/sh/shellcheck.vim
@@ -0,0 +1,66 @@
+"============================================================================
+"File:        shellcheck.vim
+"Description: Shell script syntax/style checking plugin for syntastic.vim
+"============================================================================
+
+if exists('g:loaded_syntastic_sh_shellcheck_checker')
+    finish
+endif
+let g:loaded_syntastic_sh_shellcheck_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_sh_shellcheck_GetLocList() dict " {{{1
+    let makeprg = self.makeprgBuild({
+        \ 'args': s:GetShell(),
+        \ 'args_after': '-f gcc' })
+
+    let errorformat =
+        \ '%f:%l:%c: %trror: %m,' .
+        \ '%f:%l:%c: %tarning: %m,' .
+        \ '%f:%l:%c: %tote: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1] })
+
+    for e in loclist
+        if e['type'] ==? 'n'
+            let e['type'] = 'w'
+            let e['subtype'] = 'Style'
+        endif
+    endfor
+
+    return loclist
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:GetShell() " {{{2
+    let sh = ''
+
+    if syntastic#util#parseShebang()['exe'] ==# ''
+        if syntastic#util#rawVar('is_kornshell', 0) || syntastic#util#rawVar('is_posix', 0)
+            let sh = 'ksh'
+        elseif syntastic#util#rawVar('is_bash', 0)
+            let sh = 'bash'
+        elseif syntastic#util#rawVar('is_sh', 0)
+            let sh = 'sh'
+        endif
+    endif
+
+    return sh !=# '' ? '-s ' . sh : ''
+endfunction " }}}2
+
+" }}}1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'sh',
+    \ 'name': 'shellcheck' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/slim/slim_lint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/slim/slim_lint.vim
new file mode 100644
index 0000000..f387971
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/slim/slim_lint.vim
@@ -0,0 +1,39 @@
+"============================================================================
+"File:        slim_lint.vim
+"Description: Slim style and syntax checker plugin for Syntastic
+"Maintainer:  Vasily Kolesnikov <re.vkolesnikov@gmail.com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_slim_slim_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_slim_slim_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_slim_slim_lint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l [%t] %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style'})
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'slim',
+    \ 'name': 'slim_lint',
+    \ 'exec': 'slim-lint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/slim/slimrb.vim b/vim-plugins/bundle/syntastic/syntax_checkers/slim/slimrb.vim
new file mode 100644
index 0000000..80bac05
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/slim/slimrb.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"File:        slim.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_slim_slimrb_checker')
+    finish
+endif
+let g:loaded_syntastic_slim_slimrb_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_slim_slimrb_GetLocList() dict
+    if !exists('s:slimrb_new')
+        let ver = self.getVersion(self.getExecEscaped() . ' --version 2>'. syntastic#util#DevNull())
+        let s:slimrb_new = syntastic#util#versionIsAtLeast(ver, [1, 3, 1])
+    endif
+
+    let makeprg = self.makeprgBuild({ 'args_after': '-c' })
+
+    if s:slimrb_new
+        let errorformat =
+            \ '%C %#%f\, Line %l\, Column %c,'.
+            \ '%-G %.%#,'.
+            \ '%ESlim::Parser::SyntaxError: %m,'.
+            \ '%+C%.%#'
+    else
+        let errorformat =
+            \ '%C %#%f\, Line %l,'.
+            \ '%-G %.%#,'.
+            \ '%ESlim::Parser::SyntaxError: %m,'.
+            \ '%+C%.%#'
+    endif
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'slim',
+    \ 'name': 'slimrb'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/sml/smlnj.vim b/vim-plugins/bundle/syntastic/syntax_checkers/sml/smlnj.vim
new file mode 100644
index 0000000..8b29db4
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/sml/smlnj.vim
@@ -0,0 +1,47 @@
+"============================================================================
+"File:        smlnj.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_sml_smlnj_checker')
+    finish
+endif
+let g:loaded_syntastic_sml_smlnj_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_sml_smlnj_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%E%f:%l%\%.%c %trror: %m,' .
+        \ '%E%f:%l%\%.%c-%\d%\+%\%.%\d%\+ %trror: %m,' .
+        \ '%W%f:%l%\%.%c %tarning: %m,' .
+        \ '%W%f:%l%\%.%c-%\d%\+%\%.%\d%\+ %tarning: %m,' .
+        \ '%C%\s%\+%m,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['compressWhitespace'],
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'sml',
+    \ 'name': 'smlnj',
+    \ 'exec': 'sml'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/solidity/solc.vim b/vim-plugins/bundle/syntastic/syntax_checkers/solidity/solc.vim
new file mode 100644
index 0000000..e401c3e
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/solidity/solc.vim
@@ -0,0 +1,38 @@
+"============================================================================
+"File:        solc.vim
+"Description: Solidity syntax checker - using solc
+"Maintainer:  Jacob Cholewa <jacob@cholewa.dk>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_solidity_solc_checker')
+    finish
+endif
+let g:loaded_syntastic_solidity_solc_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_solidity_solc_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l:%c: %trror: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'solidity',
+    \ 'name': 'solc'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/spec/rpmlint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/spec/rpmlint.vim
new file mode 100644
index 0000000..7e9431b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/spec/rpmlint.vim
@@ -0,0 +1,43 @@
+"============================================================================
+"File:        rpmlint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_spec_rpmlint_checker')
+    finish
+endif
+let g:loaded_syntastic_spec_rpmlint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_spec_rpmlint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%E%f:%l: E: %m,' .
+        \ '%E%f: E: %m,' .
+        \ '%W%f:%l: W: %m,' .
+        \ '%W%f: W: %m,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'spec',
+    \ 'name': 'rpmlint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/sql/sqlint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/sql/sqlint.vim
new file mode 100644
index 0000000..1e1eea5
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/sql/sqlint.vim
@@ -0,0 +1,50 @@
+"============================================================================
+"File:        sqlint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Steve Purcell <steve@sanityinc.com>
+"License:     MIT
+"============================================================================
+
+if exists('g:loaded_syntastic_sql_sqlint_checker')
+    finish
+endif
+let g:loaded_syntastic_sql_sqlint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_sql_sqlint_GetHighlightRegex(i)
+    let term = matchstr(a:i['text'], '\m at or near "\zs[^"]\+\ze"')
+    return term !=# '' ? '\V\<' . escape(term, '\') . '\>' : ''
+endfunction
+
+function! SyntaxCheckers_sql_sqlint_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 0, 3])
+endfunction
+
+function! SyntaxCheckers_sql_sqlint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%E%f:%l:%c:ERROR %m,' .
+        \ '%W%f:%l:%c:WARNING %m,' .
+        \ '%C %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'sql',
+    \ 'name': 'sqlint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/stylus/stylint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/stylus/stylint.vim
new file mode 100644
index 0000000..b32b745
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/stylus/stylint.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"File:        stylint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_stylus_stylint_checker')
+    finish
+endif
+let g:loaded_syntastic_stylus_stylint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_stylus_stylint_GetLocList() dict
+    if !exists('s:stylint_new')
+        let s:stylint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [1, 5, 7])
+    endif
+
+    let makeprg = self.makeprgBuild({})
+
+    if s:stylint_new
+        let errorformat =
+            \ '%P%f,' .
+            \ '%-Q,' .
+            \ '%\m%l:%c%\s%\+%t%\%%(rror%\|arning%\)%\s%\+%m%\s%\+%\S%\+%\s%#,' .
+            \ '%\m%l%\s%\+%t%\%%(rror%\|arning%\)%\s%\+%m%\s%\+%\S%\+%\s%#'
+    else
+        let errorformat =
+            \ '%WWarning: %m,' .
+            \ '%EError: %m,' .
+            \ '%CFile: %f,' .
+            \ '%CLine: %l:%.%#'
+    endif
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'stylus',
+    \ 'name': 'stylint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/tcl/nagelfar.vim b/vim-plugins/bundle/syntastic/syntax_checkers/tcl/nagelfar.vim
new file mode 100644
index 0000000..adbce63
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/tcl/nagelfar.vim
@@ -0,0 +1,44 @@
+"============================================================================
+"File:        nagelfar.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  James Pickard <james.pickard at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+"
+"Notes:       Requires nagelfar v1.1.12 or later with support for -H option.
+"             See nagelfar homepage http://nagelfar.berlios.de/.
+
+if exists('g:loaded_syntastic_tcl_nagelfar_checker')
+    finish
+endif
+let g:loaded_syntastic_tcl_nagelfar_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_tcl_nagelfar_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-H' })
+
+    let errorformat =
+        \ '%I%f: %l: N %m,'.
+        \ '%f: %l: %t %m,'.
+        \ '%-GChecking file %f'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'tcl',
+    \ 'name': 'nagelfar'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/tex/chktex.vim b/vim-plugins/bundle/syntastic/syntax_checkers/tex/chktex.vim
new file mode 100644
index 0000000..9b35902
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/tex/chktex.vim
@@ -0,0 +1,52 @@
+"============================================================================
+"File:        chktex.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_tex_chktex_checker')
+    finish
+endif
+let g:loaded_syntastic_tex_chktex_checker = 1
+
+if !exists('g:syntastic_tex_chktex_showmsgs')
+    let g:syntastic_tex_chktex_showmsgs = 1
+endif
+
+if !exists('g:syntastic_tex_chktex_sort')
+    let g:syntastic_tex_chktex_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_tex_chktex_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-q -v1' })
+
+    let errorformat =
+        \ '%EError %n in %f line %l: %m,' .
+        \ '%WWarning %n in %f line %l: %m,' .
+        \ (g:syntastic_tex_chktex_showmsgs ? '%WMessage %n in %f line %l: %m,' : '') .
+        \ '%Z%p^,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'tex',
+    \ 'name': 'chktex'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/tex/lacheck.vim b/vim-plugins/bundle/syntastic/syntax_checkers/tex/lacheck.vim
new file mode 100644
index 0000000..f156520
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/tex/lacheck.vim
@@ -0,0 +1,40 @@
+"============================================================================
+"File:        tex.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_tex_lacheck_checker')
+    finish
+endif
+let g:loaded_syntastic_tex_lacheck_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_tex_lacheck_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%-G** %f:,' .
+        \ '%E"%f"\, line %l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'tex',
+    \ 'name': 'lacheck'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/tex/proselint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/tex/proselint.vim
new file mode 100644
index 0000000..657503a
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/tex/proselint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        proselint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_tex_proselint_checker')
+    finish
+endif
+let g:loaded_syntastic_tex_proselint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'tex',
+    \ 'name': 'proselint',
+    \ 'redirect': 'text/proselint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/texinfo/makeinfo.vim b/vim-plugins/bundle/syntastic/syntax_checkers/texinfo/makeinfo.vim
new file mode 100644
index 0000000..a66e787
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/texinfo/makeinfo.vim
@@ -0,0 +1,47 @@
+"============================================================================
+"File:        makeinfo.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_texinfo_makeinfo_checker')
+    finish
+endif
+let g:loaded_syntastic_texinfo_makeinfo_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_texinfo_makeinfo_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], "\\m`\\zs[^']\\+\\ze'")
+    return term !=# '' ? '\V' . escape(term, '\') : ''
+endfunction
+
+function! SyntaxCheckers_texinfo_makeinfo_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': syntastic#c#NullOutput() })
+
+    let errorformat =
+        \ '%f:%l: %tarning: %m,' .
+        \ '%f:%l: %m,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'type': 'e' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'texinfo',
+    \ 'name': 'makeinfo'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/texinfo/proselint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/texinfo/proselint.vim
new file mode 100644
index 0000000..1afac02
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/texinfo/proselint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        proselint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_texinfo_proselint_checker')
+    finish
+endif
+let g:loaded_syntastic_texinfo_proselint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'texinfo',
+    \ 'name': 'proselint',
+    \ 'redirect': 'text/proselint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/text/atdtool.vim b/vim-plugins/bundle/syntastic/syntax_checkers/text/atdtool.vim
new file mode 100644
index 0000000..e43d9dc
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/text/atdtool.vim
@@ -0,0 +1,61 @@
+"============================================================================
+"File:        atdtool.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_text_atdtool_checker')
+    finish
+endif
+let g:loaded_syntastic_text_atdtool_checker = 1
+
+if !exists('g:syntastic_text_atdtool_sort')
+    let g:syntastic_text_atdtool_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_text_atdtool_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\m "\zs[^"]\+\ze"\($\| | suggestions:\)')
+    if term !=# ''
+        let col = get(a:item, 'col', 0)
+        let term = (col != 0 ? '\%' . col . 'c' : '') . '\V' . escape(term, '\')
+    endif
+    return term
+endfunction
+
+function! SyntaxCheckers_text_atdtool_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'tail': '2> ' . syntastic#util#DevNull() })
+
+    let errorformat =
+        \ '%W%f:%l:%c: %m,'.
+        \ '%+C  suggestions:%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0],
+        \ 'subtype': 'Style' })
+
+    for e in loclist
+        let e['text'] = substitute(e['text'], '\m\n\s\+', ' | ', 'g')
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'text',
+    \ 'name': 'atdtool'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/text/igor.vim b/vim-plugins/bundle/syntastic/syntax_checkers/text/igor.vim
new file mode 100644
index 0000000..588cf3b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/text/igor.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        igor.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_text_igor_checker')
+    finish
+endif
+let g:loaded_syntastic_text_igor_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'text',
+    \ 'name': 'igor',
+    \ 'redirect': 'docbk/igor'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/text/language_check.vim b/vim-plugins/bundle/syntastic/syntax_checkers/text/language_check.vim
new file mode 100644
index 0000000..e1aa69f
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/text/language_check.vim
@@ -0,0 +1,37 @@
+"============================================================================
+"File:        language_check.vim
+"Description: Grammar checker (https://github.com/myint/language-check)
+"Authors:     Steven Myint <git@stevenmyint.com>
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_text_language_check_checker')
+    finish
+endif
+let g:loaded_syntastic_text_language_check_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_text_language_check_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%f:%l:%c: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'text',
+    \ 'name': 'language_check',
+    \ 'exec': 'language-check'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/text/proselint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/text/proselint.vim
new file mode 100644
index 0000000..9aa9513
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/text/proselint.vim
@@ -0,0 +1,45 @@
+"============================================================================
+"File:        proselint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_text_proselint_checker')
+    finish
+endif
+let g:loaded_syntastic_text_proselint_checker = 1
+
+if !exists('g:syntastic_text_proselint_sort')
+    let g:syntastic_text_proselint_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_text_proselint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l:%c: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': { 'type': 'W', 'subtype': 'Style' },
+        \ 'preprocess': 'iconv',
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'text',
+    \ 'name': 'proselint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/text/textlint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/text/textlint.vim
new file mode 100644
index 0000000..3b51ae7
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/text/textlint.vim
@@ -0,0 +1,42 @@
+"============================================================================
+"File:        textlint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_text_textlint_checker')
+    finish
+endif
+let g:loaded_syntastic_text_textlint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_text_textlint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-f compact' })
+
+    let errorformat =
+        \ '%f: line %l\, col %c\, %tarning - %m,' .
+        \ '%f: line %l\, col %c\, %trror - %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'text',
+    \ 'name': 'textlint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/trig/rapper.vim b/vim-plugins/bundle/syntastic/syntax_checkers/trig/rapper.vim
new file mode 100644
index 0000000..f459cda
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/trig/rapper.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        rapper.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  Sebastian Tramp <mail@sebastian.tramp.name>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_trig_rapper_checker')
+    finish
+endif
+let g:loaded_syntastic_trig_rapper_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'trig',
+    \ 'name': 'rapper',
+    \ 'redirect': 'turtle/rapper'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/turtle/rapper.vim b/vim-plugins/bundle/syntastic/syntax_checkers/turtle/rapper.vim
new file mode 100644
index 0000000..4585a07
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/turtle/rapper.vim
@@ -0,0 +1,46 @@
+"============================================================================
+"File:        rapper.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  Sebastian Tramp <mail@sebastian.tramp.name>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_turtle_rapper_checker')
+    finish
+endif
+let g:loaded_syntastic_turtle_rapper_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_turtle_rapper_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\mFailed to convert qname \zs\S\+\ze to URI')
+    return term !=# '' ? '\V\<' . escape(term, '\') . '\>' : ''
+endfunction
+
+function! SyntaxCheckers_turtle_rapper_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args': '-i guess -q --count' })
+
+    let errorformat =
+        \ 'rapper: %trror - URI file://%f:%l - %m,' .
+        \ 'rapper: %tarning - URI file://%f:%l - %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'turtle',
+    \ 'name': 'rapper'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/turtle/ttl.vim b/vim-plugins/bundle/syntastic/syntax_checkers/turtle/ttl.vim
new file mode 100644
index 0000000..c28e354
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/turtle/ttl.vim
@@ -0,0 +1,43 @@
+"============================================================================
+"File:        ttl.vim
+"Description: turtle syntax checker - using ttl from turtle-validator (npm)
+"Maintainer:  Antoine Reilles (tonio@NetBSD.org)
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"============================================================================
+
+if exists('g:loaded_syntastic_turtle_ttl_checker')
+    finish
+endif
+let g:loaded_syntastic_turtle_ttl_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_turtle_ttl_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\m"\zs[^"]\+\ze"')
+    return term !=# '' ? '\V\<' . escape(term, '\') . '\>' : ''
+endfunction
+
+function! SyntaxCheckers_turtle_ttl_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%\m[Error: %m %\%%(at%\|on%\) line %l%\%.]'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'turtle',
+    \ 'name': 'ttl'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/twig/twiglint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/twig/twiglint.vim
new file mode 100644
index 0000000..547648f
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/twig/twiglint.vim
@@ -0,0 +1,41 @@
+"============================================================================
+"File:        twig.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Alexander <iam.asm89 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_twig_twiglint_checker')
+    finish
+endif
+let g:loaded_syntastic_twig_twiglint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_twig_twiglint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': 'lint',
+        \ 'args_after': '--format=csv' })
+
+    let errorformat = '"%f"\,%l\,%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat})
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'twig',
+    \ 'name': 'twiglint',
+    \ 'exec': 'twig-lint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/typescript/eslint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/typescript/eslint.vim
new file mode 100644
index 0000000..41e5276
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/typescript/eslint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        eslint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_typescript_eslint_checker')
+    finish
+endif
+let g:loaded_syntastic_typescript_eslint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'typescript',
+    \ 'name': 'eslint',
+    \ 'redirect': 'javascript/eslint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/typescript/tslint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/typescript/tslint.vim
new file mode 100644
index 0000000..de224b6
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/typescript/tslint.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"File:        typescript/tslint.vim
+"Description: TypeScript linter
+"Maintainer:  Seon-Wook Park <seon.wook@swook.net>
+"============================================================================
+
+if exists('g:loaded_syntastic_typescript_tslint_checker')
+    finish
+endif
+let g:loaded_syntastic_typescript_tslint_checker = 1
+
+if !exists('g:syntastic_typescript_tslint_sort')
+    let g:syntastic_typescript_tslint_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_typescript_tslint_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], "\\m\\s'\\zs.\\{-}\\ze'\\s")
+    return term !=# '' ? '\V' . escape(term, '\') : ''
+endfunction
+
+function! SyntaxCheckers_typescript_tslint_GetLocList() dict
+    if !exists('s:tslint_new')
+        let s:tslint_new = syntastic#util#versionIsAtLeast(self.getVersion(), [2, 4])
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '--format verbose',
+        \ 'fname_before': (s:tslint_new ? '' : '-f') })
+
+    " (comment-format) ts/app.ts[12, 36]: comment must start with lowercase letter
+    let errorformat = '%f[%l\, %c]: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'tslint',
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 2] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'typescript',
+    \ 'name': 'tslint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/vala/valac.vim b/vim-plugins/bundle/syntastic/syntax_checkers/vala/valac.vim
new file mode 100644
index 0000000..a60c249
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/vala/valac.vim
@@ -0,0 +1,86 @@
+"============================================================================
+"File:        vala.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Konstantin Stepanov (me@kstep.me)
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_vala_valac_checker')
+    finish
+endif
+let g:loaded_syntastic_vala_valac_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_vala_valac_GetHighlightRegex(pos) " {{{1
+    let length = strlen(matchstr(a:pos['text'], '\m\^\+$'))
+    return '\%>' . (a:pos['col'] - 1) . 'c\%<' . (a:pos['col'] + length) . 'c'
+endfunction " }}}1
+
+function! SyntaxCheckers_vala_valac_GetLocList() dict " {{{1
+    let vala_pkg_args = join(map(s:GetValaModules(), '"--pkg ".v:val'), ' ')
+    let vala_vapi_args = join(map(s:GetValaVapiDirs(), '"--vapidir ".v:val'), ' ')
+    let makeprg = self.makeprgBuild({ 'args': '-C ' . vala_pkg_args . ' ' . vala_vapi_args })
+
+    let errorformat =
+        \ '%A%f:%l.%c-%\d%\+.%\d%\+: %t%[a-z]%\+: %m,'.
+        \ '%C%m,'.
+        \ '%Z%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:GetValaModules() " {{{2
+    if exists('g:syntastic_vala_modules') || exists('b:syntastic_vala_modules')
+        let modules = syntastic#util#var('vala_modules')
+        if type(modules) == type('')
+            return split(modules, '\m\s\+')
+        elseif type(modules) == type([])
+            return copy(modules)
+        else
+            echoerr 'syntastic_vala_modules must be either list or string: fallback to in file modules string'
+        endif
+    endif
+
+    let modules_line = search('^// modules: ', 'n')
+    let modules_str = getline(modules_line)
+    return split(strpart(modules_str, 12), '\m\s\+')
+endfunction " }}}2
+
+function! s:GetValaVapiDirs() " {{{2
+    if exists('g:syntastic_vala_vapi_dirs') || exists('b:syntastic_vala_vapi_dirs')
+        let vapi_dirs = syntastic#util#var('vala_vapi_dirs')
+        if type(vapi_dirs) == type('')
+            return split(vapi_dirs, '\m\s\+')
+        elseif type(vapi_dirs) == type([])
+            return copy(vapi_dirs)
+        else
+            echoerr 'syntastic_vala_vapi_dirs must be either a list, or a string: fallback to in-file modules string'
+        endif
+    endif
+
+    let vapi_line = search('^//\s*vapidirs:\s*','n')
+    let vapi_str = getline(vapi_line)
+    return split( substitute( vapi_str, '\m^//\s*vapidirs:\s*', '', 'g' ), '\m\s\+' )
+endfunction " }}}2
+
+" }}}1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'vala',
+    \ 'name': 'valac'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/verilog/iverilog.vim b/vim-plugins/bundle/syntastic/syntax_checkers/verilog/iverilog.vim
new file mode 100644
index 0000000..c34fec1
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/verilog/iverilog.vim
@@ -0,0 +1,38 @@
+"============================================================================
+"File:        iverilog.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Psidium <psiidium at gmail dot com>
+"License:     The MIT License
+"============================================================================
+
+if exists('g:loaded_syntastic_verilog_iverilog_checker')
+    finish
+endif
+let g:loaded_syntastic_verilog_iverilog_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_verilog_iverilog_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': '-t null',
+        \ 'args': '-Wall' })
+
+    let errorformat =
+        \ '%f:%l: %trror: %m,' .
+        \ '%f:%l: %tarning: %m,' .
+        \ '%E%f:%l:      : %m,' .
+        \ '%W%f:%l:        : %m,' .
+        \ '%f:%l: %m'
+
+    return SyntasticMake({'makeprg': makeprg, 'errorformat': errorformat})
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'verilog',
+    \ 'name': 'iverilog'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/verilog/verilator.vim b/vim-plugins/bundle/syntastic/syntax_checkers/verilog/verilator.vim
new file mode 100644
index 0000000..e5cfddc
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/verilog/verilator.vim
@@ -0,0 +1,42 @@
+"============================================================================
+"File:        verilator.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Kocha <kocha dot lsifrontend at gmail dot com>
+"============================================================================
+
+if exists('g:loaded_syntastic_verilog_verilator_checker')
+    finish
+endif
+let g:loaded_syntastic_verilog_verilator_checker = 1
+
+if !exists('g:syntastic_verilog_compiler_options')
+    let g:syntastic_verilog_compiler_options = '-Wall'
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_verilog_verilator_IsAvailable() dict
+    if !exists('g:syntastic_verilog_compiler')
+        let g:syntastic_verilog_compiler = self.getExec()
+    endif
+    call self.log('g:syntastic_verilog_compiler =', g:syntastic_verilog_compiler)
+    return executable(expand(g:syntastic_verilog_compiler, 1))
+endfunction
+
+function! SyntaxCheckers_verilog_verilator_GetLocList() dict
+    return syntastic#c#GetLocList('verilog', 'verilator', {
+        \ 'errorformat':
+        \     '%%%trror-%\=%\w%#: %f:%l: %m,' .
+        \     '%%%tarning-%\=%\w%#: %f:%l: %m',
+        \ 'main_flags': '--lint-only' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'verilog',
+    \ 'name': 'verilator' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/vhdl/ghdl.vim b/vim-plugins/bundle/syntastic/syntax_checkers/vhdl/ghdl.vim
new file mode 100644
index 0000000..497152b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/vhdl/ghdl.vim
@@ -0,0 +1,38 @@
+"============================================================================
+"File:        ghdl.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Jan Wagner <jaydyou at janidom dot de>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_vhdl_ghdl_checker')
+    finish
+endif
+let g:loaded_syntastic_vhdl_ghdl_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_vhdl_ghdl_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_before': '-s' })
+
+    let errorformat =  '%f:%l:%c: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'vhdl',
+    \ 'name': 'ghdl'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/vhdl/vcom.vim b/vim-plugins/bundle/syntastic/syntax_checkers/vhdl/vcom.vim
new file mode 100644
index 0000000..6cdf4fb
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/vhdl/vcom.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"File:        vcom.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Jim Vogel <jim dot e dot vogel at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_vhdl_vcom_checker')
+    finish
+endif
+let g:loaded_syntastic_vhdl_vcom_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_vhdl_vcom_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_before': '-lint' })
+
+    let errorformat =
+        \ '** %tRROR: %f(%l): %m,' .
+        \ '** %tRROR: %m,' .
+        \ '** %tARNING: %f(%l): %m,' .
+        \ '** %tARNING: %m,' .
+        \ '** %tOTE: %m,' .
+        \ '%tRROR: %f(%l): %m,' .
+        \ '%tARNING[%*[0-9]]: %f(%l): %m,' .
+        \ '%tRROR: %m,' .
+        \ '%tARNING[%*[0-9]]: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+
+    for e in loclist
+        if e['type'] !=? 'E' && e['type'] !=? 'W'
+            let e['type'] = 'W'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'vhdl',
+    \ 'name': 'vcom'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/vim/vimlint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/vim/vimlint.vim
new file mode 100644
index 0000000..19cab49
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/vim/vimlint.vim
@@ -0,0 +1,107 @@
+"============================================================================
+"File:        vimlint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_vim_vimlint_checker')
+    finish
+endif
+let g:loaded_syntastic_vim_vimlint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_vim_vimlint_GetHighlightRegex(item) " {{{1
+    let term = matchstr(a:item['text'], '\m `\zs[^`]\+\ze`')
+    if term !=# ''
+        let col = get(a:item, 'col', 0)
+
+        if col && term[0:1] ==# 'l:'
+            if getline(a:item.lnum)[col-1:col] !=# 'l:'
+                let term = term[2:]
+            endif
+        endif
+
+        return col ? '\%>' . (col - 1) . 'c\%<' . (col + strlen(term)) . 'c' : '\V' . escape(term, '\')
+    endif
+
+    return ''
+endfunction " }}}1
+
+function! SyntaxCheckers_vim_vimlint_IsAvailable() dict " {{{1
+    let vimlparser = globpath(&runtimepath, 'autoload/vimlparser.vim', 1)
+    let vimlint    = globpath(&runtimepath, 'autoload/vimlint.vim', 1)
+    call self.log("globpath(&runtimepath, 'autoload/vimlparser.vim', 1) = " . string(vimlparser) . ', ' .
+                \ "globpath(&runtimepath, 'autoload/vimlint.vim', 1) = " .    string(vimlint))
+    return vimlparser !=# '' && vimlint !=# ''
+endfunction " }}}1
+
+function! SyntaxCheckers_vim_vimlint_GetLocList() dict " {{{1
+    " EVL102: unused variable v
+    " EVL103: unused argument v
+    " EVL104: variable may not be initialized on some execution path: v
+    " EVL105: global variable v is defined without g:
+    " EVL106: local variable v is used without l:
+    " EVL201: unreachable code
+    " EVL204: constant in conditional context
+    " EVL205: missing scriptencoding
+    " value 3: the message is a warning
+    "
+    " References: :help vimlint-errorcode and :help vimlint-variables
+    let param = {
+        \ 'output': function('s:vimlintOutput'),
+        \ 'quiet':  1,
+        \ 'EVL102': 3,
+        \ 'EVL103': 3,
+        \ 'EVL104': 3,
+        \ 'EVL105': 3,
+        \ 'EVL106': 3,
+        \ 'EVL201': 3,
+        \ 'EVL204': 3,
+        \ 'EVL205': 3 }
+
+    if exists('g:syntastic_vimlint_options') || exists('b:syntastic_vimlint_options')
+        let opts = syntastic#util#var('vimlint_options')
+        if type(opts) == type({})
+            let options = filter(copy(opts), 'v:key =~# "\\m^EVL"')
+            call extend(param, options, 'force')
+        endif
+    endif
+
+    call self.log('options =', param)
+
+    return vimlint#vimlint(expand('%', 1), param)
+endfunction " }}}1
+
+" Utilities {{{1
+
+" @vimlint(EVL103, 1, a:filename)
+function! s:vimlintOutput(filename, pos, ev, eid, mes, obj) " {{{2
+    call add(a:obj.error, {
+        \ 'bufnr': bufnr(''),
+        \ 'lnum': a:pos.lnum,
+        \ 'col': a:pos.col,
+        \ 'vcol': 0,
+        \ 'type': a:ev[0],
+        \ 'text': '[' . a:eid . '] ' . a:mes,
+        \ 'valid': a:pos.lnum > 0 })
+endfunction " }}}2
+" @vimlint(EVL103, 0, a:filename)
+
+" }}}1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'vim',
+    \ 'name': 'vimlint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/vim/vint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/vim/vint.vim
new file mode 100644
index 0000000..23a041e
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/vim/vint.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"File:        vint.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_vim_vint_checker')
+    finish
+endif
+let g:loaded_syntastic_vim_vint_checker = 1
+
+if !exists('g:syntastic_vim_vint_sort')
+    let g:syntastic_vim_vint_sort = 1
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_vim_vint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'post_args': '--json' })
+
+    let errorformat = '%f:%l:%c:%t: %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'vint',
+        \ 'returns': [0, 1] })
+
+    for e in loclist
+        if e['type'] ==? 's'
+            let e['type'] = 'w'
+            let e['subtype'] = 'Style'
+        elseif e['type'] !=? 'e' && e['type'] !=? 'w'
+            let e['type'] = 'e'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'vim',
+    \ 'name': 'vint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/xhtml/jshint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/xhtml/jshint.vim
new file mode 100644
index 0000000..f4536e2
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/xhtml/jshint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        jshint.vim
+"Description: Javascript syntax checker for xHTML - using jshint
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_xhtml_jshint_checker')
+    finish
+endif
+let g:loaded_syntastic_xhtml_jshint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'xhtml',
+    \ 'name': 'jshint',
+    \ 'redirect': 'html/jshint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/xhtml/proselint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/xhtml/proselint.vim
new file mode 100644
index 0000000..aea24a8
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/xhtml/proselint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        proselint.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_xhtml_proselint_checker')
+    finish
+endif
+let g:loaded_syntastic_xhtml_proselint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'xhtml',
+    \ 'name': 'proselint',
+    \ 'redirect': 'text/proselint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/xhtml/tidy.vim b/vim-plugins/bundle/syntastic/syntax_checkers/xhtml/tidy.vim
new file mode 100644
index 0000000..7f76d8b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/xhtml/tidy.vim
@@ -0,0 +1,92 @@
+"============================================================================
+"File:        xhtml.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_xhtml_tidy_checker')
+    finish
+endif
+let g:loaded_syntastic_xhtml_tidy_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+if !exists('g:syntastic_xhtml_tidy_ignore_errors')
+    let g:syntastic_xhtml_tidy_ignore_errors = []
+endif
+
+" Constants {{{1
+
+" TODO: join this with html.vim DRY's sake?
+function! s:TidyEncOptByFenc()
+    let TIDY_OPTS = {
+            \ 'utf-8':        '-utf8',
+            \ 'ascii':        '-ascii',
+            \ 'latin1':       '-latin1',
+            \ 'iso-2022-jp':  '-iso-2022',
+            \ 'cp1252':       '-win1252',
+            \ 'macroman':     '-mac',
+            \ 'utf-16le':     '-utf16le',
+            \ 'utf-16':       '-utf16',
+            \ 'big5':         '-big5',
+            \ 'cp932':        '-shiftjis',
+            \ 'sjis':         '-shiftjis',
+            \ 'cp850':        '-ibm858',
+        \ }
+    return get(TIDY_OPTS, &fileencoding, '-utf8')
+endfunction
+
+" }}}1
+
+function! SyntaxCheckers_xhtml_tidy_GetLocList() dict " {{{1
+    let encopt = s:TidyEncOptByFenc()
+    let makeprg = self.makeprgBuild({ 'args_after': encopt . ' -xml -e' })
+
+    let errorformat=
+        \ '%Wline %l column %v - Warning: %m,' .
+        \ '%Eline %l column %v - Error: %m,' .
+        \ '%-G%.%#'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')},
+        \ 'returns': [0, 1, 2] })
+
+    for e in loclist
+        if e['valid'] && s:IgnoreError(e['text']) == 1
+            let e['valid'] = 0
+        endif
+    endfor
+
+    return loclist
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:IgnoreError(text) " {{{2
+    for item in g:syntastic_xhtml_tidy_ignore_errors
+        if stridx(a:text, item) != -1
+            return 1
+        endif
+    endfor
+    return 0
+endfunction " }}}2
+
+" }}}1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'xhtml',
+    \ 'name': 'tidy'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/xml/plutil.vim b/vim-plugins/bundle/syntastic/syntax_checkers/xml/plutil.vim
new file mode 100644
index 0000000..8e80dde
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/xml/plutil.vim
@@ -0,0 +1,42 @@
+"============================================================================
+"File:        plutil.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_xml_plutil_checker')
+    finish
+endif
+let g:loaded_syntastic_xml_plutil_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_xml_plutil_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': '-lint -s',
+        \ 'fname_before': '--' })
+
+    let errorformat =
+        \ '%E%f: %m at line %l'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'xml',
+    \ 'name': 'plutil'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/xml/xmllint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/xml/xmllint.vim
new file mode 100644
index 0000000..1300437
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/xml/xmllint.vim
@@ -0,0 +1,54 @@
+"============================================================================
+"File:        xml.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Sebastian Kusnier <sebastian at kusnier dot net>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_xml_xmllint_checker')
+    finish
+endif
+let g:loaded_syntastic_xml_xmllint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" You can use a local installation of DTDs to significantly speed up validation
+" and allow you to validate XML data without network access, see xmlcatalog(1)
+" and http://www.xmlsoft.org/catalog.html for more information.
+
+function! SyntaxCheckers_xml_xmllint_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args': '--xinclude --postvalid',
+        \ 'args_after': '--noout' })
+
+    let errorformat=
+        \ '%E%f:%l: error : %m,' .
+        \ '%-G%f:%l: validity error : Validation failed: no DTD found %m,' .
+        \ '%W%f:%l: warning : %m,' .
+        \ '%W%f:%l: validity warning : %m,' .
+        \ '%E%f:%l: validity error : %m,' .
+        \ '%E%f:%l: parser error : %m,' .
+        \ '%E%f:%l: %m,' .
+        \ '%-Z%p^,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1, 2, 3, 4, 5] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'xml',
+    \ 'name': 'xmllint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/xquery/basex.vim b/vim-plugins/bundle/syntastic/syntax_checkers/xquery/basex.vim
new file mode 100644
index 0000000..640a191
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/xquery/basex.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"File:        basex.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  James Wright <james dot jw at hotmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_xquery_basex_checker')
+    finish
+endif
+let g:loaded_syntastic_xquery_basex_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_xquery_basex_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-z',
+        \ 'fname_before': '-q',
+        \ 'fname': syntastic#util#shescape('inspect:module("' . escape(expand('%:p', 1), '"') . '")') })
+
+    let errorformat =
+        \ '%f:%l:%c:%t:%n:%m,' .
+        \ '%m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'basex' })
+
+    for e in loclist
+        if e['type'] !=# 'W' && e['type'] !=# 'E'
+            let e['type'] = 'E'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'xquery',
+    \ 'name': 'basex'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/xslt/xmllint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/xslt/xmllint.vim
new file mode 100644
index 0000000..9ffb548
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/xslt/xmllint.vim
@@ -0,0 +1,23 @@
+"============================================================================
+"File:        xslt.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Sebastian Kusnier <sebastian at kusnier dot net>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_xslt_xmllint_checker')
+    finish
+endif
+let g:loaded_syntastic_xslt_xmllint_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'xslt',
+    \ 'name': 'xmllint',
+    \ 'redirect': 'xml/xmllint'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/yacc/bison.vim b/vim-plugins/bundle/syntastic/syntax_checkers/yacc/bison.vim
new file mode 100644
index 0000000..af8ac91
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/yacc/bison.vim
@@ -0,0 +1,55 @@
+"============================================================================
+"File:        yacc.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_yacc_bison_checker')
+    finish
+endif
+let g:loaded_syntastic_yacc_bison_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_yacc_bison_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': syntastic#c#NullOutput() })
+
+    let errorformat =
+        \ '%E%f:%l%.%v-%.%\{-}: %trror: %m,' .
+        \ '%E%f:%l%.%v: %trror: %m,' .
+        \ '%W%f:%l%.%v-%.%\{-}: %tarning: %m,' .
+        \ '%W%f:%l%.%v: %tarning: %m,' .
+        \ '%I%f:%l%.%v-%.%\{-}: %\s%\+%m,' .
+        \ '%I%f:%l%.%v: %\s%\+%m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+
+    let last_type = 'E'
+    for e in loclist
+        if e['type'] ==? 'I'
+            let e['type'] = last_type
+        endif
+        let last_type = e['type']
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'yacc',
+    \ 'name': 'bison'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/yaml/jsyaml.vim b/vim-plugins/bundle/syntastic/syntax_checkers/yaml/jsyaml.vim
new file mode 100644
index 0000000..e8baa7e
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/yaml/jsyaml.vim
@@ -0,0 +1,48 @@
+"============================================================================
+"File:        yaml.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_yaml_jsyaml_checker')
+    finish
+endif
+let g:loaded_syntastic_yaml_jsyaml_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_yaml_jsyaml_GetLocList() dict
+    if !exists('s:js_yaml_new')
+        let s:js_yaml_new = syntastic#util#versionIsAtLeast(self.getVersion(), [2])
+    endif
+
+    let makeprg = self.makeprgBuild({ 'args_after': (s:js_yaml_new ? '' : '--compact') })
+
+    let errorformat =
+        \ 'Error on line %l\, col %c:%m,' .
+        \ 'JS-YAML: %m at line %l\, column %c:,' .
+        \ 'YAMLException: %m at line %l\, column %c:,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'defaults': {'bufnr': bufnr('')} })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'yaml',
+    \ 'name': 'jsyaml',
+    \ 'exec': 'js-yaml'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/yaml/yamllint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/yaml/yamllint.vim
new file mode 100644
index 0000000..130877d
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/yaml/yamllint.vim
@@ -0,0 +1,52 @@
+"============================================================================
+"File:        yamllint.vim
+"Description: YAML files linting for syntastic.vim
+"Maintainer:  Adrien Vergé
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_yaml_yamllint_checker')
+    finish
+endif
+let g:loaded_syntastic_yaml_yamllint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_yaml_yamllint_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-f parsable' })
+
+    let errorformat =
+        \ '%f:%l:%c: [%trror] %m,' .
+        \ '%f:%l:%c: [%tarning] %m'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'returns': [0, 1] })
+
+    for e in loclist
+        if e['type'] ==? 'W'
+            let e['subtype'] = 'Style'
+        endif
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'yaml',
+    \ 'name': 'yamllint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/yaml/yamlxs.vim b/vim-plugins/bundle/syntastic/syntax_checkers/yaml/yamlxs.vim
new file mode 100644
index 0000000..ace118a
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/yaml/yamlxs.vim
@@ -0,0 +1,72 @@
+"============================================================================
+"File:        yamlxs.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  LCD 47 <lcd047 at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_yaml_yamlxs_checker')
+    finish
+endif
+let g:loaded_syntastic_yaml_yamlxs_checker = 1
+
+if !exists('g:syntastic_perl_lib_path')
+    let g:syntastic_perl_lib_path = []
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_yaml_yamlxs_IsAvailable() dict
+    if !exists('g:syntastic_yaml_yamlxs_exec') && exists('g:syntastic_perl_interpreter')
+        let g:syntastic_yaml_yamlxs_exec = g:syntastic_perl_interpreter
+    endif
+
+    " don't call executable() here, to allow things like
+    " let g:syntastic_perl_interpreter='/usr/bin/env perl'
+    silent! call syntastic#util#system(self.getExecEscaped() . ' ' . s:Modules() . ' -e ' . syntastic#util#shescape('exit(0)'))
+    return v:shell_error == 0
+endfunction
+
+function! SyntaxCheckers_yaml_yamlxs_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': s:Modules() . ' -e ' . syntastic#util#shescape('YAML::XS::LoadFile($ARGV[0])') })
+
+    let errorformat =
+        \ '%EYAML::XS::Load Error: The problem:,' .
+        \ '%-C,' .
+        \ '%C    %m,' .
+        \ '%Cwas found at document: %\d%\+\, line: %l\, column: %c,' .
+        \ '%-G%.%#'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['compressWhitespace'],
+        \ 'defaults': {'bufnr': bufnr('')} })
+endfunction
+
+function s:Modules()
+    if type(g:syntastic_perl_lib_path) == type('')
+        call syntastic#log#oneTimeWarn('variable g:syntastic_perl_lib_path should be a list')
+        let includes = split(g:syntastic_perl_lib_path, ',')
+    else
+        let includes = copy(syntastic#util#var('perl_lib_path'))
+    endif
+    return join(map(includes, '"-I" . v:val') + ['-MYAML::XS'])
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'yaml',
+    \ 'name': 'yamlxs',
+    \ 'exec': 'perl' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/yang/pyang.vim b/vim-plugins/bundle/syntastic/syntax_checkers/yang/pyang.vim
new file mode 100644
index 0000000..f397fa0
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/yang/pyang.vim
@@ -0,0 +1,46 @@
+"============================================================================
+"File:        pyang.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Authors:     joshua.downer@gmail.com
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_yang_pyang_checker')
+    finish
+endif
+let g:loaded_syntastic_yang_pyang_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_yang_pyang_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\m"\zs[^"]\+\ze"')
+    return term != '' ? '\V\<' . escape(term, '\') . '\>' : ''
+endfunction
+
+function! SyntaxCheckers_yang_pyang_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =
+        \ '%f:%l: %trror: %m,' .
+        \ '%f:%l: %tarning: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'postprocess': ['filterForeignErrors'] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'yang',
+    \ 'name': 'pyang'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/z80/z80syntaxchecker.vim b/vim-plugins/bundle/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
new file mode 100644
index 0000000..af61a8b
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
@@ -0,0 +1,39 @@
+"============================================================================
+"File:        z80syntaxchecker.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Romain Giot <giot.romain at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_z80_z80syntaxchecker_checker')
+    finish
+endif
+let g:loaded_syntastic_z80_z80syntaxchecker_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_z80_z80syntaxchecker_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat =  '%f:%l %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'z80',
+    \ 'name': 'z80syntaxchecker',
+    \ 'exec': 'z80_syntax_checker.py'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/zpt/zptlint.vim b/vim-plugins/bundle/syntastic/syntax_checkers/zpt/zptlint.vim
new file mode 100644
index 0000000..31a6093
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/zpt/zptlint.vim
@@ -0,0 +1,42 @@
+"============================================================================
+"File:        zpt.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  claytron <robots at claytron dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_zpt_zptlint_checker')
+    finish
+endif
+let g:loaded_syntastic_zpt_zptlint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_zpt_zptlint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat=
+        \ '%-P*** Error in: %f,'.
+        \ '%Z%*\s\, at line %l\, column %c,'.
+        \ '%E%*\s%m,'.
+        \ '%-Q'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'zpt',
+    \ 'name': 'zptlint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/syntastic/syntax_checkers/zsh/zsh.vim b/vim-plugins/bundle/syntastic/syntax_checkers/zsh/zsh.vim
new file mode 100644
index 0000000..4d458de
--- /dev/null
+++ b/vim-plugins/bundle/syntastic/syntax_checkers/zsh/zsh.vim
@@ -0,0 +1,38 @@
+"============================================================================
+"File:        zsh.vim
+"Description: Syntax checking plugin for syntastic.vim
+"Maintainer:  Martin Grenfell <martin.grenfell at gmail dot com>
+"License:     This program is free software. It comes without any warranty,
+"             to the extent permitted by applicable law. You can redistribute
+"             it and/or modify it under the terms of the Do What The Fuck You
+"             Want To Public License, Version 2, as published by Sam Hocevar.
+"             See http://sam.zoy.org/wtfpl/COPYING for more details.
+"
+"============================================================================
+
+if exists('g:loaded_syntastic_zsh_zsh_checker')
+    finish
+endif
+let g:loaded_syntastic_zsh_zsh_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_zsh_zsh_GetLocList() dict
+    let makeprg = self.makeprgBuild({ 'args_after': '-n' })
+
+    let errorformat = '%f:%l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat})
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'zsh',
+    \ 'name': 'zsh'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim-plugins/bundle/vim-airline/.travis.yml b/vim-plugins/bundle/vim-airline/.travis.yml
new file mode 100644
index 0000000..54deccf
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/.travis.yml
@@ -0,0 +1,8 @@
+language: ruby
+before_install:
+  - curl -f -L "https://raw.githubusercontent.com/vim-airline/vim-airline-themes/master/autoload/airline/themes/simple.vim" -o autoload/airline/themes/simple.vim
+  - curl -f -L "https://raw.githubusercontent.com/vim-airline/vim-airline-themes/master/autoload/airline/themes/molokai.vim" -o autoload/airline/themes/molokai.vim
+  - mkdir colors && curl -f -L 'https://raw.githubusercontent.com/tomasr/molokai/master/colors/molokai.vim' -o colors/molokai.vim
+rvm:
+  - 1.9.3
+script: rake ci
diff --git a/vim-plugins/bundle/vim-airline/CHANGELOG.md b/vim-plugins/bundle/vim-airline/CHANGELOG.md
new file mode 100644
index 0000000..b37ee18
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/CHANGELOG.md
@@ -0,0 +1,120 @@
+# Change Log
+
+This is the Changelog for the vim-airline project.
+
+## [Unreleased]
+
+## [0.8] - 2016-03-09
+- Changes
+  - Airline converted to an organization and moved to new [repository](https://github.com/vim-airline/vim-airline)
+  - Themes have been split into an separate repository [vim-airline-themes](https://github.com/vim-airline/vim-airline-themes)
+- Improvements
+  - Extensions
+    - branch: support Git and Mercurial simultaneously, untracked files
+    - whitespace: new mixed-indent rule
+  - Windows support
+  - Many bug fixes
+  - Support for Neovim
+- New features
+  - Many new themes
+  - Extensions/integration
+    - [taboo](https://github.com/gcmt/taboo.vim)
+    - [vim-ctrlspace](https://github.com/szw/vim-ctrlspace)
+    - [quickfixsigns](https://github.com/tomtom/quickfixsigns_vim)
+    - [YouCompleteMe](https://github.com/Valloric/YouCompleteMe)
+    - [po.vim](http://www.vim.org/scripts/script.php?script_id=695)
+    - [unicode.vim](https://github.com/chrisbra/unicode.vim)
+    - wordcount
+    - crypt indicator
+    - byte order mark indicator
+  - Tabline's tab mode can display splits simultaneously
+
+## [0.7] - 2014-12-10
+- New features
+    - accents support; allowing multiple colors/styles in the same section
+    - extensions: eclim
+    - themes: understated, monochrome, murmur, sol, lucius
+- Improvements
+    -  solarized theme; support for 8 color terminals
+    -  tabline resizes dynamically based on number of open buffers
+    -  miscellaneous bug fixes
+
+## [0.6] - 2013-10-08
+
+- New features
+    - accents support; allowing multiple colors/styles in the same section
+    - extensions: eclim
+    - themes: understated, monochrome, murmur, sol, lucius
+- Improvements
+    - solarized theme; support for 8 color terminals
+    - tabline resizes dynamically based on number of open buffers
+    - miscellaneous bug fixes
+
+## [0.5] - 2013-09-13
+
+- New features
+    - smart tabline extension which displays all buffers when only one tab is visible
+    - automatic section truncation when the window resizes
+    - support for a declarative style of configuration, allowing parts to contain metadata such as minimum window width or conditional visibility
+    - themes: zenburn, serene
+- Other
+    - a sizable chunk of vim-airline is now running through a unit testing suite, automated via Travis CI
+
+## [0.4] - 2013-08-26
+
+ - New features
+    - integration with csv.vim and vim-virtualenv
+    - hunks extension for vim-gitgutter and vim-signify
+    - automatic theme switching with matching colorschemes
+    - commands: AirlineToggle
+    - themes: base16 (all variants)
+ - Improvements
+    - integration with undotree, tagbar, and unite
+ - Other
+    - refactored core and exposed statusline builder and pipeline
+    - all extension related g:airline_variables have been deprecated in favor of g:airline#extensions# variables
+    - extensions found in the runtimepath outside of the default distribution will be automatically loaded
+
+## [0.3] - 2013-08-12
+
+-  New features
+    -  first-class integration with tagbar
+    -  white space detection for trailing spaces and mixed indentation
+    -  introduced warning section for syntastic and white space detection
+    -  improved ctrlp integration: colors are automatically selected based on the current airline theme
+    -  new themes: molokai, bubblegum, jellybeans, tomorrow
+-  Bug fixes
+    -  improved handling of eventignore used by other plugins
+-  Other
+    - code cleaned up for clearer separation between core functionality and extensions
+    - introduced color extraction from highlight groups, allowing themes to be generated off of the active colorscheme (e.g. jellybeans and tomorrow)
+    - License changed to MIT
+
+## [0.2] - 2013-07-28
+
+-  New features
+      - iminsert detection
+      - integration with vimshell, vimfiler, commandt, lawrencium
+      - enhanced bufferline theming
+      - support for ctrlp theming
+      - support for custom window excludes
+- New themes
+      - luna and wombat
+- Bug fixes
+      - refresh branch name after switching with a shell command
+
+## [0.1] - 2013-07-17
+
+- Initial release
+  - integration with other plugins: netrw, unite, nerdtree, undotree, gundo, tagbar, minibufexplr, ctrlp
+  - support for themes: 8 included
+
+[Unreleased]: https://github.com/vim-airline/vim-airline/compare/v0.8...HEAD
+[0.8]: https://github.com/vim-airline/vim-airline/compare/v0.7...v0.8
+[0.7]: https://github.com/vim-airline/vim-airline/compare/v0.6...v0.7
+[0.6]: https://github.com/vim-airline/vim-airline/compare/v0.5...v0.6
+[0.5]: https://github.com/vim-airline/vim-airline/compare/v0.4...v0.5
+[0.4]: https://github.com/vim-airline/vim-airline/compare/v0.3...v0.4
+[0.3]: https://github.com/vim-airline/vim-airline/compare/v0.2...v0.3
+[0.2]: https://github.com/vim-airline/vim-airline/compare/v0.1...v0.2
+[0.1]: https://github.com/vim-airline/vim-airline/releases/tag/v0.1
diff --git a/vim-plugins/bundle/vim-airline/CONTRIBUTING.md b/vim-plugins/bundle/vim-airline/CONTRIBUTING.md
new file mode 100644
index 0000000..f97699e
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/CONTRIBUTING.md
@@ -0,0 +1,32 @@
+# Contributions
+
+Contributions and pull requests are welcome.  Please take note of the following guidelines:
+
+*  Adhere to the existing style as much as possible; notably, 2 space indents and long-form keywords.
+*  Keep the history clean!  Squash your branches before you submit a pull request.  `pull --rebase` is your friend.
+*  Any changes to the core should be tested against Vim 7.2.
+
+# Bugs
+
+Tracking down bugs can take a very long time due to different configurations, versions, and operating systems.  To ensure a timely response, please help me out by doing the following:
+
+* Reproduce it with this [minivimrc][7] repository to rule out any configuration conflicts.  Even better, create a `gist` of your vimrc that is compatible with [pathogen][11].
+* And to make it easier to reproduce, please supply the following:
+  * the `:version` of vim
+  * the commit of vim-airline you're using
+  * the OS that you're using, including terminal emulator, GUI vs non-GUI
+
+# Themes
+
+*  If you submit a theme, please create a screenshot so it can be added to the [Wiki][14].
+*  In the majority of cases, modifications to colors of existing themes will likely be rejected.  Themes are a subjective thing, so while you may prefer that a particular color be darker, another user will prefer it to be lighter, or something entirely different.  The more popular the theme, the more unlikely the change will be accepted.  However, it's pretty simple to create your own theme; copy the theme to `~/.vim/autoload/airline/themes` under a new name with your modifications, and it can be used.
+
+# Maintenance
+
+If you would like to take a more active role in improving vim-airline, please consider [becoming a maintainer][43].
+
+
+[7]: https://github.com/bling/minivimrc
+[11]: https://github.com/tpope/vim-pathogen
+[14]: https://github.com/vim-airline/vim-airline/wiki/Screenshots
+[43]: https://github.com/vim-airline/vim-airline/wiki/Becoming-a-Maintainer
diff --git a/vim-plugins/bundle/vim-airline/Gemfile b/vim-plugins/bundle/vim-airline/Gemfile
new file mode 100644
index 0000000..088f22e
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'vim-flavor', '~> 1.1'
diff --git a/vim-plugins/bundle/vim-airline/ISSUE_TEMPLATE.md b/vim-plugins/bundle/vim-airline/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..a0a1a05
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/ISSUE_TEMPLATE.md
@@ -0,0 +1,21 @@
+#### environment
+
+- vim: ????
+- vim-airline: ????
+- OS: ????
+- Have you reproduced with a minimal vimrc: ???
+- What is your airline configuration: ???
+if you are using terminal:
+- terminal: ????
+- $TERM variable: ???
+- color configuration (:set t_Co?):
+if you are using Neovim:
+- does it happen in Vim: ???
+
+#### actual behavior
+
+????
+
+#### expected behavior
+
+????
diff --git a/vim-plugins/bundle/vim-airline/LICENSE b/vim-plugins/bundle/vim-airline/LICENSE
new file mode 100644
index 0000000..875acca
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (C) 2013-2016 Bailey Ling
+
+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/vim-plugins/bundle/vim-airline/README.md b/vim-plugins/bundle/vim-airline/README.md
new file mode 100644
index 0000000..d7874b1
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/README.md
@@ -0,0 +1,245 @@
+# vim-airline [![Build Status](https://travis-ci.org/vim-airline/vim-airline.png)](https://travis-ci.org/vim-airline/vim-airline)
+
+Lean &amp; mean status/tabline for vim that's light as air.
+
+![img](https://github.com/vim-airline/vim-airline/wiki/screenshots/demo.gif)
+
+# Features
+
+*  Tiny core written with extensibility in mind ([open/closed principle][8]).
+*  Integrates with a variety of plugins, including: [vim-bufferline][6],
+   [fugitive][4], [unite][9], [ctrlp][10], [minibufexpl][15], [gundo][16],
+   [undotree][17], [nerdtree][18], [tagbar][19], [vim-gitgutter][29],
+   [vim-signify][30], [quickfixsigns][39], [syntastic][5], [eclim][34],
+   [lawrencium][21], [virtualenv][31], [tmuxline][35], [taboo.vim][37],
+   [ctrlspace][38], [vim-bufmru][47] and more.
+*  Looks good with regular fonts and provides configuration points so you can use unicode or powerline symbols.
+*  Optimized for speed; it loads in under a millisecond.
+*  Extensive suite of themes for popular color schemes including [solarized][23] (dark and light), [tomorrow][24] (all variants), [base16][32] (all variants), [molokai][25], [jellybeans][26] and others.
+ Note these are now external to this plugin. See [below][46] for detail.
+*  Supports 7.2 as the minimum Vim version.
+*  The master branch tries to be as stable as possible, and new features are merged in only after they have gone through a [full regression test][33].
+*  Unit testing suite.
+
+## Straightforward customization
+
+If you don't like the defaults, you can replace all sections with standard `statusline` syntax.  Give your statusline that you've built over the years a face lift.
+
+![image](https://f.cloud.github.com/assets/306502/1009429/d69306da-0b38-11e3-94bf-7c6e3eef41e9.png)
+
+## Themes
+
+Themes have moved to
+another repository as of [this commit][45].
+
+Install the themes as you would this plugin (Vundle example):
+
+```vim
+Plugin 'vim-airline/vim-airline'
+Plugin 'vim-airline/vim-airline-themes'
+```
+
+See https://github.com/vim-airline/vim-airline-themes for more.
+
+## Automatic truncation
+
+Sections and parts within sections can be configured to automatically hide when the window size shrinks.
+
+![image](https://f.cloud.github.com/assets/306502/1060831/05c08aac-11bc-11e3-8470-a506a3037f45.png)
+
+## Smarter tab line
+
+Automatically displays all buffers when there's only one tab open.
+
+![tabline](https://f.cloud.github.com/assets/306502/1072623/44c292a0-1495-11e3-9ce6-dcada3f1c536.gif)
+
+This is disabled by default; add the following to your vimrc to enable the extension:
+
+    let g:airline#extensions#tabline#enabled = 1
+
+Separators can be configured independently for the tabline, so here is how you can define "straight" tabs:
+
+    let g:airline#extensions#tabline#left_sep = ' '
+    let g:airline#extensions#tabline#left_alt_sep = '|'
+
+## Seamless integration
+
+vim-airline integrates with a variety of plugins out of the box.  These extensions will be lazily loaded if and only if you have the other plugins installed (and of course you can turn them off).
+
+#### [ctrlp.vim][10]
+![image](https://f.cloud.github.com/assets/306502/962258/7345a224-04ec-11e3-8b5a-f11724a47437.png)
+
+#### [unite.vim][9]
+![image](https://f.cloud.github.com/assets/306502/962319/4d7d3a7e-04ed-11e3-9d59-ab29cb310ff8.png)
+
+#### [tagbar][19]
+![image](https://f.cloud.github.com/assets/306502/962150/7e7bfae6-04ea-11e3-9e28-32af206aed80.png)
+
+#### [csv.vim][28]
+![image](https://f.cloud.github.com/assets/306502/962204/cfc1210a-04eb-11e3-8a93-42e6bcd21efa.png)
+
+#### [syntastic][5]
+![image](https://f.cloud.github.com/assets/306502/962864/9824c484-04f7-11e3-9928-da94f8c7da5a.png)
+
+#### hunks ([vim-gitgutter][29] & [vim-signify][30])
+![image](https://f.cloud.github.com/assets/306502/995185/73fc7054-09b9-11e3-9d45-618406c6ed98.png)
+
+#### [virtualenv][31]
+![image](https://f.cloud.github.com/assets/390964/1022566/cf81f830-0d98-11e3-904f-cf4fe3ce201e.png)
+
+#### [tmuxline][35]
+![image](https://f.cloud.github.com/assets/1532071/1559276/4c28fbac-4fc7-11e3-90ef-7e833d980f98.gif)
+
+#### [promptline][36]
+![airline-promptline-sc](https://f.cloud.github.com/assets/1532071/1871900/7d4b28a0-789d-11e3-90e4-16f37269981b.gif)
+
+#### [ctrlspace][38]
+![papercolor_with_ctrlspace](https://cloud.githubusercontent.com/assets/493242/12912041/7fc3c6ec-cf16-11e5-8775-8492b9c64ebf.png)
+
+## Extras
+
+vim-airline also supplies some supplementary stand-alone extensions.  In addition to the tabline extension mentioned earlier, there is also:
+
+#### whitespace
+![image](https://f.cloud.github.com/assets/306502/962401/2a75385e-04ef-11e3-935c-e3b9f0e954cc.png)
+
+## Configurable and extensible
+
+#### Fine-tuned configuration
+
+Every section is composed of parts, and you can reorder and reconfigure them at will.
+
+![image](https://f.cloud.github.com/assets/306502/1073278/f291dd4c-14a3-11e3-8a83-268e2753f97d.png)
+
+Sections can contain accents, which allows for very granular control of visuals (see configuration [here](https://github.com/vim-airline/vim-airline/issues/299#issuecomment-25772886)).
+
+![image](https://f.cloud.github.com/assets/306502/1195815/4bfa38d0-249d-11e3-823e-773cfc2ca894.png)
+
+#### Extensible pipeline
+
+Completely transform the statusline to your liking.  Build out the statusline as you see fit by extracting colors from the current colorscheme's highlight groups.
+
+![allyourbase](https://f.cloud.github.com/assets/306502/1022714/e150034a-0da7-11e3-94a5-ca9d58a297e8.png)
+
+# Rationale
+
+There's already [powerline][2], why yet another statusline?
+
+*  100% vimscript; no python needed.
+
+What about [vim-powerline][1]?
+
+*  vim-powerline has been deprecated in favor of the newer, unifying powerline, which is under active development; the new version is written in python at the core and exposes various bindings such that it can style statuslines not only in vim, but also tmux, bash, zsh, and others.
+
+# Where did the name come from?
+
+I wrote the initial version on an airplane, and since it's light as air it turned out to be a good name.  Thanks for flying vim!
+
+# Installation
+
+This plugin follows the standard runtime path structure, and as such it can be installed with a variety of plugin managers:
+
+*  [Pathogen][11]
+  *  `git clone https://github.com/vim-airline/vim-airline ~/.vim/bundle/vim-airline`
+  *  Remember to run `:Helptags` to generate help tags
+*  [NeoBundle][12]
+  *  `NeoBundle 'vim-airline/vim-airline'`
+*  [Vundle][13]
+  *  `Plugin 'vim-airline/vim-airline'`
+*  [Plug][40]
+  *  `Plug 'vim-airline/vim-airline'`
+*  [VAM][22]
+  *  `call vam#ActivateAddons([ 'vim-airline' ])`
+*  manual
+  *  copy all of the files into your `~/.vim` directory
+
+# Configuration
+
+`:help airline`
+
+The default setting of 'laststatus' is for the statusline to not appear until a split is created. If you want it to appear all the time, add the following to your vimrc:
+`set laststatus=2`
+
+# Integrating with powerline fonts
+
+For the nice looking powerline symbols to appear, you will need to install a patched font.  Instructions can be found in the official powerline [documentation][20].  Prepatched fonts can be found in the [powerline-fonts][3] repository.
+
+Finally, you can add the convenience variable `let g:airline_powerline_fonts = 1` to your vimrc which will automatically populate the `g:airline_symbols` dictionary with the powerline symbols.
+
+# FAQ
+
+Solutions to common problems can be found in the [Wiki][27].
+
+# Performance
+
+Whoa!  Everything got slow all of a sudden...
+
+vim-airline strives to make it easy to use out of the box, which means that by default it will look for all compatible plugins that you have installed and enable the relevant extension.
+
+Many optimizations have been made such that the majority of users will not see any performance degradation, but it can still happen.  For example, users who routinely open very large files may want to disable the `tagbar` extension, as it can be very expensive to scan for the name of the current function.
+
+The [minivimrc][7] project has some helper mappings to troubleshoot performance related issues.
+
+If you don't want all the bells and whistles enabled by default, you can define a value for `g:airline_extensions`.  When this variable is defined, only the extensions listed will be loaded; an empty array would effectively disable all extensions.
+
+# Screenshots
+
+A full list of screenshots for various themes can be found in the [Wiki][14].
+
+# Maintainers
+
+The project is currently being maintained by [Bailey Ling][41], [Christian Brabandt][42], and [Mike Hartington][44].
+
+If you are interested in becoming a maintainer (we always welcome more maintainers), please [go here][43].
+
+# License
+
+MIT License. Copyright (c) 2013-2016 Bailey Ling.
+
+[1]: https://github.com/Lokaltog/vim-powerline
+[2]: https://github.com/Lokaltog/powerline
+[3]: https://github.com/Lokaltog/powerline-fonts
+[4]: https://github.com/tpope/vim-fugitive
+[5]: https://github.com/scrooloose/syntastic
+[6]: https://github.com/bling/vim-bufferline
+[7]: https://github.com/bling/minivimrc
+[8]: http://en.wikipedia.org/wiki/Open/closed_principle
+[9]: https://github.com/Shougo/unite.vim
+[10]: https://github.com/ctrlpvim/ctrlp.vim
+[11]: https://github.com/tpope/vim-pathogen
+[12]: https://github.com/Shougo/neobundle.vim
+[13]: https://github.com/gmarik/vundle
+[14]: https://github.com/vim-airline/vim-airline/wiki/Screenshots
+[15]: https://github.com/techlivezheng/vim-plugin-minibufexpl
+[16]: https://github.com/sjl/gundo.vim
+[17]: https://github.com/mbbill/undotree
+[18]: https://github.com/scrooloose/nerdtree
+[19]: https://github.com/majutsushi/tagbar
+[20]: https://powerline.readthedocs.org/en/master/installation.html#patched-fonts
+[21]: https://bitbucket.org/ludovicchabant/vim-lawrencium
+[22]: https://github.com/MarcWeber/vim-addon-manager
+[23]: https://github.com/altercation/solarized
+[24]: https://github.com/chriskempson/tomorrow-theme
+[25]: https://github.com/tomasr/molokai
+[26]: https://github.com/nanotech/jellybeans.vim
+[27]: https://github.com/vim-airline/vim-airline/wiki/FAQ
+[28]: https://github.com/chrisbra/csv.vim
+[29]: https://github.com/airblade/vim-gitgutter
+[30]: https://github.com/mhinz/vim-signify
+[31]: https://github.com/jmcantrell/vim-virtualenv
+[32]: https://github.com/chriskempson/base16-vim
+[33]: https://github.com/vim-airline/vim-airline/wiki/Test-Plan
+[34]: http://eclim.org
+[35]: https://github.com/edkolev/tmuxline.vim
+[36]: https://github.com/edkolev/promptline.vim
+[37]: https://github.com/gcmt/taboo.vim
+[38]: https://github.com/szw/vim-ctrlspace
+[39]: https://github.com/tomtom/quickfixsigns_vim
+[40]: https://github.com/junegunn/vim-plug
+[41]: https://github.com/bling
+[42]: https://github.com/chrisbra
+[43]: https://github.com/vim-airline/vim-airline/wiki/Becoming-a-Maintainer
+[44]: https://github.com/mhartington
+[45]: https://github.com/vim-airline/vim-airline/commit/d7fd8ca649e441b3865551a325b10504cdf0711b
+[46]: https://github.com/vim-airline/vim-airline#themes
+[47]: https://github.com/mildred/vim-bufmru
diff --git a/vim-plugins/bundle/vim-airline/Rakefile b/vim-plugins/bundle/vim-airline/Rakefile
new file mode 100644
index 0000000..741cfc2
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/Rakefile
@@ -0,0 +1,14 @@
+#!/usr/bin/env rake
+
+task :default => [:test]
+
+task :ci => [:dump, :test]
+
+task :dump do
+  sh 'vim --version'
+end
+
+task :test do
+  sh 'bundle exec vim-flavor test'
+end
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline.vim b/vim-plugins/bundle/vim-airline/autoload/airline.vim
new file mode 100644
index 0000000..23d7fc7
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline.vim
@@ -0,0 +1,195 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let g:airline_statusline_funcrefs = get(g:, 'airline_statusline_funcrefs', [])
+
+let s:sections = ['a','b','c','gutter','x','y','z', 'error', 'warning']
+let s:inactive_funcrefs = []
+
+function! airline#add_statusline_func(name)
+  call airline#add_statusline_funcref(function(a:name))
+endfunction
+
+function! airline#add_statusline_funcref(function)
+  if index(g:airline_statusline_funcrefs, a:function) >= 0
+    echohl WarningMsg
+    echo 'The airline statusline funcref '.string(a:function).' has already been added.'
+    echohl NONE
+    return
+  endif
+  call add(g:airline_statusline_funcrefs, a:function)
+endfunction
+
+function! airline#remove_statusline_func(name)
+  let i = index(g:airline_statusline_funcrefs, function(a:name))
+  if i > -1
+    call remove(g:airline_statusline_funcrefs, i)
+  endif
+endfunction
+
+function! airline#add_inactive_statusline_func(name)
+  call add(s:inactive_funcrefs, function(a:name))
+endfunction
+
+function! airline#load_theme()
+  if exists('*airline#themes#{g:airline_theme}#refresh')
+    call airline#themes#{g:airline_theme}#refresh()
+  endif
+
+  let palette = g:airline#themes#{g:airline_theme}#palette
+  call airline#themes#patch(palette)
+
+  if exists('g:airline_theme_patch_func')
+    let Fn = function(g:airline_theme_patch_func)
+    call Fn(palette)
+  endif
+
+  call airline#highlighter#load_theme()
+  call airline#extensions#load_theme()
+  call airline#update_statusline()
+endfunction
+
+function! airline#switch_theme(name)
+  try
+    let palette = g:airline#themes#{a:name}#palette "also lazy loads the theme
+    let g:airline_theme = a:name
+  catch
+    echohl WarningMsg | echo 'The specified theme cannot be found.' | echohl NONE
+    if exists('g:airline_theme')
+      return
+    else
+      let g:airline_theme = 'dark'
+    endif
+  endtry
+
+  let w:airline_lastmode = ''
+  call airline#load_theme()
+
+  silent doautocmd User AirlineAfterTheme
+
+  " this is required to prevent clobbering the startup info message, i don't know why...
+  call airline#check_mode(winnr())
+endfunction
+
+function! airline#switch_matching_theme()
+  if exists('g:colors_name')
+    let existing = g:airline_theme
+    let theme = substitute(g:colors_name, '-', '_', 'g')
+    try
+      let palette = g:airline#themes#{theme}#palette
+      call airline#switch_theme(theme)
+      return 1
+    catch
+      for map in items(g:airline_theme_map)
+        if match(g:colors_name, map[0]) > -1
+          try
+            let palette = g:airline#themes#{map[1]}#palette
+            call airline#switch_theme(map[1])
+          catch
+            call airline#switch_theme(existing)
+          endtry
+          return 1
+        endif
+      endfor
+    endtry
+  endif
+  return 0
+endfunction
+
+function! airline#update_statusline()
+  if airline#util#getwinvar(winnr(), 'airline_disabled', 0)
+    return
+  endif
+  for nr in filter(range(1, winnr('$')), 'v:val != winnr()')
+    if airline#util#getwinvar(nr, 'airline_disabled', 0)
+      continue
+    endif
+    call setwinvar(nr, 'airline_active', 0)
+    let context = { 'winnr': nr, 'active': 0, 'bufnr': winbufnr(nr) }
+    call s:invoke_funcrefs(context, s:inactive_funcrefs)
+  endfor
+
+  unlet! w:airline_render_left w:airline_render_right
+  exe 'unlet! ' 'w:airline_section_'. join(s:sections, ' w:airline_section_')
+
+  let w:airline_active = 1
+  let context = { 'winnr': winnr(), 'active': 1, 'bufnr': winbufnr(winnr()) }
+  call s:invoke_funcrefs(context, g:airline_statusline_funcrefs)
+endfunction
+
+let s:contexts = {}
+let s:core_funcrefs = [
+      \ function('airline#extensions#apply'),
+      \ function('airline#extensions#default#apply') ]
+function! s:invoke_funcrefs(context, funcrefs)
+  let builder = airline#builder#new(a:context)
+  let err = airline#util#exec_funcrefs(a:funcrefs + s:core_funcrefs, builder, a:context)
+  if err == 1
+    let a:context.line = builder.build()
+    let s:contexts[a:context.winnr] = a:context
+    call setwinvar(a:context.winnr, '&statusline', '%!airline#statusline('.a:context.winnr.')')
+  endif
+endfunction
+
+function! airline#statusline(winnr)
+  if has_key(s:contexts, a:winnr)
+    return '%{airline#check_mode('.a:winnr.')}'.s:contexts[a:winnr].line
+  endif
+
+  " in rare circumstances this happens...see #276
+  return ''
+endfunction
+
+function! airline#check_mode(winnr)
+  let context = s:contexts[a:winnr]
+
+  if get(w:, 'airline_active', 1)
+    let l:m = mode()
+    if l:m ==# "i"
+      let l:mode = ['insert']
+    elseif l:m ==# "R"
+      let l:mode = ['replace']
+    elseif l:m =~# '\v(v|V||s|S|)'
+      let l:mode = ['visual']
+    elseif l:m ==# "t"
+      let l:mode = ['terminal']
+    else
+      let l:mode = ['normal']
+    endif
+    let w:airline_current_mode = get(g:airline_mode_map, l:m, l:m)
+  else
+    let l:mode = ['inactive']
+    let w:airline_current_mode = get(g:airline_mode_map, '__')
+  endif
+
+  if g:airline_detect_modified && &modified
+    call add(l:mode, 'modified')
+  endif
+
+  if g:airline_detect_paste && &paste
+    call add(l:mode, 'paste')
+  endif
+
+  if g:airline_detect_crypt && exists("+key") && !empty(&key)
+    call add(l:mode, 'crypt')
+  endif
+
+  if g:airline_detect_spell && &spell
+    call add(l:mode, 'spell')
+  endif
+
+  if &readonly || ! &modifiable
+    call add(l:mode, 'readonly')
+  endif
+
+  let mode_string = join(l:mode)
+  if get(w:, 'airline_lastmode', '') != mode_string
+    call airline#highlighter#highlight_modified_inactive(context.bufnr)
+    call airline#highlighter#highlight(l:mode, context.bufnr)
+    let w:airline_lastmode = mode_string
+  endif
+
+  return ''
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/builder.vim b/vim-plugins/bundle/vim-airline/autoload/airline/builder.vim
new file mode 100644
index 0000000..d566a32
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/builder.vim
@@ -0,0 +1,205 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:prototype = {}
+
+function! s:prototype.split(...) dict
+  call add(self._sections, ['|', a:0 ? a:1 : '%='])
+endfunction
+
+function! s:prototype.add_section_spaced(group, contents) dict
+  let spc = empty(a:contents) ? '' : g:airline_symbols.space
+  call self.add_section(a:group, spc.a:contents.spc)
+endfunction
+
+function! s:prototype.add_section(group, contents) dict
+  call add(self._sections, [a:group, a:contents])
+endfunction
+
+function! s:prototype.add_raw(text) dict
+  call add(self._sections, ['', a:text])
+endfunction
+
+function! s:get_prev_group(sections, i)
+  let x = a:i - 1
+  while x >= 0
+    let group = a:sections[x][0]
+    if group != '' && group != '|'
+      return group
+    endif
+    let x = x - 1
+  endwhile
+  return ''
+endfunction
+
+function! s:prototype.build() dict
+  let side = 1
+  let line = ''
+  let i = 0
+  let length = len(self._sections)
+  let split = 0
+  let is_empty = 0
+  let prev_group = ''
+
+  while i < length
+    let section = self._sections[i]
+    let group = section[0]
+    let contents = section[1]
+    let pgroup = prev_group
+    let prev_group = s:get_prev_group(self._sections, i)
+    if group ==# 'airline_c' && !self._context.active && has_key(self._context, 'bufnr')
+      let group = 'airline_c'. self._context.bufnr
+    elseif prev_group ==# 'airline_c' && !self._context.active && has_key(self._context, 'bufnr')
+      let prev_group = 'airline_c'. self._context.bufnr
+    endif
+    if is_empty
+      let prev_group = pgroup
+    endif
+    let is_empty = s:section_is_empty(self, contents)
+
+    if is_empty
+      " need to fix highlighting groups, since we
+      " have skipped a section, we actually need
+      " the previous previous group and so the
+      " seperator goes from the previous previous group
+      " to the current group
+      let pgroup = group
+    endif
+
+    if group == ''
+      let line .= contents
+    elseif group == '|'
+      let side = 0
+      let line .= contents
+      let split = 1
+    else
+      if prev_group == ''
+        let line .= '%#'.group.'#'
+      elseif split
+        if !is_empty
+          let line .= s:get_transitioned_seperator(self, prev_group, group, side)
+        endif
+        let split = 0
+      else
+        if !is_empty
+          let line .= s:get_seperator(self, prev_group, group, side)
+        endif
+      endif
+      let line .= is_empty ? '' : s:get_accented_line(self, group, contents)
+    endif
+
+    let i = i + 1
+  endwhile
+
+  if !self._context.active
+    "let line = substitute(line, '%#airline_c#', '%#airline_c'.self._context.bufnr.'#', '')
+    let line = substitute(line, '%#.\{-}\ze#', '\0_inactive', 'g')
+  endif
+  return line
+endfunction
+
+function! s:should_change_group(group1, group2)
+  if a:group1 == a:group2
+    return 0
+  endif
+  let color1 = airline#highlighter#get_highlight(a:group1)
+  let color2 = airline#highlighter#get_highlight(a:group2)
+  if g:airline_gui_mode ==# 'gui'
+    return color1[1] != color2[1] || color1[0] != color2[0]
+  else
+    return color1[3] != color2[3] || color1[2] != color2[2]
+  endif
+endfunction
+
+function! s:get_transitioned_seperator(self, prev_group, group, side)
+  let line = ''
+  call airline#highlighter#add_separator(a:prev_group, a:group, a:side)
+  let line .= '%#'.a:prev_group.'_to_'.a:group.'#'
+  let line .= a:side ? a:self._context.left_sep : a:self._context.right_sep
+  let line .= '%#'.a:group.'#'
+  return line
+endfunction
+
+function! s:get_seperator(self, prev_group, group, side)
+  if s:should_change_group(a:prev_group, a:group)
+    return s:get_transitioned_seperator(a:self, a:prev_group, a:group, a:side)
+  else
+    return a:side ? a:self._context.left_alt_sep : a:self._context.right_alt_sep
+  endif
+endfunction
+
+function! s:get_accented_line(self, group, contents)
+  if a:self._context.active
+    let contents = []
+    let content_parts = split(a:contents, '__accent')
+    for cpart in content_parts
+      let accent = matchstr(cpart, '_\zs[^#]*\ze')
+      call add(contents, cpart)
+    endfor
+    let line = join(contents, a:group)
+    let line = substitute(line, '__restore__', a:group, 'g')
+  else
+    let line = substitute(a:contents, '%#__accent[^#]*#', '', 'g')
+    let line = substitute(line, '%#__restore__#', '', 'g')
+  endif
+  return line
+endfunction
+
+function! s:section_is_empty(self, content)
+  let start=1
+
+  " do not check for inactive windows or the tabline
+  if a:self._context.active == 0
+    return 0
+  elseif get(a:self._context, 'tabline', 0)
+    return 0
+  endif
+
+  " only check, if airline#skip_empty_sections == 1
+  if get(g:, 'airline_skip_empty_sections', 0) == 0
+    return 0
+  endif
+  " assume accents sections to be never empty
+  " (avoides, that on startup the mode message becomes empty)
+  if match(a:content, '%#__accent_[^#]*#.*__restore__#') > -1
+    return 0
+  endif
+  if empty(a:content)
+    return 1
+  endif
+  let list=matchlist(a:content, '%{\zs.\{-}\ze}', 1, start)
+  if empty(list)
+    return 0 " no function in statusline text
+  endif
+  while len(list) > 0
+    let expr = list[0]
+    try
+      " catch all exceptions, just in case
+      if !empty(eval(expr))
+        return 0
+      endif
+    catch
+      return 0
+    endtry
+    let start += 1
+    let list=matchlist(a:content, '%{\zs.\{-}\ze}', 1, start)
+  endw
+  return 1
+endfunction
+
+function! airline#builder#new(context)
+  let builder = copy(s:prototype)
+  let builder._context = a:context
+  let builder._sections = []
+
+  call extend(builder._context, {
+        \ 'left_sep': g:airline_left_sep,
+        \ 'left_alt_sep': g:airline_left_alt_sep,
+        \ 'right_sep': g:airline_right_sep,
+        \ 'right_alt_sep': g:airline_right_alt_sep,
+        \ }, 'keep')
+  return builder
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/debug.vim b/vim-plugins/bundle/vim-airline/autoload/airline/debug.vim
new file mode 100644
index 0000000..18fc126
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/debug.vim
@@ -0,0 +1,52 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+function! airline#debug#profile1()
+  profile start airline-profile-switch.log
+  profile func *
+  profile file *
+  split
+  for i in range(1, 1000)
+    wincmd w
+    redrawstatus
+  endfor
+  profile pause
+  noautocmd qall!
+endfunction
+
+function! airline#debug#profile2()
+  profile start airline-profile-cursor.log
+  profile func *
+  profile file *
+  edit blank
+  call setline(1, 'all your base are belong to us')
+  call setline(2, 'all your base are belong to us')
+  let positions = [[1,2], [2,2], [1,2], [1,1]]
+  for i in range(1, 1000)
+    for pos in positions
+      call cursor(pos[0], pos[1])
+      redrawstatus
+    endfor
+  endfor
+  profile pause
+  noautocmd qall!
+endfunction
+
+function! airline#debug#profile3()
+  profile start airline-profile-mode.log
+  profile func *
+  profile file *
+
+  for i in range(1000)
+    startinsert
+    redrawstatus
+    stopinsert
+    redrawstatus
+  endfor
+
+  profile pause
+  noautocmd qall!
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions.vim
new file mode 100644
index 0000000..6cae187
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions.vim
@@ -0,0 +1,318 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:ext = {}
+let s:ext._theme_funcrefs = []
+
+function! s:ext.add_statusline_func(name) dict
+  call airline#add_statusline_func(a:name)
+endfunction
+function! s:ext.add_statusline_funcref(function) dict
+  call airline#add_statusline_funcref(a:function)
+endfunction
+function! s:ext.add_inactive_statusline_func(name) dict
+  call airline#add_inactive_statusline_func(a:name)
+endfunction
+function! s:ext.add_theme_func(name) dict
+  call add(self._theme_funcrefs, function(a:name))
+endfunction
+
+let s:script_path = tolower(resolve(expand('<sfile>:p:h')))
+
+let s:filetype_overrides = {
+      \ 'nerdtree': [ 'NERD', '' ],
+      \ 'gundo': [ 'Gundo', '' ],
+      \ 'vimfiler': [ 'vimfiler', '%{vimfiler#get_status_string()}' ],
+      \ 'minibufexpl': [ 'MiniBufExplorer', '' ],
+      \ 'startify': [ 'startify', '' ],
+      \ 'vim-plug': [ 'Plugins', '' ],
+      \ }
+
+let s:filetype_regex_overrides = {}
+
+function! s:check_defined_section(name)
+  if !exists('w:airline_section_{a:name}')
+    let w:airline_section_{a:name} = g:airline_section_{a:name}
+  endif
+endfunction
+
+function! airline#extensions#append_to_section(name, value)
+  call <sid>check_defined_section(a:name)
+  let w:airline_section_{a:name} .= a:value
+endfunction
+
+function! airline#extensions#prepend_to_section(name, value)
+  call <sid>check_defined_section(a:name)
+  let w:airline_section_{a:name} = a:value . w:airline_section_{a:name}
+endfunction
+
+function! airline#extensions#apply_left_override(section1, section2)
+  let w:airline_section_a = a:section1
+  let w:airline_section_b = a:section2
+  let w:airline_section_c = airline#section#create(['readonly'])
+  let w:airline_render_left = 1
+  let w:airline_render_right = 0
+endfunction
+
+let s:active_winnr = -1
+function! airline#extensions#apply(...)
+  let s:active_winnr = winnr()
+
+  if s:is_excluded_window()
+    return -1
+  endif
+
+  if &buftype == 'help'
+    call airline#extensions#apply_left_override('Help', '%f')
+    let w:airline_section_x = ''
+    let w:airline_section_y = ''
+    let w:airline_render_right = 1
+  endif
+
+  if &previewwindow
+    let w:airline_section_a = 'Preview'
+    let w:airline_section_b = ''
+    let w:airline_section_c = bufname(winbufnr(winnr()))
+  endif
+
+  if has_key(s:filetype_overrides, &ft)
+    let args = s:filetype_overrides[&ft]
+    call airline#extensions#apply_left_override(args[0], args[1])
+  endif
+
+  for item in items(s:filetype_regex_overrides)
+    if match(&ft, item[0]) >= 0
+      call airline#extensions#apply_left_override(item[1][0], item[1][1])
+    endif
+  endfor
+endfunction
+
+function! s:is_excluded_window()
+  for matchft in g:airline_exclude_filetypes
+    if matchft ==# &ft
+      return 1
+    endif
+  endfor
+
+  for matchw in g:airline_exclude_filenames
+    if matchstr(expand('%'), matchw) ==# matchw
+      return 1
+    endif
+  endfor
+
+  if g:airline_exclude_preview && &previewwindow
+    return 1
+  endif
+
+  return 0
+endfunction
+
+function! airline#extensions#load_theme()
+  call airline#util#exec_funcrefs(s:ext._theme_funcrefs, g:airline#themes#{g:airline_theme}#palette)
+endfunction
+
+function! s:sync_active_winnr()
+  if exists('#airline') && winnr() != s:active_winnr
+    call airline#update_statusline()
+  endif
+endfunction
+
+function! airline#extensions#load()
+  let loaded_ext = []
+  " non-trivial number of external plugins use eventignore=all, so we need to account for that
+  autocmd CursorMoved * call <sid>sync_active_winnr()
+
+  if exists('g:airline_extensions')
+    for ext in g:airline_extensions
+      try
+        call airline#extensions#{ext}#init(s:ext)
+      catch /^Vim\%((\a\+)\)\=:E117/	" E117, function does not exist
+        call airline#util#warning("Extension '".ext."' not installed, ignoring!")
+      endtry
+    endfor
+    return
+  endif
+
+  call airline#extensions#quickfix#init(s:ext)
+  call add(loaded_ext, 'quickfix')
+
+  if get(g:, 'loaded_unite', 0)
+    call airline#extensions#unite#init(s:ext)
+    call add(loaded_ext, 'unite')
+  endif
+
+  if exists(':NetrwSettings')
+    call airline#extensions#netrw#init(s:ext)
+    call add(loaded_ext, 'netrw')
+  endif
+
+  if get(g:, 'airline#extensions#ycm#enabled', 0)
+    call airline#extensions#ycm#init(s:ext)
+    call add(loaded_ext, 'ycm')
+  endif
+
+  if get(g:, 'loaded_vimfiler', 0)
+    let g:vimfiler_force_overwrite_statusline = 0
+  endif
+
+  if get(g:, 'loaded_ctrlp', 0)
+    call airline#extensions#ctrlp#init(s:ext)
+    call add(loaded_ext, 'ctrlp')
+  endif
+
+  if get(g:, 'CtrlSpaceLoaded', 0)
+    call airline#extensions#ctrlspace#init(s:ext)
+    call add(loaded_ext, 'ctrlspace')
+  endif
+
+  if get(g:, 'command_t_loaded', 0)
+    call airline#extensions#commandt#init(s:ext)
+    call add(loaded_ext, 'commandt')
+  endif
+
+  if exists(':UndotreeToggle')
+    call airline#extensions#undotree#init(s:ext)
+    call add(loaded_ext, 'undotree')
+  endif
+
+  if get(g:, 'airline#extensions#hunks#enabled', 1)
+        \ && (exists('g:loaded_signify') || exists('g:loaded_gitgutter') || exists('g:loaded_changes') || exists('g:loaded_quickfixsigns'))
+    call airline#extensions#hunks#init(s:ext)
+    call add(loaded_ext, 'hunks')
+  endif
+
+  if get(g:, 'airline#extensions#tagbar#enabled', 1)
+        \ && exists(':TagbarToggle')
+    call airline#extensions#tagbar#init(s:ext)
+    call add(loaded_ext, 'tagbar')
+  endif
+
+  if get(g:, 'airline#extensions#csv#enabled', 1)
+        \ && (get(g:, 'loaded_csv', 0) || exists(':Table'))
+    call airline#extensions#csv#init(s:ext)
+    call add(loaded_ext, 'csv')
+  endif
+
+  if exists(':VimShell')
+    let s:filetype_overrides['vimshell'] = ['vimshell','%{vimshell#get_status_string()}']
+    let s:filetype_regex_overrides['^int-'] = ['vimshell','%{substitute(&ft, "int-", "", "")}']
+  endif
+
+  if get(g:, 'airline#extensions#branch#enabled', 1)
+        \ && (exists('*fugitive#head') || exists('*lawrencium#statusline') ||
+        \     (get(g:, 'airline#extensions#branch#use_vcscommand', 0) && exists('*VCSCommandGetStatusLine')))
+    call airline#extensions#branch#init(s:ext)
+    call add(loaded_ext, 'branch')
+  endif
+
+  if get(g:, 'airline#extensions#bufferline#enabled', 1)
+        \ && exists('*bufferline#get_status_string')
+    call airline#extensions#bufferline#init(s:ext)
+    call add(loaded_ext, 'bufferline')
+  endif
+
+  if (get(g:, 'airline#extensions#virtualenv#enabled', 1) && (exists(':VirtualEnvList') || isdirectory($VIRTUAL_ENV)))
+    call airline#extensions#virtualenv#init(s:ext)
+    call add(loaded_ext, 'virtualenv')
+  endif
+
+  if (get(g:, 'airline#extensions#eclim#enabled', 1) && exists(':ProjectCreate'))
+    call airline#extensions#eclim#init(s:ext)
+    call add(loaded_ext, 'eclim')
+  endif
+
+  if get(g:, 'airline#extensions#syntastic#enabled', 1)
+        \ && exists(':SyntasticCheck')
+    call airline#extensions#syntastic#init(s:ext)
+    call add(loaded_ext, 'syntastic')
+  endif
+
+  if (get(g:, 'airline#extensions#ale#enabled', 1) && exists('g:loaded_ale'))
+    call airline#extensions#ale#init(s:ext)
+    call add(loaded_ext, 'ale')
+  endif
+
+  if get(g:, 'airline#extensions#whitespace#enabled', 1)
+    call airline#extensions#whitespace#init(s:ext)
+    call add(loaded_ext, 'whitespace')
+  endif
+
+  if (get(g:, 'airline#extensions#neomake#enabled', 1) && exists(':Neomake'))
+    call airline#extensions#neomake#init(s:ext)
+    call add(loaded_ext, 'neomake')
+  endif
+
+  if get(g:, 'airline#extensions#po#enabled', 1) && executable('msgfmt')
+    call airline#extensions#po#init(s:ext)
+    call add(loaded_ext, 'po')
+  endif
+
+  if get(g:, 'airline#extensions#wordcount#enabled', 1)
+    call airline#extensions#wordcount#init(s:ext)
+    call add(loaded_ext, 'wordcount')
+  endif
+
+  if get(g:, 'airline#extensions#tabline#enabled', 0)
+    call airline#extensions#tabline#init(s:ext)
+    call add(loaded_ext, 'tabline')
+  endif
+
+  if get(g:, 'airline#extensions#tmuxline#enabled', 1) && exists(':Tmuxline')
+    call airline#extensions#tmuxline#init(s:ext)
+    call add(loaded_ext, 'tmuxline')
+  endif
+
+  if get(g:, 'airline#extensions#promptline#enabled', 1) && exists(':PromptlineSnapshot') && len(get(g:, 'airline#extensions#promptline#snapshot_file', ''))
+    call airline#extensions#promptline#init(s:ext)
+    call add(loaded_ext, 'promptline')
+  endif
+
+  if get(g:, 'airline#extensions#nrrwrgn#enabled', 1) && exists(':NR') == 2
+      call airline#extensions#nrrwrgn#init(s:ext)
+    call add(loaded_ext, 'nrrwrgn')
+  endif
+
+  if get(g:, 'airline#extensions#unicode#enabled', 1) && exists(':UnicodeTable') == 2
+      call airline#extensions#unicode#init(s:ext)
+    call add(loaded_ext, 'nrrwrgn')
+  endif
+
+  if (get(g:, 'airline#extensions#capslock#enabled', 1) && exists('*CapsLockStatusline'))
+    call airline#extensions#capslock#init(s:ext)
+    call add(loaded_ext, 'capslock')
+  endif
+
+  if (get(g:, 'airline#extensions#windowswap#enabled', 1) && get(g:, 'loaded_windowswap', 0))
+    call airline#extensions#windowswap#init(s:ext)
+    call add(loaded_ext, 'windowswap')
+  endif
+
+  if (get(g:, 'airline#extensions#obsession#enabled', 1) && exists('*ObsessionStatus'))
+    call airline#extensions#obsession#init(s:ext)
+    call add(loaded_ext, 'obsession')
+  endif
+
+  if !get(g:, 'airline#extensions#disable_rtp_load', 0)
+    " load all other extensions, which are not part of the default distribution.
+    " (autoload/airline/extensions/*.vim outside of our s:script_path).
+    for file in split(globpath(&rtp, "autoload/airline/extensions/*.vim"), "\n")
+      " we have to check both resolved and unresolved paths, since it's possible
+      " that they might not get resolved properly (see #187)
+      if stridx(tolower(resolve(fnamemodify(file, ':p'))), s:script_path) < 0
+            \ && stridx(tolower(fnamemodify(file, ':p')), s:script_path) < 0
+        let name = fnamemodify(file, ':t:r')
+        if !get(g:, 'airline#extensions#'.name.'#enabled', 1) ||
+            \ index(loaded_ext, name) > -1
+          continue
+        endif
+        try
+          call airline#extensions#{name}#init(s:ext)
+        catch
+        endtry
+      endif
+    endfor
+  endif
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/ale.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/ale.vim
new file mode 100644
index 0000000..84b1b36
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/ale.vim
@@ -0,0 +1,36 @@
+" MIT License. Copyright (c) 2013-2016 Bjorn Neergaard.
+" vim: et ts=2 sts=2 sw=2
+
+if !exists('g:loaded_ale')
+  finish
+endif
+
+let s:error_symbol = get(g:, 'airline#extensions#ale#error_symbol', 'E:')
+let s:warning_symbol = get(g:, 'airline#extensions#ale#warning_symbol', 'W:')
+
+function! s:count(index)
+  let l:buf = bufnr('%')
+  let l:count = ale#statusline#Count(l:buf)
+  if type(l:count) ==# type(0)
+    let l:count = 0
+  else
+    let l:count = l:count[a:index]
+  endif
+
+  return l:count
+endfunction
+
+function! airline#extensions#ale#get_errors()
+  let l:count = s:count(0)
+  return l:count ? s:error_symbol . l:count : ''
+endfunction
+
+function! airline#extensions#ale#get_warnings()
+  let l:count = s:count(1)
+  return l:count ? s:warning_symbol . l:count : ''
+endfunction
+
+function! airline#extensions#ale#init(ext)
+  call airline#parts#define_function('ale_error_count', 'airline#extensions#ale#get_errors')
+  call airline#parts#define_function('ale_warning_count', 'airline#extensions#ale#get_warnings')
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/branch.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/branch.vim
new file mode 100644
index 0000000..56fd32e
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/branch.vim
@@ -0,0 +1,403 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling et al.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:has_fugitive = exists('*fugitive#head')
+let s:has_lawrencium = exists('*lawrencium#statusline')
+let s:has_vcscommand = get(g:, 'airline#extensions#branch#use_vcscommand', 0) && exists('*VCSCommandGetStatusLine')
+
+if !s:has_fugitive && !s:has_lawrencium && !s:has_vcscommand
+  finish
+endif
+
+let s:has_async = airline#util#async
+
+" s:vcs_config contains static configuration of VCSes and their status relative
+" to the active file.
+" 'branch'    - The name of currently active branch. This field is empty iff it
+"               has not been initialized yet or the current file is not in
+"               an active branch.
+" 'untracked' - Cache of untracked files represented as a dictionary with files
+"               as keys. A file has a not exists symbol set as its value if it
+"               is untracked. A file is present in this dictionary iff its
+"               status is considered up to date.
+" 'untracked_mark' - used as regexp to test against the output of 'cmd'
+let s:vcs_config = {
+\  'git': {
+\    'exe': 'git',
+\    'cmd': 'git status --porcelain -- ',
+\    'untracked_mark': '??',
+\    'update_branch': 's:update_git_branch',
+\    'branch': '',
+\    'untracked': {},
+\  },
+\  'mercurial': {
+\    'exe': 'hg',
+\    'cmd': 'hg status -u -- ',
+\    'untracked_mark': '?',
+\    'update_branch': 's:update_hg_branch',
+\    'branch': '',
+\    'untracked': {},
+\  },
+\}
+
+" Initializes b:buffer_vcs_config. b:buffer_vcs_config caches the branch and
+" untracked status of the file in the buffer. Caching those fields is necessary,
+" because s:vcs_config may be updated asynchronously and s:vcs_config fields may
+" be invalid during those updates. b:buffer_vcs_config fields are updated
+" whenever corresponding fields in s:vcs_config are updated or an inconsistency
+" is detected during update_* operation.
+"
+" b:airline_head caches the head string it is empty iff it needs to be
+" recalculated. b:airline_head is recalculated based on b:buffer_vcs_config.
+function! s:init_buffer()
+  let b:buffer_vcs_config = {}
+  for vcs in keys(s:vcs_config)
+    let b:buffer_vcs_config[vcs] = {
+          \     'branch': '',
+          \     'untracked': '',
+          \   }
+  endfor
+  unlet! b:airline_head
+endfunction
+
+let s:head_format = get(g:, 'airline#extensions#branch#format', 0)
+if s:head_format == 1
+  function! s:format_name(name)
+    return fnamemodify(a:name, ':t')
+  endfunction
+elseif s:head_format == 2
+  function! s:format_name(name)
+    return pathshorten(a:name)
+  endfunction
+elseif type(s:head_format) == type('')
+  function! s:format_name(name)
+    return call(s:head_format, [a:name])
+  endfunction
+else
+  function! s:format_name(name)
+    return a:name
+  endfunction
+endif
+
+let s:git_dirs = {}
+
+function! s:update_git_branch(path)
+  if !s:has_fugitive
+    let s:vcs_config['git'].branch = ''
+    return
+  endif
+
+  let name = fugitive#head(7)
+  if empty(name)
+    if has_key(s:git_dirs, a:path)
+      let s:vcs_config['git'].branch = s:git_dirs[a:path]
+      return
+    endif
+
+    let dir = fugitive#extract_git_dir(a:path)
+    if empty(dir)
+      let name = ''
+    else
+      try
+        let line = join(readfile(dir . '/HEAD'))
+        if strpart(line, 0, 16) == 'ref: refs/heads/'
+          let name = strpart(line, 16)
+        else
+          " raw commit hash
+          let name = strpart(line, 0, 7)
+        endif
+      catch
+        let name = ''
+      endtry
+    endif
+  endif
+
+  let s:git_dirs[a:path] = name
+  let s:vcs_config['git'].branch = name
+endfunction
+
+function! s:update_hg_branch(path)
+  if s:has_lawrencium
+    let stl=lawrencium#statusline()
+    if !empty(stl) && s:has_async
+      call s:get_mq_async('hg qtop', expand('%:p'))
+    endif
+    if exists("s:mq") && !empty(s:mq)
+      if stl is# 'default'
+        " Shorten default a bit
+        let stl='def'
+      endif
+      let stl.=' ['.s:mq.']'
+    endif
+    let s:vcs_config['mercurial'].branch = stl
+  else
+    let s:vcs_config['mercurial'].branch = ''
+  endif
+endfunction
+
+function! s:update_branch()
+  let l:path = exists("*fnamemodify") ? fnamemodify(resolve(@%), ":p:h") : expand("%:p:h")
+  for vcs in keys(s:vcs_config)
+    call {s:vcs_config[vcs].update_branch}(l:path)
+    if b:buffer_vcs_config[vcs].branch != s:vcs_config[vcs].branch
+      let b:buffer_vcs_config[vcs].branch = s:vcs_config[vcs].branch
+      unlet! b:airline_head
+    endif
+  endfor
+endfunction
+
+function! s:update_untracked_in_buffer_config(file, vcs)
+  if !has_key(s:vcs_config[a:vcs].untracked, a:file)
+    return
+  elseif s:vcs_config[a:vcs].untracked[a:file] != b:buffer_vcs_config[a:vcs].untracked
+    let b:buffer_vcs_config[a:vcs].untracked = s:vcs_config[a:vcs].untracked[a:file]
+    unlet! b:airline_head
+  endif
+endfunction
+
+function! s:update_untracked()
+  let l:file = expand("%:p")
+  if empty(l:file) || isdirectory(l:file)
+    return
+  endif
+
+  let l:needs_update = 1
+  for vcs in keys(s:vcs_config)
+    if has_key(s:vcs_config[vcs].untracked, l:file)
+      let l:needs_update = 0
+      call s:update_untracked_in_buffer_config(l:file, vcs)
+    endif
+  endfor
+
+  if !l:needs_update
+    return
+  endif
+
+  for vcs in keys(s:vcs_config)
+    let l:config = s:vcs_config[vcs]
+    if s:has_async
+      " Note that asynchronous update updates s:vcs_config only, and only
+      " s:update_untracked updates b:buffer_vcs_config. If s:vcs_config is
+      " invalidated again before s:update_untracked is called, then we lose the
+      " result of the previous call, i.e. the head string is not updated. It
+      " doesn't happen often in practice, so we let it be.
+      call s:get_vcs_untracked_async(l:config, l:file)
+    else
+      let output = airline#util#system(l:config.cmd . shellescape(l:file))
+      if output =~? ('^' . l:config.untracked_mark)
+        let l:config.untracked[l:file] = get(g:, 'airline#extensions#branch#notexists', g:airline_symbols.notexists)
+      else
+        let l:config.untracked[l:file] = ''
+      endif
+      call s:update_untracked_in_buffer_config(l:file, vcs)
+    endif
+  endfor
+endfunction
+
+if s:has_async
+  let s:jobs = {}
+
+  function! s:on_stdout(channel, msg) dict abort
+    let self.buf .= a:msg
+  endfunction
+
+  function! s:on_exit(channel) dict abort
+    if self.buf =~? ('^' . self.config['untracked_mark'])
+      let self.config.untracked[self.file] = get(g:, 'airline#extensions#branch#notexists', g:airline_symbols.notexists)
+    else
+      let self.config.untracked[self.file] = ''
+    endif
+    " b:buffer_vcs_config will be updated on next call of update_untracked if
+    " needed
+    if has_key(s:jobs, self.file)
+      call remove(s:jobs, self.file)
+    endif
+  endfunction
+
+  function! s:get_vcs_untracked_async(config, file)
+    if g:airline#util#is_windows && &shell =~ 'cmd'
+      let cmd = a:config['cmd'] . shellescape(a:file)
+    else
+      let cmd = ['sh', '-c', a:config['cmd'] . shellescape(a:file)]
+    endif
+
+    let options = {'config': a:config, 'buf': '', 'file': a:file}
+    if has_key(s:jobs, a:file)
+      if job_status(get(s:jobs, a:file)) == 'run'
+        return
+      elseif has_key(s:jobs, a:file)
+        call remove(s:jobs, a:file)
+      endif
+    endif
+    let id = job_start(cmd, {
+          \ 'err_io':   'out',
+          \ 'out_cb':   function('s:on_stdout', options),
+          \ 'close_cb': function('s:on_exit', options)})
+    let s:jobs[a:file] = id
+  endfu
+
+  function! s:on_exit_mq(channel) dict abort
+    if !empty(self.buf)
+      if self.buf is# 'no patches applied' ||
+        \ self.buf =~# "unknown command 'qtop'"
+        let self.buf = ''
+      elseif exists("s:mq") && s:mq isnot# self.buf
+        " make sure, statusline is updated
+        unlet! b:airline_head
+      endif
+      let s:mq = self.buf
+    endif
+    if has_key(s:jobs, self.file)
+      call remove(s:jobs, self.file)
+    endif
+  endfunction
+
+  function! s:get_mq_async(cmd, file)
+    if g:airline#util#is_windows && &shell =~ 'cmd'
+      let cmd = a:cmd. shellescape(a:file)
+    else
+      let cmd = ['sh', '-c', a:cmd]
+    endif
+
+    let options = {'cmd': a:cmd, 'buf': '', 'file': a:file}
+    if has_key(s:jobs, a:file)
+      if job_status(get(s:jobs, a:file)) == 'run'
+        return
+      elseif has_key(s:jobs, a:file)
+        call remove(s:jobs, a:file)
+      endif
+    endif
+    let id = job_start(cmd, {
+          \ 'err_io':   'out',
+          \ 'out_cb':   function('s:on_stdout', options),
+          \ 'close_cb': function('s:on_exit_mq', options)})
+    let s:jobs[a:file] = id
+  endfu
+endif
+
+function! airline#extensions#branch#head()
+  if !exists('b:buffer_vcs_config')
+    call s:init_buffer()
+  endif
+
+  call s:update_branch()
+  call s:update_untracked()
+
+  if exists('b:airline_head') && !empty(b:airline_head)
+    return b:airline_head
+  endif
+
+  let b:airline_head = ''
+  let l:vcs_priority = get(g:, "airline#extensions#branch#vcs_priority", ["git", "mercurial"])
+
+  let l:heads = {}
+  for vcs in l:vcs_priority
+    if !empty(b:buffer_vcs_config[vcs].branch)
+      let l:heads[vcs] = b:buffer_vcs_config[vcs].branch
+    endif
+  endfor
+
+  for vcs in keys(l:heads)
+    if !empty(b:airline_head)
+      let b:airline_head .= ' | '
+    endif
+    let b:airline_head .= (len(l:heads) > 1 ? s:vcs_config[l:vcs].exe : '') . s:format_name(l:heads[l:vcs])
+    let b:airline_head .= b:buffer_vcs_config[vcs].untracked
+  endfor
+
+  if empty(l:heads)
+    if s:has_vcscommand
+      call VCSCommandEnableBufferSetup()
+      if exists('b:VCSCommandBufferInfo')
+        let b:airline_head = s:format_name(get(b:VCSCommandBufferInfo, 0, ''))
+      endif
+    endif
+  endif
+
+  if exists("g:airline#extensions#branch#displayed_head_limit")
+    let w:displayed_head_limit = g:airline#extensions#branch#displayed_head_limit
+    if len(b:airline_head) > w:displayed_head_limit - 1
+      let b:airline_head = b:airline_head[0:(w:displayed_head_limit - 1)].(&encoding ==? 'utf-8' ?  '…' : '.')
+    endif
+  endif
+
+  if has_key(l:heads, 'git') && !s:check_in_path()
+    let b:airline_head = ''
+  endif
+  let minwidth = empty(get(b:, 'airline_hunks', '')) ? 14 : 7
+  let b:airline_head = airline#util#shorten(b:airline_head, 120, minwidth)
+  return b:airline_head
+endfunction
+
+function! airline#extensions#branch#get_head()
+  let head = airline#extensions#branch#head()
+  let empty_message = get(g:, 'airline#extensions#branch#empty_message', '')
+  let symbol = get(g:, 'airline#extensions#branch#symbol', g:airline_symbols.branch)
+  return empty(head)
+        \ ? empty_message
+        \ : printf('%s%s', empty(symbol) ? '' : symbol.(g:airline_symbols.space), head)
+endfunction
+
+function! s:check_in_path()
+  if !exists('b:airline_file_in_root')
+    let root = get(b:, 'git_dir', get(b:, 'mercurial_dir', ''))
+    let bufferpath = resolve(fnamemodify(expand('%'), ':p'))
+
+    if !filereadable(root) "not a file
+      " if .git is a directory, it's the old submodule format
+      if match(root, '\.git$') >= 0
+        let root = expand(fnamemodify(root, ':h'))
+      else
+        " else it's the newer format, and we need to guesstimate
+        " 1) check for worktrees
+        if match(root, 'worktrees') > -1
+          " worktree can be anywhere, so simply assume true here
+          return 1
+        endif
+        " 2) check for submodules
+        let pattern = '\.git[\\/]\(modules\)[\\/]'
+        if match(root, pattern) >= 0
+          let root = substitute(root, pattern, '', '')
+        endif
+      endif
+    endif
+
+    let b:airline_file_in_root = stridx(bufferpath, root) > -1
+  endif
+  return b:airline_file_in_root
+endfunction
+
+function! s:reset_untracked_cache(shellcmdpost)
+  " shellcmdpost - whether function was called as a result of ShellCmdPost hook
+  if !s:has_async && !has('nvim')
+    if a:shellcmdpost
+      " Clear cache only if there was no error or the script uses an
+      " asynchronous interface. Otherwise, cache clearing would overwrite
+      " v:shell_error with a system() call inside get_*_untracked.
+      if v:shell_error
+        return
+      endif
+    endif
+  endif
+
+  let l:file = expand("%:p")
+  for vcs in keys(s:vcs_config)
+    " Dump the value of the cache for the current file. Partially mitigates the
+    " issue of cache invalidation happening before a call to
+    " s:update_untracked()
+    call s:update_untracked_in_buffer_config(l:file, l:vcs)
+    let s:vcs_config[vcs].untracked = {}
+  endfor
+endfunction
+
+function! airline#extensions#branch#init(ext)
+  call airline#parts#define_function('branch', 'airline#extensions#branch#get_head')
+
+  autocmd BufReadPost * unlet! b:airline_file_in_root
+  autocmd CursorHold,ShellCmdPost,CmdwinLeave * unlet! b:airline_head
+  autocmd User AirlineBeforeRefresh unlet! b:airline_head
+  autocmd BufWritePost * call s:reset_untracked_cache(0)
+  autocmd ShellCmdPost * call s:reset_untracked_cache(1)
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/bufferline.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/bufferline.vim
new file mode 100644
index 0000000..8ca825f
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/bufferline.vim
@@ -0,0 +1,25 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !exists('*bufferline#get_status_string')
+  finish
+endif
+
+let s:overwrite = get(g:, 'airline#extensions#bufferline#overwrite_variables', 1)
+
+function! airline#extensions#bufferline#init(ext)
+  if s:overwrite
+    highlight bufferline_selected gui=bold cterm=bold term=bold
+    highlight link bufferline_selected_inactive airline_c_inactive
+    let g:bufferline_inactive_highlight = 'airline_c'
+    let g:bufferline_active_highlight = 'bufferline_selected'
+    let g:bufferline_active_buffer_left = ''
+    let g:bufferline_active_buffer_right = ''
+    let g:bufferline_separator = g:airline_symbols.space
+  endif
+
+  call airline#parts#define_raw('file', '%{bufferline#refresh_status()}'.bufferline#get_status_string())
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/capslock.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/capslock.vim
new file mode 100644
index 0000000..d79c24e
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/capslock.vim
@@ -0,0 +1,17 @@
+" MIT License. Copyright (c) 2014 Mathias Andersson.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !exists('*CapsLockStatusline')
+  finish
+endif
+
+function! airline#extensions#capslock#status()
+  return tolower(CapsLockStatusline()) == '[caps]' ? 'CAPS' : ''
+endfunction
+
+function! airline#extensions#capslock#init(ext)
+  call airline#parts#define_function('capslock', 'airline#extensions#capslock#status')
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/commandt.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/commandt.vim
new file mode 100644
index 0000000..93c6572
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/commandt.vim
@@ -0,0 +1,18 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !get(g:, 'command_t_loaded', 0)
+  finish
+endif
+
+function! airline#extensions#commandt#apply(...)
+  if bufname('%') ==# 'GoToFile'
+    call airline#extensions#apply_left_override('CommandT', '')
+  endif
+endfunction
+
+function! airline#extensions#commandt#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#commandt#apply')
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/csv.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/csv.vim
new file mode 100644
index 0000000..b95aacd
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/csv.vim
@@ -0,0 +1,33 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !get(g:, 'loaded_csv', 0) && !exists(':Table')
+  finish
+endif
+
+let s:column_display = get(g:, 'airline#extensions#csv#column_display', 'Number')
+
+function! airline#extensions#csv#get_column()
+  if exists('*CSV_WCol')
+    if s:column_display ==# 'Name'
+      return '['.CSV_WCol('Name').CSV_WCol().']'
+    else
+      return '['.CSV_WCol().']'
+    endif
+  endif
+  return ''
+endfunction
+
+function! airline#extensions#csv#apply(...)
+  if &ft ==# "csv"
+    call airline#extensions#prepend_to_section('gutter',
+          \ g:airline_left_alt_sep.' %{airline#extensions#csv#get_column()}')
+  endif
+endfunction
+
+function! airline#extensions#csv#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#csv#apply')
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/ctrlp.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/ctrlp.vim
new file mode 100644
index 0000000..3781108
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/ctrlp.vim
@@ -0,0 +1,82 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+
+let s:color_template = get(g:, 'airline#extensions#ctrlp#color_template', 'insert')
+
+function! airline#extensions#ctrlp#generate_color_map(dark, light, white)
+  return {
+        \ 'CtrlPdark'   : a:dark,
+        \ 'CtrlPlight'  : a:light,
+        \ 'CtrlPwhite'  : a:white,
+        \ 'CtrlParrow1' : [ a:light[1] , a:white[1] , a:light[3] , a:white[3] , ''     ] ,
+        \ 'CtrlParrow2' : [ a:white[1] , a:light[1] , a:white[3] , a:light[3] , ''     ] ,
+        \ 'CtrlParrow3' : [ a:light[1] , a:dark[1]  , a:light[3] , a:dark[3]  , ''     ] ,
+        \ }
+endfunction
+
+function! airline#extensions#ctrlp#load_theme(palette)
+  if exists('a:palette.ctrlp')
+    let theme = a:palette.ctrlp
+  else
+    let s:color_template = has_key(a:palette, s:color_template) ? s:color_template : 'insert'
+    let theme = airline#extensions#ctrlp#generate_color_map(
+          \ a:palette[s:color_template]['airline_c'],
+          \ a:palette[s:color_template]['airline_b'],
+          \ a:palette[s:color_template]['airline_a'])
+  endif
+  for key in keys(theme)
+    call airline#highlighter#exec(key, theme[key])
+  endfor
+endfunction
+
+" Arguments: focus, byfname, regexp, prv, item, nxt, marked
+function! airline#extensions#ctrlp#ctrlp_airline(...)
+  let b = airline#builder#new({'active': 1})
+  if a:2 == 'file'
+    call b.add_section_spaced('CtrlPlight', 'by fname')
+  endif
+  if a:3
+    call b.add_section_spaced('CtrlPlight', 'regex')
+  endif
+  if get(g:, 'airline#extensions#ctrlp#show_adjacent_modes', 1)
+    call b.add_section_spaced('CtrlPlight', a:4)
+    call b.add_section_spaced('CtrlPwhite', a:5)
+    call b.add_section_spaced('CtrlPlight', a:6)
+  else
+    call b.add_section_spaced('CtrlPwhite', a:5)
+  endif
+  call b.add_section_spaced('CtrlPdark', a:7)
+  call b.split()
+  call b.add_section_spaced('CtrlPdark', a:1)
+  call b.add_section_spaced('CtrlPdark', a:2)
+  call b.add_section_spaced('CtrlPlight', '%{getcwd()}')
+  return b.build()
+endfunction
+
+" Argument: len
+function! airline#extensions#ctrlp#ctrlp_airline_status(...)
+  let len = '%#CtrlPdark# '.a:1
+  let dir = '%=%<%#CtrlParrow3#'.g:airline_right_sep.'%#CtrlPlight# '.getcwd().' %*'
+  return len.dir
+endfunction
+
+function! airline#extensions#ctrlp#apply(...)
+  " disable statusline overwrite if ctrlp already did it
+  return match(&statusline, 'CtrlPwhite') >= 0 ? -1 : 0
+endfunction
+
+function! airline#extensions#ctrlp#init(ext)
+  let g:ctrlp_status_func = {
+        \ 'main': 'airline#extensions#ctrlp#ctrlp_airline',
+        \ 'prog': 'airline#extensions#ctrlp#ctrlp_airline_status',
+        \ }
+  call a:ext.add_statusline_func('airline#extensions#ctrlp#apply')
+  call a:ext.add_theme_func('airline#extensions#ctrlp#load_theme')
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/ctrlspace.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/ctrlspace.vim
new file mode 100644
index 0000000..57183d7
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/ctrlspace.vim
@@ -0,0 +1,19 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:spc = g:airline_symbols.space
+let s:padding = s:spc . s:spc . s:spc
+
+function! airline#extensions#ctrlspace#statusline(...)
+  let b = airline#builder#new({ 'active': 1 })
+  call b.add_section('airline_b', '⌗' . s:padding . ctrlspace#api#StatuslineModeSegment(s:padding))
+  call b.split()
+  call b.add_section('airline_x', s:spc . ctrlspace#api#StatuslineTabSegment() . s:spc)
+  return b.build()
+endfunction
+
+function! airline#extensions#ctrlspace#init(ext)
+  let g:CtrlSpaceStatuslineFunction = "airline#extensions#ctrlspace#statusline()"
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/default.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/default.vim
new file mode 100644
index 0000000..7c209a1
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/default.vim
@@ -0,0 +1,101 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:section_use_groups     = get(g:, 'airline#extensions#default#section_use_groupitems', 1)
+let s:section_truncate_width = get(g:, 'airline#extensions#default#section_truncate_width', {
+      \ 'b': 79,
+      \ 'x': 60,
+      \ 'y': 88,
+      \ 'z': 45,
+      \ 'warning': 80,
+      \ 'error': 80,
+      \ })
+let s:layout = get(g:, 'airline#extensions#default#layout', [
+      \ [ 'a', 'b', 'c' ],
+      \ [ 'x', 'y', 'z', 'warning', 'error' ]
+      \ ])
+
+function! s:get_section(winnr, key, ...)
+  if has_key(s:section_truncate_width, a:key)
+    if winwidth(a:winnr) < s:section_truncate_width[a:key]
+      return ''
+    endif
+  endif
+  let spc = g:airline_symbols.space
+  if !exists('g:airline_section_{a:key}')
+    return ''
+  endif
+  let text = airline#util#getwinvar(a:winnr, 'airline_section_'.a:key, g:airline_section_{a:key})
+  let [prefix, suffix] = [get(a:000, 0, '%('.spc), get(a:000, 1, spc.'%)')]
+  return empty(text) ? '' : prefix.text.suffix
+endfunction
+
+function! s:build_sections(builder, context, keys)
+  for key in a:keys
+    if (key == 'warning' || key == 'error') && !a:context.active
+      continue
+    endif
+    call s:add_section(a:builder, a:context, key)
+  endfor
+endfunction
+
+" There still is a highlighting bug when using groups %(%) in the statusline,
+" deactivate it, unless it is fixed (7.4.1511)
+if s:section_use_groups && (v:version >= 704 || (v:version >= 703 && has('patch81')))
+  function! s:add_section(builder, context, key)
+    let condition = (a:key is# "warning" || a:key is# "error") &&
+          \ (v:version == 704 && !has("patch1511"))
+    " i have no idea why the warning section needs special treatment, but it's
+    " needed to prevent separators from showing up
+    if ((a:key == 'error' || a:key == 'warning') && empty(s:get_section(a:context.winnr, a:key)))
+      return
+    endif
+    if condition
+      call a:builder.add_raw('%(')
+    endif
+    call a:builder.add_section('airline_'.a:key, s:get_section(a:context.winnr, a:key))
+    if condition
+      call a:builder.add_raw('%)')
+    endif
+  endfunction
+else
+  " older version don't like the use of %(%)
+  function! s:add_section(builder, context, key)
+    if ((a:key == 'error' || a:key == 'warning') && empty(s:get_section(a:context.winnr, a:key)))
+      return
+    endif
+    if a:key == 'warning'
+      call a:builder.add_raw('%#airline_warning#'.s:get_section(a:context.winnr, a:key))
+    elseif a:key == 'error'
+      call a:builder.add_raw('%#airline_error#'.s:get_section(a:context.winnr, a:key))
+    else
+      call a:builder.add_section('airline_'.a:key, s:get_section(a:context.winnr, a:key))
+    endif
+  endfunction
+endif
+
+function! airline#extensions#default#apply(builder, context)
+  let winnr = a:context.winnr
+  let active = a:context.active
+
+  if airline#util#getwinvar(winnr, 'airline_render_left', active || (!active && !g:airline_inactive_collapse))
+    call s:build_sections(a:builder, a:context, s:layout[0])
+  else
+    let text = s:get_section(winnr, 'c')
+    if empty(text)
+      let text = ' %f%m '
+    endif
+    call a:builder.add_section('airline_c'.(a:context.bufnr), text)
+  endif
+
+  call a:builder.split(s:get_section(winnr, 'gutter', '', ''))
+
+  if airline#util#getwinvar(winnr, 'airline_render_right', 1)
+    call s:build_sections(a:builder, a:context, s:layout[1])
+  endif
+
+  return 1
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/eclim.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/eclim.vim
new file mode 100644
index 0000000..44f1bb5
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/eclim.vim
@@ -0,0 +1,62 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !exists(':ProjectCreate')
+  finish
+endif
+
+function! airline#extensions#eclim#creat_line(...)
+  if &filetype == "tree"
+    let builder = a:1
+    call builder.add_section('airline_a', ' Project ')
+    call builder.add_section('airline_b', ' %f ')
+    call builder.add_section('airline_c', '')
+  return 1
+  endif
+endfunction
+
+function! airline#extensions#eclim#get_warnings()
+  " Cache vavlues, so that it isn't called too often
+  if exists("s:eclim_errors") &&
+    \  get(b:,  'airline_changenr', 0) == changenr()
+    return s:eclim_errors
+  endif
+  let eclimList = eclim#display#signs#GetExisting()
+  let s:eclim_errors = ''
+
+  if !empty(eclimList)
+    " Remove any non-eclim signs (see eclim#display#signs#Update)
+    " First check for just errors since they are more important.
+    " If there are no errors, then check for warnings.
+    let errorList = filter(copy(eclimList), 'v:val.name =~ "^\\(qf_\\)\\?\\(error\\)$"')
+
+    if (empty(errorList))
+      " use the warnings
+      call filter(eclimList, 'v:val.name =~ "^\\(qf_\\)\\?\\(warning\\)$"')
+      let type = 'W'
+    else
+      " Use the errors
+      let eclimList = errorList
+      let type = 'E'
+    endif
+
+    if !empty(eclimList)
+      let errorsLine = eclimList[0]['line']
+      let errorsNumber = len(eclimList)
+      let errors = "[Eclim:" . type . " line:".string(errorsLine)." (".string(errorsNumber).")]"
+      if !exists(':SyntasticCheck') || SyntasticStatuslineFlag() == ''
+        let s:eclim_errors = errors.(g:airline_symbols.space)
+      endif
+    endif
+  endif
+  let b:airline_changenr = changenr()
+  return s:eclim_errors
+endfunction
+
+function! airline#extensions#eclim#init(ext)
+  call airline#parts#define_function('eclim', 'airline#extensions#eclim#get_warnings')
+  call a:ext.add_statusline_func('airline#extensions#eclim#creat_line')
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/example.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/example.vim
new file mode 100644
index 0000000..c81f6c3
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/example.vim
@@ -0,0 +1,56 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+" we don't actually want this loaded :P
+finish
+
+" Due to some potential rendering issues, the use of the `space` variable is
+" recommended.
+let s:spc = g:airline_symbols.space
+
+" Extension specific variables can be defined the usual fashion.
+if !exists('g:airline#extensions#example#number_of_cats')
+  let g:airline#extensions#example#number_of_cats = 42
+endif
+
+" First we define an init function that will be invoked from extensions.vim
+function! airline#extensions#example#init(ext)
+
+  " Here we define a new part for the plugin.  This allows users to place this
+  " extension in arbitrary locations.
+  call airline#parts#define_raw('cats', '%{airline#extensions#example#get_cats()}')
+
+  " Next up we add a funcref so that we can run some code prior to the
+  " statusline getting modifed.
+  call a:ext.add_statusline_func('airline#extensions#example#apply')
+
+  " You can also add a funcref for inactive statuslines.
+  " call a:ext.add_inactive_statusline_func('airline#extensions#example#unapply')
+endfunction
+
+" This function will be invoked just prior to the statusline getting modified.
+function! airline#extensions#example#apply(...)
+  " First we check for the filetype.
+  if &filetype == "nyancat"
+
+    " Let's say we want to append to section_c, first we check if there's
+    " already a window-local override, and if not, create it off of the global
+    " section_c.
+    let w:airline_section_c = get(w:, 'airline_section_c', g:airline_section_c)
+
+    " Then we just append this extenion to it, optionally using separators.
+    let w:airline_section_c .= s:spc.g:airline_left_alt_sep.s:spc.'%{airline#extensions#example#get_cats()}'
+  endif
+endfunction
+
+" Finally, this function will be invoked from the statusline.
+function! airline#extensions#example#get_cats()
+  let cats = ''
+  for i in range(1, g:airline#extensions#example#number_of_cats)
+    let cats .= ' (,,,)=(^.^)=(,,,) '
+  endfor
+  return cats
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/hunks.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/hunks.vim
new file mode 100644
index 0000000..02a8ff4
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/hunks.vim
@@ -0,0 +1,96 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !get(g:, 'loaded_signify', 0) && !get(g:, 'loaded_gitgutter', 0) && !get(g:, 'loaded_changes', 0) && !get(g:, 'loaded_quickfixsigns', 0)
+  finish
+endif
+
+let s:non_zero_only = get(g:, 'airline#extensions#hunks#non_zero_only', 0)
+let s:hunk_symbols = get(g:, 'airline#extensions#hunks#hunk_symbols', ['+', '~', '-'])
+
+function! s:get_hunks_signify()
+  let hunks = sy#repo#get_stats()
+  if hunks[0] >= 0
+    return hunks
+  endif
+  return []
+endfunction
+
+function! s:is_branch_empty()
+  return exists('*airline#extensions#branch#head') && empty(airline#extensions#branch#head())
+endfunction
+
+function! s:get_hunks_gitgutter()
+  if !get(g:, 'gitgutter_enabled', 0) || s:is_branch_empty()
+    return ''
+  endif
+  return GitGutterGetHunkSummary()
+endfunction
+
+function! s:get_hunks_changes()
+  if !get(b:, 'changes_view_enabled', 0) || s:is_branch_empty()
+    return []
+  endif
+  let hunks = changes#GetStats()
+  for i in hunks
+    if i > 0
+      return hunks
+    endif
+  endfor
+  return []
+endfunction
+
+function! s:get_hunks_empty()
+  return ''
+endfunction
+
+function! s:get_hunks()
+  if !exists('b:source_func') || get(b:, 'source_func', '') is# 's:get_hunks_empty'
+    if get(g:, 'loaded_signify') && sy#buffer_is_active()
+      let b:source_func = 's:get_hunks_signify'
+    elseif exists('*GitGutterGetHunkSummary')
+      let b:source_func = 's:get_hunks_gitgutter'
+    elseif exists('*changes#GetStats')
+      let b:source_func = 's:get_hunks_changes'
+    elseif exists('*quickfixsigns#vcsdiff#GetHunkSummary')
+      let b:source_func = 'quickfixsigns#vcsdiff#GetHunkSummary'
+    else
+      let b:source_func = 's:get_hunks_empty'
+    endif
+  endif
+  return {b:source_func}()
+endfunction
+
+function! airline#extensions#hunks#get_hunks()
+  if !get(w:, 'airline_active', 0)
+    return ''
+  endif
+  " Cache vavlues, so that it isn't called too often
+  if exists("b:airline_hunks") &&
+    \ get(b:,  'airline_changenr', 0) == changenr() &&
+    \ winwidth(0) == get(s:, 'airline_winwidth', 0) &&
+    \ get(b:, 'source_func', '') isnot# 's:get_hunks_signify' &&
+    \ get(b:, 'source_func', '') isnot# 's:get_hunks_gitgutter' &&
+    \ get(b:, 'source_func', '') isnot# 's:get_hunks_empty'
+    return b:airline_hunks
+  endif
+  let hunks = s:get_hunks()
+  let string = ''
+  if !empty(hunks)
+    for i in [0, 1, 2]
+      if (s:non_zero_only == 0 && winwidth(0) > 100) || hunks[i] > 0
+        let string .= printf('%s%s ', s:hunk_symbols[i], hunks[i])
+      endif
+    endfor
+  endif
+  let b:airline_hunks = string
+  let b:airline_changenr = changenr()
+  let s:airline_winwidth = winwidth(0)
+  return string
+endfunction
+
+function! airline#extensions#hunks#init(ext)
+  call airline#parts#define_function('hunks', 'airline#extensions#hunks#get_hunks')
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/neomake.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/neomake.vim
new file mode 100644
index 0000000..6587f87
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/neomake.vim
@@ -0,0 +1,25 @@
+" vim: et ts=2 sts=2 sw=2
+
+if !exists(':Neomake')
+  finish
+endif
+
+let s:error_symbol = get(g:, 'airline#extensions#neomake#error_symbol', 'E:')
+let s:warning_symbol = get(g:, 'airline#extensions#neomake#warning_symbol', 'W:')
+
+function! airline#extensions#neomake#get_warnings()
+  let counts = neomake#statusline#LoclistCounts()
+  let warnings = get(counts, 'W', 0)
+  return warnings ? s:warning_symbol.warnings : ''
+endfunction
+
+function! airline#extensions#neomake#get_errors()
+  let counts = neomake#statusline#LoclistCounts()
+  let errors = get(counts, 'E', 0)
+  return errors ? s:error_symbol.errors : ''
+endfunction
+
+function! airline#extensions#neomake#init(ext)
+  call airline#parts#define_function('neomake_warning_count', 'airline#extensions#neomake#get_warnings')
+  call airline#parts#define_function('neomake_error_count', 'airline#extensions#neomake#get_errors')
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/netrw.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/netrw.vim
new file mode 100644
index 0000000..7af76d6
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/netrw.vim
@@ -0,0 +1,34 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !exists(':NetrwSettings')
+  finish
+endif
+
+function! airline#extensions#netrw#apply(...)
+  if &ft == 'netrw'
+    let spc = g:airline_symbols.space
+
+    call a:1.add_section('airline_a', spc.'netrw'.spc)
+    if exists('*airline#extensions#branch#get_head')
+      call a:1.add_section('airline_b', spc.'%{airline#extensions#branch#get_head()}'.spc)
+    endif
+    call a:1.add_section('airline_c', spc.'%f'.spc)
+    call a:1.split()
+    call a:1.add_section('airline_y', spc.'%{airline#extensions#netrw#sortstring()}'.spc)
+    return 1
+  endif
+endfunction
+
+function! airline#extensions#netrw#init(ext)
+  let g:netrw_force_overwrite_statusline = 0
+  call a:ext.add_statusline_func('airline#extensions#netrw#apply')
+endfunction
+
+
+function! airline#extensions#netrw#sortstring()
+  let order = (g:netrw_sort_direction =~ 'n') ? '+' : '-'
+  return g:netrw_sort_by . (g:airline_symbols.space) . '[' . order . ']'
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/nrrwrgn.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/nrrwrgn.vim
new file mode 100644
index 0000000..4629915
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/nrrwrgn.vim
@@ -0,0 +1,57 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !get(g:, 'loaded_nrrw_rgn', 0)
+  finish
+endif
+
+function! airline#extensions#nrrwrgn#apply(...)
+  if exists(":WidenRegion") == 2
+    let spc = g:airline_symbols.space
+    if !exists("*nrrwrgn#NrrwRgnStatus()") || empty(nrrwrgn#NrrwRgnStatus())
+      call a:1.add_section('airline_a', printf('%s[Narrowed%s#%d]', spc, spc, b:nrrw_instn))
+      let bufname=(get(b:, 'orig_buf', 0) ? bufname(b:orig_buf) : substitute(bufname('%'), '^Nrrwrgn_\zs.*\ze_\d\+$', submatch(0), ''))
+      call a:1.add_section('airline_c', spc.bufname.spc)
+      call a:1.split()
+    else
+      let dict=nrrwrgn#NrrwRgnStatus()
+      let vmode = { 'v': 'Char ', 'V': 'Line ', '': 'Block '}
+      let mode = dict.visual ? vmode[dict.visual] : vmode['V']
+      let winwidth = winwidth(0)
+      if winwidth < 80
+        let mode = mode[0]
+      endif
+      let title = (winwidth < 80 ? "Nrrw" : "Narrowed ")
+      let multi = (winwidth < 80 ? 'M' : 'Multi')
+      call a:1.add_section('airline_a', printf('[%s%s%s#%d]%s', (dict.multi ? multi : ""),
+        \ title, mode, b:nrrw_instn, spc))
+      let name = dict.fullname
+      if name !=# '[No Name]'
+        if winwidth > 100
+          " need some space
+          let name = fnamemodify(dict.fullname, ':~')
+          if strlen(name) > 8
+            " shorten name
+            let name = substitute(name, '\(.\)[^/\\]*\([/\\]\)', '\1\2', 'g')
+          endif
+        else
+          let name = fnamemodify(dict.fullname, ':t')
+        endif
+      endif
+      let range=(dict.multi ? '' : printf("[%d-%d]", dict.start[1], dict.end[1]))
+      call a:1.add_section('airline_c', printf("%s %s %s", name, range,
+        \ dict.enabled ? (&encoding ==? 'utf-8'  ? "\u2713"  : '')  : '!'))
+      call a:1.split()
+      call a:1.add_section('airline_x', get(g:, 'airline_section_x').spc)
+      call a:1.add_section('airline_y', spc.get(g:, 'airline_section_y').spc)
+      call a:1.add_section('airline_z', spc.get(g:, 'airline_section_z'))
+    endif
+    return 1
+  endif
+endfunction
+
+function! airline#extensions#nrrwrgn#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#nrrwrgn#apply')
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/obsession.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/obsession.vim
new file mode 100644
index 0000000..ca0fc16
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/obsession.vim
@@ -0,0 +1,22 @@
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !exists('*ObsessionStatus')
+  finish
+endif
+
+let s:spc = g:airline_symbols.space
+
+if !exists('g:airline#extensions#obsession#indicator_text')
+  let g:airline#extensions#obsession#indicator_text = '$'
+endif
+
+function! airline#extensions#obsession#init(ext)
+  call airline#parts#define_function('obsession', 'airline#extensions#obsession#get_status')
+endfunction
+
+function! airline#extensions#obsession#get_status()
+  return ObsessionStatus((g:airline#extensions#obsession#indicator_text . s:spc), '')
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/po.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/po.vim
new file mode 100644
index 0000000..fada471
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/po.vim
@@ -0,0 +1,91 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:has_async = airline#util#async
+
+function! s:shorten()
+  if exists("g:airline#extensions#po#displayed_limit")
+    let w:displayed_po_limit = g:airline#extensions#po#displayed_limit
+    if len(b:airline_po_stats) > w:displayed_po_limit - 1
+      let b:airline_po_stats = b:airline_po_stats[0:(w:displayed_po_limit - 2)].(&encoding==?'utf-8' ? '…' : '.'). ']'
+    endif
+  endif
+endfunction
+
+if s:has_async
+  let s:jobs = {}
+
+  function! s:on_stdout(channel, msg) dict abort
+    let self.buf = a:msg
+  endfunction
+
+  function! s:on_exit(channel) dict abort
+    if !empty(self.buf)
+      let b:airline_po_stats = printf("[%s]", self.buf)
+    else
+      let b:airline_po_stats = ''
+    endif
+    call remove(s:jobs, self.file)
+    call s:shorten()
+  endfunction
+
+  function! s:get_msgfmt_stat_async(cmd, file)
+    if g:airline#util#is_windows || !executable('msgfmt')
+      " no msgfmt on windows?
+      return
+    else
+      let cmd = ['sh', '-c', a:cmd. shellescape(a:file)]
+    endif
+
+    let options = {'buf': '', 'file': a:file}
+    if has_key(s:jobs, a:file)
+      if job_status(get(s:jobs, a:file)) == 'run'
+        return
+      elseif has_key(s:jobs, a:file)
+        call remove(s:jobs, a:file)
+      endif
+    endif
+    let id = job_start(cmd, {
+          \ 'err_io':   'out',
+          \ 'out_cb':   function('s:on_stdout', options),
+          \ 'close_cb': function('s:on_exit', options)})
+    let s:jobs[a:file] = id
+  endfu
+endif
+
+function! airline#extensions#po#apply(...)
+  if &ft ==# 'po'
+    call airline#extensions#prepend_to_section('z', '%{airline#extensions#po#stats()}')
+    autocmd airline BufWritePost * unlet! b:airline_po_stats
+  endif
+endfunction
+
+function! airline#extensions#po#stats()
+  if exists('b:airline_po_stats') && !empty(b:airline_po_stats)
+    return b:airline_po_stats
+  endif
+
+  let cmd = 'msgfmt --statistics -o /dev/null -- '
+  if s:has_async
+    call s:get_msgfmt_stat_async(cmd, expand('%:p'))
+  else
+    let airline_po_stats = system(cmd. shellescape(expand('%:p')))
+    if v:shell_error
+      return ''
+    endif
+    try
+      let b:airline_po_stats = '['. split(airline_po_stats, '\n')[0]. ']'
+      let b:airline_po_stats = substitute(b:airline_po_stats, ' \(message\|translation\)s*\.*', '', 'g')
+    catch
+      let b:airline_po_stats = ''
+    endtry
+    call s:shorten()
+  endif
+  return get(b:, 'airline_po_stats', '')
+endfunction
+
+function! airline#extensions#po#init(ext)
+    call a:ext.add_statusline_func('airline#extensions#po#apply')
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/promptline.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/promptline.vim
new file mode 100644
index 0000000..9b76a1a
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/promptline.vim
@@ -0,0 +1,35 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !exists(':PromptlineSnapshot')
+  finish
+endif
+
+if !exists('airline#extensions#promptline#snapshot_file') || !len('airline#extensions#promptline#snapshot_file')
+  finish
+endif
+
+let s:prompt_snapshot_file = get(g:, 'airline#extensions#promptline#snapshot_file', '')
+let s:color_template = get(g:, 'airline#extensions#promptline#color_template', 'normal')
+
+function! airline#extensions#promptline#init(ext)
+  call a:ext.add_theme_func('airline#extensions#promptline#set_prompt_colors')
+endfunction
+
+function! airline#extensions#promptline#set_prompt_colors(palette)
+  let color_template = has_key(a:palette, s:color_template) ? s:color_template : 'normal'
+  let mode_palette = a:palette[color_template]
+
+  if !has_key(g:, 'promptline_symbols')
+    let g:promptline_symbols = {
+          \ 'left'           : g:airline_left_sep,
+          \ 'right'          : g:airline_right_sep,
+          \ 'left_alt'       : g:airline_left_alt_sep,
+          \ 'right_alt'      : g:airline_right_alt_sep}
+  endif
+
+  let promptline_theme = promptline#api#create_theme_from_airline(mode_palette)
+  call promptline#api#create_snapshot_with_theme(s:prompt_snapshot_file, promptline_theme)
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/quickfix.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/quickfix.vim
new file mode 100644
index 0000000..4f13a85
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/quickfix.vim
@@ -0,0 +1,53 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let g:airline#extensions#quickfix#quickfix_text = 'Quickfix'
+let g:airline#extensions#quickfix#location_text = 'Location'
+
+function! airline#extensions#quickfix#apply(...)
+  if &buftype == 'quickfix'
+    let w:airline_section_a = s:get_text()
+    let w:airline_section_b = '%{get(w:, "quickfix_title", "")}'
+    let w:airline_section_c = ''
+    let w:airline_section_x = ''
+  endif
+endfunction
+
+function! airline#extensions#quickfix#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#quickfix#apply')
+  call a:ext.add_inactive_statusline_func('airline#extensions#quickfix#inactive_qf_window')
+endfunction
+
+function! airline#extensions#quickfix#inactive_qf_window(...)
+  if getbufvar(a:2.bufnr, '&filetype') is# 'qf' && !empty(airline#util#getwinvar(a:2.winnr, 'quickfix_title', ''))
+    call setwinvar(a:2.winnr, 'airline_section_c', '[%{get(w:, "quickfix_title", "")}] %f %m')
+  endif
+endfunction
+
+function! s:get_text()
+  if exists("*win_getid") && exists("*getwininfo")
+    let dict = getwininfo(win_getid())
+    if len(dict) > 0 && dict[0].quickfix && !dict[0].loclist
+      return g:airline#extensions#quickfix#quickfix_text
+    elseif len(dict) > 0 && dict[0].quickfix && dict[0].loclist
+      return g:airline#extensions#quickfix#location_text
+    endif
+  endif
+  redir => buffers
+  silent ls
+  redir END
+
+  let nr = bufnr('%')
+  for buf in split(buffers, '\n')
+    if match(buf, '\v^\s*'.nr) > -1
+      if match(buf, '\cQuickfix') > -1
+        return g:airline#extensions#quickfix#quickfix_text
+      else
+        return g:airline#extensions#quickfix#location_text
+      endif
+    endif
+  endfor
+  return ''
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/syntastic.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/syntastic.vim
new file mode 100644
index 0000000..adf5460
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/syntastic.vim
@@ -0,0 +1,21 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !exists(':SyntasticCheck')
+  finish
+endif
+
+function! airline#extensions#syntastic#get_warnings()
+  let errors = SyntasticStatuslineFlag()
+  if strlen(errors) > 0
+    return errors.(g:airline_symbols.space)
+  endif
+  return ''
+endfunction
+
+function! airline#extensions#syntastic#init(ext)
+  call airline#parts#define_function('syntastic', 'airline#extensions#syntastic#get_warnings')
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline.vim
new file mode 100644
index 0000000..cadb399
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline.vim
@@ -0,0 +1,193 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:formatter = get(g:, 'airline#extensions#tabline#formatter', 'default')
+let s:show_buffers = get(g:, 'airline#extensions#tabline#show_buffers', 1)
+let s:show_tabs = get(g:, 'airline#extensions#tabline#show_tabs', 1)
+let s:ignore_bufadd_pat = get(g:, 'airline#extensions#tabline#ignore_bufadd_pat', '\c\vgundo|undotree|vimfiler|tagbar|nerd_tree')
+
+let s:taboo = get(g:, 'airline#extensions#taboo#enabled', 1) && get(g:, 'loaded_taboo', 0)
+if s:taboo
+  let g:taboo_tabline = 0
+endif
+
+let s:ctrlspace = get(g:, 'CtrlSpaceLoaded', 0)
+
+function! airline#extensions#tabline#init(ext)
+  if has('gui_running')
+    set guioptions-=e
+  endif
+
+  autocmd User AirlineToggledOn call s:toggle_on()
+  autocmd User AirlineToggledOff call s:toggle_off()
+
+  call s:toggle_on()
+  call a:ext.add_theme_func('airline#extensions#tabline#load_theme')
+endfunction
+
+function! s:toggle_off()
+  call airline#extensions#tabline#autoshow#off()
+  call airline#extensions#tabline#tabs#off()
+  call airline#extensions#tabline#buffers#off()
+  call airline#extensions#tabline#ctrlspace#off()
+endfunction
+
+function! s:toggle_on()
+  call airline#extensions#tabline#autoshow#on()
+  call airline#extensions#tabline#tabs#on()
+  call airline#extensions#tabline#buffers#on()
+  call airline#extensions#tabline#ctrlspace#on()
+
+  set tabline=%!airline#extensions#tabline#get()
+endfunction
+
+function! s:update_tabline()
+  if get(g:, 'airline#extensions#tabline#disable_refresh', 0)
+    return
+  endif
+  let match = expand('<afile>')
+  if pumvisible()
+    return
+  elseif !get(g:, 'airline#extensions#tabline#enabled', 0)
+    return
+  " return, if buffer matches ignore pattern or is directory (netrw)
+  elseif empty(match)
+        \ || match(match, s:ignore_bufadd_pat) > -1
+        \ || isdirectory(expand("<afile>"))
+    return
+  endif
+  doautocmd User BufMRUChange
+endfunction
+
+function! airline#extensions#tabline#load_theme(palette)
+  if pumvisible()
+    return
+  endif
+  let colors    = get(a:palette, 'tabline', {})
+  " Theme for tabs on the left
+  let l:tab     = get(colors, 'airline_tab', a:palette.normal.airline_b)
+  let l:tabsel  = get(colors, 'airline_tabsel', a:palette.normal.airline_a)
+  let l:tabtype = get(colors, 'airline_tabtype', a:palette.visual.airline_a)
+  let l:tabfill = get(colors, 'airline_tabfill', a:palette.normal.airline_c)
+  let l:tabmod  = get(colors, 'airline_tabmod', a:palette.insert.airline_a)
+  let l:tabhid  = get(colors, 'airline_tabhid', a:palette.normal.airline_c)
+  if has_key(a:palette, 'normal_modified') && has_key(a:palette.normal_modified, 'airline_c')
+    let l:tabmodu = get(colors, 'airline_tabmod_unsel', a:palette.normal_modified.airline_c)
+  else
+    "Fall back to normal airline_c if modified airline_c isn't present
+    let l:tabmodu = get(colors, 'airline_tabmod_unsel', a:palette.normal.airline_c)
+  endif
+  call airline#highlighter#exec('airline_tab', l:tab)
+  call airline#highlighter#exec('airline_tabsel', l:tabsel)
+  call airline#highlighter#exec('airline_tabtype', l:tabtype)
+  call airline#highlighter#exec('airline_tabfill', l:tabfill)
+  call airline#highlighter#exec('airline_tabmod', l:tabmod)
+  call airline#highlighter#exec('airline_tabmod_unsel', l:tabmodu)
+  call airline#highlighter#exec('airline_tabhid', l:tabhid)
+
+  " Theme for tabs on the right
+  let l:tabsel_right  = get(colors, 'airline_tabsel_right', a:palette.normal.airline_a)
+  let l:tab_right     = get(colors, 'airline_tab_right',    a:palette.inactive.airline_c)
+  let l:tabmod_right  = get(colors, 'airline_tabmod_right', a:palette.insert.airline_a)
+  let l:tabhid_right  = get(colors, 'airline_tabhid_right', a:palette.normal.airline_c)
+  if has_key(a:palette, 'normal_modified') && has_key(a:palette.normal_modified, 'airline_c')
+    let l:tabmodu_right = get(colors, 'airline_tabmod_unsel_right', a:palette.normal_modified.airline_c)
+  else
+    "Fall back to normal airline_c if modified airline_c isn't present
+    let l:tabmodu_right = get(colors, 'airline_tabmod_unsel_right', a:palette.normal.airline_c)
+  endif
+  call airline#highlighter#exec('airline_tab_right',    l:tab_right)
+  call airline#highlighter#exec('airline_tabsel_right', l:tabsel_right)
+  call airline#highlighter#exec('airline_tabmod_right', l:tabmod_right)
+  call airline#highlighter#exec('airline_tabhid_right', l:tabhid_right)
+  call airline#highlighter#exec('airline_tabmod_unsel_right', l:tabmodu_right)
+endfunction
+
+let s:current_tabcnt = -1
+function! airline#extensions#tabline#get()
+  let curtabcnt = tabpagenr('$')
+  if curtabcnt != s:current_tabcnt
+    let s:current_tabcnt = curtabcnt
+    call airline#extensions#tabline#tabs#invalidate()
+    call airline#extensions#tabline#buffers#invalidate()
+    call airline#extensions#tabline#ctrlspace#invalidate()
+  endif
+
+  if !exists('#airline#BufAdd#*')
+    autocmd airline BufAdd * call <sid>update_tabline()
+  endif
+  if s:ctrlspace
+    return airline#extensions#tabline#ctrlspace#get()
+  elseif s:show_buffers && curtabcnt == 1 || !s:show_tabs
+    return airline#extensions#tabline#buffers#get()
+  else
+    return airline#extensions#tabline#tabs#get()
+  endif
+endfunction
+
+function! airline#extensions#tabline#title(n)
+  let title = ''
+  if s:taboo
+    let title = TabooTabTitle(a:n)
+  endif
+
+  if empty(title) && exists('*gettabvar')
+    let title = gettabvar(a:n, 'title')
+  endif
+
+  if empty(title)
+    let buflist = tabpagebuflist(a:n)
+    let winnr = tabpagewinnr(a:n)
+    let all_buffers = airline#extensions#tabline#buflist#list()
+    return airline#extensions#tabline#get_buffer_name(
+          \ buflist[winnr - 1],
+          \ filter(buflist, 'index(all_buffers, v:val) != -1'))
+  endif
+
+  return title
+endfunction
+
+function! airline#extensions#tabline#get_buffer_name(nr, ...)
+  let buffers = a:0 ? a:1 : airline#extensions#tabline#buflist#list()
+  return airline#extensions#tabline#formatters#{s:formatter}#format(a:nr, buffers)
+endfunction
+
+function! airline#extensions#tabline#new_builder()
+  let builder_context = {
+        \ 'active'        : 1,
+        \ 'tabline'       : 1,
+        \ 'right_sep'     : get(g:, 'airline#extensions#tabline#right_sep'    , g:airline_right_sep),
+        \ 'right_alt_sep' : get(g:, 'airline#extensions#tabline#right_alt_sep', g:airline_right_alt_sep),
+        \ }
+  if get(g:, 'airline_powerline_fonts', 0)
+    let builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , g:airline_left_sep)
+    let builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , g:airline_left_alt_sep)
+  else
+    let builder_context.left_sep     = get(g:, 'airline#extensions#tabline#left_sep'     , ' ')
+    let builder_context.left_alt_sep = get(g:, 'airline#extensions#tabline#left_alt_sep' , '|')
+  endif
+
+  return airline#builder#new(builder_context)
+endfunction
+
+function! airline#extensions#tabline#group_of_bufnr(tab_bufs, bufnr)
+  let cur = bufnr('%')
+  if cur == a:bufnr
+    if g:airline_detect_modified && getbufvar(a:bufnr, '&modified')
+      let group = 'airline_tabmod'
+    else
+      let group = 'airline_tabsel'
+    endif
+  else
+    if g:airline_detect_modified && getbufvar(a:bufnr, '&modified')
+      let group = 'airline_tabmod_unsel'
+    elseif index(a:tab_bufs, a:bufnr) > -1
+      let group = 'airline_tab'
+    else
+      let group = 'airline_tabhid'
+    endif
+  endif
+  return group
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/autoshow.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/autoshow.vim
new file mode 100644
index 0000000..a6782a8
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/autoshow.vim
@@ -0,0 +1,55 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:show_buffers = get(g:, 'airline#extensions#tabline#show_buffers', 1)
+let s:buf_min_count = get(g:, 'airline#extensions#tabline#buffer_min_count', 0)
+let s:tab_min_count = get(g:, 'airline#extensions#tabline#tab_min_count', 0)
+
+function! airline#extensions#tabline#autoshow#off()
+  if exists('s:original_tabline')
+    let &tabline = s:original_tabline
+    let &showtabline = s:original_showtabline
+  endif
+
+  augroup airline_tabline_autoshow
+    autocmd!
+  augroup END
+endfunction
+
+function! airline#extensions#tabline#autoshow#on()
+  let [ s:original_tabline, s:original_showtabline ] = [ &tabline, &showtabline ]
+
+  augroup airline_tabline_autoshow
+    autocmd!
+    if s:buf_min_count <= 0 && s:tab_min_count <= 1
+      if &lines > 3
+        set showtabline=2
+      endif
+    else
+      if s:show_buffers == 1
+        autocmd BufEnter  * call <sid>show_tabline(s:buf_min_count, len(airline#extensions#tabline#buflist#list()))
+        autocmd BufUnload * call <sid>show_tabline(s:buf_min_count, len(airline#extensions#tabline#buflist#list()) - 1)
+      else
+        autocmd TabEnter  * call <sid>show_tabline(s:tab_min_count, tabpagenr('$'))
+      endif
+    endif
+
+    " Invalidate cache.  This has to come after the BufUnload for
+    " s:show_buffers, to invalidate the cache for BufEnter.
+    autocmd BufLeave,BufAdd,BufUnload * call airline#extensions#tabline#buflist#invalidate()
+  augroup END
+endfunction
+
+function! s:show_tabline(min_count, total_count)
+  if a:total_count >= a:min_count
+    if &showtabline != 2 && &lines > 3
+      set showtabline=2
+    endif
+  else
+    if &showtabline != 0
+      set showtabline=0
+    endif
+  endif
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/buffers.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/buffers.vim
new file mode 100644
index 0000000..31ad4da
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/buffers.vim
@@ -0,0 +1,251 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:buffer_idx_mode = get(g:, 'airline#extensions#tabline#buffer_idx_mode', 0)
+let s:show_tab_type = get(g:, 'airline#extensions#tabline#show_tab_type', 1)
+let s:buffers_label = get(g:, 'airline#extensions#tabline#buffers_label', 'buffers')
+let s:spc = g:airline_symbols.space
+
+let s:current_bufnr = -1
+let s:current_modified = 0
+let s:current_tabline = ''
+let s:current_visible_buffers = []
+
+let s:number_map = {
+      \ '0': '�',
+      \ '1': '¹',
+      \ '2': '²',
+      \ '3': '³',
+      \ '4': '�',
+      \ '5': '�',
+      \ '6': '�',
+      \ '7': '�',
+      \ '8': '�',
+      \ '9': '�'
+      \ }
+let s:number_map = &encoding == 'utf-8'
+      \ ? get(g:, 'airline#extensions#tabline#buffer_idx_format', s:number_map)
+      \ : {}
+
+function! airline#extensions#tabline#buffers#off()
+  augroup airline_tabline_buffers
+    autocmd!
+  augroup END
+endfunction
+
+function! airline#extensions#tabline#buffers#on()
+  augroup airline_tabline_buffers
+    autocmd!
+    autocmd BufDelete * call airline#extensions#tabline#buffers#invalidate()
+    autocmd User BufMRUChange call airline#extensions#tabline#buflist#invalidate()
+    autocmd User BufMRUChange call airline#extensions#tabline#buffers#invalidate()
+  augroup END
+endfunction
+
+function! airline#extensions#tabline#buffers#invalidate()
+  let s:current_bufnr = -1
+endfunction
+
+function! airline#extensions#tabline#buffers#get()
+  call <sid>map_keys()
+  let cur = bufnr('%')
+  if cur == s:current_bufnr
+    if !g:airline_detect_modified || getbufvar(cur, '&modified') == s:current_modified
+      return s:current_tabline
+    endif
+  endif
+
+  let l:index = 1
+  let b = airline#extensions#tabline#new_builder()
+  let tab_bufs = tabpagebuflist(tabpagenr())
+  for nr in s:get_visible_buffers()
+    if nr < 0
+      call b.add_raw('%#airline_tabhid#...')
+      continue
+    endif
+
+    let group = airline#extensions#tabline#group_of_bufnr(tab_bufs, nr)
+
+    if nr == cur
+      let s:current_modified = (group == 'airline_tabmod') ? 1 : 0
+    endif
+
+    " Neovim feature: Have clickable buffers
+    if has("tablineat")
+      call b.add_raw('%'.nr.'@airline#extensions#tabline#buffers#clickbuf@')
+    endif
+    if s:buffer_idx_mode
+      if len(s:number_map) > 0
+        call b.add_section(group, s:spc . get(s:number_map, l:index, '') . '%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)' . s:spc)
+      else
+        call b.add_section(group, '['.l:index.s:spc.'%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)'.']')
+      endif
+      let l:index = l:index + 1
+    else
+      call b.add_section(group, s:spc.'%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)'.s:spc)
+    endif
+    if has("tablineat")
+      call b.add_raw('%X')
+    endif
+  endfor
+
+  call b.add_section('airline_tabfill', '')
+  call b.split()
+  call b.add_section('airline_tabfill', '')
+  if s:show_tab_type
+    call b.add_section_spaced('airline_tabtype', s:buffers_label)
+  endif
+  if tabpagenr('$') > 1
+    call b.add_section_spaced('airline_tabmod', printf('%s %d/%d', "tab", tabpagenr(), tabpagenr('$')))
+  endif
+
+  let s:current_bufnr = cur
+  let s:current_tabline = b.build()
+  return s:current_tabline
+endfunction
+
+function! s:get_visible_buffers()
+  let buffers = airline#extensions#tabline#buflist#list()
+  let cur = bufnr('%')
+
+  let total_width = 0
+  let max_width = 0
+
+  for nr in buffers
+    let width = len(airline#extensions#tabline#get_buffer_name(nr)) + 4
+    let total_width += width
+    let max_width = max([max_width, width])
+  endfor
+
+  " only show current and surrounding buffers if there are too many buffers
+  let position  = index(buffers, cur)
+  let vimwidth = &columns
+  if total_width > vimwidth && position > -1
+    let buf_count = len(buffers)
+
+    " determine how many buffers to show based on the longest buffer width,
+    " use one on the right side and put the rest on the left
+    let buf_max   = vimwidth / max_width
+    let buf_right = 1
+    let buf_left  = max([0, buf_max - buf_right])
+
+    let start = max([0, position - buf_left])
+    let end   = min([buf_count, position + buf_right])
+
+    " fill up available space on the right
+    if position < buf_left
+      let end += (buf_left - position)
+    endif
+
+    " fill up available space on the left
+    if end > buf_count - 1 - buf_right
+      let start -= max([0, buf_right - (buf_count - 1 - position)])
+    endif
+
+    let buffers = eval('buffers[' . start . ':' . end . ']')
+
+    if start > 0
+      call insert(buffers, -1, 0)
+    endif
+
+    if end < buf_count - 1
+      call add(buffers, -1)
+    endif
+  endif
+
+  let s:current_visible_buffers = buffers
+  return buffers
+endfunction
+
+function! s:select_tab(buf_index)
+  " no-op when called in the NERDTree buffer
+  if exists('t:NERDTreeBufName') && bufname('%') == t:NERDTreeBufName
+    return
+  endif
+
+  let idx = a:buf_index
+  if s:current_visible_buffers[0] == -1
+    let idx = idx + 1
+  endif
+
+  let buf = get(s:current_visible_buffers, idx, 0)
+  if buf != 0
+    exec 'b!' . buf
+  endif
+endfunction
+
+function! s:jump_to_tab(offset)
+    let l = s:current_visible_buffers
+    let i = index(l, bufnr('%'))
+    if i > -1
+        exec 'b!' . l[float2nr(fmod(i + a:offset, len(l)))]
+    endif
+endfunction
+
+function! s:map_keys()
+  if s:buffer_idx_mode
+    noremap <silent> <Plug>AirlineSelectTab1 :call <SID>select_tab(0)<CR>
+    noremap <silent> <Plug>AirlineSelectTab2 :call <SID>select_tab(1)<CR>
+    noremap <silent> <Plug>AirlineSelectTab3 :call <SID>select_tab(2)<CR>
+    noremap <silent> <Plug>AirlineSelectTab4 :call <SID>select_tab(3)<CR>
+    noremap <silent> <Plug>AirlineSelectTab5 :call <SID>select_tab(4)<CR>
+    noremap <silent> <Plug>AirlineSelectTab6 :call <SID>select_tab(5)<CR>
+    noremap <silent> <Plug>AirlineSelectTab7 :call <SID>select_tab(6)<CR>
+    noremap <silent> <Plug>AirlineSelectTab8 :call <SID>select_tab(7)<CR>
+    noremap <silent> <Plug>AirlineSelectTab9 :call <SID>select_tab(8)<CR>
+    noremap <silent> <Plug>AirlineSelectPrevTab :<C-u>call <SID>jump_to_tab(-v:count1)<CR>
+    noremap <silent> <Plug>AirlineSelectNextTab :<C-u>call <SID>jump_to_tab(v:count1)<CR>
+  endif
+endfunction
+
+function! airline#extensions#tabline#buffers#clickbuf(minwid, clicks, button, modifiers) abort
+    " Clickable buffers
+    " works only in recent NeoVim with has('tablineat')
+
+    " single mouse button click without modifiers pressed
+    if a:clicks == 1 && a:modifiers !~# '[^ ]'
+      if a:button is# 'l'
+        " left button - switch to buffer
+        silent execute 'buffer' a:minwid
+      elseif a:button is# 'm'
+        " middle button - delete buffer
+
+        if get(g:, 'airline#extensions#tabline#middle_click_preserves_windows', 0) == 0
+          " just simply delete the clicked buffer. This will cause windows
+          " associated with the clicked buffer to be closed.
+          silent execute 'bdelete' a:minwid
+        else
+          " find windows displaying the clicked buffer and open an new
+          " buffer in them.
+          let current_window = bufwinnr("%")
+          let window_number = bufwinnr(a:minwid)
+          let last_window_visited = -1
+
+          " Set to 1 if the clicked buffer was open in any windows.
+          let buffer_in_window = 0
+
+          " Find the next window with the clicked buffer open. If bufwinnr()
+          " returns the same window number, this is because we clicked a new
+          " buffer, and then tried editing a new buffer. Vim won't create a
+          " new empty buffer for the same window, so we get the same window
+          " number from bufwinnr(). In this case we just give up and don't
+          " delete the buffer.
+          " This could be made cleaner if we could check if the clicked buffer
+          " is a new buffer, but I don't know if there is a way to do that.
+          while window_number != -1 && window_number != last_window_visited
+            let buffer_in_window = 1
+            silent execute window_number . 'wincmd w'
+            silent execute 'enew'
+            let last_window_visited = window_number
+            let window_number = bufwinnr(a:minwid)
+          endwhile
+          silent execute current_window . 'wincmd w'
+          if window_number != last_window_visited || buffer_in_window == 0
+            silent execute 'bdelete' a:minwid
+          endif
+        endif
+      endif
+    endif
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/buflist.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/buflist.vim
new file mode 100644
index 0000000..f49eabc
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/buflist.vim
@@ -0,0 +1,44 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+function! airline#extensions#tabline#buflist#invalidate()
+  unlet! s:current_buffer_list
+endfunction
+
+function! airline#extensions#tabline#buflist#list()
+  if exists('s:current_buffer_list')
+    return s:current_buffer_list
+  endif
+
+  let excludes = get(g:, 'airline#extensions#tabline#excludes', [])
+  let exclude_preview = get(g:, 'airline#extensions#tabline#exclude_preview', 1)
+
+  let list = (exists('g:did_bufmru') && g:did_bufmru) ? BufMRUList() : range(1, bufnr("$"))
+
+  let buffers = []
+  " If this is too slow, we can switch to a different algorithm.
+  " Basically branch 535 already does it, but since it relies on
+  " BufAdd autocommand, I'd like to avoid this if possible.
+  for nr in list
+    if buflisted(nr)
+      " Do not add to the bufferlist, if either
+      " 1) buffername matches exclude pattern
+      " 2) buffer is a quickfix buffer
+      " 3) exclude preview windows (if 'bufhidden' == wipe
+      "    and 'buftype' == nofile
+      if (!empty(excludes) && match(bufname(nr), join(excludes, '\|')) > -1) ||
+            \ (getbufvar(nr, 'current_syntax') == 'qf') ||
+            \  (exclude_preview && getbufvar(nr, '&bufhidden') == 'wipe'
+            \  && getbufvar(nr, '&buftype') == 'nofile')
+        continue
+      endif
+      call add(buffers, nr)
+    endif
+  endfor
+
+  let s:current_buffer_list = buffers
+  return buffers
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/ctrlspace.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/ctrlspace.vim
new file mode 100644
index 0000000..e2a1032
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/ctrlspace.vim
@@ -0,0 +1,150 @@
+" MIT License. Copyright (c) 2016 Kevin Sapper
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:current_bufnr = -1
+let s:current_tabnr = -1
+let s:current_tabline = ''
+
+let s:buffers_label = get(g:, 'airline#extensions#tabline#buffers_label', 'buffers')
+let s:tabs_label = get(g:, 'airline#extensions#tabline#tabs_label', 'tabs')
+let s:switch_buffers_and_tabs = get(g:, 'airline#extensions#tabline#switch_buffers_and_tabs', 0)
+let s:show_buffers = get(g:, 'airline#extensions#tabline#show_buffers', 1)
+let s:show_tabs = get(g:, 'airline#extensions#tabline#show_tabs', 1)
+
+function! airline#extensions#tabline#ctrlspace#off()
+  augroup airline_tabline_ctrlspace
+    autocmd!
+  augroup END
+endfunction
+
+function! airline#extensions#tabline#ctrlspace#on()
+  augroup airline_tabline_ctrlspace
+    autocmd!
+    autocmd BufDelete * call airline#extensions#tabline#ctrlspace#invalidate()
+  augroup END
+endfunction
+
+function! airline#extensions#tabline#ctrlspace#invalidate()
+  let s:current_bufnr = -1
+  let s:current_tabnr = -1
+endfunction
+
+function! airline#extensions#tabline#ctrlspace#add_buffer_section(builder, cur_tab, cur_buf, pos)
+  if a:pos == 0
+    let pos_extension = ''
+  else
+    let pos_extension = '_right'
+  endif
+
+  let s:buffer_list = ctrlspace#api#BufferList(a:cur_tab)
+  for buffer in s:buffer_list
+      if a:cur_buf == buffer.index
+        if buffer.modified
+          let group = 'airline_tabmod'.pos_extension
+        else
+          let group = 'airline_tabsel'.pos_extension
+        endif
+      else
+        if buffer.modified
+          let group = 'airline_tabmod_unsel'.pos_extension
+        elseif buffer.visible
+          let group = 'airline_tab'.pos_extension
+        else
+          let group = 'airline_tabhid'.pos_extension
+        endif
+      endif
+
+      let buf_name = '%(%{airline#extensions#tabline#get_buffer_name('.buffer.index.')}%)'
+
+      if has("tablineat")
+        let buf_name = '%'.buffer.index.'@airline#extensions#tabline#buffers#clickbuf@'.buf_name.'%X'
+      endif
+
+      call a:builder.add_section_spaced(group, buf_name)
+  endfor
+endfunction
+
+function! airline#extensions#tabline#ctrlspace#add_tab_section(builder, pos)
+  if a:pos == 0
+    let pos_extension = ''
+  else
+    let pos_extension = '_right'
+  endif
+
+  for tab in s:tab_list
+    if tab.current
+      if tab.modified
+        let group = 'airline_tabmod'.pos_extension
+      else
+        let group = 'airline_tabsel'.pos_extension
+      endif
+    else
+      if tab.modified
+        let group = 'airline_tabmod_unsel'.pos_extension
+      else
+        let group = 'airline_tabhid'.pos_extension
+      endif
+    endif
+
+    call a:builder.add_section_spaced(group, '%'.tab.index.'T'.tab.title.ctrlspace#api#TabBuffersNumber(tab.index).'%T')
+  endfor
+endfunction
+
+function! airline#extensions#tabline#ctrlspace#get()
+  let cur_buf = bufnr('%')
+
+  call airline#extensions#tabline#tabs#map_keys()
+  let s:tab_list = ctrlspace#api#TabList()
+  for tab in s:tab_list
+    if tab.current
+      let cur_tab = tab.index
+    endif
+  endfor
+
+  if cur_buf == s:current_bufnr && cur_tab == s:current_tabnr
+    return s:current_tabline
+  endif
+
+  let builder = airline#extensions#tabline#new_builder()
+
+  " Add left tabline content
+  if s:show_buffers == 0
+      call airline#extensions#tabline#ctrlspace#add_tab_section(builder, 0)
+  elseif s:show_tabs == 0
+      call airline#extensions#tabline#ctrlspace#add_buffer_section(builder, cur_tab, cur_buf, 0)
+  else
+    if s:switch_buffers_and_tabs == 0
+      call builder.add_section_spaced('airline_tabtype', s:buffers_label)
+      call airline#extensions#tabline#ctrlspace#add_buffer_section(builder, cur_tab, cur_buf, 0)
+    else
+      call builder.add_section_spaced('airline_tabtype', s:tabs_label)
+      call airline#extensions#tabline#ctrlspace#add_tab_section(builder, 0)
+    endif
+  endif
+
+  call builder.add_section('airline_tabfill', '')
+  call builder.split()
+  call builder.add_section('airline_tabfill', '')
+
+  " Add right tabline content
+  if s:show_buffers == 0
+      call builder.add_section_spaced('airline_tabtype', s:tabs_label)
+  elseif s:show_tabs == 0
+      call builder.add_section_spaced('airline_tabtype', s:buffers_label)
+  else
+    if s:switch_buffers_and_tabs == 0
+      call airline#extensions#tabline#ctrlspace#add_tab_section(builder, 1)
+      call builder.add_section_spaced('airline_tabtype', s:tabs_label)
+    else
+      call airline#extensions#tabline#ctrlspace#add_buffer_section(builder, cur_tab, cur_buf, 1)
+      call builder.add_section_spaced('airline_tabtype', s:buffers_label)
+    endif
+  endif
+
+  let s:current_bufnr = cur_buf
+  let s:current_tabnr = cur_tab
+  let s:current_tabline = builder.build()
+  return s:current_tabline
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/formatters/default.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/formatters/default.vim
new file mode 100644
index 0000000..1ecce32
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/formatters/default.vim
@@ -0,0 +1,41 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:fnamecollapse = get(g:, 'airline#extensions#tabline#fnamecollapse', 1)
+let s:fnametruncate = get(g:, 'airline#extensions#tabline#fnametruncate', 0)
+let s:buf_nr_format = get(g:, 'airline#extensions#tabline#buffer_nr_format', '%s: ')
+let s:buf_nr_show = get(g:, 'airline#extensions#tabline#buffer_nr_show', 0)
+let s:buf_modified_symbol = g:airline_symbols.modified
+
+function! airline#extensions#tabline#formatters#default#format(bufnr, buffers)
+  let fmod = get(g:, 'airline#extensions#tabline#fnamemod', ':~:.')
+  let _ = ''
+
+  let name = bufname(a:bufnr)
+  if empty(name)
+    let _ .= '[No Name]'
+  else
+    if s:fnamecollapse
+      let _ .= substitute(fnamemodify(name, fmod), '\v\w\zs.{-}\ze(\\|/)', '', 'g')
+    else
+      let _ .= fnamemodify(name, fmod)
+    endif
+    if a:bufnr != bufnr('%') && s:fnametruncate && strlen(_) > s:fnametruncate
+      let _ = strpart(_, 0, s:fnametruncate)
+    endif
+  endif
+
+  return airline#extensions#tabline#formatters#default#wrap_name(a:bufnr, _)
+endfunction
+
+function! airline#extensions#tabline#formatters#default#wrap_name(bufnr, buffer_name)
+  let _ = s:buf_nr_show ? printf(s:buf_nr_format, a:bufnr) : ''
+  let _ .= substitute(a:buffer_name, '\\', '/', 'g')
+
+  if getbufvar(a:bufnr, '&modified') == 1
+    let _ .= s:buf_modified_symbol
+  endif
+  return _
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail.vim
new file mode 100644
index 0000000..d9c7d6a
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail.vim
@@ -0,0 +1,34 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+function! airline#extensions#tabline#formatters#unique_tail#format(bufnr, buffers)
+  let duplicates = {}
+  let tails = {}
+  let map = {}
+  for nr in a:buffers
+    let name = bufname(nr)
+    if empty(name)
+      let map[nr] = '[No Name]'
+    else
+      let tail = fnamemodify(name, ':s?/\+$??:t')
+      if has_key(tails, tail)
+        let duplicates[nr] = nr
+      endif
+      let tails[tail] = 1
+      let map[nr] = airline#extensions#tabline#formatters#default#wrap_name(nr, tail)
+    endif
+  endfor
+
+  for nr in values(duplicates)
+    let map[nr] = airline#extensions#tabline#formatters#default#wrap_name(nr, fnamemodify(bufname(nr), ':p:.'))
+  endfor
+
+  if has_key(map, a:bufnr)
+    return map[a:bufnr]
+  endif
+
+  " if we get here, the buffer list isn't in sync with the selected buffer yet, fall back to the default
+  return airline#extensions#tabline#formatters#default#format(a:bufnr, a:buffers)
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail_improved.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail_improved.vim
new file mode 100644
index 0000000..e860bd8
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail_improved.vim
@@ -0,0 +1,91 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:skip_symbol = '…'
+
+function! airline#extensions#tabline#formatters#unique_tail_improved#format(bufnr, buffers)
+  if len(a:buffers) <= 1 " don't need to compare bufnames if has less than one buffer opened
+    return airline#extensions#tabline#formatters#default#format(a:bufnr, a:buffers)
+  endif
+
+  let curbuf_tail = fnamemodify(bufname(a:bufnr), ':t')
+  let do_deduplicate = 0
+  let path_tokens = {}
+
+  for nr in a:buffers
+    let name = bufname(nr)
+    if !empty(name) && nr != a:bufnr && fnamemodify(name, ':t') == curbuf_tail " only perform actions if curbuf_tail isn't unique
+      let do_deduplicate = 1
+      let tokens = reverse(split(substitute(fnamemodify(name, ':p:h'), '\\', '/', 'g'), '/'))
+      let token_index = 0
+      for token in tokens
+        if token == '' | continue | endif
+        if token == '.' | break | endif
+        if !has_key(path_tokens, token_index)
+          let path_tokens[token_index] = {}
+        endif
+        let path_tokens[token_index][token] = 1
+        let token_index += 1
+      endfor
+    endif
+  endfor
+
+  if do_deduplicate == 1
+    let path = []
+    let token_index = 0
+    for token in reverse(split(substitute(fnamemodify(bufname(a:bufnr), ':p:h'), '\\', '/', 'g'), '/'))
+      if token == '.' | break | endif
+      let duplicated = 0
+      let uniq = 1
+      let single = 1
+      if has_key(path_tokens, token_index)
+        let duplicated = 1
+        if len(keys(path_tokens[token_index])) > 1 | let single = 0 | endif
+        if has_key(path_tokens[token_index], token) | let uniq = 0 | endif
+      endif
+      call insert(path, {'token': token, 'duplicated': duplicated, 'uniq': uniq, 'single': single})
+      let token_index += 1
+    endfor
+
+    let buf_name = [curbuf_tail]
+    let has_uniq = 0
+    let has_skipped = 0
+    for token1 in reverse(path)
+      if !token1['duplicated'] && len(buf_name) > 1
+        call insert(buf_name, s:skip_symbol)
+        let has_skipped = 0
+        break
+      endif
+
+      if has_uniq == 1
+        call insert(buf_name, s:skip_symbol)
+        let has_skipped = 0
+        break
+      endif
+
+      if token1['uniq'] == 0 && token1['single'] == 1
+        let has_skipped = 1
+      else
+        if has_skipped == 1
+          call insert(buf_name, s:skip_symbol)
+          let has_skipped = 0
+        endif
+        call insert(buf_name, token1['token'])
+      endif
+
+      if token1['uniq'] == 1
+        let has_uniq = 1
+      endif
+    endfor
+
+    if has_skipped == 1
+      call insert(buf_name, s:skip_symbol)
+    endif
+
+    return airline#extensions#tabline#formatters#default#wrap_name(a:bufnr, join(buf_name, '/'))
+  else
+    return airline#extensions#tabline#formatters#default#format(a:bufnr, a:buffers)
+  endif
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/tabs.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/tabs.vim
new file mode 100644
index 0000000..63beee1
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tabline/tabs.vim
@@ -0,0 +1,112 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:show_close_button = get(g:, 'airline#extensions#tabline#show_close_button', 1)
+let s:show_tab_type = get(g:, 'airline#extensions#tabline#show_tab_type', 1)
+let s:show_tab_nr = get(g:, 'airline#extensions#tabline#show_tab_nr', 1)
+let s:tab_nr_type = get(g:, 'airline#extensions#tabline#tab_nr_type', 0)
+let s:close_symbol = get(g:, 'airline#extensions#tabline#close_symbol', 'X')
+let s:tabs_label = get(g:, 'airline#extensions#tabline#tabs_label', 'tabs')
+let s:show_splits = get(g:, 'airline#extensions#tabline#show_splits', 1)
+let s:spc = g:airline_symbols.space
+
+let s:current_bufnr = -1
+let s:current_tabnr = -1
+let s:current_modified = 0
+
+function! airline#extensions#tabline#tabs#off()
+  augroup airline_tabline_tabs
+    autocmd!
+  augroup END
+endfunction
+
+function! airline#extensions#tabline#tabs#on()
+  augroup airline_tabline_tabs
+    autocmd!
+    autocmd BufDelete * call airline#extensions#tabline#tabs#invalidate()
+  augroup END
+endfunction
+
+function! airline#extensions#tabline#tabs#invalidate()
+  let s:current_bufnr = -1
+endfunction
+
+function! airline#extensions#tabline#tabs#get()
+  let curbuf = bufnr('%')
+  let curtab = tabpagenr()
+  call airline#extensions#tabline#tabs#map_keys()
+  if curbuf == s:current_bufnr && curtab == s:current_tabnr
+    if !g:airline_detect_modified || getbufvar(curbuf, '&modified') == s:current_modified
+      return s:current_tabline
+    endif
+  endif
+
+  let b = airline#extensions#tabline#new_builder()
+
+  for i in range(1, tabpagenr('$'))
+    if i == curtab
+      let group = 'airline_tabsel'
+      if g:airline_detect_modified
+        for bi in tabpagebuflist(i)
+          if getbufvar(bi, '&modified')
+            let group = 'airline_tabmod'
+          endif
+        endfor
+      endif
+      let s:current_modified = (group == 'airline_tabmod') ? 1 : 0
+    else
+      let group = 'airline_tab'
+    endif
+    let val = '%('
+    if s:show_tab_nr
+      if s:tab_nr_type == 0
+        let val .= (g:airline_symbols.space).'%{len(tabpagebuflist('.i.'))}'
+      elseif s:tab_nr_type == 1
+        let val .= (g:airline_symbols.space).i
+      else "== 2
+        let val .= (g:airline_symbols.space).i.'.%{len(tabpagebuflist('.i.'))}'
+      endif
+    endif
+    call b.add_section(group, val.'%'.i.'T %{airline#extensions#tabline#title('.i.')} %)')
+  endfor
+
+  call b.add_section('airline_tabfill', '')
+  call b.split()
+  call b.add_section('airline_tabfill', '')
+
+  if s:show_close_button
+    call b.add_section('airline_tab_right', ' %999X'.s:close_symbol.' ')
+  endif
+
+  if s:show_splits == 1
+    let buffers = tabpagebuflist(curtab)
+    for nr in buffers
+      let group = airline#extensions#tabline#group_of_bufnr(buffers, nr) . "_right"
+      call b.add_section_spaced(group, '%(%{airline#extensions#tabline#get_buffer_name('.nr.')}%)')
+    endfor
+  elseif s:show_tab_type == 1
+    call b.add_section_spaced('airline_tabtype', s:tabs_label)
+  endif
+
+  let s:current_bufnr = curbuf
+  let s:current_tabnr = curtab
+  let s:current_tabline = b.build()
+  return s:current_tabline
+endfunction
+
+function! airline#extensions#tabline#tabs#map_keys()
+  noremap <silent> <Plug>AirlineSelectTab1 :1tabn<CR>
+  noremap <silent> <Plug>AirlineSelectTab2 :2tabn<CR>
+  noremap <silent> <Plug>AirlineSelectTab3 :3tabn<CR>
+  noremap <silent> <Plug>AirlineSelectTab4 :4tabn<CR>
+  noremap <silent> <Plug>AirlineSelectTab5 :5tabn<CR>
+  noremap <silent> <Plug>AirlineSelectTab6 :6tabn<CR>
+  noremap <silent> <Plug>AirlineSelectTab7 :7tabn<CR>
+  noremap <silent> <Plug>AirlineSelectTab8 :8tabn<CR>
+  noremap <silent> <Plug>AirlineSelectTab9 :9tabn<CR>
+  noremap <silent> <Plug>AirlineSelectPrevTab gT
+  " tabn {count} goes to count tab does not go {count} tab pages forward!
+  noremap <silent> <Plug>AirlineSelectNextTab :<C-U>exe repeat(':tabn\|', v:count1)<cr>
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tagbar.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tagbar.vim
new file mode 100644
index 0000000..7e7665a
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tagbar.vim
@@ -0,0 +1,47 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !exists(':TagbarToggle')
+  finish
+endif
+
+let s:flags = get(g:, 'airline#extensions#tagbar#flags', '')
+let s:spc = g:airline_symbols.space
+
+" Arguments: current, sort, fname
+function! airline#extensions#tagbar#get_status(...)
+  let builder = airline#builder#new({ 'active': a:1 })
+  call builder.add_section('airline_a', s:spc.'Tagbar'.s:spc)
+  call builder.add_section('airline_b', s:spc.a:2.s:spc)
+  call builder.add_section('airline_c', s:spc.a:3.s:spc)
+  return builder.build()
+endfunction
+
+function! airline#extensions#tagbar#inactive_apply(...)
+  if getwinvar(a:2.winnr, '&filetype') == 'tagbar'
+    return -1
+  endif
+endfunction
+
+let s:airline_tagbar_last_lookup_time = 0
+let s:airline_tagbar_last_lookup_val = ''
+function! airline#extensions#tagbar#currenttag()
+  if get(w:, 'airline_active', 0)
+    if s:airline_tagbar_last_lookup_time != localtime()
+      let s:airline_tagbar_last_lookup_val = tagbar#currenttag('%s', '', s:flags)
+      let s:airline_tagbar_last_lookup_time = localtime()
+    endif
+    return s:airline_tagbar_last_lookup_val
+  endif
+  return ''
+endfunction
+
+function! airline#extensions#tagbar#init(ext)
+  call a:ext.add_inactive_statusline_func('airline#extensions#tagbar#inactive_apply')
+  let g:tagbar_status_func = 'airline#extensions#tagbar#get_status'
+
+  call airline#parts#define_function('tagbar', 'airline#extensions#tagbar#currenttag')
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tmuxline.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tmuxline.vim
new file mode 100644
index 0000000..078d5dc
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/tmuxline.vim
@@ -0,0 +1,28 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !exists(':Tmuxline')
+  finish
+endif
+
+let s:tmuxline_snapshot_file = get(g:, 'airline#extensions#tmuxline#snapshot_file', '')
+let s:color_template = get(g:, 'airline#extensions#tmuxline#color_template', 'normal')
+
+function! airline#extensions#tmuxline#init(ext)
+  call a:ext.add_theme_func('airline#extensions#tmuxline#set_tmux_colors')
+endfunction
+
+function! airline#extensions#tmuxline#set_tmux_colors(palette)
+  let color_template = has_key(a:palette, s:color_template) ? s:color_template : 'normal'
+  let mode_palette = a:palette[color_template]
+
+  let tmuxline_theme = tmuxline#api#create_theme_from_airline(mode_palette)
+  call tmuxline#api#set_theme(tmuxline_theme)
+
+  if strlen(s:tmuxline_snapshot_file)
+    call tmuxline#api#snapshot(s:tmuxline_snapshot_file)
+  endif
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/undotree.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/undotree.vim
new file mode 100644
index 0000000..36f8b9b
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/undotree.vim
@@ -0,0 +1,29 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !exists(':UndotreeToggle')
+  finish
+endif
+
+function! airline#extensions#undotree#apply(...)
+  if exists('t:undotree')
+    if &ft == 'undotree'
+      if exists('*t:undotree.GetStatusLine')
+        call airline#extensions#apply_left_override('undo', '%{t:undotree.GetStatusLine()}')
+      else
+        call airline#extensions#apply_left_override('undotree', '%f')
+      endif
+    endif
+
+    if &ft == 'diff' && exists('*t:diffpanel.GetStatusLine')
+      call airline#extensions#apply_left_override('diff', '%{t:diffpanel.GetStatusLine()}')
+    endif
+  endif
+endfunction
+
+function! airline#extensions#undotree#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#undotree#apply')
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/unicode.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/unicode.vim
new file mode 100644
index 0000000..30cb796
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/unicode.vim
@@ -0,0 +1,24 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !get(g:, 'loaded_unicodePlugin', 0)
+  finish
+endif
+
+function! airline#extensions#unicode#apply(...)
+  if exists(":UnicodeTable") == 2 && bufname('') ==# 'UnicodeTable'
+    call airline#parts#define('unicode', {
+          \ 'text': '[UnicodeTable]',
+          \ 'accent': 'bold' })
+    let w:airline_section_a = airline#section#create(['unicode'])
+    let w:airline_section_b = ''
+    let w:airline_section_c = ''
+    let w:airline_section_y = ''
+  endif
+endfunction
+
+function! airline#extensions#unicode#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#unicode#apply')
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/unite.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/unite.vim
new file mode 100644
index 0000000..9467a7d
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/unite.vim
@@ -0,0 +1,25 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !get(g:, 'loaded_unite', 0)
+  finish
+endif
+
+function! airline#extensions#unite#apply(...)
+  if &ft == 'unite'
+    call a:1.add_section('airline_a', ' Unite ')
+    call a:1.add_section('airline_b', ' %{get(unite#get_context(), "buffer_name", "")} ')
+    call a:1.add_section('airline_c', ' %{unite#get_status_string()} ')
+    call a:1.split()
+    call a:1.add_section('airline_y', ' %{get(unite#get_context(), "real_buffer_name", "")} ')
+    return 1
+  endif
+endfunction
+
+function! airline#extensions#unite#init(ext)
+  let g:unite_force_overwrite_statusline = 0
+  call a:ext.add_statusline_func('airline#extensions#unite#apply')
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/virtualenv.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/virtualenv.vim
new file mode 100644
index 0000000..0364434
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/virtualenv.vim
@@ -0,0 +1,31 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:spc = g:airline_symbols.space
+
+function! airline#extensions#virtualenv#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#virtualenv#apply')
+endfunction
+
+function! airline#extensions#virtualenv#apply(...)
+  if &filetype =~# "python"
+    if get(g:, 'virtualenv_loaded', 0)
+      let statusline = virtualenv#statusline()
+    else
+      let statusline = fnamemodify($VIRTUAL_ENV, ':t')
+    endif
+    if !empty(statusline)
+      call airline#extensions#append_to_section('x',
+            \ s:spc.g:airline_right_alt_sep.s:spc.statusline)
+    endif
+  endif
+endfunction
+
+function! airline#extensions#virtualenv#update()
+  if &filetype =~# "python"
+    call airline#extensions#virtualenv#apply()
+    call airline#update_statusline()
+  endif
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/whitespace.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/whitespace.vim
new file mode 100644
index 0000000..7bd629c
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/whitespace.vim
@@ -0,0 +1,157 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+" http://got-ravings.blogspot.com/2008/10/vim-pr0n-statusline-whitespace-flags.html
+
+scriptencoding utf-8
+
+let s:show_message = get(g:, 'airline#extensions#whitespace#show_message', 1)
+let s:symbol = get(g:, 'airline#extensions#whitespace#symbol', g:airline_symbols.whitespace)
+let s:default_checks = ['indent', 'trailing', 'mixed-indent-file']
+
+let s:trailing_format = get(g:, 'airline#extensions#whitespace#trailing_format', 'trailing[%s]')
+let s:mixed_indent_format = get(g:, 'airline#extensions#whitespace#mixed_indent_format', 'mixed-indent[%s]')
+let s:long_format = get(g:, 'airline#extensions#whitespace#long_format', 'long[%s]')
+let s:mixed_indent_file_format = get(g:, 'airline#extensions#whitespace#mixed_indent_file_format', 'mix-indent-file[%s]')
+let s:indent_algo = get(g:, 'airline#extensions#whitespace#mixed_indent_algo', 0)
+let s:skip_check_ft = {'make': ['indent', 'mixed-indent-file'] }
+let s:max_lines = get(g:, 'airline#extensions#whitespace#max_lines', 20000)
+let s:enabled = get(g:, 'airline#extensions#whitespace#enabled', 1)
+let s:c_like_langs = get(g:, 'airline#extensions#c_like_langs', [ 'c', 'cpp', 'cuda', 'go', 'javascript', 'ld', 'php' ])
+
+function! s:check_mixed_indent()
+  if s:indent_algo == 1
+    " [<tab>]<space><tab>
+    " spaces before or between tabs are not allowed
+    let t_s_t = '(^\t* +\t\s*\S)'
+    " <tab>(<space> x count)
+    " count of spaces at the end of tabs should be less than tabstop value
+    let t_l_s = '(^\t+ {' . &ts . ',}' . '\S)'
+    return search('\v' . t_s_t . '|' . t_l_s, 'nw')
+  elseif s:indent_algo == 2
+    return search('\v(^\t* +\t\s*\S)', 'nw')
+  else
+    return search('\v(^\t+ +)|(^ +\t+)', 'nw')
+  endif
+endfunction
+
+function! s:check_mixed_indent_file()
+  if index(s:c_like_langs, &ft) > -1
+    " for C-like languages: allow /** */ comment style with one space before the '*'
+    let head_spc = '\v(^ +\*@!)'
+  else
+    let head_spc = '\v(^ +)'
+  endif
+  let indent_tabs = search('\v(^\t+)', 'nw')
+  let indent_spc  = search(head_spc, 'nw')
+  if indent_tabs > 0 && indent_spc > 0
+    return printf("%d:%d", indent_tabs, indent_spc)
+  else
+    return ''
+  endif
+endfunction
+
+function! airline#extensions#whitespace#check()
+  if &readonly || !&modifiable || !s:enabled || line('$') > s:max_lines
+          \ || get(b:, 'airline_whitespace_disabled', 0)
+    return ''
+  endif
+
+  if !exists('b:airline_whitespace_check')
+    let b:airline_whitespace_check = ''
+    let checks = get(b:, 'airline_whitespace_checks', get(g:, 'airline#extensions#whitespace#checks', s:default_checks))
+
+    let trailing = 0
+    if index(checks, 'trailing') > -1
+      try
+        let regexp = get(g:, 'airline#extensions#whitespace#trailing_regexp', '\s$')
+        let trailing = search(regexp, 'nw')
+      catch
+        echomsg 'airline#whitespace: error occured evaluating '. regexp
+        echomsg v:exception
+        return ''
+      endtry
+    endif
+
+    let mixed = 0
+    let check = 'indent'
+    if index(checks, check) > -1 && index(get(s:skip_check_ft, &ft, []), check) < 0
+      let mixed = s:check_mixed_indent()
+    endif
+
+    let mixed_file = ''
+    let check = 'mixed-indent-file'
+    if index(checks, check) > -1 && index(get(s:skip_check_ft, &ft, []), check) < 0
+      let mixed_file = s:check_mixed_indent_file()
+    endif
+
+    let long = 0
+    if index(checks, 'long') > -1 && &tw > 0
+      let long = search('\%>'.&tw.'v.\+', 'nw')
+    endif
+
+    if trailing != 0 || mixed != 0 || long != 0 || !empty(mixed_file)
+      let b:airline_whitespace_check = s:symbol
+      if strlen(s:symbol) > 0
+        let space = (g:airline_symbols.space)
+      else
+        let space = ''
+      endif
+
+      if s:show_message
+        if trailing != 0
+          let b:airline_whitespace_check .= space.printf(s:trailing_format, trailing)
+        endif
+        if mixed != 0
+          let b:airline_whitespace_check .= space.printf(s:mixed_indent_format, mixed)
+        endif
+        if long != 0
+          let b:airline_whitespace_check .= space.printf(s:long_format, long)
+        endif
+        if !empty(mixed_file)
+          let b:airline_whitespace_check .= space.printf(s:mixed_indent_file_format, mixed_file)
+        endif
+      endif
+    endif
+  endif
+  return airline#util#shorten(b:airline_whitespace_check, 120, 9)
+endfunction
+
+function! airline#extensions#whitespace#toggle()
+  if s:enabled
+    augroup airline_whitespace
+      autocmd!
+    augroup END
+    augroup! airline_whitespace
+    let s:enabled = 0
+  else
+    call airline#extensions#whitespace#init()
+    let s:enabled = 1
+  endif
+
+  if exists("g:airline#extensions#whitespace#enabled")
+    let g:airline#extensions#whitespace#enabled = s:enabled
+    if s:enabled && match(g:airline_section_warning, '#whitespace#check') < 0
+      let g:airline_section_warning .= airline#section#create(['whitespace'])
+      call airline#update_statusline()
+    endif
+  endif
+  echo 'Whitespace checking: '.(s:enabled ? 'Enabled' : 'Disabled')
+endfunction
+
+function! airline#extensions#whitespace#init(...)
+  call airline#parts#define_function('whitespace', 'airline#extensions#whitespace#check')
+
+  unlet! b:airline_whitespace_check
+  augroup airline_whitespace
+    autocmd!
+    autocmd CursorHold,BufWritePost * call <sid>ws_refresh()
+  augroup END
+endfunction
+
+function! s:ws_refresh()
+  unlet! b:airline_whitespace_check
+  if get(g:, 'airline_skip_empty_sections', 0)
+    exe ':AirlineRefresh'
+  endif
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/windowswap.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/windowswap.vim
new file mode 100644
index 0000000..fde010d
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/windowswap.vim
@@ -0,0 +1,29 @@
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !exists('g:loaded_windowswap')
+  finish
+endif
+
+let s:spc = g:airline_symbols.space
+
+if !exists('g:airline#extensions#windowswap#indicator_text')
+  let g:airline#extensions#windowswap#indicator_text = 'WS'
+endif
+
+function! airline#extensions#windowswap#init(ext)
+  call airline#parts#define_function('windowswap', 'airline#extensions#windowswap#get_status')
+endfunction
+
+function! airline#extensions#windowswap#get_status()
+  " use new tab-aware api if WS is up to date
+  let s:mark = exists('*WindowSwap#IsCurrentWindowMarked') ?
+    \WindowSwap#IsCurrentWindowMarked() :
+    \(WindowSwap#HasMarkedWindow() && WindowSwap#GetMarkedWindowNum() == winnr())
+  if s:mark
+    return g:airline#extensions#windowswap#indicator_text.s:spc
+  endif
+  return ''
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/wordcount.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/wordcount.vim
new file mode 100644
index 0000000..4227769
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/wordcount.vim
@@ -0,0 +1,39 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:format = get(g:, 'airline#extensions#wordcount#format', '%d words')
+let s:formatter = get(g:, 'airline#extensions#wordcount#formatter', 'default')
+let g:airline#extensions#wordcount#filetypes = get(g:, 'airline#extensions#wordcount#filetypes',
+      \ '\vhelp|markdown|rst|org|text|asciidoc|tex|mail')
+
+function! s:update()
+  if match(&ft, get(g:, 'airline#extensions#wordcount#filetypes')) > -1
+    let l:mode = mode()
+    if l:mode ==# 'v' || l:mode ==# 'V' || l:mode ==# 's' || l:mode ==# 'S'
+      let b:airline_wordcount = airline#extensions#wordcount#formatters#{s:formatter}#format()
+      let b:airline_change_tick = b:changedtick
+    else
+      if get(b:, 'airline_wordcount_cache', '') is# '' ||
+            \ b:airline_wordcount_cache isnot# get(b:, 'airline_wordcount', '') ||
+            \ get(b:, 'airline_change_tick', 0) != b:changedtick
+        " cache data
+        let b:airline_wordcount = airline#extensions#wordcount#formatters#{s:formatter}#format()
+        let b:airline_wordcount_cache = b:airline_wordcount
+        let b:airline_change_tick = b:changedtick
+      endif
+    endif
+  endif
+endfunction
+
+function! airline#extensions#wordcount#apply(...)
+  if match(&ft, get(g:, 'airline#extensions#wordcount#filetypes')) > -1
+    call airline#extensions#prepend_to_section('z', '%{get(b:, "airline_wordcount", "")}')
+  endif
+endfunction
+
+function! airline#extensions#wordcount#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#wordcount#apply')
+  autocmd BufReadPost,CursorMoved,CursorMovedI * call s:update()
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/wordcount/formatters/default.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/wordcount/formatters/default.vim
new file mode 100644
index 0000000..bb49c3f
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/wordcount/formatters/default.vim
@@ -0,0 +1,60 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+function! airline#extensions#wordcount#formatters#default#format()
+  let words = string(s:wordcount())
+  if empty(words)
+    return
+  endif
+  let separator = s:get_decimal_group()
+  if words > 999 && !empty(separator)
+    " Format number according to locale, e.g. German: 1.245 or English: 1,245
+    let a = join(reverse(split(words, '.\zs')),'')
+    let a = substitute(a, '...', '&'.separator, 'g')
+    let words = join(reverse(split(a, '.\zs')),'')
+  endif
+  return  words . " words" . g:airline_symbols.space . g:airline_right_alt_sep . g:airline_symbols.space
+endfunction
+
+function! s:wordcount()
+  if exists("*wordcount")
+    let l:mode = mode()
+    if l:mode ==# 'v' || l:mode ==# 'V' || l:mode ==# 's' || l:mode ==# 'S'
+      let l:visual_words = wordcount()['visual_words']
+      if l:visual_words != ''
+        return l:visual_words
+      else
+        return 0
+      endif
+    else
+      return wordcount()['words']
+    endif
+  elseif mode() =~? 's'
+    return
+  else
+    let old_status = v:statusmsg
+    let position = getpos(".")
+    exe "silent normal! g\<c-g>"
+    let stat = v:statusmsg
+    call setpos('.', position)
+    let v:statusmsg = old_status
+
+    let parts = split(stat)
+    if len(parts) > 11
+      return str2nr(parts[11])
+    else
+      return
+    endif
+  endif
+endfunction
+
+function! s:get_decimal_group()
+  if match(v:lang, '\v\cC|en') > -1
+    return ','
+  elseif match(v:lang, '\v\cde|dk|fr|pt') > -1
+    return '.'
+  endif
+  return ''
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/extensions/ycm.vim b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/ycm.vim
new file mode 100644
index 0000000..a254b4b
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/extensions/ycm.vim
@@ -0,0 +1,38 @@
+" MIT License. Copyright (c) 2015 Evgeny Firsov.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:spc = g:airline_symbols.space
+let s:error_symbol = get(g:, 'airline#extensions#ycm#error_symbol', 'E:')
+let s:warning_symbol = get(g:, 'airline#extensions#ycm#warning_symbol', 'W:')
+
+function! airline#extensions#ycm#init(ext)
+  call airline#parts#define_function('ycm_error_count', 'airline#extensions#ycm#get_error_count')
+  call airline#parts#define_function('ycm_warning_count', 'airline#extensions#ycm#get_warning_count')
+endfunction
+
+function! airline#extensions#ycm#get_error_count()
+  if exists(':YcmDiag') && exists("*youcompleteme#GetErrorCount")
+    let cnt = youcompleteme#GetErrorCount()
+
+    if cnt != 0
+      return s:error_symbol.cnt
+    endif
+  endif
+
+  return ''
+endfunction
+
+function! airline#extensions#ycm#get_warning_count()
+  if exists(':YcmDiag') && exists("*youcompleteme#GetWarningCount")
+    let cnt = youcompleteme#GetWarningCount()
+
+    if cnt != 0
+      return s:warning_symbol.cnt.s:spc
+    endif
+  endif
+
+  return ''
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/highlighter.vim b/vim-plugins/bundle/vim-airline/autoload/airline/highlighter.vim
new file mode 100644
index 0000000..5cbf590
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/highlighter.vim
@@ -0,0 +1,187 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:is_win32term = (has('win32') || has('win64')) && !has('gui_running') && (empty($CONEMUBUILD) || &term !=? 'xterm')
+
+let s:separators = {}
+let s:accents = {}
+
+function! s:gui2cui(rgb, fallback)
+  if a:rgb == ''
+    return a:fallback
+  elseif match(a:rgb, '^\%(NONE\|[fb]g\)$') > -1
+    return a:rgb
+  endif
+  let rgb = map(split(a:rgb[1:], '..\zs'), '0 + ("0x".v:val)')
+  return airline#msdos#round_msdos_colors(rgb)
+endfunction
+
+function! s:get_syn(group, what)
+  if !exists("g:airline_gui_mode")
+    let g:airline_gui_mode = airline#init#gui_mode()
+  endif
+  let color = synIDattr(synIDtrans(hlID(a:group)), a:what, g:airline_gui_mode)
+  if empty(color) || color == -1
+    let color = synIDattr(synIDtrans(hlID('Normal')), a:what, g:airline_gui_mode)
+  endif
+  if empty(color) || color == -1
+    let color = 'NONE'
+  endif
+  return color
+endfunction
+
+function! s:get_array(fg, bg, opts)
+  return g:airline_gui_mode ==# 'gui'
+        \ ? [ a:fg, a:bg, '', '', join(a:opts, ',') ]
+        \ : [ '', '', a:fg, a:bg, join(a:opts, ',') ]
+endfunction
+
+function! airline#highlighter#get_highlight(group, ...)
+  let fg = s:get_syn(a:group, 'fg')
+  let bg = s:get_syn(a:group, 'bg')
+  let reverse = g:airline_gui_mode ==# 'gui'
+        \ ? synIDattr(synIDtrans(hlID(a:group)), 'reverse', 'gui')
+        \ : synIDattr(synIDtrans(hlID(a:group)), 'reverse', 'cterm')
+        \|| synIDattr(synIDtrans(hlID(a:group)), 'reverse', 'term')
+  return reverse ? s:get_array(bg, fg, a:000) : s:get_array(fg, bg, a:000)
+endfunction
+
+function! airline#highlighter#get_highlight2(fg, bg, ...)
+  let fg = s:get_syn(a:fg[0], a:fg[1])
+  let bg = s:get_syn(a:bg[0], a:bg[1])
+  return s:get_array(fg, bg, a:000)
+endfunction
+
+function! airline#highlighter#exec(group, colors)
+  if pumvisible()
+    return
+  endif
+  let colors = a:colors
+  if s:is_win32term
+    let colors[2] = s:gui2cui(get(colors, 0, ''), get(colors, 2, ''))
+    let colors[3] = s:gui2cui(get(colors, 1, ''), get(colors, 3, ''))
+  endif
+  let old_hi = airline#highlighter#get_highlight(a:group)
+  if len(colors) == 4
+    call add(colors, '')
+  endif
+  if old_hi != colors
+    let cmd = printf('hi %s %s %s %s %s %s %s %s',
+        \ a:group, s:Get(colors, 0, 'guifg=', ''), s:Get(colors, 1, 'guibg=', ''),
+        \ s:Get(colors, 2, 'ctermfg=', ''), s:Get(colors, 3, 'ctermbg=', ''),
+        \ s:Get(colors, 4, 'gui=', ''), s:Get(colors, 4, 'cterm=', ''),
+        \ s:Get(colors, 4, 'term=', ''))
+    exe cmd
+  endif
+endfunction
+
+function! s:Get(dict, key, prefix, default)
+  if get(a:dict, a:key, a:default) isnot# a:default
+    return a:prefix. get(a:dict, a:key)
+  else
+    return ''
+  endif
+endfunction
+
+function! s:exec_separator(dict, from, to, inverse, suffix)
+  if pumvisible()
+    return
+  endif
+  let l:from = airline#themes#get_highlight(a:from.a:suffix)
+  let l:to = airline#themes#get_highlight(a:to.a:suffix)
+  let group = a:from.'_to_'.a:to.a:suffix
+  if a:inverse
+    let colors = [ l:from[1], l:to[1], l:from[3], l:to[3] ]
+  else
+    let colors = [ l:to[1], l:from[1], l:to[3], l:from[3] ]
+  endif
+  let a:dict[group] = colors
+  call airline#highlighter#exec(group, colors)
+endfunction
+
+function! airline#highlighter#load_theme()
+  if pumvisible()
+    return
+  endif
+  for winnr in filter(range(1, winnr('$')), 'v:val != winnr()')
+    call airline#highlighter#highlight_modified_inactive(winbufnr(winnr))
+  endfor
+  call airline#highlighter#highlight(['inactive'])
+  if getbufvar( bufnr('%'), '&modified'  )
+    call airline#highlighter#highlight(['normal', 'modified'])
+  else
+    call airline#highlighter#highlight(['normal'])
+  endif
+endfunction
+
+function! airline#highlighter#add_separator(from, to, inverse)
+  let s:separators[a:from.a:to] = [a:from, a:to, a:inverse]
+  call <sid>exec_separator({}, a:from, a:to, a:inverse, '')
+endfunction
+
+function! airline#highlighter#add_accent(accent)
+  let s:accents[a:accent] = 1
+endfunction
+
+function! airline#highlighter#highlight_modified_inactive(bufnr)
+  if getbufvar(a:bufnr, '&modified')
+    let colors = exists('g:airline#themes#{g:airline_theme}#palette.inactive_modified.airline_c')
+          \ ? g:airline#themes#{g:airline_theme}#palette.inactive_modified.airline_c : []
+  else
+    let colors = exists('g:airline#themes#{g:airline_theme}#palette.inactive.airline_c')
+          \ ? g:airline#themes#{g:airline_theme}#palette.inactive.airline_c : []
+  endif
+
+  if !empty(colors)
+    call airline#highlighter#exec('airline_c'.(a:bufnr).'_inactive', colors)
+  endif
+endfunction
+
+function! airline#highlighter#highlight(modes, ...)
+  let bufnr = a:0 ? a:1 : ''
+  let p = g:airline#themes#{g:airline_theme}#palette
+
+  " draw the base mode, followed by any overrides
+  let mapped = map(a:modes, 'v:val == a:modes[0] ? v:val : a:modes[0]."_".v:val')
+  let suffix = a:modes[0] == 'inactive' ? '_inactive' : ''
+  for mode in mapped
+    if exists('g:airline#themes#{g:airline_theme}#palette[mode]')
+      let dict = g:airline#themes#{g:airline_theme}#palette[mode]
+      for kvp in items(dict)
+        let mode_colors = kvp[1]
+        let name = kvp[0]
+        if name is# 'airline_c' && !empty(bufnr) && suffix is# '_inactive'
+          let name = 'airline_c'.bufnr
+        endif
+        call airline#highlighter#exec(name.suffix, mode_colors)
+
+        for accent in keys(s:accents)
+          if !has_key(p.accents, accent)
+            continue
+          endif
+          let colors = copy(mode_colors)
+          if p.accents[accent][0] != ''
+            let colors[0] = p.accents[accent][0]
+          endif
+          if p.accents[accent][2] != ''
+            let colors[2] = p.accents[accent][2]
+          endif
+          if len(colors) >= 5
+            let colors[4] = get(p.accents[accent], 4, '')
+          else
+            call add(colors, get(p.accents[accent], 4, ''))
+          endif
+          call airline#highlighter#exec(name.suffix.'_'.accent, colors)
+        endfor
+      endfor
+
+      " TODO: optimize this
+      for sep in items(s:separators)
+        call <sid>exec_separator(dict, sep[1][0], sep[1][1], sep[1][2], suffix)
+      endfor
+    endif
+  endfor
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/init.vim b/vim-plugins/bundle/vim-airline/autoload/airline/init.vim
new file mode 100644
index 0000000..93cd113
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/init.vim
@@ -0,0 +1,154 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+function! s:check_defined(variable, default)
+  if !exists(a:variable)
+    let {a:variable} = a:default
+  endif
+endfunction
+
+let s:loaded = 0
+function! airline#init#bootstrap()
+  if s:loaded
+    return
+  endif
+  let s:loaded = 1
+
+  let g:airline#init#bootstrapping = 1
+  call s:check_defined('g:airline_left_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b0":">")
+  call s:check_defined('g:airline_left_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b1":">")
+  call s:check_defined('g:airline_right_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b2":"<")
+  call s:check_defined('g:airline_right_alt_sep', get(g:, 'airline_powerline_fonts', 0)?"\ue0b3":"<")
+  call s:check_defined('g:airline_detect_modified', 1)
+  call s:check_defined('g:airline_detect_paste', 1)
+  call s:check_defined('g:airline_detect_crypt', 1)
+  call s:check_defined('g:airline_detect_spell', 1)
+  call s:check_defined('g:airline_detect_iminsert', 0)
+  call s:check_defined('g:airline_inactive_collapse', 1)
+  call s:check_defined('g:airline_exclude_filenames', ['DebuggerWatch','DebuggerStack','DebuggerStatus'])
+  call s:check_defined('g:airline_exclude_filetypes', [])
+  call s:check_defined('g:airline_exclude_preview', 0)
+  call s:check_defined('g:airline_gui_mode', airline#init#gui_mode())
+
+  let g:airline#util#async = v:version >= 800 && has('job')
+  let g:airline#util#is_windows = has('win32') || has('win64')
+
+  call s:check_defined('g:airline_mode_map', {})
+  call extend(g:airline_mode_map, {
+        \ '__' : '------',
+        \ 'n'  : 'NORMAL',
+        \ 'i'  : 'INSERT',
+        \ 'R'  : 'REPLACE',
+        \ 'v'  : 'VISUAL',
+        \ 'V'  : 'V-LINE',
+        \ 'c'  : 'COMMAND',
+        \ '' : 'V-BLOCK',
+        \ 's'  : 'SELECT',
+        \ 'S'  : 'S-LINE',
+        \ '' : 'S-BLOCK',
+        \ 't'  : 'TERMINAL',
+        \ }, 'keep')
+
+  call s:check_defined('g:airline_theme_map', {})
+  call extend(g:airline_theme_map, {
+        \ '\CTomorrow': 'tomorrow',
+        \ 'base16': 'base16',
+        \ 'mo[l|n]okai': 'molokai',
+        \ 'wombat': 'wombat',
+        \ 'zenburn': 'zenburn',
+        \ 'solarized': 'solarized',
+        \ 'flattened': 'solarized',
+        \ '\CNeoSolarized': 'solarized',
+        \ }, 'keep')
+
+  call s:check_defined('g:airline_symbols', {})
+  call extend(g:airline_symbols, {
+        \ 'paste': 'PASTE',
+        \ 'spell': 'SPELL',
+        \ 'readonly': get(g:, 'airline_powerline_fonts', 0) ? "\ue0a2" : 'RO',
+        \ 'whitespace': get(g:, 'airline_powerline_fonts', 0) ? "\u2739" : '!',
+        \ 'linenr': get(g:, 'airline_powerline_fonts', 0) ? "\ue0a1" : ':',
+        \ 'maxlinenr': get(g:, 'airline_powerline_fonts', 0) ? "\u2630" : '',
+        \ 'branch': get(g:, 'airline_powerline_fonts', 0) ? "\ue0a0" : '',
+        \ 'notexists': "\u2204",
+        \ 'modified': '+',
+        \ 'space': ' ',
+        \ 'crypt': get(g:, 'airline_crypt_symbol', nr2char(0x1F512)),
+        \ }, 'keep')
+
+  call airline#parts#define('mode', {
+        \ 'function': 'airline#parts#mode',
+        \ 'accent': 'bold',
+        \ })
+  call airline#parts#define_function('iminsert', 'airline#parts#iminsert')
+  call airline#parts#define_function('paste', 'airline#parts#paste')
+  call airline#parts#define_function('crypt', 'airline#parts#crypt')
+  call airline#parts#define_function('spell', 'airline#parts#spell')
+  call airline#parts#define_function('filetype', 'airline#parts#filetype')
+  call airline#parts#define('readonly', {
+        \ 'function': 'airline#parts#readonly',
+        \ 'accent': 'red',
+        \ })
+  call airline#parts#define_raw('file', '%f%m')
+  call airline#parts#define_raw('path', '%F%m')
+  call airline#parts#define('linenr', {
+        \ 'raw': '%{g:airline_symbols.linenr}%#__accent_bold#%4l%#__restore__#',
+        \ 'accent': 'bold'})
+  call airline#parts#define('maxlinenr', {
+        \ 'raw': '%#__accent_bold#/%L%{g:airline_symbols.maxlinenr}%#__restore__#',
+        \ 'accent': 'bold'})
+  call airline#parts#define_function('ffenc', 'airline#parts#ffenc')
+  call airline#parts#define_empty(['hunks', 'branch', 'obsession', 'tagbar', 'syntastic',
+        \ 'eclim', 'whitespace','windowswap', 'ycm_error_count', 'ycm_warning_count',
+        \ 'neomake_error_count', 'neomake_warning_count', 'ale_error_count', 'ale_warning_count'])
+  call airline#parts#define_text('capslock', '')
+
+  unlet g:airline#init#bootstrapping
+endfunction
+
+function! airline#init#gui_mode()
+  return ((has('nvim') && exists('$NVIM_TUI_ENABLE_TRUE_COLOR') && !exists("+termguicolors"))
+        \ || has('gui_running') || (has("termtruecolor") && &guicolors == 1) || (has("termguicolors") && &termguicolors == 1)) ?
+        \ 'gui' : 'cterm'
+endfunction
+
+function! airline#init#sections()
+  let spc = g:airline_symbols.space
+  if !exists('g:airline_section_a')
+    let g:airline_section_a = airline#section#create_left(['mode', 'crypt', 'paste', 'spell', 'capslock', 'iminsert'])
+  endif
+  if !exists('g:airline_section_b')
+    let g:airline_section_b = airline#section#create(['hunks', 'branch'])
+  endif
+  if !exists('g:airline_section_c')
+    if exists("+autochdir") && &autochdir == 1
+      let g:airline_section_c = airline#section#create(['%<', 'path', spc, 'readonly'])
+    else
+      let g:airline_section_c = airline#section#create(['%<', 'file', spc, 'readonly'])
+    endif
+  endif
+  if !exists('g:airline_section_gutter')
+    let g:airline_section_gutter = airline#section#create(['%='])
+  endif
+  if !exists('g:airline_section_x')
+    let g:airline_section_x = airline#section#create_right(['tagbar', 'filetype'])
+  endif
+  if !exists('g:airline_section_y')
+    let g:airline_section_y = airline#section#create_right(['ffenc'])
+  endif
+  if !exists('g:airline_section_z')
+    if winwidth(0) > 80
+      let g:airline_section_z = airline#section#create(['windowswap', 'obsession', '%3p%%'.spc, 'linenr', 'maxlinenr', spc.':%3v'])
+    else
+      let g:airline_section_z = airline#section#create(['%3p%%'.spc, 'linenr',  ':%3v'])
+    endif
+  endif
+  if !exists('g:airline_section_error')
+    let g:airline_section_error = airline#section#create(['ycm_error_count', 'syntastic', 'eclim', 'neomake_error_count', 'ale_error_count'])
+  endif
+  if !exists('g:airline_section_warning')
+    let g:airline_section_warning = airline#section#create(['ycm_warning_count',  'neomake_warning_count', 'ale_warning_count', 'whitespace'])
+  endif
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/msdos.vim b/vim-plugins/bundle/vim-airline/autoload/airline/msdos.vim
new file mode 100644
index 0000000..0757de5
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/msdos.vim
@@ -0,0 +1,59 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+" basic 16 msdos from MSDOS
+" see output of color, should be
+"     0    Black
+"     1    DarkBlue
+"     2    DarkGreen
+"     3    DarkCyan
+"     4    DarkRed
+"     5    DarkMagenta
+"     6    Brown
+"     7    LightGray
+"     8    DarkGray
+"     9    Blue
+"     10   Green
+"     11   Cyan
+"     12   Red
+"     13   Magenta
+"     14   Yellow
+"     15   White
+
+let s:basic16 = [
+  \ [ 0x00, 0x00, 0x00 ],
+  \ [ 0x00, 0x00, 0x80 ],
+  \ [ 0x00, 0x80, 0x00 ],
+  \ [ 0x00, 0x80, 0x80 ],
+  \ [ 0x80, 0x00, 0x00 ],
+  \ [ 0x80, 0x00, 0x80 ],
+  \ [ 0x80, 0x80, 0x00 ],
+  \ [ 0xC0, 0xC0, 0xC0 ],
+  \ [ 0x80, 0x80, 0x80 ],
+  \ [ 0x00, 0x00, 0xFF ],
+  \ [ 0x00, 0xFF, 0x00 ],
+  \ [ 0x00, 0xFF, 0xFF ],
+  \ [ 0xFF, 0x00, 0x00 ],
+  \ [ 0xFF, 0x00, 0xFF ],
+  \ [ 0xFF, 0xFF, 0x00 ],
+  \ [ 0xFF, 0xFF, 0xFF ]
+  \ ]
+
+function! airline#msdos#round_msdos_colors(rgblist)
+  " Check for values from MSDOS 16 color terminal
+  let best = []
+  let min  = 100000
+  let list = s:basic16
+  for value in list
+    let t = abs(value[0] - a:rgblist[0]) +
+          \ abs(value[1] - a:rgblist[1]) +
+          \ abs(value[2] - a:rgblist[2])
+    if min > t
+      let min = t
+      let best = value
+    endif
+  endfor
+  return index(s:basic16, best)
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/parts.vim b/vim-plugins/bundle/vim-airline/autoload/airline/parts.vim
new file mode 100644
index 0000000..6496bd9
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/parts.vim
@@ -0,0 +1,99 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+let s:parts = {}
+
+" PUBLIC API {{{
+
+function! airline#parts#define(key, config)
+  let s:parts[a:key] = get(s:parts, a:key, {})
+  if exists('g:airline#init#bootstrapping')
+    call extend(s:parts[a:key], a:config, 'keep')
+  else
+    call extend(s:parts[a:key], a:config, 'force')
+  endif
+endfunction
+
+function! airline#parts#define_function(key, name)
+  call airline#parts#define(a:key, { 'function': a:name })
+endfunction
+
+function! airline#parts#define_text(key, text)
+  call airline#parts#define(a:key, { 'text': a:text })
+endfunction
+
+function! airline#parts#define_raw(key, raw)
+  call airline#parts#define(a:key, { 'raw': a:raw })
+endfunction
+
+function! airline#parts#define_minwidth(key, width)
+  call airline#parts#define(a:key, { 'minwidth': a:width })
+endfunction
+
+function! airline#parts#define_condition(key, predicate)
+  call airline#parts#define(a:key, { 'condition': a:predicate })
+endfunction
+
+function! airline#parts#define_accent(key, accent)
+  call airline#parts#define(a:key, { 'accent': a:accent })
+endfunction
+
+function! airline#parts#define_empty(keys)
+  for key in a:keys
+    call airline#parts#define_raw(key, '')
+  endfor
+endfunction
+
+function! airline#parts#get(key)
+  return get(s:parts, a:key, {})
+endfunction
+
+" }}}
+
+function! airline#parts#mode()
+  return airline#util#shorten(get(w:, 'airline_current_mode', ''), 79, 1)
+endfunction
+
+function! airline#parts#crypt()
+  return g:airline_detect_crypt && exists("+key") && !empty(&key) ? g:airline_symbols.crypt : ''
+endfunction
+
+function! airline#parts#paste()
+  return g:airline_detect_paste && &paste ? g:airline_symbols.paste : ''
+endfunction
+
+function! airline#parts#spell()
+  return g:airline_detect_spell && &spell ? g:airline_symbols.spell : ''
+endfunction
+
+function! airline#parts#iminsert()
+  if g:airline_detect_iminsert && &iminsert && exists('b:keymap_name')
+    return toupper(b:keymap_name)
+  endif
+  return ''
+endfunction
+
+function! airline#parts#readonly()
+  if &readonly && &modifiable && !filereadable(bufname('%'))
+    return '[noperm]'
+  else
+    return &readonly ? g:airline_symbols.readonly : ''
+  endif
+endfunction
+
+function! airline#parts#filetype()
+  return winwidth(0) < 100 && strlen(&filetype) > 3 ? matchstr(&filetype, '...'). (&encoding is? 'utf-8' ? '…' : '>') : &filetype
+endfunction
+
+function! airline#parts#ffenc()
+  let expected = get(g:, 'airline#parts#ffenc#skip_expected_string', '')
+  let bomb     = &l:bomb ? '[BOM]' : ''
+  let ff       = strlen(&ff) ? '['.&ff.']' : ''
+  if expected is# &fenc.bomb.ff
+    return ''
+  else
+    return &fenc.bomb.ff
+  endif
+endfunction
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/section.vim b/vim-plugins/bundle/vim-airline/autoload/airline/section.vim
new file mode 100644
index 0000000..8d08230
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/section.vim
@@ -0,0 +1,85 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+call airline#init#bootstrap()
+let s:spc = g:airline_symbols.space
+
+function! s:wrap_accent(part, value)
+  if exists('a:part.accent')
+    call airline#highlighter#add_accent(a:part.accent)
+    return '%#__accent_'.(a:part.accent).'#'.a:value.'%#__restore__#'
+  endif
+  return a:value
+endfunction
+
+function! s:create(parts, append)
+  let _ = ''
+  for idx in range(len(a:parts))
+    let part = airline#parts#get(a:parts[idx])
+    let val = ''
+    let add_sep = get(l:, 'add_sep', 0)
+
+    if exists('part.function')
+      let func = (part.function).'()'
+    elseif exists('part.text')
+      let func = '"'.(part.text).'"'
+    else
+      if a:append > 0 && idx != 0
+        let val .= s:spc.g:airline_left_alt_sep.s:spc
+      endif
+      if a:append < 0 && idx != 0
+        let t = ''
+        if !add_sep
+          let t = s:spc.g:airline_right_alt_sep.s:spc
+        endif
+        let val = t.val
+      endif
+      if exists('part.raw')
+        let _ .= s:wrap_accent(part, val.(part.raw))
+        continue
+      else
+        let _ .= s:wrap_accent(part, val.a:parts[idx])
+        continue
+      endif
+    endif
+
+    let minwidth = get(part, 'minwidth', 0)
+
+    if a:append > 0 && idx != 0
+      let partval = printf('%%{airline#util#append(%s,%s)}', func, minwidth)
+      " will add an extra separator, if minwidth is zero
+      let add_sep = (minwidth == 0)
+    elseif a:append < 0 && idx != len(a:parts) - 1
+      let partval = printf('%%{airline#util#prepend(%s,%s)}', func, minwidth)
+      " will add an extra separator, if minwidth is zero
+      let add_sep = (minwidth == 0)
+    else
+      let partval = printf('%%{airline#util#wrap(%s,%s)}', func, minwidth)
+      let add_sep = 0
+    endif
+
+    if exists('part.condition')
+      let partval = substitute(partval, '{', '\="{".(part.condition)." ? "', '')
+      let partval = substitute(partval, '}', ' : ""}', '')
+    endif
+
+    let val .= s:wrap_accent(part, partval)
+    let _ .= val
+  endfor
+  return _
+endfunction
+
+function! airline#section#create(parts)
+  return s:create(a:parts, 0)
+endfunction
+
+function! airline#section#create_left(parts)
+  return s:create(a:parts, 1)
+endfunction
+
+function! airline#section#create_right(parts)
+  return s:create(a:parts, -1)
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/themes.vim b/vim-plugins/bundle/vim-airline/autoload/airline/themes.vim
new file mode 100644
index 0000000..75c2f40
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/themes.vim
@@ -0,0 +1,73 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+" generates a dictionary which defines the colors for each highlight group
+function! airline#themes#generate_color_map(sect1, sect2, sect3, ...)
+  let palette = {
+        \ 'airline_a': [ a:sect1[0] , a:sect1[1] , a:sect1[2] , a:sect1[3] , get(a:sect1 , 4 , '') ] ,
+        \ 'airline_b': [ a:sect2[0] , a:sect2[1] , a:sect2[2] , a:sect2[3] , get(a:sect2 , 4 , '') ] ,
+        \ 'airline_c': [ a:sect3[0] , a:sect3[1] , a:sect3[2] , a:sect3[3] , get(a:sect3 , 4 , '') ] ,
+        \ }
+
+  if a:0 > 0
+    call extend(palette, {
+          \ 'airline_x': [ a:1[0] , a:1[1] , a:1[2] , a:1[3] , get(a:1 , 4 , '' ) ] ,
+          \ 'airline_y': [ a:2[0] , a:2[1] , a:2[2] , a:2[3] , get(a:2 , 4 , '' ) ] ,
+          \ 'airline_z': [ a:3[0] , a:3[1] , a:3[2] , a:3[3] , get(a:3 , 4 , '' ) ] ,
+          \ })
+  else
+    call extend(palette, {
+          \ 'airline_x': [ a:sect3[0] , a:sect3[1] , a:sect3[2] , a:sect3[3] , '' ] ,
+          \ 'airline_y': [ a:sect2[0] , a:sect2[1] , a:sect2[2] , a:sect2[3] , '' ] ,
+          \ 'airline_z': [ a:sect1[0] , a:sect1[1] , a:sect1[2] , a:sect1[3] , '' ] ,
+          \ })
+  endif
+
+  return palette
+endfunction
+
+function! airline#themes#get_highlight(group, ...)
+  return call('airline#highlighter#get_highlight', [a:group] + a:000)
+endfunction
+
+function! airline#themes#get_highlight2(fg, bg, ...)
+  return call('airline#highlighter#get_highlight2', [a:fg, a:bg] + a:000)
+endfunction
+
+function! airline#themes#patch(palette)
+  for mode in keys(a:palette)
+    if !has_key(a:palette[mode], 'airline_warning')
+      let a:palette[mode]['airline_warning'] = [ '#000000', '#df5f00', 232, 166 ]
+    endif
+    if !has_key(a:palette[mode], 'airline_error')
+      let a:palette[mode]['airline_error'] = [ '#000000', '#990000', 232, 160 ]
+    endif
+  endfor
+
+  let a:palette.accents = get(a:palette, 'accents', {})
+  let a:palette.accents.none = [ '', '', '', '', '' ]
+  let a:palette.accents.bold = [ '', '', '', '', 'bold' ]
+  let a:palette.accents.italic = [ '', '', '', '', 'italic' ]
+
+  if !has_key(a:palette.accents, 'red')
+    let a:palette.accents.red = [ '#ff0000' , '' , 160 , '' ]
+  endif
+  if !has_key(a:palette.accents, 'green')
+    let a:palette.accents.green = [ '#008700' , '' , 22  , '' ]
+  endif
+  if !has_key(a:palette.accents, 'blue')
+    let a:palette.accents.blue = [ '#005fff' , '' , 27  , '' ]
+  endif
+  if !has_key(a:palette.accents, 'yellow')
+    let a:palette.accents.yellow = [ '#dfff00' , '' , 190 , '' ]
+  endif
+  if !has_key(a:palette.accents, 'orange')
+    let a:palette.accents.orange = [ '#df5f00' , '' , 166 , '' ]
+  endif
+  if !has_key(a:palette.accents, 'purple')
+    let a:palette.accents.purple = [ '#af00df' , '' , 128 , '' ]
+  endif
+endfunction
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/themes/dark.vim b/vim-plugins/bundle/vim-airline/autoload/airline/themes/dark.vim
new file mode 100644
index 0000000..44f4a1a
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/themes/dark.vim
@@ -0,0 +1,104 @@
+scriptencoding utf-8
+
+" Each theme is contained in its own file and declares variables scoped to the
+" file.  These variables represent the possible "modes" that airline can
+" detect.  The mode is the return value of mode(), which gets converted to a
+" readable string.  The following is a list currently supported modes: normal,
+" insert, replace, visual, and inactive.
+"
+" Each mode can also have overrides.  These are small changes to the mode that
+" don't require a completely different look.  "modified" and "paste" are two
+" such supported overrides.  These are simply suffixed to the major mode,
+" separated by an underscore.  For example, "normal_modified" would be normal
+" mode where the current buffer is modified.
+"
+" The theming algorithm is a 2-pass system where the mode will draw over all
+" parts of the statusline, and then the override is applied after.  This means
+" it is possible to specify a subset of the theme in overrides, as it will
+" simply overwrite the previous colors.  If you want simultaneous overrides,
+" then they will need to change different parts of the statusline so they do
+" not conflict with each other.
+"
+" First, let's define an empty dictionary and assign it to the "palette"
+" variable. The # is a separator that maps with the directory structure. If
+" you get this wrong, Vim will complain loudly.
+let g:airline#themes#dark#palette = {}
+
+" First let's define some arrays. The s: is just a VimL thing for scoping the
+" variables to the current script. Without this, these variables would be
+" declared globally. Now let's declare some colors for normal mode and add it
+" to the dictionary.  The array is in the format:
+" [ guifg, guibg, ctermfg, ctermbg, opts ]. See "help attr-list" for valid
+" values for the "opt" value.
+let s:N1   = [ '#00005f' , '#dfff00' , 17  , 190 ]
+let s:N2   = [ '#ffffff' , '#444444' , 255 , 238 ]
+let s:N3   = [ '#9cffd3' , '#202020' , 85  , 234 ]
+let g:airline#themes#dark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+" Here we define overrides for when the buffer is modified.  This will be
+" applied after g:airline#themes#dark#palette.normal, hence why only certain keys are
+" declared.
+let g:airline#themes#dark#palette.normal_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+
+
+let s:I1 = [ '#00005f' , '#00dfff' , 17  , 45  ]
+let s:I2 = [ '#ffffff' , '#005fff' , 255 , 27  ]
+let s:I3 = [ '#ffffff' , '#000080' , 15  , 17  ]
+let g:airline#themes#dark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#dark#palette.insert_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+let g:airline#themes#dark#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#dark#palette.replace = copy(g:airline#themes#dark#palette.insert)
+let g:airline#themes#dark#palette.replace.airline_a = [ s:I2[0]   , '#af0000' , s:I2[2] , 124     , ''     ]
+let g:airline#themes#dark#palette.replace_modified = g:airline#themes#dark#palette.insert_modified
+
+
+let s:V1 = [ '#000000' , '#ffaf00' , 232 , 214 ]
+let s:V2 = [ '#000000' , '#ff5f00' , 232 , 202 ]
+let s:V3 = [ '#ffffff' , '#5f0000' , 15  , 52  ]
+let g:airline#themes#dark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#dark#palette.visual_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+
+
+let s:IA1 = [ '#4e4e4e' , '#1c1c1c' , 239 , 234 , '' ]
+let s:IA2 = [ '#4e4e4e' , '#262626' , 239 , 235 , '' ]
+let s:IA3 = [ '#4e4e4e' , '#303030' , 239 , 236 , '' ]
+let g:airline#themes#dark#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#dark#palette.inactive_modified = {
+      \ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
+      \ }
+
+
+" Accents are used to give parts within a section a slightly different look or
+" color. Here we are defining a "red" accent, which is used by the 'readonly'
+" part by default. Only the foreground colors are specified, so the background
+" colors are automatically extracted from the underlying section colors. What
+" this means is that regardless of which section the part is defined in, it
+" will be red instead of the section's foreground color. You can also have
+" multiple parts with accents within a section.
+let g:airline#themes#dark#palette.accents = {
+      \ 'red': [ '#ff0000' , '' , 160 , ''  ]
+      \ }
+
+
+" Here we define the color map for ctrlp.  We check for the g:loaded_ctrlp
+" variable so that related functionality is loaded iff the user is using
+" ctrlp. Note that this is optional, and if you do not define ctrlp colors
+" they will be chosen automatically from the existing palette.
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#dark#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#d7d7ff' , '#5f00af' , 189 , 55  , ''     ],
+      \ [ '#ffffff' , '#875fd7' , 231 , 98  , ''     ],
+      \ [ '#5f00af' , '#ffffff' , 55  , 231 , 'bold' ])
+
diff --git a/vim-plugins/bundle/vim-airline/autoload/airline/util.vim b/vim-plugins/bundle/vim-airline/autoload/airline/util.vim
new file mode 100644
index 0000000..ef11cbe
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/autoload/airline/util.vim
@@ -0,0 +1,107 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+call airline#init#bootstrap()
+let s:spc = g:airline_symbols.space
+
+function! airline#util#shorten(text, winwidth, minwidth)
+  if winwidth(0) < a:winwidth && len(split(a:text, '\zs')) > a:minwidth
+    return matchstr(a:text, '^.\{'.a:minwidth.'}').'…'
+  else
+    return a:text
+  endif
+endfunction
+
+function! airline#util#wrap(text, minwidth)
+  if a:minwidth > 0 && winwidth(0) < a:minwidth
+    return ''
+  endif
+  return a:text
+endfunction
+
+function! airline#util#append(text, minwidth)
+  if a:minwidth > 0 && winwidth(0) < a:minwidth
+    return ''
+  endif
+  let prefix = s:spc == "\ua0" ? s:spc : s:spc.s:spc
+  return empty(a:text) ? '' : prefix.g:airline_left_alt_sep.s:spc.a:text
+endfunction
+
+function! airline#util#warning(msg)
+  echohl WarningMsg
+  echomsg "airline: ".a:msg
+  echohl Normal
+endfunction
+
+function! airline#util#prepend(text, minwidth)
+  if a:minwidth > 0 && winwidth(0) < a:minwidth
+    return ''
+  endif
+  return empty(a:text) ? '' : a:text.s:spc.g:airline_right_alt_sep.s:spc
+endfunction
+
+if v:version >= 704
+  function! airline#util#getwinvar(winnr, key, def)
+    return getwinvar(a:winnr, a:key, a:def)
+  endfunction
+else
+  function! airline#util#getwinvar(winnr, key, def)
+    let winvals = getwinvar(a:winnr, '')
+    return get(winvals, a:key, a:def)
+  endfunction
+endif
+
+if v:version >= 704
+  function! airline#util#exec_funcrefs(list, ...)
+    for Fn in a:list
+      let code = call(Fn, a:000)
+      if code != 0
+        return code
+      endif
+    endfor
+    return 0
+  endfunction
+else
+  function! airline#util#exec_funcrefs(list, ...)
+    " for 7.2; we cannot iterate the list, hence why we use range()
+    " for 7.3-[97, 328]; we cannot reuse the variable, hence the {}
+    for i in range(0, len(a:list) - 1)
+      let Fn{i} = a:list[i]
+      let code = call(Fn{i}, a:000)
+      if code != 0
+        return code
+      endif
+    endfor
+    return 0
+  endfunction
+endif
+
+" Define a wrapper over system() that uses nvim's async job control if
+" available. This way we avoid overwriting v:shell_error, which might
+" potentially disrupt other plugins.
+if has('nvim')
+  function! s:system_job_handler(job_id, data, event) dict
+    if a:event == 'stdout'
+      let self.buf .=  join(a:data)
+    endif
+  endfunction
+
+  function! airline#util#system(cmd)
+    let l:config = {
+    \ 'buf': '',
+    \ 'on_stdout': function('s:system_job_handler'),
+    \ }
+    let l:id = jobstart(a:cmd, l:config)
+    if l:id < 1
+      return system(a:cmd)
+    endif
+    call jobwait([l:id])
+    return l:config.buf
+  endfunction
+else
+  function! airline#util#system(cmd)
+    return system(a:cmd)
+  endfunction
+endif
diff --git a/vim-plugins/bundle/vim-airline/doc/airline.txt b/vim-plugins/bundle/vim-airline/doc/airline.txt
new file mode 100644
index 0000000..a098dd9
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/doc/airline.txt
@@ -0,0 +1,1088 @@
+*airline.txt*  Lean and mean status/tabline that's light as air
+*airline*
+                   _                       _      _ _                        ~
+            __   _(_)_ __ ___         __ _(_)_ __| (_)_ __   ___             ~
+            \ \ / / | '_ ` _ \ _____ / _` | | '__| | | '_ \ / _ \            ~
+             \ V /| | | | | | |_____| (_| | | |  | | | | | |  __/            ~
+              \_/ |_|_| |_| |_|      \__,_|_|_|  |_|_|_| |_|\___|            ~
+                                                                             ~
+==============================================================================
+CONTENTS                                                  *airline-contents*
+
+   01. Intro ............................................... |airline-intro|
+   02. Features ......................................... |airline-features|
+   03. Name ................................................. |airline-name|
+   04. Configuration ............................... |airline-configuration|
+   05. Commands ......................................... |airline-commands|
+   06. Autocommands ................................. |airline-autocommands|
+   07. Customization ............................... |airline-customization|
+   08. Extensions ..................................... |airline-extensions|
+   09. Advanced Customization ............. |airline-advanced-customization|
+   10. Funcrefs ......................................... |airline-funcrefs|
+   11. Pipeline ......................................... |airline-pipeline|
+   12. Writing Extensions ..................... |airline-writing-extensions|
+   13. Writing Themes ..................................... |airline-themes|
+   14. Troubleshooting ........................... |airline-troubleshooting|
+   15. Contributions ............................... |airline-contributions|
+   16. License ........................................... |airline-license|
+
+==============================================================================
+INTRODUCTION                                                 *airline-intro*
+
+vim-airline is a fast and lightweight alternative to powerline, written
+in 100% vimscript with no outside dependencies.
+
+==============================================================================
+FEATURES                                                  *airline-features*
+
+*  tiny core written with extensibility in mind.
+*  integrates with many popular plugins.
+*  looks good with regular fonts, and provides configuration points so you
+   can use unicode or powerline symbols.
+*  optimized for speed; it loads in under a millisecond.
+*  fully customizable; if you know a little 'statusline' syntax you can
+   tweak it to your needs.
+*  extremely easy to write themes.
+
+==============================================================================
+NAME                                                          *airline-name*
+
+Where did the name come from?
+
+I wrote this on an airplane, and since it's light as air it turned out to be a
+good name :-)
+
+==============================================================================
+CONFIGURATION                                        *airline-configuration*
+
+There are a couple configuration values available (shown with their default
+values):
+
+* the separator used on the left side >
+  let g:airline_left_sep='>'
+<
+* the separator used on the right side >
+  let g:airline_right_sep='<'
+<
+* enable modified detection >
+  let g:airline_detect_modified=1
+
+* enable paste detection >
+  let g:airline_detect_paste=1
+<
+* enable crypt detection >
+  let g:airline_detect_crypt=1
+
+* enable spell detection >
+  let g:airline_detect_spell=1
+<
+* enable iminsert detection >
+  let g:airline_detect_iminsert=0
+<
+* determine whether inactive windows should have the left section collapsed to
+  only the filename of that buffer.  >
+  let g:airline_inactive_collapse=1
+<
+* themes are automatically selected based on the matching colorscheme. this
+  can be overridden by defining a value. >
+  let g:airline_theme='dark'
+<
+  Note: Only the dark theme is distributed with vim-airline. For more themes,
+  checkout the vim-airline-themes repository
+  (github.com/vim-airline/vim-airline-themes)
+
+* if you want to patch the airline theme before it gets applied, you can
+  supply the name of a function where you can modify the palette. >
+  let g:airline_theme_patch_func = 'AirlineThemePatch'
+  function! AirlineThemePatch(palette)
+    if g:airline_theme == 'badwolf'
+      for colors in values(a:palette.inactive)
+        let colors[3] = 245
+      endfor
+    endif
+  endfunction
+<
+* enable/disable automatic population of the `g:airline_symbols` dictionary
+  with powerline symbols. >
+  let g:airline_powerline_fonts=0
+<
+* define the set of text to display for each mode.  >
+  let g:airline_mode_map = {} " see source for the defaults
+
+  " or copy paste the following into your vimrc for shortform text
+  let g:airline_mode_map = {
+      \ '__' : '-',
+      \ 'n'  : 'N',
+      \ 'i'  : 'I',
+      \ 'R'  : 'R',
+      \ 'c'  : 'C',
+      \ 'v'  : 'V',
+      \ 'V'  : 'V',
+      \ '' : 'V',
+      \ 's'  : 'S',
+      \ 'S'  : 'S',
+      \ '' : 'S',
+      \ }
+<
+* define the set of filename match queries which excludes a window from having
+  its statusline modified >
+  let g:airline_exclude_filenames = [] " see source for current list
+<
+* define the set of filetypes which are excluded from having its window
+  statusline modified >
+  let g:airline_exclude_filetypes = [] " see source for current list
+<
+* defines whether the preview window should be excluded from have its window
+  statusline modified (may help with plugins which use the preview window
+  heavily) >
+  let g:airline_exclude_preview = 0
+<
+* disable the Airline customization for selective windows (this is a
+  window-local variable so you can disable it for only some windows) >
+  let w:airline_disabled = 1
+
+* Do not draw separators for empty sections (only for the active window)
+ >
+  let g:airline_skip_empty_sections = 1
+<
+==============================================================================
+COMMANDS                                                  *airline-commands*
+
+:AirlineTheme {theme-name}                                   *:AirlineTheme*
+  Displays or changes the current theme.
+
+:AirlineToggleWhitespace                          *:AirlineToggleWhitespace*
+  Toggles whitespace detection.
+
+:AirlineToggle                                              *:AirlineToggle*
+  Toggles between the standard 'statusline' and airline.
+
+:AirlineRefresh                                            *:AirlineRefresh*
+  Refreshes all highlight groups and redraws the statusline.
+
+==============================================================================
+AUTOCOMMANDS                                          *airline-autocommands*
+
+Airline comes with some user-defined autocommands.
+
+|AirlineAfterInit|     after plugin is initialized, but before the statusline
+                    is replaced
+|AirlineAfterTheme|   after theme of the statusline has been changed
+|AirlineToggledOn|    after airline is activated and replaced the statusline
+|AirlineToggledOff|   after airline is deactivated and the statusline is
+                    restored to the original
+
+==============================================================================
+CUSTOMIZATION                                        *airline-customization*
+
+The following are some unicode symbols for customizing the left/right
+separators, as well as the powerline font glyphs.
+
+Note: You must define the dictionary first before setting values. Also, it's a
+good idea to check whether it exists as to avoid accidentally overwriting
+its contents. >
+  if !exists('g:airline_symbols')
+    let g:airline_symbols = {}
+  endif
+
+  " unicode symbols
+  let g:airline_left_sep = '»'
+  let g:airline_left_sep = 'â–¶'
+  let g:airline_right_sep = '«'
+  let g:airline_right_sep = 'â—€'
+  let g:airline_symbols.crypt = '🔒'
+  let g:airline_symbols.linenr = '�'
+  let g:airline_symbols.linenr = '�'
+  let g:airline_symbols.linenr = '¶'
+  let g:airline_symbols.maxlinenr = '☰'
+  let g:airline_symbols.maxlinenr = ''
+  let g:airline_symbols.branch = '⎇'
+  let g:airline_symbols.paste = '�'
+  let g:airline_symbols.paste = 'Þ'
+  let g:airline_symbols.paste = '∥'
+  let g:airline_symbols.spell = 'Ꞩ'
+  let g:airline_symbols.notexists = '∄'
+  let g:airline_symbols.whitespace = 'Ξ'
+
+  " powerline symbols
+  let g:airline_left_sep = 'î‚°'
+  let g:airline_left_alt_sep = ''
+  let g:airline_right_sep = ''
+  let g:airline_right_alt_sep = ''
+  let g:airline_symbols.branch = 'î‚ '
+  let g:airline_symbols.readonly = 'î‚¢'
+  let g:airline_symbols.linenr = 'î‚¡'
+
+  " old vim-powerline symbols
+  let g:airline_left_sep = '⮀'
+  let g:airline_left_alt_sep = '�'
+  let g:airline_right_sep = '⮂'
+  let g:airline_right_alt_sep = '⮃'
+  let g:airline_symbols.branch = 'â­ '
+  let g:airline_symbols.readonly = 'â­¤'
+  let g:airline_symbols.linenr = 'â­¡'
+<
+
+For more intricate customizations, you can replace the predefined sections
+with the usual statusline syntax.
+
+Note: If you define any section variables it will replace the default values
+entirely.  If you want to disable only certain parts of a section you can try
+using variables defined in the |airline-configuration| or |airline-extensions|
+section.
+>
+  variable names                default contents
+  ----------------------------------------------------------------------------
+  let g:airline_section_a       (mode, crypt, paste, spell, iminsert)
+  let g:airline_section_b       (hunks, branch)
+  let g:airline_section_c       (bufferline or filename)
+  let g:airline_section_gutter  (readonly, csv)
+  let g:airline_section_x       (tagbar, filetype, virtualenv)
+  let g:airline_section_y       (fileencoding, fileformat)
+  let g:airline_section_z       (percentage, line number, column number)
+  let g:airline_section_error   (ycm_error_count, syntastic, eclim)
+  let g:airline_section_warning (ycm_warning_count, whitespace)
+
+  " here is an example of how you could replace the branch indicator with
+  " the current working directory, followed by the filename.
+  let g:airline_section_b = '%{getcwd()}'
+  let g:airline_section_c = '%t'
+<
+==============================================================================
+EXTENSIONS                                              *airline-extensions*
+
+Most extensions are enabled by default and lazily loaded when the
+corresponding plugin (if any) is detected.
+
+By default, airline will attempt to load any extension it can find in the
+'runtimepath'.  On some systems this can result in an undesirable startup
+cost.  You can disable the check with the following flag. >
+  let g:airline#extensions#disable_rtp_load = 1
+<
+  Note: Third party plugins that rely on this behavior will be affected. You
+  will need to manually load them.
+
+Alternatively, if you want a minimalistic setup and would rather opt-in which
+extensions get loaded instead of disabling each individually, you can declare
+the following list variable: >
+  " an empty list disables all extensions
+  let g:airline_extensions = []
+
+  " or only load what you want
+  let g:airline_extensions = ['branch', 'tabline']
+<
+-------------------------------------                      *airline-default*
+The default extension understands all of the `g:` variables in the
+|airline-configuration| section, however it also has some more fine-tuned
+configuration values that you can use.
+
+* control which sections get truncated and at what width. >
+  let g:airline#extensions#default#section_truncate_width = {
+      \ 'b': 79,
+      \ 'x': 60,
+      \ 'y': 88,
+      \ 'z': 45,
+      \ 'warning': 80,
+      \ 'error': 80,
+      \ }
+
+  " Note: set to an empty dictionary to disable truncation.
+  let g:airline#extensions#default#section_truncate_width = {}
+<
+* configure the layout of the sections by specifying an array of two arrays
+  (first array is the left side, second array is the right side). >
+  let g:airline#extensions#default#layout = [
+      \ [ 'a', 'b', 'c' ],
+      \ [ 'x', 'y', 'z', 'error', 'warning' ]
+      \ ]
+<
+* configure the layout to not use %(%) grouping items in the statusline.
+  Try setting this to zero, if you notice bleeding color artifacts >
+  let airline#extensions#default#section_use_groupitems = 1
+<
+* configure the fileformat output
+  By default, it will display something like 'utf-8[unix]', however, you can
+  skip displaying it, if the output matches a configured string. To do so,
+  set >
+  let g:airline#parts#ffenc#skip_expected_string='utf-8[unix]'
+<
+-------------------------------------                     *airline-quickfix*
+The quickfix extension is a simple built-in extension which determines
+whether the buffer is a quickfix or location list buffer, and adjusts the
+title accordingly.
+
+* configure the title text for quickfix buffers >
+  let g:airline#extensions#quickfix#quickfix_text = 'Quickfix'
+<
+* configure the title text for location list buffers >
+  let g:airline#extensions#quickfix#location_text = 'Location'
+<
+
+-------------------------------------                   *airline-bufferline*
+vim-bufferline <https://github.com/bling/vim-bufferline>
+
+* enable/disable bufferline integration >
+  let g:airline#extensions#bufferline#enabled = 1
+<
+* determine whether bufferline will overwrite customization variables >
+  let g:airline#extensions#bufferline#overwrite_variables = 1
+<
+-------------------------------------                       *airline-branch*
+
+vim-airline will display the branch-indicator together with the branch name in
+the statusline, if one of the following plugins is installed:
+
+fugitive.vim <https://github.com/tpope/vim-fugitive>
+lawrencium   <https://bitbucket.org/ludovicchabant/vim-lawrencium>
+vcscommand   <http://www.vim.org/scripts/script.php?script_id=90>
+
+If a file is edited, that is not yet in the repository, the
+notexists symbol will be displayed after the branch name.
+
+* enable/disable fugitive/lawrencium integration >
+  let g:airline#extensions#branch#enabled = 1
+<
+* change the text for when no branch is detected >
+  let g:airline#extensions#branch#empty_message = ''
+<
+* define the order in which the branches of different vcs systems will be
+  displayed on the statusline (currently only for fugitive and lawrencium) >
+  let g:airline#extensions#branch#vcs_priority = ["git", "mercurial"]
+<
+* use vcscommand.vim if available >
+  let g:airline#extensions#branch#use_vcscommand = 0
+<
+* truncate long branch names to a fixed length >
+  let g:airline#extensions#branch#displayed_head_limit = 10
+<
+* customize formatting of branch name >
+  " default value leaves the name unmodifed
+  let g:airline#extensions#branch#format = 0
+
+  " to only show the tail, e.g. a branch 'feature/foo' becomes 'foo', use
+  let g:airline#extensions#branch#format = 1
+
+  " to truncate all path sections but the last one, e.g. a branch
+  " 'foo/bar/baz' becomes 'f/b/baz', use
+  let g:airline#extensions#branch#format = 2
+
+  " if a string is provided, it should be the name of a function that
+  " takes a string and returns the desired value
+  let g:airline#extensions#branch#format = 'CustomBranchName'
+  function! CustomBranchName(name)
+    return '[' . a:name . ']'
+  endfunction
+<
+-------------------------------------                    *airline-syntastic*
+syntastic <https://github.com/scrooloose/syntastic>
+
+* enable/disable syntastic integration >
+  let g:airline#extensions#syntastic#enabled = 1
+
+  Note: The recommendation from syntastic to modify the statusline directly
+  does not apply, if you use vim-airline, since it will take care for you of
+  adjusting the statusline.
+<
+-------------------------------------                       *airline-tagbar*
+tagbar <https://github.com/majutsushi/tagbar>
+
+* enable/disable tagbar integration >
+  let g:airline#extensions#tagbar#enabled = 1
+<
+* change how tags are displayed (:help tagbar-statusline) >
+  let g:airline#extensions#tagbar#flags = ''  (default)
+  let g:airline#extensions#tagbar#flags = 'f'
+  let g:airline#extensions#tagbar#flags = 's'
+  let g:airline#extensions#tagbar#flags = 'p'
+<
+-------------------------------------                          *airline-csv*
+csv.vim <https://github.com/chrisbra/csv.vim>
+
+* enable/disable csv integration for displaying the current column. >
+  let g:airline#extensions#csv#enabled = 1
+<
+* change how columns are displayed. >
+  let g:airline#extensions#csv#column_display = 'Number' (default)
+  let g:airline#extensions#csv#column_display = 'Name'
+<
+-------------------------------------                        *airline-hunks*
+vim-gitgutter <https://github.com/airblade/vim-gitgutter>
+vim-signify <https://github.com/mhinz/vim-signify>
+changesPlugin <https://github.com/chrisbra/changesPlugin>
+quickfixsigns <https://github.com/tomtom/quickfixsigns_vim>
+
+* enable/disable showing a summary of changed hunks under source control. >
+  let g:airline#extensions#hunks#enabled = 1
+<
+* enable/disable showing only non-zero hunks. >
+  let g:airline#extensions#hunks#non_zero_only = 0
+<
+* set hunk count symbols. >
+  let g:airline#extensions#hunks#hunk_symbols = ['+', '~', '-']
+<
+-------------------------------------                        *airline-ctrlp*
+ctrlp <https://github.com/kien/ctrlp.vim>
+
+* configure which mode colors should ctrlp window use (takes effect
+  only if the active airline theme doesn't define ctrlp colors) >
+  let g:airline#extensions#ctrlp#color_template = 'insert' (default)
+  let g:airline#extensions#ctrlp#color_template = 'normal'
+  let g:airline#extensions#ctrlp#color_template = 'visual'
+  let g:airline#extensions#ctrlp#color_template = 'replace'
+<
+
+* configure whether to show the previous and next modes (mru, buffer, etc...)
+>
+ let g:airline#extensions#ctrlp#show_adjacent_modes = 1
+<
+-------------------------------------                   *airline-virtualenv*
+virtualenv <https://github.com/jmcantrell/vim-virtualenv>
+
+* enable/disable virtualenv integration >
+  let g:airline#extensions#virtualenv#enabled = 1
+<
+-------------------------------------                        *airline-eclim*
+eclim <https://eclim.org>
+
+* enable/disable eclim integration, which works well with the
+  |airline-syntastic| extension. >
+  let g:airline#extensions#eclim#enabled = 1
+
+-------------------------------------                    *airline-wordcount*
+* enable/disable word counting. >
+  let g:airline#extensions#wordcount#enabled = 1
+<
+* regex of filetypes to enable word counting. >
+  " the default value matches filetypes typically used for documentation
+  " such as markdown and help files.
+  let g:airline#extensions#wordcount#filetypes = ...
+  (default: markdown,rst,org,help,text,tex,mail)
+
+* defines the name of a formatter for word count will be displayed: >
+  " The default will try to guess LC_NUMERIC and format number accordingly
+  " e.g. 1,042 in English and 1.042 in German locale
+  let g:airline#extensions#wordcount#formatter = 'default'
+
+  " here is how you can define a 'foo' formatter:
+  " create a file in the dir autoload/airline/extensions/wordcount/formatters/
+  " called foo.vim
+  " this example needs at least Vim > 7.4.1042
+  function! airline#extensions#wordcount#formatters#foo#format()
+    return (wordcount()['words'] == 0 ? 'NONE' :
+        \ wordcount()['words'] > 100 ? 'okay' : 'not enough')
+  endfunction
+  let g:airline#extensions#wordline#formatter = 'foo'
+
+* defines how to display the wordcount statistics: >
+  let g:airline#extensions#wordcount#format = '%d words'
+<
+-------------------------------------                   *airline-whitespace*
+* enable/disable detection of whitespace errors. >
+  let g:airline#extensions#whitespace#enabled = 1
+<
+* customize the type of mixed indent checking to perform. >
+  " must be all spaces or all tabs before the first non-whitespace character
+  let g:airline#extensions#whitespace#mixed_indent_algo = 0 (default)
+
+  " certain number of spaces are allowed after tabs, but not in between
+  " this algorithm works well for /** */ style comments in a tab-indented file
+  let g:airline#extensions#whitespace#mixed_indent_algo = 1
+
+  " spaces are allowed after tabs, but not in between
+  " this algorithm works well with programming styles that use tabs for
+  " indentation and spaces for alignment
+  let g:airline#extensions#whitespace#mixed_indent_algo = 2
+<
+* customize the whitespace symbol. >
+  let g:airline#extensions#whitespace#symbol = '!'
+<
+* configure which whitespace checks to enable. >
+  " indent: mixed indent within a line
+  " long:   overlong lines
+  " trailing: trailing whitespace
+  " mixed-indent-file: different indentation in different lines
+  let g:airline#extensions#whitespace#checks = [ 'indent', 'trailing', 'long', 'mixed-indent-file' ]
+
+  " this can also be configured for an individual buffer
+  let b:airline_whitespace_checks = [ 'indent', 'trailing', 'long', 'mixed-indent-file' ]
+<
+* configure the maximum number of lines where whitespace checking is enabled. >
+  let g:airline#extensions#whitespace#max_lines = 20000
+<
+* configure whether a message should be displayed. >
+  let g:airline#extensions#whitespace#show_message = 1
+<
+* configure the formatting of the warning messages. >
+  let g:airline#extensions#whitespace#trailing_format = 'trailing[%s]'
+  let g:airline#extensions#whitespace#mixed_indent_format = 'mixed-indent[%s]'
+  let g:airline#extensions#whitespace#long_format = 'long[%s]'
+  let g:airline#extensions#whitespace#mixed_indent_file_format = 'mix-indent-file[%s]'
+
+* configure custom trailing whitespace regexp rule >
+  let g:airline#extensions#whitespace#trailing_regexp = '\s$'
+
+* configure, which filetypes have special treatment of /* */ comments,
+  matters for mix-indent-file algorithm: >
+  let airline#extensions#c_like_langs = ['c', 'cpp', 'cuda', 'go', 'javascript', 'ld', 'php']
+<
+* disable whitespace checking for an individual buffer >
+  " Checking is enabled by default because b:airline_whitespace_disabled
+  " is by default not defined:
+  unlet b:airline_whitespace_disabled
+
+  " If b:airline_whitespace_disabled is defined and is non-zero for a buffer,
+  " then whitespace checking will be disabled for that buffer; for example:
+  " let b:airline_whitespace_disabled = 1
+<
+-------------------------------------                      *airline-tabline*
+Note: If you're using the ctrlspace tabline only the option marked with (c)
+are supported!
+
+* enable/disable enhanced tabline. (c)
+  let g:airline#extensions#tabline#enabled = 0
+
+* enable/disable displaying open splits per tab (only when tabs are opened). >
+  let g:airline#extensions#tabline#show_splits = 1
+    *
+* switch position of buffers and tabs on splited tabline (c)
+  let g:airline#extensions#tabline#switch_buffers_and_tabs = 0
+
+* enable/disable displaying buffers with a single tab. (c)
+  let g:airline#extensions#tabline#show_buffers = 1
+<
+
+Note: If you are using neovim (has('tablineat') = 1), then you can click
+on the tabline with the left mouse button to switch to that buffer, and
+with the middle mouse button to delete that buffer.
+
+* enable/disable displaying tabs, regardless of number. (c)
+  let g:airline#extensions#tabline#show_tabs = 1
+<
+* configure filename match rules to exclude from the tabline. >
+  let g:airline#extensions#tabline#excludes = []
+
+* enable/disable display preview window buffer in the tabline. >
+  let g:airline#extensions#tabline#exclude_preview = 1
+
+* configure how numbers are displayed in tab mode. >
+  let g:airline#extensions#tabline#tab_nr_type = 0 " # of splits (default)
+  let g:airline#extensions#tabline#tab_nr_type = 1 " tab number
+  let g:airline#extensions#tabline#tab_nr_type = 2 " splits and tab number
+<
+* enable/disable displaying tab number in tabs mode. >
+  let g:airline#extensions#tabline#show_tab_nr = 1
+
+* enable/disable displaying tab type (far right) >
+  let g:airline#extensions#tabline#show_tab_type = 1
+
+  Note: The tab-type will only be displayed in tab-mode,
+  if there are no splits shown. (See: g:airline#extensions#tabline#show_splits)
+
+* rename label for buffers (default: 'buffers') (c)
+  let g:airline#extensions#tabline#buffers_label = 'b'
+
+* rename label for tabs (default: 'tabs') (c)
+  let g:airline#extensions#tabline#tabs_label = 't'
+
+* enable/disable displaying index of the buffer.
+
+  When enabled, numbers will be displayed in the tabline and mappings will be
+  exposed to allow you to select a buffer directly.  Up to 9 mappings will be
+  exposed. >
+
+  let g:airline#extensions#tabline#buffer_idx_mode = 1
+  nmap <leader>1 <Plug>AirlineSelectTab1
+  nmap <leader>2 <Plug>AirlineSelectTab2
+  nmap <leader>3 <Plug>AirlineSelectTab3
+  nmap <leader>4 <Plug>AirlineSelectTab4
+  nmap <leader>5 <Plug>AirlineSelectTab5
+  nmap <leader>6 <Plug>AirlineSelectTab6
+  nmap <leader>7 <Plug>AirlineSelectTab7
+  nmap <leader>8 <Plug>AirlineSelectTab8
+  nmap <leader>9 <Plug>AirlineSelectTab9
+  nmap <leader>- <Plug>AirlineSelectPrevTab
+  nmap <leader>+ <Plug>AirlineSelectNextTab
+
+  Note: Mappings will be ignored within a NERDTree buffer.
+
+  Note: In buffer_idx_mode these mappings won't change the
+  current tab, but switch to the buffer visible in that tab.
+  Use |gt| for switching tabs.
+  In tabmode, those mappings will switch to the specified tab.
+
+* change the display format of the buffer index >
+  let g:airline#extensions#tabline#buffer_idx_format = {
+        \ '0': '0 ',
+        \ '1': '1 ',
+        \ '2': '2 ',
+        \ '3': '3 ',
+        \ '4': '4 ',
+        \ '5': '5 ',
+        \ '6': '6 ',
+        \ '7': '7 ',
+        \ '8': '8 ',
+        \ '9': '9 '
+        \}
+<
+
+* defines the name of a formatter for how buffer names are displayed. (c)
+  let g:airline#extensions#tabline#formatter = 'default'
+
+  " here is how you can define a 'foo' formatter:
+  " create a file in the dir autoload/airline/extensions/tabline/formatters/
+  " called foo.vim
+  function! airline#extensions#tabline#formatters#foo#format(bufnr, buffers)
+    return fnamemodify(bufname(a:bufnr), ':t')
+  endfunction
+  let g:airline#extensions#tabline#formatter = 'foo'
+<
+
+  Note: the following variables are only used by the 'default' formatter.
+  When no disambiguation is needed, both 'unique_tail_improved' and
+  'unique_tail' delegate formatting to 'default', so these variables also
+  control rendering of unique filenames when using these formatters.
+
+    * configure whether buffer numbers should be shown. >
+      let g:airline#extensions#tabline#buffer_nr_show = 0
+<
+    * configure how buffer numbers should be formatted with |printf()|. >
+      let g:airline#extensions#tabline#buffer_nr_format = '%s: '
+<
+    * configure the formatting of filenames (see |filename-modifiers|). >
+      let g:airline#extensions#tabline#fnamemod = ':p:.'
+<
+    * configure collapsing parent directories in buffer name. >
+      let g:airline#extensions#tabline#fnamecollapse = 1
+<
+    * configure truncating non-active buffer names to specified length. >
+      let g:airline#extensions#tabline#fnametruncate = 0
+
+  " The `unique_tail` algorithm will display the tail of the filename, unless
+  " there is another file of the same name, in which it will display it along
+  " with the containing parent directory.
+  let g:airline#extensions#tabline#formatter = 'unique_tail'
+
+  " The `unique_tail_improved` - another algorithm, that will smartly uniquify
+  " buffers names with similar filename, suppressing common parts of paths.
+  let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
+<
+* configure the minimum number of buffers needed to show the tabline. >
+  let g:airline#extensions#tabline#buffer_min_count = 0
+<
+  Note: this setting only applies to a single tab and when `show_buffers` is
+  true.
+
+* configure the minimum number of tabs needed to show the tabline. >
+  let g:airline#extensions#tabline#tab_min_count = 0
+<
+  Note: this setting only applies when `show_buffers` is false.
+
+* configure separators for the tabline only. >
+  let g:airline#extensions#tabline#left_sep = ''
+  let g:airline#extensions#tabline#left_alt_sep = ''
+  let g:airline#extensions#tabline#right_sep = ''
+  let g:airline#extensions#tabline#right_alt_sep = ''
+
+* configure whether close button should be shown: >
+  let g:airline#extensions#tabline#show_close_button = 1
+
+* configure symbol used to represent close button >
+  let g:airline#extensions#tabline#close_symbol = 'X'
+
+* configure pattern to be ignored on BufAdd autocommand >
+  " fixes unneccessary redraw, when e.g. opening Gundo window
+  let airline#extensions#tabline#ignore_bufadd_pat =
+            \ '\c\vgundo|undotree|vimfiler|tagbar|nerd_tree'
+
+Note: Enabling this extension will modify 'showtabline' and 'guioptions'.
+
+* enable Refresh of tabline buffers on |BufAdd| autocommands
+  (set this to one, if you note 'AirlineTablineRefresh', however, this
+   won't update airline on |:badd| commands) >
+  let airline#extensions#tabline#disable_refresh = 0
+
+* preserve windows when closing a buffer from the bufferline (default: 0) >
+
+  let airline#extensions#tabline#middle_click_preserves_windows = 1
+<
+-------------------------------------                     *airline-tmuxline*
+tmuxline <https://github.com/edkolev/tmuxline.vim>
+
+* enable/disable tmuxline integration >
+  let g:airline#extensions#tmuxline#enabled = 0
+<
+* configure which mode colors should be used in tmux statusline >
+  let airline#extensions#tmuxline#color_template = 'normal' (default)
+  let airline#extensions#tmuxline#color_template = 'insert'
+  let airline#extensions#tmuxline#color_template = 'visual'
+  let airline#extensions#tmuxline#color_template = 'replace'
+<
+* if specified, setting this option will trigger writing to the file whenever the
+  airline theme is applied, i.e. when :AirlineTheme is executed and on vim
+  startup >
+  airline#extensions#tmuxline#snapshot_file = "~/.tmux-statusline-colors.conf"
+<
+-------------------------------------                   *airline-promptline*
+promptline <https://github.com/edkolev/promptline.vim>
+
+* configure the path to the snapshot .sh file. Mandatory option. The created
+  file should be sourced by the shell on login >
+  " in .vimrc
+  airline#extensions#promptline#snapshot_file = "~/.shell_prompt.sh"
+
+  " in .bashrc/.zshrc
+  [ -f ~/.shell_prompt.sh ] && source ~/.shell_prompt.sh
+<
+* enable/disable promptline integration >
+  let g:airline#extensions#promptline#enabled = 0
+<
+* configure which mode colors should be used in prompt >
+  let airline#extensions#promptline#color_template = 'normal' (default)
+  let airline#extensions#promptline#color_template = 'insert'
+  let airline#extensions#promptline#color_template = 'visual'
+  let airline#extensions#promptline#color_template = 'replace'
+<
+-------------------------------------                      *airline-nrrwrgn*
+NrrwRgn <https://github.com/chrisbra/NrrwRgn>
+
+* enable/disable NrrwRgn integration >
+  let g:airline#extensions#nrrwrgn#enabled = 1
+
+-------------------------------------                     *airline-capslock*
+vim-capslock <https://github.com/tpope/vim-capslock>
+
+* enable/disable vim-capslock integration >
+  let g:airline#extensions#capslock#enabled = 1
+
+-------------------------------------                   *airline-windowswap*
+vim-windowswap <https://github.com/wesQ3/vim-windowswap>
+
+* enable/disable vim-windowswap integration >
+  let g:airline#extensions#windowswap#enabled = 1
+
+* set marked window indicator string >
+  let g:airline#extensions#windowswap#indicator_text = 'WS'
+<
+-------------------------------------                    *airline-obsession*
+vim-obsession <https://github.com/tpope/vim-obsession>
+
+* enable/disable vim-obsession integration >
+  let g:airline#extensions#obsession#enabled = 1
+
+* set marked window indicator string >
+  let g:airline#extensions#obsession#indicator_text = '$'
+<
+-------------------------------------                        *airline-taboo*
+taboo.vim <https://github.com/gcmt/taboo.vim>
+
+* enable/disable taboo.vim integration >
+  let g:airline#extensions#taboo#enabled = 1
+<
+-------------------------------------                    *airline-ctrlspace*
+vim-ctrlspace <https://github.com/szw/vim-ctrlspace>
+
+* enable/disable vim-ctrlspace integration >
+  let g:airline#extensions#ctrlspace#enabled = 1
+
+  To make the vim-ctrlspace integration work you will need to make the
+  ctrlspace statusline function call the correct airline function. Therefore
+  add the following line into your .vimrc:
+
+  let g:CtrlSpaceStatuslineFunction = "airline#extensions#ctrlspace#statusline()"
+<
+-------------------------------------                    *airline-ycm*
+YouCompleteMe <https://github.com/Valloric/YouCompleteMe>
+
+Shows number of errors and warnings in the current file detected by YCM.
+
+* enable/disable YCM integration >
+  let g:airline#extensions#ycm#enabled = 1
+
+* set error count prefix >
+  let g:airline#extensions#ycm#error_symbol = 'E:'
+
+* set warning count prefix >
+  let g:airline#extensions#ycm#warning_symbol = 'W:'
+<
+-------------------------------------                          *airline-po*
+po.vim <http://www.vim.org/scripts/script.php?script_id=2530>
+
+* enable/disable po integration >
+  let g:airline#extensions#po#enabled = 1
+<
+* truncate width names to a fixed length >
+  let g:airline#extensions#po#displayed_limit = 0
+<
+==============================================================================
+ADVANCED CUSTOMIZATION                      *airline-advanced-customization*
+
+The defaults will accommodate the mass majority of users with minimal
+configuration. However, if you want to reposition sections or contents you can
+do so with built-in helper functions, which makes it possible to create
+sections in a more declarative style.
+
+-------------------------------------                        *airline-parts*
+A part is something that contains metadata that eventually gets rendered into
+the statusline. You can define parts that contain constant strings or
+functions. Defining parts is needed if you want to use features like automatic
+insertion of separators or hiding based on window width.
+
+For example, this is how you would define a part function: >
+  call airline#parts#define_function('foo', 'GetFooText')
+<
+Here is how you would define a part that is visible only if the window width
+greater than a minimum width. >
+  call airline#parts#define_minwidth('foo', 50)
+<
+Parts can be configured to be visible conditionally. >
+  call airline#parts#define_condition('foo', 'getcwd() =~ "work_dir"')
+<
+
+Now add part "foo" to section section airline_section_y: >
+  let g:airline_section_y = airline#section#create_right(['ffenc','foo'])
+<
+Note: Part definitions are combinative; e.g. the two examples above modify the
+same `foo` part.
+
+Note: Look at the source code and tests for the full API.
+
+-------------------------------------             *airline-predefined-parts*
+Before is a list of parts that are predefined by vim-airline.
+
+* `mode`           displays the current mode
+* `iminsert`       displays the current insert method
+* `paste`          displays the paste indicator
+* `crypt`          displays the crypted indicator
+* `spell`          displays the spell indicator
+* `filetype`       displays the file type
+* `readonly`       displays the read only indicator
+* `file`           displays the filename and modified indicator
+* `ffenc`          displays the file format and encoding
+
+And the following are defined for their respective extensions:
+
+`hunks`, `branch`, `tagbar`, `syntastic`, `whitespace`
+
+-------------------------------------                      *airline-accents*
+Accents can be defined on any part, like so: >
+  call airline#parts#define_accent('foo', 'red')
+<
+This will override the colors of that part by using what is defined in that
+particular accent. In the above example, the `red` accent is used, which means
+regardless of which section the part is used in, it will have red foreground
+colors instead of the section's default foreground color.
+
+The following accents are defined by default. Themes can define their variants
+of the colors, but defaults will be provided if missing. >
+  bold, italic, red, green, blue, yellow, orange, purple, none
+<
+The defaults configure the mode and line number parts to be bold, and the
+readonly part to be red.
+
+"none" is special. This can be used, to remove a bold accent from an existing
+theme. For example, usually the mode part of the statusline is usually defined
+to be bold. However, it can be hard to remove an existing bold accent from the
+default configuration. Therefore, you can use the none accent to remove
+existing accents, so if you put >
+    call airline#parts#define_accent('mode', 'none')
+the mode section will be set to non-bold font style.
+
+-------------------------------------                     *airline-sections*
+Once a part is defined, you can use helper functions to generate the
+statuslines for each section. For example, to use the part above, we could
+define a section like this: >
+  function! AirlineInit()
+    let g:airline_section_a = airline#section#create(['mode', ' ', 'foo'])
+    let g:airline_section_b = airline#section#create_left(['ffenc','file'])
+    let g:airline_section_c = airline#section#create(['%{getcwd()}'])
+  endfunction
+  autocmd User AirlineAfterInit call AirlineInit()
+<
+This will create a section with the `mode`, followed by a space, and our `foo`
+part in section `a`. Section `b` will have two parts with a left-side
+separator. And section `c` will contain the current path. You may notice that
+the space and cwd are not defined parts. For convenience, if a part of that
+key does not exist, it will be inserted as is. The unit tests will be a good
+resource for possibilities.
+
+Note: The use of |VimEnter| is important, because most extensions are lazily
+loaded, so we must give them a chance to define their parts before we can use
+them.
+
+Note: The `airline#section#create` function and friends will do its best to
+create a section with the appropriate separators, but it only works for
+function and text parts. Special 'statusline' items like %f or raw/undefined
+parts will not work as it is not possible to inspect their widths/contents
+before rendering to the statusline.
+
+==============================================================================
+FUNCREFS                                                  *airline-funcrefs*
+
+vim-airline internally uses funcrefs to integrate with third party plugins,
+and you can tap into this functionality to extend it for you needs. This is
+the most powerful way to customize the statusline, and sometimes it may be
+easier to go this route than the above methods.
+
+Every section can have two values. The default value is the global `g:`
+variable which is used in the absence of a `w:` value. This makes it very easy
+to override only certain parts of the statusline by only defining window-local
+variables for a subset of all sections.
+
+-------------------------------------                  *add_statusline_func*
+The following is an example of how you can extend vim-airline to support a
+new plugin. >
+  function! MyPlugin(...)
+    if &filetype == 'MyPluginFileType'
+      let w:airline_section_a = 'MyPlugin'
+      let w:airline_section_b = '%f'
+      let w:airline_section_c = '%{MyPlugin#function()}'
+      let g:airline_variable_referenced_in_statusline = 'foo'
+    endif
+  endfunction
+  call airline#add_statusline_func('MyPlugin')
+<
+Notice that only the left side of the statusline is overwritten. This means
+the right side (the line/column numbers, etc) will be intact.
+
+-------------------------------------               *remove_statusline_func*
+You can also remove a function as well, which is useful for when you want a
+temporary override. >
+  call airline#remove_statusline_func('MyPlugin')
+<
+
+==============================================================================
+PIPELINE                                                  *airline-pipeline*
+
+Sometimes you want to do more than just use overrides.  The statusline funcref
+is invoked and passed two arguments.  The first of these arguments is the
+statusline builder.  You can use this to build completely custom statuslines
+to your liking.  Here is an example: >
+>
+  function! MyPlugin(...)
+    " first variable is the statusline builder
+    let builder = a:1
+
+    " WARNING: the API for the builder is not finalized and may change
+    call builder.add_section('Normal', '%f')
+    call builder.add_section('WarningMsg', '%{getcwd()}')
+    call builder.split()
+    call builder.add_section('airline_z', '%p%%')
+
+    " tell the core to use the contents of the builder
+    return 1
+  endfunction
+<
+The above example uses various example highlight groups to demonstrate
+that you can use any combination from the loaded colorscheme. However, if
+you want colors to change between modes, you should use one of the section
+highlight groups, e.g. `airline_a` and `airline_b`.
+
+The second variable is the context, which is a dictionary containing various
+values such as whether the statusline is active or not, and the window number.
+>
+  context = {
+    'winnr': 'the window number for the statusline',
+    'active': 'whether the window is active or not',
+    'bufnr': 'the current buffer for this window',
+  }
+<
+-------------------------------------        *airline-pipeline-return-codes*
+The pipeline accepts various return codes and can be used to determine the
+next action.  The following are the supported codes: >
+   0   the default, continue on with the next funcref
+  -1   do not modify the statusline
+   1   modify the statusline with the current contents of the builder
+<
+Note: Any value other than 0 will halt the pipeline and prevent the next
+funcref from executing.
+
+==============================================================================
+WRITING EXTENSIONS                              *airline-writing-extensions*
+
+For contributions into the plugin, here are the following guidelines:
+
+1.  For simple 'filetype' checks, they can be added directly into the
+`extensions.vim` file.
+
+2.  Pretty much everything else should live as a separate file under the
+`extensions/` directory.
+
+  a.  Inside `extensions.vim`, add a check for some variable or command that
+      is always available (these must be defined in `plugin/`, and _not_
+      `autoload/` of the other plugin).  If it exists, then initialize the
+      extension. This ensures that the extension is loaded if and only if the
+      user has the other plugin installed.  Also, a check to
+      `airline#extensions#foo_plugin#enabled` should be performed to allow the
+      user to disable it.
+
+  b.  Configuration variables for the extension should reside in the
+      extension, e.g. `g:airline#extensions#foo_plugin#bar_variable`.
+
+See the source of |example.vim| for documented code of how to write one.
+Looking at the other extensions is also a good resource.
+
+==============================================================================
+WRITING THEMES                                              *airline-themes*
+
+Themes are written "close to the metal" -- you will need to know some basic
+VimL syntax to write a theme, but if you've written in any programming
+language before it will be easy to pick up.
+
+The |dark.vim| theme fully documents this procedure and will guide you through
+the process.
+
+For other examples, you can visit the official themes repository at
+<https://github.com/vim-airline/vim-airline-themes>.  It also includes
+examples such as |jellybeans.vim| which define colors by extracting highlight
+groups from the underlying colorscheme.
+
+==============================================================================
+TROUBLESHOOTING                                    *airline-troubleshooting*
+
+Q. There are no colors.
+A. You need to set up your terminal correctly.  For more details, see
+   <http://vim.wikia.com/wiki/256_colors_in_vim>.  Alternatively, if you want
+   to bypass the automatic detection of terminal colors, you can force Vim
+   into 256 color mode with this: >
+  set t_Co=256
+<
+Q. The statusline does not appear until I create a split.
+A. This is the default setting of 'laststatus'.  If you want it to appear all
+   the time, add the following to your vimrc: >
+  set laststatus=2
+<
+Q. Powerline symbols are not showing up.
+A. First, you must install patched powerline fonts. Second, you must enable
+   unicode in vim.  >
+  set encoding=utf-8
+<
+Q. There is a pause when leaving insert mode.
+A. Add the following to your vimrc.  >
+  set ttimeoutlen=50
+<
+Q. The colors look a little off for some themes.
+A. Certain themes are derived from the active colorscheme by extracting colors
+   from predefined highlight groups.  These airline themes will look good for
+   their intended matching colorschemes, but will be hit or miss when loaded
+   with other colorschemes.
+
+Q. Themes are missing
+A. Themes have been extracted into the vim-airlines-themes repository. Simply
+   clone https://github.com/vim-airline/vim-airline-themes and everything
+   should work again.
+
+
+Solutions to other common problems can be found in the Wiki:
+<https://github.com/vim-airline/vim-airline/wiki/FAQ>
+
+==============================================================================
+CONTRIBUTIONS                                        *airline-contributions*
+
+Contributions and pull requests are welcome.
+
+==============================================================================
+LICENSE                                                    *airline-license*
+
+MIT License.  Copyright © 2013-2016 Bailey Ling.
+
+ vim:tw=78:ts=8:ft=help:norl:
diff --git a/vim-plugins/bundle/vim-airline/doc/tags b/vim-plugins/bundle/vim-airline/doc/tags
new file mode 100644
index 0000000..4024527
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/doc/tags
@@ -0,0 +1,54 @@
+:AirlineRefresh	airline.txt	/*:AirlineRefresh*
+:AirlineTheme	airline.txt	/*:AirlineTheme*
+:AirlineToggle	airline.txt	/*:AirlineToggle*
+:AirlineToggleWhitespace	airline.txt	/*:AirlineToggleWhitespace*
+add_statusline_func	airline.txt	/*add_statusline_func*
+airline	airline.txt	/*airline*
+airline-accents	airline.txt	/*airline-accents*
+airline-advanced-customization	airline.txt	/*airline-advanced-customization*
+airline-autocommands	airline.txt	/*airline-autocommands*
+airline-branch	airline.txt	/*airline-branch*
+airline-bufferline	airline.txt	/*airline-bufferline*
+airline-capslock	airline.txt	/*airline-capslock*
+airline-commands	airline.txt	/*airline-commands*
+airline-configuration	airline.txt	/*airline-configuration*
+airline-contents	airline.txt	/*airline-contents*
+airline-contributions	airline.txt	/*airline-contributions*
+airline-csv	airline.txt	/*airline-csv*
+airline-ctrlp	airline.txt	/*airline-ctrlp*
+airline-ctrlspace	airline.txt	/*airline-ctrlspace*
+airline-customization	airline.txt	/*airline-customization*
+airline-default	airline.txt	/*airline-default*
+airline-eclim	airline.txt	/*airline-eclim*
+airline-extensions	airline.txt	/*airline-extensions*
+airline-features	airline.txt	/*airline-features*
+airline-funcrefs	airline.txt	/*airline-funcrefs*
+airline-hunks	airline.txt	/*airline-hunks*
+airline-intro	airline.txt	/*airline-intro*
+airline-license	airline.txt	/*airline-license*
+airline-name	airline.txt	/*airline-name*
+airline-nrrwrgn	airline.txt	/*airline-nrrwrgn*
+airline-obsession	airline.txt	/*airline-obsession*
+airline-parts	airline.txt	/*airline-parts*
+airline-pipeline	airline.txt	/*airline-pipeline*
+airline-pipeline-return-codes	airline.txt	/*airline-pipeline-return-codes*
+airline-po	airline.txt	/*airline-po*
+airline-predefined-parts	airline.txt	/*airline-predefined-parts*
+airline-promptline	airline.txt	/*airline-promptline*
+airline-quickfix	airline.txt	/*airline-quickfix*
+airline-sections	airline.txt	/*airline-sections*
+airline-syntastic	airline.txt	/*airline-syntastic*
+airline-tabline	airline.txt	/*airline-tabline*
+airline-taboo	airline.txt	/*airline-taboo*
+airline-tagbar	airline.txt	/*airline-tagbar*
+airline-themes	airline.txt	/*airline-themes*
+airline-tmuxline	airline.txt	/*airline-tmuxline*
+airline-troubleshooting	airline.txt	/*airline-troubleshooting*
+airline-virtualenv	airline.txt	/*airline-virtualenv*
+airline-whitespace	airline.txt	/*airline-whitespace*
+airline-windowswap	airline.txt	/*airline-windowswap*
+airline-wordcount	airline.txt	/*airline-wordcount*
+airline-writing-extensions	airline.txt	/*airline-writing-extensions*
+airline-ycm	airline.txt	/*airline-ycm*
+airline.txt	airline.txt	/*airline.txt*
+remove_statusline_func	airline.txt	/*remove_statusline_func*
diff --git a/vim-plugins/bundle/vim-airline/plugin/airline.vim b/vim-plugins/bundle/vim-airline/plugin/airline.vim
new file mode 100644
index 0000000..0590cf6
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/plugin/airline.vim
@@ -0,0 +1,143 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if &cp || v:version < 702 || (exists('g:loaded_airline') && g:loaded_airline)
+  finish
+endif
+let g:loaded_airline = 1
+
+let s:airline_initialized = 0
+function! s:init()
+  if s:airline_initialized
+    return
+  endif
+  let s:airline_initialized = 1
+
+  call airline#extensions#load()
+  call airline#init#sections()
+
+  let s:theme_in_vimrc = exists('g:airline_theme')
+  if s:theme_in_vimrc
+    try
+      let palette = g:airline#themes#{g:airline_theme}#palette
+    catch
+      echom 'Could not resolve airline theme "' . g:airline_theme . '". Themes have been migrated to github.com/vim-airline/vim-airline-themes.'
+      let g:airline_theme = 'dark'
+    endtry
+    silent call airline#switch_theme(g:airline_theme)
+  else
+    let g:airline_theme = 'dark'
+    silent call s:on_colorscheme_changed()
+  endif
+
+  silent doautocmd User AirlineAfterInit
+endfunction
+
+function! s:on_window_changed()
+  if pumvisible() && (!&previewwindow || g:airline_exclude_preview)
+    return
+  endif
+  " Handle each window only once, since we might come here several times for
+  " different autocommands.
+  let l:key = [bufnr('%'), winnr(), winnr('$'), tabpagenr()]
+  if get(g:, 'airline_last_window_changed', []) == l:key
+        \ && &stl is# '%!airline#statusline('.winnr().')'
+    return
+  endif
+  let g:airline_last_window_changed = l:key
+  call s:init()
+  call airline#update_statusline()
+endfunction
+
+function! s:on_colorscheme_changed()
+  call s:init()
+  let g:airline_gui_mode = airline#init#gui_mode()
+  if !s:theme_in_vimrc
+    call airline#switch_matching_theme()
+  endif
+
+  " couldn't find a match, or theme was defined, just refresh
+  call airline#load_theme()
+endfunction
+
+function! airline#cmdwinenter(...)
+  call airline#extensions#apply_left_override('Command Line', '')
+endfunction
+
+function! s:airline_toggle()
+  if exists("#airline")
+    augroup airline
+      au!
+    augroup END
+    augroup! airline
+
+    if exists("s:stl")
+      let &stl = s:stl
+    endif
+
+    silent doautocmd User AirlineToggledOff
+  else
+    let s:stl = &statusline
+    augroup airline
+      autocmd!
+
+      autocmd CmdwinEnter *
+            \ call airline#add_statusline_func('airline#cmdwinenter')
+            \ | call <sid>on_window_changed()
+      autocmd CmdwinLeave * call airline#remove_statusline_func('airline#cmdwinenter')
+
+      autocmd GUIEnter,ColorScheme * call <sid>on_colorscheme_changed()
+      autocmd SessionLoadPost,VimEnter,WinEnter,BufWinEnter,FileType,BufUnload *
+            \ call <sid>on_window_changed()
+
+      autocmd VimResized * unlet! w:airline_lastmode | :call <sid>airline_refresh()
+      autocmd TabEnter * :unlet! w:airline_lastmode | let w:airline_active=1
+      autocmd BufWritePost */autoload/airline/themes/*.vim
+            \ exec 'source '.split(globpath(&rtp, 'autoload/airline/themes/'.g:airline_theme.'.vim', 1), "\n")[0]
+            \ | call airline#load_theme()
+    augroup END
+
+    if s:airline_initialized
+      call s:on_window_changed()
+    endif
+
+    silent doautocmd User AirlineToggledOn
+  endif
+endfunction
+
+function! s:get_airline_themes(a, l, p)
+  let files = split(globpath(&rtp, 'autoload/airline/themes/'.a:a.'*'), "\n")
+  return map(files, 'fnamemodify(v:val, ":t:r")')
+endfunction
+
+function! s:airline_theme(...)
+  if a:0
+    call airline#switch_theme(a:1)
+  else
+    echo g:airline_theme
+  endif
+endfunction
+
+function! s:airline_refresh()
+  if !exists("#airline")
+    " disabled
+    return
+  endif
+  let nomodeline=''
+  if v:version > 703 || v:version == 703 && has("patch438")
+    let nomodeline = '<nomodeline>'
+  endif
+  exe printf("silent doautocmd %s User AirlineBeforeRefresh", nomodeline)
+  call airline#load_theme()
+  call airline#update_statusline()
+endfunction
+
+command! -bar -nargs=? -complete=customlist,<sid>get_airline_themes AirlineTheme call <sid>airline_theme(<f-args>)
+command! -bar AirlineToggleWhitespace call airline#extensions#whitespace#toggle()
+command! -bar AirlineToggle call s:airline_toggle()
+command! -bar AirlineRefresh call s:airline_refresh()
+
+call airline#init#bootstrap()
+call s:airline_toggle()
diff --git a/vim-plugins/bundle/vim-airline/t/airline.vim b/vim-plugins/bundle/vim-airline/t/airline.vim
new file mode 100644
index 0000000..6e66aec
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/t/airline.vim
@@ -0,0 +1,87 @@
+let g:airline_theme = 'dark'
+
+source plugin/airline.vim
+doautocmd VimEnter
+
+function! MyFuncref(...)
+  call a:1.add_raw('hello world')
+  return 1
+endfunction
+
+function! MyIgnoreFuncref(...)
+  return -1
+endfunction
+
+function! MyAppend1(...)
+  call a:1.add_raw('hello')
+endfunction
+
+function! MyAppend2(...)
+  call a:1.add_raw('world')
+endfunction
+
+describe 'airline'
+  before
+    let g:airline_statusline_funcrefs = []
+  end
+
+  it 'should run user funcrefs first'
+    call airline#add_statusline_func('MyFuncref')
+    let &statusline = ''
+    call airline#update_statusline()
+    Expect airline#statusline(1) =~ 'hello world'
+  end
+
+  it 'should not change the statusline with -1'
+    call airline#add_statusline_funcref(function('MyIgnoreFuncref'))
+    let &statusline = 'foo'
+    call airline#update_statusline()
+    Expect &statusline == 'foo'
+  end
+
+  it 'should support multiple chained funcrefs'
+    call airline#add_statusline_func('MyAppend1')
+    call airline#add_statusline_func('MyAppend2')
+    call airline#update_statusline()
+    Expect airline#statusline(1) =~ 'helloworld'
+  end
+
+  it 'should allow users to redefine sections'
+    let g:airline_section_a = airline#section#create(['mode', 'mode'])
+    call airline#update_statusline()
+    Expect airline#statusline(1) =~ '%{airline#util#wrap(airline#parts#mode(),0)}%#airline_a#%#airline_a_bold#%{airline#util#wrap(airline#parts#mode(),0)}%#airline_a#'
+  end
+
+  it 'should remove funcrefs properly'
+    let c = len(g:airline_statusline_funcrefs)
+    call airline#add_statusline_func('MyIgnoreFuncref')
+    call airline#remove_statusline_func('MyIgnoreFuncref')
+    Expect len(g:airline_statusline_funcrefs) == c
+  end
+
+  it 'should overwrite the statusline with active and inactive splits'
+    wincmd s
+    Expect airline#statusline(1) !~ 'inactive'
+    Expect airline#statusline(2) =~ 'inactive'
+    wincmd c
+  end
+
+  it 'should collapse the inactive split if the variable is set true'
+    let g:airline_inactive_collapse = 1
+    wincmd s
+    Expect getwinvar(2, '&statusline') !~ 'airline#parts#mode'
+    wincmd c
+  end
+
+  it 'should not collapse the inactive split if the variable is set false'
+    let g:airline_inactive_collapse = 0
+    wincmd s
+    Expect getwinvar(2, '&statusline') != 'airline#parts#mode'
+    wincmd c
+  end
+
+  it 'should include check_mode'
+    Expect airline#statusline(1) =~ 'airline#check_mode'
+  end
+end
+
diff --git a/vim-plugins/bundle/vim-airline/t/builder.vim b/vim-plugins/bundle/vim-airline/t/builder.vim
new file mode 100644
index 0000000..57feb14
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/t/builder.vim
@@ -0,0 +1,106 @@
+let g:airline_theme = 'dark'
+call airline#init#bootstrap()
+
+describe 'active builder'
+  before
+    let s:builder = airline#builder#new({'active': 1})
+  end
+
+  it 'should start with an empty statusline'
+    let stl = s:builder.build()
+    Expect stl == ''
+  end
+
+  it 'should transition colors from one to the next'
+    call s:builder.add_section('Normal', 'hello')
+    call s:builder.add_section('Search', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Normal#hello%#Normal_to_Search#>%#Search#world'
+  end
+
+  it 'should reuse highlight group if background colors match'
+    highlight Foo1 ctermfg=1 ctermbg=2
+    highlight Foo2 ctermfg=1 ctermbg=2
+    call s:builder.add_section('Foo1', 'hello')
+    call s:builder.add_section('Foo2', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Foo1#hello>world'
+  end
+
+  it 'should switch highlight groups if foreground colors differ'
+    highlight Foo1 ctermfg=1 ctermbg=2
+    highlight Foo2 ctermfg=2 ctermbg=2
+    call s:builder.add_section('Foo1', 'hello')
+    call s:builder.add_section('Foo2', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Foo1#hello%#Foo1_to_Foo2#>%#Foo2#world'
+  end
+
+  it 'should split left/right sections'
+    call s:builder.split()
+    let stl = s:builder.build()
+    Expect stl =~ '%='
+  end
+
+  it 'after split, sections use the right separator'
+    call s:builder.split()
+    call s:builder.add_section('Normal', 'hello')
+    call s:builder.add_section('Search', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ 'hello%#Normal_to_Search#<%#Search#world'
+  end
+
+  it 'should not repeat the same highlight group'
+    call s:builder.add_section('Normal', 'hello')
+    call s:builder.add_section('Normal', 'hello')
+    let stl = s:builder.build()
+    Expect stl == '%#Normal#hello>hello'
+  end
+
+  it 'should replace accent groups with the specified group'
+    call s:builder.add_section('Normal', '%#__accent_foo#hello')
+    let stl = s:builder.build()
+    Expect stl == '%#Normal#%#Normal_foo#hello'
+  end
+
+  it 'should replace two accent groups with correct groups'
+    call s:builder.add_section('Normal', '%#__accent_foo#hello%#__accent_bar#world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Normal_foo#hello%#Normal_bar#world'
+  end
+
+  it 'should special restore group should go back to previous group'
+    call s:builder.add_section('Normal', '%#__restore__#')
+    let stl = s:builder.build()
+    Expect stl !~ '%#__restore__#'
+    Expect stl =~ '%#Normal#'
+  end
+
+  it 'should blend colors from the left through the split to the right'
+    call s:builder.add_section('Normal', 'hello')
+    call s:builder.split()
+    call s:builder.add_section('Search', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ 'Normal_to_Search'
+  end
+end
+
+describe 'inactive builder'
+  before
+    let s:builder = airline#builder#new({'active': 0})
+  end
+
+  it 'should transition colors from one to the next'
+    call s:builder.add_section('Normal', 'hello')
+    call s:builder.add_section('Search', 'world')
+    let stl = s:builder.build()
+    Expect stl =~ '%#Normal_inactive#hello%#Normal_to_Search_inactive#>%#Search_inactive#world'
+  end
+
+  it 'should not render accents'
+    call s:builder.add_section('Normal', '%#__accent_foo#hello%#foo#foo%#__accent_bar#world')
+    let stl = s:builder.build()
+    Expect stl == '%#Normal_inactive#hello%#foo_inactive#fooworld'
+  end
+end
+
diff --git a/vim-plugins/bundle/vim-airline/t/commands.vim b/vim-plugins/bundle/vim-airline/t/commands.vim
new file mode 100644
index 0000000..0f4bcb6
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/t/commands.vim
@@ -0,0 +1,35 @@
+source plugin/airline.vim
+doautocmd VimEnter
+
+describe 'commands'
+  it 'should toggle off and on'
+    execute 'AirlineToggle'
+    Expect exists('#airline') to_be_false
+    execute 'AirlineToggle'
+    Expect exists('#airline') to_be_true
+  end
+
+  it 'should toggle whitespace off and on'
+    call airline#extensions#load()
+    execute 'AirlineToggleWhitespace'
+    Expect exists('#airline_whitespace') to_be_false
+    execute 'AirlineToggleWhitespace'
+    Expect exists('#airline_whitespace') to_be_true
+  end
+
+  it 'should display theme name with no args'
+    execute 'AirlineTheme simple'
+    Expect g:airline_theme == 'simple'
+    execute 'AirlineTheme dark'
+    Expect g:airline_theme == 'dark'
+    execute 'AirlineTheme doesnotexist'
+    Expect g:airline_theme == 'dark'
+    colors molokai
+    Expect g:airline_theme == 'molokai'
+  end
+
+  it 'should have a refresh command'
+    Expect exists(':AirlineRefresh') to_be_true
+  end
+end
+
diff --git a/vim-plugins/bundle/vim-airline/t/extensions_default.vim b/vim-plugins/bundle/vim-airline/t/extensions_default.vim
new file mode 100644
index 0000000..e60d651
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/t/extensions_default.vim
@@ -0,0 +1,31 @@
+let g:airline#extensions#default#layout = [
+      \ [ 'c', 'a', 'b', 'warning' ],
+      \ [ 'x', 'z', 'y' ]
+      \ ]
+
+source plugin/airline.vim
+doautocmd VimEnter
+
+describe 'default'
+  before
+    let s:builder = airline#builder#new({'active': 1})
+  end
+
+  it 'should use the layout'
+    call airline#extensions#default#apply(s:builder, { 'winnr': 1, 'active': 1 })
+    let stl = s:builder.build()
+    Expect stl =~ 'airline_c_to_airline_a'
+    Expect stl =~ 'airline_a_to_airline_b'
+    Expect stl =~ 'airline_b_to_airline_warning'
+    Expect stl =~ 'airline_x_to_airline_z'
+    Expect stl =~ 'airline_z_to_airline_y'
+  end
+
+  it 'should only render warning section in active splits'
+    wincmd s
+    Expect airline#statusline(1) =~ 'warning'
+    Expect airline#statusline(2) !~ 'warning'
+    wincmd c
+  end
+end
+
diff --git a/vim-plugins/bundle/vim-airline/t/highlighter.vim b/vim-plugins/bundle/vim-airline/t/highlighter.vim
new file mode 100644
index 0000000..a1ed490
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/t/highlighter.vim
@@ -0,0 +1,21 @@
+let g:airline_theme = 'dark'
+
+describe 'highlighter'
+  it 'should create separator highlight groups'
+    hi Foo1 ctermfg=1 ctermbg=2
+    hi Foo2 ctermfg=3 ctermbg=4
+    call airline#highlighter#add_separator('Foo1', 'Foo2', 0)
+    let hl = airline#highlighter#get_highlight('Foo1_to_Foo2')
+    Expect hl == [ '', '', '4', '2', '' ]
+  end
+
+  it 'should populate accent colors'
+    Expect exists('g:airline#themes#dark#palette.normal.airline_c_red') to_be_false
+    Expect hlID('airline_c_red') == 0
+    call airline#themes#patch(g:airline#themes#dark#palette)
+    call airline#highlighter#add_accent('red')
+    call airline#highlighter#highlight(['normal'])
+    Expect hlID('airline_c_red') != 0
+  end
+end
+
diff --git a/vim-plugins/bundle/vim-airline/t/init.vim b/vim-plugins/bundle/vim-airline/t/init.vim
new file mode 100644
index 0000000..acb9f19
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/t/init.vim
@@ -0,0 +1,78 @@
+let s:sections = ['a', 'b', 'c', 'gutter', 'x', 'y', 'z', 'warning']
+
+function! s:clear()
+  for key in s:sections
+    unlet! g:airline_section_{key}
+  endfor
+endfunction
+
+call airline#init#bootstrap()
+
+describe 'init sections'
+  before
+    call s:clear()
+    call airline#init#sections()
+  end
+
+  after
+    call s:clear()
+  end
+
+  it 'section a should have mode, paste, spell, iminsert'
+    Expect g:airline_section_a =~ 'mode'
+    Expect g:airline_section_a =~ 'paste'
+    Expect g:airline_section_a =~ 'spell'
+    Expect g:airline_section_a =~ 'iminsert'
+  end
+
+  it 'section b should be blank because no extensions are installed'
+    Expect g:airline_section_b == ''
+  end
+
+  it 'section c should be file'
+    Expect g:airline_section_c == '%<%f%m %#__accent_red#%{airline#util#wrap(airline#parts#readonly(),0)}%#__restore__#'
+  end
+
+  it 'section x should be filetype'
+    Expect g:airline_section_x == '%{airline#util#wrap(airline#parts#filetype(),0)}'
+  end
+
+  it 'section y should be fenc and ff'
+    Expect g:airline_section_y =~ 'ff'
+    Expect g:airline_section_y =~ 'fenc'
+  end
+
+  it 'section z should be line numbers'
+    Expect g:airline_section_z =~ '%3p%%'
+    Expect g:airline_section_z =~ '%4l'
+    Expect g:airline_section_z =~ '%3v'
+  end
+
+  it 'should not redefine sections already defined'
+    for s in s:sections
+      let g:airline_section_{s} = s
+    endfor
+    call airline#init#bootstrap()
+    for s in s:sections
+      Expect g:airline_section_{s} == s
+    endfor
+  end
+
+  it 'all default statusline extensions should be blank'
+    Expect airline#parts#get('hunks').raw == ''
+    Expect airline#parts#get('branch').raw == ''
+    Expect airline#parts#get('tagbar').raw == ''
+    Expect airline#parts#get('syntastic').raw == ''
+    Expect airline#parts#get('eclim').raw == ''
+    Expect airline#parts#get('whitespace').raw == ''
+  end
+end
+
+describe 'init parts'
+  it 'should not redefine parts already defined'
+    call airline#parts#define_raw('linenr', 'bar')
+    call airline#init#sections()
+    Expect g:airline_section_z =~ 'bar'
+  end
+end
+
diff --git a/vim-plugins/bundle/vim-airline/t/parts.vim b/vim-plugins/bundle/vim-airline/t/parts.vim
new file mode 100644
index 0000000..ee7c92e
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/t/parts.vim
@@ -0,0 +1,39 @@
+describe 'parts'
+  it 'overwrites existing values'
+    call airline#parts#define('foo', { 'test': '123' })
+    Expect airline#parts#get('foo').test == '123'
+    call airline#parts#define('foo', { 'test': '321' })
+    Expect airline#parts#get('foo').test == '321'
+  end
+
+  it 'can define a function part'
+    call airline#parts#define_function('func', 'bar')
+    Expect airline#parts#get('func').function == 'bar'
+  end
+
+  it 'can define a text part'
+    call airline#parts#define_text('text', 'bar')
+    Expect airline#parts#get('text').text == 'bar'
+  end
+
+  it 'can define a raw part'
+    call airline#parts#define_raw('raw', 'bar')
+    Expect airline#parts#get('raw').raw == 'bar'
+  end
+
+  it 'can define a minwidth'
+    call airline#parts#define_minwidth('mw', 123)
+    Expect airline#parts#get('mw').minwidth == 123
+  end
+
+  it 'can define a condition'
+    call airline#parts#define_condition('part', '1')
+    Expect airline#parts#get('part').condition == '1'
+  end
+
+  it 'can define a accent'
+    call airline#parts#define_accent('part', 'red')
+    Expect airline#parts#get('part').accent == 'red'
+  end
+end
+
diff --git a/vim-plugins/bundle/vim-airline/t/section.vim b/vim-plugins/bundle/vim-airline/t/section.vim
new file mode 100644
index 0000000..b6dd8fb
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/t/section.vim
@@ -0,0 +1,81 @@
+function! SectionSpec()
+endfunction
+
+describe 'section'
+  before
+    call airline#parts#define_text('text', 'text')
+    call airline#parts#define_raw('raw', 'raw')
+    call airline#parts#define_function('func', 'SectionSpec')
+  end
+
+  it 'should be able to reference default parts'
+    let s = airline#section#create(['paste'])
+    Expect s == '%{airline#util#wrap(airline#parts#paste(),0)}'
+  end
+
+  it 'should create sections with no separators'
+    let s = airline#section#create(['text', 'raw', 'func'])
+    Expect s == '%{airline#util#wrap("text",0)}raw%{airline#util#wrap(SectionSpec(),0)}'
+  end
+
+  it 'should create left sections with separators'
+    let s = airline#section#create_left(['text', 'text'])
+    Expect s == '%{airline#util#wrap("text",0)}%{airline#util#append("text",0)}'
+  end
+
+  it 'should create right sections with separators'
+    let s = airline#section#create_right(['text', 'text'])
+    Expect s == '%{airline#util#prepend("text",0)}%{airline#util#wrap("text",0)}'
+  end
+
+  it 'should prefix with accent group if provided and restore afterwards'
+    call airline#parts#define('hi', {
+          \ 'raw': 'hello',
+          \ 'accent': 'red',
+          \ })
+    let s = airline#section#create(['hi'])
+    Expect s == '%#__accent_red#hello%#__restore__#'
+  end
+
+  it 'should accent functions'
+    call airline#parts#define_function('hi', 'Hello')
+    call airline#parts#define_accent('hi', 'bold')
+    let s = airline#section#create(['hi'])
+    Expect s == '%#__accent_bold#%{airline#util#wrap(Hello(),0)}%#__restore__#'
+  end
+
+  it 'should parse out a section from the distro'
+    call airline#extensions#load()
+    let s = airline#section#create(['whitespace'])
+    Expect s =~ 'airline#extensions#whitespace#check'
+  end
+
+  it 'should use parts as is if they are not found'
+    let s = airline#section#create(['asdf', 'func'])
+    Expect s == 'asdf%{airline#util#wrap(SectionSpec(),0)}'
+  end
+
+  it 'should force add separators for raw and missing keys'
+    let s = airline#section#create_left(['asdf', 'raw'])
+    Expect s == 'asdf > raw'
+    let s = airline#section#create_left(['asdf', 'aaaa', 'raw'])
+    Expect s == 'asdf > aaaa > raw'
+    let s = airline#section#create_right(['raw', '%f'])
+    Expect s == 'raw < %f'
+    let s = airline#section#create_right(['%t', 'asdf', '%{getcwd()}'])
+    Expect s == '%t < asdf < %{getcwd()}'
+  end
+
+  it 'should empty out parts that do not pass their condition'
+    call airline#parts#define_text('conditional', 'conditional')
+    call airline#parts#define_condition('conditional', '0')
+    let s = airline#section#create(['conditional'])
+    Expect s == '%{0 ? airline#util#wrap("conditional",0) : ""}'
+  end
+
+  it 'should not draw two separators after another'
+    let s = airline#section#create_right(['ffenc','%{strftime("%H:%M")}'])
+    Expect s == '%{airline#util#prepend(airline#parts#ffenc(),0)}%{strftime("%H:%M")}'
+  end
+end
+
diff --git a/vim-plugins/bundle/vim-airline/t/themes.vim b/vim-plugins/bundle/vim-airline/t/themes.vim
new file mode 100644
index 0000000..5a13993
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/t/themes.vim
@@ -0,0 +1,68 @@
+describe 'themes'
+  after
+    highlight clear Foo
+    highlight clear Normal
+  end
+
+  it 'should extract correct colors'
+    highlight Foo ctermfg=1 ctermbg=2
+    let colors = airline#themes#get_highlight('Foo')
+    Expect colors[2] == '1'
+    Expect colors[3] == '2'
+  end
+
+  it 'should extract from normal if colors unavailable'
+    highlight Normal ctermfg=100 ctermbg=200
+    highlight Foo ctermbg=2
+    let colors = airline#themes#get_highlight('Foo')
+    Expect colors[2] == '100'
+    Expect colors[3] == '2'
+  end
+
+  it 'should flip target group if it is reversed'
+    highlight Foo ctermbg=222 ctermfg=103 term=reverse
+    let colors = airline#themes#get_highlight('Foo')
+    Expect colors[2] == '222'
+    Expect colors[3] == '103'
+  end
+
+  it 'should pass args through correctly'
+    let hl = airline#themes#get_highlight('Foo', 'bold', 'italic')
+    Expect hl == ['', '', 'NONE', 'NONE', 'bold,italic']
+
+    let hl = airline#themes#get_highlight2(['Foo','bg'], ['Foo','fg'], 'italic', 'bold')
+    Expect hl == ['', '', 'NONE', 'NONE', 'italic,bold']
+  end
+
+  it 'should generate color map with mirroring'
+    let map = airline#themes#generate_color_map(
+          \ [ 1, 1, 1, 1, '1' ],
+          \ [ 2, 2, 2, 2, '2' ],
+          \ [ 3, 3, 3, 3, '3' ],
+          \ )
+    Expect map.airline_a[0] == 1
+    Expect map.airline_b[0] == 2
+    Expect map.airline_c[0] == 3
+    Expect map.airline_x[0] == 3
+    Expect map.airline_y[0] == 2
+    Expect map.airline_z[0] == 1
+  end
+
+  it 'should generate color map with full set of colors'
+    let map = airline#themes#generate_color_map(
+          \ [ 1, 1, 1, 1, '1' ],
+          \ [ 2, 2, 2, 2, '2' ],
+          \ [ 3, 3, 3, 3, '3' ],
+          \ [ 4, 4, 4, 4, '4' ],
+          \ [ 5, 5, 5, 5, '5' ],
+          \ [ 6, 6, 6, 6, '6' ],
+          \ )
+    Expect map.airline_a[0] == 1
+    Expect map.airline_b[0] == 2
+    Expect map.airline_c[0] == 3
+    Expect map.airline_x[0] == 4
+    Expect map.airline_y[0] == 5
+    Expect map.airline_z[0] == 6
+  end
+end
+
diff --git a/vim-plugins/bundle/vim-airline/t/util.vim b/vim-plugins/bundle/vim-airline/t/util.vim
new file mode 100644
index 0000000..913de9d
--- /dev/null
+++ b/vim-plugins/bundle/vim-airline/t/util.vim
@@ -0,0 +1,54 @@
+call airline#init#bootstrap()
+
+function! Util1()
+  let g:count += 1
+endfunction
+function! Util2()
+  let g:count += 2
+endfunction
+function! Util3(...)
+  let g:count = a:0
+endfunction
+
+describe 'util'
+  before
+    let g:count = 0
+  end
+
+  it 'has append wrapper function'
+    Expect airline#util#append('', 0) == ''
+    Expect airline#util#append('1', 0) == '  > 1'
+  end
+
+  it 'has prepend wrapper function'
+    Expect airline#util#prepend('', 0) == ''
+    Expect airline#util#prepend('1', 0) == '1 < '
+  end
+
+  it 'has getwinvar function'
+    Expect airline#util#getwinvar(1, 'asdf', '123') == '123'
+    call setwinvar(1, 'vspec', 'is cool')
+    Expect airline#util#getwinvar(1, 'vspec', '') == 'is cool'
+  end
+
+  it 'has exec funcrefs helper functions'
+    call airline#util#exec_funcrefs([function('Util1'), function('Util2')])
+    Expect g:count == 3
+
+    call airline#util#exec_funcrefs([function('Util3')], 1, 2, 3, 4)
+    Expect g:count == 4
+  end
+
+  it 'should ignore minwidth if less than 0'
+    Expect airline#util#append('foo', -1) == '  > foo'
+    Expect airline#util#prepend('foo', -1) == 'foo < '
+    Expect airline#util#wrap('foo', -1) == 'foo'
+  end
+
+  it 'should return empty if winwidth() > minwidth'
+    Expect airline#util#append('foo', 99999) == ''
+    Expect airline#util#prepend('foo', 99999) == ''
+    Expect airline#util#wrap('foo', 99999) == ''
+  end
+end
+
diff --git a/vim-plugins/bundle/vim-commentary/CONTRIBUTING.markdown b/vim-plugins/bundle/vim-commentary/CONTRIBUTING.markdown
new file mode 100644
index 0000000..b3f0095
--- /dev/null
+++ b/vim-plugins/bundle/vim-commentary/CONTRIBUTING.markdown
@@ -0,0 +1 @@
+See the [contribution guidelines for pathogen.vim](https://github.com/tpope/vim-pathogen/blob/master/CONTRIBUTING.markdown).
diff --git a/vim-plugins/bundle/vim-commentary/README.markdown b/vim-plugins/bundle/vim-commentary/README.markdown
new file mode 100644
index 0000000..5387ba6
--- /dev/null
+++ b/vim-plugins/bundle/vim-commentary/README.markdown
@@ -0,0 +1,51 @@
+# commentary.vim
+
+Comment stuff out.  Use `gcc` to comment out a line (takes a count),
+`gc` to comment out the target of a motion (for example, `gcap` to
+comment out a paragraph), `gc` in visual mode to comment out the selection,
+and `gc` in operator pending mode to target a comment.  You can also use
+it as a command, either with a range like `:7,17Commentary`, or as part of a
+`:global` invocation like with `:g/TODO/Commentary`. That's it.
+
+I wrote this because 5 years after Vim added support for mapping an
+operator, I still couldn't find a commenting plugin that leveraged that
+feature (I overlooked
+[tcomment.vim](https://github.com/tomtom/tcomment_vim)).  Striving for
+minimalism, it weighs in at under 100 lines of code.
+
+Oh, and it uncomments, too.  The above maps actually toggle, and `gcgc`
+uncomments a set of adjacent commented lines.
+
+## Installation
+
+If you don't have a preferred installation method, I recommend
+installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and
+then simply copy and paste:
+
+    cd ~/.vim/bundle
+    git clone git://github.com/tpope/vim-commentary.git
+
+Once help tags have been generated, you can view the manual with
+`:help commentary`.
+
+## FAQ
+
+> My favorite file type isn't supported!
+
+Relax!  You just have to adjust `'commentstring'`:
+
+    autocmd FileType apache setlocal commentstring=#\ %s
+
+## Self-Promotion
+
+Like commentary.vim? Follow the repository on
+[GitHub](https://github.com/tpope/vim-commentary) and vote for it on
+[vim.org](http://www.vim.org/scripts/script.php?script_id=3695).  And if
+you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
+[Twitter](http://twitter.com/tpope) and
+[GitHub](https://github.com/tpope).
+
+## License
+
+Copyright (c) Tim Pope.  Distributed under the same terms as Vim itself.
+See `:help license`.
diff --git a/vim-plugins/bundle/vim-commentary/doc/commentary.txt b/vim-plugins/bundle/vim-commentary/doc/commentary.txt
new file mode 100644
index 0000000..b048569
--- /dev/null
+++ b/vim-plugins/bundle/vim-commentary/doc/commentary.txt
@@ -0,0 +1,32 @@
+*commentary.txt*  Comment stuff out
+
+Author:  Tim Pope <http://tpo.pe/>
+License: Same terms as Vim itself (see |license|)
+
+Comment stuff out.  Then uncomment it later.  Relies on 'commentstring' to be
+correctly set, or uses b:commentary_format if it is set.
+
+                                                *gc*
+gc{motion}              Comment or uncomment lines that {motion} moves over.
+
+                                                *gcc*
+gcc                     Comment or uncomment [count] lines.
+
+                                                *v_gc*
+{Visual}gc              Comment or uncomment the highlighted lines.
+
+                                                *o_gc*
+gc                      Text object for a comment (operator pending mode
+                        only.)
+
+                                                *gcgc* *gcu*
+gcgc                    Uncomment the current and adjacent commented lines.
+gcu
+
+                                                *:Commentary*
+:[range]Commentary      Comment or uncomment [range] lines
+
+The |User| CommentaryPost autocommand fires after a successful operation and
+can be used for advanced customization.
+
+ vim:tw=78:et:ft=help:norl:
diff --git a/vim-plugins/bundle/vim-commentary/doc/tags b/vim-plugins/bundle/vim-commentary/doc/tags
new file mode 100644
index 0000000..97559d8
--- /dev/null
+++ b/vim-plugins/bundle/vim-commentary/doc/tags
@@ -0,0 +1,8 @@
+:Commentary	commentary.txt	/*:Commentary*
+commentary.txt	commentary.txt	/*commentary.txt*
+gc	commentary.txt	/*gc*
+gcc	commentary.txt	/*gcc*
+gcgc	commentary.txt	/*gcgc*
+gcu	commentary.txt	/*gcu*
+o_gc	commentary.txt	/*o_gc*
+v_gc	commentary.txt	/*v_gc*
diff --git a/vim-plugins/bundle/vim-commentary/plugin/commentary.vim b/vim-plugins/bundle/vim-commentary/plugin/commentary.vim
new file mode 100644
index 0000000..0bef7cc
--- /dev/null
+++ b/vim-plugins/bundle/vim-commentary/plugin/commentary.vim
@@ -0,0 +1,103 @@
+" commentary.vim - Comment stuff out
+" Maintainer:   Tim Pope <http://tpo.pe/>
+" Version:      1.3
+" GetLatestVimScripts: 3695 1 :AutoInstall: commentary.vim
+
+if exists("g:loaded_commentary") || &cp || v:version < 700
+  finish
+endif
+let g:loaded_commentary = 1
+
+function! s:surroundings() abort
+  return split(get(b:, 'commentary_format', substitute(substitute(
+        \ &commentstring, '\S\zs%s',' %s','') ,'%s\ze\S', '%s ', '')), '%s', 1)
+endfunction
+
+function! s:strip_white_space(l,r,line) abort
+  let [l, r] = [a:l, a:r]
+  if stridx(a:line,l) == -1 && stridx(a:line,l[0:-2]) == 0 && a:line[strlen(a:line)-strlen(r[1:]):-1] == r[1:]
+    return [l[0:-2], r[1:]]
+  endif
+  return [l, r]
+endfunction
+
+function! s:go(type,...) abort
+  if a:0
+    let [lnum1, lnum2] = [a:type, a:1]
+  else
+    let [lnum1, lnum2] = [line("'["), line("']")]
+  endif
+
+  let [l_, r_] = s:surroundings()
+  let uncomment = 2
+  for lnum in range(lnum1,lnum2)
+    let line = matchstr(getline(lnum),'\S.*\s\@<!')
+    let [l, r] = s:strip_white_space(l_,r_,line)
+    if line != '' && (stridx(line,l) || line[strlen(line)-strlen(r) : -1] != r)
+      let uncomment = 0
+    endif
+  endfor
+
+  for lnum in range(lnum1,lnum2)
+    let line = getline(lnum)
+    if strlen(r) > 2 && l.r !~# '\\'
+      let line = substitute(line,
+            \'\M'.r[0:-2].'\zs\d\*\ze'.r[-1:-1].'\|'.l[0].'\zs\d\*\ze'.l[1:-1],
+            \'\=substitute(submatch(0)+1-uncomment,"^0$\\|^-\\d*$","","")','g')
+    endif
+    if uncomment
+      let line = substitute(line,'\S.*\s\@<!','\=submatch(0)[strlen(l):-strlen(r)-1]','')
+    else
+      let line = substitute(line,'^\%('.matchstr(getline(lnum1),'^\s*').'\|\s*\)\zs.*\S\@<=','\=l.submatch(0).r','')
+    endif
+    call setline(lnum,line)
+  endfor
+  let modelines = &modelines
+  try
+    set modelines=0
+    silent doautocmd User CommentaryPost
+  finally
+    let &modelines = modelines
+  endtry
+endfunction
+
+function! s:textobject(inner) abort
+  let [l_, r_] = s:surroundings()
+  let [l, r] = [l_, r_]
+  let lnums = [line('.')+1, line('.')-2]
+  for [index, dir, bound, line] in [[0, -1, 1, ''], [1, 1, line('$'), '']]
+    while lnums[index] != bound && line ==# '' || !(stridx(line,l) || line[strlen(line)-strlen(r) : -1] != r)
+      let lnums[index] += dir
+      let line = matchstr(getline(lnums[index]+dir),'\S.*\s\@<!')
+      let [l, r] = s:strip_white_space(l_,r_,line)
+    endwhile
+  endfor
+  while (a:inner || lnums[1] != line('$')) && empty(getline(lnums[0]))
+    let lnums[0] += 1
+  endwhile
+  while a:inner && empty(getline(lnums[1]))
+    let lnums[1] -= 1
+  endwhile
+  if lnums[0] <= lnums[1]
+    execute 'normal! 'lnums[0].'GV'.lnums[1].'G'
+  endif
+endfunction
+
+xnoremap <silent> <Plug>Commentary     :<C-U>call <SID>go(line("'<"),line("'>"))<CR>
+nnoremap <silent> <Plug>Commentary     :<C-U>set opfunc=<SID>go<CR>g@
+nnoremap <silent> <Plug>CommentaryLine :<C-U>set opfunc=<SID>go<Bar>exe 'norm! 'v:count1.'g@_'<CR>
+onoremap <silent> <Plug>Commentary        :<C-U>call <SID>textobject(0)<CR>
+nnoremap <silent> <Plug>ChangeCommentary c:<C-U>call <SID>textobject(1)<CR>
+nmap <silent> <Plug>CommentaryUndo <Plug>Commentary<Plug>Commentary
+command! -range -bar Commentary call s:go(<line1>,<line2>)
+
+if !hasmapto('<Plug>Commentary') || maparg('gc','n') ==# ''
+  xmap gc  <Plug>Commentary
+  nmap gc  <Plug>Commentary
+  omap gc  <Plug>Commentary
+  nmap gcc <Plug>CommentaryLine
+  nmap cgc <Plug>ChangeCommentary
+  nmap gcu <Plug>Commentary<Plug>Commentary
+endif
+
+" vim:set et sw=2:
diff --git a/vim-plugins/bundle/vim-htmldjango_omnicomplete/CHANGELOG b/vim-plugins/bundle/vim-htmldjango_omnicomplete/CHANGELOG
new file mode 100644
index 0000000..e93497b
--- /dev/null
+++ b/vim-plugins/bundle/vim-htmldjango_omnicomplete/CHANGELOG
@@ -0,0 +1,27 @@
+v0.5.1 Mon 23 Apr 2012
+    - compatability fixes for older django versions
+    - fix some edge cases in tag detection
+
+v0.6 - html omni support / better matching 
+
+v0.7 Thu Apr 26 2012
+    -url matching
+    -inline {% import %} support
+
+v0.8 Sun 13 May 2012
+    - {% block %} name complete
+
+v0.8.1 Sun 25 Nov 2012
+   - warning suppression on imports
+
+v0.9.1 Tue 27 Nov 2012
+   - {% static %}
+
+v0.9.2 Wed 06 May 2014
+    - TEMPLATE_DIRS bugfix
+    
+v0.9.3 Tue 06 Jan 2015
+    - Django 1.7 support
+
+v0.9.4 Fri 29 May 2015
+    - Django 1.7 support
diff --git a/vim-plugins/bundle/vim-htmldjango_omnicomplete/README.md b/vim-plugins/bundle/vim-htmldjango_omnicomplete/README.md
new file mode 100644
index 0000000..d276292
--- /dev/null
+++ b/vim-plugins/bundle/vim-htmldjango_omnicomplete/README.md
@@ -0,0 +1,130 @@
+#Vim htmldjango autocomplete
+
+[![Join the chat at https://gitter.im/mjbrownie/vim-htmldjango_omnicomplete](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mjbrownie/vim-htmldjango_omnicomplete?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+An omnicomplete tailored to django templates "tags/variables/filters/templates"
+
+Repo: git://github.com/mjbrownie/vim-htmldjango_omnicomplete.git
+
+##Screenshots:
+
+![](https://raw.githubusercontent.com/mjbrownie/media/master/django_completeme.gif)
+( Note the screenshot is from the youcompleteme rewrite found here https://github.com/mjbrownie/django_completeme).
+This plugin is standalone and functionally identical except for the fuzzy ycm completion options. See notes at the bottom.
+
+##Eg.
+
+    1. Filters
+
+        {{ somevar|a<c-x><c-o>}} should complete 'add' , 'addslashes'
+
+    2. Tags
+
+        {% cy<c-x><x-o> %} should complete 'cycle'
+
+    3. Load statements
+
+        It also should grab any libs you have {% load tag_lib %} in the file.
+        Although it needs them in INSTALLED_APPS.
+
+        {% load <c-x><c-o> %} will complete libraries (eg. 'cache', 'humanize')
+
+    4. template filenames
+
+        {% extends '<c-x><c-o>' %} will list base.html ... etc
+
+    5. url complete
+
+        {% url <c-x><c-o> %} should complete views and named urls
+
+    6. super block complete
+
+        eg {% block c<c-x><c-o> %} to complete 'content' or something defined
+        in an extended template.
+
+    7. static files complete
+
+        eg {% static "r<c-x><c-o>" %}
+
+        <script src="{% static "<c-x><c-o>" %}" /> - completes js files in static
+        <style src="{% static "<c-x><c-o>" %}" /> - completes css files in static
+        <img src="{% static "<c-x><c-o>" %}" /> - completes img files in static
+
+    8. optional variable name completion (placeholder)
+
+        {{ s<c-x><x-o> }}
+
+        will complete any maps defined in the python htmldjango_opts['variable']
+        dict list. See below for info.
+
+
+    Where possible info panels show the functions __doc__. Most of the
+    internal ones are decent.
+
+##Requires:
+
+    +python
+
+##SETUP
+
+    1. I like pathogen/Vundle clone into ~/.vim/bundle directory.
+
+        Alternately just stick the vim file in your ~/.vim/autoload/ dir.
+
+    2. in .vimrc set the omnifunc Eg.
+
+        au FileType htmldjango set omnifunc=htmldjangocomplete#CompleteDjango
+
+    3. Optional: At the moment you need to force a html flavour for htmlcompletion
+
+        in .vimrc
+
+        let g:htmldjangocomplete_html_flavour = 'html401s'
+
+        :verbose function htmlcomplete#CheckDoctype for DocType details
+
+        Choices:
+            'html401t' 'xhtml10s' 'html32' 'html40t' 'html40f' 'html40s'
+            'html401t' 'html401f' 'html401s' 'xhtml10t' 'xhtml10f' 'xhtml10s'
+            'xhtml11'
+
+            'html5' if you have html5.vim
+
+    4. matchpair notes
+
+        This plugin uses matchpair and needs to be inside a closed django tag. 
+        This is fine if you are using snipmate. Also you might want auto
+        closing maps such as follows.
+
+        au FileType htmldjango inoremap {% {% %}<left><left><left>
+        au FileType htmldjango inoremap {{ {{ }}<left><left><left>
+
+##TESTING
+
+    django needs to be in sys.path along with DJANGO_SETTINGS_MODULE in your
+    environment.
+
+    To test...
+
+    :python import django
+
+    should not result in an error
+
+    :python from django.conf import settings; print settings.INSTALLED_APPS
+    :python from django.conf import settings; print settings.TEMPLATE_DIRS
+
+    should show the apps template dirs you need
+
+    I've only tested this on a mac with vim 7.3 and django 1.4
+
+##NOTES
+
+    Note I have started rewriting an editior agnostic version of this plugin.
+
+    https://github.com/mjbrownie/django_completeme
+
+    It can be used with my fork of the youcompleteme daemon.
+
+    https://github.com/mjbrownie/ycmd
+
+    but it is still pre alpha.
diff --git a/vim-plugins/bundle/vim-htmldjango_omnicomplete/autoload/htmldjangocomplete.vim b/vim-plugins/bundle/vim-htmldjango_omnicomplete/autoload/htmldjangocomplete.vim
new file mode 100644
index 0000000..4a403bb
--- /dev/null
+++ b/vim-plugins/bundle/vim-htmldjango_omnicomplete/autoload/htmldjangocomplete.vim
@@ -0,0 +1,504 @@
+" Vim completion script
+" Language: htmldjango
+" Maintainer:   Michael Brown
+" Last Change:  Sun 13 May 2012 16:39:45 EST
+" Version: 0.9.2
+" Omnicomplete for django template taga/variables/filters
+" {{{1 Environment Settings
+if !exists('g:htmldjangocomplete_html_flavour')
+    " :verbose function htmlcomplete#CheckDoctype for details
+    " No html5!
+    "'html401t' 'xhtml10s' 'html32' 'html40t' 'html40f' 'html40s'
+    "'html401t' 'html401f' 'html401s' 'xhtml10t' 'xhtml10f' 'xhtml10s'
+    "'xhtml11'
+    let g:htmldjangocomplete_html_flavour = 'xhtml11'
+endif
+
+"Allow settings of DEBUG
+if !exists('g:htmldjangocomplete_debug')
+    let g:htmldjangocomplete_debug = 0
+endif
+
+"{{{1 The actual omnifunc
+function! htmldjangocomplete#CompleteDjango(findstart, base)
+    "{{{2 findstart = 1 when we need to get the text length
+    "
+    if a:findstart == 1
+
+        "Fallback to htmlcomplete
+        if searchpair('{{','','}}','nc') == 0 && searchpair('{%',"",'%}','nc') == 0
+            if !exists('b:html_doctype')
+                let b:html_doctype = 1
+                let b:html_omni_flavor = g:htmldjangocomplete_html_flavour
+            endif
+            return htmlcomplete#CompleteTags(a:findstart,a:base)
+        endif
+
+        " locate the start of the word
+        let line = getline('.')
+        let start = col('.') - 1
+        "special case for {% extends %} {% import %} needs to grab /'s
+        "TODO make this match more flexible. It needs to know its in a string
+        "also need to handle inline imports
+        if s:get_context() == 'extends'|| s:get_context() == 'include'
+            while start > 0 && line[start - 1] != '"' && line[start -1] != "'"
+                        \ && line[start -1] != ' '
+            let start -= 1
+            endwhile
+            return start
+        endif
+        "
+        "default <word> case
+        while start > 0 && line[start - 1] =~ '\a'
+          let start -= 1
+        endwhile
+        return start
+    "{{{2 findstart = 0 when we need to return the list of completions
+    else
+        "Fallback to htmlcomplete
+        if searchpair('{{','','}}','nc') == 0 && searchpair('{%',"",'%}','nc') == 0
+            let matches = htmlcomplete#CompleteTags(a:findstart,a:base)
+            "suppress all DOCTYPE matches
+            call filter(matches, 'stridx(v:val["word"],"DOCTYPE") == -1')
+            return matches
+        endif
+
+        let context = s:get_context()
+
+        if context == 'extends' || context == 'include'
+            let context = 'template'
+        endif
+
+        "TODO: Reduce load always nature of this plugin
+        call s:load_libs()
+        "get context look for {% {{ and |
+        let line = getline('.')
+        let start = col('.') -1
+
+        " Special case for extends and import
+        " TODO 'filter' should really just be string filters
+        if index(['template','load','url','filter','block', 'static'],context) != -1
+            execute "python htmldjangocomplete('" . context . "', '" . a:base . "')"
+            return g:htmldjangocomplete_completions
+        endif
+
+        while start > 0
+            if line[start] == ':' && s:in_django(line,start) == 1
+                execute "python htmldjangocomplete('variable', '" . a:base . "')"
+                return g:htmldjangocomplete_completions
+            elseif line[start] == '|' && s:in_django(line,start)
+                execute "python htmldjangocomplete('filter', '" . a:base . "')"
+                return g:htmldjangocomplete_completions
+            elseif line[start] == '{' && line[start -1] == '{'
+                execute "python htmldjangocomplete('variable', '" . a:base . "')"
+                return g:htmldjangocomplete_completions
+            elseif line[start] == '%' && line[start -1] == '{'
+                execute "python htmldjangocomplete('tag', '" . a:base . "')"
+                return g:htmldjangocomplete_completions
+            else
+                let start -= 1
+            endif
+        endwhile
+
+        return [ {'word': "nomatch"} ]
+        "fallback to htmlcomplete TODO This doesn't work as expected.
+        "Might need to turn off some doctype setting.
+        "
+        "call htmlcomplete#CompleteTags(1, a:base)
+        "return htmlcomplete#CompleteTags(0, a:base)
+    endif
+endfunction
+
+"Supporting vim functions {{{1
+function! s:get_context()
+    let curpos = getpos('.')
+    let line = getline('.')
+
+    "tags
+    let starttag = searchpairpos('{%', '', '%}', 'bn')
+    if starttag != [0,0]
+        let fragment = line[starttag[1]:curpos[2]]
+        return split(fragment,' ')[1]
+    endif
+
+    return "other"
+endfunction
+
+"TODO This could probably be neater with an index check. need to get strings
+"working
+function! s:in_django(l,s)
+    let line = a:l
+    let start = a:s
+    while start >= 0
+        if line[start] == '}'
+            return 0
+        elseif line[start] == '{'
+            return 1
+        endif
+        let start -= 1
+    endwhile
+    return 0
+endfunction
+
+"Python section {{{1
+"imports {{{2
+let g:htmldjangocomplete_completions = []
+function! s:load_libs()
+if has('python')
+python << EOF
+try:
+    HTMLDJANGO_DEBUG = vim.eval("g:htmldjangocomplete_debug") == 0 and True or False
+except:
+    HTMLDJANGO_DEBUG = False
+
+TEMPLATE_EXTS = ['.html','.txt','.htm']
+
+import warnings
+warnings.sys.warnoptions = ['-W']
+
+import logging
+import vim
+import os
+
+# Install the django-configurations importer (before Django setup).
+if os.environ.get('DJANGO_CONFIGURATION'):
+    try:
+        import configurations.importer
+        configurations.importer.install()
+    except:
+        sys.exit()
+
+# Setup Django (required for >= 1.7).
+import django
+if hasattr(django, 'setup'):
+    django.setup()
+
+try:
+    #for OLD versions od django
+    from django.template import get_library
+except:
+    #for django 1.8+
+    try:
+        from django.template.base import get_library
+    except:
+        #for django 1.9+
+        from django.template.backends.django import get_installed_libraries
+        def get_library(libname):
+            return get_installed_libraries()[libname]
+
+
+from django.template.loaders import filesystem, app_directories
+#Later versions of django seem to be fussy about get_library paths.
+try:
+    from django.template import import_library
+except ImportError:
+    try:
+        from django.template.base import import_library
+    except ImportError:
+        import_library = get_library
+
+
+try:
+    from django.template.loaders.app_directories import app_template_dirs
+except:
+    from django.template.loaders.app_directories import get_app_template_dirs
+    app_template_dirs = get_app_template_dirs('templates')
+
+from django.conf import settings as mysettings
+from django.template.loader import get_template
+from django.template.loader_tags import ExtendsNode, BlockNode
+from django.template import Template
+
+import re
+from operator import itemgetter
+import pkgutil
+import os
+from glob import glob
+
+try:
+    from django.template import get_templatetags_modules
+except ImportError:
+    #I've lifted this version from the django source
+    try:
+        from importlib import import_module
+    except ImportError:
+        from django.utils.importlib import import_module
+
+    def get_templatetags_modules():
+        """
+        Return the list of all available template tag modules.
+
+        Caches the result for faster access.
+        """
+        _templatetags_modules = []
+        # Populate list once per process. Mutate the local list first, and
+        # then assign it to the global name to ensure there are no cases where
+        # two threads try to populate it simultaneously.
+        for app_module in ['django'] + list(mysettings.INSTALLED_APPS):
+            try:
+                templatetag_module = '%s.templatetags' % app_module
+                import_module(templatetag_module)
+                _templatetags_modules.append(templatetag_module)
+            except ImportError:
+                continue
+        return _templatetags_modules
+
+# {{{2 Support functions
+
+def get_block_tags(start=''):
+
+    #use regexp for extends as get_template will fail on tag errors
+    rexp = re.compile('{%\s*extends\s*[\'"](.*)["\']\s*%}')
+    base = None
+    templates = [] # for cycle detection
+
+    for l in vim.current.buffer[0:10]:
+        match = rexp.match(l)
+        if match:
+            try:
+                base = get_template(match.groups()[0])
+            except:
+                return []
+
+    if not base:
+        return []
+
+    def _get_blocks(tpl, menu_prefix='', add_name = True):
+        """
+        recursive worker function
+        """
+
+        # TODO I Think this is a 1.8 compatibility thing sending the wrapper
+        # class
+        tpl = getattr(tpl, 'name', None) and tpl or tpl.template
+
+        if tpl.name in templates and isinstance(tpl, Template):
+            logging.info("cyclic extends detected!")
+            return []
+        else:
+            templates.append(tpl.name)
+
+        if menu_prefix == '' and isinstance(tpl, Template):
+            menu_prefix = "%s > " % tpl.name
+
+        blocks = [(block, block.name, menu_prefix)
+                    for block in tpl.nodelist if isinstance(block, BlockNode)]
+
+        for block, name, _ in blocks:
+            if add_name:
+                blocks += _get_blocks(block, '%s%s > ' % (menu_prefix, name))
+            else:
+                blocks += _get_blocks(block, '%s' % (menu_prefix))
+
+        if len(tpl.nodelist) > 0 and isinstance(tpl.nodelist[0], ExtendsNode):
+            logging.debug("parent_name")
+            logging.debug(tpl.nodelist[0].parent_name)
+            parent_template = str(tpl.nodelist[0].parent_name).replace(
+                '"', '').replace("''", '')
+            try:
+                parent_tpl = get_template(parent_template)
+                blocks += _get_blocks(parent_tpl)
+            except TemplateDoesNotExist:
+                logging.info("get_template:TemplateDoesNotExist - '%s'" %
+                                parent_template)
+
+        for node in tpl.nodelist:
+            if not isinstance(node, BlockNode) and not isinstance(node,
+                    ExtendsNode):
+                try:
+                    blocks += _get_blocks(node, menu_prefix, add_name=False)
+                except AttributeError:
+                    logging.info("node %s: no nodelist" % node)
+
+        return blocks
+
+    full_matches = _get_blocks(base)
+
+    names = []
+    matches = []
+    # dedup matches TODO might be a better way of picking matches
+    for match in full_matches:
+        if not match[0] in names:
+            matches.append(match)
+            names.append(match[0])
+
+    return [{'word':n,'menu':m} for b, n, m in matches if n.startswith(start)]
+
+def get_template_names(pattern):
+
+    dirs = getattr(mysettings, "TEMPLATE_DIRS", ()) + app_template_dirs
+    if hasattr(mysettings, "TEMPLATES"):
+        for d in [e["DIRS"] for e in mysettings.TEMPLATES]:
+            dirs += tuple(d)
+
+    matches = []
+    for d in dirs:
+        d = d + (os.path.sep if not d.endswith(os.path.sep) else '')
+        for m in glob(os.path.join(d,pattern + '*')):
+            if os.path.isdir(m):
+                for root,dirnames,filenames in os.walk(m):
+                    for f in filenames:
+                        fn,ext = os.path.splitext(f)
+                        if ext in TEMPLATE_EXTS:
+                            matches.append({
+                                'word' : os.path.join(root,f).replace(d,''),
+                                'info' : 'found in %s' % d
+                            }
+                            )
+            else:
+                matches.append({
+                    'word' : m.replace(d,''),
+                    'info' : 'found in %s' % d
+                }
+                )
+
+    return matches
+
+try:
+    from django.contrib.staticfiles import finders, storage
+    def get_staticfiles(pattern):
+
+        dirs = mysettings.STATICFILES_DIRS
+
+        #TODO crude matching
+        line = vim.current.line
+        if 'script' in line:
+            ext = ".*\.js$"
+        elif 'style' in line:
+            ext = ".*\.css$"
+        elif 'img' in line:
+            ext = ".*\.(gif|jpg|jpeg|png)$"
+        else:
+            ext = '.*'
+
+        matches = []
+
+        for finder in finders.get_finders():
+            for path, storage in finder.list([]):
+                if re.compile(ext,re.IGNORECASE).match(path) \
+                    and path.startswith(pattern):
+                    matches.append(dict(word=path,info=''))
+
+        return matches
+except:
+    def get_staticfiles(pattern):
+        return []
+
+def get_tag_libraries():
+    opts = []
+    for module in get_templatetags_modules():
+        mod = __import__(module,fromlist=['foo'])
+        for l,m,i in pkgutil.iter_modules([os.path.dirname(mod.__file__)]):
+            opts.append({'word':m,'menu':mod.__name__})
+
+    return opts
+
+
+def _get_doc(doc, name):
+    if doc:
+        return doc.replace('"',' ').replace("'",' ')
+    return '%s: no doc' % name
+
+def _get_opt_dict(lib,t,libname=''):
+    opts = getattr(lib,t)
+    return [
+    {'word':f, 'info': _get_doc(opts[f].__doc__,f),'menu':libname} \
+    for f in opts.keys()]
+
+def load_app_tags():
+    cb = vim.current.buffer
+    for line in cb:
+        m =  re.compile('{% load (.*)%}').match(line)
+        if m:
+            for lib in m.groups()[0].rstrip().split(' '):
+                try:
+                    l = get_library(lib)
+                    htmldjango_opts['filter'] += _get_opt_dict(l,'filters',lib)
+                    htmldjango_opts['tag'] += _get_opt_dict(l,'tags',lib)
+                except Exception as e:
+                    if HTMLDJANGO_DEBUG:
+                        print "FAILED TO LOAD: %s" % lib
+                        raise e
+# {{{2 load options
+# TODO At the moment this is being loaded every match
+htmldjango_opts = {}
+
+htmldjango_opts['load'] = get_tag_libraries()
+def_filters = import_library('django.template.defaultfilters')
+htmldjango_opts['filter'] = _get_opt_dict(def_filters,'filters','default')
+def_tags = import_library('django.template.defaulttags')
+htmldjango_opts['tag'] = _get_opt_dict(def_tags,'tags','default')
+load_app_tags()
+
+try:
+    urls = __import__(mysettings.ROOT_URLCONF,fromlist=['foo'])
+except:
+    urls = None
+
+def htmldjango_urls(pattern):
+    matches = []
+    def get_urls(urllist,parent=None):
+        for entry in urllist:
+            if hasattr(entry,'name') and entry.name:
+                matches.append(dict(
+                    word = entry.name,
+                    info = entry.regex.pattern,
+                    menu = parent and parent.urlconf_name or '')
+                    )
+            if hasattr(entry, 'url_patterns'):
+                get_urls(entry.url_patterns, entry)
+    if urls:
+        get_urls(urls.urlpatterns)
+    return matches
+
+#TODO I may be able to populate RequestContext via middleware component
+htmldjango_opts['variable'] = []
+#TODO Write a function that gets all ancestor template blocks
+htmldjango_opts['block'] = []
+
+# Main Python function {{{2
+def htmldjangocomplete(context,match):
+    if context == 'template':
+        all = get_template_names(match)
+    elif context == 'static':
+        all = get_staticfiles(match)
+    elif context == 'url':
+        all = htmldjango_urls(match)
+    elif context == 'block':
+        all = get_block_tags(match)
+    else:
+        all = htmldjango_opts[context]
+
+    vim.command("silent let g:htmldjangocomplete_completions = []")
+
+    dictstr = '['
+    # have to do this for double quoting
+
+    all = [a for a in all if a['word'].startswith(match)]
+    all = sorted(all, key=itemgetter('word'))
+
+    for cmpl in all:
+        dictstr += '{'
+        for x in cmpl: dictstr += '"%s":"%s",' % (x,cmpl[x].replace("\\", "\\\\")) # Windows slashes must be escaped
+        dictstr += '"icase":0},'
+    if dictstr[-1] == ',': dictstr = dictstr[:-1]
+    dictstr += ']'
+    vim.command("silent let g:htmldjangocomplete_completions = %s" % dictstr)
+EOF
+endif
+endfunction
+" Test Area {{{1
+function! TestLoadLibs()
+    call s:load_libs()
+endfunction
+
+function! HtmlDjangoDebug(on)
+    if a:on
+        echo "adding Breakpoint"
+        breakadd func htmldjangocomplete#CompleteDjango
+    else
+        echo "remove Breakpoint"
+        breakdel func htmldjangocomplete#CompleteDjango
+    endif
+endfunction
+" vim:set foldmethod=marker:
diff --git a/vim-plugins/bundle/vim-htmldjango_omnicomplete/examples/block_eample.png b/vim-plugins/bundle/vim-htmldjango_omnicomplete/examples/block_eample.png
new file mode 100644
index 0000000..5f5840f
Binary files /dev/null and b/vim-plugins/bundle/vim-htmldjango_omnicomplete/examples/block_eample.png differ
diff --git a/vim-plugins/bundle/vim-htmldjango_omnicomplete/examples/extends_example.png b/vim-plugins/bundle/vim-htmldjango_omnicomplete/examples/extends_example.png
new file mode 100644
index 0000000..be74ce8
Binary files /dev/null and b/vim-plugins/bundle/vim-htmldjango_omnicomplete/examples/extends_example.png differ
diff --git a/vim-plugins/bundle/vim-htmldjango_omnicomplete/examples/url_example.png b/vim-plugins/bundle/vim-htmldjango_omnicomplete/examples/url_example.png
new file mode 100644
index 0000000..6853230
Binary files /dev/null and b/vim-plugins/bundle/vim-htmldjango_omnicomplete/examples/url_example.png differ
diff --git a/vim-plugins/bundle/vim-indent-object/doc/indent-object.txt b/vim-plugins/bundle/vim-indent-object/doc/indent-object.txt
new file mode 100644
index 0000000..be99f31
--- /dev/null
+++ b/vim-plugins/bundle/vim-indent-object/doc/indent-object.txt
@@ -0,0 +1,126 @@
+*indent-object.txt*         Text objects based on indent levels.
+
+           Copyright (c) 2010 Michael Smith
+
+Indent Text Objects
+
+INTRODUCTION                      |indtobj-introduction|
+TEXT OBJECTS                      |indtobj-objects|
+BLANK LINES                       |indtobj-blanklines|
+ABOUT                             |indtobj-about|
+
+
+==============================================================================
+INTRODUCTION                                            *indtobj-introduction*
+
+Vim text objects provide a convenient way to select and operate on various
+types of objects. These objects include regions surrounded by various types of
+brackets and various parts of language (ie sentences, paragraphs, etc).
+
+This plugin defines a new text object, based on indentation levels. This is
+very useful in languages such as Python, in which the syntax defines scope in
+terms of indentation. Using the objects defined in this plugin, an entire if
+structure can be quickly selected, for example.
+
+
+==============================================================================
+TEXT OBJECTS                          *ai* *ii* *aI* *iI*     *indtobj-objects*
+
+This plugin defines two new text objects. These are very similar - they differ
+only in whether they include the line below the block or not.
+
+        Key Mapping       Description     ~
+>
+        <count>ai         (A)n (I)ndentation level and line above.
+        <count>ii         (I)nner (I)ndentation level (no line above).
+        <count>aI         (A)n (I)ndentation level and lines above/below.
+        <count>iI         (I)nner (I)ndentation level (no lines above/below).
+<
+
+Note that the iI mapping is mostly included simply for completeness, it is
+effectively a synonym for ii.
+
+Just like regular text objects, these mappings can be used either with
+operators expecting a motion, such as 'd' or 'c', as well as in visual mode.
+In visual mode the mapping can be repeated, which has the effect of
+iteratively increasing the scope of indentation block selected. Specifying a
+count can be used to achieve the same effect.
+
+The difference between |ai| and |aI| is that |ai| includes the line
+immediately above the indentation block, whereas aI includes not only that,
+but also the line below. Which of these is most useful largely depends on the
+structure of the language being edited.
+
+For example, when editing the Python code, |ai| is generally more useful, as
+the line above the indentation block is usually related to it. For example, in
+the following code (* is used to indicate the cursor position):
+>
+      if foo > 3:
+         log("foo is big") *
+         foo = 3
+      do_something_else()
+<
+the if clause is logically related to the code block, whereas the function
+call below is not. It is unlikely we would want to select the line below when
+we are interested in the if block.
+
+However, in other languages, such as Vim scripts, control structures are
+usually terminated with something like 'endif'. Therefore, in this example:
+>
+      if foo > 3
+         echo "foo is big" *
+         let foo = 3
+      endif
+      call do_something_else()
+<
+we would more likely want to include the endif when we select the if
+structure.
+
+
+==============================================================================
+BLANK LINES                                               *indtobj-blanklines*
+
+When scanning code blocks, the plugin usually ignores blank lines. There is an
+exception to this, however, when the block being selected is not indented. In
+this case if blank lines are ignored, then the entire file would be selected.
+Instead when code at the top level is being indented blank lines are
+considered to delimit the block.
+
+This exceptional behaviour can be disabled by executing the following line
+>
+      :let g:indent_object_except_first_level = 0
+<
+(default is 1)
+
+
+==============================================================================
+ABOUT                                                          *indtobj-about*
+
+vim-indent-object was written by Michael Smith <msmith@msmith.id.au>. The
+project repository is kept at:
+
+http://github.com/michaeljsmith/vim-indent-object
+
+Any feedback or criticism is welcome, and can be mailed to the author at the
+above email address. Alternatively issues can be raised on the project
+website.
+
+Licence:
+
+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/vim-plugins/bundle/vim-indent-object/plugin/indent-object.vim b/vim-plugins/bundle/vim-indent-object/plugin/indent-object.vim
new file mode 100644
index 0000000..199b433
--- /dev/null
+++ b/vim-plugins/bundle/vim-indent-object/plugin/indent-object.vim
@@ -0,0 +1,234 @@
+"--------------------------------------------------------------------------------
+"
+"  Copyright (c) 2010 Michael Smith <msmith@msmith.id.au>
+"
+"  http://github.com/michaeljsmith/vim-indent-object
+"
+"  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.
+"
+"--------------------------------------------------------------------------------
+
+" Mappings excluding line below.
+onoremap <silent>ai :<C-u>cal <Sid>HandleTextObjectMapping(0, 0, 0, [line("."), line("."), col("."), col(".")])<CR>
+onoremap <silent>ii :<C-u>cal <Sid>HandleTextObjectMapping(1, 0, 0, [line("."), line("."), col("."), col(".")])<CR>
+vnoremap <silent>ai :<C-u>cal <Sid>HandleTextObjectMapping(0, 0, 1, [line("'<"), line("'>"), col("'<"), col("'>")])<CR><Esc>gv
+vnoremap <silent>ii :<C-u>cal <Sid>HandleTextObjectMapping(1, 0, 1, [line("'<"), line("'>"), col("'<"), col("'>")])<CR><Esc>gv
+
+" Mappings including line below.
+onoremap <silent>aI :<C-u>cal <Sid>HandleTextObjectMapping(0, 1, 0, [line("."), line("."), col("."), col(".")])<CR>
+onoremap <silent>iI :<C-u>cal <Sid>HandleTextObjectMapping(1, 1, 0, [line("."), line("."), col("."), col(".")])<CR>
+vnoremap <silent>aI :<C-u>cal <Sid>HandleTextObjectMapping(0, 1, 1, [line("'<"), line("'>"), col("'<"), col("'>")])<CR><Esc>gv
+vnoremap <silent>iI :<C-u>cal <Sid>HandleTextObjectMapping(1, 1, 1, [line("'<"), line("'>"), col("'<"), col("'>")])<CR><Esc>gv
+
+let s:l0 = -1
+let s:l1 = -1
+let s:c0 = -1
+let s:c1 = -1
+
+if !exists("g:indent_object_except_first_level")
+	let g:indent_object_except_first_level = 1
+endif
+
+function! <Sid>TextObject(inner, incbelow, vis, range, count)
+
+	" Record the current state of the visual region.
+	let vismode = "V"
+
+	" Detect if this is a completely new visual selction session.
+	let new_vis = 0
+	let new_vis = new_vis || s:l0 != a:range[0]
+	let new_vis = new_vis || s:l1 != a:range[1]
+	let new_vis = new_vis || s:c0 != a:range[2]
+	let new_vis = new_vis || s:c1 != a:range[3]
+
+	let s:l0 = a:range[0]
+	let s:l1 = a:range[1]
+	let s:c0 = a:range[2]
+	let s:c1 = a:range[3]
+
+	" Repeatedly increase the scope of the selection.
+	let itr_cnt = 0
+	let cnt = a:count
+	while cnt > 0
+
+		" Look for the minimum indentation in the current visual region.
+		let l = s:l0
+		let idnt_invalid = 1000
+		let idnt = idnt_invalid
+		while l <= s:l1
+			if !(getline(l) =~ "^\\s*$")
+				let idnt = min([idnt, indent(l)])
+			endif
+			let l += 1
+		endwhile
+
+		" Keep track of where the range should be expanded to.
+		let l_1 = s:l0
+		let l_1o = l_1
+		let l2 = s:l1
+		let l2o = l2
+
+		" If we are highlighting only blank lines, we may not have found a
+		" valid indent. In this case we need to look for the next and previous
+		" non blank lines and check which of those has the largest indent.
+		if idnt == idnt_invalid
+			let idnt = 0
+			let pnb = prevnonblank(s:l0)
+			if pnb
+				let idnt = max([idnt, indent(pnb)])
+				let l_1 = pnb
+			endif
+			let nnb = nextnonblank(s:l0)
+			if nnb
+				let idnt = max([idnt, indent(nnb)])
+			endif
+
+			" If we are in whitespace at the beginning of a block, skip over
+			" it when we are selecting the range. Similarly, if we are in
+			" whitespace at the end, ignore it.
+			if idnt > indent(pnb)
+				let l_1 = nnb
+			endif
+			if idnt > indent(nnb)
+				let l2 = pnb
+			endif
+		endif
+
+		" Search backward for the first line with less indent than the target
+		" indent (skipping blank lines).
+		let blnk = getline(l_1) =~ "^\\s*$"
+		while l_1 > 0 && (blnk || indent(l_1) >= idnt)
+			if g:indent_object_except_first_level && idnt == 0 && blnk
+				break
+			endif
+			if !blnk || !a:inner
+				let l_1o = l_1
+			endif
+			let l_1 -= 1
+			let blnk = getline(l_1) =~ "^\\s*$"
+		endwhile
+
+		" Search forward for the first line with more indent than the target
+		" indent (skipping blank lines).
+		let line_cnt = line("$")
+		let blnk = getline(l2) =~ "^\\s*$"
+		while l2 <= line_cnt && (blnk || indent(l2) >= idnt)
+			if g:indent_object_except_first_level && idnt == 0 && blnk
+				break
+			endif
+			if !blnk || !a:inner
+				let l2o = l2
+			endif
+			let l2 += 1
+			let blnk = getline(l2) =~ "^\\s*$"
+		endwhile
+
+		" Determine which of these extensions to include. Include neither if
+		" we are selecting an 'inner' object. Exclude the bottom unless are
+		" told to include it.
+		let idnt2 = max([indent(l_1), indent(l2)])
+		if indent(l_1) < idnt2 || a:inner
+			let l_1 = l_1o
+		endif
+		if indent(l2) < idnt2 || a:inner || !a:incbelow
+			let l2 = l2o
+		endif
+		let l_1 = max([l_1, 1])
+		let l2 = min([l2, line("$")])
+
+		" Extend the columns to the start and end.
+		" If inner is selected, set the final cursor pos to the start
+		" of the text in the line.
+		let c_1 = 1
+		if a:inner
+			let c_1 = match(getline(l_1), "\\c\\S") + 1
+		endif
+		let c2 = len(getline(l2))
+		if !a:inner
+			let c2 += 1
+		endif
+
+		" Make sure there's no change if we haven't really made a
+		" significant change in linewise mode - this makes sure that
+		" we can iteratively increase selection in linewise mode.
+		if itr_cnt == 0 && vismode ==# 'V' && s:l0 == l_1 && s:l1 == l2
+			let c_1 = s:c0
+			let c2 = s:c1
+		endif
+
+		" Check whether the visual region has changed.
+		let chg = 0
+		let chg = chg || s:l0 != l_1
+		let chg = chg || s:l1 != l2
+		let chg = chg || s:c0 != c_1
+		let chg = chg || s:c1 != c2
+
+		if vismode ==# 'V' && new_vis
+			let chg = 1
+		endif
+
+		" Update the vars.
+		let s:l0 = l_1
+		let s:l1 = l2
+		let s:c0 = c_1
+		let s:c1 = c2
+
+		" If there was no change, then don't decrement the count (it didn't
+		" count because it didn't do anything).
+		if chg
+			let cnt = cnt - 1
+		else
+			" Since this didn't work, push the selection back one char. This
+			" will have the effect of getting the enclosing block. Do it at
+			" the beginning rather than the end - the beginning is very likely
+			" to be only one indentation level different.
+			if s:l0 == 0
+				return
+			endif
+			let s:l0 -= 1
+			let s:c0 = len(getline(s:l0))
+		endif
+
+		let itr_cnt += 1
+
+	endwhile
+
+	" Apply the range we have found. Make sure to use the current visual mode.
+	call cursor(s:l0, s:c0)
+	exe "normal! " . vismode
+	call cursor(s:l1, s:c1)
+	normal! o
+
+	" Update these static variables - we need to keep these up-to-date between
+	" invocations because it's the only way we can detect whether it's a new
+	" visual mode. We need to know if it's a new visual mode because otherwise
+	" if there's a single line block in visual line mode and we select it with
+	" "V", we can't tell whether it's already been selected using Vii.
+	exe "normal! \<Esc>"
+	let s:l0 = line("'<")
+	let s:l1 = line("'>")
+	let s:c0 = col("'<")
+	let s:c1 = col("'>")
+	normal gv
+
+endfunction
+
+function! <Sid>HandleTextObjectMapping(inner, incbelow, vis, range)
+	call <Sid>TextObject(a:inner, a:incbelow, a:vis, a:range, v:count1)
+endfunction
diff --git a/vim-plugins/bundle/vim-lion/README.md b/vim-plugins/bundle/vim-lion/README.md
new file mode 100644
index 0000000..ebc8ca9
--- /dev/null
+++ b/vim-plugins/bundle/vim-lion/README.md
@@ -0,0 +1,99 @@
+lion.vim
+========
+
+Lion.vim is a tool for aligning text by some character. It defines some
+Vim operators that can be used with motion commands to align a targetted
+block of text.
+
+The two operators are `gl` and `gL`. `gl` will add spaces to the left of
+the alignment character, and `gL` will add spaces to the right. Both
+operators accept a count, a motion, and a single character. Without a
+count, all occurrences of the character will be aligned.
+
+For example, `glip=` will turn
+
+```php
+$i = 5;
+$username = 'tommcdo';
+$stuff = array(1, 2, 3);
+```
+
+into
+
+```php
+$i        = 5;
+$username = 'tommcdo';
+$stuff    = array(1, 2, 3);
+```
+
+Typing `3gLi(,` with the cursor somewhere inside `(` and `)` will turn
+
+```php
+$names = array(
+    'bill', 'samantha', 'ray', 'ronald',
+    'mo', 'harry', 'susan', 'ted',
+    'timothy', 'bob', 'wolverine', 'cat',
+    'lion', 'alfred', 'batman', 'linus',
+);
+```
+
+into
+
+```php
+$names = array(
+    'bill',    'samantha', 'ray',       'ronald',
+    'mo',      'harry',    'susan',     'ted',
+    'timothy', 'bob',      'wolverine', 'cat',
+    'lion',    'alfred',   'batman',    'linus',
+);
+```
+
+It is also possible to align text by a pattern. To enter a pattern, use `/` as
+the alignment character (e.g. `glip/`) and then you will be prompted to input
+the pattern. To align by `/`, simply leave the pattern empty (by pressing
+`Enter`).
+
+Installation
+------------
+
+If you don't have a preferred installation method, I recommend
+installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and
+then simply copy and paste:
+
+```sh
+cd ~/.vim/bundle
+git clone git://github.com/tommcdo/vim-lion.git
+```
+
+Once help tags have been generated, you can view the manual with
+`:help lion`.
+
+Options
+-------
+
+Option |                Description |                      Default
+--- | --- | ---
+`g:lion_create_maps`    | Whether to create mappings       | `1`
+`b:lion_squeeze_spaces`<br>`g:lion_squeeze_spaces` | Squeeze extra spaces             | `0`
+`g:lion_map_right`      | Mapping for right-align operator | `gl`
+`g:lion_map_left`       | Mapping for left-align operator  | `gL`
+
+If you set: `let b:lion_squeeze_spaces = 1`, and hit `glip=`, you will turn
+
+```php
+$i      = 5;
+$user     = 'tommcdo';
+$stuff  = array(1, 2, 3);
+```
+into:
+```php
+$i     = 5;
+$user  = 'tommcdo';
+$stuff = array(1, 2, 3);
+```
+instead of (`b:lion_squeeze_spaces = 0`):
+```php
+$i        = 5;
+$user     = 'tommcdo';
+$stuff    = array(1, 2, 3);
+```
diff --git a/vim-plugins/bundle/vim-lion/doc/lion.txt b/vim-plugins/bundle/vim-lion/doc/lion.txt
new file mode 100644
index 0000000..30d0822
--- /dev/null
+++ b/vim-plugins/bundle/vim-lion/doc/lion.txt
@@ -0,0 +1,69 @@
+*lion.txt*  Plugin to define a code alignment operator
+
+Author: Tom McDonald <http://tommcdo.com>
+License: Same terms as Vim itself (see |license|)
+
+This plugin is only available if 'compatible' is not set.
+
+INTRODUCTION                                    *lion*
+
+This plugin provides operators for aligning text to a specific character.
+The operators are designed to work as closely as possible to the built-in
+Vim |operators|.
+
+MAPPINGS                                        *lion-mappings*
+
+In the mappings below, if {char} is "/", a prompt will input a pattern to use
+for alignment. If the pattern is left blank, "/" will be used.
+
+                                                *gl* *lion-right-align*
+[count]gl{motion}{char} Align text within {motion} to [count] occurrences
+                        of {char}. Spaces are added to the left of each
+                        {char} in the line up to the [count]th position in
+                        the line.
+                        If no [count] is specified, align all occurrences.
+
+                                                *gL* *lion-left-align*
+[count]gL{motion}{char} Align text within {motion} to [count] occurrences
+                        of {char}. Spaces are added to the right of each
+                        {char} in the line up to the [count]th position in
+                        the line.
+                        If no [count] is specified, align all occurrences.
+
+EXAMPLES                                        *lion-examples*
+
+In the below examples, an asterisk (*) denotes the position of cursor. This
+is primarily to help understand {motion}s from the example commands.
+
+  Old text                  Command     New text ~
+
+  $name = "Tom";            glip=       $name     = "Tom";
+  $birthday =* "Jan 12";                $birthday = "Jan 12";
+  $age = 25;                            $age      = 25;
+
+  fish, monkey, giraffe*    2gL3j,      fish,    monkey,   giraffe
+  a, b, c                               a,       b,        c
+  45, saturday, 0                       45,      saturday, 0
+  goodbye, cruel, lamp                  goodbye, cruel,    lamp
+
+CONFIGURATION                                   *lion-configuration*
+
+Mappings can be configured with the following options:
+
+  Option                  Description                        Default ~
+
+  g:lion_create_maps      Whether to create mappings         1
+  b:lion_squeeze_spaces,
+  g:lion_squeeze_spaces   Whether to squeeze extra spaces    0
+  g:lion_map_right        Mapping for right-align operator   gl
+  g:lion_map_left         Mapping for left-align operator    gL
+
+ISSUES AND TODO                                 *lion-issues* *lion-todo*
+
+See https://github.com/tommcdo/vim-lion/issues for bugs and issues.
+
+MY LOVE                                         *lion-my-love*
+
+The love of my life (and Vim plugin hero) is my beautiful wife, Maya. <3
+
+ vim:tw=78:ts=8:ft=help:norl:
diff --git a/vim-plugins/bundle/vim-lion/plugin/lion.vim b/vim-plugins/bundle/vim-lion/plugin/lion.vim
new file mode 100644
index 0000000..22a4c9d
--- /dev/null
+++ b/vim-plugins/bundle/vim-lion/plugin/lion.vim
@@ -0,0 +1,211 @@
+" lion.vim - A Vim plugin for text alignment operators
+" Maintainer:   Tom McDonald <http://github.com/tommcdo>
+" Version:      1.0
+
+let s:count = 1
+
+let s:lion_prompt = get(g:, 'lion_prompt', 'Pattern [/]: ')
+
+function! s:command(func, ...)
+	let s:count = v:count
+	if a:0
+		return ":" . "\<C-U>call " . a:func . "(visualmode(), 1)\<CR>"
+	else
+		return ":" . "\<C-U>set opfunc=" . a:func . "\<CR>g@"
+	endif
+endfunction
+
+function! s:alignRight(type, ...)
+	return s:align('right', a:type, a:0, '')
+endfunction
+
+function! s:alignLeft(type, ...)
+	return s:align('left', a:type, a:0, '')
+endfunction
+
+" Align a range to a particular character
+function! s:align(mode, type, vis, align_char)
+	let sel_save = &selection
+	let &selection = "inclusive"
+
+	try
+		" Do we have a character from argument, or should we get one from input?
+		let align_pattern = a:align_char
+		let skip = 0
+		if align_pattern == ''
+			let align_pattern = nr2char(getchar())
+			if align_pattern =~ '[1-9]'
+				while 1
+					let char = nr2char(getchar())
+					if char !~ '[0-9]'
+						break
+					endif
+					let align_pattern .= char
+				endwhile
+				if char != "\<CR>"
+					let skip = str2nr(align_pattern) - 1
+					let align_pattern = char
+				endif
+			endif
+		endif
+		if align_pattern == '/'
+			let align_pattern .= input(s:lion_prompt)
+		elseif align_pattern == ' '
+			let align_pattern = '/\S\zs\s'
+		endif
+
+		" Determine range boundaries
+		if a:vis
+			let pos = s:getpos("'<", "'>", visualmode())
+		else
+			let pos = s:getpos("'[", "']", a:type)
+		endif
+		let [start_line, end_line, start_col, end_col, middle_start_col, middle_end_col] = pos
+
+		" Check for 'lion_squeeze_spaces' options
+		if exists('b:lion_squeeze_spaces')
+			let s:lion_squeeze_spaces = get(b:, 'lion_squeeze_spaces')
+		elseif exists('g:lion_squeeze_spaces')
+			let s:lion_squeeze_spaces = get(g:, 'lion_squeeze_spaces')
+		else
+			let s:lion_squeeze_spaces = 0
+		endif
+
+		" Squeeze extra spaces before aligning
+		if s:lion_squeeze_spaces
+			for lnum in range(start_line, end_line)
+				call setline(lnum, substitute(getline(lnum), '\(^\s*\)\@<! \{2,}', ' ', 'g'))
+			endfor
+		endif
+
+		" Align for each character up to count or maximum occurrences
+		let iteration = 1
+		while 1
+			let line_virtual_pos = [] " Keep track of positions
+			let longest = -1          " Track longest sequence
+
+			" Find the longest substring before the align character
+			for line_number in range(start_line, end_line)
+				if line_number == start_line
+					let start = start_col
+				else
+					let start = middle_start_col
+				endif
+				if line_number == end_line
+					let end = end_col
+				else
+					let end = middle_end_col
+				endif
+				let line_str = getline(line_number)
+				" Find the 'real' and 'virtual' positions of the align character in this line
+				let [real_pos, virtual_pos] = s:match_pos(a:mode, line_str, align_pattern, skip + iteration, line_number, start, end)
+				let line_virtual_pos += [[real_pos, virtual_pos]]
+				let longest = max([longest, virtual_pos])
+			endfor
+
+			" Align each line according to the longest
+			for line_number in range(start_line, end_line)
+				let line_str = getline(line_number)
+				let [real_pos, virtual_pos] = line_virtual_pos[(line_number - start_line)]
+				if virtual_pos != -1 && virtual_pos < longest
+					let spaces = repeat(' ', (longest - virtual_pos))
+					if real_pos == 0
+						let new_line = spaces . line_str
+					else
+						let new_line = line_str[:(real_pos - 1)] . spaces . line_str[(real_pos):]
+					endif
+					call setline(line_number, new_line)
+				endif
+			endfor
+			if s:count - iteration == 0 || longest == -1
+				break
+			endif
+			let iteration += 1
+		endwhile
+
+		if align_pattern[0] == '/'
+			silent! call repeat#set("\<Plug>LionRepeat".align_pattern."\<CR>")
+		else
+			silent! call repeat#set("\<Plug>LionRepeat".align_pattern)
+		endif
+	finally
+		let &selection = sel_save
+	endtry
+endfunction
+
+function! s:getpos(start, end, mode)
+	let [_, start_line, start_col, _] = getpos(a:start)
+	let [_, end_line, end_col, _] = getpos(a:end)
+	let [middle_start_col, middle_end_col] = [0, -1]
+	if a:mode == 'V' || a:mode == 'line'
+		let [start_col, end_col] = [0, -1]
+	elseif a:mode == "\<C-V>"
+		let [middle_start_col, middle_end_col] = [start_col, end_col]
+	endif
+	return [start_line, end_line, start_col, end_col, middle_start_col, middle_end_col]
+endfunction
+
+" Match the position of a character in a line after accounting for artificial width set by tabs
+function! s:match_pos(mode, line, char, count, line_number, start, end)
+	if strlen(a:char) == 1
+		let pattern = escape(a:char, '~^$.')
+	else
+		let pattern = a:char[1:]
+		" Add start-of-match anchor at the end if there isn't already one in the pattern
+		if a:mode == 'left' && match(pattern, '\\zs') == -1
+			let pattern .= '\zs'
+		endif
+	endif
+	if a:end == -1
+		let line = a:line
+	else
+		let line = a:line[:(a:end - 1)]
+	endif
+	if a:mode == 'right'
+		let real_pos = match(line, pattern, a:start - 1, a:count)
+	elseif a:mode == 'left'
+		let real_pos = s:first_non_ws_after(line, pattern, a:start - 1, a:count)
+	endif
+	if real_pos == -1
+		let virtual_pos = -1
+	else
+		let virtual_pos = virtcol([a:line_number, real_pos])
+	endif
+	return [real_pos, virtual_pos]
+endfunction
+
+" Get the first non-whitespace after [count] instances of [char]
+function! s:first_non_ws_after(line, pattern, start, count)
+	let pattern = len(a:pattern) == 1 ? a:pattern . '\zs' : a:pattern
+	let char_pos = match(a:line, pattern, a:start, a:count)
+	if char_pos == -1
+		return -1
+	else
+		return match(a:line, '\S', char_pos)
+	endif
+endfunction
+
+" Echo a string and wait for input (used when I'm debugging)
+function! s:debug_str(str)
+	echo a:str
+	let x = getchar()
+endfunction
+
+function! s:assign_map(map, func)
+	if a:map == ''
+		return
+	endif
+	execute 'nmap <silent> ' . a:map . ' <Plug>Lion' . a:func
+	execute 'vmap <silent> ' . a:map . ' <Plug>VLion' . a:func
+endfunction
+
+nnoremap <silent> <Plug>LionRepeat .
+nnoremap <silent> <expr> <Plug>LionRight <SID>command("<SID>alignRight")
+vnoremap <silent> <expr> <Plug>VLionRight <SID>command("<SID>alignRight", 1)
+nnoremap <silent> <expr> <Plug>LionLeft <SID>command("<SID>alignLeft")
+vnoremap <silent> <expr> <Plug>VLionLeft <SID>command("<SID>alignLeft", 1)
+
+if get(g:, 'lion_create_maps', 1)
+	call s:assign_map(get(g:, 'lion_map_right', 'gl'), 'Right')
+	call s:assign_map(get(g:, 'lion_map_left',  'gL'), 'Left')
+endif
diff --git a/vim-plugins/bundle/vim-markdown/.travis.yml b/vim-plugins/bundle/vim-markdown/.travis.yml
new file mode 100644
index 0000000..8ea8d3d
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/.travis.yml
@@ -0,0 +1,31 @@
+language: vim
+
+os:
+  - linux
+  - osx
+
+env:
+  - TEST=package
+  - TEST=latest
+
+before_script: |
+  if [ "$TEST" = "package" ]; then
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      sudo apt-get -y update
+      sudo apt-get -y install vim
+    fi
+  else
+    cd ..
+    git clone --depth 1 https://github.com/vim/vim
+    cd vim
+    ./configure --with-features=huge
+    make
+    sudo make install
+    export PATH="/usr/local/bin:$PATH"
+    cd "$TRAVIS_BUILD_DIR"
+  fi
+  sudo -H pip install virtualenv
+
+script:
+  - make test
+  - make doc
diff --git a/vim-plugins/bundle/vim-markdown/CONTRIBUTING.md b/vim-plugins/bundle/vim-markdown/CONTRIBUTING.md
new file mode 100644
index 0000000..86912a4
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/CONTRIBUTING.md
@@ -0,0 +1,58 @@
+# CONTRIBUTING
+
+These contributing guidelines were accepted rather late in the history of this plugin, after much code had already been written.
+
+If you find any existing behavior which does not conform to these guidelines, please correct it and send a pull request.
+
+## General Rules
+
+Every non local identifier must start with `g:vim_markdown_`.
+
+## Documentation
+
+Every new feature must be documented under in the [README.md](README.md). Documentation must be written in [GFM](https://help.github.com/articles/github-flavored-markdown) since GitHub itself is the primary to HTML converter used. In particular, remember that GFM adds line breaks at single newlines, so just forget about the 70 characters wide rule.
+
+Vim help file [doc/vim-markdown.txt](doc/vim-markdown.txt) will be generated from [README.md](README.md) by `make doc` using [vim-tools](https://github.com/xolox/vim-tools).
+
+## Markdown Flavors
+
+There are many flavors of markdown, each one with an unique feature set. This plugin uses the following strategy to deal with all those flavors:
+
+- Features from the [original markdown](http://daringfireball.net/projects/markdown/syntax) are turned on by default. They may not even have an option that turns them off.
+
+- Features from other markdown flavors *must* have an option that turns them on or off. If the feature is common enough across multiple versions of markdown, it may be turned on by default. This shall be decided by the community when the merge request is done.
+
+- If possible, cite the exact point in the documentation of the flavor where a feature is specified. If the feature is not documented, you may also reference the source code itself of the implementation. This way, people who do not know that flavor can check if your implementation is correct.
+
+- Do not use the name of a flavor for a feature that is used across multiple flavors. Instead, create a separate flavor option, that automatically sets each feature.
+
+    For example, fenced code blocks (putting code between pairs of three backticks) is not part of the original markdown, but is supported by [GFM](https://help.github.com/articles/github-flavored-markdown#fenced-code-blocks) and [Jekyll](http://jekyllrb.com/docs/configuration/).
+
+    Therefore, instead of creating an option `g:vim_markdown_gfm_fenced_code_block`, and an option `g:vim_markdown_jekyll_fenced_code_block`, create a single option `g:vim_markdown_fenced_code_block`.
+
+    Next, if there are many more than one Jekyll feature options, create a `g:vim_markdown_jekyll` option that turns them all on at once.
+
+## Style
+
+When choosing between multiple valid Markdown syntaxes, the default behavior must be that specified at: <http://www.cirosantilli.com/markdown-styleguide>
+
+If you wish to have a behavior that differs from that style guide, add an option to turn it on or off, and leave it off by default.
+
+## Tests
+
+All new features must have unit tests.
+
+## Issues
+
+Issues are tracked within GitHub.
+
+When reporting issues, your report is more effective if you include a minimal example file that reproduces the problem. Try to trim out as much as possible, until you have the smallest possible file that still reproduces the issue. Paste the example inline into your issue report, quoted using four spaces at the beginning of each line, like this example from issue [#189](https://github.com/plasticboy/vim-markdown/issues/189):
+
+```
+Minimal example:
+
+    ```
+    =
+    ```
+    bad!
+```
diff --git a/vim-plugins/bundle/vim-markdown/Makefile b/vim-plugins/bundle/vim-markdown/Makefile
new file mode 100644
index 0000000..c9d1155
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/Makefile
@@ -0,0 +1,82 @@
+VIMDIR=$(DESTDIR)/usr/share/vim
+ADDONS=${VIMDIR}/addons
+REGISTRY=${VIMDIR}/registry
+
+all:
+
+install:
+	mkdir -pv ${ADDONS}/ftdetect
+	cp -v ftdetect/markdown.vim ${ADDONS}/ftdetect/markdown.vim
+	mkdir -pv ${ADDONS}/ftplugin
+	cp -v ftplugin/markdown.vim ${ADDONS}/ftplugin/markdown.vim
+	mkdir -pv ${ADDONS}/syntax
+	cp -v syntax/markdown.vim ${ADDONS}/syntax/markdown.vim
+	mkdir -pv ${ADDONS}/after/ftplugin
+	cp -v after/ftplugin/markdown.vim ${ADDONS}/after/ftplugin/markdown.vim
+	mkdir -pv ${ADDONS}/indent
+	cp -v indent/markdown.vim ${ADDONS}/indent/markdown.vim
+	mkdir -pv ${ADDONS}/doc
+	cp -v doc/vim-markdown.txt ${ADDONS}/doc/vim-markdown.txt
+	mkdir -pv ${REGISTRY}
+	cp -v registry/markdown.yaml ${REGISTRY}/markdown.yaml
+
+test: build/tabular build/vim-toml build/vim-json build/vader.vim
+	test/run-tests.sh
+.PHONY: test
+
+update: build/tabular build/vim-toml build/vim-json build/vader.vim
+	cd build/tabular && git pull
+	cd build/vim-toml && git pull
+	cd build/vim-json && git pull
+	cd build/vader.vim && git pull
+.PHONY: update
+
+build/tabular: | build
+	git clone https://github.com/godlygeek/tabular build/tabular
+
+build/vim-toml: | build
+	git clone https://github.com/cespare/vim-toml build/vim-toml
+
+build/vim-json: | build
+	git clone https://github.com/elzr/vim-json build/vim-json
+
+build/vader.vim: | build
+	git clone https://github.com/junegunn/vader.vim build/vader.vim
+
+build:
+	mkdir build
+
+doc: build/html2vimdoc build/vim-tools
+	sed -e '/^\[!\[Build Status\]/d' \
+	    -e '/^1\. \[/d' README.md > doc/tmp.md # remove table of contents
+	build/html2vimdoc/bin/python build/vim-tools/html2vimdoc.py -f vim-markdown \
+		doc/tmp.md | \
+		sed -E -e "s/[[:space:]]*$$//" -e "# remove trailing spaces" \
+		    -e "/^.{79,}\|$$/ {" -e "# wrap table of contents over 79" \
+		    -e "h" -e "# save the matched line to the hold space" \
+		    -e "s/^(.*) (\|[^|]*\|)$$/\1/" -e "# make content title" \
+		    -e "p" -e "# print title" \
+		    -e "g" -e "# restore the matched line" \
+		    -e "s/^.* (\|[^|]*\|)$$/ \1/" -e "# make link" \
+		    -e ":c" -e "s/^(.{1,78})$$/ \1/" -e "tc" -e "# align right" \
+		    -e "}" \
+		    -e "/^- '[^']*':( |$$)/ {" \
+		    -e "h" -e "# save the matched line to the hold space" \
+		    -e "s/^- '([^']{3,})':.*/ \*\1\*/" -e "# make command reference" \
+		    -e "s/^- '([^']{1,2})':.*/ \*vim-markdown-\1\*/" -e "# short command" \
+		    -e ":a" -e "s/^(.{1,78})$$/ \1/" -e "ta" -e "# align right" \
+		    -e "G" -e "# append the matched line after the command reference" \
+		    -e "}" > doc/vim-markdown.txt && rm -f doc/tmp.md
+
+.PHONY: doc
+
+# Prerequire Python and virtualenv.
+# $ sudo pip install virtualenv
+# Create the virtual environment.
+# Install the dependencies.
+build/html2vimdoc: | build
+	virtualenv build/html2vimdoc
+	build/html2vimdoc/bin/pip install beautifulsoup coloredlogs==4.0 markdown
+
+build/vim-tools: | build
+	git clone https://github.com/xolox/vim-tools.git build/vim-tools
diff --git a/vim-plugins/bundle/vim-markdown/README.md b/vim-plugins/bundle/vim-markdown/README.md
new file mode 100644
index 0000000..0d03b34
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/README.md
@@ -0,0 +1,358 @@
+# Vim Markdown
+
+[![Build Status](https://travis-ci.org/plasticboy/vim-markdown.svg)](https://travis-ci.org/plasticboy/vim-markdown)
+
+Syntax highlighting, matching rules and mappings for [the original Markdown](http://daringfireball.net/projects/markdown/) and extensions.
+
+1. [Installation](#installation)
+1. [Options](#options)
+1. [Mappings](#mappings)
+1. [Commands](#commands)
+1. [Credits](#credits)
+1. [License](#license)
+
+## Installation
+
+If you use [Vundle](https://github.com/gmarik/vundle), add the following line to your `~/.vimrc`:
+
+```vim
+Plugin 'godlygeek/tabular'
+Plugin 'plasticboy/vim-markdown'
+```
+
+The `tabular` plugin must come *before* `vim-markdown`.
+
+Then run inside Vim:
+
+```vim
+:so ~/.vimrc
+:PluginInstall
+```
+
+If you use [Pathogen](https://github.com/tpope/vim-pathogen), do this:
+
+```sh
+cd ~/.vim/bundle
+git clone https://github.com/plasticboy/vim-markdown.git
+```
+
+To install without Pathogen using the Debian [vim-addon-manager](http://packages.qa.debian.org/v/vim-addon-manager.html), do this:
+
+```sh
+git clone https://github.com/plasticboy/vim-markdown.git
+cd vim-markdown
+sudo make install
+vim-addon-manager install markdown
+```
+
+If you are not using any package manager, download the [tarball](https://github.com/plasticboy/vim-markdown/archive/master.tar.gz) and do this:
+
+```sh
+cd ~/.vim
+tar --strip=1 -zxf vim-markdown-master.tar.gz
+```
+
+## Options
+
+### Disable Folding
+
+Add the following line to your `.vimrc` to disable the folding configuration:
+
+```vim
+let g:vim_markdown_folding_disabled = 1
+```
+
+This option only controls Vim Markdown specific folding configuration.
+
+To enable/disable folding use Vim's standard folding configuration.
+
+```vim
+set [no]foldenable
+```
+
+### Change fold style
+
+To fold in a style like [python-mode](https://github.com/klen/python-mode), add the following to your `.vimrc`:
+
+```vim
+let g:vim_markdown_folding_style_pythonic = 1
+```
+
+Level 1 heading which is served as a document title is not folded.
+`g:vim_markdown_folding_level` setting is not active with this fold style.
+
+To prevent foldtext from being set add the following to your `.vimrc`:
+
+```vim
+let g:vim_markdown_override_foldtext = 0
+```
+
+### Set header folding level
+
+Folding level is a number between 1 and 6. By default, if not specified, it is set to 1.
+
+```vim
+let g:vim_markdown_folding_level = 6
+```
+
+Tip: it can be changed on the fly with:
+
+```vim
+:let g:vim_markdown_folding_level = 1
+:edit
+```
+
+### Disable Default Key Mappings
+
+Add the following line to your `.vimrc` to disable default key mappings:
+
+```vim
+let g:vim_markdown_no_default_key_mappings = 1
+```
+
+You can also map them by yourself with `<Plug>` mappings.
+
+### Enable TOC window auto-fit
+
+Allow for the TOC window to auto-fit when it's possible for it to shrink.
+It never increases its default size (half screen), it only shrinks.
+
+```vim
+let g:vim_markdown_toc_autofit = 1
+```
+
+### Text emphasis restriction to single-lines
+
+By default text emphasis works across multiple lines until a closing token is found. However, it's possible to restrict text emphasis to a single line (ie, for it to be applied a closing token must be found on the same line). To do so:
+
+```vim
+let g:vim_markdown_emphasis_multiline = 0
+```
+
+### Syntax Concealing
+
+Concealing is set for some syntax.
+
+For example, conceal `[link text](link url)` as just `link text`.
+Also, `_italic_` and `*italic*` will conceal to just _italic_.
+Similarly `__bold__`, `**bold**`, `___italic bold___`, and `***italic bold***`
+will conceal to just __bold__, **bold**, ___italic bold___, and ***italic bold*** respectively.
+
+To enable conceal use Vim's standard conceal configuration.
+
+```vim
+set conceallevel=2
+```
+
+To disable conceal regardless of `conceallevel` setting, add the following to your `.vimrc`:
+
+```vim
+let g:vim_markdown_conceal = 0
+```
+
+To disable math conceal with LaTeX math syntax enabled, add the following to your `.vimrc`:
+
+```vim
+let g:tex_conceal = ""
+let g:vim_markdown_math = 1
+```
+
+### Fenced code block languages
+
+You can use filetype name as fenced code block languages for syntax highlighting.
+If you want to use different name from filetype, you can add it in your `.vimrc` like so:
+
+```vim
+let g:vim_markdown_fenced_languages = ['csharp=cs']
+```
+
+This will cause the following to be highlighted using the `cs` filetype syntax.
+
+    ```csharp
+    ...
+    ```
+
+Default is `['c++=cpp', 'viml=vim', 'bash=sh', 'ini=dosini']`.
+
+### Syntax extensions
+
+The following options control which syntax extensions will be turned on. They are off by default.
+
+#### LaTeX math
+
+Used as `$x^2$`, `$$x^2$$`, escapable as `\$x\$` and `\$\$x\$\$`.
+
+```vim
+let g:vim_markdown_math = 1
+```
+
+#### YAML Front Matter
+
+Highlight YAML front matter as used by Jekyll or [Hugo](https://gohugo.io/content/front-matter/).
+
+```vim
+let g:vim_markdown_frontmatter = 1
+```
+
+#### TOML Front Matter
+
+Highlight TOML front matter as used by [Hugo](https://gohugo.io/content/front-matter/).
+
+TOML syntax highlight requires [vim-toml](https://github.com/cespare/vim-toml).
+
+```vim
+let g:vim_markdown_toml_frontmatter = 1
+```
+
+#### JSON Front Matter
+
+Highlight JSON front matter as used by [Hugo](https://gohugo.io/content/front-matter/).
+
+JSON syntax highlight requires [vim-json](https://github.com/elzr/vim-json).
+
+```vim
+let g:vim_markdown_json_frontmatter = 1
+```
+
+### Adjust new list item indent
+
+You can adjust a new list indent. For example, you insert a single line like below:
+
+```
+* item1
+```
+
+Then if you type `o` to insert new line in vim and type `* item2`, the result will be:
+
+```
+* item1
+    * item2
+```
+
+vim-markdown automatically insert the indent. By default, the number of spaces of indent is 4. If you'd like to change the number as 2, just write:
+
+```vim
+let g:vim_markdown_new_list_item_indent = 2
+```
+
+### Do not require .md extensions for Markdown links
+
+If you want to have a link like this `[link text](link-url)` and follow it for editing in vim using the `ge` command, but have it open the file "link-url.md" instead of the file "link-url", then use this option:
+
+```vim
+let g:vim_markdown_no_extensions_in_markdown = 1
+```
+This is super useful for GitLab and GitHub wiki repositories.
+
+Normal behaviour would be that vim-markup required you to do this `[link text](link-url.md)`, but this is not how the Gitlab and GitHub wiki repositories work. So this option adds some consistency between the two. 
+
+### Auto-write when following link
+
+If you follow a link like this `[link text](link-url)` using the `ge` shortcut, this option will automatically save any edits you made before moving you:
+
+```vim
+let g:vim_markdown_autowrite = 1
+```
+
+## Mappings
+
+The following work on normal and visual modes:
+
+-   `gx`: open the link under the cursor in the same browser as the standard `gx` command. `<Plug>Markdown_OpenUrlUnderCursor`
+
+    The standard `gx` is extended by allowing you to put your cursor anywhere inside a link.
+
+    For example, all the following cursor positions will work:
+
+        [Example](http://example.com)
+        ^  ^    ^^   ^       ^
+        1  2    34   5       6
+
+        <http://example.com>
+        ^  ^               ^
+        1  2               3
+
+    Known limitation: does not work for links that span multiple lines.
+
+-   `ge`: open the link under the cursor in Vim for editing. Useful for relative markdown links. `<Plug>Markdown_EditUrlUnderCursor`
+
+    The rules for the cursor position are the same as the `gx` command.
+
+-   `]]`: go to next header. `<Plug>Markdown_MoveToNextHeader`
+
+-   `[[`: go to previous header. Contrast with `]c`. `<Plug>Markdown_MoveToPreviousHeader`
+
+-   `][`: go to next sibling header if any. `<Plug>Markdown_MoveToNextSiblingHeader`
+
+-   `[]`: go to previous sibling header if any. `<Plug>Markdown_MoveToPreviousSiblingHeader`
+
+-   `]c`: go to Current header. `<Plug>Markdown_MoveToCurHeader`
+
+-   `]u`: go to parent header (Up). `<Plug>Markdown_MoveToParentHeader`
+
+This plugin follows the recommended Vim plugin mapping interface, so to change the map `]u` to `asdf`, add to your `.vimrc`:
+
+    map asdf <Plug>Markdown_MoveToParentHeader
+
+To disable a map use:
+
+    map <Plug> <Plug>Markdown_MoveToParentHeader
+
+## Commands
+
+The following requires `:filetype plugin on`.
+
+-   `:HeaderDecrease`:
+
+    Decrease level of all headers in buffer: `h2` to `h1`, `h3` to `h2`, etc.
+
+    If range is given, only operate in the range.
+
+    If an `h1` would be decreased, abort.
+
+    For simplicity of implementation, Setex headers are converted to Atx.
+
+-   `:HeaderIncrease`: Analogous to `:HeaderDecrease`, but increase levels instead.
+
+-   `:SetexToAtx`:
+
+    Convert all Setex style headers in buffer to Atx.
+
+    If a range is given, e.g. hit `:` from visual mode, only operate on the range.
+
+-   `:TableFormat`: Format the table under the cursor [like this](http://www.cirosantilli.com/markdown-style-guide/#tables).
+
+    Requires [Tabular](https://github.com/godlygeek/tabular).
+
+    The input table *must* already have a separator line as the second line of the table.
+    That line only needs to contain the correct pipes `|`, nothing else is required.
+
+-   `:Toc`: create a quickfix vertical window navigable table of contents with the headers.
+
+    Hit `<Enter>` on a line to jump to the corresponding line of the markdown file.
+
+-   `:Toch`: Same as `:Toc` but in an horizontal window.
+
+-   `:Toct`: Same as `:Toc` but in a new tab.
+
+-   `:Tocv`: Same as `:Toc` for symmetry with `:Toch` and `:Tocv`.
+
+## Credits
+
+The main contributors of vim-markdown are:
+
+- **Ben Williams** (A.K.A. **plasticboy**). The original developer of vim-markdown. [Homepage](http://plasticboy.com/).
+
+If you feel that your name should be on this list, please make a pull request listing your contributions.
+
+## License
+
+The MIT License (MIT)
+
+Copyright (c) 2012 Benjamin D. Williams
+
+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/vim-plugins/bundle/vim-markdown/after/ftplugin/markdown.vim b/vim-plugins/bundle/vim-markdown/after/ftplugin/markdown.vim
new file mode 100644
index 0000000..9ee0100
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/after/ftplugin/markdown.vim
@@ -0,0 +1,160 @@
+" folding for Markdown headers, both styles (atx- and setex-)
+" http://daringfireball.net/projects/markdown/syntax#header
+"
+" this code can be placed in file
+"   $HOME/.vim/after/ftplugin/markdown.vim
+"
+" original version from Steve Losh's gist: https://gist.github.com/1038710
+
+function! s:is_mkdCode(lnum)
+    let name = synIDattr(synID(a:lnum, 1, 0), 'name')
+    return (name =~ '^mkd\%(Code$\|Snippet\)' || name != '' && name !~ '^\%(mkd\|html\)')
+endfunction
+
+if get(g:, "vim_markdown_folding_style_pythonic", 0)
+    function! Foldexpr_markdown(lnum)
+        let l1 = getline(a:lnum)
+        " keep track of fenced code blocks
+        if l1 =~ '````*' || l1 =~ '\~\~\~\~*'
+            if b:fenced_block == 0
+                let b:fenced_block = 1
+            elseif b:fenced_block == 1
+                let b:fenced_block = 0
+            endif
+        elseif g:vim_markdown_frontmatter == 1
+            if b:front_matter == 1 && a:lnum > 2
+                let l0 = getline(a:lnum-1)
+                if l0 == '---'
+                    let b:front_matter = 0
+                endif
+            elseif a:lnum == 1
+                if l1 == '---'
+                    let b:front_matter = 1
+                endif
+            endif
+        endif
+
+        if b:fenced_block == 1 || b:front_matter == 1
+            if a:lnum == 1
+                " fold any 'preamble'
+                return '>1'
+            else
+                " keep previous foldlevel
+                return '='
+            endif
+        endif
+
+        let l2 = getline(a:lnum+1)
+        if l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
+            " next line is underlined (level 1)
+            return '>0'
+        elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
+            " next line is underlined (level 2)
+            return '>1'
+        endif
+
+        if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
+            " current line starts with hashes
+            return '>'.(matchend(l1, '^#\+') - 1)
+        elseif a:lnum == 1
+            " fold any 'preamble'
+            return '>1'
+        else
+            " keep previous foldlevel
+            return '='
+        endif
+    endfunction
+
+    function! Foldtext_markdown()
+        let line = getline(v:foldstart)
+        let has_numbers = &number || &relativenumber
+        let nucolwidth = &fdc + has_numbers * &numberwidth
+        let windowwidth = winwidth(0) - nucolwidth - 6
+        let foldedlinecount = v:foldend - v:foldstart
+        let line = strpart(line, 0, windowwidth - 2 -len(foldedlinecount))
+        let line = substitute(line, '\%("""\|''''''\)', '', '')
+        let fillcharcount = windowwidth - len(line) - len(foldedlinecount) + 1
+        return line . ' ' . repeat("-", fillcharcount) . ' ' . foldedlinecount
+    endfunction
+else
+    function! Foldexpr_markdown(lnum)
+        if (a:lnum == 1)
+            let l0 = ''
+        else
+            let l0 = getline(a:lnum-1)
+        endif
+
+        " keep track of fenced code blocks
+        if l0 =~ '````*' || l0 =~ '\~\~\~\~*'
+            if b:fenced_block == 0
+                let b:fenced_block = 1
+            elseif b:fenced_block == 1
+                let b:fenced_block = 0
+            endif
+        elseif g:vim_markdown_frontmatter == 1
+            if b:front_matter == 1
+                if l0 == '---'
+                    let b:front_matter = 0
+                endif
+            elseif a:lnum == 2
+                if l0 == '---'
+                    let b:front_matter = 1
+                endif
+            endif
+        endif
+
+        if b:fenced_block == 1 || b:front_matter == 1
+            " keep previous foldlevel
+            return '='
+        endif
+
+        let l2 = getline(a:lnum+1)
+        if  l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
+            " next line is underlined (level 1)
+            return '>1'
+        elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
+            " next line is underlined (level 2)
+            if s:vim_markdown_folding_level >= 2
+                return '>1'
+            else
+                return '>2'
+            endif
+        endif
+
+        let l1 = getline(a:lnum)
+        if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
+            " fold level according to option
+            if s:vim_markdown_folding_level == 1 || matchend(l1, '^#\+') > s:vim_markdown_folding_level
+                if a:lnum == line('$')
+                    return matchend(l1, '^#\+') - 1
+                else
+                    return -1
+                endif
+            else
+                " headers are not folded
+                return 0
+            endif
+        endif
+
+        if l0 =~ '^#' && !s:is_mkdCode(a:lnum-1)
+            " previous line starts with hashes
+            return '>'.matchend(l0, '^#\+')
+        else
+            " keep previous foldlevel
+            return '='
+        endif
+    endfunction
+endif
+
+
+let b:fenced_block = 0
+let b:front_matter = 0
+let s:vim_markdown_folding_level = get(g:, "vim_markdown_folding_level", 1)
+
+if !get(g:, "vim_markdown_folding_disabled", 0)
+    setlocal foldexpr=Foldexpr_markdown(v:lnum)
+    setlocal foldmethod=expr
+    if get(g:, "vim_markdown_folding_style_pythonic", 0) && get(g:, "vim_markdown_override_foldtext", 1)
+        setlocal foldtext=Foldtext_markdown()
+    endif
+endif
diff --git a/vim-plugins/bundle/vim-markdown/doc/vim-markdown.txt b/vim-plugins/bundle/vim-markdown/doc/vim-markdown.txt
new file mode 100644
index 0000000..c6d579e
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/doc/vim-markdown.txt
@@ -0,0 +1,452 @@
+*vim-markdown*  Vim Markdown
+
+===============================================================================
+Contents ~
+
+ 1. Introduction                                    |vim-markdown-introduction|
+ 2. Installation                                    |vim-markdown-installation|
+ 3. Options                                              |vim-markdown-options|
+  1. Disable Folding                             |vim-markdown-disable-folding|
+  2. Change fold style                         |vim-markdown-change-fold-style|
+  3. Set header folding level           |vim-markdown-set-header-folding-level|
+  4. Disable Default Key Mappings   |vim-markdown-disable-default-key-mappings|
+  5. Enable TOC window auto-fit       |vim-markdown-enable-toc-window-auto-fit|
+  6. Text emphasis restriction to single-lines
+                       |vim-markdown-text-emphasis-restriction-to-single-lines|
+  7. Syntax Concealing                         |vim-markdown-syntax-concealing|
+  8. Fenced code block languages     |vim-markdown-fenced-code-block-languages|
+  9. Syntax extensions                         |vim-markdown-syntax-extensions|
+   1. LaTeX math                                      |vim-markdown-latex-math|
+   2. YAML Front Matter                        |vim-markdown-yaml-front-matter|
+   3. TOML Front Matter                        |vim-markdown-toml-front-matter|
+   4. JSON Front Matter                        |vim-markdown-json-front-matter|
+  10. Adjust new list item indent    |vim-markdown-adjust-new-list-item-indent|
+  11. Do not require .md extensions for Markdown links
+                |vim-markdown-do-not-require-.md-extensions-for-markdown-links|
+  12. Auto-write when following link
+                                  |vim-markdown-auto-write-when-following-link|
+ 4. Mappings                                            |vim-markdown-mappings|
+ 5. Commands                                            |vim-markdown-commands|
+ 6. Credits                                              |vim-markdown-credits|
+ 7. License                                              |vim-markdown-license|
+ 8. References                                        |vim-markdown-references|
+
+===============================================================================
+                                                    *vim-markdown-introduction*
+Introduction ~
+
+Syntax highlighting, matching rules and mappings for the original Markdown [1]
+and extensions.
+
+===============================================================================
+                                                    *vim-markdown-installation*
+Installation ~
+
+If you use Vundle [2], add the following line to your '~/.vimrc':
+>
+  Plugin 'godlygeek/tabular'
+  Plugin 'plasticboy/vim-markdown'
+<
+The 'tabular' plugin must come _before_ 'vim-markdown'.
+
+Then run inside Vim:
+>
+  :so ~/.vimrc
+  :PluginInstall
+<
+If you use Pathogen [3], do this:
+>
+  cd ~/.vim/bundle
+  git clone https://github.com/plasticboy/vim-markdown.git
+<
+To install without Pathogen using the Debian vim-addon-manager [4], do this:
+>
+  git clone https://github.com/plasticboy/vim-markdown.git
+  cd vim-markdown
+  sudo make install
+  vim-addon-manager install markdown
+<
+If you are not using any package manager, download the tarball [5] and do this:
+>
+  cd ~/.vim
+  tar --strip=1 -zxf vim-markdown-master.tar.gz
+<
+===============================================================================
+                                                         *vim-markdown-options*
+Options ~
+
+-------------------------------------------------------------------------------
+                                                 *vim-markdown-disable-folding*
+Disable Folding ~
+
+Add the following line to your '.vimrc' to disable the folding configuration:
+>
+  let g:vim_markdown_folding_disabled = 1
+<
+This option only controls Vim Markdown specific folding configuration.
+
+To enable/disable folding use Vim's standard folding configuration.
+>
+  set [no]foldenable
+<
+-------------------------------------------------------------------------------
+                                               *vim-markdown-change-fold-style*
+Change fold style ~
+
+To fold in a style like python-mode [6], add the following to your '.vimrc':
+>
+  let g:vim_markdown_folding_style_pythonic = 1
+<
+Level 1 heading which is served as a document title is not folded.
+'g:vim_markdown_folding_level' setting is not active with this fold style.
+
+To prevent foldtext from being set add the following to your '.vimrc':
+>
+  let g:vim_markdown_override_foldtext = 0
+<
+-------------------------------------------------------------------------------
+                                        *vim-markdown-set-header-folding-level*
+Set header folding level ~
+
+Folding level is a number between 1 and 6. By default, if not specified, it is
+set to 1.
+>
+  let g:vim_markdown_folding_level = 6
+<
+Tip: it can be changed on the fly with:
+>
+  :let g:vim_markdown_folding_level = 1
+  :edit
+<
+-------------------------------------------------------------------------------
+                                    *vim-markdown-disable-default-key-mappings*
+Disable Default Key Mappings ~
+
+Add the following line to your '.vimrc' to disable default key mappings:
+>
+  let g:vim_markdown_no_default_key_mappings = 1
+<
+You can also map them by yourself with '<Plug>' mappings.
+
+-------------------------------------------------------------------------------
+                                      *vim-markdown-enable-toc-window-auto-fit*
+Enable TOC window auto-fit ~
+
+Allow for the TOC window to auto-fit when it's possible for it to shrink. It
+never increases its default size (half screen), it only shrinks.
+>
+  let g:vim_markdown_toc_autofit = 1
+<
+-------------------------------------------------------------------------------
+                       *vim-markdown-text-emphasis-restriction-to-single-lines*
+Text emphasis restriction to single-lines ~
+
+By default text emphasis works across multiple lines until a closing token is
+found. However, it's possible to restrict text emphasis to a single line (ie,
+for it to be applied a closing token must be found on the same line). To do so:
+>
+  let g:vim_markdown_emphasis_multiline = 0
+<
+-------------------------------------------------------------------------------
+                                               *vim-markdown-syntax-concealing*
+Syntax Concealing ~
+
+Concealing is set for some syntax.
+
+For example, conceal '[link text](link url)' as just 'link text'. Also,
+'_italic_' and '*italic*' will conceal to just _italic_. Similarly '__bold__',
+'**bold**', '___italic bold___', and '***italic bold***' will conceal to just
+**bold**, **bold**, **_italic bold_**, and **_italic bold_** respectively.
+
+To enable conceal use Vim's standard conceal configuration.
+>
+  set conceallevel=2
+<
+To disable conceal regardless of 'conceallevel' setting, add the following to
+your '.vimrc':
+>
+  let g:vim_markdown_conceal = 0
+<
+To disable math conceal with LaTeX math syntax enabled, add the following to
+your '.vimrc':
+>
+  let g:tex_conceal = ""
+  let g:vim_markdown_math = 1
+<
+-------------------------------------------------------------------------------
+                                     *vim-markdown-fenced-code-block-languages*
+Fenced code block languages ~
+
+You can use filetype name as fenced code block languages for syntax
+highlighting. If you want to use different name from filetype, you can add it
+in your '.vimrc' like so:
+>
+  let g:vim_markdown_fenced_languages = ['csharp=cs']
+<
+This will cause the following to be highlighted using the 'cs' filetype syntax.
+>
+  ```csharp
+  ...
+  ```
+<
+Default is "['c++=cpp', 'viml=vim', 'bash=sh', 'ini=dosini']".
+
+-------------------------------------------------------------------------------
+                                               *vim-markdown-syntax-extensions*
+Syntax extensions ~
+
+The following options control which syntax extensions will be turned on. They
+are off by default.
+
+-------------------------------------------------------------------------------
+                                                      *vim-markdown-latex-math*
+LaTeX math ~
+
+Used as '$x^2$', '$$x^2$$', escapable as '\$x\$' and '\$\$x\$\$'.
+>
+  let g:vim_markdown_math = 1
+<
+-------------------------------------------------------------------------------
+                                               *vim-markdown-yaml-front-matter*
+YAML Front Matter ~
+
+Highlight YAML front matter as used by Jekyll or Hugo [7].
+>
+  let g:vim_markdown_frontmatter = 1
+<
+-------------------------------------------------------------------------------
+                                               *vim-markdown-toml-front-matter*
+TOML Front Matter ~
+
+Highlight TOML front matter as used by Hugo [7].
+
+TOML syntax highlight requires vim-toml [8].
+>
+  let g:vim_markdown_toml_frontmatter = 1
+<
+-------------------------------------------------------------------------------
+                                               *vim-markdown-json-front-matter*
+JSON Front Matter ~
+
+Highlight JSON front matter as used by Hugo [7].
+
+JSON syntax highlight requires vim-json [9].
+>
+  let g:vim_markdown_json_frontmatter = 1
+<
+-------------------------------------------------------------------------------
+                                     *vim-markdown-adjust-new-list-item-indent*
+Adjust new list item indent ~
+
+You can adjust a new list indent. For example, you insert a single line like
+below:
+>
+  * item1
+<
+Then if you type 'o' to insert new line in vim and type '* item2', the result
+will be:
+>
+  * item1
+      * item2
+<
+vim-markdown automatically insert the indent. By default, the number of spaces
+of indent is 4. If you'd like to change the number as 2, just write:
+>
+  let g:vim_markdown_new_list_item_indent = 2
+<
+-------------------------------------------------------------------------------
+                *vim-markdown-do-not-require-.md-extensions-for-markdown-links*
+Do not require .md extensions for Markdown links ~
+
+If you want to have a link like this '[link text](link-url)' and follow it for
+editing in vim using the 'ge' command, but have it open the file "link-url.md"
+instead of the file "link-url", then use this option:
+>
+  let g:vim_markdown_no_extensions_in_markdown = 1
+<
+This is super useful for GitLab and GitHub wiki repositories.
+
+Normal behaviour would be that vim-markup required you to do this '[link text
+](link-url.md)', but this is not how the Gitlab and GitHub wiki repositories
+work. So this option adds some consistency between the two.
+
+-------------------------------------------------------------------------------
+                                  *vim-markdown-auto-write-when-following-link*
+Auto-write when following link ~
+
+If you follow a link like this '[link text](link-url)' using the 'ge' shortcut,
+this option will automatically save any edits you made before moving you:
+>
+  let g:vim_markdown_autowrite = 1
+<
+===============================================================================
+                                                        *vim-markdown-mappings*
+Mappings ~
+
+The following work on normal and visual modes:
+
+                                                              *vim-markdown-gx*
+- 'gx': open the link under the cursor in the same browser as the standard
+  'gx' command. '<Plug>Markdown_OpenUrlUnderCursor'
+
+  The standard 'gx' is extended by allowing you to put your cursor anywhere
+  inside a link.
+
+  For example, all the following cursor positions will work:
+>
+  [Example](http://example.com)
+  ^  ^    ^^   ^       ^
+  1  2    34   5       6
+
+  <http://example.com>
+  ^  ^               ^
+  1  2               3
+<
+  Known limitation: does not work for links that span multiple lines.
+
+                                                              *vim-markdown-ge*
+- 'ge': open the link under the cursor in Vim for editing. Useful for
+  relative markdown links. '<Plug>Markdown_EditUrlUnderCursor'
+
+  The rules for the cursor position are the same as the 'gx' command.
+
+                                                              *vim-markdown-]]*
+- ']]': go to next header. '<Plug>Markdown_MoveToNextHeader'
+
+                                                              *vim-markdown-[[*
+- '[[': go to previous header. Contrast with ']c'.
+  '<Plug>Markdown_MoveToPreviousHeader'
+
+                                                              *vim-markdown-][*
+- '][': go to next sibling header if any.
+  '<Plug>Markdown_MoveToNextSiblingHeader'
+
+                                                              *vim-markdown-[]*
+- '[]': go to previous sibling header if any.
+  '<Plug>Markdown_MoveToPreviousSiblingHeader'
+
+                                                              *vim-markdown-]c*
+- ']c': go to Current header. '<Plug>Markdown_MoveToCurHeader'
+
+                                                              *vim-markdown-]u*
+- ']u': go to parent header (Up). '<Plug>Markdown_MoveToParentHeader'
+
+This plugin follows the recommended Vim plugin mapping interface, so to change
+the map ']u' to 'asdf', add to your '.vimrc':
+>
+  map asdf <Plug>Markdown_MoveToParentHeader
+<
+To disable a map use:
+>
+  map <Plug> <Plug>Markdown_MoveToParentHeader
+<
+===============================================================================
+                                                        *vim-markdown-commands*
+Commands ~
+
+The following requires ':filetype plugin on'.
+
+                                                              *:HeaderDecrease*
+- ':HeaderDecrease':
+
+  Decrease level of all headers in buffer: 'h2' to 'h1', 'h3' to 'h2', etc.
+
+  If range is given, only operate in the range.
+
+  If an 'h1' would be decreased, abort.
+
+  For simplicity of implementation, Setex headers are converted to Atx.
+
+                                                              *:HeaderIncrease*
+- ':HeaderIncrease': Analogous to ':HeaderDecrease', but increase levels
+  instead.
+
+                                                                  *:SetexToAtx*
+- ':SetexToAtx':
+
+  Convert all Setex style headers in buffer to Atx.
+
+  If a range is given, e.g. hit ':' from visual mode, only operate on the
+  range.
+
+                                                                 *:TableFormat*
+- ':TableFormat': Format the table under the cursor like this [10].
+
+  Requires Tabular [11].
+
+  The input table _must_ already have a separator line as the second line of
+  the table. That line only needs to contain the correct pipes '|', nothing
+  else is required.
+
+                                                                         *:Toc*
+- ':Toc': create a quickfix vertical window navigable table of contents with
+  the headers.
+
+  Hit '<Enter>' on a line to jump to the corresponding line of the markdown
+  file.
+
+                                                                        *:Toch*
+- ':Toch': Same as ':Toc' but in an horizontal window.
+
+                                                                        *:Toct*
+- ':Toct': Same as ':Toc' but in a new tab.
+
+                                                                        *:Tocv*
+- ':Tocv': Same as ':Toc' for symmetry with ':Toch' and ':Tocv'.
+
+===============================================================================
+                                                         *vim-markdown-credits*
+Credits ~
+
+The main contributors of vim-markdown are:
+
+- **Ben Williams** (A.K.A. **plasticboy**). The original developer of vim-
+  markdown. Homepage [12].
+
+If you feel that your name should be on this list, please make a pull request
+listing your contributions.
+
+===============================================================================
+                                                         *vim-markdown-license*
+License ~
+
+The MIT License (MIT)
+
+Copyright (c) 2012 Benjamin D. Williams
+
+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.
+
+===============================================================================
+                                                      *vim-markdown-references*
+References ~
+
+[1] http://daringfireball.net/projects/markdown/
+[2] https://github.com/gmarik/vundle
+[3] https://github.com/tpope/vim-pathogen
+[4] http://packages.qa.debian.org/v/vim-addon-manager.html
+[5] https://github.com/plasticboy/vim-markdown/archive/master.tar.gz
+[6] https://github.com/klen/python-mode
+[7] https://gohugo.io/content/front-matter/
+[8] https://github.com/cespare/vim-toml
+[9] https://github.com/elzr/vim-json
+[10] http://www.cirosantilli.com/markdown-style-guide/#tables
+[11] https://github.com/godlygeek/tabular
+[12] http://plasticboy.com/
+
+vim: ft=help
diff --git a/vim-plugins/bundle/vim-markdown/ftdetect/markdown.vim b/vim-plugins/bundle/vim-markdown/ftdetect/markdown.vim
new file mode 100644
index 0000000..611ecaa
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/ftdetect/markdown.vim
@@ -0,0 +1,3 @@
+" markdown filetype file
+au BufRead,BufNewFile *.{md,mdown,mkd,mkdn,markdown,mdwn} set filetype=markdown
+au BufRead,BufNewFile *.{md,mdown,mkd,mkdn,markdown,mdwn}.{des3,des,bf,bfa,aes,idea,cast,rc2,rc4,rc5,desx} set filetype=markdown
diff --git a/vim-plugins/bundle/vim-markdown/ftplugin/markdown.vim b/vim-plugins/bundle/vim-markdown/ftplugin/markdown.vim
new file mode 100644
index 0000000..21c9442
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/ftplugin/markdown.vim
@@ -0,0 +1,749 @@
+"TODO print messages when on visual mode. I only see VISUAL, not the messages.
+
+" Function interface phylosophy:
+"
+" - functions take arbitrary line numbers as parameters.
+"    Current cursor line is only a suitable default parameter.
+"
+" - only functions that bind directly to user actions:
+"
+"    - print error messages.
+"       All intermediate functions limit themselves return `0` to indicate an error.
+"
+"    - move the cursor. All other functions do not move the cursor.
+"
+" This is how you should view headers for the header mappings:
+"
+"   |BUFFER
+"   |
+"   |Outside any header
+"   |
+" a-+# a
+"   |
+"   |Inside a
+"   |
+" a-+
+" b-+## b
+"   |
+"   |inside b
+"   |
+" b-+
+" c-+### c
+"   |
+"   |Inside c
+"   |
+" c-+
+" d-|# d
+"   |
+"   |Inside d
+"   |
+" d-+
+" e-|e
+"   |====
+"   |
+"   |Inside e
+"   |
+" e-+
+
+" For each level, contains the regexp that matches at that level only.
+"
+let s:levelRegexpDict = {
+    \ 1: '\v^(#[^#]@=|.+\n\=+$)',
+    \ 2: '\v^(##[^#]@=|.+\n-+$)',
+    \ 3: '\v^###[^#]@=',
+    \ 4: '\v^####[^#]@=',
+    \ 5: '\v^#####[^#]@=',
+    \ 6: '\v^######[^#]@='
+\ }
+
+" Maches any header level of any type.
+"
+" This could be deduced from `s:levelRegexpDict`, but it is more
+" efficient to have a single regexp for this.
+"
+let s:headersRegexp = '\v^(#|.+\n(\=+|-+)$)'
+
+" Returns the line number of the first header before `line`, called the
+" current header.
+"
+" If there is no current header, return `0`.
+"
+" @param a:1 The line to look the header of. Default value: `getpos('.')`.
+"
+function! s:GetHeaderLineNum(...)
+    if a:0 == 0
+        let l:l = line('.')
+    else
+        let l:l = a:1
+    endif
+    while(l:l > 0)
+        if join(getline(l:l, l:l + 1), "\n") =~ s:headersRegexp
+            return l:l
+        endif
+        let l:l -= 1
+    endwhile
+    return 0
+endfunction
+
+" -  if inside a header goes to it.
+"    Return its line number.
+"
+" -  if on top level outside any headers,
+"    print a warning
+"    Return `0`.
+"
+function! s:MoveToCurHeader()
+    let l:lineNum = s:GetHeaderLineNum()
+    if l:lineNum != 0
+        call cursor(l:lineNum, 1)
+    else
+        echo 'outside any header'
+        "normal! gg
+    endif
+    return l:lineNum
+endfunction
+
+" Move cursor to next header of any level.
+"
+" If there are no more headers, print a warning.
+"
+function! s:MoveToNextHeader()
+    if search(s:headersRegexp, 'W') == 0
+        "normal! G
+        echo 'no next header'
+    endif
+endfunction
+
+" Move cursor to previous header (before current) of any level.
+"
+" If it does not exist, print a warning.
+"
+function! s:MoveToPreviousHeader()
+    let l:curHeaderLineNumber = s:GetHeaderLineNum()
+    let l:noPreviousHeader = 0
+    if l:curHeaderLineNumber <= 1
+        let l:noPreviousHeader = 1
+    else
+        let l:previousHeaderLineNumber = s:GetHeaderLineNum(l:curHeaderLineNumber - 1)
+        if l:previousHeaderLineNumber == 0
+            let l:noPreviousHeader = 1
+        else
+            call cursor(l:previousHeaderLineNumber, 1)
+        endif
+    endif
+    if l:noPreviousHeader
+        echo 'no previous header'
+    endif
+endfunction
+
+" - if line is inside a header, return the header level (h1 -> 1, h2 -> 2, etc.).
+"
+" - if line is at top level outside any headers, return `0`.
+"
+function! s:GetHeaderLevel(...)
+    if a:0 == 0
+        let l:line = line('.')
+    else
+        let l:line = a:1
+    endif
+    let l:linenum = s:GetHeaderLineNum(l:line)
+    if l:linenum != 0
+        return s:GetLevelOfHeaderAtLine(l:linenum)
+    else
+        return 0
+    endif
+endfunction
+
+" Returns the level of the header at the given line.
+"
+" If there is no header at the given line, returns `0`.
+"
+function! s:GetLevelOfHeaderAtLine(linenum)
+    let l:lines = join(getline(a:linenum, a:linenum + 1), "\n")
+    for l:key in keys(s:levelRegexpDict)
+        if l:lines =~ get(s:levelRegexpDict, l:key)
+            return l:key
+        endif
+    endfor
+    return 0
+endfunction
+
+" Move cursor to parent header of the current header.
+"
+" If it does not exit, print a warning and do nothing.
+"
+function! s:MoveToParentHeader()
+    let l:linenum = s:GetParentHeaderLineNumber()
+    if l:linenum != 0
+        call cursor(l:linenum, 1)
+    else
+        echo 'no parent header'
+    endif
+endfunction
+
+" Return the line number of the parent header of line `line`.
+"
+" If it has no parent, return `0`.
+"
+function! s:GetParentHeaderLineNumber(...)
+    if a:0 == 0
+        let l:line = line('.')
+    else
+        let l:line = a:1
+    endif
+    let l:level = s:GetHeaderLevel(l:line)
+    if l:level > 1
+        let l:linenum = s:GetPreviousHeaderLineNumberAtLevel(l:level - 1, l:line)
+        return l:linenum
+    endif
+    return 0
+endfunction
+
+" Return the line number of the previous header of given level.
+" in relation to line `a:1`. If not given, `a:1 = getline()`
+"
+" `a:1` line is included, and this may return the current header.
+"
+" If none return 0.
+"
+function! s:GetNextHeaderLineNumberAtLevel(level, ...)
+    if a:0 < 1
+        let l:line = line('.')
+    else
+        let l:line = a:1
+    endif
+    let l:l = l:line
+    while(l:l <= line('$'))
+        if join(getline(l:l, l:l + 1), "\n") =~ get(s:levelRegexpDict, a:level)
+            return l:l
+        endif
+        let l:l += 1
+    endwhile
+    return 0
+endfunction
+
+" Return the line number of the previous header of given level.
+" in relation to line `a:1`. If not given, `a:1 = getline()`
+"
+" `a:1` line is included, and this may return the current header.
+"
+" If none return 0.
+"
+function! s:GetPreviousHeaderLineNumberAtLevel(level, ...)
+    if a:0 == 0
+        let l:line = line('.')
+    else
+        let l:line = a:1
+    endif
+    let l:l = l:line
+    while(l:l > 0)
+        if join(getline(l:l, l:l + 1), "\n") =~ get(s:levelRegexpDict, a:level)
+            return l:l
+        endif
+        let l:l -= 1
+    endwhile
+    return 0
+endfunction
+
+" Move cursor to next sibling header.
+"
+" If there is no next siblings, print a warning and don't move.
+"
+function! s:MoveToNextSiblingHeader()
+    let l:curHeaderLineNumber = s:GetHeaderLineNum()
+    let l:curHeaderLevel = s:GetLevelOfHeaderAtLine(l:curHeaderLineNumber)
+    let l:curHeaderParentLineNumber = s:GetParentHeaderLineNumber()
+    let l:nextHeaderSameLevelLineNumber = s:GetNextHeaderLineNumberAtLevel(l:curHeaderLevel, l:curHeaderLineNumber + 1)
+    let l:noNextSibling = 0
+    if l:nextHeaderSameLevelLineNumber == 0
+        let l:noNextSibling = 1
+    else
+        let l:nextHeaderSameLevelParentLineNumber = s:GetParentHeaderLineNumber(l:nextHeaderSameLevelLineNumber)
+        if l:curHeaderParentLineNumber == l:nextHeaderSameLevelParentLineNumber
+            call cursor(l:nextHeaderSameLevelLineNumber, 1)
+        else
+            let l:noNextSibling = 1
+        endif
+    endif
+    if l:noNextSibling
+        echo 'no next sibling header'
+    endif
+endfunction
+
+" Move cursor to previous sibling header.
+"
+" If there is no previous siblings, print a warning and do nothing.
+"
+function! s:MoveToPreviousSiblingHeader()
+    let l:curHeaderLineNumber = s:GetHeaderLineNum()
+    let l:curHeaderLevel = s:GetLevelOfHeaderAtLine(l:curHeaderLineNumber)
+    let l:curHeaderParentLineNumber = s:GetParentHeaderLineNumber()
+    let l:previousHeaderSameLevelLineNumber = s:GetPreviousHeaderLineNumberAtLevel(l:curHeaderLevel, l:curHeaderLineNumber - 1)
+    let l:noPreviousSibling = 0
+    if l:previousHeaderSameLevelLineNumber == 0
+        let l:noPreviousSibling = 1
+    else
+        let l:previousHeaderSameLevelParentLineNumber = s:GetParentHeaderLineNumber(l:previousHeaderSameLevelLineNumber)
+        if l:curHeaderParentLineNumber == l:previousHeaderSameLevelParentLineNumber
+            call cursor(l:previousHeaderSameLevelLineNumber, 1)
+        else
+            let l:noPreviousSibling = 1
+        endif
+    endif
+    if l:noPreviousSibling
+        echo 'no previous sibling header'
+    endif
+endfunction
+
+function! s:Toc(...)
+    if a:0 > 0
+        let l:window_type = a:1
+    else
+        let l:window_type = 'vertical'
+    endif
+
+
+    let l:bufnr = bufnr('%')
+    let l:cursor_line = line('.')
+    let l:cursor_header = 0
+    let l:fenced_block = 0
+    let l:front_matter = 0
+    let l:header_list = []
+    let l:header_max_len = 0
+    let l:vim_markdown_toc_autofit = get(g:, "vim_markdown_toc_autofit", 0)
+    let l:vim_markdown_frontmatter = get(g:, "vim_markdown_frontmatter", 0)
+    for i in range(1, line('$'))
+        let l:lineraw = getline(i)
+        let l:l1 = getline(i+1)
+        let l:line = substitute(l:lineraw, "#", "\\\#", "g")
+        if l:line =~ '````*' || l:line =~ '\~\~\~\~*'
+            if l:fenced_block == 0
+                let l:fenced_block = 1
+            elseif l:fenced_block == 1
+                let l:fenced_block = 0
+            endif
+        elseif l:vim_markdown_frontmatter == 1
+            if l:front_matter == 1
+                if l:line == '---'
+                    let l:front_matter = 0
+                endif
+            elseif i == 1
+                if l:line == '---'
+                    let l:front_matter = 1
+                endif
+            endif
+        endif
+        if l:line =~ '^#\+' || (l:l1 =~ '^=\+\s*$' || l:l1 =~ '^-\+\s*$') && l:line =~ '^\S'
+            let l:is_header = 1
+        else
+            let l:is_header = 0
+        endif
+        if l:is_header == 1 && l:fenced_block == 0 && l:front_matter == 0
+            " append line to location list
+            let l:item = {'lnum': i, 'text': l:line, 'valid': 1, 'bufnr': l:bufnr, 'col': 1}
+            let l:header_list = l:header_list + [l:item]
+            " set header number of the cursor position
+            if l:cursor_header == 0
+                if i == l:cursor_line
+                    let l:cursor_header = len(l:header_list)
+                elseif i > l:cursor_line
+                    let l:cursor_header = len(l:header_list) - 1
+                endif
+            endif
+            " keep track of the longest header size (heading level + title)
+            let l:total_len = stridx(l:line, ' ') + strdisplaywidth(l:line)
+            if l:total_len > l:header_max_len
+                let l:header_max_len = l:total_len
+            endif
+        endif
+    endfor
+    call setloclist(0, l:header_list)
+    if len(l:header_list) == 0
+        echom "Toc: No headers."
+        return
+    endif
+
+    if l:window_type ==# 'horizontal'
+        lopen
+    elseif l:window_type ==# 'vertical'
+        vertical lopen
+        " auto-fit toc window when possible to shrink it
+        if (&columns/2) > l:header_max_len && l:vim_markdown_toc_autofit == 1
+            execute 'vertical resize ' . (l:header_max_len + 1)
+        else
+            execute 'vertical resize ' . (&columns/2)
+        endif
+    elseif l:window_type ==# 'tab'
+        tab lopen
+    else
+        lopen
+    endif
+    setlocal modifiable
+    for i in range(1, line('$'))
+        " this is the location-list data for the current item
+        let d = getloclist(0)[i-1]
+        " atx headers
+        if match(d.text, "^#") > -1
+            let l:level = len(matchstr(d.text, '#*', 'g'))-1
+            let d.text = substitute(d.text, '\v^#*[ ]*', '', '')
+            let d.text = substitute(d.text, '\v[ ]*#*$', '', '')
+        " setex headers
+        else
+            let l:next_line = getbufline(d.bufnr, d.lnum+1)
+            if match(l:next_line, "=") > -1
+                let l:level = 0
+            elseif match(l:next_line, "-") > -1
+                let l:level = 1
+            endif
+        endif
+        call setline(i, repeat('  ', l:level). d.text)
+    endfor
+    setlocal nomodified
+    setlocal nomodifiable
+    execute 'normal! ' . l:cursor_header . 'G'
+endfunction
+
+" Convert Setex headers in range `line1 .. line2` to Atx.
+"
+" Return the number of conversions.
+"
+function! s:SetexToAtx(line1, line2)
+    let l:originalNumLines = line('$')
+    execute 'silent! ' . a:line1 . ',' . a:line2 . 'substitute/\v(.*\S.*)\n\=+$/# \1/'
+    execute 'silent! ' . a:line1 . ',' . a:line2 . 'substitute/\v(.*\S.*)\n-+$/## \1/'
+    return l:originalNumLines - line('$')
+endfunction
+
+" If `a:1` is 0, decrease the level of all headers in range `line1 .. line2`.
+"
+" Otherwise, increase the level. `a:1` defaults to `0`.
+"
+function! s:HeaderDecrease(line1, line2, ...)
+    if a:0 > 0
+        let l:increase = a:1
+    else
+        let l:increase = 0
+    endif
+    if l:increase
+        let l:forbiddenLevel = 6
+        let l:replaceLevels = [5, 1]
+        let l:levelDelta = 1
+    else
+        let l:forbiddenLevel = 1
+        let l:replaceLevels = [2, 6]
+        let l:levelDelta = -1
+    endif
+    for l:line in range(a:line1, a:line2)
+        if join(getline(l:line, l:line + 1), "\n") =~ s:levelRegexpDict[l:forbiddenLevel]
+            echomsg 'There is an h' . l:forbiddenLevel . ' at line ' . l:line . '. Aborting.'
+            return
+        endif
+    endfor
+    let l:numSubstitutions = s:SetexToAtx(a:line1, a:line2)
+    let l:flags = (&gdefault ? '' : 'g')
+    for l:level in range(replaceLevels[0], replaceLevels[1], -l:levelDelta)
+        execute 'silent! ' . a:line1 . ',' . (a:line2 - l:numSubstitutions) . 'substitute/' . s:levelRegexpDict[l:level] . '/' . repeat('#', l:level + l:levelDelta) . '/' . l:flags
+    endfor
+endfunction
+
+" Format table under cursor.
+"
+" Depends on Tabularize.
+"
+function! s:TableFormat()
+    let l:pos = getpos('.')
+    normal! {
+    " Search instead of `normal! j` because of the table at beginning of file edge case.
+    call search('|')
+    normal! j
+    " Remove everything that is not a pipe, colon or hyphen next to a colon othewise
+    " well formated tables would grow because of addition of 2 spaces on the separator
+    " line by Tabularize /|.
+    let l:flags = (&gdefault ? '' : 'g')
+    execute 's/\(:\@<!-:\@!\|[^|:-]\)//e' . l:flags
+    execute 's/--/-/e' . l:flags
+    Tabularize /|
+    " Move colons for alignment to left or right side of the cell.
+    execute 's/:\( \+\)|/\1:|/e' . l:flags
+    execute 's/|\( \+\):/|:\1/e' . l:flags
+    execute 's/ /-/' . l:flags
+    call setpos('.', l:pos)
+endfunction
+
+" Wrapper to do move commands in visual mode.
+"
+function! s:VisMove(f)
+    norm! gv
+    call function(a:f)()
+endfunction
+
+" Map in both normal and visual modes.
+"
+function! s:MapNormVis(rhs,lhs)
+    execute 'nn <buffer><silent> ' . a:rhs . ' :call ' . a:lhs . '()<cr>'
+    execute 'vn <buffer><silent> ' . a:rhs . ' <esc>:call <sid>VisMove(''' . a:lhs . ''')<cr>'
+endfunction
+
+" Parameters:
+"
+" - step +1 for right, -1 for left
+"
+" TODO: multiple lines.
+"
+function! s:FindCornerOfSyntax(lnum, col, step)
+    let l:col = a:col
+    let l:syn = synIDattr(synID(a:lnum, l:col, 1), 'name')
+    while synIDattr(synID(a:lnum, l:col, 1), 'name') ==# l:syn
+        let l:col += a:step
+    endwhile
+    return l:col - a:step
+endfunction
+
+" Return the next position of the given syntax name,
+" inclusive on the given position.
+"
+" TODO: multiple lines
+"
+function! s:FindNextSyntax(lnum, col, name)
+    let l:col = a:col
+    let l:step = 1
+    while synIDattr(synID(a:lnum, l:col, 1), 'name') !=# a:name
+        let l:col += l:step
+    endwhile
+    return [a:lnum, l:col]
+endfunction
+
+function! s:FindCornersOfSyntax(lnum, col)
+    return [<sid>FindLeftOfSyntax(a:lnum, a:col), <sid>FindRightOfSyntax(a:lnum, a:col)]
+endfunction
+
+function! s:FindRightOfSyntax(lnum, col)
+    return <sid>FindCornerOfSyntax(a:lnum, a:col, 1)
+endfunction
+
+function! s:FindLeftOfSyntax(lnum, col)
+    return <sid>FindCornerOfSyntax(a:lnum, a:col, -1)
+endfunction
+
+" Returns:
+"
+" - a string with the the URL for the link under the cursor
+" - an empty string if the cursor is not on a link
+"
+" TODO
+"
+" - multiline support
+" - give an error if the separator does is not on a link
+"
+function! s:Markdown_GetUrlForPosition(lnum, col)
+    let l:lnum = a:lnum
+    let l:col = a:col
+    let l:syn = synIDattr(synID(l:lnum, l:col, 1), 'name')
+
+    if l:syn ==# 'mkdInlineURL' || l:syn ==# 'mkdURL' || l:syn ==# 'mkdLinkDefTarget'
+        " Do nothing.
+    elseif l:syn ==# 'mkdLink'
+        let [l:lnum, l:col] = <sid>FindNextSyntax(l:lnum, l:col, 'mkdURL')
+        let l:syn = 'mkdURL'
+    elseif l:syn ==# 'mkdDelimiter'
+        let l:line = getline(l:lnum)
+        let l:char = l:line[col - 1]
+        if l:char ==# '<'
+            let l:col += 1
+        elseif l:char ==# '>' || l:char ==# ')'
+            let l:col -= 1
+        elseif l:char ==# '[' || l:char ==# ']' || l:char ==# '('
+            let [l:lnum, l:col] = <sid>FindNextSyntax(l:lnum, l:col, 'mkdURL')
+        else
+            return ''
+        endif
+    else
+        return ''
+    endif
+
+    let [l:left, l:right] = <sid>FindCornersOfSyntax(l:lnum, l:col)
+    return getline(l:lnum)[l:left - 1 : l:right - 1]
+endfunction
+
+" Front end for GetUrlForPosition.
+"
+function! s:OpenUrlUnderCursor()
+    let l:url = s:Markdown_GetUrlForPosition(line('.'), col('.'))
+    if l:url != ''
+        call s:VersionAwareNetrwBrowseX(l:url)
+    else
+        echomsg 'The cursor is not on a link.'
+    endif
+endfunction
+
+" We need a definition guard because we invoke 'edit' which will reload this
+" script while this function is running. We must not replace it.
+if !exists("*s:EditUrlUnderCursor")
+  function s:EditUrlUnderCursor()
+      let l:url = s:Markdown_GetUrlForPosition(line('.'), col('.'))
+      if l:url != ''
+          if get(g:, 'vim_markdown_autowrite', 0)
+            write
+          endif
+          if get(g:, 'vim_markdown_no_extensions_in_markdown', 0)
+              execute 'edit' fnamemodify(expand('%:~'), ':p:h').'/'.l:url.'.md'
+          else
+              execute 'edit' l:url 
+          endif
+      else
+          echomsg 'The cursor is not on a link.'
+      endif
+  endfunction
+endif
+
+function! s:VersionAwareNetrwBrowseX(url)
+    if has('patch-7.4.567')
+        call netrw#BrowseX(a:url, 0)
+    else
+        call netrw#NetrwBrowseX(a:url, 0)
+    endif
+endf
+
+function! s:MapNotHasmapto(lhs, rhs)
+    if !hasmapto('<Plug>' . a:rhs)
+        execute 'nmap <buffer>' . a:lhs . ' <Plug>' . a:rhs
+        execute 'vmap <buffer>' . a:lhs . ' <Plug>' . a:rhs
+    endif
+endfunction
+
+call <sid>MapNormVis('<Plug>Markdown_MoveToNextHeader', '<sid>MoveToNextHeader')
+call <sid>MapNormVis('<Plug>Markdown_MoveToPreviousHeader', '<sid>MoveToPreviousHeader')
+call <sid>MapNormVis('<Plug>Markdown_MoveToNextSiblingHeader', '<sid>MoveToNextSiblingHeader')
+call <sid>MapNormVis('<Plug>Markdown_MoveToPreviousSiblingHeader', '<sid>MoveToPreviousSiblingHeader')
+call <sid>MapNormVis('<Plug>Markdown_MoveToParentHeader', '<sid>MoveToParentHeader')
+call <sid>MapNormVis('<Plug>Markdown_MoveToCurHeader', '<sid>MoveToCurHeader')
+nnoremap <Plug>Markdown_OpenUrlUnderCursor :call <sid>OpenUrlUnderCursor()<cr>
+nnoremap <Plug>Markdown_EditUrlUnderCursor :call <sid>EditUrlUnderCursor()<cr>
+
+if !get(g:, 'vim_markdown_no_default_key_mappings', 0)
+    call <sid>MapNotHasmapto(']]', 'Markdown_MoveToNextHeader')
+    call <sid>MapNotHasmapto('[[', 'Markdown_MoveToPreviousHeader')
+    call <sid>MapNotHasmapto('][', 'Markdown_MoveToNextSiblingHeader')
+    call <sid>MapNotHasmapto('[]', 'Markdown_MoveToPreviousSiblingHeader')
+    call <sid>MapNotHasmapto(']u', 'Markdown_MoveToParentHeader')
+    call <sid>MapNotHasmapto(']c', 'Markdown_MoveToCurHeader')
+    call <sid>MapNotHasmapto('gx', 'Markdown_OpenUrlUnderCursor')
+    call <sid>MapNotHasmapto('ge', 'Markdown_EditUrlUnderCursor')
+endif
+
+command! -buffer -range=% HeaderDecrease call s:HeaderDecrease(<line1>, <line2>)
+command! -buffer -range=% HeaderIncrease call s:HeaderDecrease(<line1>, <line2>, 1)
+command! -buffer -range=% SetexToAtx call s:SetexToAtx(<line1>, <line2>)
+command! -buffer TableFormat call s:TableFormat()
+command! -buffer Toc call s:Toc()
+command! -buffer Toch call s:Toc('horizontal')
+command! -buffer Tocv call s:Toc('vertical')
+command! -buffer Toct call s:Toc('tab')
+
+" Heavily based on vim-notes - http://peterodding.com/code/vim/notes/
+if exists('g:vim_markdown_fenced_languages')
+    let s:filetype_dict = {}
+    for s:filetype in g:vim_markdown_fenced_languages
+        let key = matchstr(s:filetype, "[^=]*")
+        let val = matchstr(s:filetype, "[^=]*$")
+        let s:filetype_dict[key] = val
+    endfor
+else
+    let s:filetype_dict = {
+        \ 'c++': 'cpp',
+        \ 'viml': 'vim',
+        \ 'bash': 'sh',
+        \ 'ini': 'dosini'
+    \ }
+endif
+
+function! s:MarkdownHighlightSources(force)
+    " Syntax highlight source code embedded in notes.
+    " Look for code blocks in the current file
+    let filetypes = {}
+    for line in getline(1, '$')
+        let ft = matchstr(line, '```\s*\zs[0-9A-Za-z_+-]*')
+        if !empty(ft) && ft !~ '^\d*$' | let filetypes[ft] = 1 | endif
+    endfor
+    if !exists('b:mkd_known_filetypes')
+        let b:mkd_known_filetypes = {}
+    endif
+    if !exists('b:mkd_included_filetypes')
+        " set syntax file name included
+        let b:mkd_included_filetypes = {}
+    endif
+    if !a:force && (b:mkd_known_filetypes == filetypes || empty(filetypes))
+        return
+    endif
+
+    " Now we're ready to actually highlight the code blocks.
+    let startgroup = 'mkdCodeStart'
+    let endgroup = 'mkdCodeEnd'
+    for ft in keys(filetypes)
+        if a:force || !has_key(b:mkd_known_filetypes, ft)
+            if has_key(s:filetype_dict, ft)
+                let filetype = s:filetype_dict[ft]
+            else
+                let filetype = ft
+            endif
+            let group = 'mkdSnippet' . toupper(substitute(filetype, "[+-]", "_", "g"))
+            if !has_key(b:mkd_included_filetypes, filetype)
+                let include = s:SyntaxInclude(filetype)
+                let b:mkd_included_filetypes[filetype] = 1
+            else
+                let include = '@' . toupper(filetype)
+            endif
+            let command = 'syntax region %s matchgroup=%s start="^\s*```\s*%s$" matchgroup=%s end="\s*```$" keepend contains=%s%s'
+            execute printf(command, group, startgroup, ft, endgroup, include, has('conceal') && get(g:, 'vim_markdown_conceal', 1) ? ' concealends' : '')
+            execute printf('syntax cluster mkdNonListItem add=%s', group)
+
+            let b:mkd_known_filetypes[ft] = 1
+        endif
+    endfor
+endfunction
+
+function! s:SyntaxInclude(filetype)
+    " Include the syntax highlighting of another {filetype}.
+    let grouplistname = '@' . toupper(a:filetype)
+    " Unset the name of the current syntax while including the other syntax
+    " because some syntax scripts do nothing when "b:current_syntax" is set
+    if exists('b:current_syntax')
+        let syntax_save = b:current_syntax
+        unlet b:current_syntax
+    endif
+    try
+        execute 'syntax include' grouplistname 'syntax/' . a:filetype . '.vim'
+        execute 'syntax include' grouplistname 'after/syntax/' . a:filetype . '.vim'
+    catch /E484/
+        " Ignore missing scripts
+    endtry
+    " Restore the name of the current syntax
+    if exists('syntax_save')
+        let b:current_syntax = syntax_save
+    elseif exists('b:current_syntax')
+        unlet b:current_syntax
+    endif
+    return grouplistname
+endfunction
+
+
+function! s:MarkdownRefreshSyntax(force)
+    if &filetype == 'markdown' && line('$') > 1
+        call s:MarkdownHighlightSources(a:force)
+    endif
+endfunction
+
+function! s:MarkdownClearSyntaxVariables()
+    if &filetype == 'markdown'
+        unlet! b:mkd_included_filetypes
+    endif
+endfunction
+
+augroup Mkd
+    autocmd!
+    au BufWinEnter * call s:MarkdownRefreshSyntax(1)
+    au BufUnload * call s:MarkdownClearSyntaxVariables()
+    au BufWritePost * call s:MarkdownRefreshSyntax(0)
+    au InsertEnter,InsertLeave * call s:MarkdownRefreshSyntax(0)
+    au CursorHold,CursorHoldI * call s:MarkdownRefreshSyntax(0)
+augroup END
diff --git a/vim-plugins/bundle/vim-markdown/indent/markdown.vim b/vim-plugins/bundle/vim-markdown/indent/markdown.vim
new file mode 100755
index 0000000..103e160
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/indent/markdown.vim
@@ -0,0 +1,75 @@
+if exists("b:did_indent") | finish | endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetMarkdownIndent()
+setlocal nolisp
+setlocal autoindent
+
+" Automatically insert bullets
+setlocal formatoptions+=r
+" Do not automatically insert bullets when auto-wrapping with text-width
+setlocal formatoptions-=c
+" Accept various markers as bullets
+setlocal comments=b:*,b:+,b:-
+
+" Automatically continue blockquote on line break
+setlocal comments+=b:>
+
+" Only define the function once
+if exists("*GetMarkdownIndent") | finish | endif
+
+function! s:IsMkdCode(lnum)
+    let name = synIDattr(synID(a:lnum, 1, 0), 'name')
+    return (name =~ '^mkd\%(Code$\|Snippet\)' || name != '' && name !~ '^\%(mkd\|html\)')
+endfunction
+
+function! s:IsLiStart(line)
+    return a:line !~ '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' &&
+      \    a:line =~ '^\s*[*+-] \+'
+endfunction
+
+function! s:IsHeaderLine(line)
+    return a:line =~ '^\s*#'
+endfunction
+
+function! s:IsBlankLine(line)
+    return a:line =~ '^$'
+endfunction
+
+function! s:PrevNonBlank(lnum)
+    let i = a:lnum
+    while i > 1 && s:IsBlankLine(getline(i))
+        let i -= 1
+    endwhile
+    return i
+endfunction
+
+function GetMarkdownIndent()
+    if v:lnum > 2 && s:IsBlankLine(getline(v:lnum - 1)) && s:IsBlankLine(getline(v:lnum - 2))
+        return 0
+    endif
+    let list_ind = get(g:, "vim_markdown_new_list_item_indent", 4)
+    " Find a non-blank line above the current line.
+    let lnum = s:PrevNonBlank(v:lnum - 1)
+    " At the start of the file use zero indent.
+    if lnum == 0 | return 0 | endif
+    let ind = indent(lnum)
+    let line = getline(lnum)    " Last line
+    let cline = getline(v:lnum) " Current line
+    if s:IsLiStart(cline)
+        " Current line is the first line of a list item, do not change indent
+        return indent(v:lnum)
+    elseif s:IsHeaderLine(cline) && !s:IsMkdCode(v:lnum)
+        " Current line is the header, do not indent
+        return 0
+    elseif s:IsLiStart(line)
+        if s:IsMkdCode(lnum)
+            return ind
+        else
+            " Last line is the first line of a list item, increase indent
+            return ind + list_ind
+        end
+    else
+        return ind
+    endif
+endfunction
diff --git a/vim-plugins/bundle/vim-markdown/registry/markdown.yaml b/vim-plugins/bundle/vim-markdown/registry/markdown.yaml
new file mode 100644
index 0000000..4d293ee
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/registry/markdown.yaml
@@ -0,0 +1,9 @@
+addon: markdown
+description: "Markdown syntax highlighting"
+files:
+  - ftdetect/markdown.vim
+  - ftplugin/markdown.vim
+  - syntax/markdown.vim
+  - after/ftplugin/markdown.vim
+  - indent/markdown.vim
+  - doc/vim-markdown.txt
diff --git a/vim-plugins/bundle/vim-markdown/syntax/markdown.vim b/vim-plugins/bundle/vim-markdown/syntax/markdown.vim
new file mode 100644
index 0000000..384c277
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/syntax/markdown.vim
@@ -0,0 +1,175 @@
+" Vim syntax file
+" Language:	Markdown
+" Maintainer:	Ben Williams <benw@plasticboy.com>
+" URL:		http://plasticboy.com/markdown-vim-mode/
+" Remark:	Uses HTML syntax file
+" TODO: 	Handle stuff contained within stuff (e.g. headings within blockquotes)
+
+
+" Read the HTML syntax to start with
+if version < 600
+  so <sfile>:p:h/html.vim
+else
+  runtime! syntax/html.vim
+
+  if exists('b:current_syntax')
+    unlet b:current_syntax
+  endif
+endif
+
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+" don't use standard HiLink, it will not work with included syntax files
+if version < 508
+  command! -nargs=+ HtmlHiLink hi link <args>
+else
+  command! -nargs=+ HtmlHiLink hi def link <args>
+endif
+
+syn spell toplevel
+syn case ignore
+syn sync linebreaks=1
+
+let s:conceal = ''
+let s:concealends = ''
+if has('conceal') && get(g:, 'vim_markdown_conceal', 1)
+  let s:conceal = ' conceal'
+  let s:concealends = ' concealends'
+endif
+
+" additions to HTML groups
+if get(g:, 'vim_markdown_emphasis_multiline', 1)
+    let s:oneline = ''
+else
+    let s:oneline = ' oneline'
+endif
+syn region mkdItalic matchgroup=mkdItalic start="\%(\*\|_\)"    end="\%(\*\|_\)"
+syn region mkdBold matchgroup=mkdBold start="\%(\*\*\|__\)"    end="\%(\*\*\|__\)"
+syn region mkdBoldItalic matchgroup=mkdBoldItalic start="\%(\*\*\*\|___\)"    end="\%(\*\*\*\|___\)"
+execute 'syn region htmlItalic matchgroup=mkdItalic start="\%(^\|\s\)\zs\*\ze[^\\\*\t ]\%(\%([^*]\|\\\*\|\n\)*[^\\\*\t ]\)\?\*\_W" end="[^\\\*\t ]\zs\*\ze\_W" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlItalic matchgroup=mkdItalic start="\%(^\|\s\)\zs_\ze[^\\_\t ]" end="[^\\_\t ]\zs_\ze\_W" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlBold matchgroup=mkdBold start="\%(^\|\s\)\zs\*\*\ze\S" end="\S\zs\*\*" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlBold matchgroup=mkdBold start="\%(^\|\s\)\zs__\ze\S" end="\S\zs__" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|\s\)\zs\*\*\*\ze\S" end="\S\zs\*\*\*" keepend contains=@Spell' . s:oneline . s:concealends
+execute 'syn region htmlBoldItalic matchgroup=mkdBoldItalic start="\%(^\|\s\)\zs___\ze\S" end="\S\zs___" keepend contains=@Spell' . s:oneline . s:concealends
+
+" [link](URL) | [link][id] | [link][] | ![image](URL)
+syn region mkdFootnotes matchgroup=mkdDelimiter start="\[^"    end="\]"
+execute 'syn region mkdID matchgroup=mkdDelimiter    start="\["    end="\]" contained oneline' . s:conceal
+execute 'syn region mkdURL matchgroup=mkdDelimiter   start="("     end=")"  contained oneline' . s:conceal
+execute 'syn region mkdLink matchgroup=mkdDelimiter  start="\\\@<!!\?\[\ze[^]\n]*\n\?[^]\n]*\][[(]" end="\]" contains=@mkdNonListItem,@Spell nextgroup=mkdURL,mkdID skipwhite' . s:concealends
+
+" Autolink without angle brackets.
+" mkd  inline links:      protocol     optional  user:pass@  sub/domain                    .com, .co.uk, etc         optional port   path/querystring/hash fragment
+"                         ------------ _____________________ ----------------------------- _________________________ ----------------- __
+syn match   mkdInlineURL /https\?:\/\/\(\w\+\(:\w\+\)\?@\)\?\([A-Za-z0-9][-_0-9A-Za-z]*\.\)\{1,}\(\w\{2,}\.\?\)\{1,}\(:[0-9]\{1,5}\)\?\S*/
+
+" Autolink with parenthesis.
+syn region  mkdInlineURL matchgroup=mkdDelimiter start="(\(https\?:\/\/\(\w\+\(:\w\+\)\?@\)\?\([A-Za-z0-9][-_0-9A-Za-z]*\.\)\{1,}\(\w\{2,}\.\?\)\{1,}\(:[0-9]\{1,5}\)\?\S*)\)\@=" end=")"
+
+" Autolink with angle brackets.
+syn region mkdInlineURL matchgroup=mkdDelimiter start="\\\@<!<\ze[a-z][a-z0-9,.-]\{1,22}:\/\/[^> ]*>" end=">"
+
+" Link definitions: [id]: URL (Optional Title)
+syn region mkdLinkDef matchgroup=mkdDelimiter   start="^ \{,3}\zs\[\^\@!" end="]:" oneline nextgroup=mkdLinkDefTarget skipwhite
+syn region mkdLinkDefTarget start="<\?\zs\S" excludenl end="\ze[>[:space:]\n]"   contained nextgroup=mkdLinkTitle,mkdLinkDef skipwhite skipnl oneline
+syn region mkdLinkTitle matchgroup=mkdDelimiter start=+"+     end=+"+  contained
+syn region mkdLinkTitle matchgroup=mkdDelimiter start=+'+     end=+'+  contained
+syn region mkdLinkTitle matchgroup=mkdDelimiter start=+(+     end=+)+  contained
+
+"HTML headings
+syn region htmlH1       start="^\s*#"                   end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH2       start="^\s*##"                  end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH3       start="^\s*###"                 end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH4       start="^\s*####"                end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH5       start="^\s*#####"               end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn region htmlH6       start="^\s*######"              end="$" contains=mkdLink,mkdInlineURL,@Spell
+syn match  htmlH1       /^.\+\n=\+$/ contains=mkdLink,mkdInlineURL,@Spell
+syn match  htmlH2       /^.\+\n-\+$/ contains=mkdLink,mkdInlineURL,@Spell
+
+"define Markdown groups
+syn match  mkdLineBreak    /  \+$/
+syn region mkdBlockquote   start=/^\s*>/                   end=/$/ contains=mkdLink,mkdInlineURL,mkdLineBreak,@Spell
+syn region mkdCode         start=/\(\([^\\]\|^\)\\\)\@<!`/ end=/\(\([^\\]\|^\)\\\)\@<!`/
+syn region mkdCode         start=/\s*``[^`]*/              end=/[^`]*``\s*/
+syn region mkdCode         start=/^\s*\z(`\{3,}\)[^`]*$/   end=/^\s*\z1`*\s*$/
+syn region mkdCode         start=/\s*\~\~[^\~]*/           end=/[^\~]*\~\~\s*/
+syn region mkdCode         start=/^\s*\z(\~\{3,}\)\s*[0-9A-Za-z_+-]*\s*$/         end=/^\s*\z1\~*\s*$/
+syn region mkdCode         start="<pre[^>]*\\\@<!>"        end="</pre>"
+syn region mkdCode         start="<code[^>]*\\\@<!>"       end="</code>"
+syn region mkdFootnote     start="\[^"                     end="\]"
+syn match  mkdCode         /^\s*\n\(\(\s\{8,}[^ ]\|\t\t\+[^\t]\).*\n\)\+/
+syn match  mkdCode         /\%^\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/
+syn match  mkdCode         /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/ contained
+syn match  mkdListItem     /^\s*\%([-*+]\|\d\+\.\)\ze\s\+/ contained
+syn region mkdListItemLine start="^\s*\%([-*+]\|\d\+\.\)\s\+" end="$" oneline contains=@mkdNonListItem,mkdListItem,@Spell
+syn region mkdNonListItemBlock start="\(\%^\(\s*\([-*+]\|\d\+\.\)\s\+\)\@!\|\n\(\_^\_$\|\s\{4,}[^ ]\|\t+[^\t]\)\@!\)" end="^\(\s*\([-*+]\|\d\+\.\)\s\+\)\@=" contains=@mkdNonListItem,@Spell
+syn match  mkdRule         /^\s*\*\s\{0,1}\*\s\{0,1}\*$/
+syn match  mkdRule         /^\s*-\s\{0,1}-\s\{0,1}-$/
+syn match  mkdRule         /^\s*_\s\{0,1}_\s\{0,1}_$/
+syn match  mkdRule         /^\s*-\{3,}$/
+syn match  mkdRule         /^\s*\*\{3,5}$/
+
+" YAML frontmatter
+if get(g:, 'vim_markdown_frontmatter', 0)
+  syn include @yamlTop syntax/yaml.vim
+  syn region Comment matchgroup=mkdDelimiter start="\%^---$" end="^---$" contains=@yamlTop keepend
+  unlet! b:current_syntax
+endif
+
+if get(g:, 'vim_markdown_toml_frontmatter', 0)
+  try
+    syn include @tomlTop syntax/toml.vim
+    syn region Comment matchgroup=mkdDelimiter start="\%^+++$" end="^+++$" transparent contains=@tomlTop keepend
+    unlet! b:current_syntax
+  catch /E484/
+    syn region Comment matchgroup=mkdDelimiter start="\%^+++$" end="^+++$"
+  endtry
+endif
+
+if get(g:, 'vim_markdown_json_frontmatter', 0)
+  try
+    syn include @jsonTop syntax/json.vim
+    syn region Comment matchgroup=mkdDelimiter start="\%^{$" end="^}$" contains=@jsonTop keepend
+    unlet! b:current_syntax
+  catch /E484/
+    syn region Comment matchgroup=mkdDelimiter start="\%^{$" end="^}$"
+  endtry
+endif
+
+if get(g:, 'vim_markdown_math', 0)
+  syn include @tex syntax/tex.vim
+  syn region mkdMath start="\\\@<!\$" end="\$" contains=@tex keepend
+  syn region mkdMath start="\\\@<!\$\$" end="\$\$" contains=@tex keepend
+endif
+
+syn cluster mkdNonListItem contains=@htmlTop,htmlItalic,htmlBold,htmlBoldItalic,mkdFootnotes,mkdInlineURL,mkdLink,mkdLinkDef,mkdLineBreak,mkdBlockquote,mkdCode,mkdRule,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,mkdMath
+
+"highlighting for Markdown groups
+HtmlHiLink mkdString        String
+HtmlHiLink mkdCode          String
+HtmlHiLink mkdCodeStart     String
+HtmlHiLink mkdCodeEnd       String
+HtmlHiLink mkdFootnote      Comment
+HtmlHiLink mkdBlockquote    Comment
+HtmlHiLink mkdListItem      Identifier
+HtmlHiLink mkdRule          Identifier
+HtmlHiLink mkdLineBreak     Visual
+HtmlHiLink mkdFootnotes     htmlLink
+HtmlHiLink mkdLink          htmlLink
+HtmlHiLink mkdURL           htmlString
+HtmlHiLink mkdInlineURL     htmlLink
+HtmlHiLink mkdID            Identifier
+HtmlHiLink mkdLinkDef       mkdID
+HtmlHiLink mkdLinkDefTarget mkdURL
+HtmlHiLink mkdLinkTitle     htmlString
+HtmlHiLink mkdDelimiter     Delimiter
+
+let b:current_syntax = "mkd"
+
+delcommand HtmlHiLink
+" vim: ts=8
diff --git a/vim-plugins/bundle/vim-markdown/test/README.md b/vim-plugins/bundle/vim-markdown/test/README.md
new file mode 100644
index 0000000..a13d6d2
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/README.md
@@ -0,0 +1,5 @@
+You can run the tests using the Makefile from the top directory:
+
+    make test
+
+To run them manually please refer to the instructions/commands in the Makefile.
diff --git a/vim-plugins/bundle/vim-markdown/test/folding-toc.vader b/vim-plugins/bundle/vim-markdown/test/folding-toc.vader
new file mode 100644
index 0000000..79c5400
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/folding-toc.vader
@@ -0,0 +1,178 @@
+" Tests atx and setext folding, and :Toc.
+
+Before:
+  source ../after/ftplugin/markdown.vim
+
+After:
+  setlocal foldexpr=0
+  setlocal foldmethod=manual
+
+Given markdown;
+# chap 1
+
+hello
+world
+
+```bash
+# some bash scripting
+pwd
+
+# this is another comment
+# other
+echo "foo"
+```
+
+## chap 1.1
+
+- dog
+- cat
+
+~~~~bash
+mkdir foo
+# comment in ~
+~~~~
+
+### chap 1.1.1
+
+- dragons
+- fenixs
+
+# chap 2
+
+another
+
+## chap 2.1
+
+- uk
+- japan
+- china
+
+
+# chap 3
+
+nothing here
+
+chap 4
+======
+
+setext are evil
+
+chap 4.1
+--------
+
+evil indeed
+
+````bash
+# get system info
+uname -a
+````
+
+Execute (fold level):
+  AssertEqual foldlevel(1), 0, '# chap 1'
+  AssertEqual foldlevel(3), 1, 'hello'
+  AssertEqual foldlevel(6), 1, '```bash'
+  AssertEqual foldlevel(7), 1, '# some bash scripting'
+  AssertEqual foldlevel(15), 1, '## chap 1.1'
+  AssertEqual foldlevel(21), 2, 'mkdir foo'
+  AssertEqual foldlevel(22), 2, 'comment in ~'
+  AssertEqual foldlevel(25), 2, '### chap 1.1.1'
+  AssertEqual foldlevel(27), 3, '- dragons'
+  AssertEqual foldlevel(30), 1, '# chap 2'
+  AssertEqual foldlevel(32), 1, 'another'
+  AssertEqual foldlevel(34), 1, '# chap 2.1'
+  AssertEqual foldlevel(37), 2, '- japan'
+  AssertEqual foldlevel(41), 1, '# chap 3'
+  AssertEqual foldlevel(45), 1, 'chap 4\n======'
+  AssertEqual foldlevel(48), 1, 'setext are evil'
+  AssertEqual foldlevel(50), 2, 'chap 4.1\n------'
+
+Execute (fold text result):
+  AssertEqual foldtextresult(2), '+-- 28 lines: hello'
+  AssertEqual foldtextresult(31), '+-- 10 lines: another'
+  AssertEqual foldtextresult(42), '+--  3 lines: nothing here'
+  AssertEqual foldtextresult(45), '+-- 14 lines: chap 4'
+
+Execute (fold level with setting):
+  let g:vim_markdown_folding_level = 2
+  source ../after/ftplugin/markdown.vim
+  AssertEqual foldlevel(1), 0, '# chap 1'
+  AssertEqual foldlevel(3), 1, 'hello'
+  AssertEqual foldlevel(6), 1, '```bash'
+  AssertEqual foldlevel(7), 1, '# some bash scripting'
+  AssertEqual foldlevel(15), 0, '## chap 1.1'
+  AssertEqual foldlevel(21), 2, 'mkdir foo'
+  AssertEqual foldlevel(22), 2, 'comment in ~'
+  AssertEqual foldlevel(25), 2, '### chap 1.1.1'
+  AssertEqual foldlevel(27), 3, '- dragons'
+  AssertEqual foldlevel(30), 0, '# chap 2'
+  AssertEqual foldlevel(32), 1, 'another'
+  AssertEqual foldlevel(34), 0, '# chap 2.1'
+  AssertEqual foldlevel(37), 2, '- japan'
+  AssertEqual foldlevel(41), 0, '# chap 3'
+  AssertEqual foldlevel(45), 1, 'chap 4\n======'
+  AssertEqual foldlevel(48), 1, 'setext are evil'
+  AssertEqual foldlevel(50), 1, 'chap 4.1\n------'
+  let g:vim_markdown_folding_level = 0
+
+Execute (check TOC):
+  :Toc
+  :lclose
+  let res = getloclist(0)
+  let elem = res[0]
+  AssertEqual elem.lnum, 1
+  AssertEqual elem.text, '# chap 1'
+  let elem = res[1]
+  AssertEqual elem.lnum, 15
+  AssertEqual elem.text, '## chap 1.1'
+  let elem = res[2]
+  AssertEqual elem.lnum, 25
+  AssertEqual elem.text, '### chap 1.1.1'
+  let elem = res[3]
+  AssertEqual elem.lnum, 30
+  AssertEqual elem.text, '# chap 2'
+  let elem = res[4]
+  AssertEqual elem.lnum, 34
+  AssertEqual elem.text, '## chap 2.1'
+  let elem = res[5]
+  AssertEqual elem.lnum, 41
+  AssertEqual elem.text, '# chap 3'
+  let elem = res[6]
+  AssertEqual elem.lnum, 45
+  AssertEqual elem.text, 'chap 4'
+  let elem = res[7]
+  AssertEqual elem.lnum, 50
+  AssertEqual elem.text, 'chap 4.1'
+
+Given markdown;
+---
+layout: article
+title: A test of the heading folding when there is YAML frontmatter
+tags: markdown yaml vim-markdown
+---
+body
+
+heading
+-------
+
+Execute (fold level of yaml front matter):
+  let g:vim_markdown_frontmatter = 1
+  source ../after/ftplugin/markdown.vim
+  AssertEqual foldlevel(1), 0, '---'
+  AssertEqual foldlevel(2), 0, 'layout: article'
+  AssertEqual foldlevel(4), 0, 'tags: markdown yaml vim-markdown'
+  AssertEqual foldlevel(5), 0, '---'
+  AssertEqual foldlevel(6), 0, 'body'
+  AssertEqual foldlevel(8), 2, 'heading'
+  AssertEqual foldlevel(9), 2, '-------'
+  unlet g:vim_markdown_frontmatter
+
+Execute (check Toc of yaml front matter):
+  let g:vim_markdown_frontmatter = 1
+  :Toc
+  :lclose
+  let res = getloclist(0)
+  AssertEqual len(res), 1
+  let elem = res[0]
+  AssertEqual elem.lnum, 8
+  AssertEqual elem.text, 'heading'
+  unlet g:vim_markdown_frontmatter
diff --git a/vim-plugins/bundle/vim-markdown/test/folding.vader b/vim-plugins/bundle/vim-markdown/test/folding.vader
new file mode 100644
index 0000000..ecf5f9b
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/folding.vader
@@ -0,0 +1,53 @@
+Before:
+  source ../after/ftplugin/markdown.vim
+
+After:
+  setlocal foldexpr=0
+  setlocal foldmethod=manual
+
+Given markdown;
+# Title
+
+## Chapter 1
+
+```
+This is code block
+# This is just a comment
+```
+
+## Capter 2
+
+foobar
+
+Execute (fold level # in code block):
+  AssertEqual foldlevel(1), 0, '# Title'
+  AssertEqual foldlevel(3), 1, '## Chapter 1'
+  AssertEqual foldlevel(7), 2, '# This is just a comment'
+  AssertEqual foldlevel(8), 2, '```'
+  AssertEqual foldlevel(10), 1, '## Chapter 2'
+  AssertEqual foldlevel(12), 2, 'foobar'
+
+Given markdown;
+Fold Level 1
+============
+Fold Level 2
+------------
+
+Execute (fold level ==, --):
+  AssertEqual foldlevel(2), 1, '=='
+  AssertEqual foldlevel(4), 2, '--'
+
+Given markdown;
+# H1
+
+## H1.1
+
+## H1.2
+
+# H2
+
+Execute (fold level # in last line):
+  AssertEqual foldlevel(1), 0, '# H1'
+  AssertEqual foldlevel(3), 1, '## H1.1'
+  AssertEqual foldlevel(5), 1, '## H1.2'
+  AssertEqual foldlevel(7), 0, '# H2'
diff --git a/vim-plugins/bundle/vim-markdown/test/ge_test.md b/vim-plugins/bundle/vim-markdown/test/ge_test.md
new file mode 100644
index 0000000..0f5e100
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/ge_test.md
@@ -0,0 +1 @@
+ge test
diff --git a/vim-plugins/bundle/vim-markdown/test/indent-new-list-item.vader b/vim-plugins/bundle/vim-markdown/test/indent-new-list-item.vader
new file mode 100644
index 0000000..f73d7cc
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/indent-new-list-item.vader
@@ -0,0 +1,15 @@
+Before:
+  let g:vim_markdown_new_list_item_indent = 2
+
+After:
+  unlet g:vim_markdown_new_list_item_indent
+
+Given markdown;
+* item1
+
+Do (new line from the first item of the list and add the second item):
+  o* item2
+
+Expect (insert 2 spaces to the head of second item):
+  * item1
+    * item2
diff --git a/vim-plugins/bundle/vim-markdown/test/indent.md b/vim-plugins/bundle/vim-markdown/test/indent.md
new file mode 100644
index 0000000..6d250a1
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/indent.md
@@ -0,0 +1,26 @@
+1. Confirm indent with new line insert after list items
+
+'\' is not list item.
+\ foo
+
+If only space and three '*' or '-' character are in the line,
+this line means horizontal item.
+If current line is below horizontal item, it need not to indent.
+Following example is horizontal item.
+
+---
+***
+- - -
+* * *
+
+And list item must be specified space after [*-+].
+Following example is list item.
+
+* foo
+- bar
++ baz
+
+But following example is not list item.
+*foo
+-bar
++baz
diff --git a/vim-plugins/bundle/vim-markdown/test/indent.vader b/vim-plugins/bundle/vim-markdown/test/indent.vader
new file mode 100644
index 0000000..e0870d5
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/indent.vader
@@ -0,0 +1,73 @@
+Given markdown;
+* item1
+
+Do (insert enter at list end):
+  A\<cr>item2
+
+Expect (auto insert * and indent level is same):
+  * item1
+  * item2
+
+Given markdown;
+
+Execute:
+  syntax off
+
+Do (insert enter at list end with syntax off):
+  i* item1\<cr>item2
+
+Expect (auto insert * and indent level is same):
+  * item1
+  * item2
+
+Execute:
+  syntax on
+
+Given markdown;
+```
+* item1
+
+Do (insert after list items in code block):
+  jotext
+
+Expect (no autoindent in code block):
+  ```
+  * item1
+  text
+
+Given markdown;
+* item1
+
+a
+
+Do (insert enter after list):
+  jji\<cr>b
+
+Expect (no autoindent outside list):
+  * item1
+
+
+  ba
+
+Given markdown;
+-   a
+
+    # b
+
+Do (insert header after list):
+  jjwi#
+
+Expect (no indent header after list):
+  -   a
+
+  ## b
+
+Given markdown;
+* item1
+
+Do (new line from the first item of the list and add the second item):
+  o* item2
+
+Expect (insert 4 spaces to the head of second item):
+  * item1
+      * item2
diff --git a/vim-plugins/bundle/vim-markdown/test/map.vader b/vim-plugins/bundle/vim-markdown/test/map.vader
new file mode 100644
index 0000000..7ecdfad
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/map.vader
@@ -0,0 +1,153 @@
+Given markdown;
+a <http://b> c
+
+Execute (gx autolink):
+  let b:url = 'http://b'
+  let b:line = getline(1)
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'Markdown_GetUrlForPosition')
+  AssertEqual b:func(1, match(b:line, 'a') + 1), ''
+  AssertEqual b:func(1, match(b:line, '<') + 1), b:url
+  AssertEqual b:func(1, match(b:line, 'h') + 1), b:url
+  AssertEqual b:func(1, match(b:line, '>') + 1), b:url
+  AssertEqual b:func(1, match(b:line, 'c') + 1), ''
+
+Given markdown;
+a http://b.bb c
+
+Execute (gx implicit autolink):
+  let b:url = 'http://b.bb'
+  let b:line = getline(1)
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'Markdown_GetUrlForPosition')
+  AssertEqual b:func(1, match(b:line, 'a') + 1), ''
+  AssertEqual b:func(1, match(b:line, 'h') + 1), b:url
+  AssertEqual b:func(1, match(b:line, 'c') + 1), ''
+
+Given markdown;
+[a]: http://b "c"
+
+Execute (gx link reference definition):
+  let b:url = 'http://b'
+  let b:line = getline(1)
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'Markdown_GetUrlForPosition')
+  " TODO would be cool if all of the following gave the link.
+  AssertEqual b:func(1, match(b:line, 'a') + 1), ''
+  AssertEqual b:func(1, match(b:line, 'h') + 1), b:url
+  AssertEqual b:func(1, match(b:line, 'c') + 1), ''
+
+Given markdown;
+a [b](c) d
+
+Execute (gx autolink):
+  let b:url = 'c'
+  let b:line = getline(1)
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'Markdown_GetUrlForPosition')
+  AssertEqual b:func(1, match(b:line, 'a') + 1), ''
+  AssertEqual b:func(1, match(b:line, '[') + 1), b:url
+  AssertEqual b:func(1, match(b:line, 'b') + 1), b:url
+  AssertEqual b:func(1, match(b:line, ']') + 1), b:url
+  AssertEqual b:func(1, match(b:line, '(') + 1), b:url
+  AssertEqual b:func(1, match(b:line, 'c') + 1), b:url
+  AssertEqual b:func(1, match(b:line, ')') + 1), b:url
+  AssertEqual b:func(1, match(b:line, 'd') + 1), ''
+
+Given markdown;
+[ge_test.md](ge_test.md)
+
+Execute (ge opens file):
+  normal ge
+  AssertEqual @%, 'ge_test.md'
+  AssertEqual getline(1), 'ge test'
+
+Given markdown;
+[ge_test](ge_test)
+
+Execute (ge opens file without .md extensions):
+  let g:vim_markdown_no_extensions_in_markdown = 1
+  normal ge
+  AssertEqual @%, 'ge_test.md'
+  AssertEqual getline(1), 'ge test'
+  unlet g:vim_markdown_no_extensions_in_markdown
+
+Given markdown;
+[ge_test.md](ge_test.md)
+
+Execute (ge does not write before opening file):
+  normal ia
+  normal l
+  normal ge
+  AssertEqual @%, 'ge_test.md'
+  AssertEqual getline(1), 'ge test'
+
+Given markdown;
+[ge_test.md](ge_test.md)
+
+Execute (ge auto-write before opening file):
+  let g:vim_markdown_autowrite = 1
+  normal ia
+  normal l
+  AssertThrows normal ge
+  AssertEqual g:vader_exception, 'Vim(write):E382: Cannot write, ''buftype'' option is set'
+  unlet g:vim_markdown_autowrite
+
+Given markdown;
+# a
+
+b
+
+# c
+
+d
+
+Execute (]] same level):
+  AssertEqual line('.'), 1
+  normal ]]
+  AssertEqual line('.'), 5
+  normal [[
+  AssertEqual line('.'), 1
+
+Given markdown;
+# a
+
+b
+
+## c
+
+d
+
+Execute (]] different levels level):
+  AssertEqual line('.'), 1
+  normal ]]
+  AssertEqual line('.'), 5
+  normal [[
+  AssertEqual line('.'), 1
+
+Given markdown;
+# a
+
+b
+
+## c
+
+d
+
+# e
+
+f
+
+Execute (][ different levels level):
+  AssertEqual line('.'), 1
+  normal ][
+  AssertEqual line('.'), 9
+  normal []
+  AssertEqual line('.'), 1
+
+Given markdown;
+# a
+
+b
+
+Execute (]c):
+  normal! 3G
+  AssertEqual line('.'), 3
+  normal ]c
+  AssertEqual line('.'), 1
diff --git a/vim-plugins/bundle/vim-markdown/test/python-folding.vader b/vim-plugins/bundle/vim-markdown/test/python-folding.vader
new file mode 100644
index 0000000..91fc9e2
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/python-folding.vader
@@ -0,0 +1,85 @@
+Before:
+  let g:vim_markdown_folding_style_pythonic = 1
+  source ../after/ftplugin/markdown.vim
+
+After:
+  setlocal foldexpr=0
+  setlocal foldmethod=manual
+
+Given markdown;
+# Title
+
+## Chapter 1
+
+```
+This is code block
+# This is just a comment
+```
+
+## Chapter 2
+
+foobar
+
+Execute (fold level # in code block):
+  AssertEqual foldlevel(1), 0, '# Title'
+  AssertEqual foldlevel(3), 1, '## Chapter 1'
+  AssertEqual foldlevel(7), 1, '# This is just a comment'
+  AssertEqual foldlevel(8), 1, '```'
+  AssertEqual foldlevel(10), 1, '## Chapter 2'
+  AssertEqual foldlevel(12), 1, 'foobar'
+
+Execute (fold text of chapters):
+  let b:width = winwidth(0)
+  let b:hyphen = repeat('-', b:width - 18 > 2 ? b:width - 18 : b:width - 9 > 0 ? 3 : 2)
+  AssertEqual foldtextresult(3), strpart('## Chapter 1', 0, b:width - 9) . ' ' . b:hyphen . ' 6'
+  AssertEqual foldtextresult(10), strpart('## Chapter 2', 0, b:width - 9) . ' ' . b:hyphen . ' 2'
+
+Given markdown;
+Fold text 1
+===========
+Fold text 2
+-----------
+
+Execute (fold level ==, --):
+  AssertEqual foldlevel(2), 0, '=='
+  AssertEqual foldlevel(4), 1, '--'
+
+Execute (fold text of ==, --):
+  let b:width = winwidth(0)
+  let b:hyphen = repeat('-', b:width - 17 > 2 ? b:width - 17 : b:width - 9 > 0 ? 3 : 2)
+  AssertEqual foldtextresult(3), strpart('Fold text 2', 0, b:width - 9) . ' ' . b:hyphen . ' 1'
+
+Given markdown;
+Headline
+
+foobar
+
+# Title
+
+Execute (fold any preamble):
+  AssertEqual foldlevel(1), 1, 'Headline'
+  AssertEqual foldlevel(3), 1, 'foobar'
+  AssertEqual foldlevel(5), 0, '# Title'
+
+Given markdown;
+---
+layout: article
+title: A test of the heading folding when there is YAML frontmatter
+tags: markdown yaml vim-markdown
+---
+body
+
+heading
+-------
+
+Execute (fold level of yaml front matter):
+  let g:vim_markdown_frontmatter = 1
+  source ../after/ftplugin/markdown.vim
+  AssertEqual foldlevel(1), 1, '---'
+  AssertEqual foldlevel(2), 1, 'layout: article'
+  AssertEqual foldlevel(4), 1, 'tags: markdown yaml vim-markdown'
+  AssertEqual foldlevel(5), 1, '---'
+  AssertEqual foldlevel(6), 1, 'body'
+  AssertEqual foldlevel(8), 1, 'heading'
+  AssertEqual foldlevel(9), 1, '-------'
+  unlet g:vim_markdown_frontmatter
diff --git a/vim-plugins/bundle/vim-markdown/test/run-tests.sh b/vim-plugins/bundle/vim-markdown/test/run-tests.sh
new file mode 100755
index 0000000..5c9db06
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/run-tests.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# Exit on error.
+set -e
+
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+
+for dep in ../build/tabular ../build/vim-toml ../build/vim-json ../build/vader.vim; do
+  if [[ ! -d $dep ]]; then
+    echo "Missing dependency: $dep"
+    echo "You may just want to use 'make test'."
+    exit 1
+  fi
+done
+
+vim -Nu vimrc -c 'Vader! *' > /dev/null
diff --git a/vim-plugins/bundle/vim-markdown/test/syntax-singleline.vader b/vim-plugins/bundle/vim-markdown/test/syntax-singleline.vader
new file mode 100644
index 0000000..9fde407
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/syntax-singleline.vader
@@ -0,0 +1,158 @@
+Before:
+  let g:vim_markdown_emphasis_multiline = 0
+  syn off | syn on
+
+After:
+  let g:vim_markdown_emphasis_multiline = 1
+  syn off | syn on
+
+Given markdown;
+a **b** c
+
+Execute (bold):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertNotEqual SyntaxOf('c'), 'htmlBold'
+
+Given markdown;
+a __b__ c
+
+Execute (bold):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertNotEqual SyntaxOf('c'), 'htmlBold'
+
+Given markdown;
+a *b* c
+
+Execute (italic):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a _b_ c
+
+Execute (italic):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+_a_b_
+
+Execute (italic text has underscores):
+  AssertEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+
+Given markdown;
+a \*b\* c
+
+Execute (not italic with escaped asterisks):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a \_b\_ c
+
+Execute (not italic with escaped underscores):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a _b\_c_ d
+
+Execute (italic with escaped underscores):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+a_b_c
+
+Execute (not italic underscores within text):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a *b\*c* d
+
+Execute (italic with escaped asterisks):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+a __b\_\_c__ d
+
+Execute (bold with escaped underscores):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertEqual SyntaxOf('c'), 'htmlBold'
+  AssertNotEqual SyntaxOf('d'), 'htmlBold'
+
+Given markdown;
+_a b
+c_ d
+
+Execute (italic with underscores in multiple lines):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+__a b
+c__ d
+
+Execute (bold with underscores in multiple lines):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertNotEqual SyntaxOf('b'), 'htmlBold'
+  AssertNotEqual SyntaxOf('c'), 'htmlBold'
+  AssertNotEqual SyntaxOf('d'), 'htmlBold'
+
+Given markdown;
+___a b
+c___ d
+
+Execute (bold italic with underscores in multiple lines):
+  AssertNotEqual SyntaxOf('a'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlBoldItalic'
+
+Given markdown;
+*a b
+c* d
+
+Execute (italic with asterisks in multiple lines):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+**a b
+c** d
+
+Execute (bold with asterisks in multiple lines):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertNotEqual SyntaxOf('b'), 'htmlBold'
+  AssertNotEqual SyntaxOf('c'), 'htmlBold'
+  AssertNotEqual SyntaxOf('d'), 'htmlBold'
+
+Given markdown;
+***a b
+c*** d
+
+Execute (bold italic with asterisks in multiple lines):
+  AssertNotEqual SyntaxOf('a'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlBoldItalic'
+
diff --git a/vim-plugins/bundle/vim-markdown/test/syntax.md b/vim-plugins/bundle/vim-markdown/test/syntax.md
new file mode 100644
index 0000000..33f5500
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/syntax.md
@@ -0,0 +1,89 @@
+# Fenced code living in an indented environment is correctly highlighted
+
+1. run this command to do this:
+
+    ```
+some command
+    ```
+
+2. Subsequent list items are correctly highlighted.
+
+Fenced code block with language:
+
+```ruby
+def f
+  0
+end
+```
+
+# Links
+
+[a](b "c")
+
+[a]()
+
+[good spell](a)
+
+[badd spell](a)
+
+[a](b "c")
+
+[a]( b
+"c" )
+
+a (`a`) b. Fix: <https://github.com/plasticboy/vim-markdown/issues/113>
+
+Escaped:
+
+\[a](b)
+
+[a\]b](c)
+
+## Known failures
+
+Escape does not work:
+
+[a\](b)
+
+Should not be links because of whitespace:
+
+[a] (b)
+
+[a](a
+b)
+
+[a](a b)
+
+# Reference links
+
+Single links:
+
+[a][b]
+
+[good spell][a]
+
+[badd spell][a]
+
+[a][]
+
+[a] []
+
+[a][b] c [d][e]
+
+Reference link followed by inline link:
+
+[a] [b](c)
+
+## Known failures
+
+Should be shortcut reference links:
+
+[a]
+
+[a] b [c]
+
+Should be a single link:
+
+[a] [b]
+
+[a] b [c](d)
diff --git a/vim-plugins/bundle/vim-markdown/test/syntax.vader b/vim-plugins/bundle/vim-markdown/test/syntax.vader
new file mode 100644
index 0000000..0540155
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/syntax.vader
@@ -0,0 +1,1250 @@
+Before:
+  unlet! b:mkd_known_filetypes
+  unlet! b:mkd_included_filetypes
+  unlet! g:vim_markdown_math
+
+Given markdown;
+a **b** c
+
+Execute (bold):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertNotEqual SyntaxOf('c'), 'htmlBold'
+
+Given markdown;
+a __b__ c
+
+Execute (bold):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertNotEqual SyntaxOf('c'), 'htmlBold'
+
+Given markdown;
+a *b* c
+
+Execute (italic):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a _b_ c
+
+Execute (italic):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+_a_b_
+
+Execute (italic text has underscores):
+  AssertEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+
+Given markdown;
+a \*b\* c
+
+Execute (not italic with escaped asterisks):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a \_b\_ c
+
+Execute (not italic with escaped underscores):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a _b\_c_ d
+
+Execute (italic with escaped underscores):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+a_b_c
+
+Execute (not italic underscores within text):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('b'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('c'), 'htmlItalic'
+
+Given markdown;
+a *b\*c* d
+
+Execute (italic with escaped asterisks):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+a __b\_\_c__ d
+
+Execute (bold with escaped underscores):
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertEqual SyntaxOf('c'), 'htmlBold'
+  AssertNotEqual SyntaxOf('d'), 'htmlBold'
+
+Given markdown;
+_a b
+c_ d
+
+Execute (italic with underscores in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+__a b
+c__ d
+
+Execute (bold with underscores in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertEqual SyntaxOf('c'), 'htmlBold'
+  AssertNotEqual SyntaxOf('d'), 'htmlBold'
+
+Given markdown;
+___a b
+c___ d
+
+Execute (bold italic with underscores in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlBoldItalic'
+  AssertEqual SyntaxOf('b'), 'htmlBoldItalic'
+  AssertEqual SyntaxOf('c'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlBoldItalic'
+
+Given markdown;
+*a b
+c* d
+
+Execute (italic with asterisks in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlItalic'
+  AssertEqual SyntaxOf('b'), 'htmlItalic'
+  AssertEqual SyntaxOf('c'), 'htmlItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlItalic'
+
+Given markdown;
+**a b
+c** d
+
+Execute (bold with asterisks in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlBold'
+  AssertEqual SyntaxOf('b'), 'htmlBold'
+  AssertEqual SyntaxOf('c'), 'htmlBold'
+  AssertNotEqual SyntaxOf('d'), 'htmlBold'
+
+Given markdown;
+***a b
+c*** d
+
+Execute (bold italic with asterisks in multiple lines):
+  AssertEqual SyntaxOf('a'), 'htmlBoldItalic'
+  AssertEqual SyntaxOf('b'), 'htmlBoldItalic'
+  AssertEqual SyntaxOf('c'), 'htmlBoldItalic'
+  AssertNotEqual SyntaxOf('d'), 'htmlBoldItalic'
+
+Given markdown;
+*a
+
+Execute (not italic with an asterisk):
+  AssertNotEqual SyntaxOf('a'), 'htmlItalic'
+
+Given markdown;
+[__](a) b
+
+Execute (not bold with double underscores):
+  AssertNotEqual SyntaxOf('_'), 'htmlBold'
+  AssertNotEqual SyntaxOf('a'), 'htmlBold'
+  AssertNotEqual SyntaxOf('b'), 'htmlBold'
+
+Given markdown;
+_a_
+
+Execute (conceal italic):
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 1
+    setlocal conceallevel=0
+  endif
+
+Execute (disable conceal):
+  if has('conceal')
+    let g:vim_markdown_conceal=0
+    syn off | syn on
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 0
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+
+    let g:vim_markdown_conceal=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 1
+
+    setlocal conceallevel=0
+    unlet g:vim_markdown_conceal
+    syn off | syn on
+  endif
+
+Given markdown;
+*a*
+
+Execute (conceal italic):
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 1
+    setlocal conceallevel=0
+  endif
+
+Execute (disable conceal):
+  if has('conceal')
+    let g:vim_markdown_conceal=0
+    syn off | syn on
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 0
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+
+    let g:vim_markdown_conceal=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 1
+
+    setlocal conceallevel=0
+    unlet g:vim_markdown_conceal
+    syn off | syn on
+  endif
+
+Given markdown;
+__a__
+
+Execute (conceal bold):
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 5)[0], 1
+    setlocal conceallevel=0
+  endif
+
+Execute (disable conceal):
+  if has('conceal')
+    let g:vim_markdown_conceal=0
+    syn off | syn on
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 0
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 0
+
+    let g:vim_markdown_conceal=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 5)[0], 1
+
+    setlocal conceallevel=0
+    unlet g:vim_markdown_conceal
+    syn off | syn on
+  endif
+
+Given markdown;
+**a**
+
+Execute (conceal bold):
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 5)[0], 1
+    setlocal conceallevel=0
+  endif
+
+Execute (disable conceal):
+  if has('conceal')
+    let g:vim_markdown_conceal=0
+    syn off | syn on
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 0
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 0
+
+    let g:vim_markdown_conceal=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 5)[0], 1
+
+    setlocal conceallevel=0
+    unlet g:vim_markdown_conceal
+    syn off | syn on
+  endif
+
+Given markdown;
+___a___
+
+Execute (conceal italic bold):
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 1
+    AssertEqual synconcealed(1, 6)[0], 1
+    AssertEqual synconcealed(1, 7)[0], 1
+    setlocal conceallevel=0
+  endif
+
+Execute (disable conceal):
+  if has('conceal')
+    let g:vim_markdown_conceal=0
+    syn off | syn on
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 0
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 0
+    AssertEqual synconcealed(1, 6)[0], 0
+    AssertEqual synconcealed(1, 7)[0], 0
+
+    let g:vim_markdown_conceal=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 1
+    AssertEqual synconcealed(1, 6)[0], 1
+    AssertEqual synconcealed(1, 7)[0], 1
+
+    setlocal conceallevel=0
+    unlet g:vim_markdown_conceal
+    syn off | syn on
+  endif
+
+Given markdown;
+***a***
+
+Execute (conceal italic bold):
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 1
+    AssertEqual synconcealed(1, 6)[0], 1
+    AssertEqual synconcealed(1, 7)[0], 1
+    setlocal conceallevel=0
+  endif
+
+Execute (disable conceal):
+  if has('conceal')
+    let g:vim_markdown_conceal=0
+    syn off | syn on
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 0
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 0
+    AssertEqual synconcealed(1, 6)[0], 0
+    AssertEqual synconcealed(1, 7)[0], 0
+
+    let g:vim_markdown_conceal=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 1
+    AssertEqual synconcealed(1, 3)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 1
+    AssertEqual synconcealed(1, 6)[0], 1
+    AssertEqual synconcealed(1, 7)[0], 1
+
+    setlocal conceallevel=0
+    unlet g:vim_markdown_conceal
+    syn off | syn on
+  endif
+
+# Links
+
+Given markdown;
+[a](b)
+
+Execute (link with title):
+  AssertEqual SyntaxOf('a'), 'mkdLink'
+  AssertEqual SyntaxOf('b'), 'mkdURL'
+
+Given markdown;
+[a
+b](c)
+
+Execute (link text with newline):
+  AssertEqual SyntaxOf('a'), 'mkdLink'
+  AssertEqual SyntaxOf('b'), 'mkdLink'
+  AssertEqual SyntaxOf('c'), 'mkdURL'
+
+Given markdown;
+[a] b [c](d)
+
+Execute (link text with bracket sections):
+  AssertNotEqual SyntaxOf('a'), 'mkdLink'
+  AssertNotEqual SyntaxOf('b'), 'mkdLink'
+  AssertEqual SyntaxOf('c'), 'mkdLink'
+  AssertEqual SyntaxOf('d'), 'mkdURL'
+
+Given markdown;
+[^a]: b
+
+Execute (footnote is not link):
+  AssertNotEqual SyntaxOf('a'), 'mkdLinkDef'
+
+Given markdown;
+(a)
+
+(b)
+
+Execute (parenthesis not in link):
+  AssertNotEqual SyntaxOf('a'), 'mkdURL'
+  AssertNotEqual SyntaxOf('b'), 'mkdURL'
+
+Given markdown;
+[a](b) c [d](e)
+
+Execute (multiple links on a line):
+  AssertNotEqual SyntaxOf('c'), 'mkdLink'
+  AssertNotEqual SyntaxOf('c'), 'mkdURL'
+
+Given markdown;
+[a] (b)
+
+Execute (space is not allowed between link text and parenthesis):
+  AssertNotEqual SyntaxOf('a'), 'mkdLink'
+  AssertNotEqual SyntaxOf('b'), 'mkdURL'
+
+Given markdown;
+[a](b)
+
+Execute (conceal link):
+  if has('conceal')
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 5)[0], 1
+    AssertEqual synconcealed(1, 6)[0], 1
+    setlocal conceallevel=0
+  endif
+
+Execute (disable conceal):
+  if has('conceal')
+    let g:vim_markdown_conceal=0
+    syn off | syn on
+    setlocal conceallevel=2
+    AssertEqual synconcealed(1, 1)[0], 0
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 0
+    AssertEqual synconcealed(1, 6)[0], 0
+
+    let g:vim_markdown_conceal=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 4)[0], 1
+    AssertEqual synconcealed(1, 5)[0], 1
+    AssertEqual synconcealed(1, 6)[0], 1
+
+    setlocal conceallevel=0
+    unlet g:vim_markdown_conceal
+    syn off | syn on
+  endif
+
+# Autolinks
+
+Given markdown;
+a <http://b> c
+
+Execute (autolink):
+  AssertNotEqual SyntaxOf('a'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('<'), 'mkdDelimiter'
+  AssertEqual SyntaxOf('b'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('>'), 'mkdDelimiter'
+  AssertNotEqual SyntaxOf('c'), 'mkdInlineURL'
+
+Given markdown;
+http://12monkeys.foo
+
+Execute (autolink with domain starting with a number):
+  AssertEqual SyntaxOf('12monkeys'), 'mkdInlineURL'
+
+Given markdown;
+<HtTp://a>
+
+Execute (autolink with scheme case is insensitive):
+  AssertEqual SyntaxOf('a'), 'mkdInlineURL'
+
+Given markdown;
+<a>
+
+Execute (autolink without scheme is not a link):
+  AssertNotEqual SyntaxOf('a'), 'mkdInlineURL'
+
+Given markdown;
+< http://a >
+<http://b c>
+<http://d
+e>
+
+Execute (autolink with space is not a link):
+  AssertNotEqual SyntaxOf('a'), 'mkdInlineURL'
+  AssertNotEqual SyntaxOf('b'), 'mkdInlineURL'
+  AssertNotEqual SyntaxOf('c'), 'mkdInlineURL'
+  AssertNotEqual SyntaxOf('d'), 'mkdInlineURL'
+  AssertNotEqual SyntaxOf('e'), 'mkdInlineURL'
+
+Given markdown;
+\<http://a>
+
+Execute (autolinks can be backslash escaped):
+  AssertNotEqual SyntaxOf('<'), 'mkdDelimiter'
+
+Given markdown;
+a (http://b.bb) c
+
+Execute (autolink in parenthesis):
+  AssertNotEqual SyntaxOf('a'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('('), 'mkdDelimiter'
+  AssertEqual SyntaxOf('b'), 'mkdInlineURL'
+  AssertEqual SyntaxOf(')'), 'mkdDelimiter'
+  AssertNotEqual SyntaxOf('c'), 'mkdInlineURL'
+
+Given markdown;
+[![a](http://b)](http://c)
+
+Execute (autolink in link text):
+  AssertEqual SyntaxOf('!'), 'mkdDelimiter'
+  AssertEqual SyntaxOf('a'), 'mkdLink'
+  AssertEqual SyntaxOf('b'), 'mkdURL'
+  AssertEqual SyntaxOf('c'), 'mkdURL'
+
+Given markdown;
+# [h1link](url)
+
+## [h2link](url)
+
+### [h3link](url)
+
+#### [h4link](url)
+
+##### [h5link](url)
+
+###### [h6link](url)
+
+[h1link_b](url)
+===============
+
+[h2link_b](url)
+---------------
+
+Execute (link in headers):
+  AssertEqual SyntaxOf('h1link'), 'mkdLink'
+  AssertEqual SyntaxOf('h2link'), 'mkdLink'
+  AssertEqual SyntaxOf('h3link'), 'mkdLink'
+  AssertEqual SyntaxOf('h4link'), 'mkdLink'
+  AssertEqual SyntaxOf('h5link'), 'mkdLink'
+  AssertEqual SyntaxOf('h6link'), 'mkdLink'
+  AssertEqual SyntaxOf('h1link_b'), 'mkdLink'
+  AssertEqual SyntaxOf('h2link_b'), 'mkdLink'
+
+Given markdown;
+# http://h1link.foo
+
+## http://h2link.foo
+
+### http://h3link.foo
+
+#### http://h4link.foo
+
+##### http://h5link.foo
+
+###### http://h6link.foo
+
+http://h1link_b.foo
+===================
+
+http://h2link_b.foo
+-------------------
+
+Execute (inline url in headers):
+  AssertEqual SyntaxOf('h1link'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('h2link'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('h3link'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('h4link'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('h5link'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('h6link'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('h1link_b'), 'mkdInlineURL'
+  AssertEqual SyntaxOf('h2link_b'), 'mkdInlineURL'
+
+Given markdown;
+> [a](b)
+> http://foo.bar
+
+Execute (link in blockquote):
+  AssertEqual SyntaxOf('a'), 'mkdLink'
+  AssertEqual SyntaxOf('foo'), 'mkdInlineURL'
+
+# Code Blocks
+
+Given markdown;
+~~~
+code
+~~~
+
+Execute (code blocks can be fenced with tildes):
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given markdown;
+~~~~
+code
+~~~~~
+
+Execute (code blocks can be fenced with tildes longer than 3):
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given markdown;
+````
+code
+`````
+
+Execute (code blocks can be fenced with backticks longer than 3):
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given markdown;
+~~~ruby
+code
+~~~
+
+Execute (code blocks can have a language specifier):
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given markdown;
+```c++
+code
+```
+
+text
+
+Execute (code blocks can be fenced with backticks and a language specifier):
+  AssertEqual SyntaxOf('code'), 'mkdCode'
+  AssertNotEqual SyntaxOf('text'), 'mkdCode'
+
+# Indent Code Blocks
+
+Given markdown;
+a
+
+    b
+    c
+
+Execute (indent code blocks):
+  AssertNotEqual SyntaxOf('a'), 'mkdCode'
+  AssertEqual SyntaxOf('b'), 'mkdCode'
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given markdown;
+# a
+
+b
+
+    c
+
+Execute (indent code blocks after header):
+  AssertNotEqual SyntaxOf('a'), 'mkdCode'
+  AssertNotEqual SyntaxOf('b'), 'mkdCode'
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given markdown;
+-   a
+
+    b
+
+        c
+
+Execute (indent code blocks after list):
+  AssertNotEqual SyntaxOf('a'), 'mkdCode'
+  AssertNotEqual SyntaxOf('b'), 'mkdCode'
+  AssertEqual SyntaxOf('c'), 'mkdCode'
+
+Given markdown;
+    a
+    b
+
+Execute (indent code block at beginning of file):
+  AssertEqual SyntaxOf('a'), 'mkdCode'
+  AssertEqual SyntaxOf('b'), 'mkdCode'
+
+Given markdown;
+```c++
+#include <iostream>
+code
+```
+
+```ruby
+def a
+end
+```
+
+Execute (fenced code block syntax with a language specifier):
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax')
+  call b:func(0)
+  AssertEqual SyntaxOf('include'), 'cInclude'
+  AssertEqual SyntaxOf('code'), 'mkdSnippetCPP'
+  AssertEqual SyntaxOf('def'), 'rubyDefine'
+
+Given markdown;
+``` c++
+#include <iostream>
+code
+```
+
+```  vim
+let g:a = 1
+```
+
+```	ruby
+def a
+end
+```
+
+```
+ruby
+class B
+end
+```
+
+Execute (fenced code block syntax with a language specifier after whitespace):
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax')
+  call b:func(0)
+  AssertEqual SyntaxOf('include'), 'cInclude'
+  AssertEqual SyntaxOf('code'), 'mkdSnippetCPP'
+  AssertEqual SyntaxOf('g:a'), 'vimVar'
+  AssertEqual SyntaxOf('def'), 'rubyDefine'
+  AssertNotEqual SyntaxOf('class'), 'rubyClass'
+
+Given markdown;
+```vim
+let g:a = 1
+```
+
+```viml
+let g:b = 1
+```
+
+Execute (fenced code block syntax with alias language specifier):
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax')
+  call b:func(0)
+  AssertEqual SyntaxOf('g:a'), 'vimVar'
+  AssertEqual SyntaxOf('g:b'), 'vimVar'
+
+Given markdown;
+```csharp
+var s = "foo";
+```
+
+Execute (fenced code block languages setting):
+  let g:vim_markdown_fenced_languages = ['csharp=cs']
+  source ../ftplugin/markdown.vim
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax')
+  call b:func(0)
+  AssertEqual SyntaxOf('foo'), 'csString'
+  unlet g:vim_markdown_fenced_languages
+
+Given markdown;
+```vim
+let g:a = 1
+```
+
+Execute (fenced code block includes language syntax with reopening same buffer):
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax')
+  call b:func(0)
+  split
+  quit
+  edit
+  set filetype=markdown
+  execute "normal! i```vim\<cr>let g:a = 1\<cr>```"
+  call b:func(1)
+  AssertEqual SyntaxOf('g:a'), 'vimVar'
+
+Given markdown;
+```a+b-
+code
+```
+
+Execute (fenced code block syntax with an unknown language specifier):
+  let b:func = Markdown_GetFunc('vim-markdown/ftplugin/markdown.vim', 'MarkdownRefreshSyntax')
+  call b:func(0)
+  AssertEqual SyntaxOf('code'), 'mkdSnippetA_B_'
+
+Given markdown;
+```
+=
+a
+-
+```
+
+Execute (first = or - in fenced code block is not setex headers):
+  AssertEqual SyntaxOf('='), 'mkdCode'
+  AssertEqual SyntaxOf('-'), 'mkdCode'
+
+Given markdown;
+``` {style=""}
+a
+```
+
+Execute (fenced code block with extended info strings):
+  AssertEqual SyntaxOf('a'), 'mkdCode'
+
+# Code Blocks in pre and code tag
+
+Given markdown;
+<pre>
+a
+</pre>
+
+Execute (code block in pre tag):
+  AssertEqual SyntaxOf('a'), 'mkdCode'
+
+Given markdown;
+<code>
+a
+</code>
+
+Execute (code block in code tag):
+  AssertEqual SyntaxOf('a'), 'mkdCode'
+
+Given markdown;
+\<pre\>
+a
+\</pre\>
+
+Execute (not code block in escaped pre tag):
+  AssertNotEqual SyntaxOf('a'), 'mkdCode'
+
+Given markdown;
+\<code\>
+a
+\</code\>
+
+Execute (not code block in escaped code tag):
+  AssertNotEqual SyntaxOf('a'), 'mkdCode'
+
+# Math
+
+Given markdown;
+a $x$ b
+c $$y$$ d
+\$e\$
+\$\$f\$\$
+
+Execute (math):
+  AssertNotEqual SyntaxOf('x')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('y')[0:2], 'tex'
+  let g:vim_markdown_math=1
+  syn off | syn on
+  AssertNotEqual SyntaxOf('a')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('b')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('c')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('d')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('e')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('f')[0:2], 'tex'
+  AssertEqual SyntaxOf('x')[0:2], 'tex'
+  AssertEqual SyntaxOf('y')[0:2], 'tex'
+  let g:vim_markdown_math=0
+  syn off | syn on
+  AssertNotEqual SyntaxOf('x')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('y')[0:2], 'tex'
+
+Given markdown;
+a
+
+$
+b
+$
+
+c
+
+Execute (multiline math):
+  let g:vim_markdown_math=1
+  syn off | syn on
+  AssertNotEqual SyntaxOf('a')[0:2], 'tex'
+  AssertEqual SyntaxOf('b')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('c')[0:2], 'tex'
+
+Given markdown;
+$ \sqrt{a}{b} $
+$$ \frac{a}{b} $$
+
+Execute (math tex highlighting):
+  let g:vim_markdown_math=0
+  syn off | syn on
+  AssertNotEqual SyntaxOf('sqrt'), 'texStatement'
+  AssertNotEqual SyntaxOf('frac'), 'texStatement'
+  let g:vim_markdown_math=1
+  syn off | syn on
+  AssertEqual SyntaxOf('sqrt'), 'texStatement'
+  AssertEqual SyntaxOf('frac'), 'texStatement'
+
+Given markdown;
+$a b[$ c
+
+Execute (math ends with $):
+  let g:vim_markdown_math=1
+  syn off | syn on
+  AssertEqual SyntaxOf('a')[0:2], 'tex'
+  AssertEqual SyntaxOf('b')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('c')[0:2], 'tex'
+
+Given markdown;
+$$a b[$$ c
+
+Execute (math ends with $$):
+  let g:vim_markdown_math=1
+  syn off | syn on
+  AssertEqual SyntaxOf('a')[0:2], 'tex'
+  AssertEqual SyntaxOf('b')[0:2], 'tex'
+  AssertNotEqual SyntaxOf('c')[0:2], 'tex'
+
+Given markdown;
+$(0 \le 1)$
+
+Execute (math conceal in $):
+  if has('conceal')
+    setlocal conceallevel=2
+    let g:vim_markdown_math=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1, '$'
+    AssertEqual synconcealed(1, 2)[0], 0
+    AssertEqual synconcealed(1, 3)[0], 0
+    AssertEqual synconcealed(1, 4)[0], 0
+    AssertEqual synconcealed(1, 5)[0], 1, '\le'
+    AssertEqual synconcealed(1, 6)[0], 1
+    AssertEqual synconcealed(1, 7)[0], 1
+    AssertEqual synconcealed(1, 8)[0], 0
+    AssertEqual synconcealed(1, 9)[0], 0
+    AssertEqual synconcealed(1, 10)[0], 0
+    AssertEqual synconcealed(1, 11)[0], 1, '$'
+    setlocal conceallevel=0
+  endif
+
+Given markdown;
+$$
+\omega
+0 \le 1
+$$
+
+Execute (math conceal in $$):
+  if has('conceal')
+    setlocal conceallevel=2
+    let g:vim_markdown_math=1
+    syn off | syn on
+    AssertEqual synconcealed(1, 1)[0], 1, '$$'
+    AssertEqual synconcealed(2, 1)[0], 1, '\omega'
+    AssertEqual synconcealed(3, 1)[0], 0, '0'
+    AssertEqual synconcealed(3, 3)[0], 1, '\le'
+    AssertEqual synconcealed(3, 7)[0], 0, '1'
+    AssertEqual synconcealed(4, 1)[0], 1, '$$'
+    setlocal conceallevel=0
+  endif
+
+# YAML frontmatter
+
+Given markdown;
+---
+a: b
+---
+
+Execute (YAML frontmatter is controlled by the option):
+  AssertNotEqual SyntaxOf('a')[0:3], 'yaml'
+  let g:vim_markdown_frontmatter=1
+  syn off | syn on
+  AssertEqual SyntaxOf('a')[0:3], 'yaml'
+  let g:vim_markdown_frontmatter=0
+  syn off | syn on
+  AssertNotEqual SyntaxOf('a')[0:3], 'yaml'
+
+Given markdown;
+
+---
+a: b
+---
+
+Execute (YAML frontmatter only works if it's the first thing in the file):
+  let g:vim_markdown_frontmatter=1
+  syn off | syn on
+  AssertNotEqual SyntaxOf('a')[0:3], 'yaml'
+
+Given markdown;
+---
+a: b
+---
+
+---
+
+Execute (rules are not mistaken by YAML frontmatter delimiters):
+  let g:vim_markdown_frontmatter=1
+  syn off | syn on
+  AssertEqual SyntaxAt(5, 1), 'mkdRule'
+  unlet g:vim_markdown_frontmatter
+
+# TOML frontmatter
+
+Given markdown;
++++
+a = "b"
++++
+
+Execute (TOML frontmatter is controlled by the option):
+  syn off | syn on
+  AssertNotEqual SyntaxOf('b'), 'tomlString'
+  let g:vim_markdown_toml_frontmatter=1
+  syn off | syn on
+  AssertEqual SyntaxOf('b'), 'tomlString'
+  let g:vim_markdown_toml_frontmatter=0
+  syn off | syn on
+  AssertNotEqual SyntaxOf('b'), 'tomlString'
+
+Given markdown;
+
++++
+a = "b"
++++
+
+Execute (TOML frontmatter only works if it's the first thing in the file):
+  let g:vim_markdown_toml_frontmatter=1
+  syn off | syn on
+  AssertNotEqual SyntaxOf('b'), 'tomlString'
+  unlet g:vim_markdown_toml_frontmatter
+
+# JSON frontmatter
+
+Given markdown;
+{
+  "a": "b"
+}
+
+Execute (JSON frontmatter is controlled by the option):
+  syn off | syn on
+  AssertNotEqual SyntaxOf('a'), 'jsonKeyword'
+  let g:vim_markdown_json_frontmatter=1
+  syn off | syn on
+  AssertEqual SyntaxOf('a'), 'jsonKeyword'
+  let g:vim_markdown_json_frontmatter=0
+  syn off | syn on
+  AssertNotEqual SyntaxOf('a'), 'jsonKeyword'
+
+Given markdown;
+
+{
+  "a": "b"
+}
+
+Execute (JSON frontmatter only works if it's the first thing in the file):
+  let g:vim_markdown_json_frontmatter=1
+  syn off | syn on
+  AssertNotEqual SyntaxOf('a'), 'jsonKeyword'
+  unlet g:vim_markdown_json_frontmatter
+
+# Header
+
+Given markdown;
+# #a
+ccc
+
+## #b
+ddd
+
+Execute (header title starts with #):
+  AssertEqual SyntaxOf('a'), 'htmlH1'
+  AssertEqual SyntaxOf('b'), 'htmlH2'
+
+Given markdown;
+# h1 space
+
+#h1 nospace
+
+#  h1 2 spaces
+
+# h1 trailing hash #
+
+## h2 space
+
+##h2 nospace
+
+## h2 trailing hash ##
+
+### h3 space
+
+###h3 nospace
+
+### h3 trailing hash ###
+
+#### h4
+
+##### h5
+
+###### h6
+
+Execute (atx headers):
+  AssertEqual SyntaxOf('# h1 space'), 'htmlH1'
+  AssertEqual SyntaxOf('#h1 nospace'), 'htmlH1'
+  AssertEqual SyntaxOf('#  h1 2 spaces'), 'htmlH1'
+  AssertEqual SyntaxOf('# h1 trailing hash #'), 'htmlH1'
+  AssertEqual SyntaxOf('## h2 space'), 'htmlH2'
+  AssertEqual SyntaxOf('##h2 nospace'), 'htmlH2'
+  AssertEqual SyntaxOf('## h2 trailing hash ##'), 'htmlH2'
+  AssertEqual SyntaxOf('### h3 space'), 'htmlH3'
+  AssertEqual SyntaxOf('###h3 nospace'), 'htmlH3'
+  AssertEqual SyntaxOf('### h3 trailing hash ###'), 'htmlH3'
+  AssertEqual SyntaxOf('#### h4'), 'htmlH4'
+  AssertEqual SyntaxOf('##### h5'), 'htmlH5'
+  AssertEqual SyntaxOf('###### h6'), 'htmlH6'
+
+Given markdown;
+# h1 before h2
+
+## h2 between h1s
+
+# h1 after h2
+
+Execute (atx headers relative positions):
+  AssertEqual SyntaxOf('# h1 before h2'), 'htmlH1'
+  AssertEqual SyntaxOf('## h2 between h1s'), 'htmlH2'
+  AssertEqual SyntaxOf('# h1 after h2'), 'htmlH1'
+
+Given markdown;
+setex h1
+========
+
+setex h2
+--------
+
+setex h1 single punctuation
+=
+
+setex h1 punctuation longer than header
+================================
+
+Execute (setex headers):
+  AssertEqual SyntaxOf('setex h1'), 'htmlH1'
+  AssertEqual SyntaxOf('^========$'), 'htmlH1'
+  AssertEqual SyntaxOf('setex h2'), 'htmlH2'
+  AssertEqual SyntaxOf('--------'), 'htmlH2'
+  AssertEqual SyntaxOf('setex h1 single punctuation'), 'htmlH1'
+  AssertEqual SyntaxOf('^=$'), 'htmlH1'
+  AssertEqual SyntaxOf('setex h1 punctuation longer than header'), 'htmlH1'
+  AssertEqual SyntaxOf('^================================$'), 'htmlH1'
+
+Given markdown;
+- not Setex
+- because list
+
+Execute (prevent list vs Setex confusion):
+  AssertNotEqual SyntaxOf('- not Setex'), 'htmlH2'
+  AssertNotEqual SyntaxOf('- becuase list'), 'htmlH2'
+
+Given markdown;
+setex h1 before atx
+===================
+
+## atx h2
+
+### atx h3
+
+# atx h1
+
+setex h2
+------------------
+
+### atx h3 2
+
+Execute (mixed atx and setex headers):
+  AssertEqual SyntaxOf('setex h1 before atx'), 'htmlH1'
+  AssertEqual SyntaxOf('==================='), 'htmlH1'
+  AssertEqual SyntaxOf('## atx h2'), 'htmlH2'
+  AssertEqual SyntaxOf('### atx h3'), 'htmlH3'
+  AssertEqual SyntaxOf('# atx h1'), 'htmlH1'
+  AssertEqual SyntaxOf('setex h2'), 'htmlH2'
+  AssertEqual SyntaxOf('------------------'), 'htmlH2'
+
+# List
+
+Given markdown;
+- a & b
+1. c > d
+
+Execute (& and > are not marked as htmlError in lists):
+  AssertEqual SyntaxOf('-'), 'mkdListItem'
+  AssertEqual SyntaxOf('1.'), 'mkdListItem'
+  AssertNotEqual SyntaxOf('&'), 'htmlError'
+  AssertNotEqual SyntaxOf('>'), 'htmlError'
+
+Given markdown;
+1. a  
+2. b
+
+Execute (list after line break):
+  AssertEqual SyntaxOf('1'), 'mkdListItem'
+  AssertEqual SyntaxOf('2'), 'mkdListItem'
+
+# HTML
+
+Given markdown;
+a
+
+<p>b</p>
+
+- <span>c</span>
+
+Execute (HTML tag in text):
+  AssertEqual SyntaxOf('p'), 'htmlTagName'
+  AssertEqual SyntaxOf('<p>'), 'htmlTag'
+  AssertEqual SyntaxOf('</p>'), 'htmlEndTag'
+  AssertEqual SyntaxOf('span'), 'htmlTagName'
+  AssertEqual SyntaxOf('<span>'), 'htmlTag'
+  AssertEqual SyntaxOf('</span>'), 'htmlEndTag'
diff --git a/vim-plugins/bundle/vim-markdown/test/table-format.vader b/vim-plugins/bundle/vim-markdown/test/table-format.vader
new file mode 100644
index 0000000..2fc06a3
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/table-format.vader
@@ -0,0 +1,44 @@
+Before:
+  let &gdefault = 1
+
+After:
+  let &gdefault = 0
+
+Given markdown;
+| normal |no space|  2 spaces  ||
+| - |-|  --- ||
+| normal |no space|  2 spaces  ||
+
+Execute (format unformatted table):
+  TableFormat
+
+Expect (table is formatted):
+  | normal | no space | 2 spaces |  |
+  |--------|----------|----------|--|
+  | normal | no space | 2 spaces |  |
+
+Given markdown;
+| a | b |
+|---|---|
+| c | d |
+
+Execute (format well formatted table):
+  TableFormat
+
+Expect (table is not modified):
+  | a | b |
+  |---|---|
+  | c | d |
+
+Given markdown;
+| left |right|  center  ||
+| :- | --: |:---:|:|
+| left |right|  center  ||
+
+Execute (format table with colons):
+  TableFormat
+
+Expect (preserve colons to align text):
+  | left | right | center |   |
+  |:-----|------:|:------:|:--|
+  | left | right | center |   |
diff --git a/vim-plugins/bundle/vim-markdown/test/toc-autofit.vader b/vim-plugins/bundle/vim-markdown/test/toc-autofit.vader
new file mode 100644
index 0000000..2678997
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/toc-autofit.vader
@@ -0,0 +1,53 @@
+" Tests toc window auto-fit to longest header, but without exceeding half screen.
+
+Given markdown;
+# chap 1
+
+# chap 2
+
+# chap 3
+
+# chap 4
+
+# chap 5
+
+# chap 6
+
+# chap 7
+
+# chap 8
+
+# chap 9
+
+# chap 10
+
+# chap 11
+
+# chap 12
+
+## chap 12.1
+
+### chap 12.1.1
+
+#### chap 12.1.1.1
+
+##### chap 12.1.1.1.1
+
+###### chap 12.1.1.1.1.1
+
+# chap 13
+
+Execute (toc window autofit width):
+  set number
+  let g:vim_markdown_toc_autofit = 1
+  let line = '###### chap 12.1.1.1.1.1'
+  AssertEqual getline('33'), line
+  :Toc
+  let real_width = winwidth(0)
+  :lclose
+  let expected_width = len(line) + 2*5 + 1 + 3 - 7
+  AssertEqual real_width, expected_width
+  set nonumber
+" 2 spaces * 5 additional header levels + 1 space for first header +
+" 3 spaces for line numbers - 7 chars ('###### ') that don't show up on the TOC
+
diff --git a/vim-plugins/bundle/vim-markdown/test/toc.vader b/vim-plugins/bundle/vim-markdown/test/toc.vader
new file mode 100644
index 0000000..2510edc
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/toc.vader
@@ -0,0 +1,185 @@
+Given markdown;
+# a
+
+Execute (Toc does not set nomodifiable on other files):
+  " Sanity check.
+  Assert &modifiable
+
+  :Toc
+  :lclose
+  :edit a
+
+  Assert &modifiable
+
+Given markdown;
+header 1
+========
+
+test
+
+header 2
+--------
+
+test
+
+### header 3
+
+test
+
+Execute (Toc setex headers):
+  :Toc
+
+Expect (setex headers):
+  header 1
+    header 2
+      header 3
+
+Given markdown;
+# header 1
+
+test
+
+## header 2
+
+test
+
+### header 3
+
+test
+
+Execute (Toc atx headers):
+  :Toc
+
+Expect (atx headers):
+  header 1
+    header 2
+      header 3
+
+Given markdown;
+ATX tests.
+
+# h1 space
+
+#h1 nospace
+
+#  h1 2 spaces
+
+# h1 trailing hash #
+
+## h2 space
+
+##h2 nospace
+
+## h2 trailing hash ##
+
+### h3 space
+
+###h3 nospace
+
+### h3 trailing hash ###
+
+#### h4
+
+##### h5
+
+###### h6
+
+---
+
+Relative positions.
+
+# h1 before h2
+
+## h2 between h1s
+
+# h1 after h2
+
+---
+
+Setex tests.
+
+setex h1
+========
+
+setex h2
+--------
+
+setex h1 single punctuation
+=
+
+setex h1 punctuation longer than header
+================================
+
+Prevent list vs Setex confusion:
+
+- not Setex
+- because list
+
+---
+
+Mixed tests.
+
+setex h1 before atx
+===================
+
+## atx h2
+
+### atx h3
+
+# atx h1
+
+setex h2
+------------------
+
+### atx h3 2
+
+Execute (Toc multiple headers):
+  :Toc
+
+Expect (multiple headers):
+  h1 space
+  h1 nospace
+  h1 2 spaces
+  h1 trailing hash
+    h2 space
+    h2 nospace
+    h2 trailing hash
+      h3 space
+      h3 nospace
+      h3 trailing hash
+        h4
+          h5
+            h6
+  h1 before h2
+    h2 between h1s
+  h1 after h2
+  setex h1
+    setex h2
+  setex h1 single punctuation
+  setex h1 punctuation longer than header
+  setex h1 before atx
+    atx h2
+      atx h3
+  atx h1
+    setex h2
+      atx h3 2
+
+Execute:
+  :lclose
+
+Given markdown;
+# header 1
+
+## header 2
+
+### header 3
+
+Execute (Toc cursor on the current header):
+  normal! 4G
+  :Toc
+  AssertEqual line('.'), 2
+  :lclose
+  normal! G
+  :Toc
+  AssertEqual line('.'), 3
+  :lclose
diff --git a/vim-plugins/bundle/vim-markdown/test/vimrc b/vim-plugins/bundle/vim-markdown/test/vimrc
new file mode 100644
index 0000000..463cbd8
--- /dev/null
+++ b/vim-plugins/bundle/vim-markdown/test/vimrc
@@ -0,0 +1,27 @@
+set nocompatible
+set rtp+=../
+set rtp+=../build/tabular/
+set rtp+=../build/vim-toml/
+set rtp+=../build/vim-json/
+set rtp+=../build/vader.vim/
+let $LANG='en_US'
+filetype on
+filetype plugin on
+filetype indent on
+syntax on
+
+function! Markdown_GetScriptID(fname) abort
+    let a:snlist = ''
+    redir => a:snlist
+    silent! scriptnames
+    redir END
+    let a:mx = '^\s*\(\d\+\):\s*\(.*\)$'
+    for a:line in split(a:snlist, "\n")
+        if stridx(substitute(a:line, '\\', '/', 'g'), a:fname) >= 0
+            return substitute(a:line, a:mx, '\1', '')
+        endif
+    endfor
+endfunction
+function! Markdown_GetFunc(fname, funcname) abort
+    return function('<SNR>' . Markdown_GetScriptID(a:fname) . '_' . a:funcname)
+endfunction
diff --git a/vim-plugins/bundle/vim-powerline/Powerline_default_default_compatible.cache b/vim-plugins/bundle/vim-powerline/Powerline_default_default_compatible.cache
new file mode 100644
index 0000000..4e67ad5
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/Powerline_default_default_compatible.cache
@@ -0,0 +1,4 @@
+let g:Powerline_cache_revision = 7
+let g:Pl#HL = ['hi Ple7ffffffa0d70000b ctermfg=231 ctermbg=160 cterm=bold guifg=#ffffff guibg=#d70000 gui=bold', 'hi Pla0d70000f0585858N ctermfg=160 ctermbg=240 cterm=NONE guifg=#d70000 guibg=#585858 gui=NONE', 'hi Plc4ff0000f0585858b ctermfg=196 ctermbg=240 cterm=bold guifg=#ff0000 guibg=#585858 gui=bold', 'hi Plfcd0d0d0f0585858N ctermfg=252 ctermbg=240 cterm=NONE guifg=#d0d0d0 guibg=#585858 gui=NONE', 'hi Ple7fffffff0585858b ctermfg=231 ctermbg=240 cterm=bold guifg=#ffffff guibg=#585858 gui=bold', 'hi Plf0585858ec303030N ctermfg=240 ctermbg=236 cterm=NONE guifg=#585858 guibg=#303030 gui=NONE', 'hi Ple7ffffffec303030N ctermfg=231 ctermbg=236 cterm=NONE guifg=#ffffff guibg=#303030 gui=NONE', 'hi Plf79e9e9eec303030N ctermfg=247 ctermbg=236 cterm=NONE guifg=#9e9e9e guibg=#303030 gui=NONE', 'hi Plec303030ec303030N ctermfg=236 ctermbg=236 cterm=NONE guifg=#303030 guibg=#303030 gui=NONE', 'hi Plfabcbcbcf0585858N ctermfg=250 ctermbg=240 cterm=NONE guifg=#bcbcbc guibg=#585858 gui=NONE', 'hi Plec303030fcd0d0d0b ctermfg=236 ctermbg=252 cterm=bold guifg=#303030 guibg=#d0d0d0 gui=bold', 'hi Plf4808080fcd0d0d0N ctermfg=244 ctermbg=252 cterm=NONE guifg=#808080 guibg=#d0d0d0 gui=NONE', 'hi Pla0d70000f1626262N ctermfg=160 ctermbg=241 cterm=NONE guifg=#d70000 guibg=#626262 gui=NONE', 'hi Ple7fffffff1626262b ctermfg=231 ctermbg=241 cterm=bold guifg=#ffffff guibg=#626262 gui=bold', 'hi Plf1626262f0585858N ctermfg=241 ctermbg=240 cterm=NONE guifg=#626262 guibg=#585858 gui=NONE', 'hi Pl58870000e9121212N ctermfg=88 ctermbg=233 cterm=NONE guifg=#870000 guibg=#121212 gui=NONE', 'hi Plf1626262e9121212N ctermfg=241 ctermbg=233 cterm=NONE guifg=#626262 guibg=#121212 gui=NONE', 'hi Plf58a8a8ae9121212b ctermfg=245 ctermbg=233 cterm=bold guifg=#8a8a8a guibg=#121212 gui=bold', 'hi Ple9121212e9121212N ctermfg=233 ctermbg=233 cterm=NONE guifg=#121212 guibg=#121212 gui=NONE', 'hi Ple7ffffffe9121212N ctermfg=231 ctermbg=233 cterm=NONE guifg=#ffffff guibg=#121212 gui=NONE', 'hi Plf0585858eb262626N ctermfg=240 ctermbg=235 cterm=NONE guifg=#585858 guibg=#262626 gui=NONE', 'hi Pleb262626e9121212N ctermfg=235 ctermbg=233 cterm=NONE guifg=#262626 guibg=#121212 gui=NONE', 'hi Plf58a8a8aeb262626b ctermfg=245 ctermbg=235 cterm=bold guifg=#8a8a8a guibg=#262626 gui=bold', 'hi Plf1626262eb262626N ctermfg=241 ctermbg=235 cterm=NONE guifg=#626262 guibg=#262626 gui=NONE', 'hi Pla0d70000d0ff8700N ctermfg=160 ctermbg=208 cterm=NONE guifg=#d70000 guibg=#ff8700 gui=NONE', 'hi Pl58870000d0ff8700b ctermfg=88 ctermbg=208 cterm=bold guifg=#870000 guibg=#ff8700 gui=bold', 'hi Pld0ff8700f0585858N ctermfg=208 ctermbg=240 cterm=NONE guifg=#ff8700 guibg=#585858 gui=NONE', 'hi Pla0d70000e7ffffffN ctermfg=160 ctermbg=231 cterm=NONE guifg=#d70000 guibg=#ffffff gui=NONE', 'hi Pl17005f5fe7ffffffb ctermfg=23 ctermbg=231 cterm=bold guifg=#005f5f guibg=#ffffff gui=bold', 'hi Ple7ffffff1f0087afN ctermfg=231 ctermbg=31 cterm=NONE guifg=#ffffff guibg=#0087af gui=NONE', 'hi Plc4ff00001f0087afb ctermfg=196 ctermbg=31 cterm=bold guifg=#ff0000 guibg=#0087af gui=bold', 'hi Pl7587d7ff1f0087afN ctermfg=117 ctermbg=31 cterm=NONE guifg=#87d7ff guibg=#0087af gui=NONE', 'hi Ple7ffffff1f0087afb ctermfg=231 ctermbg=31 cterm=bold guifg=#ffffff guibg=#0087af gui=bold', 'hi Pl1f0087af18005f87N ctermfg=31 ctermbg=24 cterm=NONE guifg=#0087af guibg=#005f87 gui=NONE', 'hi Ple7ffffff18005f87N ctermfg=231 ctermbg=24 cterm=NONE guifg=#ffffff guibg=#005f87 gui=NONE', 'hi Pl7587d7ff18005f87N ctermfg=117 ctermbg=24 cterm=NONE guifg=#87d7ff guibg=#005f87 gui=NONE', 'hi Pl18005f8718005f87N ctermfg=24 ctermbg=24 cterm=NONE guifg=#005f87 guibg=#005f87 gui=NONE', 'hi Pl17005f5f7587d7ffb ctermfg=23 ctermbg=117 cterm=bold guifg=#005f5f guibg=#87d7ff gui=bold', 'hi Pl17005f5f7587d7ffN ctermfg=23 ctermbg=117 cterm=NONE guifg=#005f5f guibg=#87d7ff gui=NONE', 'hi Pla0d7000094afd700N ctermfg=160 ctermbg=148 cterm=NONE guifg=#d70000 guibg=#afd700 gui=NONE', 'hi Pl16005f0094afd700b ctermfg=22 ctermbg=148 cterm=bold guifg=#005f00 guibg=#afd700 gui=bold', 'hi Pl94afd700f0585858N ctermfg=148 ctermbg=240 cterm=NONE guifg=#afd700 guibg=#585858 gui=NONE', 'hi Ple7ffffff7caf0000b ctermfg=231 ctermbg=124 cterm=bold guifg=#ffffff guibg=#af0000 gui=bold', 'hi Pl7caf000058870000N ctermfg=124 ctermbg=88 cterm=NONE guifg=#af0000 guibg=#870000 gui=NONE', 'hi Ple7ffffff58870000N ctermfg=231 ctermbg=88 cterm=NONE guifg=#ffffff guibg=#870000 gui=NONE', 'hi Pl5887000058870000N ctermfg=88 ctermbg=88 cterm=NONE guifg=#870000 guibg=#870000 gui=NONE', 'hi Pla0d70000345f0000b ctermfg=160 ctermbg=52 cterm=bold guifg=#d70000 guibg=#5f0000 gui=bold', 'hi Pl345f0000345f0000N ctermfg=52 ctermbg=52 cterm=NONE guifg=#5f0000 guibg=#5f0000 gui=NONE', 'hi Ple7ffffff345f0000N ctermfg=231 ctermbg=52 cterm=NONE guifg=#ffffff guibg=#5f0000 gui=NONE', 'hi Pla0d70000345f0000N ctermfg=160 ctermbg=52 cterm=NONE guifg=#d70000 guibg=#5f0000 gui=NONE', 'hi Ple7fffffff0585858N ctermfg=231 ctermbg=240 cterm=NONE guifg=#ffffff guibg=#585858 gui=NONE', 'hi Plf58a8a8aeb262626N ctermfg=245 ctermbg=235 cterm=NONE guifg=#8a8a8a guibg=#262626 gui=NONE', 'hi Ple7ffffff465faf00b ctermfg=231 ctermbg=70 cterm=bold guifg=#ffffff guibg=#5faf00 gui=bold', 'hi Pl465faf001c008700N ctermfg=70 ctermbg=28 cterm=NONE guifg=#5faf00 guibg=#008700 gui=NONE', 'hi Pl94afd7001c008700N ctermfg=148 ctermbg=28 cterm=NONE guifg=#afd700 guibg=#008700 gui=NONE', 'hi Pl1c0087001c008700N ctermfg=28 ctermbg=28 cterm=NONE guifg=#008700 guibg=#008700 gui=NONE', 'hi Ple7ffffff1c008700N ctermfg=231 ctermbg=28 cterm=NONE guifg=#ffffff guibg=#008700 gui=NONE', 'hi Pl465faf0016005f00b ctermfg=70 ctermbg=22 cterm=bold guifg=#5faf00 guibg=#005f00 gui=bold', 'hi Pl465faf0016005f00N ctermfg=70 ctermbg=22 cterm=NONE guifg=#5faf00 guibg=#005f00 gui=NONE', 'hi Pl16005f0016005f00N ctermfg=22 ctermbg=22 cterm=NONE guifg=#005f00 guibg=#005f00 gui=NONE', 'hi Ple7ffffff16005f00N ctermfg=231 ctermbg=22 cterm=NONE guifg=#ffffff guibg=#005f00 gui=NONE', 'hi Ple7ffffff62875fd7N ctermfg=231 ctermbg=98 cterm=NONE guifg=#ffffff guibg=#875fd7 gui=NONE', 'hi Pl62875fd7e7ffffffN ctermfg=98 ctermbg=231 cterm=NONE guifg=#875fd7 guibg=#ffffff gui=NONE', 'hi Pl375f00afe7ffffffb ctermfg=55 ctermbg=231 cterm=bold guifg=#5f00af guibg=#ffffff gui=bold', 'hi Pl62875fd7375f00afN ctermfg=98 ctermbg=55 cterm=NONE guifg=#875fd7 guibg=#5f00af gui=NONE', 'hi Plc4ff0000375f00afb ctermfg=196 ctermbg=55 cterm=bold guifg=#ff0000 guibg=#5f00af gui=bold', 'hi Pl375f00af375f00afN ctermfg=55 ctermbg=55 cterm=NONE guifg=#5f00af guibg=#5f00af gui=NONE', 'hi Ple7ffffff375f00afN ctermfg=231 ctermbg=55 cterm=NONE guifg=#ffffff guibg=#5f00af gui=NONE', 'hi Plbdd7d7ff375f00afN ctermfg=189 ctermbg=55 cterm=NONE guifg=#d7d7ff guibg=#5f00af gui=NONE', 'hi Pl375f00afe7ffffffN ctermfg=55 ctermbg=231 cterm=NONE guifg=#5f00af guibg=#ffffff gui=NONE']
+let g:Pl#THEME  = [{'mode_statuslines': {'r': '%(%(%#Ple7ffffffa0d70000b# %{&paste ? "PASTE" : ""} %)%#Ple7ffffffa0d70000b#│%)%(%(%#Ple7ffffffa0d70000b# %{Powerline#Functions#GetMode()} %)%#Pla0d70000f0585858N#%)%( %(%#Plc4ff0000f0585858b#%{&readonly ? "RO" : ""} %)%(%#Plfcd0d0d0f0585858N#%{Powerline#Functions#GetFilepath()}%)%(%#Ple7fffffff0585858b#%t %)%(%#Plc4ff0000f0585858b#%M %)%(%#Plc4ff0000f0585858b#%H%W %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plec303030ec303030N#%(%#Plf79e9e9eec303030N# %{&fileformat} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{(&fenc == "" ? &enc : &fenc)} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{strlen(&ft) ? &ft : "no ft"} %)%)%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)%(%#Plfcd0d0d0f0585858N#%(%#Plec303030fcd0d0d0b# LN %3l%)%(%#Plf4808080fcd0d0d0N#:%-2v%) %)', 's': '%(%(%#Ple7ffffffa0d70000b# %{&paste ? "PASTE" : ""} %)%#Pla0d70000f1626262N#%)%(%(%#Ple7fffffff1626262b# %{Powerline#Functions#GetMode()} %)%#Plf1626262f0585858N#%)%( %(%#Plc4ff0000f0585858b#%{&readonly ? "RO" : ""} %)%(%#Plfcd0d0d0f0585858N#%{Powerline#Functions#GetFilepath()}%)%(%#Ple7fffffff0585858b#%t %)%(%#Plc4ff0000f0585858b#%M %)%(%#Plc4ff0000f0585858b#%H%W %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plec303030ec303030N#%(%#Plf79e9e9eec303030N# %{&fileformat} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{(&fenc == "" ? &enc : &fenc)} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{strlen(&ft) ? &ft : "no ft"} %)%)%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)%(%#Plfcd0d0d0f0585858N#%(%#Plec303030fcd0d0d0b# LN %3l%)%(%#Plf4808080fcd0d0d0N#:%-2v%) %)', 'N': '%( %(%#Pl58870000e9121212N#%{&readonly ? "RO" : ""} %)%(%#Plf1626262e9121212N#%{Powerline#Functions#GetFilepath()}%)%(%#Plf58a8a8ae9121212b#%t %)%(%#Pl58870000e9121212N#%M %)%(%#Pl58870000e9121212N#%H%W %)%#Ple9121212e9121212N#%)%<%#Ple7ffffffe9121212N#%=%(%#Pleb262626e9121212N#%(%#Plf0585858eb262626N# %3p%% %)%)%(%#Plf58a8a8aeb262626b#│%(%#Plf58a8a8aeb262626b# LN %3l%)%(%#Plf1626262eb262626N#:%-2v%) %)', 'v': '%(%(%#Ple7ffffffa0d70000b# %{&paste ? "PASTE" : ""} %)%#Pla0d70000d0ff8700N#%)%(%(%#Pl58870000d0ff8700b# %{Powerline#Functions#GetMode()} %)%#Pld0ff8700f0585858N#%)%( %(%#Plc4ff0000f0585858b#%{&readonly ? "RO" : ""} %)%(%#Plfcd0d0d0f0585858N#%{Powerline#Functions#GetFilepath()}%)%(%#Ple7fffffff0585858b#%t %)%(%#Plc4ff0000f0585858b#%M %)%(%#Plc4ff0000f0585858b#%H%W %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plec303030ec303030N#%(%#Plf79e9e9eec303030N# %{&fileformat} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{(&fenc == "" ? &enc : &fenc)} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{strlen(&ft) ? &ft : "no ft"} %)%)%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)%(%#Plfcd0d0d0f0585858N#%(%#Plec303030fcd0d0d0b# LN %3l%)%(%#Plf4808080fcd0d0d0N#:%-2v%) %)', 'i': '%(%(%#Ple7ffffffa0d70000b# %{&paste ? "PASTE" : ""} %)%#Pla0d70000e7ffffffN#%)%(%(%#Pl17005f5fe7ffffffb# %{Powerline#Functions#GetMode()} %)%#Ple7ffffff1f0087afN#%)%( %(%#Plc4ff00001f0087afb#%{&readonly ? "RO" : ""} %)%(%#Pl7587d7ff1f0087afN#%{Powerline#Functions#GetFilepath()}%)%(%#Ple7ffffff1f0087afb#%t %)%(%#Plc4ff00001f0087afb#%M %)%(%#Plc4ff00001f0087afb#%H%W %)%#Pl1f0087af18005f87N#%)%<%#Ple7ffffff18005f87N#%=%(%#Pl18005f8718005f87N#%(%#Pl7587d7ff18005f87N# %{&fileformat} %)%)%(%#Pl7587d7ff18005f87N#│%(%#Pl7587d7ff18005f87N# %{(&fenc == "" ? &enc : &fenc)} %)%)%(%#Pl7587d7ff18005f87N#│%(%#Pl7587d7ff18005f87N# %{strlen(&ft) ? &ft : "no ft"} %)%)%(%#Pl1f0087af18005f87N#%(%#Pl7587d7ff1f0087afN# %3p%% %)%)%(%#Pl7587d7ff1f0087afN#%(%#Pl17005f5f7587d7ffb# LN %3l%)%(%#Pl17005f5f7587d7ffN#:%-2v%) %)', 'n': '%(%(%#Ple7ffffffa0d70000b# %{&paste ? "PASTE" : ""} %)%#Pla0d7000094afd700N#%)%(%(%#Pl16005f0094afd700b# %{Powerline#Functions#GetMode()} %)%#Pl94afd700f0585858N#%)%( %(%#Plc4ff0000f0585858b#%{&readonly ? "RO" : ""} %)%(%#Plfcd0d0d0f0585858N#%{Powerline#Functions#GetFilepath()}%)%(%#Ple7fffffff0585858b#%t %)%(%#Plc4ff0000f0585858b#%M %)%(%#Plc4ff0000f0585858b#%H%W %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plec303030ec303030N#%(%#Plf79e9e9eec303030N# %{&fileformat} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{(&fenc == "" ? &enc : &fenc)} %)%)%(%#Plf79e9e9eec303030N#│%(%#Plf79e9e9eec303030N# %{strlen(&ft) ? &ft : "no ft"} %)%)%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)%(%#Plfcd0d0d0f0585858N#%(%#Plec303030fcd0d0d0b# LN %3l%)%(%#Plf4808080fcd0d0d0N#:%-2v%) %)'}, 'matches': ['match', 'any', []]}, {'mode_statuslines': {'r': '%(%(%#Ple7ffffff7caf0000b# %{"Command-T"} %)%#Pl7caf000058870000N#%)%<%#Ple7ffffff58870000N#%=%(%#Pl5887000058870000N#%(%#Ple7ffffff58870000N# %10(Match #%l%) %)%)', 's': '%(%(%#Ple7ffffff7caf0000b# %{"Command-T"} %)%#Pl7caf000058870000N#%)%<%#Ple7ffffff58870000N#%=%(%#Pl5887000058870000N#%(%#Ple7ffffff58870000N# %10(Match #%l%) %)%)', 'N': '%(%(%#Pla0d70000345f0000b# %{"Command-T"} %)%#Pl345f0000345f0000N#%)%<%#Ple7ffffff345f0000N#%=%(%#Pl345f0000345f0000N#%(%#Pla0d70000345f0000N# %10(Match #%l%) %)%)', 'v': '%(%(%#Ple7ffffff7caf0000b# %{"Command-T"} %)%#Pl7caf000058870000N#%)%<%#Ple7ffffff58870000N#%=%(%#Pl5887000058870000N#%(%#Ple7ffffff58870000N# %10(Match #%l%) %)%)', 'i': '%(%(%#Ple7ffffff7caf0000b# %{"Command-T"} %)%#Pl7caf000058870000N#%)%<%#Ple7ffffff58870000N#%=%(%#Pl5887000058870000N#%(%#Ple7ffffff58870000N# %10(Match #%l%) %)%)', 'n': '%(%(%#Ple7ffffff7caf0000b# %{"Command-T"} %)%#Pl7caf000058870000N#%)%<%#Ple7ffffff58870000N#%=%(%#Pl5887000058870000N#%(%#Ple7ffffff58870000N# %10(Match #%l%) %)%)'}, 'matches': ['match', 'any', [['bufname(winbufnr(a:window))', '^GoToFile$']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Undo tree"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 's': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Undo tree"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 'N': '%(%(%#Pla0d70000345f0000b# %{"Gundo"} %)%#Pla0d70000345f0000b#│%)%(%(%#Pla0d70000345f0000N# %{"Undo tree"} %)%#Pl345f0000345f0000N#%)%<%#Ple7ffffff345f0000N#%=', 'v': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Undo tree"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 'i': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Undo tree"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 'n': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Undo tree"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%='}, 'matches': ['match', 'any', [['bufname(winbufnr(a:window))', '^__Gundo__$']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Diff preview"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 's': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Diff preview"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 'N': '%(%(%#Pla0d70000345f0000b# %{"Gundo"} %)%#Pla0d70000345f0000b#│%)%(%(%#Pla0d70000345f0000N# %{"Diff preview"} %)%#Pl345f0000345f0000N#%)%<%#Ple7ffffff345f0000N#%=', 'v': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Diff preview"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 'i': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Diff preview"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%=', 'n': '%(%(%#Ple7ffffff7caf0000b# %{"Gundo"} %)%#Pl7caf000058870000N#%)%(%(%#Ple7ffffff58870000N# %{"Diff preview"} %)%#Pl5887000058870000N#%)%<%#Ple7ffffff58870000N#%='}, 'matches': ['match', 'any', [['bufname(winbufnr(a:window))', '^__Gundo_Preview__$']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7fffffff0585858N# %{"Help"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 's': '%(%(%#Ple7fffffff0585858N# %{"Help"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 'N': '%(%(%#Plf58a8a8aeb262626N# %{"Help"} %)%#Pleb262626e9121212N#%)%(%(%#Plf58a8a8ae9121212b# %t %)%#Ple9121212e9121212N#%)%<%#Ple7ffffffe9121212N#%=%(%#Pleb262626e9121212N#%(%#Plf0585858eb262626N# %3p%% %)%)', 'v': '%(%(%#Ple7fffffff0585858N# %{"Help"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 'i': '%(%(%#Ple7ffffff1f0087afN# %{"Help"} %)%#Ple7ffffff1f0087afN#│%)%(%(%#Ple7ffffff1f0087afb# %t %)%#Pl1f0087af18005f87N#%)%<%#Ple7ffffff18005f87N#%=%(%#Pl1f0087af18005f87N#%(%#Pl7587d7ff1f0087afN# %3p%% %)%)', 'n': '%(%(%#Ple7fffffff0585858N# %{"Help"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)'}, 'matches': ['match', 'any', [['getwinvar(a:window, "&bt")', '^help$']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7fffffff0585858N# %{"Pager"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 's': '%(%(%#Ple7fffffff0585858N# %{"Pager"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 'N': '%(%(%#Plf58a8a8aeb262626N# %{"Pager"} %)%#Pleb262626e9121212N#%)%(%(%#Plf58a8a8ae9121212b# %t %)%#Ple9121212e9121212N#%)%<%#Ple7ffffffe9121212N#%=%(%#Pleb262626e9121212N#%(%#Plf0585858eb262626N# %3p%% %)%)', 'v': '%(%(%#Ple7fffffff0585858N# %{"Pager"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 'i': '%(%(%#Ple7ffffff1f0087afN# %{"Pager"} %)%#Ple7ffffff1f0087afN#│%)%(%(%#Ple7ffffff1f0087afb# %t %)%#Pl1f0087af18005f87N#%)%<%#Ple7ffffff18005f87N#%=%(%#Pl1f0087af18005f87N#%(%#Pl7587d7ff1f0087afN# %3p%% %)%)', 'n': '%(%(%#Ple7fffffff0585858N# %{"Pager"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %t %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)'}, 'matches': ['match', 'any', [['getwinvar(a:window, "&ft")', 'vimpager']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7ffffff465faf00b# %{"LustyExplorer"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Buffer list"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 's': '%(%(%#Ple7ffffff465faf00b# %{"LustyExplorer"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Buffer list"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'N': '%(%(%#Pl465faf0016005f00b# %{"LustyExplorer"} %)%#Pl465faf0016005f00b#│%)%(%(%#Pl465faf0016005f00N# %{"Buffer list"} %)%#Pl16005f0016005f00N#%)%<%#Ple7ffffff16005f00N#%=', 'v': '%(%(%#Ple7ffffff465faf00b# %{"LustyExplorer"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Buffer list"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'i': '%(%(%#Ple7ffffff465faf00b# %{"LustyExplorer"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Buffer list"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'n': '%(%(%#Ple7ffffff465faf00b# %{"LustyExplorer"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Buffer list"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%='}, 'matches': ['match', 'any', [['bufname(winbufnr(a:window))', '\[LustyExplorer\-Buffers\]']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7fffffff0585858N# %{"Man page"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %{Powerline#Functions#ft_man#GetName()} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 's': '%(%(%#Ple7fffffff0585858N# %{"Man page"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %{Powerline#Functions#ft_man#GetName()} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 'N': '%(%(%#Plf58a8a8aeb262626N# %{"Man page"} %)%#Pleb262626e9121212N#%)%(%(%#Plf58a8a8ae9121212b# %{Powerline#Functions#ft_man#GetName()} %)%#Ple9121212e9121212N#%)%<%#Ple7ffffffe9121212N#%=%(%#Pleb262626e9121212N#%(%#Plf0585858eb262626N# %3p%% %)%)', 'v': '%(%(%#Ple7fffffff0585858N# %{"Man page"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %{Powerline#Functions#ft_man#GetName()} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)', 'i': '%(%(%#Ple7ffffff1f0087afN# %{"Man page"} %)%#Ple7ffffff1f0087afN#│%)%(%(%#Ple7ffffff1f0087afb# %{Powerline#Functions#ft_man#GetName()} %)%#Pl1f0087af18005f87N#%)%<%#Ple7ffffff18005f87N#%=%(%#Pl1f0087af18005f87N#%(%#Pl7587d7ff1f0087afN# %3p%% %)%)', 'n': '%(%(%#Ple7fffffff0585858N# %{"Man page"} %)%#Ple7fffffff0585858N#│%)%(%(%#Ple7fffffff0585858b# %{Powerline#Functions#ft_man#GetName()} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=%(%#Plf0585858ec303030N#%(%#Plfabcbcbcf0585858N# %3p%% %)%)'}, 'matches': ['match', 'any', [['getwinvar(a:window, "&ft")', '^man$']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7ffffff465faf00b# %{"MiniBufExplorer"} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 's': '%(%(%#Ple7ffffff465faf00b# %{"MiniBufExplorer"} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'N': '%(%(%#Pl465faf0016005f00b# %{"MiniBufExplorer"} %)%#Pl16005f0016005f00N#%)%<%#Ple7ffffff16005f00N#%=', 'v': '%(%(%#Ple7ffffff465faf00b# %{"MiniBufExplorer"} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'i': '%(%(%#Ple7ffffff465faf00b# %{"MiniBufExplorer"} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'n': '%(%(%#Ple7ffffff465faf00b# %{"MiniBufExplorer"} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%='}, 'matches': ['match', 'any', [['bufname(winbufnr(a:window))', '^\-MiniBufExplorer\-$']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7fffffff0585858N# %{"Quickfix"} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=', 's': '%(%(%#Ple7fffffff0585858N# %{"Quickfix"} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=', 'N': '%(%(%#Plf58a8a8aeb262626N# %{"Quickfix"} %)%#Pleb262626e9121212N#%)%<%#Ple7ffffffe9121212N#%=', 'v': '%(%(%#Ple7fffffff0585858N# %{"Quickfix"} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%=', 'i': '%(%(%#Ple7ffffff1f0087afN# %{"Quickfix"} %)%#Pl1f0087af18005f87N#%)%<%#Ple7ffffff18005f87N#%=', 'n': '%(%(%#Ple7fffffff0585858N# %{"Quickfix"} %)%#Plf0585858ec303030N#%)%<%#Ple7ffffffec303030N#%='}, 'matches': ['match', 'any', [['getwinvar(a:window, "&ft")', '^qf$']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7ffffff465faf00b# %{"Tagbar"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Tree"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 's': '%(%(%#Ple7ffffff465faf00b# %{"Tagbar"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Tree"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'N': '%(%(%#Pl465faf0016005f00b# %{"Tagbar"} %)%#Pl465faf0016005f00b#│%)%(%(%#Pl465faf0016005f00N# %{"Tree"} %)%#Pl16005f0016005f00N#%)%<%#Ple7ffffff16005f00N#%=', 'v': '%(%(%#Ple7ffffff465faf00b# %{"Tagbar"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Tree"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'i': '%(%(%#Ple7ffffff465faf00b# %{"Tagbar"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Tree"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'n': '%(%(%#Ple7ffffff465faf00b# %{"Tagbar"} %)%#Pl465faf001c008700N#%)%(%(%#Pl94afd7001c008700N# %{"Tree"} %)%#Pl1c0087001c008700N#%)%<%#Ple7ffffff1c008700N#%='}, 'matches': ['match', 'any', [['getwinvar(a:window, "&ft")', '^tagbar$']]]}, {'mode_statuslines': {'r': '%(%(%#Ple7ffffff465faf00b# %{Powerline#Functions#GetShortPath(4)} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 's': '%(%(%#Ple7ffffff465faf00b# %{Powerline#Functions#GetShortPath(4)} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'N': '%(%(%#Pl465faf0016005f00b# %{Powerline#Functions#GetShortPath(4)} %)%#Pl16005f0016005f00N#%)%<%#Ple7ffffff16005f00N#%=', 'v': '%(%(%#Ple7ffffff465faf00b# %{Powerline#Functions#GetShortPath(4)} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'i': '%(%(%#Ple7ffffff465faf00b# %{Powerline#Functions#GetShortPath(4)} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%=', 'n': '%(%(%#Ple7ffffff465faf00b# %{Powerline#Functions#GetShortPath(4)} %)%#Pl465faf001c008700N#%)%<%#Ple7ffffff1c008700N#%='}, 'matches': ['match', 'any', [['getwinvar(a:window, "&ft")', '^nerdtree$']]]}]
+let g:Pl#THEME_CALLBACKS  = [['function! PowerlineStatuslineCallback_ctrlp_main(...){{NEWLINE}}return Pl#StatuslineCallback(''%(%(%#Ple7ffffff62875fd7N# %-3{"%3"} %)%#Pl62875fd7e7ffffffN#%)%(%(%#Pl375f00afe7ffffffb# %-9{"%4"} %)%#Ple7ffffff62875fd7N#%)%(%(%#Ple7ffffff62875fd7N# %-3{"%5"} %)%#Pl62875fd7375f00afN#%)%(%(%#Plc4ff0000375f00afb# %{"%6" == " <+>" ? "" : strpart("%6", 2, len("%6") - 3)} %)%#Pl375f00af375f00afN#%)%<%#Ple7ffffff375f00afN#%=%(%#Pl375f00af375f00afN#%(%#Plbdd7d7ff375f00afN# %{"%0"} %)%)%(%#Plbdd7d7ff375f00afN#│%(%#Plbdd7d7ff375f00afN# %{"%1"} %)%)%(%#Pl62875fd7375f00afN#%(%#Ple7ffffff62875fd7N# %{substitute(getcwd(), expand("$HOME"), "~", "g")} %)%)'', a:000){{NEWLINE}}endfunction', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.main = "PowerlineStatuslineCallback_ctrlp_main"'], ['function! PowerlineStatuslineCallback_ctrlp_prog(...){{NEWLINE}}return Pl#StatuslineCallback(''%(%(%#Pl375f00afe7ffffffN# %-6{"%0"} %)%#Ple7ffffff375f00afN#%)%<%#Ple7ffffff375f00afN#%=%(%#Pl62875fd7375f00afN#%(%#Ple7ffffff62875fd7N# %{substitute(getcwd(), expand("$HOME"), "~", "g")} %)%)'', a:000){{NEWLINE}}endfunction', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.prog = "PowerlineStatuslineCallback_ctrlp_prog"']]
diff --git a/vim-plugins/bundle/vim-powerline/README.rst b/vim-plugins/bundle/vim-powerline/README.rst
new file mode 100644
index 0000000..9c71440
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/README.rst
@@ -0,0 +1,114 @@
+===================
+DEPRECATION WARNING
+===================
+
+Plugin is currently in maintenance mode, no feature requests will be accepted.
+Vim-powerline will be deprecated in favour of https://github.com/Lokaltog/powerline once it is ready.
+
+=================
+Powerline for vim
+=================
+
+:Author: Kim Silkebækken (kim.silkebaekken+vim@gmail.com)
+:Source: https://github.com/Lokaltog/vim-powerline
+:Version: β
+
+Introduction
+------------
+
+Powerline is a utility plugin which allows you to create better-looking, 
+more functional vim statuslines. See the screenshots below for 
+a demonstration of the plugin's capabilities.
+
+It's recommended that you install the plugin using Pathogen_ or Vundle_.  
+After the plugin is installed update your help tags and see ``:help 
+Powerline`` for instructions on how to enable and configure the plugin.
+
+See the `Troubleshooting`_ section below if you're having any issues with 
+the plugin or the font patcher.
+
+**Note:** You need a patched font to be able to use the symbols in the 
+statusline. An experimental Python/fontforge-based font patcher is included 
+in the ``fontpatcher`` directory. See ``fontpatcher/README.rst`` for usage 
+instructions.
+
+.. _Pathogen: https://github.com/tpope/vim-pathogen
+.. _Vundle: https://github.com/gmarik/vundle
+
+Screenshots
+-----------
+
+.. image:: http://i.imgur.com/MsuIB.png
+
+Troubleshooting
+---------------
+
+I can't see the fancy symbols, what's wrong?
+    Make sure that you have ``let g:Powerline_symbols = 'fancy'`` in your 
+    ``vimrc`` file. The settings may be loaded too late if you have this in 
+    ``gvimrc``, so always put this in your ``vimrc``.
+
+    Clear the cache using ``:PowerlineClearCache`` and restart vim.
+
+    Make sure that you've configured gvim or your terminal emulator to use 
+    a patched font.
+
+    Make sure that vim is compiled with the ``--with-features=big`` flag.
+
+The fancy symbols look a bit blurry or "off"!
+    Make sure that you have patched all variants of your font (i.e. both the 
+    regular and the bold font files).
+
+I'm unable to patch my font, what should I do?
+    Font patching is only known to work on most Linux and OS X machines. If 
+    you have followed the instructions in the fontpatcher README and still 
+    have problems, please submit an issue on GitHub.
+
+    You can download some community-contributed patched fonts from the 
+    `Powerline wiki`_ if you don't want to mess around with the font 
+    patcher.
+
+The Syntastic/Fugitive statusline flags don't work!
+    These flags should work without any configuration. If you installed 
+    either plugin after Powerline, you'll have to clear the cache using 
+    ``:PowerlineClearCache`` and restart vim.
+
+The colors are weird in the default OS X Terminal app!
+    The default OS X Terminal app is known to have some issues with the 
+    Powerline colors. Please use another terminal emulator. iTerm2 should 
+    work fine.
+
+    The arrows may have the wrong colors if you have changed the "minimum 
+    contrast" slider in the color tab of  your OS X settings.
+
+The statusline has strange characters like ``^B`` in it!
+    Please add ``set encoding=utf-8`` to your ``vimrc``.
+
+    You may also need to set your ``LANG`` and ``LC_*`` environment 
+    variables to a UTF-8 locale (e.g. ``LANG=en_US.utf8``). Consult your 
+    Linux distro's documentation for information about setting these 
+    variables correctly.
+
+The statusline has a lot of ``^`` or underline characters in it!
+    You need to configure the ``fillchars`` setting to disable statusline 
+    fillchars (see ``:h fillchars`` for details). Add this to your 
+    ``vimrc`` to solve this issue::
+
+        set fillchars+=stl:\ ,stlnc:\ 
+
+The statusline is hidden/only appears in split windows!
+    Make sure that you have ``set laststatus=2`` in your ``vimrc``.
+
+I'm using tmux and Powerline looks like crap, what's wrong?
+    You need to tell tmux that it has 256-color capabilities. Add this to 
+    your ``.tmux.conf`` to solve this issue::
+
+        set -g default-terminal "screen-256color"
+
+    If you use iTerm2, make sure that you have enabled the setting 'Set 
+    locale variables automatically' in Profiles > Terminal > Environment.
+
+If you have any other issues and you can't find the answer in the docs, 
+please submit an issue on GitHub.
+
+.. _`Powerline wiki`: https://github.com/Lokaltog/vim-powerline/wiki/Patched-fonts
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl.vim b/vim-plugins/bundle/vim-powerline/autoload/Pl.vim
new file mode 100644
index 0000000..83edf6c
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Pl.vim
@@ -0,0 +1,184 @@
+" Powerline - The ultimate statusline utility
+"
+" Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
+" Source repository: https://github.com/Lokaltog/vim-powerline
+
+" Script variables {{{
+	let g:Pl#OLD_STL = ''
+	let g:Pl#THEME = []
+	let g:Pl#THEME_CALLBACKS = []
+	let g:Pl#HL = []
+
+	" Cache revision, this must be incremented whenever the cache format is changed
+	let s:CACHE_REVISION = 7
+" }}}
+" Script initialization {{{
+	function! Pl#LoadCache() " {{{
+		if filereadable(g:Powerline_cache_file) && g:Powerline_cache_enabled
+			exec 'source' escape(g:Powerline_cache_file, ' \')
+
+			if ! exists('g:Powerline_cache_revision') || g:Powerline_cache_revision != s:CACHE_REVISION
+				" Cache revision differs, cache is invalid
+				unlet! g:Powerline_cache_revision
+
+				return 0
+			endif
+
+			" Create highlighting groups
+			for hi_cmd in g:Pl#HL
+				exec hi_cmd
+			endfor
+
+			" Run theme callbacks
+			for callback in g:Pl#THEME_CALLBACKS
+				" Substitute {{NEWLINE}} with newlines (strings must be
+				" stored without newlines characters to avoid vim errors)
+				exec substitute(callback[0], "{{NEWLINE}}", "\n", 'g')
+				exec substitute(callback[1], "{{NEWLINE}}", "\n", 'g')
+			endfor
+
+			return 1
+		endif
+
+		return 0
+	endfunction " }}}
+	function! Pl#ClearCache() " {{{
+		if filereadable(g:Powerline_cache_file)
+			" Delete the cache file
+			call delete(g:Powerline_cache_file)
+		endif
+
+		echo 'Powerline cache cleared. Please restart vim for the changes to take effect.'
+	endfunction " }}}
+	function! Pl#ReloadColorscheme() " {{{
+		call Pl#ClearCache()
+
+		" The colorscheme and theme files must be manually sourced because
+		" vim won't reload previously autoloaded files
+		"
+		" This is a bit hackish, but it works
+		unlet! g:Powerline#Colorschemes#{g:Powerline_colorscheme}#colorscheme
+		exec "source" split(globpath(&rtp, 'autoload/Powerline/Colorschemes/'. g:Powerline_colorscheme .'.vim', 1), '\n')[0]
+
+		unlet! g:Powerline#Themes#{g:Powerline_theme}#theme
+		exec "source" split(globpath(&rtp, 'autoload/Powerline/Themes/'. g:Powerline_theme .'.vim', 1), '\n')[0]
+
+		let g:Pl#THEME = []
+
+		call Pl#Load()
+	endfunction " }}}
+	function! Pl#Load() " {{{
+		if empty(g:Pl#OLD_STL)
+			" Store old statusline
+			let g:Pl#OLD_STL = &statusline
+		endif
+
+		if ! Pl#LoadCache()
+			try
+				" Autoload the theme dict first
+				let raw_theme = g:Powerline#Themes#{g:Powerline_theme}#theme
+			catch
+				echom 'Invalid Powerline theme! Please check your theme and colorscheme settings.'
+
+				return
+			endtry
+
+			" Create list with parsed statuslines
+			for buffer_statusline in raw_theme
+				unlet! mode_statuslines
+				let mode_statuslines = Pl#Parser#GetStatusline(buffer_statusline.segments)
+
+				if ! empty(buffer_statusline.callback)
+					" The callback function passes its arguments on to
+					" Pl#StatuslineCallback along with the normal/current mode
+					" statusline.
+					let s:cb_func  = "function! PowerlineStatuslineCallback_". buffer_statusline.callback[1] ."(...)\n"
+					let s:cb_func .= "return Pl#StatuslineCallback(". string(mode_statuslines['n']) .", a:000)\n"
+					let s:cb_func .= "endfunction"
+
+					" The callback expression should be used to initialize any
+					" variables that will use the callback function. The
+					" expression requires a %s which will be replaced by the
+					" callback function name.
+					let s:cb_expr  = printf(buffer_statusline.callback[2], 'PowerlineStatuslineCallback_'. buffer_statusline.callback[1])
+
+					exec s:cb_func
+					exec s:cb_expr
+
+					" Newlines must be substituted with another character
+					" because vim doesn't like newlines in strings
+					call add(g:Pl#THEME_CALLBACKS, [substitute(s:cb_func, "\n", "{{NEWLINE}}", 'g'), substitute(s:cb_expr, "\n", "{{NEWLINE}}", 'g')])
+
+					unlet! s:cb_func s:cb_expr
+
+					continue
+				endif
+
+				" Store the statuslines for matching specific buffers
+				call add(g:Pl#THEME, {
+					\ 'matches': buffer_statusline.matches,
+					\ 'mode_statuslines': mode_statuslines
+					\ })
+			endfor
+
+			if ! g:Powerline_cache_enabled
+				" Don't cache anything if caching is disabled or cache file isn't writeable
+				return
+			endif
+
+			" Prepare commands and statuslines for caching
+			let cache = [
+				\ 'let g:Powerline_cache_revision = '. string(s:CACHE_REVISION),
+				\ 'let g:Pl#HL = '. string(g:Pl#HL),
+				\ 'let g:Pl#THEME  = '. string(g:Pl#THEME),
+				\ 'let g:Pl#THEME_CALLBACKS  = '. string(g:Pl#THEME_CALLBACKS),
+			\ ]
+
+			call writefile(cache, g:Powerline_cache_file)
+		endif
+	endfunction " }}}
+" }}}
+" Statusline updater {{{
+	function! Pl#Statusline(statusline, current) " {{{
+		let mode = mode()
+
+		if ! a:current
+			let mode = 'N' " Normal (non-current)
+		elseif mode =~# '\v(v|V|)'
+			let mode = 'v' " Visual mode
+		elseif mode =~# '\v(s|S|)'
+			let mode = 's' " Select mode
+		elseif mode =~# '\vi'
+			let mode = 'i' " Insert mode
+		elseif mode =~# '\v(R|Rv)'
+			let mode = 'r' " Replace mode
+		else
+			" Fallback to normal mode
+			let mode = 'n' " Normal (current)
+		endif
+
+		return g:Pl#THEME[a:statusline].mode_statuslines[mode]
+	endfunction " }}}
+	function! Pl#StatuslineCallback(statusline, args) " {{{
+		" Replace %1, %2, etc. in the statusline with the callback args
+		return substitute(
+			\ a:statusline,
+			\ '\v\%(\d+)',
+			\ '\=a:args[submatch(1)]',
+			\ 'g')
+	endfunction " }}}
+	function! Pl#UpdateStatusline(current, ...) " {{{
+		if empty(g:Pl#THEME)
+			" Load statuslines if they aren't loaded yet
+			call Pl#Load()
+		endif
+
+		for i in range(len(g:Pl#THEME))
+			if Pl#Match#Validate(g:Pl#THEME[i], a:0 ? a:1 : 0)
+				" Update window-local statusline
+				call setwinvar(a:0 ? a:1 : 0, '&statusline',
+				            \  '%!Pl#Statusline('. i .','. a:current .')')
+			endif
+		endfor
+	endfunction " }}}
+" }}}
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl/Colorscheme.vim b/vim-plugins/bundle/vim-powerline/autoload/Pl/Colorscheme.vim
new file mode 100644
index 0000000..ec15e46
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Pl/Colorscheme.vim
@@ -0,0 +1,145 @@
+function! Pl#Colorscheme#Init(hi) " {{{
+	let colorscheme = {}
+
+	for hi in a:hi
+		" Ensure that the segments are a list
+		let segments = type(hi[0]) == type('') ? [ hi[0] ] : hi[0]
+		let mode_hi_dict = hi[1]
+
+		for segment in segments
+			let colorscheme[segment] = mode_hi_dict
+		endfor
+	endfor
+
+	return colorscheme
+endfunction " }}}
+function! Pl#Colorscheme#Apply(colorscheme, buffer_segments) " {{{
+	" Set color parameters for all segments in a:buffer_segments
+
+	" TODO This function should be recursive and work on both segments and groups
+	" TODO We could probably handle the NS stuff here...
+
+	try
+		let colorscheme = g:Powerline#Colorschemes#{a:colorscheme}#colorscheme
+	catch
+		echom 'Color scheme "'. a:colorscheme .'" doesn''t exist!'
+
+		return
+	endtry
+
+	let buffer_segments = a:buffer_segments
+
+	" This is a bit complex, I'll walk you through exactly what happens here...
+	"
+	" First of all we loop through the buffer_segments, which are the segments that
+	" this specific buffer will have.
+	for buffer_segment in buffer_segments
+		" The buffer_segment consists of a 'matches' list and a 'segments' list.
+		" The 'matches' list has conditions to limit this statusline to specific buffers/windows.
+		" The 'segments' list has each segment and segment group for this buffer
+		for segment in buffer_segment.segments
+			let type = get(segment, 'type', '')
+
+			if type == 'segment_group'
+				" We're going to handle segment groups different from single segments. Segment groups
+				" have child segments which may have their own highlighting (e.g. fileinfo.flags),
+				" and these child segments may be grouped (e.g. fileinfo.flags.ro) to provide very
+				" specific highlighting. So here we'll handle all that:
+
+				" Set the default/fallback colors for this group
+				for i in range(len(segment.variants), 0, -1)
+					" Check for available highlighting for the main group segment
+					"
+					" This works like the segment highlighting below
+					" TODO Create a function for this
+					let seg_variants = join(segment.variants[0:i], '.')
+
+					let seg_name = i > 0 ? segment.name .'.'. seg_variants : segment.name
+					let seg_ns_name = len(segment.ns) > 0 ? segment.ns .':'. seg_name : seg_name
+
+					if has_key(colorscheme, seg_ns_name)
+						" We have a namespaced highlight group
+						let segment.colors = colorscheme[seg_ns_name]
+						break
+					elseif has_key(colorscheme, seg_name)
+						" We have a non-namespaced group
+						let segment.colors = colorscheme[seg_name]
+						break
+					endif
+				endfor
+
+				" The reason why we need to deepcopy the group's segments is that the child segments
+				" all point to the same base segments and that screws up highlighting if we highlight
+				" some child segments with different namespaced colors
+				let segment.segments = deepcopy(segment.segments)
+
+				" Apply colors to each child segment
+				for child_segment in segment.segments
+					" Check if this child segment is grouped (e.g. fileinfo.flags.group.subgroup)
+					" We're going to prioritize the most specific grouping and then work back to the
+					" most common group (e.g. fileinfo.flags)
+
+					" FIXME We don't have the variants from before because group children aren't run through Pl#Segment#Get
+					let child_segment.variants = [seg_name] + split(child_segment.name, '\.')
+
+					" Use the parent group's namespace
+					let child_segment.ns = segment.ns
+
+					for i in range(len(child_segment.variants), 0, -1)
+						" Check for available highlighting for the main group segment
+						let child_seg_name = join(child_segment.variants[0:i], '.')
+
+						let child_seg_ns_name = len(child_segment.ns) > 0 ? child_segment.ns .':'. child_seg_name : child_seg_name
+
+						if has_key(colorscheme, child_seg_ns_name)
+							" We have a namespaced highlight group
+							let child_segment.colors = colorscheme[child_seg_ns_name]
+							break
+						elseif has_key(colorscheme, child_seg_name)
+							" We have a non-namespaced group
+							let child_segment.colors = colorscheme[child_seg_name]
+							break
+						endif
+					endfor
+				endfor
+			elseif type == 'segment'
+				for i in range(len(segment.variants), 0, -1)
+					" Check for available highlighting
+					"
+					" This is done in the following manner, using the segment gundo:static_filename.text.buffer as an example:
+					"
+					" * Look for the hl group: gundo:static_filename.text.buffer
+					" * Look for the hl group:       static_filename.text.buffer
+					" * Look for the hl group: gundo:static_filename.text
+					" * Look for the hl group:       static_filename.text
+					" * Look for the hl group: gundo:static_filename
+					" * Look for the hl group:       static_filename
+					" * Return the segment without highlighting, causing an error in the parser
+					let seg_variants = join(segment.variants[0:i], '.')
+
+					let seg_name = i > 0 ? segment.name .'.'. seg_variants : segment.name
+					let seg_ns_name = len(segment.ns) > 0 ? segment.ns .':'. seg_name : seg_name
+
+					if has_key(colorscheme, seg_ns_name)
+						" We have a namespaced highlight group
+						let segment.colors = colorscheme[seg_ns_name]
+						break
+					elseif has_key(colorscheme, seg_name)
+						" We have a non-namespaced group
+						let segment.colors = colorscheme[seg_name]
+						break
+					endif
+				endfor
+			endif
+
+			unlet! segment
+		endfor
+	endfor
+
+	" Good luck parsing this return value
+	"
+	" It's a huge dict with all segments for all buffers with their respective syntax highlighting.
+	" It will be parsed by the main Powerline code, where all the data will be shortened to a simple
+	" array consiting of a statusline for each mode, with generated highlighting groups and dividers.
+	return buffer_segments
+endfunction " }}}
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl/Hi.vim b/vim-plugins/bundle/vim-powerline/autoload/Pl/Hi.vim
new file mode 100644
index 0000000..f6b3eea
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Pl/Hi.vim
@@ -0,0 +1,140 @@
+" cterm -> gui color dict {{{
+let s:cterm2gui_dict = {
+	\ 16:  0x000000, 17:  0x00005f, 18:  0x000087, 19:  0x0000af, 20:  0x0000d7, 21:  0x0000ff,
+	\ 22:  0x005f00, 23:  0x005f5f, 24:  0x005f87, 25:  0x005faf, 26:  0x005fd7, 27:  0x005fff,
+	\ 28:  0x008700, 29:  0x00875f, 30:  0x008787, 31:  0x0087af, 32:  0x0087d7, 33:  0x0087ff,
+	\ 34:  0x00af00, 35:  0x00af5f, 36:  0x00af87, 37:  0x00afaf, 38:  0x00afd7, 39:  0x00afff,
+	\ 40:  0x00d700, 41:  0x00d75f, 42:  0x00d787, 43:  0x00d7af, 44:  0x00d7d7, 45:  0x00d7ff,
+	\ 46:  0x00ff00, 47:  0x00ff5f, 48:  0x00ff87, 49:  0x00ffaf, 50:  0x00ffd7, 51:  0x00ffff,
+	\ 52:  0x5f0000, 53:  0x5f005f, 54:  0x5f0087, 55:  0x5f00af, 56:  0x5f00d7, 57:  0x5f00ff,
+	\ 58:  0x5f5f00, 59:  0x5f5f5f, 60:  0x5f5f87, 61:  0x5f5faf, 62:  0x5f5fd7, 63:  0x5f5fff,
+	\ 64:  0x5f8700, 65:  0x5f875f, 66:  0x5f8787, 67:  0x5f87af, 68:  0x5f87d7, 69:  0x5f87ff,
+	\ 70:  0x5faf00, 71:  0x5faf5f, 72:  0x5faf87, 73:  0x5fafaf, 74:  0x5fafd7, 75:  0x5fafff,
+	\ 76:  0x5fd700, 77:  0x5fd75f, 78:  0x5fd787, 79:  0x5fd7af, 80:  0x5fd7d7, 81:  0x5fd7ff,
+	\ 82:  0x5fff00, 83:  0x5fff5f, 84:  0x5fff87, 85:  0x5fffaf, 86:  0x5fffd7, 87:  0x5fffff,
+	\ 88:  0x870000, 89:  0x87005f, 90:  0x870087, 91:  0x8700af, 92:  0x8700d7, 93:  0x8700ff,
+	\ 94:  0x875f00, 95:  0x875f5f, 96:  0x875f87, 97:  0x875faf, 98:  0x875fd7, 99:  0x875fff,
+	\ 100: 0x878700, 101: 0x87875f, 102: 0x878787, 103: 0x8787af, 104: 0x8787d7, 105: 0x8787ff,
+	\ 106: 0x87af00, 107: 0x87af5f, 108: 0x87af87, 109: 0x87afaf, 110: 0x87afd7, 111: 0x87afff,
+	\ 112: 0x87d700, 113: 0x87d75f, 114: 0x87d787, 115: 0x87d7af, 116: 0x87d7d7, 117: 0x87d7ff,
+	\ 118: 0x87ff00, 119: 0x87ff5f, 120: 0x87ff87, 121: 0x87ffaf, 122: 0x87ffd7, 123: 0x87ffff,
+	\ 124: 0xaf0000, 125: 0xaf005f, 126: 0xaf0087, 127: 0xaf00af, 128: 0xaf00d7, 129: 0xaf00ff,
+	\ 130: 0xaf5f00, 131: 0xaf5f5f, 132: 0xaf5f87, 133: 0xaf5faf, 134: 0xaf5fd7, 135: 0xaf5fff,
+	\ 136: 0xaf8700, 137: 0xaf875f, 138: 0xaf8787, 139: 0xaf87af, 140: 0xaf87d7, 141: 0xaf87ff,
+	\ 142: 0xafaf00, 143: 0xafaf5f, 144: 0xafaf87, 145: 0xafafaf, 146: 0xafafd7, 147: 0xafafff,
+	\ 148: 0xafd700, 149: 0xafd75f, 150: 0xafd787, 151: 0xafd7af, 152: 0xafd7d7, 153: 0xafd7ff,
+	\ 154: 0xafff00, 155: 0xafff5f, 156: 0xafff87, 157: 0xafffaf, 158: 0xafffd7, 159: 0xafffff,
+	\ 160: 0xd70000, 161: 0xd7005f, 162: 0xd70087, 163: 0xd700af, 164: 0xd700d7, 165: 0xd700ff,
+	\ 166: 0xd75f00, 167: 0xd75f5f, 168: 0xd75f87, 169: 0xd75faf, 170: 0xd75fd7, 171: 0xd75fff,
+	\ 172: 0xd78700, 173: 0xd7875f, 174: 0xd78787, 175: 0xd787af, 176: 0xd787d7, 177: 0xd787ff,
+	\ 178: 0xd7af00, 179: 0xd7af5f, 180: 0xd7af87, 181: 0xd7afaf, 182: 0xd7afd7, 183: 0xd7afff,
+	\ 184: 0xd7d700, 185: 0xd7d75f, 186: 0xd7d787, 187: 0xd7d7af, 188: 0xd7d7d7, 189: 0xd7d7ff,
+	\ 190: 0xd7ff00, 191: 0xd7ff5f, 192: 0xd7ff87, 193: 0xd7ffaf, 194: 0xd7ffd7, 195: 0xd7ffff,
+	\ 196: 0xff0000, 197: 0xff005f, 198: 0xff0087, 199: 0xff00af, 200: 0xff00d7, 201: 0xff00ff,
+	\ 202: 0xff5f00, 203: 0xff5f5f, 204: 0xff5f87, 205: 0xff5faf, 206: 0xff5fd7, 207: 0xff5fff,
+	\ 208: 0xff8700, 209: 0xff875f, 210: 0xff8787, 211: 0xff87af, 212: 0xff87d7, 213: 0xff87ff,
+	\ 214: 0xffaf00, 215: 0xffaf5f, 216: 0xffaf87, 217: 0xffafaf, 218: 0xffafd7, 219: 0xffafff,
+	\ 220: 0xffd700, 221: 0xffd75f, 222: 0xffd787, 223: 0xffd7af, 224: 0xffd7d7, 225: 0xffd7ff,
+	\ 226: 0xffff00, 227: 0xffff5f, 228: 0xffff87, 229: 0xffffaf, 230: 0xffffd7, 231: 0xffffff,
+	\ 232: 0x080808, 233: 0x121212, 234: 0x1c1c1c, 235: 0x262626, 236: 0x303030, 237: 0x3a3a3a,
+	\ 238: 0x444444, 239: 0x4e4e4e, 240: 0x585858, 241: 0x626262, 242: 0x6c6c6c, 243: 0x767676,
+	\ 244: 0x808080, 245: 0x8a8a8a, 246: 0x949494, 247: 0x9e9e9e, 248: 0xa8a8a8, 249: 0xb2b2b2,
+	\ 250: 0xbcbcbc, 251: 0xc6c6c6, 252: 0xd0d0d0, 253: 0xdadada, 254: 0xe4e4e4, 255: 0xeeeeee
+\ }
+" }}}
+" Allocated color dict {{{
+let s:allocated_colors = {
+	\ 'NONE': 'NONE',
+	\ }
+" }}}
+function! s:Cterm2GUI(cterm) " {{{
+	if toupper(a:cterm) == 'NONE'
+		return 'NONE'
+	endif
+
+	if ! has_key(s:cterm2gui_dict, a:cterm)
+		return 0xff0000
+	endif
+
+	return s:cterm2gui_dict[a:cterm]
+endfunction " }}}
+function! Pl#Hi#Segments(segments, mode_colors) " {{{
+	let mode_translate = {
+		\ 'normal':     'n',
+		\ 'noncurrent': 'N',
+		\ 'insert':     'i',
+		\ 'visual':     'v',
+		\ 'replace':    'r',
+		\ 'select':     's',
+		\ }
+
+	let attributes = ['bold', 'italic', 'underline']
+
+	let segments = a:segments
+	let mode_hi_dict = {}
+
+	" Mode dict
+	for [mode, colors] in items(a:mode_colors)
+		if has_key(mode_translate, mode)
+			let mode = mode_translate[mode]
+		endif
+
+		unlet! fg
+		let fg = s:allocated_colors[colors[0]]
+
+		let hi = {
+			\ 'cterm': [fg['cterm'], ''],
+			\ 'gui'  : [fg['gui'], ''],
+			\ 'attr' : []
+			\ }
+
+		if exists('colors[1]')
+			if type(colors[1]) == type([])
+				" We don't have a BG color, but we have attributes
+				let hi.attr = colors[1]
+			else
+				" The second parameter is the background color
+				unlet! bg
+				let bg = s:allocated_colors[colors[1]]
+
+				let hi.cterm[1] = bg['cterm']
+				let hi.gui[1] = bg['gui']
+			endif
+		endif
+
+		if exists('colors[2]') && type(colors[2]) == type([])
+			" The third parameter is always an attribute list
+			let hi.attr = colors[2]
+		endif
+
+		let mode_hi_dict[mode] = {
+			\ 'ctermfg': (empty(hi['cterm'][0]) ? '' : (string(hi['cterm'][0]) == 'NONE' ? 'NONE' : hi['cterm'][0])),
+			\ 'ctermbg': (empty(hi['cterm'][1]) ? '' : (string(hi['cterm'][1]) == 'NONE' ? 'NONE' : hi['cterm'][1])),
+			\ 'guifg'  : (empty(hi['gui'][0]) ? '' : (string(hi['gui'][0]) == 'NONE' ? 'NONE' : hi['gui'][0])),
+			\ 'guibg'  : (empty(hi['gui'][1]) ? '' : (string(hi['gui'][1]) == 'NONE' ? 'NONE' : hi['gui'][1])),
+			\ 'attr'   : (! len(hi['attr']) ? 'NONE' : join(hi['attr'], ','))
+			\ }
+	endfor
+
+	return [segments, mode_hi_dict]
+endfunction " }}}
+function! Pl#Hi#Allocate(colors) " {{{
+	for [key, color] in items(a:colors)
+		if type(color) == type(0)
+			" Only terminal color
+			let cterm = color
+			let gui = s:Cterm2GUI(color)
+		elseif type(color) == type([]) && len(color) == 2
+			" Terminal and GUI colors
+			let cterm = color[0]
+			let gui = color[1]
+		endif
+
+		let s:allocated_colors[key] = {
+			\ 'cterm': cterm,
+			\ 'gui': gui,
+			\ }
+
+		unlet! color
+	endfor
+endfunction " }}}
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl/Match.vim b/vim-plugins/bundle/vim-powerline/autoload/Pl/Match.vim
new file mode 100644
index 0000000..93aa6d0
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Pl/Match.vim
@@ -0,0 +1,43 @@
+function! Pl#Match#Add(pat, expr) " {{{
+	return [a:pat, a:expr]
+endfunction " }}}
+function! Pl#Match#Any(...) " {{{
+	let matches = []
+
+	for match_name in a:000
+		if empty(match_name)
+			" Skip empty match parameters
+			continue
+		endif
+
+		if has_key(g:Powerline#Matches#matches, match_name)
+			call add(matches, g:Powerline#Matches#matches[match_name])
+		endif
+
+		unlet! match_name
+	endfor
+
+	return ['match', 'any', matches]
+endfunction " }}}
+function! Pl#Match#Validate(theme, window) " {{{
+	let match = a:theme.matches[1]
+
+	if match == 'none'
+		return 0
+	elseif match == 'any'
+		let matches = a:theme.matches[2]
+
+		if ! len(matches)
+			" Empty match array matches everything
+			return 1
+		endif
+
+		for [eval, re] in matches
+			if match(eval(eval), '\v\C'. re) != -1
+				return 1
+			endif
+		endfor
+
+		return 0
+	endif
+endfunction " }}}
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl/Mod.vim b/vim-plugins/bundle/vim-powerline/autoload/Pl/Mod.vim
new file mode 100644
index 0000000..fdfb571
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Pl/Mod.vim
@@ -0,0 +1,40 @@
+let s:segment_mods = []
+
+function! Pl#Mod#AddSegmentMod(action, properties) " {{{
+	call add(s:segment_mods, [a:action, a:properties])
+endfunction " }}}
+function! Pl#Mod#ApplySegmentMods(theme) " {{{
+	let theme = deepcopy(a:theme)
+
+	for mod in s:segment_mods
+		let [action, properties] = mod
+
+		" We have to loop through the segments instead of using index() because some
+		" segments are lists!
+		let target_seg_idx = -1
+
+		for i in range(0, len(theme) - 1)
+			unlet! segment
+			let segment = theme[i]
+
+			if type(segment) == type(properties.target_segment) && segment == properties.target_segment
+				let target_seg_idx = i
+				break
+			endif
+		endfor
+
+		if action == 'insert_segment'
+			" Insert segment
+			if target_seg_idx != -1
+				call insert(theme, properties.new_segment, (properties.where == 'before' ? target_seg_idx : target_seg_idx + 1))
+			endif
+		elseif action == 'remove_segment'
+			" Remove segment
+			if target_seg_idx != -1
+				call remove(theme, target_seg_idx)
+			endif
+		endif
+	endfor
+
+	return theme
+endfunction " }}}
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl/Parser.vim b/vim-plugins/bundle/vim-powerline/autoload/Pl/Parser.vim
new file mode 100644
index 0000000..a6f3428
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Pl/Parser.vim
@@ -0,0 +1,371 @@
+let g:Pl#Parser#Symbols = {
+	\ 'compatible': {
+		\   'dividers': [ '', [0x2502], '', [0x2502] ]
+		\ , 'symbols' : {
+			\   'BRANCH': 'BR:'
+			\ , 'RO'    : 'RO'
+			\ , 'FT'    : 'FT'
+			\ , 'LINE'  : 'LN'
+		\ }
+	\ },
+	\ 'unicode': {
+		\   'dividers': [ [0x25b6], [0x276f], [0x25c0], [0x276e]  ]
+		\ , 'symbols' : {
+			\   'BRANCH': [0x26a1]
+			\ , 'RO'    : [0x2613]
+			\ , 'FT'    : [0x2691]
+			\ , 'LINE'  : [0x204b]
+		\ },
+	\ },
+	\ 'fancy': {
+		\   'dividers': [ [0x2b80], [0x2b81], [0x2b82], [0x2b83] ]
+		\ , 'symbols' : {
+			\   'BRANCH': [0x2b60]
+			\ , 'RO'    : [0x2b64]
+			\ , 'FT'    : [0x2b62, 0x2b63]
+			\ , 'LINE'  : [0x2b61]
+		\ }
+	\ }
+\ }
+
+" Handle symbol overrides
+for [s:key, s:value] in items(g:Powerline_symbols_override)
+	let g:Pl#Parser#Symbols[g:Powerline_symbols].symbols[s:key] = s:value
+
+	unlet! s:key s:value
+endfor
+
+" Handle divider overrides
+if len(g:Powerline_dividers_override) == 4
+	let g:Pl#Parser#Symbols[g:Powerline_symbols].dividers = g:Powerline_dividers_override
+endif
+
+let s:LEFT_SIDE = 0
+let s:RIGHT_SIDE = 2
+
+let s:PADDING = 1
+
+let s:EMPTY_SEGMENT = { 'type': 'empty' }
+
+let s:HARD_DIVIDER = 0
+let s:SOFT_DIVIDER = 1
+
+function! Pl#Parser#GetStatusline(segments) " {{{
+	let statusline = {
+		\   'n': ''
+		\ , 'N': ''
+		\ , 'v': ''
+		\ , 'i': ''
+		\ , 'r': ''
+		\ , 's': ''
+		\ }
+
+	" Run through the different modes and create the statuslines
+	for mode in keys(statusline)
+		" Create an empty statusline list
+		let stl = []
+
+		call extend(stl, s:ParseSegments(mode, s:LEFT_SIDE, a:segments))
+
+		let statusline[mode] .= join(stl, '')
+	endfor
+
+	return statusline
+endfunction " }}}
+function! Pl#Parser#ParseChars(arg) " {{{
+	" Handles symbol arrays which can be either an array of hex values,
+	" or a string. Will convert the hex array to a string, or return the
+	" string as-is.
+	let arg = a:arg
+
+	if type(arg) == type([])
+		" Hex array
+		call map(arg, 'nr2char(v:val)')
+
+		return join(arg, '')
+	endif
+
+	" Anything else, just return it as it is
+	return arg
+endfunction " }}}
+function! s:ParseSegments(mode, side, segments, ...) " {{{
+	let mode     = a:mode
+	let side     = a:side
+	let segments = a:segments
+
+	let level      = exists('a:1') ? a:1 : 0
+	let base_color = exists('a:2') ? a:2 : {}
+
+	let ret = []
+
+	for i in range(0, len(segments) - 1)
+		unlet! seg_prev seg_curr seg_next
+
+		" Prepare some resources (fetch previous, current and next segment)
+		let seg_curr = deepcopy(get(segments, i))
+
+		" Find previous segment
+		let seg_prev = s:EMPTY_SEGMENT
+
+		" If we're currently at i = 0 we have to start on 0 or else we will start on the last segment (list[-1])
+		let range_start = (i == 0 ? i : i - 1)
+		for j in range(range_start, 0, -1)
+			let seg = deepcopy(get(segments, j))
+			if get(seg, 'name') ==# 'TRUNCATE'
+				" Skip truncate segments
+				continue
+			endif
+
+			" Look ahead for another segment that's visible in this mode
+			if index(get(seg, 'modes'), mode) != -1
+				" Use this segment
+				let seg_prev = seg
+
+				break
+			endif
+		endfor
+
+		"" Find next segment
+		let seg_next = s:EMPTY_SEGMENT
+
+		" If we're currently at i = len(segments) - 1 we have to start on i or else we will get an error because the index doesn't exist
+		let range_start = (i == len(segments) - 1 ? i : i + 1)
+		for j in range(range_start, len(segments) - 1, 1)
+			let seg = deepcopy(get(segments, j))
+			if get(seg, 'name') ==# 'TRUNCATE'
+				" Skip truncate segments
+				continue
+			endif
+
+			" Look ahead for another segment that's visible in this mode
+			if index(get(seg, 'modes'), mode) != -1
+				" Use this segment
+				let seg_next = seg
+
+				break
+			endif
+		endfor
+
+		if index(get(seg_curr, 'modes', []), mode) == -1
+			" The segment is invisible in this mode, skip it
+			" FIXME When two segments after each other are hidden, a gap appears where the segments would be, this is probably due to segment padding
+			continue
+		endif
+
+		" Handle the different segment types
+		if seg_curr.type == 'segment'
+			if seg_curr.name ==# 'TRUNCATE'
+				" Truncate statusline
+				call add(ret, '%<')
+			elseif seg_curr.name ==# 'SPLIT'
+				" Split statusline
+
+				" Switch sides
+				let side = s:RIGHT_SIDE
+
+				" Handle highlighting
+				let mode_colors = get(seg_curr.colors, mode, seg_curr.colors['n'])
+				let hl_group = s:HlCreate(mode_colors)
+
+				" Add segment text
+				call add(ret, '%#'. hl_group .'#%=')
+			else
+				" Add segment text
+				let text = seg_curr.text
+
+				" Decide on whether to use the group's colors or the segment's colors
+				let colors = get(seg_curr, 'colors', base_color)
+
+				" Fallback to normal (current) highlighting if we don't have mode-specific highlighting
+				let mode_colors = get(colors, mode, get(colors, 'n', {}))
+
+				if empty(mode_colors)
+					echom 'Segment doesn''t have any colors! NS: "'. seg_curr.ns .'" SEG: "'. seg_curr.name .'"'
+
+					continue
+				endif
+
+				" Check if we're in a group (level > 0)
+				if level > 0
+					" If we're in a group we don't have dividers between
+					" segments, so we should only pad one side, but only pad
+					" if the segment doesn't have Pl#Segment#NoPadding() set
+					let padding_right = (seg_curr.padding && side == s:LEFT_SIDE  ? repeat(' ', s:PADDING) : '')
+					let padding_left  = (seg_curr.padding && side == s:RIGHT_SIDE ? repeat(' ', s:PADDING) : '')
+
+					" Check if we lack a bg/fg color for this segment
+					" If we do, use the bg/fg color from base_color
+					let base_color_mode = ! has_key(base_color, mode) ? base_color['n'] : base_color[mode]
+
+					for col in ['ctermbg', 'ctermfg', 'guibg', 'guifg']
+						if empty(mode_colors[col])
+							let mode_colors[col] = base_color_mode[col]
+						endif
+					endfor
+				else
+					"" If we're outside a group we have dividers and must pad both sides
+					let padding_left  = repeat(' ', s:PADDING)
+					let padding_right = repeat(' ', s:PADDING)
+				endif
+
+				" Get main hl group for segment
+				let hl_group = s:HlCreate(mode_colors)
+
+				" Prepare segment text
+				let text = '%(%#'. hl_group .'#'. padding_left . text . padding_right . '%)'
+
+				if level == 0
+					" Add divider to single segments
+					let text = s:AddDivider(text, side, mode, colors, seg_prev, seg_curr, seg_next)
+				endif
+
+				call add(ret, text)
+			endif
+		elseif seg_curr.type == 'segment_group'
+			" Recursively parse segment group
+			let func_params = [mode, side, seg_curr.segments, level + 1]
+
+			if has_key(seg_curr, 'colors')
+				" Pass the base colors on to the child segments
+				call add(func_params, seg_curr.colors)
+			endif
+
+			" Get segment group string
+			let text = join(call('s:ParseSegments', func_params), '')
+
+			" Pad on the opposite side of the divider
+			let padding_right = (side == s:RIGHT_SIDE ? repeat(' ', s:PADDING) : '')
+			let padding_left  = (side == s:LEFT_SIDE  ? repeat(' ', s:PADDING) : '')
+
+			let text = s:AddDivider(padding_left . text . padding_right, side, mode, seg_curr.colors, seg_prev, seg_curr, seg_next)
+
+			call add(ret, text)
+		endif
+	endfor
+
+	return ret
+endfunction " }}}
+function! s:HlCreate(hl) " {{{
+	" Create a short and unique highlighting group name
+	" It uses the hex values of all the color properties and an attribute flag at the end
+	" NONE colors are translated to NN for cterm and NNNNNN for gui colors
+	let hi_group = printf('Pl%s%s%s%s%s'
+		\ , (a:hl['ctermfg'] == 'NONE' ? 'NN'     : printf('%02x', a:hl['ctermfg']))
+		\ , (a:hl['guifg']   == 'NONE' ? 'NNNNNN' : printf('%06x', a:hl['guifg']  ))
+		\ , (a:hl['ctermbg'] == 'NONE' ? 'NN'     : printf('%02x', a:hl['ctermbg']))
+		\ , (a:hl['guibg']   == 'NONE' ? 'NNNNNN' : printf('%06x', a:hl['guibg']  ))
+		\ , substitute(a:hl['attr'], '\v([a-zA-Z])[a-zA-Z]*,?', '\1', 'g')
+		\ )
+
+	if ! s:HlExists(hi_group)
+		let ctermbg = a:hl['ctermbg'] == 'NONE' ? 'NONE' : printf('%d', a:hl['ctermbg'])
+		if (has('win32') || has('win64')) && !has('gui_running') && ctermbg != 'NONE' && ctermbg > 128
+			let ctermbg -= 128
+		endif
+		let hi_cmd = printf('hi %s ctermfg=%s ctermbg=%s cterm=%s guifg=%s guibg=%s gui=%s'
+			\ , hi_group
+			\ , a:hl['ctermfg'] == 'NONE' ? 'NONE' : printf('%d', a:hl['ctermfg'])
+			\ , ctermbg
+			\ , a:hl['attr']
+			\ , (a:hl['guifg'] == 'NONE' ? 'NONE' : printf('#%06x', a:hl['guifg']))
+			\ , (a:hl['guibg'] == 'NONE' ? 'NONE' : printf('#%06x', a:hl['guibg']))
+			\ , a:hl['attr']
+			\ )
+
+		exec hi_cmd
+
+		" Add command to Pl#HL list for caching
+		call add(g:Pl#HL, hi_cmd)
+	endif
+
+	" Return only the highlighting group name
+	return hi_group
+endfunction " }}}
+function! s:HlExists(hl) " {{{
+	if ! hlexists(a:hl)
+		return 0
+	endif
+
+	redir => hlstatus
+	silent exec 'hi' a:hl
+	redir END
+
+	return (hlstatus !~ 'cleared')
+endfunction " }}}
+function! s:AddDivider(text, side, mode, colors, prev, curr, next) " {{{
+	let seg_prev = a:prev
+	let seg_curr = a:curr
+	let seg_next = a:next
+
+	" Set default color/type for the divider
+	let div_colors = get(a:colors, a:mode, a:colors['n'])
+	let div_type = s:SOFT_DIVIDER
+
+	" Define segment to compare
+	let cmp_seg = a:side == s:LEFT_SIDE ? seg_next : seg_prev
+
+	let cmp_all_colors = get(cmp_seg, 'colors', {})
+	let cmp_colors = get(cmp_all_colors, a:mode, get(cmp_all_colors, 'n', {}))
+
+	if ! empty(cmp_colors)
+		" Compare the highlighting groups
+		"
+		" If the background color for cterm is equal, use soft divider with the current segment's highlighting
+		" If not, use hard divider with a new highlighting group
+		"
+		" Note that if the previous/next segment is the split, a hard divider is always used
+		if get(div_colors, 'ctermbg') != get(cmp_colors, 'ctermbg') || get(seg_next, 'name') ==# 'SPLIT' || get(seg_prev, 'name') ==# 'SPLIT'
+			let div_type = s:HARD_DIVIDER
+
+			" Create new highlighting group
+			if div_colors['attr'] =~ 'reverse' && cmp_colors['attr'] =~ 'reverse'
+				" Use FG = CURRENT FG, BG = CMP FG
+				let div_colors['ctermbg'] = get(cmp_colors, 'ctermfg')
+				let div_colors['guibg']   = get(cmp_colors, 'guifg')
+
+				let div_colors['attr']    = div_colors['attr'] =~ 'bold' ? 'bold' : 'NONE'
+			elseif div_colors['attr'] =~ 'reverse'
+				" Use FG = CURRENT FG, BG = CMP BG
+				let div_colors['ctermbg'] = get(cmp_colors, 'ctermbg')
+				let div_colors['guibg']   = get(cmp_colors, 'guibg')
+
+				let div_colors['attr']    = div_colors['attr'] =~ 'bold' ? 'bold' : 'NONE'
+			elseif cmp_colors['attr'] =~ 'reverse'
+				" Use FG = CMP FG, BG = CURRENT BG : reversed
+				let div_colors['ctermfg'] = get(cmp_colors, 'ctermfg')
+				let div_colors['guifg']   = get(cmp_colors, 'guifg')
+
+				let div_colors['attr']    = 'reverse'
+
+			else
+				" Use FG = CURRENT BG, BG = CMP BG
+				let div_colors['ctermfg'] = get(div_colors, 'ctermbg')
+				let div_colors['guifg']   = get(div_colors, 'guibg')
+
+				let div_colors['ctermbg'] = get(cmp_colors, 'ctermbg')
+				let div_colors['guibg']   = get(cmp_colors, 'guibg')
+
+				let div_colors['attr']    = 'NONE'
+			endif
+		endif
+	endif
+
+	" Prepare divider
+	let divider_raw = deepcopy(g:Pl#Parser#Symbols[g:Powerline_symbols].dividers[a:side + div_type])
+	let divider = Pl#Parser#ParseChars(divider_raw)
+
+	" Don't add dividers for segments adjacent to split (unless it's a hard divider)
+	if ((get(seg_next, 'name') ==# 'SPLIT' || get(seg_prev, 'name') ==# 'SPLIT') && div_type != s:HARD_DIVIDER)
+		return ''
+	endif
+
+	if a:side == s:LEFT_SIDE
+		" Left side
+		" Divider to the right
+		return printf('%%(%s%%#%s#%s%%)', a:text, s:HlCreate(div_colors), divider)
+	else
+		" Right side
+		" Divider to the left
+		return printf('%%(%%#%s#%s%s%%)', s:HlCreate(div_colors), divider, a:text)
+	endif
+endfunction " }}}
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl/Segment.vim b/vim-plugins/bundle/vim-powerline/autoload/Pl/Segment.vim
new file mode 100644
index 0000000..bb09438
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Pl/Segment.vim
@@ -0,0 +1,188 @@
+let s:default_modes = ['n', 'N', 'v', 'i', 'r', 's']
+
+function! s:CheckConditions(params) " {{{
+	" Check conditions for a segment/group
+	" Integer parameters are always conditions
+	for param in a:params
+		if type(param) == type(0) && param == 0
+			" Break here if it's an integer parameter and it's false (0)
+			return 0
+		endif
+		unlet! param
+	endfor
+
+	return 1
+endfunction " }}}
+function! Pl#Segment#Create(name, ...) " {{{
+	" Check condition parameters
+	if ! s:CheckConditions(a:000)
+		return {}
+	endif
+
+	let name = a:name
+	let modes = s:default_modes
+	let padding = 1
+	let segments = []
+
+	for param in a:000
+		" Lookup modes for this segment/group
+		if type(param) == type([]) && param[0] == 'modes'
+			let modes = param[1]
+		elseif type(param) == type([]) && param[0] == 'nopadding'
+			let padding = 0
+		elseif type(a:1) == type([]) && a:1[0] == 'segment'
+			call add(segments, param[1])
+		endif
+
+		unlet! param
+	endfor
+
+	if type(a:1) == type([]) && a:1[0] == 'segment'
+		" This is a segment group
+		return ['segment_group', {
+			\   'type': 'segment_group'
+			\ , 'name': name
+			\ , 'segments': segments
+			\ , 'modes': modes
+			\ , 'padding': padding
+			\ }]
+	else
+		" This is a single segment
+		let text = a:1
+
+		" Search/replace symbols
+		for [key, symbol] in items(g:Pl#Parser#Symbols[g:Powerline_symbols].symbols)
+			let text = substitute(
+				\ text,
+				\ '\v\$('. key .')',
+				\ '\=Pl#Parser#ParseChars(g:Pl#Parser#Symbols[g:Powerline_symbols].symbols[submatch(1)])',
+				\ 'g')
+
+			unlet! key symbol
+		endfor
+
+		return ['segment', {
+			\   'type': 'segment'
+			\ , 'name': name
+			\ , 'text': text
+			\ , 'modes': modes
+			\ , 'padding': padding
+			\ }]
+	endif
+
+endfunction " }}}
+function! Pl#Segment#Init(params) " {{{
+	" Check condition parameters
+	if ! s:CheckConditions(a:params)
+		return {}
+	endif
+
+	let segments = {}
+	let ns = ''
+
+	for param in a:params
+		if type(param) == type('')
+			" String parameters is the namespace
+			let ns = param
+		elseif type(param) == type([])
+			" The data dict is in param[1]
+			" By default we don't have a namespace for the segment
+			let segment = param[1]
+
+			if ! empty(ns)
+				" Update segment so that it includes the namespace
+				" Add the namespace to the segment dict key
+				let segment.ns = ns
+				let segment.name = join([segment.ns, segment.name], ':')
+			endif
+
+			let key = segment.name
+
+			let segments[key] = segment
+		endif
+
+		unlet! param
+	endfor
+
+	return segments
+endfunction " }}}
+function! Pl#Segment#Modes(modes) " {{{
+	" Handle modes for both segments and groups
+	let modes = split(a:modes, '\zs')
+
+	if modes[0] == '!'
+		" Filter modes (e.g. "!nr" will ignore the segment in normal and replace modes)
+		let modes = filter(deepcopy(s:default_modes), 'v:val !~# "['. join(modes[1:]) .']"')
+	endif
+
+	return ['modes', modes]
+endfunction " }}}
+function! Pl#Segment#NoPadding() " {{{
+	return ['nopadding']
+endfunction " }}}
+function! Pl#Segment#Split(...) " {{{
+	return a:0 ? a:1 .':SPLIT' : 'SPLIT'
+endfunction " }}}
+function! Pl#Segment#Truncate() " {{{
+	return 'TRUNCATE'
+endfunction " }}}
+function! Pl#Segment#Get(name) " {{{
+	" Return a segment data dict
+	let args = []
+
+	" Check for printf segments (lists)
+	if type(a:name) == type([])
+		" We're dealing with a segment with printf arguments
+		let seg_orig_name = a:name[0]
+		let args = a:name[1:]
+	else
+		let seg_orig_name = a:name
+	endif
+
+	" Fetch namespace and variants for storing in the segment dict
+	let seg_ns = ''
+	let seg_variants = []
+
+	" Retrieve color scheme variants
+	let seg_name_split = split(seg_orig_name, '\v\.')
+	if len(seg_name_split) > 1
+		let seg_variants = seg_name_split[1:]
+	endif
+
+	" Retrieve segment name and namespace
+	" Use the first piece of the split string, we can't have variants in the final segment name
+	let seg_name_split = split(seg_name_split[0], '\v:')
+	let seg_name = seg_name_split[0]
+
+	if len(seg_name_split) > 1
+		let seg_ns = seg_name_split[0]
+		let seg_name = seg_name_split[-1]
+	endif
+
+	try
+		" If we have a namespace, try to use the namespaced segment first (i.e. search for the segment in the namespaced file first)
+		let return_segment = deepcopy(g:Powerline#Segments#{seg_ns}#segments[seg_ns .':'. seg_name])
+	catch
+		try
+			" We didn't find a namespaced segment, fall back to common segments
+			let return_segment = deepcopy(g:Powerline#Segments#segments[seg_name])
+		catch
+			" Didn't find the segment among the common segments either, just skip it
+			return {}
+		endtry
+	endtry
+
+	if len(args) && has_key(return_segment, 'text')
+		" Handle segment printf arguments
+		" printf doesn't accept lists as its second argument, so we have to work around that
+		let return_segment.text = call('printf', [ return_segment.text ] + args)
+	endif
+
+	" Assign namespace, name and variants
+	let return_segment.ns = seg_ns
+	let return_segment.name = seg_name
+	let return_segment.orig_name = seg_orig_name
+	let return_segment.variants = seg_variants
+
+	return return_segment
+endfunction " }}}
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Pl/Theme.vim b/vim-plugins/bundle/vim-powerline/autoload/Pl/Theme.vim
new file mode 100644
index 0000000..da1581e
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Pl/Theme.vim
@@ -0,0 +1,100 @@
+function! Pl#Theme#Create(...) " {{{
+	let buffer_segments = []
+
+	for buffer_segment in a:000
+		" Remove empty segments (e.g. 'Pl#Theme#Function's)
+		if empty(buffer_segment)
+			continue
+		endif
+
+		call add(buffer_segments, buffer_segment)
+	endfor
+
+	let buffer_segments = Pl#Colorscheme#Apply(g:Powerline_colorscheme, buffer_segments)
+
+	return buffer_segments
+endfunction " }}}
+function! Pl#Theme#Callback(name, expr) " {{{
+	return ['callback', a:name, a:expr]
+endfunction " }}}
+function! Pl#Theme#Buffer(ns, ...) " {{{
+	let segments = []
+	let ns = ! empty(a:ns) ? a:ns .':' : ''
+
+	" Match namespace parameter by default
+	let matches = Pl#Match#Any(a:ns)
+	let callback = []
+
+	let args = a:000
+	let args = Pl#Mod#ApplySegmentMods(args)
+
+	" Fetch segment data dicts
+	for item in args
+		if type(item) == type([])
+			if item[0] == 'match'
+				" Match item, overrides default namespace match
+				let matches = item
+
+				unlet! item
+				continue
+			elseif item[0] == 'callback'
+				" Store the item as a callback expression
+				let matches = ['match', 'none']
+				let callback = [a:ns, item[1], item[2]]
+
+				unlet! item
+				continue
+			endif
+
+			" printf segment, append ns to first item in list
+			let item[0] = ns . item[0]
+		else
+			let item = ns . item
+		endif
+
+		let segment = Pl#Segment#Get(item)
+
+		if ! empty(segment)
+			" Skip empty (possible disabled) segments
+			call add(segments, segment)
+		endif
+
+		unlet! item
+	endfor
+
+	return {
+		\   'matches': matches
+		\ , 'callback': callback
+		\ , 'segments': segments
+		\ }
+endfunction " }}}
+function! Pl#Theme#InsertSegment(new_segment, where, target_segment) " {{{
+	" It's very important to NOT refer to the theme dict until everything's loaded!
+	"
+	" Because these functions are called from the vimrc, we need to put the
+	" actions in a list which will be parsed later.
+	"
+	" These functions don't accept a name parameter, because they work on the
+	" currently selected theme (will change any selected theme)
+	call Pl#Mod#AddSegmentMod('insert_segment', {
+		\ 'new_segment': a:new_segment,
+		\ 'where': a:where,
+		\ 'target_segment': a:target_segment
+		\ })
+endfunction " }}}
+function! Pl#Theme#RemoveSegment(target_segment) " {{{
+	" It's very important to NOT refer to the theme dict until everything's loaded!
+	"
+	" Because these functions are called from the vimrc, we need to put the
+	" actions in a list which will be parsed later.
+	"
+	" These functions don't accept a name parameter, because they work on the
+	" currently selected theme (will change any selected theme)
+	call Pl#Mod#AddSegmentMod('remove_segment', {
+		\ 'target_segment': a:target_segment
+		\ })
+endfunction " }}}
+function! Pl#Theme#ReplaceSegment(old_segment, new_segment) " {{{
+	call Pl#Theme#InsertSegment(a:new_segment, 'after', a:old_segment)
+	call Pl#Theme#RemoveSegment(a:old_segment)
+endfunction " }}}
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/default.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/default.vim
new file mode 100644
index 0000000..4d4c7fa
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/default.vim
@@ -0,0 +1,166 @@
+call Pl#Hi#Allocate({
+	\ 'black'          : 16,
+	\ 'white'          : 231,
+	\
+	\ 'darkestgreen'   : 22,
+	\ 'darkgreen'      : 28,
+	\ 'mediumgreen'    : 70,
+	\ 'brightgreen'    : 148,
+	\
+	\ 'darkestcyan'    : 23,
+	\ 'mediumcyan'     : 117,
+	\
+	\ 'darkestblue'    : 24,
+	\ 'darkblue'       : 31,
+	\
+	\ 'darkestred'     : 52,
+	\ 'darkred'        : 88,
+	\ 'mediumred'      : 124,
+	\ 'brightred'      : 160,
+	\ 'brightestred'   : 196,
+	\
+	\ 'darkestpurple'  : 55,
+	\ 'mediumpurple'   : 98,
+	\ 'brightpurple'   : 189,
+	\
+	\ 'brightorange'   : 208,
+	\ 'brightestorange': 214,
+	\
+	\ 'gray0'          : 233,
+	\ 'gray1'          : 235,
+	\ 'gray2'          : 236,
+	\ 'gray3'          : 239,
+	\ 'gray4'          : 240,
+	\ 'gray5'          : 241,
+	\ 'gray6'          : 244,
+	\ 'gray7'          : 245,
+	\ 'gray8'          : 247,
+	\ 'gray9'          : 250,
+	\ 'gray10'         : 252,
+	\ })
+
+let g:Powerline#Colorschemes#default#colorscheme = Pl#Colorscheme#Init([
+	\ Pl#Hi#Segments(['SPLIT'], {
+		\ 'n': ['white', 'gray2'],
+		\ 'N': ['white', 'gray0'],
+		\ 'i': ['white', 'darkestblue'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['mode_indicator'], {
+		\ 'n': ['darkestgreen', 'brightgreen', ['bold']],
+		\ 'i': ['darkestcyan', 'white', ['bold']],
+		\ 'v': ['darkred', 'brightorange', ['bold']],
+		\ 'r': ['white', 'brightred', ['bold']],
+		\ 's': ['white', 'gray5', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['branch', 'scrollpercent', 'raw', 'filesize'], {
+		\ 'n': ['gray9', 'gray4'],
+		\ 'N': ['gray4', 'gray1'],
+		\ 'i': ['mediumcyan', 'darkblue'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['fileinfo', 'filename'], {
+		\ 'n': ['white', 'gray4', ['bold']],
+		\ 'N': ['gray7', 'gray0', ['bold']],
+		\ 'i': ['white', 'darkblue', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['fileinfo.filepath'], {
+		\ 'n': ['gray10'],
+		\ 'N': ['gray5'],
+		\ 'i': ['mediumcyan'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['static_str'], {
+		\ 'n': ['white', 'gray4'],
+		\ 'N': ['gray7', 'gray1'],
+		\ 'i': ['white', 'darkblue'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['fileinfo.flags'], {
+		\ 'n': ['brightestred', ['bold']],
+		\ 'N': ['darkred'],
+		\ 'i': ['brightestred', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['currenttag', 'fullcurrenttag', 'fileformat', 'fileencoding', 'pwd', 'filetype', 'rvm:string', 'rvm:statusline', 'virtualenv:statusline', 'charcode', 'currhigroup'], {
+		\ 'n': ['gray8', 'gray2'],
+		\ 'i': ['mediumcyan', 'darkestblue'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lineinfo'], {
+		\ 'n': ['gray2', 'gray10', ['bold']],
+		\ 'N': ['gray7', 'gray1', ['bold']],
+		\ 'i': ['darkestcyan', 'mediumcyan', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['errors'], {
+		\ 'n': ['brightestorange', 'gray2', ['bold']],
+		\ 'i': ['brightestorange', 'darkestblue', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lineinfo.line.tot'], {
+		\ 'n': ['gray6'],
+		\ 'N': ['gray5'],
+		\ 'i': ['darkestcyan'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['paste_indicator', 'ws_marker'], {
+		\ 'n': ['white', 'brightred', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['gundo:static_str.name', 'command_t:static_str.name'], {
+		\ 'n': ['white', 'mediumred', ['bold']],
+		\ 'N': ['brightred', 'darkestred', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['gundo:static_str.buffer', 'command_t:raw.line'], {
+		\ 'n': ['white', 'darkred'],
+		\ 'N': ['brightred', 'darkestred'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['gundo:SPLIT', 'command_t:SPLIT'], {
+		\ 'n': ['white', 'darkred'],
+		\ 'N': ['white', 'darkestred'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lustyexplorer:static_str.name', 'minibufexplorer:static_str.name', 'nerdtree:raw.name', 'tagbar:static_str.name'], {
+		\ 'n': ['white', 'mediumgreen', ['bold']],
+		\ 'N': ['mediumgreen', 'darkestgreen', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lustyexplorer:static_str.buffer', 'tagbar:static_str.buffer'], {
+		\ 'n': ['brightgreen', 'darkgreen'],
+		\ 'N': ['mediumgreen', 'darkestgreen'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lustyexplorer:SPLIT', 'minibufexplorer:SPLIT', 'nerdtree:SPLIT', 'tagbar:SPLIT'], {
+		\ 'n': ['white', 'darkgreen'],
+		\ 'N': ['white', 'darkestgreen'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:focus', 'ctrlp:byfname'], {
+		\ 'n': ['brightpurple', 'darkestpurple'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:prev', 'ctrlp:next', 'ctrlp:pwd'], {
+		\ 'n': ['white', 'mediumpurple'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:item'], {
+		\ 'n': ['darkestpurple', 'white', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:marked'], {
+		\ 'n': ['brightestred', 'darkestpurple', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:count'], {
+		\ 'n': ['darkestpurple', 'white'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:SPLIT'], {
+		\ 'n': ['white', 'darkestpurple'],
+		\ }),
+	\ ])
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized.vim
new file mode 100644
index 0000000..c4bf42c
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized.vim
@@ -0,0 +1,154 @@
+
+" Solarized color scheme for Powerline
+" N = no focus
+" 16 hex colors as defined on http://ethanschoonover.com/solarized
+call Pl#Hi#Allocate({
+  \ 'base03'  : [8,   0x002b36],
+  \ 'base02'  : [0,   0x073642],
+  \ 'base01'  : [10,  0x586e75],
+  \ 'base00'  : [11,  0x657b83],
+  \ 'base0'   : [12,  0x839496],
+  \ 'base1'   : [14,  0x93a1a1],
+  \ 'base2'   : [7,   0xeee8d5],
+  \ 'base3'   : [15,  0xfdf6e3],
+  \ 'yellow'  : [3,   0xb58900],
+  \ 'orange'  : [9,   0xcb4b16],
+  \ 'red'     : [1,   0xdc322f],
+  \ 'magenta' : [5,   0xd33682],
+  \ 'violet'  : [13,  0x6c71c4],
+  \ 'blue'    : [4,   0x268bd2],
+  \ 'cyan'    : [6,   0x2aa198],
+  \ 'green'   : [2,   0x859900],
+	\ })
+
+let g:Powerline#Colorschemes#solarized#colorscheme = Pl#Colorscheme#Init([
+	\ Pl#Hi#Segments(['SPLIT'], {
+		\ 'n': ['base3',  'base2'],
+		\ 'N': ['base3',  'base2'],
+		\ 'i': ['base3',  'base2'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['mode_indicator'], {
+		\ 'n': ['base2',  'blue',     ['bold']],
+		\ 'i': ['base3',  'orange',   ['bold']],
+		\ 'v': ['base3',  'magenta',  ['bold']],
+		\ 'r': ['base3',  'violet',   ['bold']],
+		\ 's': ['base3',  'yellow',   ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['branch'], {
+		\ 'n': ['base2',   'base02'],
+		\ 'N': ['base02',  'base1'],
+		\ 'i': ['base2',   'base00'],
+		\ }),
+	\
+  \ Pl#Hi#Segments(['scrollpercent', 'raw', 'filesize'], {
+		\ 'n': ['base2',   'base0'],
+		\ 'N': ['base00',  'base2'],
+		\ 'i': ['base2',   'base1'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['fileinfo', 'filename'], {
+		\ 'n': ['base2',   'base01',   ['bold']],
+		\ 'N': ['base01',  'base2' ],
+		\ 'i': ['base3',   'base1',    ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['fileinfo.filepath'], {
+		\ 'n': ['base1'],
+		\ 'N': ['base1'],
+		\ 'i': ['base01'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['static_str'], {
+		\ 'n': ['base3',   'green'],
+		\ 'N': ['base02',  'base01'],
+		\ 'i': ['base3',   'blue'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['fileinfo.flags'], {
+		\ 'n': ['base3'],
+		\ 'N': ['base00'],
+		\ 'i': ['base3'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['currenttag', 'fileformat', 'fileencoding', 'pwd', 'filetype', 'rvm:string', 'rvm:statusline', 'virtualenv:statusline', 'charcode', 'currhigroup'], {
+		\ 'n': ['base00', 'base2'],
+		\ 'i': ['base0', 'base2'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lineinfo'], {
+		\ 'n': ['base2',   'base01',  ['bold']],
+		\ 'N': ['base02',  'base0'],
+		\ 'i': ['base2',   'base00',  ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['errors'], {
+		\ 'n': ['red',  'base2',  ['bold']],
+		\ 'i': ['red',  'base2',  ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lineinfo.line.tot'], {
+		\ 'n': ['base3'],
+		\ 'N': ['base02'],
+		\ 'i': ['base3'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['paste_indicator', 'ws_marker'], {
+		\ 'n': ['base3', 'red', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['gundo:static_str.name', 'command_t:static_str.name'], {
+		\ 'n': ['base3',   'red',     ['bold']],
+		\ 'N': ['base02',  'base01',  ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['gundo:static_str.buffer', 'command_t:raw.line'], {
+		\ 'n': ['base3',  'base00'],
+		\ 'N': ['base0',  'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['gundo:SPLIT', 'command_t:SPLIT'], {
+		\ 'n': ['base3',  'base02'],
+		\ 'N': ['base0',  'base03'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lustyexplorer:static_str.name', 'minibufexplorer:static_str.name', 'nerdtree:raw.name', 'tagbar:static_str.name'], {
+		\ 'n': ['base2',   'green',   ['bold']],
+		\ 'N': ['base02',  'base1'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lustyexplorer:static_str.buffer', 'tagbar:static_str.buffer'], {
+		\ 'n': ['base3',   'base01'],
+		\ 'N': ['base02',  'base01'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lustyexplorer:SPLIT', 'minibufexplorer:SPLIT', 'nerdtree:SPLIT', 'tagbar:SPLIT'], {
+		\ 'n': ['base2',  'base2'],
+		\ 'N': ['base2',  'base2'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:focus', 'ctrlp:byfname'], {
+		\ 'n': ['base03', 'base01'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:prev', 'ctrlp:next', 'ctrlp:pwd'], {
+		\ 'n': ['base3', 'base00'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:item'], {
+		\ 'n': ['base3', 'violet', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:marked'], {
+		\ 'n': ['base1', 'base01', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:count'], {
+		\ 'n': ['base3', 'violet'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:SPLIT'], {
+		\ 'n': ['base3', 'base03'],
+		\ }),
+	\ ])
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized16.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized16.vim
new file mode 100644
index 0000000..44d0687
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized16.vim
@@ -0,0 +1,195 @@
+" Authors:
+"   @stephenmckinney
+"
+" This colorscheme is based on Solarized-dark colors, setting the specific
+" values for the Solarized palette, using the terminal's 16 ansi
+" color values. It combines Solarized with Powerline native colors.
+call Pl#Hi#Allocate({
+	\ 'black'          : 16,
+	\ 'white'          : 231,
+	\
+	\ 'darkestgreen'   : 22,
+	\ 'darkgreen'      : 28,
+	\ 'mediumgreen'    : 70,
+	\ 'brightgreen'    : 148,
+	\
+	\ 'darkestcyan'    : 23,
+	\ 'mediumcyan'     : 117,
+	\
+	\ 'darkestblue'    : 24,
+	\ 'darkblue'       : 31,
+	\
+	\ 'darkestred'     : 52,
+	\ 'darkred'        : 88,
+	\ 'mediumred'      : 124,
+	\ 'brightred'      : 160,
+	\ 'brightestred'   : 196,
+	\
+	\ 'darkestpurple'  : 55,
+	\ 'mediumpurple'   : 98,
+	\ 'brightpurple'   : 189,
+	\
+	\ 'brightorange'   : 208,
+	\ 'brightestorange': 214,
+	\
+	\ 'gray0'          : 233,
+	\ 'gray1'          : 235,
+	\ 'gray2'          : 236,
+	\ 'gray3'          : 239,
+	\ 'gray4'          : 240,
+	\ 'gray5'          : 241,
+	\ 'gray6'          : 244,
+	\ 'gray7'          : 245,
+	\ 'gray8'          : 247,
+	\ 'gray9'          : 250,
+	\ 'gray10'         : 252,
+	\
+	\ 'base03'         : [8, 0x002b36],
+	\ 'base02'         : [0, 0x073642],
+	\ 'base01'         : [10, 0x586e75],
+	\ 'base00'         : [11, 0x657b83],
+	\ 'base0'          : [12, 0x839496],
+	\ 'base1'          : [14, 0x93a1a1],
+	\ 'base2'          : [7, 0xeee8d5],
+	\ 'base3'          : [15, 0xfdf6e3],
+	\ 'yellow'         : [3, 0xb58900],
+	\ 'orange'         : [9, 0xcb4b16],
+	\ 'red'            : [1, 0xdc322f],
+	\ 'magenta'        : [5, 0xd33682],
+	\ 'violet'         : [13, 0x6c71c4],
+	\ 'blue'           : [4, 0x268bd2],
+	\ 'cyan'           : [6, 0x2aa198],
+	\ 'green'          : [2, 0x859900],
+	\ })
+
+let g:Powerline#Colorschemes#solarized16#colorscheme= Pl#Colorscheme#Init([
+	\ Pl#Hi#Segments(['SPLIT'], {
+		\ 'n': ['white', 'base02'],
+		\ 'N': ['white', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['mode_indicator'], {
+		\ 'n': ['darkestgreen', 'brightgreen', ['bold']],
+		\ 'i': ['darkestcyan', 'white', ['bold']],
+		\ 'v': ['red', 'brightorange', ['bold']],
+		\ 'r': ['white', 'violet', ['bold']],
+		\ 's': ['white', 'gray5', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['branch', 'raw', 'filesize'], {
+		\ 'n': ['base03', 'blue'],
+		\ 'N': ['base00', 'base03'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['fileinfo', 'filename', 'filepath'], {
+		\ 'n': ['base3', 'darkestblue', ['bold']],
+		\ 'N': ['base0', 'base02', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['fileinfo.filepath'], {
+		\ 'n': ['base2'],
+		\ 'N': ['base00'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['static_str'], {
+		\ 'n': ['base3', 'violet'],
+		\ 'N': ['base1', 'base02'],
+		\ 'i': ['white', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['fileinfo.flags'], {
+		\ 'n': ['base03', ['bold']],
+		\ 'N': ['gray5'],
+		\ 'i': ['base03', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['currenttag', 'fullcurrenttag', 'fileformat', 'fileencoding', 'pwd', 'filetype', 'rvm:string', 'rvm:statusline', 'virtualenv:statusline', 'charcode', 'currhigroup'], {
+		\ 'n': ['base1', 'base02'],
+		\ 'N': ['base00', 'base03'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['scrollpercent'], {
+		\ 'n': ['base1', 'base02', ['bold']],
+		\ 'N': ['base00', 'base03'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lineinfo'], {
+		\ 'n': ['gray2', 'gray10', ['bold']],
+		\ 'N': ['gray7', 'gray1', ['bold']],
+		\ 'i': ['darkestcyan', 'mediumcyan', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['errors'], {
+		\ 'n': ['orange', 'base02', ['bold']],
+		\ 'N': ['gray5', 'base03', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lineinfo.line.tot'], {
+		\ 'n': ['gray6'],
+		\ 'N': ['gray5'],
+		\ 'i': ['darkestcyan'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['paste_indicator', 'ws_marker'], {
+		\ 'n': ['base3', 'red', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['gundo:static_str.name', 'command_t:static_str.name'], {
+		\ 'n': ['base3', 'darkblue', ['bold']],
+		\ 'N': ['base1', 'base03', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['gundo:static_str.buffer', 'command_t:raw.line'], {
+		\ 'n': ['white', 'base02'],
+		\ 'N': ['gray5', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['gundo:SPLIT', 'command_t:SPLIT'], {
+		\ 'n': ['white', 'base02'],
+		\ 'N': ['white', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lustyexplorer:static_str.name', 'minibufexplorer:static_str.name', 'nerdtree:raw.name', 'tagbar:static_str.name'], {
+		\ 'n': ['base3', 'darkestblue', ['bold']],
+		\ 'N': ['base01', 'base02', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lustyexplorer:static_str.buffer', 'tagbar:static_str.buffer'], {
+		\ 'n': ['base3', 'blue'],
+		\ 'N': ['gray5', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lustyexplorer:SPLIT', 'minibufexplorer:SPLIT', 'nerdtree:SPLIT', 'tagbar:SPLIT'], {
+		\ 'n': ['gray3', 'base02'],
+		\ 'N': ['gray3', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:focus', 'ctrlp:byfname'], {
+		\ 'n': ['green', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:prev', 'ctrlp:next'], {
+		\ 'n': ['green', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:item', 'ctrlp:pwd'], {
+		\ 'n': ['base2', 'darkestblue', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:marked'], {
+		\ 'n': ['green', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:count'], {
+		\ 'n': ['base0', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:SPLIT'], {
+		\ 'n': ['white', 'base02'],
+		\ }),
+  \
+  \ Pl#Hi#Segments(['status'], {
+		\ 'n': ['green', 'base02'],
+		\ 'N': ['gray5', 'base02'],
+    \ }),
+\ ])
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized256.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized256.vim
new file mode 100644
index 0000000..ea5cab0
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Colorschemes/solarized256.vim
@@ -0,0 +1,195 @@
+" Authors:
+"   @skwp
+"
+" This colorscheme is based on Solarized-dark colors, combined
+" with Powerline native colors
+call Pl#Hi#Allocate({
+	\ 'black'          : 16,
+	\ 'white'          : 231,
+	\
+	\ 'darkestgreen'   : 22,
+	\ 'darkgreen'      : 28,
+	\ 'mediumgreen'    : 70,
+	\ 'brightgreen'    : 148,
+	\
+	\ 'darkestcyan'    : 23,
+	\ 'mediumcyan'     : 117,
+	\
+	\ 'darkestblue'    : 24,
+	\ 'darkblue'       : 31,
+	\
+	\ 'darkestred'     : 52,
+	\ 'darkred'        : 88,
+	\ 'mediumred'      : 124,
+	\ 'brightred'      : 160,
+	\ 'brightestred'   : 196,
+	\
+	\ 'darkestpurple'  : 55,
+	\ 'mediumpurple'   : 98,
+	\ 'brightpurple'   : 189,
+	\
+	\ 'brightorange'   : 208,
+	\ 'brightestorange': 214,
+	\
+	\ 'gray0'          : 233,
+	\ 'gray1'          : 235,
+	\ 'gray2'          : 236,
+	\ 'gray3'          : 239,
+	\ 'gray4'          : 240,
+	\ 'gray5'          : 241,
+	\ 'gray6'          : 244,
+	\ 'gray7'          : 245,
+	\ 'gray8'          : 247,
+	\ 'gray9'          : 250,
+	\ 'gray10'         : 252,
+	\
+	\ 'base03'         : [234, 0x002b36],
+	\ 'base02'         : [235, 0x073642],
+	\ 'base01'         : [240, 0x586e75],
+	\ 'base00'         : [241, 0x657b83],
+	\ 'base0'          : [244, 0x839496],
+	\ 'base1'          : [245, 0x93a1a1],
+	\ 'base2'          : [254, 0xeee8d5],
+	\ 'base3'          : [230, 0xfdf6e3],
+	\ 'yellow'         : [136, 0xb58900],
+	\ 'orange'         : [166, 0xcb4b16],
+	\ 'red'            : [160, 0xdc322f],
+	\ 'magenta'        : [125, 0xd33682],
+	\ 'violet'         : [61, 0x6c71c4],
+	\ 'blue'           : [33, 0x268bd2],
+	\ 'cyan'           : [37, 0x2aa198],
+	\ 'green'          : [64, 0x859900],
+	\ })
+
+let g:Powerline#Colorschemes#solarized256#colorscheme = Pl#Colorscheme#Init([
+	\ Pl#Hi#Segments(['SPLIT'], {
+		\ 'n': ['white', 'base02'],
+		\ 'N': ['white', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['mode_indicator'], {
+		\ 'n': ['darkestgreen', 'brightgreen', ['bold']],
+		\ 'i': ['darkestcyan', 'white', ['bold']],
+		\ 'v': ['red', 'brightorange', ['bold']],
+		\ 'r': ['white', 'violet', ['bold']],
+		\ 's': ['white', 'gray5', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['branch', 'raw', 'filesize'], {
+		\ 'n': ['base03', 'blue'],
+		\ 'N': ['gray5', 'base03'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['scrollpercent'], {
+		\ 'n': ['gray7', 'gray2'],
+		\ 'N': ['base2', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['fileinfo', 'filename', 'filepath'], {
+		\ 'n': ['base2', 'darkestblue', ['bold']],
+		\ 'N': ['base1', 'base02', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['fileinfo.filepath'], {
+		\ 'n': ['gray10'],
+		\ 'N': ['gray5'],
+		\ 'i': ['mediumcyan'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['static_str'], {
+		\ 'n': ['base3', 'violet'],
+		\ 'N': ['base1', 'base02'],
+		\ 'i': ['white', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['fileinfo.flags'], {
+		\ 'n': ['base03', ['bold']],
+		\ 'N': ['gray5'],
+		\ 'i': ['base03', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['currenttag', 'fullcurrenttag', 'fileformat', 'fileencoding', 'pwd', 'filetype', 'rvm:string', 'rvm:statusline', 'virtualenv:statusline', 'charcode', 'currhigroup'], {
+		\ 'n': ['gray5', 'gray2'],
+		\ 'i': ['mediumcyan', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lineinfo'], {
+		\ 'n': ['gray2', 'gray10', ['bold']],
+		\ 'N': ['gray7', 'gray1', ['bold']],
+		\ 'i': ['darkestcyan', 'mediumcyan', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['errors'], {
+		\ 'n': ['orange', 'base02', ['bold']],
+		\ 'N': ['gray5', 'base03', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lineinfo.line.tot'], {
+		\ 'n': ['gray6'],
+		\ 'N': ['gray5'],
+		\ 'i': ['darkestcyan'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['paste_indicator', 'ws_marker'], {
+		\ 'n': ['base3', 'red', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['gundo:static_str.name', 'command_t:static_str.name'], {
+		\ 'n': ['base3', 'darkblue', ['bold']],
+		\ 'N': ['base1', 'base03', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['gundo:static_str.buffer', 'command_t:raw.line'], {
+		\ 'n': ['white', 'base02'],
+		\ 'N': ['gray5', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['gundo:SPLIT', 'command_t:SPLIT'], {
+		\ 'n': ['white', 'base02'],
+		\ 'N': ['white', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lustyexplorer:static_str.name', 'minibufexplorer:static_str.name', 'nerdtree:raw.name', 'tagbar:static_str.name'], {
+		\ 'n': ['gray10', 'darkestblue', ['bold']],
+		\ 'N': ['gray3', 'base02', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lustyexplorer:static_str.buffer', 'tagbar:static_str.buffer'], {
+		\ 'n': ['base3', 'blue'],
+		\ 'N': ['gray5', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['lustyexplorer:SPLIT', 'minibufexplorer:SPLIT', 'nerdtree:SPLIT', 'tagbar:SPLIT'], {
+		\ 'n': ['gray3', 'base02'],
+		\ 'N': ['gray3', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:focus', 'ctrlp:byfname'], {
+		\ 'n': ['green', 'base03'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:prev', 'ctrlp:next', 'ctrlp:pwd'], {
+		\ 'n': ['green', 'base02'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:item'], {
+		\ 'n': ['base2', 'darkestblue', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:marked'], {
+		\ 'n': ['brightgreen', 'base03', ['bold']],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:count'], {
+		\ 'n': ['base0', 'base03'],
+		\ }),
+	\
+	\ Pl#Hi#Segments(['ctrlp:SPLIT'], {
+		\ 'n': ['white', 'base03'],
+		\ }),
+  \
+  \ Pl#Hi#Segments(['status'], {
+		\ 'n': ['green', 'base02'],
+		\ 'N': ['gray5', 'base02'],
+    \ }),
+\ ])
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions.vim
new file mode 100644
index 0000000..4f327eb
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions.vim
@@ -0,0 +1,141 @@
+" Recalculate the trailing whitespace warning when idle, and after saving
+autocmd CursorHold,BufWritePost,InsertLeave * unlet! b:statusline_trailing_space_warning
+
+function! Powerline#Functions#GetFilepath() " {{{
+	" Recalculate the filepath when cwd changes.
+	let cwd = getcwd()
+	if exists("b:Powerline_cwd") && cwd != b:Powerline_cwd
+		unlet! b:Powerline_filepath
+	endif
+	let b:Powerline_cwd = cwd
+
+	if exists('b:Powerline_filepath')
+		return b:Powerline_filepath
+	endif
+
+	let dirsep = has('win32') && ! &shellslash ? '\' : '/'
+	let filepath = expand('%:p')
+
+	if empty(filepath)
+		return ''
+	endif
+
+	let ret = ''
+
+	if g:Powerline_stl_path_style == 'short'
+		" Display a short path where the first directory is displayed with its
+		" full name, and the subsequent directories are shortened to their
+		" first letter, i.e. "/home/user/foo/foo/bar/baz.vim" becomes
+		" "~/foo/f/b/baz.vim"
+		"
+		" This displays the shortest possible path, relative to ~ or the
+		" current directory.
+		let mod = (exists('+acd') && &acd) ? ':~:h' : ':~:.:h'
+		let fpath = split(fnamemodify(filepath, mod), dirsep)
+		let fpath_shortparts = map(fpath[1:], 'v:val[0]')
+		let ret = join(extend([fpath[0]], fpath_shortparts), dirsep) . dirsep
+	elseif g:Powerline_stl_path_style == 'relative'
+		" Display a relative path, similar to the %f statusline item
+		let ret = fnamemodify(filepath, ':~:.:h') . dirsep
+	elseif g:Powerline_stl_path_style == 'full'
+		" Display the full path, similar to the %F statusline item
+		let ret = fnamemodify(filepath, ':h') . dirsep
+	endif
+
+	if ret == ('.' . dirsep)
+		let ret = ''
+	endif
+
+	let b:Powerline_filepath = ret
+	return ret
+endfunction " }}}
+function! Powerline#Functions#GetShortPath(threshold) " {{{
+	let fullpath = split(expand('%:~'), '[/\\]')
+
+	if len(fullpath) > a:threshold
+		let fullpath = [fullpath[0], '…'] +  fullpath[-a:threshold + 1 :]
+	endif
+
+	return join(fullpath, '/')
+endfunction " }}}
+function! Powerline#Functions#GetMode() " {{{
+	let mode = mode()
+
+	if mode ==# 'v'
+		let mode = get(g:, "Powerline_mode_v", "VISUAL")
+	elseif mode ==# 'V'
+		let mode = get(g:, "Powerline_mode_V", "Vâ‹…LINE")
+	elseif mode ==# ''
+		let mode = get(g:, "Powerline_mode_cv", "Vâ‹…BLOCK")
+	elseif mode ==# 's'
+		let mode = get(g:, "Powerline_mode_s", "SELECT")
+	elseif mode ==# 'S'
+		let mode = get(g:, "Powerline_mode_S", "Sâ‹…LINE")
+	elseif mode ==# ''
+		let mode = get(g:, "Powerline_mode_cs", "Sâ‹…BLOCK")
+	elseif mode =~# '\vi'
+		let mode = get(g:, "Powerline_mode_i", "INSERT")
+	elseif mode =~# '\v(R|Rv)'
+		let mode = get(g:, "Powerline_mode_R", "REPLACE")
+	else
+		" Fallback to normal mode
+		let mode = get(g:, "Powerline_mode_n", "NORMAL")
+	endif
+
+	return mode
+endfunction " }}}
+function! Powerline#Functions#GetFilesize() " {{{
+	let bytes = getfsize(expand("%:p"))
+
+	if bytes <= 0
+		return ''
+	endif
+
+	if bytes < 1024
+		return bytes . 'B'
+	else
+		return (bytes / 1024) . 'kB'
+	endif
+endfunction "}}}
+function! Powerline#Functions#GetCharCode() " {{{
+	" Get the output of :ascii
+	redir => ascii
+	silent! ascii
+	redir END
+
+	if match(ascii, 'NUL') != -1
+		return 'NUL'
+	endif
+
+	" Zero pad hex values
+	let nrformat = '0x%02x'
+
+	let encoding = (&fenc == '' ? &enc : &fenc)
+
+	if encoding == 'utf-8'
+		" Zero pad with 4 zeroes in unicode files
+		let nrformat = '0x%04x'
+	endif
+
+	" Get the character and the numeric value from the return value of :ascii
+	" This matches the two first pieces of the return value, e.g.
+	" "<F>  70" => char: 'F', nr: '70'
+	let [str, char, nr; rest] = matchlist(ascii, '\v\<(.{-1,})\>\s*([0-9]+)')
+
+	" Format the numeric value
+	let nr = printf(nrformat, nr)
+
+	return "'". char ."' ". nr
+endfunction "}}}
+function! Powerline#Functions#GetWSMarker() " {{{
+	" Return '...' if trailing white space is detected
+	" Return '' otherwise
+	if ! exists("b:statusline_trailing_space_warning")
+		if search('\s$', 'nw') != 0
+			let b:statusline_trailing_space_warning = ' … '
+		else
+			let b:statusline_trailing_space_warning = ''
+		endif
+	endif
+	return b:statusline_trailing_space_warning
+endfunction " }}}
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/ft_man.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/ft_man.vim
new file mode 100644
index 0000000..29135e4
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/ft_man.vim
@@ -0,0 +1,12 @@
+function! Powerline#Functions#ft_man#GetName() " {{{
+	let matches = matchlist(getline(1), '\v^([a-zA-Z_\.\-]+)\((\d+)\)')
+
+	if ! len(matches)
+		return 'n/a'
+	endif
+
+	let file = tolower(matches[1])
+	let num = matches[2]
+
+	return file
+endfunction " }}}
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/fugitive.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/fugitive.vim
new file mode 100644
index 0000000..bb00131
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/fugitive.vim
@@ -0,0 +1,7 @@
+function! Powerline#Functions#fugitive#GetBranch(symbol) " {{{
+	let ret = fugitive#statusline()
+
+	let ret = substitute(ret, '\c\v\[?GIT\(([a-z0-9\-_\./:]+)\)\]?', a:symbol .' \1', 'g')
+
+	return ret
+endfunction " }}}
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/hgrev.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/hgrev.vim
new file mode 100644
index 0000000..61d94ad
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/hgrev.vim
@@ -0,0 +1,17 @@
+function! Powerline#Functions#hgrev#Status(symbol) " {{{
+	if ! exists('*HGRev')
+		" HGRev hasn't been loaded yet
+		return ''
+	endif
+	if !exists("b:statusline_hg_status")
+		silent execute "RefreshMercurialRev"
+	endif
+	let b:statusline_hg_status=HGRev()
+	if b:statusline_hg_status != '-'
+		let ret = "\u26A1". '' . substitute(b:statusline_hg_status, '^[^ ]*', '\1', 'g')
+		let ret=substitute(ret,' M$','+','g')
+	else
+		let ret=''
+		endif
+	return ret
+endfunction " }}}
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/syntastic.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/syntastic.vim
new file mode 100644
index 0000000..70c8849
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Functions/syntastic.vim
@@ -0,0 +1,16 @@
+function! Powerline#Functions#syntastic#GetErrors(line_symbol) " {{{
+	if ! exists('g:syntastic_stl_format')
+		" Syntastic hasn't been loaded yet
+		return ''
+	endif
+
+	" Temporarily change syntastic output format
+	let old_stl_format = g:syntastic_stl_format
+	let g:syntastic_stl_format = '%E{ ERRORS (%e) '. a:line_symbol .' %fe }%W{ WARNINGS (%w) '. a:line_symbol .' %fw }'
+
+	let ret = SyntasticStatuslineFlag()
+
+	let g:syntastic_stl_format = old_stl_format
+
+	return ret
+endfunction " }}}
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Matches.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Matches.vim
new file mode 100644
index 0000000..033c4be
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Matches.vim
@@ -0,0 +1,13 @@
+let g:Powerline#Matches#matches = {
+	\ 'command_t'       : Pl#Match#Add('bufname(winbufnr(a:window))', '^GoToFile$'),
+	\ 'bt_help'         : Pl#Match#Add('getwinvar(a:window, "&bt")' , '^help$'),
+	\ 'ft_man'          : Pl#Match#Add('getwinvar(a:window, "&ft")' , '^man$'),
+	\ 'ft_qf'           : Pl#Match#Add('getwinvar(a:window, "&ft")' , '^qf$'),
+	\ 'ft_vimpager'     : Pl#Match#Add('getwinvar(a:window, "&ft")' , 'vimpager'),
+	\ 'gundo_preview'   : Pl#Match#Add('bufname(winbufnr(a:window))', '^__Gundo_Preview__$'),
+	\ 'gundo_tree'      : Pl#Match#Add('bufname(winbufnr(a:window))', '^__Gundo__$'),
+	\ 'lustyexplorer'   : Pl#Match#Add('bufname(winbufnr(a:window))', '\[LustyExplorer\-Buffers\]'),
+	\ 'minibufexplorer' : Pl#Match#Add('bufname(winbufnr(a:window))', '^\-MiniBufExplorer\-$'),
+	\ 'tagbar'          : Pl#Match#Add('getwinvar(a:window, "&ft")' , '^tagbar$'),
+	\ 'nerdtree'        : Pl#Match#Add('getwinvar(a:window, "&ft")' , '^nerdtree$'),
+\ }
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments.vim
new file mode 100644
index 0000000..c74c34f
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments.vim
@@ -0,0 +1,30 @@
+let g:Powerline#Segments#segments = Pl#Segment#Init([
+	\ Pl#Segment#Create('SPLIT'   , '__split__'),
+	\ Pl#Segment#Create('TRUNCATE', '__truncate__'),
+	\
+	\ Pl#Segment#Create('paste_indicator' , '%{&paste ? "PASTE" : ""}', Pl#Segment#Modes('!N')),
+	\ Pl#Segment#Create('mode_indicator'  , '%{Powerline#Functions#GetMode()}', Pl#Segment#Modes('!N')),
+	\ Pl#Segment#Create('fileinfo',
+		\ Pl#Segment#Create('flags.ro'    , '%{&readonly ? "$RO" : ""}'),
+		\ Pl#Segment#Create('filepath'    , '%{Powerline#Functions#GetFilepath()}', Pl#Segment#NoPadding()),
+		\ Pl#Segment#Create('filename'    , '%t'),
+		\ Pl#Segment#Create('flags.mod'   , '%M'),
+		\ Pl#Segment#Create('flags.type'  , '%H%W'),
+	\ ),
+	\ Pl#Segment#Create('filename'        , '%t'),
+	\ Pl#Segment#Create('filesize'        , '%{Powerline#Functions#GetFilesize()}', Pl#Segment#Modes('!N')),
+	\ Pl#Segment#Create('pwd'             , '%{substitute(getcwd(), expand("$HOME"), "~", "g")}'),
+	\ Pl#Segment#Create('static_str'      , '%%{"%s"}'),
+	\ Pl#Segment#Create('raw'             , '%s'),
+	\ Pl#Segment#Create('fileformat'      , '%{&fileformat}', Pl#Segment#Modes('!N')),
+	\ Pl#Segment#Create('fileencoding'    , '%{(&fenc == "" ? &enc : &fenc)}', Pl#Segment#Modes('!N')),
+	\ Pl#Segment#Create('filetype'        , '%{strlen(&ft) ? &ft : "no ft"}', Pl#Segment#Modes('!N')),
+	\ Pl#Segment#Create('scrollpercent'   , '%3p%%'),
+	\ Pl#Segment#Create('lineinfo',
+		\ Pl#Segment#Create('line.cur'    , '$LINE %3l'),
+		\ Pl#Segment#Create('line.tot'    , ':%-2v', Pl#Segment#NoPadding()),
+	\ ),
+	\ Pl#Segment#Create('charcode'        , '%{Powerline#Functions#GetCharCode()}', Pl#Segment#Modes('!N')),
+	\ Pl#Segment#Create('currhigroup'     , '%{synIDattr(synID(line("."), col("."), 1), "name")}', Pl#Segment#Modes('!N')),
+	\ Pl#Segment#Create('ws_marker'       , '%{Powerline#Functions#GetWSMarker()}', Pl#Segment#Modes('!N')),
+\ ])
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/ctrlp.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/ctrlp.vim
new file mode 100755
index 0000000..41c5ebf
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/ctrlp.vim
@@ -0,0 +1,20 @@
+if !exists("g:Powerline#Segments#ctrlp#segments#focus ")
+	let g:Powerline#Segments#ctrlp#segments#focus = '%{"%0"}'
+endif
+if !exists("g:Powerline#Segments#ctrlp#segments#prev ")
+	let g:Powerline#Segments#ctrlp#segments#prev = '%-3{"%3"}'
+endif
+if !exists("g:Powerline#Segments#ctrlp#segments#next ")
+	let g:Powerline#Segments#ctrlp#segments#next = '%-3{"%5"}'
+endif
+
+let g:Powerline#Segments#ctrlp#segments = Pl#Segment#Init(['ctrlp'
+	\ , Pl#Segment#Create('focus', g:Powerline#Segments#ctrlp#segments#focus)
+	\ , Pl#Segment#Create('byfname', '%{"%1"}')
+	\ , Pl#Segment#Create('prev', g:Powerline#Segments#ctrlp#segments#prev)
+	\ , Pl#Segment#Create('item', '%-9{"%4"}')
+	\ , Pl#Segment#Create('next', g:Powerline#Segments#ctrlp#segments#next)
+	\ , Pl#Segment#Create('marked', '%{"%6" == " <+>" ? "" : strpart("%6", 2, len("%6") - 3)}')
+	\
+	\ , Pl#Segment#Create('count', '%-6{"%0"}')
+\ ])
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/ft_man.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/ft_man.vim
new file mode 100644
index 0000000..6ed0cc3
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/ft_man.vim
@@ -0,0 +1,3 @@
+let g:Powerline#Segments#ft_man#segments = Pl#Segment#Init(['ft_man',
+	\ Pl#Segment#Create('filename', '%{Powerline#Functions#ft_man#GetName()}')
+\ ])
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/fugitive.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/fugitive.vim
new file mode 100644
index 0000000..bb46eec
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/fugitive.vim
@@ -0,0 +1,5 @@
+let g:Powerline#Segments#fugitive#segments = Pl#Segment#Init(['fugitive',
+	\ (exists('g:loaded_fugitive') && g:loaded_fugitive == 1),
+	\
+	\ Pl#Segment#Create('branch', '%{Powerline#Functions#fugitive#GetBranch("$BRANCH")}')
+\ ])
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/hgrev.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/hgrev.vim
new file mode 100644
index 0000000..3e651d1
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/hgrev.vim
@@ -0,0 +1,4 @@
+let g:Powerline#Segments#hgrev#segments = Pl#Segment#Init(['hgrev',
+	\ (exists('hgrev_loaded')),
+	\ Pl#Segment#Create('branch', '%{Powerline#Functions#hgrev#Status("$BRANCH")}')
+  \ ])
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/rvm.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/rvm.vim
new file mode 100644
index 0000000..c840632
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/rvm.vim
@@ -0,0 +1,6 @@
+let g:Powerline#Segments#rvm#segments = Pl#Segment#Init(['rvm',
+	\ (exists('g:loaded_rvm') && g:loaded_rvm == 1),
+	\
+	\ Pl#Segment#Create('string', '%{rvm#string()}'),
+	\ Pl#Segment#Create('statusline', '%{rvm#statusline()}')
+\ ])
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/syntastic.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/syntastic.vim
new file mode 100644
index 0000000..5a893d6
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/syntastic.vim
@@ -0,0 +1,5 @@
+let g:Powerline#Segments#syntastic#segments = Pl#Segment#Init(['syntastic',
+	\ (exists('g:loaded_syntastic_plugin') && g:loaded_syntastic_plugin == 1),
+	\
+	\ Pl#Segment#Create('errors', '%{Powerline#Functions#syntastic#GetErrors("$LINE")}', Pl#Segment#Modes('!N'))
+\ ])
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/tagbar.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/tagbar.vim
new file mode 100644
index 0000000..5db8cd9
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/tagbar.vim
@@ -0,0 +1,6 @@
+let g:Powerline#Segments#tagbar#segments = Pl#Segment#Init(['tagbar',
+	\ (exists(':Tagbar') > 0),
+	\
+	\ Pl#Segment#Create('currenttag', '%{tagbar#currenttag("%s", "")}', Pl#Segment#Modes('!N')),
+	\ Pl#Segment#Create('fullcurrenttag', '%{tagbar#currenttag("%s", "", "f")}', Pl#Segment#Modes('!N'))
+\ ])
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/virtualenv.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/virtualenv.vim
new file mode 100644
index 0000000..8c7d6fb
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Segments/virtualenv.vim
@@ -0,0 +1,5 @@
+let g:Powerline#Segments#virtualenv#segments = Pl#Segment#Init(['virtualenv',
+	\ has('python') && (exists('g:virtualenv_loaded') && g:virtualenv_loaded == 1),
+	\
+	\ Pl#Segment#Create('statusline', '%{virtualenv#statusline()}')
+\ ])
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/default.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/default.vim
new file mode 100644
index 0000000..a97d5b9
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/default.vim
@@ -0,0 +1,116 @@
+let g:Powerline#Themes#default#theme = Pl#Theme#Create(
+	\ Pl#Theme#Buffer(''
+		\ , 'paste_indicator'
+		\ , 'mode_indicator'
+		\ , 'fugitive:branch'
+		\ , 'hgrev:branch'
+		\ , 'fileinfo'
+		\ , 'syntastic:errors'
+		\ , Pl#Segment#Truncate()
+		\ , 'tagbar:currenttag'
+		\ , Pl#Segment#Split()
+		\ , 'rvm:string'
+		\ , 'virtualenv:statusline'
+		\ , 'fileformat'
+		\ , 'fileencoding'
+		\ , 'filetype'
+		\ , 'scrollpercent'
+		\ , 'lineinfo'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('command_t'
+		\ , ['static_str.name', 'Command-T']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , ['raw.line', '%10(Match #%l%)']
+	\ ),
+	\
+	\ Pl#Theme#Buffer('gundo', Pl#Match#Any('gundo_tree')
+		\ , ['static_str.name', 'Gundo']
+		\ , ['static_str.buffer', 'Undo tree']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('gundo', Pl#Match#Any('gundo_preview')
+		\ , ['static_str.name', 'Gundo']
+		\ , ['static_str.buffer', 'Diff preview']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('bt_help'
+		\ , ['static_str.name', 'Help']
+		\ , 'filename'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'scrollpercent'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ft_vimpager'
+		\ , ['static_str.name', 'Pager']
+		\ , 'filename'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'scrollpercent'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('lustyexplorer'
+		\ , ['static_str.name', 'LustyExplorer']
+		\ , ['static_str.buffer', 'Buffer list']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ft_man'
+		\ , ['static_str.name', 'Man page']
+		\ , 'filename'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'scrollpercent'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('minibufexplorer'
+		\ , ['static_str.name', 'MiniBufExplorer']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ft_qf'
+		\ , ['static_str.name', 'Quickfix']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('tagbar'
+		\ , ['static_str.name', 'Tagbar']
+		\ , ['static_str.buffer', 'Tree']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ctrlp', Pl#Theme#Callback('ctrlp_main', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.main = "%s"')
+		\ , 'ctrlp:prev'
+		\ , 'ctrlp:item'
+		\ , 'ctrlp:next'
+		\ , 'ctrlp:marked'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'ctrlp:focus'
+		\ , 'ctrlp:byfname'
+		\ , 'pwd'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ctrlp', Pl#Theme#Callback('ctrlp_prog', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.prog = "%s"')
+		\ , 'ctrlp:count'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'pwd'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('nerdtree'
+		\ , ['raw.name', '%{Powerline#Functions#GetShortPath(4)}']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ )
+\ )
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/solarized16.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/solarized16.vim
new file mode 100644
index 0000000..ee8b91a
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/solarized16.vim
@@ -0,0 +1,114 @@
+" Authors:
+"   @stephenmckinney
+"
+let g:Powerline#Themes#solarized16#theme = Pl#Theme#Create(
+	\ Pl#Theme#Buffer(''
+		\ , 'fugitive:branch'
+		\ , 'fileinfo'
+		\ , 'flags.mod'
+		\ , 'syntastic:errors'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'sass:status'
+		\ , 'rvm:string'
+		\ , 'filetype'
+		\ , 'scrollpercent'
+		\ , 'paste_indicator'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('command_t'
+		\ , ['static_str.name', 'Command-T']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , ['raw.line', '%10(Match #%l%)']
+	\ ),
+	\
+	\ Pl#Theme#Buffer('gundo', Pl#Match#Any('gundo_tree')
+		\ , ['static_str.name', 'Gundo']
+		\ , ['static_str.buffer', 'Undo tree']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('gundo', Pl#Match#Any('gundo_preview')
+		\ , ['static_str.name', 'Gundo']
+		\ , ['static_str.buffer', 'Diff preview']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('bt_help'
+		\ , ['static_str.name', 'Help']
+		\ , 'filename'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'scrollpercent'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ft_vimpager'
+		\ , ['static_str.name', 'Pager']
+		\ , 'filename'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'scrollpercent'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('lustyexplorer'
+		\ , ['static_str.name', 'LustyExplorer']
+		\ , ['static_str.buffer', 'Buffer list']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ft_man'
+		\ , ['static_str.name', 'Man page']
+		\ , 'filename'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'scrollpercent'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('minibufexplorer'
+		\ , ['static_str.name', 'MiniBufExplorer']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ft_qf'
+		\ , ['static_str.name', 'Quickfix']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('tagbar'
+		\ , ['static_str.name', 'Tagbar']
+		\ , ['static_str.buffer', 'Tree']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ctrlp', Pl#Theme#Callback('ctrlp_main', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.main = "%s"')
+		\ , 'ctrlp:prev'
+		\ , 'ctrlp:item'
+		\ , 'ctrlp:next'
+		\ , 'ctrlp:marked'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'ctrlp:focus'
+		\ , 'ctrlp:byfname'
+		\ , 'pwd'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ctrlp', Pl#Theme#Callback('ctrlp_prog', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.prog = "%s"')
+		\ , 'ctrlp:count'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'pwd'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('nerdtree'
+		\ , ['raw.name', '%{Powerline#Functions#GetShortPath(4)}']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ )
+\ )
diff --git a/vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/solarized256.vim b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/solarized256.vim
new file mode 100644
index 0000000..82c06bf
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/autoload/Powerline/Themes/solarized256.vim
@@ -0,0 +1,119 @@
+" Authors:
+"   @skwp
+"
+" Disabled:
+" Add the following line into the first theme group to see the highlight
+" group
+" \ , 'currhigroup'
+"
+" Line info taken out - I know which line number I'm on from the gutter
+"\ , 'lineinfo'
+let g:Powerline#Themes#solarized256#theme = Pl#Theme#Create(
+	\ Pl#Theme#Buffer(''
+		\ , 'fugitive:branch'
+		\ , 'fileinfo'
+		\ , 'flags.mod'
+		\ , 'syntastic:errors'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'sass:status'
+		\ , 'rvm:string'
+		\ , 'paste_indicator'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('command_t'
+		\ , ['static_str.name', 'Command-T']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , ['raw.line', '%10(Match #%l%)']
+	\ ),
+	\
+	\ Pl#Theme#Buffer('gundo', Pl#Match#Any('gundo_tree')
+		\ , ['static_str.name', 'Gundo']
+		\ , ['static_str.buffer', 'Undo tree']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('gundo', Pl#Match#Any('gundo_preview')
+		\ , ['static_str.name', 'Gundo']
+		\ , ['static_str.buffer', 'Diff preview']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('bt_help'
+		\ , ['static_str.name', 'Help']
+		\ , 'filename'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'scrollpercent'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ft_vimpager'
+		\ , ['static_str.name', 'Pager']
+		\ , 'filename'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'scrollpercent'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('lustyexplorer'
+		\ , ['static_str.name', 'LustyExplorer']
+		\ , ['static_str.buffer', 'Buffer list']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ft_man'
+		\ , ['static_str.name', 'Man page']
+		\ , 'filename'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'scrollpercent'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('minibufexplorer'
+		\ , ['static_str.name', 'MiniBufExplorer']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ft_qf'
+		\ , ['static_str.name', 'Quickfix']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('tagbar'
+		\ , ['static_str.name', 'Tagbar']
+		\ , ['static_str.buffer', 'Tree']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ctrlp', Pl#Theme#Callback('ctrlp_main', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.main = "%s"')
+		\ , 'ctrlp:prev'
+		\ , 'ctrlp:item'
+		\ , 'ctrlp:next'
+		\ , 'ctrlp:marked'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'ctrlp:focus'
+		\ , 'ctrlp:byfname'
+		\ , 'pwd'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('ctrlp', Pl#Theme#Callback('ctrlp_prog', 'if ! exists("g:ctrlp_status_func") | let g:ctrlp_status_func = {} | endif | let g:ctrlp_status_func.prog = "%s"')
+		\ , 'ctrlp:count'
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+		\ , 'pwd'
+	\ ),
+	\
+	\ Pl#Theme#Buffer('nerdtree'
+		\ , ['raw.name', '%{Powerline#Functions#GetShortPath(4)}']
+		\ , Pl#Segment#Truncate()
+		\ , Pl#Segment#Split()
+	\ )
+\ )
diff --git a/vim-plugins/bundle/vim-powerline/doc/Powerline.txt b/vim-plugins/bundle/vim-powerline/doc/Powerline.txt
new file mode 100644
index 0000000..af1b0cf
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/doc/Powerline.txt
@@ -0,0 +1,439 @@
+*Powerline.txt*	For Vim version 7.3.	Last change: 2011 Nov 23
+
+                                            ______
+         _________                          \    /__
+         \_____   \______  _  _____________ /   /'__' ___   ____
+          |    ___/  _ \ \/ \/ / __ \_  ___\   / |  |/   \_/ __ \
+          |   |  |  (_) \  _  /  ___/|  |  /  /__|  |  |  \  ___/
+          '___'   \____/ \/ \/ \___  |__' /___  /'__'__|  /\___ \
+                                   \/        / /        \/     \/
+                                            | /
+                                            |/
+                                            '
+
+==============================================================================
+CONTENTS                                                  *Powerline-contents*
+
+    1. Introduction ....................... |Powerline-introduction|
+    2. Usage .............................. |Powerline-usage|
+    3. Requirements ....................... |Powerline-requirements|
+       3.1 Recommended settings ........... |Powerline-recommended-settings|
+    4. Configuration ...................... |Powerline-configuration|
+       4.1 Powerline_cache_file ........... |Powerline_cache_file|
+           4.1.1 Clearing the cache ....... |:PowerlineClearCache|
+           4.1.2 Powerline_cache_dir ...... |Powerline_cache_dir|
+       4.2 Powerline_cache_enabled ........ |Powerline_cache_enabled|
+       4.3 Powerline_symbols .............. |Powerline_symbols|
+           4.3.1 Compatible symbols ....... |Powerline-symbols-compatible|
+           4.3.2 Fancy symbols ............ |Powerline-symbols-fancy|
+           4.3.3 Overriding symbols ....... |Powerline_symbols_override|
+           4.3.4 Overriding dividers ...... |Powerline_dividers_override|
+       4.4 Powerline_theme ................ |Powerline_theme|
+       4.5 Powerline_colorscheme .......... |Powerline_colorscheme|
+       4.6 Powerline_stl_path_style ....... |Powerline_stl_path_style|
+    5. Fonts .............................. |Powerline-fonts|
+    6. Customization ...................... |Powerline-customization|
+       6.1 Basic customization ............ |Powerline-basic-customization|
+       6.2 Advanced customization ......... |Powerline-advanced-customization|
+           6.2.1 Colorschemes ............. |Powerline-cust-colorschemes|
+           6.2.2 Functions ................ |Powerline-cust-functions|
+           6.2.3 Segments ................. |Powerline-cust-segments|
+           6.2.4 Themes ................... |Powerline-cust-themes|
+    7. License ............................ |Powerline-license|
+    8. Known issues ....................... |Powerline-known-issues|
+    9. Contributing ....................... |Powerline-contributing|
+
+==============================================================================
+1. Introduction                           *Powerline* *Powerline-introduction*
+
+Powerline is a utility plugin which allows you to create better-looking, more 
+functional Vim statuslines.
+
+==============================================================================
+2. Usage                                                     *Powerline-usage*
+
+Powerline is automatically enabled when it's installed, either by unzipping 
+the provided archive or by adding it as a Pathogen/Vundle bundle.
+
+Powerline replaces the standard Vim 'statusline' with a custom statusline made 
+up of Powerline segments.
+
+Powerline ignores any 'statusline' customizations you have defined in your 
+|vimrc|. If you remove Powerline, your 'statusline' customizations are 
+restored.
+
+==============================================================================
+3. Requirements                                       *Powerline-requirements*
+
+Powerline has been developed and tested in Vim 7.3, but it should run without 
+any problems in Vim 7.2. The default configuration requires a Unix-like system 
+to work properly.
+
+The plugin only works with Vim running in an 88/256-color terminal or Gvim.
+
+Vi-compatible mode must be disabled.
+
+------------------------------------------------------------------------------
+3.1 Recommended settings                      *Powerline-recommended-settings*
+
+The following configuration options should be set in your |vimrc|: >
+
+    set nocompatible   " Disable vi-compatibility
+    set laststatus=2   " Always show the statusline
+    set encoding=utf-8 " Necessary to show Unicode glyphs
+
+Note: If you're using an 88/256-color terminal but still don't see the colored 
+statusline, you may have to set the following option as well: >
+
+    set t_Co=256 " Explicitly tell Vim that the terminal supports 256 colors
+
+==============================================================================
+4. Configuration                                     *Powerline-configuration*
+
+Powerline will work fine without any user configuration, but default behavior 
+can be overridden by setting configuration variables globally in your |vimrc| 
+file.
+
+------------------------------------------------------------------------------
+4.1 Powerline_cache_file                                *Powerline_cache_file*
+
+By default Powerline caches all the statuslines and colors in a cache file in 
+the plugin's directory (or the Vim directory, depending on the installation 
+method used).
+
+It's recommended that you enable the cache, as this dramatically improves Vim 
+startup time after the cache file has been generated (the plugin usually loads 
+within ~100ms without the cache and ~1ms with the cache).
+
+Note: The default cache filename includes the current theme, colorscheme and 
+symbol settings in order to tie the cache file to your current configuration, 
+so the cache file will be regenerated when you change any settings. This may 
+leave several old cache files in your Vim folder, and these may safely be 
+deleted.
+
+Defaults: "|Powerline_cache_dir|/Powerline_<theme>_<colorscheme>_<symbols>.cache"
+
+------------------------------------------------------------------------------
+4.1.1 Powerline_cache_dir                                *Powerline_cache_dir*
+
+This is the directory used for |Powerline_cache_file|.
+
+Default: Plugin directory: >
+
+    let g:Powerline_cache_dir = simplify(expand('<sfile>:p:h') .'/..')
+<
+------------------------------------------------------------------------------
+4.1.2 Clearing the cache                                *:PowerlineClearCache*
+
+Powerline provides a command to easily clear the cache after changing your 
+settings or updating your theme. Simply run the following command to clear 
+your cache, and restart Vim afterwards: >
+
+    :PowerlineClearCache
+<
+------------------------------------------------------------------------------
+4.2 Powerline_cache_enabled                          *Powerline_cache_enabled*
+
+It's possible to disable statusline caching by setting this option to 0. This 
+is mostly useful when developing statuslines.
+
+Example: >
+
+    let g:Powerline_cache_enabled = 0
+<
+
+Default: 1
+
+------------------------------------------------------------------------------
+4.3 Powerline_symbols                                      *Powerline_symbols*
+
+This option defines which set of symbols and dividers you want to use. There 
+are currently three available options: "compatible", "unicode" and "fancy".
+
+    TYPE           DESCRIPTION ~
+    compatible     Doesn't use any special characters.
+    unicode        Simulates icons and arrows using similar Unicode glyphs.
+    fancy          Custom icons and arrows. Requires a patched font.
+
+Example: >
+
+    let g:Powerline_symbols = 'fancy'
+<
+
+Default: "compatible"
+
+Symbols can be inserted into statuslines by using the following variables 
+(just insert the variables as text in your segments):
+
+    VARIABLE       DESCRIPTION ~
+    $BRANCH        Inserts a branch symbol
+    $RO            Inserts a read-only symbol
+    $FT            Inserts a filetype symbol
+    $LINE          Inserts a line number symbol
+
+------------------------------------------------------------------------------
+4.3.1 Compatible symbols                        *Powerline-symbols-compatible*
+
+These symbols will work in any configuration, and do not require a special 
+font to work. This option will replace the fancy icons with plain text, and 
+the pointy dividers with straight lines.
+
+------------------------------------------------------------------------------
+4.3.2 Fancy symbols                                  *Powerline-symbols-fancy*
+
+These symbols require a custom font to work. A font patcher is provided for 
+adding the required symbols to any outline font and some bitmap fonts, see 
+|Powerline-fonts| and the provided README file for usage details.
+
+------------------------------------------------------------------------------
+4.3.3 Overriding symbols                          *Powerline_symbols_override*
+
+You can override symbols by adding your symbols to the 
+g:Powerline_symbols_override dictionary. Example: If you want the branch 
+symbol to be "∓" (hex code 0x2213) and the line symbol to be "L" you can add 
+the following to your |vimrc|: >
+
+    let g:Powerline_symbols_override = {
+        \ 'BRANCH': [0x2213],
+        \ 'LINE': 'L',
+        \ }
+<
+------------------------------------------------------------------------------
+4.3.4 Overriding dividers                        *Powerline_dividers_override*
+
+If you for some reason want to override the dividers then you can set 
+g:Powerline_dividers_override to a list with exactly four elements:
+
+    1: Hard right-pointing arrow
+    2: Soft right-pointing arrow
+    3: Hard left-pointing arrow
+    4: Soft left-pointing arrow
+
+Example: >
+
+    let g:Powerline_dividers_override = ['>>', '>', '<<', '<']
+<
+
+------------------------------------------------------------------------------
+4.3.5 Overriding mode names                                   *Powerline_mode*
+
+You can change the names used for modes at the far left by setting some
+variables in your |vimrc|. For example you can change "N" to "NORMAL" with: >
+
+    let g:Powerline_mode_n = 'NORMAL'
+<
+The variables are all named beginning with 'g:Powerline_mode_', as follows:
+
+mode                name    default       note ~
+Normal              n       ' N '         (surrounded by spaces)
+Insert              i       INSERT
+Replace             R       REPLACE       |Replace-mode|
+Visual              v       VISUAL        |Visual-mode|
+Visual linewise     V       Vâ‹…LINE
+Visual blockwise    cv      Vâ‹…BLOCK
+Select              s       SELECT        |Select-mode|
+Select linewise     S       Sâ‹…LINE
+Select blockwise    cs      Sâ‹…BLOCK
+
+-----------------------------------------------------------------------------
+4.4 Powerline_theme                                          *Powerline_theme*
+
+This option defines the theme Powerline uses. The available themes are located 
+in autoload/Powerline/Themes/. A theme is a pre-defined set of Powerline 
+segments which make up the statusline.
+
+Example: >
+
+    let g:Powerline_theme = 'solarized256'
+<
+
+Default: "default"
+
+------------------------------------------------------------------------------
+4.5 Powerline_colorscheme                              *Powerline_colorscheme*
+
+This option defines the colorscheme Powerline uses. The available colorschemes 
+are located in autoload/Powerline/Colorschemes/.
+
+Example: >
+
+    let g:Powerline_colorscheme = 'solarized256'
+<
+
+Default: "default"
+
+------------------------------------------------------------------------------
+4.6 Powerline_stl_path_style                        *Powerline_stl_path_style*
+
+There are currently four ways to display the current path and file name. The 
+default is to only display the file name like the %t statusline item. By 
+setting this configuration value you can choose from the following ways 
+display the current path and file name:
+
+    VALUE      DESCRIPTION ~
+    filename   Display only the file name using the %t statusline item.
+    short      Display a short path. The home directory is substituted with
+               "~", the first directory is displayed with its full name, and
+               subsequent directories are shortened to their first letter.
+               I.e. "/home/user/foo/bar/baz.vim" becomes "~/f/b/baz.vim" and
+               "long/relative/path/foo/bar/baz.vim becomes
+               "long/r/p/f/b/baz.vim".
+    relative   Display a relative path, similar to the %f statusline item.
+    full       Display the full path, similar to the %F statusline item.
+
+Example: >
+
+    let g:Powerline_stl_path_style = 'full'
+<
+
+Default: "relative"
+
+==============================================================================
+5. Fonts                                                     *Powerline-fonts*
+
+TODO
+
+==============================================================================
+6. Customization                                     *Powerline-customization*
+
+There are currently two ways of customizing Powerline: Basic customization 
+using a couple of functions to insert and remove existing segments from the 
+statusline, and advanced customization using your own autoload files. The 
+customization features of Powerline allow you to create your own statuslines 
+without ever touching the original source code.
+
+------------------------------------------------------------------------------
+6.1 Basic customization                        *Powerline-basic-customization*
+
+Powerline provides the following functions to alter the default statusline 
+look. These functions should be called from your |vimrc| file or another file 
+which is sourced at Vim startup.
+
+Note: These functions are currently applied to all statuslines, so if you 
+insert a segment after a segment which is present in many statuslines (e.g.  
+the "filename" segment), all the statuslines will have the inserted segment.  
+This behavior may be changed in a future version of Powerline.
+
+Note: Remember to clear your cache with |:PowerlineClearCache| after changing 
+your statusline!
+
+Example: >
+
+    " Insert the charcode segment after the filetype segment
+    call Pl#Theme#InsertSegment('charcode', 'after', 'filetype')
+
+    " Replace the scrollpercent segment with the charcode segment
+    call Pl#Theme#ReplaceSegment('scrollpercent', 'fileinfo')
+<
+                                                      *Pl#Theme#InsertSegment*
+Pl#Theme#InsertSegment({newsegment}, {location}, {targetsegment})
+
+This function inserts {newsegment} before or after {targetsegment}. The 
+{location} parameter specifies the location of the new segment, valid values 
+are "before" and "after". You can see all the available segments in 
+autoload/Powerline/Segments.vim and the files specified in 
+|Powerline-cust-segments|.
+
+Pl#Theme#RemoveSegment({targetsegment})               *Pl#Theme#RemoveSegment*
+
+This function removes the {targetsegment} segment entirely.
+
+Pl#Theme#ReplaceSegment({oldsegment}, {newsegment})  *Pl#Theme#ReplaceSegment*
+
+This function replaces {oldsegment} with {newsegment}.
+
+------------------------------------------------------------------------------
+6.2 Advanced customization                  *Powerline-advanced-customization*
+
+Because Powerline utilizes Vim's autoload functionality, you can easily create 
+your own segments, themes, functions and colorschemes without touching the 
+original source code. This is a bit more complex than using the utility 
+functions, but it allows you to do a lot more with your statusline.
+
+Your custom autoload files should be stored in your |runtimepath| (usually in 
+"~/.vim/autoload/Powerline/*").
+
+Note: Remember to clear your cache with |:PowerlineClearCache| after changing 
+your statusline!
+
+6.2.1 Colorschemes                               *Powerline-cust-colorschemes*
+------------------------------------------------------------------------------
+
+Colorschemes should be stored as separate files in 
+{runtimepath}/autoload/Powerline/Colorschemes/.
+
+SYNTAX ~
+
+TODO
+
+EXAMPLE ~
+
+TODO
+
+6.2.2 Functions                                     *Powerline-cust-functions*
+------------------------------------------------------------------------------
+
+Functions should be stored as separate files in 
+{runtimepath}/autoload/Powerline/Functions/.
+
+SYNTAX ~
+
+TODO
+
+EXAMPLE ~
+
+TODO
+
+6.2.3 Segments                                       *Powerline-cust-segments*
+------------------------------------------------------------------------------
+
+Segments should be stored as separate files in 
+{runtimepath}/autoload/Powerline/Segments/.
+
+SYNTAX ~
+
+TODO
+
+EXAMPLE ~
+
+TODO
+
+6.2.4 Themes                                           *Powerline-cust-themes*
+------------------------------------------------------------------------------
+
+Themes should be stored as separate files in 
+{runtimepath}/autoload/Powerline/Themes/.
+
+SYNTAX ~
+
+TODO
+
+EXAMPLE ~
+
+TODO
+
+==============================================================================
+7. License                                                 *Powerline-license*
+
+Creative Commons Attribution-ShareAlike 3.0 Unported
+
+http://creativecommons.org/licenses/by-sa/3.0/
+
+==============================================================================
+8. Known issues                                       *Powerline-known-issues*
+
+See the issue tracker at
+https://github.com/Lokaltog/vim-powerline/issues
+
+==============================================================================
+9. Contributing                                       *Powerline-contributing*
+
+If you experience any bugs or have feature requests, please open an issue on
+GitHub. Fork the source repository on GitHub and send a pull request if you
+have any code improvements.
+
+Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
+Source repository: https://github.com/Lokaltog/vim-powerline
+
+==============================================================================
+vim:tw=78:sw=4:ts=8:ft=help:norl:
diff --git a/vim-plugins/bundle/vim-powerline/doc/tags b/vim-plugins/bundle/vim-powerline/doc/tags
new file mode 100644
index 0000000..445284b
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/doc/tags
@@ -0,0 +1,35 @@
+:PowerlineClearCache	Powerline.txt	/*:PowerlineClearCache*
+Pl#Theme#InsertSegment	Powerline.txt	/*Pl#Theme#InsertSegment*
+Pl#Theme#RemoveSegment	Powerline.txt	/*Pl#Theme#RemoveSegment*
+Pl#Theme#ReplaceSegment	Powerline.txt	/*Pl#Theme#ReplaceSegment*
+Powerline	Powerline.txt	/*Powerline*
+Powerline-advanced-customization	Powerline.txt	/*Powerline-advanced-customization*
+Powerline-basic-customization	Powerline.txt	/*Powerline-basic-customization*
+Powerline-configuration	Powerline.txt	/*Powerline-configuration*
+Powerline-contents	Powerline.txt	/*Powerline-contents*
+Powerline-contributing	Powerline.txt	/*Powerline-contributing*
+Powerline-cust-colorschemes	Powerline.txt	/*Powerline-cust-colorschemes*
+Powerline-cust-functions	Powerline.txt	/*Powerline-cust-functions*
+Powerline-cust-segments	Powerline.txt	/*Powerline-cust-segments*
+Powerline-cust-themes	Powerline.txt	/*Powerline-cust-themes*
+Powerline-customization	Powerline.txt	/*Powerline-customization*
+Powerline-fonts	Powerline.txt	/*Powerline-fonts*
+Powerline-introduction	Powerline.txt	/*Powerline-introduction*
+Powerline-known-issues	Powerline.txt	/*Powerline-known-issues*
+Powerline-license	Powerline.txt	/*Powerline-license*
+Powerline-recommended-settings	Powerline.txt	/*Powerline-recommended-settings*
+Powerline-requirements	Powerline.txt	/*Powerline-requirements*
+Powerline-symbols-compatible	Powerline.txt	/*Powerline-symbols-compatible*
+Powerline-symbols-fancy	Powerline.txt	/*Powerline-symbols-fancy*
+Powerline-usage	Powerline.txt	/*Powerline-usage*
+Powerline.txt	Powerline.txt	/*Powerline.txt*
+Powerline_cache_dir	Powerline.txt	/*Powerline_cache_dir*
+Powerline_cache_enabled	Powerline.txt	/*Powerline_cache_enabled*
+Powerline_cache_file	Powerline.txt	/*Powerline_cache_file*
+Powerline_colorscheme	Powerline.txt	/*Powerline_colorscheme*
+Powerline_dividers_override	Powerline.txt	/*Powerline_dividers_override*
+Powerline_mode	Powerline.txt	/*Powerline_mode*
+Powerline_stl_path_style	Powerline.txt	/*Powerline_stl_path_style*
+Powerline_symbols	Powerline.txt	/*Powerline_symbols*
+Powerline_symbols_override	Powerline.txt	/*Powerline_symbols_override*
+Powerline_theme	Powerline.txt	/*Powerline_theme*
diff --git a/vim-plugins/bundle/vim-powerline/fontpatcher/PowerlineSymbols.sfd b/vim-plugins/bundle/vim-powerline/fontpatcher/PowerlineSymbols.sfd
new file mode 100644
index 0000000..34d7d0c
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/fontpatcher/PowerlineSymbols.sfd
@@ -0,0 +1,319 @@
+SplineFontDB: 3.0
+FontName: PowerlineSymbols
+FullName: PowerlineSymbols
+FamilyName: PowerlineSymbols
+Weight: Medium
+Copyright: 
+UComments: "2011-11-21: Created." 
+Version: 001.000
+ItalicAngle: 0
+UnderlinePosition: -98.6328
+UnderlineWidth: 48.8281
+Ascent: 800
+Descent: 200
+LayerCount: 2
+Layer: 0 0 "Back"  1
+Layer: 1 0 "Fore"  0
+XUID: [1021 211 26716215 11021609]
+FSType: 0
+OS2Version: 0
+OS2_WeightWidthSlopeOnly: 0
+OS2_UseTypoMetrics: 1
+CreationTime: 1321867751
+ModificationTime: 1326665029
+OS2TypoAscent: 0
+OS2TypoAOffset: 1
+OS2TypoDescent: 0
+OS2TypoDOffset: 1
+OS2TypoLinegap: 90
+OS2WinAscent: 0
+OS2WinAOffset: 1
+OS2WinDescent: 0
+OS2WinDOffset: 1
+HheadAscent: 0
+HheadAOffset: 1
+HheadDescent: 0
+HheadDOffset: 1
+OS2Vendor: 'PfEd'
+MarkAttachClasses: 1
+DEI: 91125
+Encoding: UnicodeFull
+Compacted: 1
+UnicodeInterp: none
+NameList: Adobe Glyph List
+DisplaySize: -24
+AntiAlias: 1
+FitToEm: 1
+WinInfo: 0 31 18
+BeginPrivate: 0
+EndPrivate
+BeginChars: 1114112 9
+
+StartChar: uni2B80
+Encoding: 11136 11136 0
+Width: 621
+Flags: HMW
+LayerCount: 2
+Fore
+SplineSet
+0 1000 m 1
+ 621 379 l 1
+ 0 -243 l 1
+ 0 1000 l 1
+EndSplineSet
+EndChar
+
+StartChar: uni2B81
+Encoding: 11137 11137 1
+Width: 621
+Flags: HMW
+LayerCount: 2
+Fore
+SplineSet
+10 991 m 0
+ 16 997 23 1000 32 1000 c 0
+ 41 1000 48 996 54 990 c 2
+ 613 400 l 2
+ 619 394 621 386 621 378 c 0
+ 621 370 618 362 613 357 c 2
+ 54 -233 l 2
+ 48 -239 41 -242 32 -242 c 0
+ 23 -242 16 -240 10 -234 c 0
+ 4 -228 0 -221 0 -212 c 0
+ 0 -203 3 -196 8 -190 c 2
+ 547 379 l 1
+ 8 948 l 2
+ 3 954 0 961 0 970 c 0
+ 0 979 4 985 10 991 c 0
+EndSplineSet
+EndChar
+
+StartChar: uni2B82
+Encoding: 11138 11138 2
+Width: 621
+Flags: HMW
+LayerCount: 2
+Fore
+SplineSet
+621 1000 m 5
+ 621 -243 l 5
+ 0 379 l 5
+ 621 1000 l 5
+EndSplineSet
+EndChar
+
+StartChar: uni2B83
+Encoding: 11139 11139 3
+Width: 621
+Flags: HMW
+LayerCount: 2
+Fore
+SplineSet
+612 991 m 0
+ 618 985 621 979 621 970 c 0
+ 621 961 619 954 613 948 c 2
+ 74 379 l 1
+ 613 -190 l 2
+ 619 -196 621 -203 621 -212 c 0
+ 621 -221 618 -228 612 -234 c 0
+ 606 -240 598 -242 589 -242 c 0
+ 580 -242 574 -239 568 -233 c 2
+ 8 357 l 2
+ 3 362 0 370 0 378 c 0
+ 0 386 3 394 8 400 c 2
+ 568 990 l 2
+ 574 996 580 1000 589 1000 c 0
+ 598 1000 606 997 612 991 c 0
+EndSplineSet
+EndChar
+
+StartChar: uni2B61
+Encoding: 11105 11105 4
+Width: 555
+VWidth: 0
+Flags: HMW
+LayerCount: 2
+Fore
+SplineSet
+0 800 m 5
+ 92 800 l 5
+ 92 513 l 5
+ 253 513 l 5
+ 253 444 l 5
+ 0 444 l 5
+ 0 800 l 5
+236 312 m 5
+ 339 312 l 5
+ 468 67 l 5
+ 468 312 l 5
+ 555 312 l 5
+ 555 -44 l 5
+ 453 -44 l 5
+ 323 200 l 5
+ 323 -44 l 5
+ 236 -44 l 5
+ 236 312 l 5
+EndSplineSet
+EndChar
+
+StartChar: uni2B60
+Encoding: 11104 11104 5
+Width: 676
+Flags: HMW
+LayerCount: 2
+Fore
+SplineSet
+0 197 m 1
+ 94 207 419 279 419 384 c 2
+ 419 537 l 1
+ 278 501 l 1
+ 478 794 l 1
+ 677 501 l 1
+ 536 537 l 1
+ 536 384 l 2
+ 536 196 208 126 208 21 c 2
+ 208 -244 l 1
+ 0 -244 l 1
+ 0 197 l 1
+0 288 m 1
+ 0 405 0 944 0 944 c 1
+ 208 944 l 1
+ 208 944 208 451 208 334 c 1
+ 185 311 12 288 0 288 c 1
+EndSplineSet
+EndChar
+
+StartChar: uni2B62
+Encoding: 11106 11106 6
+Width: 428
+VWidth: 0
+Flags: HMW
+LayerCount: 2
+Fore
+SplineSet
+88 677 m 2
+ 429 677 l 1
+ 429 589 l 1
+ 88 589 l 1
+ 88 162 l 1
+ 198 162 l 1
+ 198 343 l 1
+ 374 343 l 1
+ 374 427 l 1
+ 198 427 l 1
+ 198 506 l 1
+ 429 506 l 1
+ 429 274 l 1
+ 416 263 391 255 374 255 c 2
+ 286 255 l 1
+ 286 162 l 2
+ 286 114 246 74 198 74 c 2
+ 88 74 l 2
+ 40 74 0 114 0 162 c 2
+ 0 589 l 2
+ 0 637 40 677 88 677 c 2
+EndSplineSet
+EndChar
+
+StartChar: uni2B63
+Encoding: 11107 11107 7
+Width: 428
+VWidth: 0
+Flags: HMW
+LayerCount: 2
+Fore
+SplineSet
+0 677 m 5
+ 341 677 l 6
+ 389 677 429 637 429 589 c 6
+ 429 506 l 6
+ 429 458 389 418 341 418 c 6
+ 287 418 l 5
+ 287 162 l 6
+ 287 114 247 74 199 74 c 6
+ 89 74 l 6
+ 41 74 1 114 1 162 c 6
+ 1 274 l 6
+ 0 274 l 6
+ 0 506 l 5
+ 89 506 l 5
+ 89 162 l 5
+ 199 162 l 5
+ 199 506 l 5
+ 341 506 l 5
+ 341 589 l 5
+ 0 589 l 5
+ 0 677 l 5
+EndSplineSet
+EndChar
+
+StartChar: uni2B64
+Encoding: 11108 11108 8
+Width: 546
+VWidth: 0
+Flags: HMW
+LayerCount: 2
+Fore
+SplineSet
+273 733 m 4
+ 429 733 430 538 430 538 c 5
+ 430 420 l 5
+ 547 420 l 5
+ 547 303 l 5
+ 547 303 546 -9 273 -9 c 4
+ 0 -9 0 303 0 303 c 5
+ 0 420 l 5
+ 117 420 l 5
+ 117 538 l 5
+ 117 538 117 733 273 733 c 4
+273 655 m 4
+ 195 655 195 576 195 420 c 5
+ 352 420 l 5
+ 352 576 351 655 273 655 c 4
+273 342 m 4
+ 195 342 195 147 273 147 c 4
+ 351 147 351 342 273 342 c 4
+EndSplineSet
+EndChar
+EndChars
+BitmapFont: 10 10 8 2 1 
+BDFChar: 0 11136 6 0 4 -2 7
+JAC+4q"X@:^jlCb
+BDFChar: 1 11137 6 0 4 -2 7
+J3Y4g#RCta5_&h7
+BDFChar: 2 11138 6 1 5 -2 7
+#T,OGq"T(n(^L*A
+BDFChar: 3 11139 6 1 5 -2 7
+#S8+DJ:Km-&-r79
+BDFChar: 4 11105 6 1 4 -1 7
+J:N1>!0GR3O8o7\
+BDFChar: 5 11104 7 0 5 -2 7
+^rY<PaN2`d^q]pM
+BDFChar: 6 11106 4 1 5 -1 6
+G^u0KJ=)F+
+BDFChar: 7 11107 4 0 5 -1 6
+p]QtGOH>Q3
+BDFChar: 8 11108 5 0 5 0 6
+0M"b4bku\c
+EndBitmapFont
+BitmapFont: 12 10 10 2 1 
+BDFChar: 0 11136 7 0 6 -2 11
+!!%Pbi:-O>r:od>^jlCb
+BDFChar: 1 11137 7 0 6 -3 11
+!!%O7+:ne]":,P]5_&h7
+BDFChar: 2 11138 7 0 6 -2 11
+!!!-1*'AWHr-UUH$j6P1
+BDFChar: 3 11139 7 0 6 -2 11
+!!!--&0O5gJ3Y4g#Qt,-
+BDFChar: 4 11105 7 0 5 0 8
+J:N1>!$jBP,QIfE
+BDFChar: 5 11104 8 0 8 -3 11
+z^];.Ma8juqa8j9]a8jQehuLOm^];.Mz
+BDFChar: 6 11106 5 1 6 0 8
+!-j$]R"1Qc?iU0,
+BDFChar: 7 11107 5 0 5 0 7
+p]QtGOH>Q3
+BDFChar: 8 11108 7 0 5 0 8
+0M"`*r63C_GQ7^D
+EndBitmapFont
+EndSplineFont
diff --git a/vim-plugins/bundle/vim-powerline/fontpatcher/README.rst b/vim-plugins/bundle/vim-powerline/fontpatcher/README.rst
new file mode 100644
index 0000000..35b3d5d
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/fontpatcher/README.rst
@@ -0,0 +1,164 @@
+======================
+Powerline font patcher
+======================
+
+:Author: Kim Silkebækken (kim.silkebaekken+vim@gmail.com)
+
+Description
+-----------
+
+This font patcher creates dividers and symbols for use with Powerline. The 
+script requires Python 2 and FontForge compiled with Python bindings.
+
+Patched fonts are renamed by default (" for Powerline" is added to the font 
+name) so they don't conflict with existing fonts. Use the ``--no-rename`` 
+option to disable font renaming.
+
+Glyph table
+-----------
+
+All the glyphs are stored in the ``U+2B60``-``U+2BFF`` range ("Misc symbols 
+and arrows").
+
++------------+-------------------+
+| Code point | Description       |
++============+===================+
+| ``U+2B60`` | Branch symbol     |
++------------+-------------------+
+| ``U+2B61`` | LN (line) symbol  |
++------------+-------------------+
+| ``U+2B62`` | FT symbol, part 1 |
++------------+-------------------+
+| ``U+2B63`` | FT symbol, part 2 |
++------------+-------------------+
+| ``U+2B64`` | Padlock (closed)  |
++------------+-------------------+
+| ``U+2B80`` | Hard right arrow  |
++------------+-------------------+
+| ``U+2B81`` | Soft right arrow  |
++------------+-------------------+
+| ``U+2B82`` | Hard left arrow   |
++------------+-------------------+
+| ``U+2B83`` | Soft left arrow   |
++------------+-------------------+
+
+===================
+Font patching guide
+===================
+
+There's a `GitHub wiki page`_ dedicated to community-contributed patched 
+fonts. You may download one of the fonts on that page if you don't want to 
+patch the fonts yourself.
+
+If you do patch a font that's not included in the wiki (and you have 
+permission to distribute it), please include it on the wiki page.
+
+**Note:** The fonts in the wiki may be outdated, and may have different 
+glyphs than the ones provided in the latest version of Powerline. It's 
+recommended that you always patch your fonts yourself if you have the 
+required software.
+
+.. _`GitHub wiki page`: https://github.com/Lokaltog/vim-powerline/wiki/Patched-fonts
+
+Linux
+-----
+
+1. Install fontforge with Python bindings. For Ubuntu users the required 
+   package is ``python-fontforge``, for Arch Linux users the required 
+   package is ``fontforge``. It should be something similar for other 
+   distros.
+
+2. Run the font patcher::
+
+       $ /path/to/fontpatcher MyFontFile.ttf
+
+3. Copy the font file into ``~/.fonts`` (or another X font directory)::
+
+       $ cp MyFontFile-Powerline.otf ~/.fonts
+
+   **Note:** If the font is a pure bitmap font (e.g. a PCF font) it will be 
+   stored in the BDF format. This is usually not a problem, and you may 
+   convert the font back to the PCF format using ``bdftopcf`` if you want 
+   to. All other fonts will be stored in the OTF format regardless of the 
+   original format.
+
+4. Update your font cache::
+
+       $ sudo fc-cache -vf
+
+   **Note:** If you use vim in rxvt-unicode in the client/daemon mode, you 
+   may need to close all running terminals as well for the font to be 
+   updated.
+
+5. **For gvim users:** Update the GUI font in your ``vimrc`` file::
+
+       set guifont=MyFont\ for\ Powerline
+
+   **For terminal users:** Update your terminal configuration to use the 
+   patched font.
+
+6. Update your ``vimrc`` configuration to use the new symbols::
+
+       let g:Powerline_symbols = 'fancy'
+
+7. Make sure that the cache file is deleted::
+
+       $ rm /tmp/Powerline.cache
+
+8. Start vim and enjoy your new statusline!
+
+OS X
+----
+
+1. Check if you have a FontForge version with Python support by running 
+   ``fontforge -version``. You should see something like this::
+
+       $ fontforge -version
+       Copyright (c) 2000-2011 by George Williams.
+       Executable based on sources from 13:48 GMT 22-Feb-2011-D.
+       Library based on sources from 13:48 GMT 22-Feb-2011.
+       fontforge 20110222
+       libfontforge 20110222
+
+   Make sure that the executable version number doesn't have ``NoPython`` in 
+   it. If everything looks OK, skip ahead to step 4.
+
+2. If you have FontForge but with ``NoPython`` in the version number, please 
+   try to update to a later version::
+
+       $ brew uninstall fontforge
+       $ brew update
+       $ brew install --use-gcc fontforge
+
+   **Note:** You may have to use ``--use-clang`` instead of ``--use-gcc`` 
+   when compiling FontForge.
+
+3. If you don't have FontForge, install it with Homebrew::
+
+       $ brew update
+       $ brew install --use-gcc fontforge
+
+4. Patch your fonts by passing the ``fontpatcher`` script as a parameter to 
+   FontForge::
+
+       $ fontforge -script /path/to/fontpatcher MyFontFile.ttf
+
+5. Install the font by double-clicking the font file in Finder and click 
+   "Install this font" from the preview window.
+
+6. **For gvim users:** Update the GUI font in your ``vimrc`` file::
+
+       set guifont=MyFont\ for\ Powerline
+
+   **For terminal users:** Update your terminal configuration to use the 
+   patched font.
+
+7. Update your ``vimrc`` configuration to use the new symbols::
+
+       let g:Powerline_symbols = 'fancy'
+
+8. Make sure that the cache file is deleted::
+
+       $ rm /tmp/Powerline.cache
+
+9. Start vim and enjoy your new statusline!
diff --git a/vim-plugins/bundle/vim-powerline/fontpatcher/fontpatcher b/vim-plugins/bundle/vim-powerline/fontpatcher/fontpatcher
new file mode 100755
index 0000000..2c54a3f
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/fontpatcher/fontpatcher
@@ -0,0 +1,240 @@
+#!/usr/bin/env python
+
+"""Font patcher for Powerline.
+
+Creates dividers and symbols for use with Powerline. Requires FontForge with Python bindings.
+
+Stores glyphs in the 2b60-2bff Unicode range ("Misc symbols and arrows").
+
+[2b60] Branch symbol
+[2b61] LN (line) symbol
+[2b62] FT symbol 1
+[2b63] FT symbol 2
+[2b64] Padlock (closed) symbol
+[2b80] Hard right arrow
+[2b81] Soft right arrow
+[2b82] Hard left arrow
+[2b83] Soft left arrow
+"""
+
+from __future__ import division
+
+import argparse
+import os
+import sys
+import re
+
+try:
+	import fontforge
+	import psMat
+except ImportError:
+	sys.stderr.write('The required FontForge modules could not be loaded.\n\n')
+
+	if sys.version_info.major > 2:
+		sys.stderr.write('FontForge only supports Python 2. Please run this script with the Python 2 executable - e.g. "python2 {0}"\n'.format(sys.argv[0]))
+	else:
+		sys.stderr.write('You need FontForge with Python bindings for this script to work.\n')
+
+	sys.exit(1)
+
+# Handle command-line arguments
+parser = argparse.ArgumentParser(description='Font patcher for Powerline. Creates dividers and symbols in FontForge-compatible font files. Requires FontForge with Python bindings. Stores glyphs in the U+2B80-U+2BFF range ("Miscellaneous symbols and arrows"). Stores the patched font as a new, renamed font file by default.')
+
+parser.add_argument('fonts', help='font file to patch', metavar='font', nargs='+')
+parser.add_argument('--no-rename', help='don\'t add " for Powerline" to the font name', default=True, action='store_false', dest='rename')
+parser.add_argument('--symbol-font', help='font file with symbols', metavar='font', dest='symbol_font', default='{0}/PowerlineSymbols.sfd'.format(sys.path[0]))
+parser.add_argument('--fix-mono', help='fixes some mono-fonts which have glyphs of 0 widths', default=False, action='store_true', dest='fixmono')
+parser.add_argument('--fix-win', help='modifies font names such that Windows correctly recognizes font families', default=False, action='store_true', dest='fixwin')
+
+args = parser.parse_args()
+
+SYM_ATTR = {
+	# Right/left-aligned glyphs will have their advance width reduced in order to overlap the next glyph slightly
+	0x2b60: { 'align': 'c', 'stretch': 'y' , 'overlap': False },
+	0x2b61: { 'align': 'c', 'stretch': ''  , 'overlap': False },
+	0x2b62: { 'align': 'r', 'stretch': ''  , 'overlap': False },
+	0x2b63: { 'align': 'l', 'stretch': ''  , 'overlap': False },
+	0x2b64: { 'align': 'c', 'stretch': ''  , 'overlap': False },
+	0x2b80: { 'align': 'l', 'stretch': 'xy', 'overlap': True  },
+	0x2b81: { 'align': 'l', 'stretch': 'xy', 'overlap': True  },
+	0x2b82: { 'align': 'r', 'stretch': 'xy', 'overlap': True  },
+	0x2b83: { 'align': 'r', 'stretch': 'xy', 'overlap': True  },
+}
+
+# Open symbol font
+try:
+	symbols = fontforge.open(args.symbol_font)
+except EnvironmentError:
+	sys.exit(1)
+
+# Patch provided fonts
+for font_path in args.fonts:
+	try:
+		font = fontforge.open(font_path)
+	except EnvironmentError:
+		sys.exit(1)
+
+	# Rename font
+	if args.rename:
+		font.familyname += ' for Powerline'
+		font.fullname += ' for Powerline'
+		font.fontname += 'ForPowerline'
+		font.appendSFNTName('English (US)', 'Preferred Family', font.familyname)
+		font.appendSFNTName('English (US)', 'Compatible Full', font.fullname)
+	if args.fixwin:
+		font.fontname = re.sub(r'\W', '', font.familyname)
+
+	# Force the em size to be equal
+	symbols.em = font.em
+
+	# Initial font dimensions
+	font_dim = {
+		'xmin'  :    0,
+		'ymin'  :    -font.descent,
+		'xmax'  :    0,
+		'ymax'  :    font.ascent,
+
+		'width' :    0,
+		'height':    0,
+	}
+
+	# Find the biggest char width and height
+	#
+	# 0x00-0x17f is the Latin Extended-A range
+	# 0x2500-0x2600 is the box drawing range
+	for glyph in range(0x00, 0x17f) + range(0x2500, 0x2600):
+		try:
+			(xmin, ymin, xmax, ymax) = font[glyph].boundingBox()
+		except TypeError:
+			continue
+
+		if font_dim['width'] == 0:
+			font_dim['width'] = font[glyph].width
+
+		if ymin < font_dim['ymin']: font_dim['ymin'] = ymin
+		if ymax > font_dim['ymax']: font_dim['ymax'] = ymax
+		if xmax > font_dim['xmax']: font_dim['xmax'] = xmax
+
+	# Calculate font height
+	font_dim['height'] = abs(font_dim['ymin']) + font_dim['ymax']
+
+	# Update the font encoding to ensure that the Unicode glyphs are available
+	font.encoding = 'ISO10646'
+
+	# Fetch this property before adding outlines
+	onlybitmaps = font.onlybitmaps
+
+	def get_dim(glyph):
+		bbox = glyph.boundingBox()
+
+		return  {
+			'xmin'  : bbox[0],
+			'ymin'  : bbox[1],
+			'xmax'  : bbox[2],
+			'ymax'  : bbox[3],
+
+			'width' : bbox[2] + (-bbox[0]),
+			'height': bbox[3] + (-bbox[1]),
+		}
+
+	# Create glyphs from symbol font
+	for sym_glyph in symbols.glyphs():
+		sym_attr = SYM_ATTR[sym_glyph.unicode]
+
+		# Prepare symbol glyph dimensions
+		sym_dim = get_dim(sym_glyph)
+
+		# Select and copy symbol from its encoding point
+		symbols.selection.select(sym_glyph.encoding)
+		symbols.copy()
+
+		# Select and paste symbol to its unicode code point
+		font.selection.select(sym_glyph.unicode)
+		font.paste()
+
+		# Now that we have copy/pasted the glyph, it's time to scale and move it
+
+		# Handle glyph stretching
+		if 'x' in sym_attr['stretch']:
+			# Stretch the glyph horizontally
+			scale_ratio = font_dim['width'] / sym_dim['width']
+
+			font.transform(psMat.scale(scale_ratio, 1))
+		if 'y' in sym_attr['stretch']:
+			# Stretch the glyph vertically
+			scale_ratio = font_dim['height'] / sym_dim['height']
+
+			font.transform(psMat.scale(1, scale_ratio))
+
+		# Use the dimensions from the pasted and stretched glyph
+		sym_dim = get_dim(font[sym_glyph.unicode])
+
+		# Center-align the glyph vertically
+		font_ycenter = font_dim['height'] / 2
+		sym_ycenter  = sym_dim['height'] / 2
+
+		# First move it to the ymax (top)
+		font.transform(psMat.translate(0, font_dim['ymax'] - sym_dim['ymax']))
+
+		# Then move it the y center difference
+		font.transform(psMat.translate(0, sym_ycenter - font_ycenter))
+
+		# Ensure that the glyph doesn't extend outside the font's bounding box
+		if sym_dim['width'] > font_dim['width']:
+			# The glyph is too wide, scale it down to fit
+			scale_matrix = psMat.scale(font_dim['width'] / sym_dim['width'], 1)
+
+			font.transform(scale_matrix)
+
+			# Use the dimensions from the stretched glyph
+			sym_dim = get_dim(font[sym_glyph.unicode])
+
+		# Handle glyph alignment
+		if sym_attr['align'] == 'c':
+			# Center align
+			align_matrix = psMat.translate(font_dim['width'] / 2 - sym_dim['width'] / 2 , 0)
+		elif sym_attr['align'] == 'r':
+			# Right align
+			align_matrix = psMat.translate(font_dim['width'] - sym_dim['width'], 0)
+		else:
+			# No alignment (left alignment)
+			align_matrix = psMat.translate(0, 0)
+
+		font.transform(align_matrix)
+
+		if sym_attr['overlap'] is True:
+			overlap_width = font.em / 48
+
+			# Stretch the glyph slightly horizontally if it should overlap
+			font.transform(psMat.scale((sym_dim['width'] + overlap_width) / sym_dim['width'], 1))
+
+			if sym_attr['align'] == 'l':
+				# The glyph should be left-aligned, so it must be moved overlap_width to the left
+				# This only applies to left-aligned glyphs because the glyph is scaled to the right
+				font.transform(psMat.translate(-overlap_width, 0))
+
+		# Ensure the font is considered monospaced on Windows
+		font[sym_glyph.unicode].width = font_dim['width']
+
+	if font.bitmapSizes and not onlybitmaps:
+		# If this is an outline font with bitmaps, regenerate bitmaps for the changed glyphs
+		font.selection.changed()
+
+		for size in font.bitmapSizes:
+			font.regenBitmaps((size, ))
+
+	output_name, extension = os.path.split(font_path)[1].rsplit('.', 1)
+	if extension.lower() not in ['ttf', 'otf']:
+		# Default to OpenType if input is not TrueType/OpenType
+		extension = 'otf'
+	if args.fixmono:
+		for glyph in font.glyphs():
+			if glyph.width == 0: glyph.width = font_dim['width']
+
+	if onlybitmaps:
+		# Generate BDF font
+		font.generate('{0}-Powerline.bdf'.format(output_name, bitmap_type='bdf'))
+	else:
+		# Generate OTF/TTF font
+		font.generate('{0}-Powerline.{1}'.format(output_name, extension))
+
diff --git a/vim-plugins/bundle/vim-powerline/plugin/Powerline.vim b/vim-plugins/bundle/vim-powerline/plugin/Powerline.vim
new file mode 100644
index 0000000..e715677
--- /dev/null
+++ b/vim-plugins/bundle/vim-powerline/plugin/Powerline.vim
@@ -0,0 +1,78 @@
+" Powerline - The ultimate statusline utility
+"
+" Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
+" Source repository: https://github.com/Lokaltog/vim-powerline
+
+" Script initialization {{{
+	if exists('g:Powerline_loaded') || &compatible || version < 702
+		finish
+	endif
+
+	let g:Powerline_loaded = 1
+" }}}
+" Commands {{{
+	command! PowerlineClearCache call Pl#ClearCache()
+	command! PowerlineReloadColorscheme call Pl#ReloadColorscheme()
+" }}}
+" Set default options {{{
+	for [s:key, s:value] in items({
+		\   'theme'            : 'default'
+		\ , 'colorscheme'      : 'default'
+		\ , 'symbols'          : 'compatible'
+		\ , 'symbols_override' : {}
+		\ , 'dividers_override': []
+		\ , 'stl_path_style'   : 'relative'
+		\ , 'cache_enabled'    : 1
+		\ })
+
+		if ! exists('g:Powerline_' . s:key)
+			exec printf('let g:Powerline_%s = %s', s:key, string(s:value))
+		endif
+
+		unlet! s:key s:value
+	endfor
+
+	if ! exists('g:Powerline_cache_dir')
+		let g:Powerline_cache_dir = simplify(expand('<sfile>:p:h') .'/..')
+	endif
+
+	if ! exists('g:Powerline_cache_file')
+		exec 'let g:Powerline_cache_file = '. string(printf('%s/Powerline_%s_%s_%s.cache'
+			\ , g:Powerline_cache_dir
+			\ , g:Powerline_theme
+			\ , g:Powerline_colorscheme
+			\ , g:Powerline_symbols
+			\ ))
+	endif
+" }}}
+" Autocommands {{{
+	function! s:Startup()
+		augroup PowerlineMain
+			autocmd!
+
+			" Reload statuslines when changing color scheme
+			autocmd ColorScheme *
+				\ call Pl#Load()
+
+			autocmd BufEnter,WinEnter,FileType,BufUnload,CmdWinEnter *
+				\ call Pl#UpdateStatusline(1)
+
+			autocmd BufLeave,WinLeave,CmdWinLeave *
+				\ call Pl#UpdateStatusline(0)
+
+			autocmd BufWritePost */autoload/Powerline/Colorschemes/*.vim
+				\ :PowerlineReloadColorscheme
+		augroup END
+
+		let curwindow = winnr()
+		for window in range(1, winnr('$'))
+			call Pl#UpdateStatusline(window == curwindow, window)
+		endfor
+	endfunction
+
+	augroup PowerlineStartup
+		autocmd!
+
+		autocmd VimEnter * call s:Startup()
+	augroup END
+" }}}
diff --git a/vim-plugins/bundle/vim-surround/README.markdown b/vim-plugins/bundle/vim-surround/README.markdown
new file mode 100644
index 0000000..fef61a8
--- /dev/null
+++ b/vim-plugins/bundle/vim-surround/README.markdown
@@ -0,0 +1,97 @@
+surround.vim
+============
+
+Surround.vim is all about "surroundings": parentheses, brackets, quotes,
+XML tags, and more.  The plugin provides mappings to easily delete,
+change and add such surroundings in pairs.
+
+It's easiest to explain with examples.  Press `cs"'` inside
+
+    "Hello world!"
+
+to change it to
+
+    'Hello world!'
+
+Now press `cs'<q>` to change it to
+
+    <q>Hello world!</q>
+
+To go full circle, press `cst"` to get
+
+    "Hello world!"
+
+To remove the delimiters entirely, press `ds"`.
+
+    Hello world!
+
+Now with the cursor on "Hello", press `ysiw]` (`iw` is a text object).
+
+    [Hello] world!
+
+Let's make that braces and add some space (use `}` instead of `{` for no
+space): `cs]{`
+
+    { Hello } world!
+
+Now wrap the entire line in parentheses with `yssb` or `yss)`.
+
+    ({ Hello } world!)
+
+Revert to the original text: `ds{ds)`
+
+    Hello world!
+
+Emphasize hello: `ysiw<em>`
+
+    <em>Hello</em> world!
+
+Finally, let's try out visual mode. Press a capital V (for linewise
+visual mode) followed by `S<p class="important">`.
+
+    <p class="important">
+      <em>Hello</em> world!
+    </p>
+
+This plugin is very powerful for HTML and XML editing, a niche which
+currently seems underfilled in Vim land.  (As opposed to HTML/XML
+*inserting*, for which many plugins are available).  Adding, changing,
+and removing pairs of tags simultaneously is a breeze.
+
+The `.` command will work with `ds`, `cs`, and `yss` if you install
+[repeat.vim](https://github.com/tpope/vim-repeat).
+
+Installation
+------------
+
+If you don't have a preferred installation method, I recommend
+installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and
+then simply copy and paste:
+
+    cd ~/.vim/bundle
+    git clone git://github.com/tpope/vim-surround.git
+
+Once help tags have been generated, you can view the manual with
+`:help surround`.
+
+Contributing
+------------
+
+See the contribution guidelines for
+[pathogen.vim](https://github.com/tpope/vim-pathogen#readme).
+
+Self-Promotion
+--------------
+
+Like surround.vim? Follow the repository on
+[GitHub](https://github.com/tpope/vim-surround) and vote for it on
+[vim.org](http://www.vim.org/scripts/script.php?script_id=1697).  And if
+you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
+[Twitter](http://twitter.com/tpope) and
+[GitHub](https://github.com/tpope).
+
+License
+-------
+
+Copyright (c) Tim Pope.  Distributed under the same terms as Vim itself.
+See `:help license`.
diff --git a/vim-plugins/bundle/vim-surround/doc/surround.txt b/vim-plugins/bundle/vim-surround/doc/surround.txt
new file mode 100644
index 0000000..674b6a9
--- /dev/null
+++ b/vim-plugins/bundle/vim-surround/doc/surround.txt
@@ -0,0 +1,207 @@
+*surround.txt*  Plugin for deleting, changing, and adding "surroundings"
+
+Author:  Tim Pope <http://tpo.pe/>
+License: Same terms as Vim itself (see |license|)
+
+This plugin is only available if 'compatible' is not set.
+
+INTRODUCTION                                    *surround*
+
+This plugin is a tool for dealing with pairs of "surroundings."  Examples
+of surroundings include parentheses, quotes, and HTML tags.  They are
+closely related to what Vim refers to as |text-objects|.  Provided
+are mappings to allow for removing, changing, and adding surroundings.
+
+Details follow on the exact semantics, but first, consider the following
+examples.  An asterisk (*) is used to denote the cursor position.
+
+  Old text                  Command     New text ~
+  "Hello *world!"           ds"         Hello world!
+  [123+4*56]/2              cs])        (123+456)/2
+  "Look ma, I'm *HTML!"     cs"<q>      <q>Look ma, I'm HTML!</q>
+  if *x>3 {                 ysW(        if ( x>3 ) {
+  my $str = *whee!;         vllllS'     my $str = 'whee!';
+
+While a few features of this plugin will work in older versions of Vim,
+Vim 7 is recommended for full functionality.
+
+MAPPINGS                                        *surround-mappings*
+
+Delete surroundings is *ds* .  The next character given determines the target
+to delete.  The exact nature of the target is explained in |surround-targets|
+but essentially it is the last character of a |text-object|.  This mapping
+deletes the difference between the "i"nner object and "a"n object.  This is
+easiest to understand with some examples:
+
+  Old text                  Command     New text ~
+  "Hello *world!"           ds"         Hello world!
+  (123+4*56)/2              ds)         123+456/2
+  <div>Yo!*</div>           dst         Yo!
+
+Change surroundings is *cs* .  It takes two arguments, a target like with
+|ds|, and a replacement.  *cS* changes surroundings, placing the surrounded
+text on its own line(s) like |yS|.  Details about the second argument can be
+found below in |surround-replacements|.  Once again, examples are in order.
+
+  Old text                  Command     New text ~
+  "Hello *world!"           cs"'        'Hello world!'
+  "Hello *world!"           cs"<q>      <q>Hello world!</q>
+  (123+4*56)/2              cs)]        [123+456]/2
+  (123+4*56)/2              cs)[        [ 123+456 ]/2
+  <div>Yo!*</div>           cst<p>      <p>Yo!</p>
+
+*ys* takes a valid Vim motion or text object as the first object, and wraps
+it using the second argument as with |cs|.  (It's a stretch, but a good
+mnemonic for "ys" is "you surround".)
+
+  Old text                  Command     New text ~
+  Hello w*orld!             ysiw)       Hello (world)!
+
+As a special case, *yss* operates on the current line, ignoring leading
+whitespace.
+
+  Old text                  Command     New text ~
+      Hello w*orld!         yssB            {Hello world!}
+
+There is also *yS* and *ySS* which indent the surrounded text and place it
+on a line of its own.
+
+In visual mode, a simple "S" with an argument wraps the selection.  This is
+referred to as the *vS* mapping, although ordinarily there will be
+additional keystrokes between the v and S.  In linewise visual mode, the
+surroundings are placed on separate lines and indented.  In blockwise visual
+mode, each line is surrounded.
+
+A "gS" in visual mode, known as *vgS* , behaves similarly.  In linewise visual
+mode, the automatic indenting is suppressed.  In blockwise visual mode, this
+enables surrounding past the end of the line with 'virtualedit' set (there
+seems to be no way in Vim Script to differentiate between a jagged end of line
+selection and a virtual block selected past the end of the line, so two maps
+were needed).
+
+                                                *i_CTRL-G_s* *i_CTRL-G_S*
+Finally, there is an experimental insert mode mapping on <C-G>s and <C-S>.
+Beware that the latter won't work on terminals with flow control (if you
+accidentally freeze your terminal, use <C-Q> to unfreeze it).  The mapping
+inserts the specified surroundings and puts the cursor between them.  If,
+immediately after the mapping and before the replacement, a second <C-S> or
+carriage return is pressed, the prefix, cursor, and suffix will be placed on
+three separate lines.  <C-G>S (not <C-G>s) also exhibits this behavior.
+
+TARGETS                                         *surround-targets*
+
+The |ds| and |cs| commands both take a target as their first argument.  The
+possible targets are based closely on the |text-objects| provided by Vim.
+All targets are currently just one character.
+
+Eight punctuation marks, (, ), {, }, [, ], <, and >, represent themselves
+and their counterparts.  If the opening mark is used, contained whitespace is
+also trimmed.  The targets b, B, r, and a are aliases for ), }, ], and > 
+(the first two mirror Vim; the second two are completely arbitrary and
+subject to change).
+
+Three quote marks, ', ", `, represent themselves, in pairs.  They are only
+searched for on the current line.
+
+A t is a pair of HTML or XML tags.  See |tag-blocks| for details.  Remember
+that you can specify a numerical argument if you want to get to a tag other
+than the innermost one.
+
+The letters w, W, and s correspond to a |word|, a |WORD|, and a |sentence|,
+respectively.  These are special in that they have nothing to delete, and
+used with |ds| they are a no-op.  With |cs|, one could consider them a
+slight shortcut for ysi (cswb == ysiwb, more or less).
+
+A p represents a |paragraph|.  This behaves similarly to w, W, and s above;
+however, newlines are sometimes added and/or removed.
+
+REPLACEMENTS                                    *surround-replacements*
+
+A replacement argument is a single character, and is required by |cs|, |ys|,
+and |vS|.  Undefined replacement characters (with the exception of alphabetic
+characters) default to placing themselves at the beginning and end of the
+destination, which can be useful for characters like / and |.
+
+If either ), }, ], or > is used, the text is wrapped in the appropriate pair
+of characters.  Similar behavior can be found with (, {, and [ (but not <),
+which append an additional space to the inside.  Like with the targets above,
+b, B, r, and a are aliases for ), }, ], and >.  To fulfill the common need for
+code blocks in C-style languages, <C-}> (which is really <C-]>) adds braces on
+lines separate from the content.
+
+If t or < is used, Vim prompts for an HTML/XML tag to insert.  You may specify
+attributes here and they will be stripped from the closing tag. If replacing a
+tag, its attributes are kept in the new tag. End your input with > to discard
+the those attributes. If <C-T> is used, the tags will appear on lines by
+themselves.
+
+If s is used, a leading but not trailing space is added.  This is useful for
+removing parentheses from a function call with csbs.
+
+CUSTOMIZING                                     *surround-customizing*
+
+The following adds a potential replacement on "-" (ASCII 45) in PHP files.
+(To determine the ASCII code to use, :echo char2nr("-")).  The carriage
+return will be replaced by the original text.
+>
+  autocmd FileType php let b:surround_45 = "<?php \r ?>"
+<
+This can be used in a PHP file as in the following example.
+
+  Old text                  Command     New text ~
+  print "Hello *world!"     yss-        <?php print "Hello world!" ?>
+
+Additionally, one can use a global variable for globally available
+replacements.
+>
+  let g:surround_45 = "<% \r %>"
+  let g:surround_61 = "<%= \r %>"
+<
+Advanced, experimental, and subject to change:  One can also prompt for
+replacement text.  The syntax for this is to surround the replacement in pairs
+of low numbered control characters.  If this sounds confusing, that's because
+it is (but it makes the parsing easy).  Consider the following example for a
+LaTeX environment on the "l" replacement.
+>
+  let g:surround_108 = "\\begin{\1environment: \1}\r\\end{\1\1}"
+<
+When this replacement is used,  the user is prompted with an "environment: "
+prompt for input.  This input is inserted between each set of \1's.
+Additional inputs up to \7 can be used.
+
+Furthermore, one can specify a regular expression substitution to apply.
+>
+  let g:surround_108 = "\\begin{\1environment: \1}\r\\end{\1\r}.*\r\1}"
+<
+This will remove anything after the first } in the input when the text is
+placed within the \end{} slot.  The first \r marks where the pattern begins,
+and the second where the replacement text begins.
+
+Here's a second example for creating an HTML <div>.  The substitution cleverly
+prompts for an id, but only adds id="" if it is non-blank.  You may have to
+read this one a few times slowly before you understand it.
+>
+  let g:surround_{char2nr("d")} = "<div\1id: \r..*\r id=\"&\"\1>\r</div>"
+<
+Inputting text replacements is a proof of concept at this point. The ugly,
+unintuitive interface and the brevity of the documentation reflect this.
+
+Finally, It is possible to always append a string to surroundings in insert
+mode (and only insert mode).  This is useful with certain plugins and mappings
+that allow you to jump to such markings.
+>
+  let g:surround_insert_tail = "<++>"
+<
+ISSUES                                          *surround-issues*
+
+Vim could potentially get confused when deleting/changing occurs at the very
+end of the line.  Please report any repeatable instances of this.
+
+Do we need to use |inputsave()|/|inputrestore()| with the tag replacement?
+
+Indenting is handled haphazardly.  Need to decide the most appropriate
+behavior and implement it.  Right now one can do :let b:surround_indent = 1
+(or the global equivalent) to enable automatic re-indenting by Vim via |=|;
+should this be the default?
+
+ vim:tw=78:ts=8:ft=help:norl:
diff --git a/vim-plugins/bundle/vim-surround/doc/tags b/vim-plugins/bundle/vim-surround/doc/tags
new file mode 100644
index 0000000..6935d68
--- /dev/null
+++ b/vim-plugins/bundle/vim-surround/doc/tags
@@ -0,0 +1,18 @@
+cS	surround.txt	/*cS*
+cs	surround.txt	/*cs*
+ds	surround.txt	/*ds*
+i_CTRL-G_S	surround.txt	/*i_CTRL-G_S*
+i_CTRL-G_s	surround.txt	/*i_CTRL-G_s*
+surround	surround.txt	/*surround*
+surround-customizing	surround.txt	/*surround-customizing*
+surround-issues	surround.txt	/*surround-issues*
+surround-mappings	surround.txt	/*surround-mappings*
+surround-replacements	surround.txt	/*surround-replacements*
+surround-targets	surround.txt	/*surround-targets*
+surround.txt	surround.txt	/*surround.txt*
+vS	surround.txt	/*vS*
+vgS	surround.txt	/*vgS*
+yS	surround.txt	/*yS*
+ySS	surround.txt	/*ySS*
+ys	surround.txt	/*ys*
+yss	surround.txt	/*yss*
diff --git a/vim-plugins/bundle/vim-surround/plugin/surround.vim b/vim-plugins/bundle/vim-surround/plugin/surround.vim
new file mode 100644
index 0000000..46f3252
--- /dev/null
+++ b/vim-plugins/bundle/vim-surround/plugin/surround.vim
@@ -0,0 +1,598 @@
+" surround.vim - Surroundings
+" Author:       Tim Pope <http://tpo.pe/>
+" Version:      2.1
+" GetLatestVimScripts: 1697 1 :AutoInstall: surround.vim
+
+if exists("g:loaded_surround") || &cp || v:version < 700
+  finish
+endif
+let g:loaded_surround = 1
+
+" Input functions {{{1
+
+function! s:getchar()
+  let c = getchar()
+  if c =~ '^\d\+$'
+    let c = nr2char(c)
+  endif
+  return c
+endfunction
+
+function! s:inputtarget()
+  let c = s:getchar()
+  while c =~ '^\d\+$'
+    let c .= s:getchar()
+  endwhile
+  if c == " "
+    let c .= s:getchar()
+  endif
+  if c =~ "\<Esc>\|\<C-C>\|\0"
+    return ""
+  else
+    return c
+  endif
+endfunction
+
+function! s:inputreplacement()
+  let c = s:getchar()
+  if c == " "
+    let c .= s:getchar()
+  endif
+  if c =~ "\<Esc>" || c =~ "\<C-C>"
+    return ""
+  else
+    return c
+  endif
+endfunction
+
+function! s:beep()
+  exe "norm! \<Esc>"
+  return ""
+endfunction
+
+function! s:redraw()
+  redraw
+  return ""
+endfunction
+
+" }}}1
+
+" Wrapping functions {{{1
+
+function! s:extractbefore(str)
+  if a:str =~ '\r'
+    return matchstr(a:str,'.*\ze\r')
+  else
+    return matchstr(a:str,'.*\ze\n')
+  endif
+endfunction
+
+function! s:extractafter(str)
+  if a:str =~ '\r'
+    return matchstr(a:str,'\r\zs.*')
+  else
+    return matchstr(a:str,'\n\zs.*')
+  endif
+endfunction
+
+function! s:fixindent(str,spc)
+  let str = substitute(a:str,'\t',repeat(' ',&sw),'g')
+  let spc = substitute(a:spc,'\t',repeat(' ',&sw),'g')
+  let str = substitute(str,'\(\n\|\%^\).\@=','\1'.spc,'g')
+  if ! &et
+    let str = substitute(str,'\s\{'.&ts.'\}',"\t",'g')
+  endif
+  return str
+endfunction
+
+function! s:process(string)
+  let i = 0
+  for i in range(7)
+    let repl_{i} = ''
+    let m = matchstr(a:string,nr2char(i).'.\{-\}\ze'.nr2char(i))
+    if m != ''
+      let m = substitute(strpart(m,1),'\r.*','','')
+      let repl_{i} = input(match(m,'\w\+$') >= 0 ? m.': ' : m)
+    endif
+  endfor
+  let s = ""
+  let i = 0
+  while i < strlen(a:string)
+    let char = strpart(a:string,i,1)
+    if char2nr(char) < 8
+      let next = stridx(a:string,char,i+1)
+      if next == -1
+        let s .= char
+      else
+        let insertion = repl_{char2nr(char)}
+        let subs = strpart(a:string,i+1,next-i-1)
+        let subs = matchstr(subs,'\r.*')
+        while subs =~ '^\r.*\r'
+          let sub = matchstr(subs,"^\r\\zs[^\r]*\r[^\r]*")
+          let subs = strpart(subs,strlen(sub)+1)
+          let r = stridx(sub,"\r")
+          let insertion = substitute(insertion,strpart(sub,0,r),strpart(sub,r+1),'')
+        endwhile
+        let s .= insertion
+        let i = next
+      endif
+    else
+      let s .= char
+    endif
+    let i += 1
+  endwhile
+  return s
+endfunction
+
+function! s:wrap(string,char,type,removed,special)
+  let keeper = a:string
+  let newchar = a:char
+  let s:input = ""
+  let type = a:type
+  let linemode = type ==# 'V' ? 1 : 0
+  let before = ""
+  let after  = ""
+  if type ==# "V"
+    let initspaces = matchstr(keeper,'\%^\s*')
+  else
+    let initspaces = matchstr(getline('.'),'\%^\s*')
+  endif
+  let pairs = "b()B{}r[]a<>"
+  let extraspace = ""
+  if newchar =~ '^ '
+    let newchar = strpart(newchar,1)
+    let extraspace = ' '
+  endif
+  let idx = stridx(pairs,newchar)
+  if newchar == ' '
+    let before = ''
+    let after  = ''
+  elseif exists("b:surround_".char2nr(newchar))
+    let all    = s:process(b:surround_{char2nr(newchar)})
+    let before = s:extractbefore(all)
+    let after  =  s:extractafter(all)
+  elseif exists("g:surround_".char2nr(newchar))
+    let all    = s:process(g:surround_{char2nr(newchar)})
+    let before = s:extractbefore(all)
+    let after  =  s:extractafter(all)
+  elseif newchar ==# "p"
+    let before = "\n"
+    let after  = "\n\n"
+  elseif newchar ==# 's'
+    let before = ' '
+    let after  = ''
+  elseif newchar ==# ':'
+    let before = ':'
+    let after = ''
+  elseif newchar =~# "[tT\<C-T><]"
+    let dounmapp = 0
+    let dounmapb = 0
+    if !maparg(">","c")
+      let dounmapb = 1
+      " Hide from AsNeeded
+      exe "cn"."oremap > ><CR>"
+    endif
+    let default = ""
+    if newchar ==# "T"
+      if !exists("s:lastdel")
+        let s:lastdel = ""
+      endif
+      let default = matchstr(s:lastdel,'<\zs.\{-\}\ze>')
+    endif
+    let tag = input("<",default)
+    if dounmapb
+      silent! cunmap >
+    endif
+    let s:input = tag
+    if tag != ""
+      let keepAttributes = ( match(tag, ">$") == -1 )
+      let tag = substitute(tag,'>*$','','')
+      let attributes = ""
+      if keepAttributes
+        let attributes = matchstr(a:removed, '<[^ \t\n]\+\zs\_.\{-\}\ze>')
+      endif
+      let s:input = tag . '>'
+      if tag =~ '/$'
+        let tag = substitute(tag, '/$', '', '')
+        let before = '<'.tag.attributes.' />'
+        let after = ''
+      else
+        let before = '<'.tag.attributes.'>'
+        let after  = '</'.substitute(tag,' .*','','').'>'
+      endif
+      if newchar == "\<C-T>"
+        if type ==# "v" || type ==# "V"
+          let before .= "\n\t"
+        endif
+        if type ==# "v"
+          let after  = "\n". after
+        endif
+      endif
+    endif
+  elseif newchar ==# 'l' || newchar == '\'
+    " LaTeX
+    let env = input('\begin{')
+    if env != ""
+      let s:input = env."\<CR>"
+      let env = '{' . env
+      let env .= s:closematch(env)
+      echo '\begin'.env
+      let before = '\begin'.env
+      let after  = '\end'.matchstr(env,'[^}]*').'}'
+    endif
+  elseif newchar ==# 'f' || newchar ==# 'F'
+    let fnc = input('function: ')
+    if fnc != ""
+      let s:input = fnc."\<CR>"
+      let before = substitute(fnc,'($','','').'('
+      let after  = ')'
+      if newchar ==# 'F'
+        let before .= ' '
+        let after = ' ' . after
+      endif
+    endif
+  elseif newchar ==# "\<C-F>"
+    let fnc = input('function: ')
+    let s:input = fnc."\<CR>"
+    let before = '('.fnc.' '
+    let after = ')'
+  elseif idx >= 0
+    let spc = (idx % 3) == 1 ? " " : ""
+    let idx = idx / 3 * 3
+    let before = strpart(pairs,idx+1,1) . spc
+    let after  = spc . strpart(pairs,idx+2,1)
+  elseif newchar == "\<C-[>" || newchar == "\<C-]>"
+    let before = "{\n\t"
+    let after  = "\n}"
+  elseif newchar !~ '\a'
+    let before = newchar
+    let after  = newchar
+  else
+    let before = ''
+    let after  = ''
+  endif
+  let after  = substitute(after ,'\n','\n'.initspaces,'g')
+  if type ==# 'V' || (a:special && type ==# "v")
+    let before = substitute(before,' \+$','','')
+    let after  = substitute(after ,'^ \+','','')
+    if after !~ '^\n'
+      let after  = initspaces.after
+    endif
+    if keeper !~ '\n$' && after !~ '^\n'
+      let keeper .= "\n"
+    elseif keeper =~ '\n$' && after =~ '^\n'
+      let after = strpart(after,1)
+    endif
+    if before !~ '\n\s*$'
+      let before .= "\n"
+      if a:special
+        let before .= "\t"
+      endif
+    endif
+  endif
+  if type ==# 'V'
+    let before = initspaces.before
+  endif
+  if before =~ '\n\s*\%$'
+    if type ==# 'v'
+      let keeper = initspaces.keeper
+    endif
+    let padding = matchstr(before,'\n\zs\s\+\%$')
+    let before  = substitute(before,'\n\s\+\%$','\n','')
+    let keeper = s:fixindent(keeper,padding)
+  endif
+  if type ==# 'V'
+    let keeper = before.keeper.after
+  elseif type =~ "^\<C-V>"
+    " Really we should be iterating over the buffer
+    let repl = substitute(before,'[\\~]','\\&','g').'\1'.substitute(after,'[\\~]','\\&','g')
+    let repl = substitute(repl,'\n',' ','g')
+    let keeper = substitute(keeper."\n",'\(.\{-\}\)\(\n\)',repl.'\n','g')
+    let keeper = substitute(keeper,'\n\%$','','')
+  else
+    let keeper = before.extraspace.keeper.extraspace.after
+  endif
+  return keeper
+endfunction
+
+function! s:wrapreg(reg,char,removed,special)
+  let orig = getreg(a:reg)
+  let type = substitute(getregtype(a:reg),'\d\+$','','')
+  let new = s:wrap(orig,a:char,type,a:removed,a:special)
+  call setreg(a:reg,new,type)
+endfunction
+" }}}1
+
+function! s:insert(...) " {{{1
+  " Optional argument causes the result to appear on 3 lines, not 1
+  let linemode = a:0 ? a:1 : 0
+  let char = s:inputreplacement()
+  while char == "\<CR>" || char == "\<C-S>"
+    " TODO: use total count for additional blank lines
+    let linemode += 1
+    let char = s:inputreplacement()
+  endwhile
+  if char == ""
+    return ""
+  endif
+  let cb_save = &clipboard
+  set clipboard-=unnamed clipboard-=unnamedplus
+  let reg_save = @@
+  call setreg('"',"\r",'v')
+  call s:wrapreg('"',char,"",linemode)
+  " If line mode is used and the surrounding consists solely of a suffix,
+  " remove the initial newline.  This fits a use case of mine but is a
+  " little inconsistent.  Is there anyone that would prefer the simpler
+  " behavior of just inserting the newline?
+  if linemode && match(getreg('"'),'^\n\s*\zs.*') == 0
+    call setreg('"',matchstr(getreg('"'),'^\n\s*\zs.*'),getregtype('"'))
+  endif
+  " This can be used to append a placeholder to the end
+  if exists("g:surround_insert_tail")
+    call setreg('"',g:surround_insert_tail,"a".getregtype('"'))
+  endif
+  if col('.') >= col('$')
+    norm! ""p
+  else
+    norm! ""P
+  endif
+  if linemode
+    call s:reindent()
+  endif
+  norm! `]
+  call search('\r','bW')
+  let @@ = reg_save
+  let &clipboard = cb_save
+  return "\<Del>"
+endfunction " }}}1
+
+function! s:reindent() " {{{1
+  if exists("b:surround_indent") ? b:surround_indent : (!exists("g:surround_indent") || g:surround_indent)
+    silent norm! '[=']
+  endif
+endfunction " }}}1
+
+function! s:dosurround(...) " {{{1
+  let scount = v:count1
+  let char = (a:0 ? a:1 : s:inputtarget())
+  let spc = ""
+  if char =~ '^\d\+'
+    let scount = scount * matchstr(char,'^\d\+')
+    let char = substitute(char,'^\d\+','','')
+  endif
+  if char =~ '^ '
+    let char = strpart(char,1)
+    let spc = 1
+  endif
+  if char == 'a'
+    let char = '>'
+  endif
+  if char == 'r'
+    let char = ']'
+  endif
+  let newchar = ""
+  if a:0 > 1
+    let newchar = a:2
+    if newchar == "\<Esc>" || newchar == "\<C-C>" || newchar == ""
+      return s:beep()
+    endif
+  endif
+  let cb_save = &clipboard
+  set clipboard-=unnamed clipboard-=unnamedplus
+  let append = ""
+  let original = getreg('"')
+  let otype = getregtype('"')
+  call setreg('"',"")
+  let strcount = (scount == 1 ? "" : scount)
+  if char == '/'
+    exe 'norm! '.strcount.'[/d'.strcount.']/'
+  elseif char =~# '[[:punct:][:space:]]' && char !~# '[][(){}<>"''`]'
+    exe 'norm! T'.char
+    if getline('.')[col('.')-1] == char
+      exe 'norm! l'
+    endif
+    exe 'norm! dt'.char
+  else
+    exe 'norm! d'.strcount.'i'.char
+  endif
+  let keeper = getreg('"')
+  let okeeper = keeper " for reindent below
+  if keeper == ""
+    call setreg('"',original,otype)
+    let &clipboard = cb_save
+    return ""
+  endif
+  let oldline = getline('.')
+  let oldlnum = line('.')
+  if char ==# "p"
+    call setreg('"','','V')
+  elseif char ==# "s" || char ==# "w" || char ==# "W"
+    " Do nothing
+    call setreg('"','')
+  elseif char =~ "[\"'`]"
+    exe "norm! i \<Esc>d2i".char
+    call setreg('"',substitute(getreg('"'),' ','',''))
+  elseif char == '/'
+    norm! "_x
+    call setreg('"','/**/',"c")
+    let keeper = substitute(substitute(keeper,'^/\*\s\=','',''),'\s\=\*$','','')
+  elseif char =~# '[[:punct:][:space:]]' && char !~# '[][(){}<>]'
+    exe 'norm! F'.char
+    exe 'norm! df'.char
+  else
+    " One character backwards
+    call search('\m.', 'bW')
+    exe "norm! da".char
+  endif
+  let removed = getreg('"')
+  let rem2 = substitute(removed,'\n.*','','')
+  let oldhead = strpart(oldline,0,strlen(oldline)-strlen(rem2))
+  let oldtail = strpart(oldline,  strlen(oldline)-strlen(rem2))
+  let regtype = getregtype('"')
+  if char =~# '[\[({<T]' || spc
+    let keeper = substitute(keeper,'^\s\+','','')
+    let keeper = substitute(keeper,'\s\+$','','')
+  endif
+  if col("']") == col("$") && col('.') + 1 == col('$')
+    if oldhead =~# '^\s*$' && a:0 < 2
+      let keeper = substitute(keeper,'\%^\n'.oldhead.'\(\s*.\{-\}\)\n\s*\%$','\1','')
+    endif
+    let pcmd = "p"
+  else
+    let pcmd = "P"
+  endif
+  if line('.') + 1 < oldlnum && regtype ==# "V"
+    let pcmd = "p"
+  endif
+  call setreg('"',keeper,regtype)
+  if newchar != ""
+    let special = a:0 > 2 ? a:3 : 0
+    call s:wrapreg('"',newchar,removed,special)
+  endif
+  silent exe 'norm! ""'.pcmd.'`['
+  if removed =~ '\n' || okeeper =~ '\n' || getreg('"') =~ '\n'
+    call s:reindent()
+  endif
+  if getline('.') =~ '^\s\+$' && keeper =~ '^\s*\n'
+    silent norm! cc
+  endif
+  call setreg('"',original,otype)
+  let s:lastdel = removed
+  let &clipboard = cb_save
+  if newchar == ""
+    silent! call repeat#set("\<Plug>Dsurround".char,scount)
+  else
+    silent! call repeat#set("\<Plug>C".(a:0 > 2 && a:3 ? "S" : "s")."urround".char.newchar.s:input,scount)
+  endif
+endfunction " }}}1
+
+function! s:changesurround(...) " {{{1
+  let a = s:inputtarget()
+  if a == ""
+    return s:beep()
+  endif
+  let b = s:inputreplacement()
+  if b == ""
+    return s:beep()
+  endif
+  call s:dosurround(a,b,a:0 && a:1)
+endfunction " }}}1
+
+function! s:opfunc(type,...) " {{{1
+  let char = s:inputreplacement()
+  if char == ""
+    return s:beep()
+  endif
+  let reg = '"'
+  let sel_save = &selection
+  let &selection = "inclusive"
+  let cb_save  = &clipboard
+  set clipboard-=unnamed clipboard-=unnamedplus
+  let reg_save = getreg(reg)
+  let reg_type = getregtype(reg)
+  let type = a:type
+  if a:type == "char"
+    silent exe 'norm! v`[o`]"'.reg.'y'
+    let type = 'v'
+  elseif a:type == "line"
+    silent exe 'norm! `[V`]"'.reg.'y'
+    let type = 'V'
+  elseif a:type ==# "v" || a:type ==# "V" || a:type ==# "\<C-V>"
+    let &selection = sel_save
+    let ve = &virtualedit
+    if !(a:0 && a:1)
+      set virtualedit=
+    endif
+    silent exe 'norm! gv"'.reg.'y'
+    let &virtualedit = ve
+  elseif a:type =~ '^\d\+$'
+    let type = 'v'
+    silent exe 'norm! ^v'.a:type.'$h"'.reg.'y'
+    if mode() ==# 'v'
+      norm! v
+      return s:beep()
+    endif
+  else
+    let &selection = sel_save
+    let &clipboard = cb_save
+    return s:beep()
+  endif
+  let keeper = getreg(reg)
+  if type ==# "v" && a:type !=# "v"
+    let append = matchstr(keeper,'\_s\@<!\s*$')
+    let keeper = substitute(keeper,'\_s\@<!\s*$','','')
+  endif
+  call setreg(reg,keeper,type)
+  call s:wrapreg(reg,char,"",a:0 && a:1)
+  if type ==# "v" && a:type !=# "v" && append != ""
+    call setreg(reg,append,"ac")
+  endif
+  silent exe 'norm! gv'.(reg == '"' ? '' : '"' . reg).'p`['
+  if type ==# 'V' || (getreg(reg) =~ '\n' && type ==# 'v')
+    call s:reindent()
+  endif
+  call setreg(reg,reg_save,reg_type)
+  let &selection = sel_save
+  let &clipboard = cb_save
+  if a:type =~ '^\d\+$'
+    silent! call repeat#set("\<Plug>Y".(a:0 && a:1 ? "S" : "s")."surround".char.s:input,a:type)
+  else
+    silent! call repeat#set("\<Plug>SurroundRepeat".char.s:input)
+  endif
+endfunction
+
+function! s:opfunc2(arg)
+  call s:opfunc(a:arg,1)
+endfunction " }}}1
+
+function! s:closematch(str) " {{{1
+  " Close an open (, {, [, or < on the command line.
+  let tail = matchstr(a:str,'.[^\[\](){}<>]*$')
+  if tail =~ '^\[.\+'
+    return "]"
+  elseif tail =~ '^(.\+'
+    return ")"
+  elseif tail =~ '^{.\+'
+    return "}"
+  elseif tail =~ '^<.+'
+    return ">"
+  else
+    return ""
+  endif
+endfunction " }}}1
+
+nnoremap <silent> <Plug>SurroundRepeat .
+nnoremap <silent> <Plug>Dsurround  :<C-U>call <SID>dosurround(<SID>inputtarget())<CR>
+nnoremap <silent> <Plug>Csurround  :<C-U>call <SID>changesurround()<CR>
+nnoremap <silent> <Plug>CSurround  :<C-U>call <SID>changesurround(1)<CR>
+nnoremap <silent> <Plug>Yssurround :<C-U>call <SID>opfunc(v:count1)<CR>
+nnoremap <silent> <Plug>YSsurround :<C-U>call <SID>opfunc2(v:count1)<CR>
+" <C-U> discards the numerical argument but there's not much we can do with it
+nnoremap <silent> <Plug>Ysurround  :<C-U>set opfunc=<SID>opfunc<CR>g@
+nnoremap <silent> <Plug>YSurround  :<C-U>set opfunc=<SID>opfunc2<CR>g@
+vnoremap <silent> <Plug>VSurround  :<C-U>call <SID>opfunc(visualmode(),visualmode() ==# 'V' ? 1 : 0)<CR>
+vnoremap <silent> <Plug>VgSurround :<C-U>call <SID>opfunc(visualmode(),visualmode() ==# 'V' ? 0 : 1)<CR>
+inoremap <silent> <Plug>Isurround  <C-R>=<SID>insert()<CR>
+inoremap <silent> <Plug>ISurround  <C-R>=<SID>insert(1)<CR>
+
+if !exists("g:surround_no_mappings") || ! g:surround_no_mappings
+  nmap ds  <Plug>Dsurround
+  nmap cs  <Plug>Csurround
+  nmap cS  <Plug>CSurround
+  nmap ys  <Plug>Ysurround
+  nmap yS  <Plug>YSurround
+  nmap yss <Plug>Yssurround
+  nmap ySs <Plug>YSsurround
+  nmap ySS <Plug>YSsurround
+  xmap S   <Plug>VSurround
+  xmap gS  <Plug>VgSurround
+  if !exists("g:surround_no_insert_mappings") || ! g:surround_no_insert_mappings
+    if !hasmapto("<Plug>Isurround","i") && "" == mapcheck("<C-S>","i")
+      imap    <C-S> <Plug>Isurround
+    endif
+    imap      <C-G>s <Plug>Isurround
+    imap      <C-G>S <Plug>ISurround
+  endif
+endif
+
+" vim:set ft=vim sw=2 sts=2 et:
diff --git a/vim-plugins/bundle/vim-virtualenv/README.mkd b/vim-plugins/bundle/vim-virtualenv/README.mkd
new file mode 100644
index 0000000..53b04e3
--- /dev/null
+++ b/vim-plugins/bundle/vim-virtualenv/README.mkd
@@ -0,0 +1,49 @@
+virtualenv.vim
+==============
+
+When using :python or :!python, it will only have access to the environment outside of any virtualenvs. If you're working with packages that are only installed in a virtualenv, they will not be available to Vim.
+
+*__Until now!__* The virtualenv.vim plugin will modify python's sys.path and the $PATH environment variable so that anything done with :python or :!python will behave like you would expect for the chosen virtualenv.
+
+If compiled with python support, Vim will have a :python command, but this will be tied to whatever version is the default on your system. If this is the version of python that you use, or you're using a Linux distribution with a sensible package manager (like Debian or Ubuntu), you likely will not have to do anything more than install the plugin. If not, then you will likely have to recompile vim with your version of python.
+
+Usage examples
+==============
+
+Deactivate the current virtualenv
+
+    :VirtualEnvDeactivate
+
+List all virtualenvs
+
+    :VirtualEnvList
+
+Activate the 'spam' virtualenv
+
+    :VirtualEnvActivate spam
+
+If you're unsure which one to activate, you could always use tab completion
+
+    :VirtualEnvActivate <tab>
+
+![tab-completion](http://i.imgur.com/1ZGrM.png "Tab Completion")
+
+If the shell that started vim had $VIRTUAL\_ENV set, omitting the name will
+imply usage of this value.
+
+If you're a virtualenvwrapper user and have $PROJECT\_HOME set, omitting the
+name will try to guess which virtualenv to activate based on the current
+filename.
+
+You can even show the current virtualenv in the statusline with the included function
+
+![statusline](http://i.imgur.com/oxE70.png "Statusline")
+
+Or, for those with a properly configured Powerline (the virtualenv segment is not enabled by default), your virtualenv indicator will toggle on or off accordingly.
+
+![powerline_indicator](http://i.imgur.com/t6pGg7w.png "Powerline Indicator Toggled")
+
+For more detailed help
+
+    :help virtualenv
+
diff --git a/vim-plugins/bundle/vim-virtualenv/autoload/__pycache__/pyvenv.cpython-35.pyc b/vim-plugins/bundle/vim-virtualenv/autoload/__pycache__/pyvenv.cpython-35.pyc
new file mode 100644
index 0000000..6c67505
Binary files /dev/null and b/vim-plugins/bundle/vim-virtualenv/autoload/__pycache__/pyvenv.cpython-35.pyc differ
diff --git a/vim-plugins/bundle/vim-virtualenv/autoload/pyvenv.py b/vim-plugins/bundle/vim-virtualenv/autoload/pyvenv.py
new file mode 100644
index 0000000..2478c61
--- /dev/null
+++ b/vim-plugins/bundle/vim-virtualenv/autoload/pyvenv.py
@@ -0,0 +1,57 @@
+import vim, os, sys
+
+prev_syspath = None
+
+activate_content = """
+try:
+    __file__
+except NameError:
+    raise AssertionError(
+        "You must run this like execfile('path/to/activate_this.py', dict(__file__='path/to/activate_this.py'))")
+import sys
+import os
+
+old_os_path = os.environ['PATH']
+os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + os.pathsep + old_os_path
+base = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+if sys.platform == 'win32':
+    site_packages = os.path.join(base, 'Lib', 'site-packages')
+else:
+    version = '%s.%s' % (sys.version_info.major, sys.version_info.minor)
+    site_packages = os.path.join(base, 'lib', 'python%s' % version, 'site-packages')
+prev_sys_path = list(sys.path)
+import site
+site.addsitedir(site_packages)
+sys.real_prefix = sys.prefix
+sys.prefix = base
+# Move the added items to the front of the path:
+new_sys_path = []
+for item in list(sys.path):
+    if item not in prev_sys_path:
+        new_sys_path.append(item)
+        sys.path.remove(item)
+sys.path[:0] = new_sys_path
+"""
+
+def activate(env):
+    global prev_syspath
+    prev_syspath = list(sys.path)
+    activate = os.path.join(env, (sys.platform == 'win32') and 'Scripts' or 'bin', 'activate_this.py')
+    try:
+        fo = open(activate)
+        f = fo.read()
+        fo.close()
+    except:
+        f = activate_content
+
+    code = compile(f, activate, 'exec')
+    exec(code, dict(__file__=activate))
+
+
+def deactivate():
+    global prev_syspath
+    try:
+        sys.path[:] = prev_syspath
+        prev_syspath = None
+    except:
+        pass
diff --git a/vim-plugins/bundle/vim-virtualenv/autoload/virtualenv.vim b/vim-plugins/bundle/vim-virtualenv/autoload/virtualenv.vim
new file mode 100644
index 0000000..6736eb6
--- /dev/null
+++ b/vim-plugins/bundle/vim-virtualenv/autoload/virtualenv.vim
@@ -0,0 +1,110 @@
+if has('python3')
+    python3 import sys, vim
+    python3 if vim.eval('expand("<sfile>:p:h")') not in sys.path: sys.path.append(vim.eval('expand("<sfile>:p:h")'))
+    python3 import pyvenv
+endif
+if has('python')
+    python import sys, vim
+    python if vim.eval('expand("<sfile>:p:h")') not in sys.path: sys.path.append(vim.eval('expand("<sfile>:p:h")'))
+    python import pyvenv
+endif
+
+function! virtualenv#activate(...)
+    let name   = a:0 > 0 ? a:1 : ''
+    let silent = a:0 > 1 ? a:2 : 0
+    let env_dir = ''
+    if len(name) == 0  "Figure out the name based on current file
+        if isdirectory($VIRTUAL_ENV)
+            let name = fnamemodify($VIRTUAL_ENV, ':t')
+            let env_dir = $VIRTUAL_ENV
+        elseif isdirectory($PROJECT_HOME)
+            let fn = expand('%:p')
+            let pat = '^'.$PROJECT_HOME.'/'
+            if fn =~ pat
+                let name = fnamemodify(substitute(fn, pat, '', ''), ':h')
+                if name != '.'  "No project directory
+                    let env_dir = g:virtualenv_directory.'/'.name
+                endif
+            endif
+        endif
+    else
+        let env_dir = g:virtualenv_directory.'/'.name
+    endif
+
+    "Couldn't figure it out, so DIE
+    if !isdirectory(env_dir)
+        if !silent
+            echoerr "No virtualenv could be auto-detected and activated."
+        endif
+        return
+    endif
+
+    let bin = env_dir.(has('win32')? '/Scripts': '/bin')
+    call virtualenv#deactivate()
+
+    let s:prev_path = $PATH
+
+    if has('python')
+        python pyvenv.activate(vim.eval('l:env_dir'))
+    endif
+    if has('python3')
+        python3 pyvenv.activate(vim.eval('l:env_dir'))
+    endif
+
+    let g:virtualenv_name = name
+    let $VIRTUAL_ENV = env_dir
+
+    if exists("*airline#extensions#virtualenv#update")
+           call airline#extensions#virtualenv#update()
+    endif
+endfunction
+
+function! virtualenv#deactivate()
+    if has('python')
+        python pyvenv.deactivate()
+    endif
+    if has('python3')
+        python3 pyvenv.deactivate()
+    endif
+
+    unlet! g:virtualenv_name
+
+    let $VIRTUAL_ENV = '' " can't delete parent variables
+
+    if exists('s:prev_path')
+        let $PATH = s:prev_path
+    endif
+
+    if exists("*airline#extensions#virtualenv#update")
+           call airline#extensions#virtualenv#update()
+    endif
+endfunction
+
+function! virtualenv#list()
+    for name in virtualenv#names('')
+        echo name
+    endfor
+endfunction
+
+function! virtualenv#statusline()
+    if exists('g:virtualenv_name')
+        return substitute(g:virtualenv_stl_format, '\C%n', g:virtualenv_name, 'g')
+    else
+        return ''
+    endif
+endfunction
+
+function! virtualenv#names(prefix)
+    let venvs = []
+    for dir in split(glob(g:virtualenv_directory.'/'.a:prefix.'*'), '\n')
+        if !isdirectory(dir)
+            continue
+        endif
+        let fn = dir.(has('win32')? '/Scripts': '/bin').'/activate'
+        if !filereadable(fn)
+            continue
+        endif
+        call add(venvs, fnamemodify(dir, ':t'))
+    endfor
+    return venvs
+endfunction
diff --git a/vim-plugins/bundle/vim-virtualenv/doc/virtualenv.txt b/vim-plugins/bundle/vim-virtualenv/doc/virtualenv.txt
new file mode 100644
index 0000000..bac5a6f
--- /dev/null
+++ b/vim-plugins/bundle/vim-virtualenv/doc/virtualenv.txt
@@ -0,0 +1,58 @@
+*virtualenv.txt*  Activate a python virtualenv within Vim
+
+Author:  Jeremy Cantrell <jmcantrell@gmail.com>  *virtualenv-author*
+License: Same terms as Vim itself (see |license|)
+
+INTRODUCTION                                     *virtualenv* *virtualenv.vim*
+
+The virtualenv plugin allows you to activate and deactivate a virtualenv
+within a live Vim session.
+
+COMMANDS                                         *virtualenv-commands*
+
+:VirtualEnvList                                  *:VirtualEnvList*
+    List all available virtualenvs.
+
+:VirtualEnvDeactivate                            *:VirtualEnvDeactivate*
+    Deactivate the current virtualenv.
+
+:VirtualEnvActivate [name]                       *:VirtualEnvActivate*
+    Activate a virtualenv. The name of the virtualenv can be completed with
+    <tab> at the command line.
+
+    If name is not specified, and you have $PROJECT_HOME set, the name will be
+    guessed based on the current filename.
+
+CONFIGURATION                                    *virtualenv-configuration*
+
+g:virtualenv_loaded                              *g:virtualenv_loaded*
+    If set in your |vimrc|, virtualenv.vim is not loaded.
+
+g:virtualenv_directory                           *g:virtualenv_directory*
+    The directory that contains the virtualenvs. If you're a virtualenvwrapper
+    user and you have $WORKON_HOME set, it will default to this. Otherwise it
+    will default to ~/.virtualenvs.
+
+g:virtualenv_auto_activate                       *g:virtualenv_auto_activate*
+    If set, an attempt will be made to detect any active virtualenv, and
+    activate it.
+
+Example: >
+    let g:virtualenv_directory = '/path/to/virtualenvs'
+<
+g:virtualenv_stl_format                          *g:virtualenv_stl_format*
+    Format string for the statusline function.
+
+Example: >
+    let g:virtualenv_stl_format = '[%n]'
+<
+To use the statusline flag, this must appear in your |'statusline'| setting: >
+    %{virtualenv#statusline()}
+<
+The content is derived from the |g:virtualenv_stl_format| variable.
+
+Powerline users can see their statuslines too. After configuring powerline
+according to its documentation to support a virtualenv segment, Powerline will
+read the value of $VIRTUAL_ENV and display it.
+
+vim:tw=78:et:ft=help:norl:
diff --git a/vim-plugins/bundle/vim-virtualenv/plugin/virtualenv.vim b/vim-plugins/bundle/vim-virtualenv/plugin/virtualenv.vim
new file mode 100644
index 0000000..226c191
--- /dev/null
+++ b/vim-plugins/bundle/vim-virtualenv/plugin/virtualenv.vim
@@ -0,0 +1,53 @@
+if exists("g:virtualenv_loaded")
+    finish
+endif
+
+let g:virtualenv_loaded = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+if !has('python3') && !has('python')
+    finish
+endif
+
+if !exists("g:virtualenv_auto_activate")
+    let g:virtualenv_auto_activate = 1
+endif
+
+if !exists("g:virtualenv_stl_format")
+    let g:virtualenv_stl_format = '%n'
+endif
+
+if !exists("g:virtualenv_directory")
+    if isdirectory($WORKON_HOME)
+        let g:virtualenv_directory = $WORKON_HOME
+    else
+        let g:virtualenv_directory = '~/.virtualenvs'
+    endif
+endif
+
+let g:virtualenv_directory = expand(g:virtualenv_directory)
+
+command! -bar VirtualEnvList :call virtualenv#list()
+command! -bar VirtualEnvDeactivate :call virtualenv#deactivate()
+command! -bar -nargs=? -complete=customlist,s:CompleteVirtualEnv VirtualEnvActivate :call virtualenv#activate(<q-args>)
+
+function! s:Error(message)
+    echohl ErrorMsg | echo a:message | echohl None
+endfunction
+
+function! s:CompleteVirtualEnv(arg_lead, cmd_line, cursor_pos)
+    return virtualenv#names(a:arg_lead)
+endfunction
+
+" DEPRECATED: Leaving in for compatibility
+function! VirtualEnvStatusline()
+    return virtualenv#statusline()
+endfunction
+
+if g:virtualenv_auto_activate == 1
+    call virtualenv#activate('', 1)
+endif
+
+let &cpo = s:save_cpo
diff --git a/vim-plugins/bundle/xptemplate/README.md b/vim-plugins/bundle/xptemplate/README.md
new file mode 100644
index 0000000..8afa641
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/README.md
@@ -0,0 +1,722 @@
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+**Table of Contents**  *generated with [DocToc](http://doctoc.herokuapp.com/)*
+
+- [XPTemplate](#xptemplate)
+  - [Usage](#usage)
+    - [Browse and basic usage](#browse-and-basic-usage)
+    - [C skeleton](#c-skeleton)
+    - [C macro](#c-macro)
+    - [C for loop and wrapper](#c-for-loop-and-wrapper)
+    - [C if-else-else](#c-if-else-else)
+    - [Python option argument](#python-option-argument)
+    - [Python def and def in class](#python-def-and-def-in-class)
+    - [Python inline completion](#python-inline-completion)
+    - [Python try-except can be a wrapper](#python-try-except-can-be-a-wrapper)
+    - [Python quickly add snippet](#python-quickly-add-snippet)
+    - [Video tutorial](#video-tutorial)
+  - [Stay up-to-date](#stay-up-to-date)
+  - [About branches](#about-branches)
+  - [Features](#features)
+- [FAQ](#faq)
+  - [Trouble Shooting. Why not work?](#trouble-shooting-why-not-work)
+  - [What else does xptemlate required to work](#what-else-does-xptemlate-required-to-work)
+  - [How to install](#how-to-install)
+  - [Customizing snippet loading](#customizing-snippet-loading)
+  - [How to reload snippets, after I changes snippet definition files(*.xpt.vim)?](#how-to-reload-snippets-after-i-changes-snippet-definition-filesxptvim)
+  - [Do NOT like spaces in auto-completed brackets/braces](#do-not-like-spaces-in-auto-completed-bracketsbraces)
+  - [I need spaces in brackets/braces only for this language, not that](#i-need-spaces-in-bracketsbraces-only-for-this-language-not-that)
+  - [I do not want XPTemplate to auto-complete braces](#i-do-not-want-xptemplate-to-auto-complete-braces)
+  - [Adjust space and line-break](#adjust-space-and-line-break)
+  - [Adjust format style of c functions, such as `main()`](#adjust-format-style-of-c-functions-such-as-main)
+  - [Supertab support](#supertab-support)
+  - [With popup menu opened, `<TAB>` doesn't trigger Snippe](#with-popup-menu-opened-tab-doesnt-trigger-snippe)
+  - [Set up personal info. XPTemplate complains: "author is not set .."](#set-up-personal-info-xptemplate-complains-author-is-not-set-)
+  - [Browse snippets: Pop up menu, Drop down list](#browse-snippets-pop-up-menu-drop-down-list)
+  - [Extend XPTemplate. Write new snippets](#extend-xptemplate-write-new-snippets)
+  - [Example of repetition snippet.](#example-of-repetition-snippet)
+  - [Define repetition trigger place holder](#define-repetition-trigger-place-holder)
+- [Known Issues](#known-issues)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+
+# XPTemplate
+
+Code snippets engine for Vim, And snippets library.
+Write codes in a smooth, quick and comfortable way.
+[xptemplate-vim.org][xpt-vim]
+
+<iframe src="http://ghbtns.com/github-btn.html?user=drmingdrmer&repo=xptemplate&type=watch&count=true"
+  allowtransparency="true" frameborder="0" scrolling="0" width="110" height="20"></iframe>
+
+
+## Usage
+
+    >vim xpt.c
+    for<C-\>
+
+generates:
+
+    for (i = 0; i < len; ++i){
+        /* cursor */
+    }
+
+Press `<tab>`,`<tab>`.. to navigate through "i", "0", "len" and finally stop at "`/* cursor */`"
+
+
+### Browse and basic usage
+![](readme-img/600x/browse-and-basic.gif)
+
+### C skeleton
+![](readme-img/600x/c-outline.gif)
+
+### C macro
+![](readme-img/600x/c-macro.gif)
+
+### C for loop and wrapper
+![](readme-img/600x/c-loop-and-wrapper.gif)
+
+### C if-else-else
+![](readme-img/600x/c-ifee.gif)
+
+
+### Python option argument
+![](readme-img/600x/py-optional-ph.gif)
+
+### Python def and def in class
+![](readme-img/600x/py-class-def.gif)
+
+### Python inline completion
+![](readme-img/600x/py-for-inline-cmpl.gif)
+
+### Python try-except can be a wrapper
+![](readme-img/600x/py-try.gif)
+
+### Python quickly add snippet
+![](readme-img/600x/py-quick-add.gif)
+
+
+### Video tutorial
+
+Tutorial by Derek Wyatt :
+<http://vimeo.com/4449258>
+
+
+## Stay up-to-date
+
+There are two major branches: "master" and "dev".
+
+* "master" is compacted, logging-removed version.
+Always use branch "master" unless you know what you are doing.
+* "dev" is for development, that it contains debug statements thus it is a bit slow.
+
+
+Before 2014-06-01, The two major branches are: "master" and "dist":
+
+* "master" is for developing purpose.
+* "dist" is for end user.
+
+
+## About branches
+
+* Branch `master` is the branch for end user.
+
+* Branch `dev` is for doing further developing on top of
+XPTemplate.
+
+* Branches that starts with `f.` are feature branches for different sub system
+of XPTemplate.
+
+* Branches that starts with `fd.` are feature breanches that has not yet been
+merged into `dev` and `master`, which are NOT considered stable.
+
+* Branches that starts with `snp.` are snippet branches.
+
+
+## Features
+
+* Live update while typing.
+* Navigate forward and backward with `<Tab>` and `<S-Tab>`.
+* Support embedded language like JAVASCRIPT in HTML. Or HTML in PHP.
+* Wrapper snippet.
+* Inclusion.
+* Generate dynamic content with variables/functions.
+* code style customization: line break before "{".
+* Filters.
+
+
+# FAQ
+
+## Trouble Shooting. Why not work?
+
+First of all, Enter VIM.
+
+* Check setting "compatible". In VIM, type:
+
+        :set compatible?
+
+    Make sure you get *"nocompatible"*. Or you need the following statement in your .vimrc:
+
+        set nocompatible
+
+* Check setting "filetype". In VIM, type:
+
+        :filetype
+
+    Make sure you get *"filetype detection:ON  plugin:ON ..."*. Or you need
+    the following statement in you .vimrc:
+
+        filetype plugin  on
+
+
+* Check if XPTemplate is loaded. In VIM, type:
+
+        :scriptnames
+
+    You will get a list of scripts VIM has loaded. There should be some files
+    with name started with "xpt", like this:
+
+        97: /data/.../dist/plugin/xptemplate.vim
+        98: /data/.../dist/plugin/xptemplate.conf.vim
+        99: /data/.../dist/plugin/xptemplate.util.vim
+
+    If not, you should check if you have XPTemplate installed correctly.
+
+    You should see files with name started with "xpt.." in folder ~/.vim/
+    (Unix-like OS) or in $VIMH/vimfiles/ (Windows). Like this:
+
+        |-- plugin
+        ...
+        |   |-- xpopup.vim
+        |   |-- xpreplace.vim
+        |   |-- xptemplate.conf.vim
+        ...
+
+    Reference:
+
+        :help 'runtimepath'
+
+* Check key binding. Make sure you have a clear environment:
+none of XPTemplate settings like *"let g:xpt..."* in you .vimrc file.
+In VIM, type:
+
+        :imap <C-\>
+
+    You will get something like this:
+
+        i  <C-\>       * <C-R>=XPTemplateStart(0,{'k':'<C-\++'})<CR>
+
+    This means your XPTemplate should work well.
+    Or check if some other plugin has conflicting key-binding.
+    If so, solve it by adding the following statement into you .vimrc file to
+    change XPTemplate key-binding:
+
+        let g:xptemplate_key = '<Tab>'
+
+* Now type in *insert-mode*:
+
+        Date<C-\>
+
+    You will get current date.
+
+
+## What else does xptemlate required to work
+
+VIM and nothing else!
+
+XPTemplate is implemented purely with VIM script.
+Nothing else(like python) is required but a single VIM( at least 7.2 ).
+
+XPTemplate works also in VIM 7.0 too. But it's no as good as in VIM 7.2.
+
+
+
+## How to install
+
+Copy all folders in to your ~/.vim folder(on unix-like OS)
+
+Or add path to XPTemplate to VIM setting 'runtimepath'.
+
+
+## Customizing snippet loading
+
+To load your own snippets and *NOT* to load snippets supplied by XPTemplate,
+add this line to your `.vimrc`:
+```
+let g:xptemplate_lib_filter = '/my_snippets/'
+```
+
+Snippets from folder `~/xpt/` that does not match `g:xptemplate_lib_filter`
+will not be loaded.
+
+```
+~/xpt/ftplugin/c/c.xpt.vim
+...
+~/my_snippets/ftplugin/c/c.xpt.vim
+...
+```
+
+
+## How to reload snippets, after I changes snippet definition files(*.xpt.vim)?
+
+    :XPTreload
+
+
+
+## Do NOT like spaces in auto-completed brackets/braces
+
+Spaces inside auto-completed brackets are controlled by XPTemplate variable $SParg.
+
+The Simplest way to disable spaces globally is to add following statements to .vimrc:
+
+    let g:xptemplate_vars = "SParg="
+
+
+With this setting, `"("` results in `"()"` but not `"(  )"` by default.
+
+
+## I need spaces in brackets/braces only for this language, not that
+
+Assume you do need spaces in brackets for java( that you want `"()"` but not `"(  )"`).
+
+Create a snippet file to defines your own preference:
+
+    .vim/ftplugin/java/mine.xpt.vim
+
+Add add following contents to this file:
+
+    XPTemplate priority=personal
+    XPTvar $SParg   ''
+
+
+## I do not want XPTemplate to auto-complete braces
+
+I want XPTemplate to complete `(`, `[`, but not `{`.
+
+Add this to .vimrc:
+
+    let g:xptemplate_brace_complete = '(['
+
+
+Or you may just want to disable brackets complete:
+
+    let g:xptemplate_brace_complete = ''
+
+
+
+## Adjust space and line-break
+
+Spaces and line-breaks are defined by some *variable*.
+Instead of rewrite snippet in your own coding style, modifying these
+*variable* is the easiest way.
+
+For example by default "for" loop snippet in C lang is like:
+
+    for ( i = 0; i < len; i++ ) {
+        /* cursor */
+    }
+
+As snippet "for" defined as:
+
+    for`$SPcmd^(`$SParg^`$FOR_SCOPE^`$VAR_PRE`i^`$SPop^=`$SPop^`0^; `i^`$SPop^<`$SPop^`len^; `i^++`$SParg^)`$BRloop^{
+        `cursor^
+    }
+
+If you want to remove space after "for" and create a line-break before "{":
+
+    for( i = 0; i < len; i++ )
+    {
+        /* cursor */
+    }
+
+Just add two variables into your *.vimrc* file:
+
+    let g:xptemplate_vars = "SPcmd=&BRloop=\n"
+
+
+## Adjust format style of c functions, such as `main()`
+
+Default c function indent is like this:
+
+        int
+    main( int argc, char **argv )
+    {
+        return 0;
+    }
+
+This is controlled by variable `$BRfun`, if you prefer the single line style:
+
+    int main( int argc, char **argv ) {
+        return 0;
+    }
+
+Add variable into your *.vimrc* file, to make ***ALL*** function snippets to
+use single line style:
+
+    let g:xptemplate_vars = "BRfun= "
+
+Or redefine `$BRfun` in higher priority snippet file to modify only c
+functions:
+
+    XPTemplate priority=personal
+    XPTvar $BRfun          ' '
+
+Add the above lines into `ftplugin/c/foobar.xpt.vim`.
+
+
+## Supertab support
+
+Let XPTemplate try to match any snippet,
+then let supertab try to complete,
+and then fall back to literal input.
+
+Put following lines into `~/.vimrc`:
+
+```vim
+" Prevent supertab from mapping <tab> to anything.
+let g:SuperTabMappingForward = '<Plug>xpt_void'
+
+" Tell XPTemplate what to fall back to, if nothing matches.
+" Original SuperTab() yields nothing if g:SuperTabMappingForward was set to
+" something it does not know.
+let g:xptemplate_fallback = '<C-r>=XPTwrapSuperTab("n")<CR>'
+
+fun! XPTwrapSuperTab(command) "{{{
+    let v = SuperTab(a:command)
+    if v == ''
+        " Change \<Tab> to whatever you want, when neither XPTemplate or
+        " supertab needs to do anything.
+        return "\<Tab>"
+    else
+        return v
+    end
+endfunction "}}}
+```
+
+## With popup menu opened, `<TAB>` doesn't trigger Snippet
+
+By default if popup menu is opened and `<TAB>` is used as trigger key, a
+`<TAB>` key press does not  trigger a snippet, according to convention in many
+other application user use `<TAB>`.
+
+If you always want to trigger snippet with `<TAB>` no matter popup menu opened
+or not, add these lines to your .vimrc:
+
+    let g:xptemplate_key = '<Plug>triggerxpt'
+    inoremap <Plug>closePUM <C-v><C-v><BS>
+    imap <TAB> <Plug>closePUM<Plug>triggerxpt
+    " " Optional. Use this only when you have no other plugin like SuperTab to
+    " " handle <TAB>.
+    " let g:xptemplate_fallback = 'nore:<TAB>'
+
+It first forces popup menu to close and then trigger snippet.
+
+This fix issue that some plugin like AutoComplPop opens popup menu
+automatically.
+
+
+
+
+## Set up personal info. XPTemplate complains: "author is not set .."
+
+You can set up your name and email for just one time, and use them everywhere,
+like that in a document comment block the name of the author(you) will be
+filled in.
+
+Set up variable $author and $email in your .vimrc:
+
+    let g:xptemplate_vars = "author=your_name&email=drdr.xp@gmail.com&..."
+
+
+Thus "filehead" snippet of C language should result in:
+
+    ...
+     * @author : your_name | drdr.xp@gmail.com
+    ...
+
+
+## Browse snippets: Pop up menu, Drop down list
+
+By default, to list snippets whose name starts with "i", Press:
+
+    i<C-r><C-\>
+
+By default, when pressing `<C-\>`
+there must be at least one letter before cursor
+so that XPTemplate triggers any snippet.
+
+* If there is only one snippet matching the preceding letters:
+
+    XPTemplate expands it.
+
+* If there are multiple matching:
+
+    XPTemplate shows up a drop down menu to let user to browse and select
+    snippet.
+![c-pum-starts-with-f](readme-img/c-pum-starts-with-f.png)
+
+* In order to always show drop down menu even when there is no preceding
+letters before cursor, add `g:xptemplate_minimal_prefix = 0` to `.vimrc`:
+```vim
+    let g:xptemplate_minimal_prefix = 0
+```
+
+See also:
+```vim
+    :help g:xptemplate_minimal_prefix
+    :help g:xptemplate_key_force_pum
+```
+
+
+## Extend XPTemplate. Write new snippets
+
+Do *NOT* modify snippets supplied by XPTemplate.
+
+***Where***:
+
+Add your own snippets into folder **personal** :
+
+    <path_to_xpt>/personal/ftplugins/
+
+
+It is meant for user-defined snippets.
+It shares the same directory-structure with the xpt-snippet-folder.
+
+Example personal-snippet-folder:
+
+    |~personal/
+    | |~ftplugin/
+    | | |+_common/
+    | | `~c/
+    | |   |-c_ext.xpt.vim
+    | |   `-c_new.xpt.vim
+    ...
+
+
+***How***:
+
+***NOTE: File names does not matter except it must ends with '.xpt.vim'.***
+
+* To create new snippet: Create *c_new.xpt.vim*. Add new snippets in it.
+
+* To override existing ones, Create *c_ext.xpte.vim* with *higher priority*.
+Put modified snippets into this file.
+For example an extended "*for*" snippet looks like:
+
+        XPTemplate priority=lang-1
+        XPTinclude
+              \ _common/common
+
+        XPTemplate for " tips
+        for (
+            `i^ = 0;
+            `i^ < `len^;
+            ++`i^
+        )
+
+
+The header line declares a higher priority than priority "*lang*"(
+lower number means higher priority ):
+
+    XPTemplate priority=lang-1
+
+All snippets in this file override snippets in
+*xpt-snippet-folder/ftplugin/c/c.xpt.vim* which declares with priority "*lang*".
+
+Except that this file is with higher **priority**, **Personal-snippet-folder**
+has no differences from **xpt-snippet-folder**.
+
+***If you use GIT to sync vim plugins and your own snippets,
+it's a good idea to place your snippet GIT folder somewhere outside XPTemplate
+folder and add snippet folder path to `runtimepath`.***
+
+References:
+
+    :help xpt-write-snippet
+    :help xpt-snippet-priority
+
+
+## Example of repetition snippet.
+
+Repetition snippet generates repeating contents such as multiple `else if` or
+multiple `case `.
+
+The following example is c struct snippet:
+```vim
+XPT struct
+struct `a^ {
+    `data_type^ `member^;
+`    `more...`
+{{^    `data_type^ `member^;
+`    `more...`
+^`}}^};
+```
+
+It generates:
+```
+struct a {
+    data_type member;
+    data_type member;
+    data_type member;
+    more...
+}
+```
+The last `more...` is trigger place holder for next repetitive part.
+
+Pressing `<Tab>` on `more...` generates another `data_type member;`.
+
+Pressing `<CR>` on `more...` quits applying repetition.
+
+
+One of the problems with repetition is controlling line breaks.
+XPTemplate accepts space and line-break as part of placeholder.
+
+When trigger place holder is removed by pressing `<CR>`,
+line break `\n` should also be removed togeter.
+Thus space and line break should be part of place holder.
+
+
+To do this, use the complete-form of placeholder:
+```vim
+`left-edge`placeholder_name`right-edge^
+```
+`left-edge` and `right-edge` can be space char or non-space char.
+
+Thus in this c struct snippet:
+
+![screen shot 2014-05-10 at 5 09 21 pm](https://cloud.githubusercontent.com/assets/44069/2935685/c9c9dfac-d822-11e3-8fda-ef428576bfee.png)
+
+The repetition trigger is `more...` in cyan.
+
+4 spaces on the left to `more...` and 1 line break on the right to `more...`.
+
+Repetition body is the text in green.
+
+Trigger for next repetition is the text in red.
+***These two triggers(cyan and red) must be the same to generate consistent copies***.
+
+Thus there will always be correct indent and a line break around trigger.
+
+![screen shot 2014-05-10 at 5 13 44 pm](https://cloud.githubusercontent.com/assets/44069/2935690/63288d6a-d823-11e3-978a-734e7451df9d.png)
+
+When trigger of repetition is removed,
+4 space indent and line break is also removed all together with trigger,
+
+![screen shot 2014-05-10 at 5 15 32 pm](https://cloud.githubusercontent.com/assets/44069/2935691/a1f1e17c-d823-11e3-97fe-9f1af63cdec3.png)
+
+
+## Define repetition trigger place holder
+
+Indent and line breaks are a bit complicated in repetition snippet.
+
+This section describes how to define repetition correctly and clearly.
+
+You may expect repetition `struct` in c to be like:
+```c
+struct a {         //
+    int a;         //
+    more...        // focused here
+}                  //
+
+struct a {         //
+    int a;         //
+    int name;      // when triggered, repetitive content generated.
+    more...        // focused here
+}                  //
+
+struct a {         //
+    int a;         //
+    int name;      // when repetition canceled.
+}                  //
+```
+
+General rule is:
+
+* Think of snippet as a single string.
+* The text of place holder is actually the change from text with place holder
+not removed to the text with place holder removed.
+
+
+The following three examples show what repetition trigger is, with:
+* only content before repetitions
+* only content after repetitions
+* both before and after
+
+( `*` = space)
+
+With only content ***BEFORE*** repetition:
+
+```
+    |                 | what on screen | plain string      | trigger     |
+    |---------------------------------------------------------------------
+    | repetition      | before         | before\n****ph... |             |
+    |                 | ****ph...      |                   |             |
+    |------------------------------------------------------|             |
+    | after canceling | before         | before            | \n****ph... |
+    | repetition      |                |                   |             |
+    |---------------------------------------------------------------------
+
+XPT rep_before
+before`
+    `ph...`{{^repetitive-content`
+    `ph...`^`}}^
+```
+
+With only content ***AFTER*** repetition:
+
+```
+    |                 | what on screen | plain string      | trigger     |
+    |---------------------------------------------------------------------
+    | repetition      | ****ph...      | ****ph...\nafter  |             |
+    |                 | after          |                   |             |
+    |------------------------------------------------------|             |
+    | after canceling | after          | after             | ****ph...\n |
+    | repetition      |                |                   |             |
+    |---------------------------------------------------------------------
+
+XPT rep_after
+`    `ph...`
+{{^repetitive-content
+`    `ph...`
+^`}}^after
+```
+
+Both before and after:
+
+```
+    |                 | what on screen | what happened            | trigger     |
+    |----------------------------------------------------------------------------
+    | repetition      | before         | before\n****ph...\nafter |             |
+    | place holder    | ****ph...      |                          |             |
+    |                 | after          |                          |             |
+    |-------------------------------------------------------------|             |
+    | after canceling | before         | before\nafter            | \n****ph... |
+    | repetition      | after          |                          |     or      |
+    |                 |                |                          | ****ph...\n |
+    |----------------------------------------------------------------------------
+```
+Either of rep_before and rep_after is OK in this case.
+
+
+# Known Issues
+
+-   Key mapping can not be saved/restored correctly.
+
+    Before VIM 7.4, during applying snippet, key-mapping saving/restoring does
+    not support `<expr>` mapping well.
+
+    [#43](../../issues/43) Solution: upgrade to VIM 7.4
+
+-   Mapping of `CTRL-L` does not work with popup menu opened.
+
+    Before VIM 7.4.653 mapping of `CTRL-L` does not work with xpt-pum opened.
+    `complete()` opens pum in `compl-whole-line` mode and it handles `CTRL-L`
+    in its own way without considering any mapping binded to it.
+
+    Fixed in 
+    [vim-7.4-patch-653](https://github.com/vim/vim/commit/cd2c1cda5803f5ef7bb71a4034d393b4872a019f)
+
+
+[xpt-github]: https://github.com/drmingdrmer/xptemplate
+[xpt-vim]: http://www.vim.org/scripts/script.php?script_id=2611
diff --git a/vim-plugins/bundle/xptemplate/autoload/XPT.vim b/vim-plugins/bundle/xptemplate/autoload/XPT.vim
new file mode 100644
index 0000000..ad24d6a
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/XPT.vim
@@ -0,0 +1,173 @@
+if exists("g:__XPT_VIM__")
+	finish
+endif
+let g:__XPT_VIM__ = 1
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let XPT#ver = 2
+let XPT#let_sid = 'map <Plug>xsid <SID>|let s:sid=matchstr(maparg("<Plug>xsid"), "\\d\\+_")|unmap <Plug>xsid'
+let XPT#nullDict = {}
+let XPT#nullList = []
+let XPT#escapeHead   = '\v(\\*)\V'
+let XPT#unescapeHead = '\v(\\*)\1\\?\V'
+let XPT#nonEscaped = '\%(' .     '\%(\[^\\]\|\^\)' .     '\%(\\\\\)\*' . '\)' . '\@<='
+let XPT#regEval     = '\V\w(\|$\w'
+let XPT#nonsafe     = '{$( '
+let XPT#nonsafeHint = '$('
+let XPT#item_var   = '\V' . '$\w\+'
+let XPT#item_qvar  = '\V' . '{$\w\+}'
+let XPT#item_func  = '\V' . '\w\+(\.\*)'
+let XPT#item_qfunc = '\V' . '{\w\+(\.\*)}'
+let XPT#ptnIncFull = '\V' . '\^Include:' . '\zs' . '\(\.\{-}\)\$'
+let XPT#ptnIncSimp = '\V' . '\^:' . '\zs' . '\(\.\{-}\)' . '\ze' . ':\$'
+let XPT#ptnRepetition = '\V'. '\^\w\*...\w\*\$'
+let XPT#ptnPreEvalFunc = '\v^%(Inc|Inline|ResetIndent|Pre)\('
+let XPT#NONE = 0x000
+let XPT#BUILT = 0x001
+let XPT#NOTBUILT = 0x002
+let XPT#DONE = 0x100
+let XPT#UNDONE = 0x200
+let XPT#GOON = 0x300
+let XPT#AGAIN = 0x400
+let XPT#BROKEN = -1
+let XPT#importConst = '' . 'let s:escapeHead     = XPT#escapeHead | ' . 'let s:unescapeHead   = XPT#unescapeHead | ' . 'let s:nonEscaped     = XPT#nonEscaped | ' . 'let s:regEval        = XPT#regEval | ' . 'let s:nonsafe        = XPT#nonsafe | ' . 'let s:nonsafeHint    = XPT#nonsafeHint | ' . 'let s:nullDict       = XPT#nullDict | ' . 'let s:nullList       = XPT#nullList | ' . 'let s:item_var       = XPT#item_var   | ' . 'let s:item_qvar      = XPT#item_qvar  | ' . 'let s:item_func      = XPT#item_func  | ' . 'let s:item_qfunc     = XPT#item_qfunc | ' . 'let s:ptnIncFull     = XPT#ptnIncFull | ' . 'let s:ptnIncSimp     = XPT#ptnIncSimp | ' . 'let s:ptnRepetition  = XPT#ptnRepetition | ' . 'let s:ptnPreEvalFunc = XPT#ptnPreEvalFunc | ' . 'let s:NONE           = XPT#NONE | ' . 'let s:DONE           = XPT#DONE | ' . 'let s:UNDONE         = XPT#UNDONE | ' . 'let s:GOON           = XPT#GOON | ' . 'let s:AGAIN          = XPT#AGAIN | ' . 'let s:BROKEN         = XPT#BROKEN | ' . 'let s:BUILT          = XPT#BUILT | ' . 'let s:NOTBUILT       = XPT#NOTBUILT | '  . 'let s:R_NEXT = 0x008 | ' . 'let s:R_OUT  = 0x009 | ' . 'let s:R_     = 0x00A | ' . 'let s:R_FOO  = 0x00B | '  . 'let s:G_CRESTED   = 0x010 | ' . 'let s:G_INITED    = 0x020 | ' . 'let s:G_PROCESSED = 0x030 | ' . 'let s:G_REFOCUSED = 0x040 | '
+let XPT#priorities = {'all' : 192, 'spec' : 160, 'like' : 128, 'lang' : 96, 'sub' : 64, 'personal' : 32}
+let XPT#skipPattern = 'synIDattr(synID(line("."), col("."), 0), "name") =~? "\\vstring|comment"'
+fun! XPT#warn(msg)
+	echohl WarningMsg
+	echom a:msg
+	echohl
+endfunction
+fun! XPT#info(msg)
+	echom a:msg
+endfunction
+fun! XPT#error(msg)
+	echohl ErrorMsg
+	echom a:msg
+	echohl
+endfunction
+fun! XPT#fallback(fbs)
+	let fbs = a:fbs
+	if len(fbs) > 0
+		let [key,flag] = fbs[0]
+		call remove(fbs,0)
+		if flag == 'feed'
+			call feedkeys( key, 'mt' )
+			return ''
+		else
+			return key
+		endif
+	else
+		return ''
+	endif
+endfunction
+fun! XPT#softTabStop()
+	let ts = &l:tabstop
+	return &l:softtabstop == 0 ? ts : &l:softtabstop
+endfunction
+fun! XPT#getIndentNr(ln,col)
+	let line = matchstr( getline(a:ln), '\V\^\s\*' )
+	let line = ( a:col == 1 ) ? '' : line[ 0 : a:col - 1 - 1 ]
+	let tabspaces = repeat( ' ', &l:tabstop )
+	return len( substitute( line, '	', tabspaces, 'g' ) )
+endfunction
+fun! XPT#getPreferedIndentNr(ln)
+	if &indentexpr != ''
+		let indentexpr = substitute( &indentexpr, '\Vv:lnum', a:ln, '' )
+		try
+			return eval(indentexpr)
+		catch /.*/
+			return -1
+		endtry
+	elseif &cindent
+		return cindent(a:ln)
+	else
+		return -1
+	endif
+endfunction
+fun! XPT#getCmdOutput(cmd)
+	let l:a = ""
+	redir => l:a
+	exe a:cmd
+	redir END
+	return l:a
+endfunction
+fun! XPT#convertSpaceToTab(text)
+	if ( "\n" . a:text ) !~ '\V\n ' || &expandtab
+		return a:text
+	else
+		let tabspaces = repeat( ' ',  &tabstop )
+		let lines = split( a:text, '\V\n', 1 )
+		let newlines = []
+		for line in lines
+			let newline = join( split( line, '\V\^\%(' . tabspaces . '\)', 1 ), '	' )
+			let newlines += [newline]
+		endfor
+		return join( newlines, "\n" )
+	endif
+endfunction
+fun! XPT#SpaceToTab(lines)
+	if ! &expandtab && match( a:lines, '\v^ ' ) > -1
+		let cmd = 'join( split( v:val, ''\v^%('' . repeat( '' '',  &tabstop ) . '')'', 1 ), ''	'' )'
+		call map(a:lines,cmd)
+	endif
+	return a:lines
+endfunction
+fun! XPT#SpaceToTabExceptFirstLine(lines)
+	if ! &expandtab && len( a:lines ) > 1 && match( a:lines, '\v^ ', 1 ) > -1
+		let line0 = a:lines[0]
+		let cmd = 'join( split( v:val, ''\v^%('' . repeat( '' '',  &tabstop ) . '')'', 1 ), ''	'' )'
+		call map(a:lines,cmd)
+		let a:lines[0] = line0
+	endif
+	return a:lines
+endfunction
+fun! XPT#TextBetween(posList)
+	return join(XPT#LinesBetween( a:posList ), "\n")
+endfunction
+fun! XPT#TextInLine(ln,s,e)
+	if a:s >= a:e
+		return ""
+	endif
+	return getline(a:ln)[a:s - 1 : a:e - 2]
+endfunction
+fun! XPT#LinesBetween(posList)
+	let [s,e] = a:posList
+	if s[0] > e[0]
+		return ""
+	endif
+	if s[0] == e[0]
+		if s[1] == e[1]
+			return ""
+		else
+			return getline(s[0])[s[1] - 1 : e[1] - 2]
+		endif
+	endif
+	let r = [getline(s[0])[s[1] - 1:]] + getline(s[0]+1,e[0]-1)
+	if e[1] > 1
+		let r += [getline(e[0])[:e[1] - 2]]
+	else
+		let r += ['']
+	endif
+	return r
+endfunction
+fun! XPT#default(k,v)
+	if !exists(a:k)
+		exe "let" a:k "=" string( a:v )
+	endif
+endfunction
+fun! XPT#Strlen(s)
+	return strlen(substitute(a:s, ".", "x", "g"))
+endfunction
+fun! XPT#Assert(toBeTrue,msg)
+	if !a:toBeTrue
+		call XPT#warn(a:msg)
+		if g:xpt_test_on_error == 'stop'
+			throw "XPT_TEST: fail: " . a:msg
+		endif
+	endi
+endfunction
+fun! XPT#AssertEq(a,b,msg)
+	call XPT#Assert( a:a == a:b, 'expect:' . string( a:a ) . ' but:' . string( a:b ) . ' message:' . a:msg )
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/XPpum.vim b/vim-plugins/bundle/xptemplate/autoload/XPpum.vim
new file mode 100644
index 0000000..a3fb60a
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/XPpum.vim
@@ -0,0 +1,42 @@
+if exists("g:__XPPUM_VIM__")
+	finish
+endif
+let g:__XPPUM_VIM__ = 1
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+exe XPT#let_sid
+fun! XPpum#completeFunc(first,base)
+	if !exists( 'b:__xppum' . s:sid )
+		if a:first
+			return col( "." )
+		else
+			return []
+		endif
+	endif
+	if a:first
+		return b:__xppum{s:sid}.col - 1
+	else
+		let &completefunc = b:__xppum{s:sid}.oldcfu
+		call b:__xppum{s:sid}.onShow()
+		let list = b:__xppum{s:sid}.list
+		unlet b:__xppum{s:sid}
+		return list
+	endif
+endfunction
+fun! XPpum#complete(col,list,onShow)
+	let b:__xppum{s:sid} = { 'col' : a:col, 'list' : a:list, 'oldcfu' : &completefunc, 'onShow' : a:onShow }
+	set completefunc=XPpum#completeFunc
+	let keyTriggerUserDefinedPum = "\<C-x>\<C-u>"
+	let keyCleanupPumSetting     = "\<C-r>=<SNR>" . s:sid . "RestoreCommpletefunc()\<CR>"
+	let keyForceRefresh          = "\<C-n>\<C-p>"
+	return keyTriggerUserDefinedPum
+endfunction
+fun! s:RestoreCommpletefunc()
+	if !exists( 'b:__xppum' . s:sid )
+		return ''
+	endif
+	let &completefunc = b:__xppum{s:sid}.oldcfu
+	unlet b:__xppum{s:sid}
+	return ''
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/buf.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/buf.vim
new file mode 100644
index 0000000..ae4878d
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/buf.vim
@@ -0,0 +1,21 @@
+exec xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+fun! xpt#buf#New()
+	if exists( 'b:xptemplateData' )
+		return b:xptemplateData
+	endif
+	let b:xptemplateData = { 'filetypes':{}, 'wrapStartPos':0, 'wrap':'', 'savedReg':'', 'snippetToParse':[], 'abbrPrefix':{}, 'fallbacks':[], 'posStack':[], 'stack':[], 'snipFileScope':{'inheritFT':0}, 'snipFileScopeStack':[], }
+	let b:xptemplateData.renderContext = xpt#rctx#New(b:xptemplateData)
+	return b:xptemplateData
+endfunction
+fun! xpt#buf#Pushrctx()
+	let x = b:xptemplateData
+	call add(x.stack,x.renderContext)
+	let x.renderContext = xpt#rctx#New(x)
+endfunction
+fun! xpt#buf#Poprctx()
+	let x = b:xptemplateData
+	let x.renderContext = remove(x.stack,-1)
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/cwd/snpt.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/cwd/snpt.vim
new file mode 100644
index 0000000..f4bebf0
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/cwd/snpt.vim
@@ -0,0 +1,31 @@
+if exists( "g:__AUTOLOAD__XPT__CWC__SNPT_VIM__" )
+	finish
+endif
+let g:__AUTOLOAD__XPT__CWC__SNPT_VIM__ = 1
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+fun! xpt#cwd#snpt#load()
+	if exists( 'b:xptemplate_cwd_snpt_loaded' )
+		return
+	endif
+	call XPTemplateInit()
+	for fn in split(globpath('.', '.xpt.vim'), '\n')
+		exec 'so ' fn
+	endfor
+	for fn in split(globpath('.', '.' . &filetype . '.xpt.vim'), '\n')
+		exec 'so ' fn
+	endfor
+	let b:xptemplate_cwd_snpt_loaded = 1
+endfunction
+fun! xpt#cwd#snpt#reload()
+	if exists( 'b:xptemplate_cwd_snpt_loaded' )
+		unlet b:xptemplate_cwd_snpt_loaded
+	endif
+	return xpt#cwd#snpt#load()
+endfunction
+fun! xpt#cwd#snpt#clearFlag()
+	if exists( 'b:xptemplate_cwd_snpt_loaded' )
+		unlet b:xptemplate_cwd_snpt_loaded
+	endif
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/debug.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/debug.vim
new file mode 100644
index 0000000..3a13da3
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/debug.vim
@@ -0,0 +1,159 @@
+if exists( "g:__XPT_DEBUG_VIM__" ) && g:__XPT_DEBUG_VIM__ >= XPT#ver
+    finish
+endif
+let g:__XPT_DEBUG_VIM__ = XPT#ver
+
+let s:oldcpo = &cpo
+set cpo-=<
+set cpo+=B
+
+
+exe XPT#let_sid
+
+let s:globalLogLevel = 'debug'
+
+let s:logLevels = {
+      \ 'fatal' : 1,
+      \ 'error' : 2,
+      \ 'warn'  : 3,
+      \ 'info'  : 4,
+      \ 'log'   : 5,
+      \ 'debug' : 6,
+      \ }
+
+fun! xpt#debug#Logger( level ) "{{{
+
+  let level = s:logLevels[ a:level ]
+  let level = min( [ level, s:logLevels[ s:globalLogLevel ] ] )
+
+  let logger = copy( s:loggerPrototype )
+
+  if level < s:logLevels.fatal | let logger.Fatal = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.error | let logger.Error = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.warn  | let logger.Warn  = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.info  | let logger.Info  = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.log   | let logger.Log   = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.debug | let logger.Debug = s:loggerPrototype.LogNothing | endif
+
+  return logger
+endfunction "}}}
+
+fun! xpt#debug#Assert( shouldBeTrue, msg ) "{{{
+    if !a:shouldBeTrue
+        throw a:msg
+    end
+endfunction "}}}
+
+fun! xpt#debug#List( l ) "{{{
+    let rst = '[' . "\n"
+    for e in a:l
+        let rst .= '--- ' . string( e ) . "\n"
+        unlet e
+    endfor
+
+    return rst . "\n" . ']'
+endfunction "}}}
+
+fun! xpt#debug#EchoList( l ) "{{{
+
+    echom '['
+    for e in a:l
+        echom '--- ' . string( e ) . "\n"
+        unlet e
+    endfor
+
+    echom  ']'
+
+endfunction "}}}
+
+
+fun! s:Fatal(...) dict "{{{
+    return call('Log_core', ['Fatal'] + a:000)
+endfunction "}}}
+
+fun! s:Error(...) dict "{{{
+    return call('Log_core', ['Error'] + a:000)
+endfunction "}}}
+
+fun! s:Warn(...) dict "{{{
+    return call('Log_core', ['Warn'] + a:000)
+endfunction "}}}
+
+fun! s:Info(...) dict "{{{
+    return call('Log_core', ['Info'] + a:000)
+endfunction "}}}
+
+fun! s:Log(...) dict "{{{
+    return call('Log_core', ['Log'] + a:000)
+endfunction "}}}
+
+fun! s:Debug(...) dict "{{{
+    return call('Log_core', ['Debug'] + a:000)
+endfunction "}}}
+
+fun! s:LogNothing(...) "{{{
+endfunction "}}}
+
+
+fun! Log_core(level, ...) "{{{
+
+    if s:logLocation == ''
+        return
+    end
+
+    " call stack printing
+    try
+        throw ''
+    catch /.*/
+        let stack = matchstr( v:throwpoint, 'function\s\+\zs.\{-}\ze\.\.\%(Fatal\|Error\|Warn\|Info\|Log\|Debug\).*' )
+        let stack = substitute( stack, '<SNR>\d\+_', '', 'g' )
+    endtry
+
+
+    exe 'redir! >> '.s:logLocation
+
+
+    silent echom a:level . ':::' . stack . ' cursor at=' . string( [ line("."), col(".") ] )
+
+    for msg in a:000
+        let l = split(';' . msg . ';', "\n")
+        let l[0] = l[0][1:]
+        let l[ -1 ] = l[ -1 ][ :-2 ]
+        for v in l
+            silent! echom v
+        endfor
+    endfor
+    redir END
+
+
+    if a:level =~ 'Fatal\|Error\|Warn'
+        echoerr string( a:000 )
+    endif
+
+endfunction "}}}
+
+
+" define script-private functions first and then make reference to them. Thus
+" in traceback function name can be shown.
+let s:loggerPrototype = {}
+let s:loggerPrototype.Fatal       = function( "<SNR>" . s:sid . "Fatal"      )
+let s:loggerPrototype.Error       = function( "<SNR>" . s:sid . "Error"      )
+let s:loggerPrototype.Warn        = function( "<SNR>" . s:sid . "Warn"       )
+let s:loggerPrototype.Info        = function( "<SNR>" . s:sid . "Info"       )
+let s:loggerPrototype.Log         = function( "<SNR>" . s:sid . "Log"        )
+let s:loggerPrototype.Debug       = function( "<SNR>" . s:sid . "Debug"      )
+let s:loggerPrototype.LogNothing  = function( "<SNR>" . s:sid . "LogNothing" )
+
+fun! s:MakeLogPath() "{{{
+    let path = g:xptemplate_debug_log
+    if path == ''
+        let s:logLocation = ''
+    else
+        let path = substitute( path, '\V\^~/', $HOME . '/', '' )
+        let s:logLocation = path
+        call delete(s:logLocation)
+    endif
+endfunction "}}}
+call s:MakeLogPath()
+
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/diff.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/diff.vim
new file mode 100644
index 0000000..2996327
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/diff.vim
@@ -0,0 +1,75 @@
+exec xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+fun! xpt#diff#Diff(a,b)
+	let [a,b] = [a:a,a:b]
+	let [astart,aend,bstart,bend] = [0,len(a),0,len(b)]
+	let [i,lmin] = [0,min([aend,bend])]
+	while i < lmin && a[i] == b[i] | let i += 1 | endwhile
+	let [astart,bstart] = [i,i]
+	let m = min([aend - astart,bend - bstart])
+	let i = 1
+	while i <= m && a[aend-i] == b[bend-i]
+		let i += 1
+	endwhile
+	let [aend,bend] = [aend-i+1,bend-i+1]
+	if type(a) == type('')
+		let [a,b] = [strpart(a,astart,aend-astart),strpart(b,bstart,bend-bstart)]
+	else
+		let [a,b] = [a[astart :],b[bstart :]]
+		if len(a) > aend - astart
+			call remove(a,aend-astart,-1)
+		endif
+		if len(b) > bend - bstart
+			call remove(b,bend-bstart,-1)
+		endif
+	endif
+	let [la,lb] = [len(a),len(b)]
+	let matrix = []
+	let i = 0
+	while i < la + 1
+		let s = []
+		let j = 0
+		while j < lb + 1
+			let s += [[0,0,0]]
+			let j += 1
+		endwhile
+		let matrix += [s]
+		let i += 1
+	endwhile
+	let [i] = [1]
+	while i < la + 1
+		let matrix[i][0] = [i-1,0,0]
+		let i += 1
+	endwhile
+	let [j] = [1]
+	while j < lb + 1
+		let matrix[0][j] = [0,j-1,0]
+		let j += 1
+	endwhile
+	let [i,j] = [0,0]
+	while i < la
+		let j = 0
+		while j < lb
+			let matrix[i+1][j+1] = a[i] == b[j] ? [i,j,matrix[i][j][2] + 1] : (matrix[i][j+1][2] > matrix[i+1][j][2] ? [i,j+1,matrix[i][j+1][2]] : [i+1,j,matrix[i+1][j][2]])
+			let j += 1
+		endwhile
+		let i += 1
+	endwhile
+	let lst = []
+	let [i,j] = [la,lb]
+	while i > 0 || j > 0
+		while (i > 0 || j > 0) && matrix[i][j][0] < i && matrix[i][j][1] < j
+			let [i,j] = matrix[i][j][: 1]
+		endwhile
+		let [ii,jj] = [i,j]
+		while (ii > 0 || jj > 0) && (matrix[ii][jj][0] == ii || matrix[ii][jj][1] == jj)
+			let [ii,jj] = matrix[ii][jj][: 1]
+		endwhile
+		let chg = [[astart+ii,astart+i],[bstart+jj,bstart+j]]
+		let lst = [chg] + lst
+		let [i,j] = [ii,jj]
+	endwhile
+	return lst
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/eval.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/eval.vim
new file mode 100644
index 0000000..5661cdd
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/eval.vim
@@ -0,0 +1,145 @@
+if exists( "g:__AL_XPT_EVAL_VIM__" ) && g:__AL_XPT_EVAL_VIM__ >= XPT#ver
+	finish
+endif
+let g:__AL_XPT_EVAL_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+let s:log = xpt#debug#Logger( 'debug' )
+exe XPT#importConst
+let s:_evalCache = { 'strMask' : {}, 'compiledExpr' : {} }
+fun! xpt#eval#Eval(str,closures)
+	if a:str == ''
+		return ''
+	endif
+	let globals = a:closures[0]
+	let x = b:xptemplateData
+	let expr = xpt#eval#Compile(a:str)
+	let globals._ctx = { 'closures':a:closures, 'renderContext':x.renderContext, }
+	let xfunc = globals
+	try
+		let r = eval(expr)
+		return r
+	catch /.*/
+		call XPT#warn(v:throwpoint)
+		call XPT#warn(v:exception)
+		call XPT#warn(expr)
+		return ''
+	endtry
+endfunction
+fun! xpt#eval#Compile(s)
+	if a:s is ''
+		return ''
+	endif
+	let expr = get(s:_evalCache.compiledExpr,a:s,0)
+	if expr is 0
+		if a:s !~ s:item_var . '\|' . s:item_func
+			let expr = string(xpt#util#UnescapeChar(a:s,s:nonsafe))
+		elseif a:s =~ '\V\^$\w\+\$'
+			let expr = 'xfunc.GetVar(' . string( a:s ) . ')'
+		else
+			let expr = s:DoCompile(a:s)
+		endif
+		let s:_evalCache.compiledExpr[a:s] = expr
+	endif
+	return expr
+endfunction
+fun! s:DoCompile(s)
+	let fptn = '\V' . '\w\+(\[^($]\{-})' . '\|' . s:nonEscaped . '{\w\+(\[^($]\{-})}'
+	let vptn = '\V' . s:nonEscaped . '$\w\+' . '\|' . s:nonEscaped . '{$\w\+}'
+	let sptn = '\V' . s:nonEscaped . '(\[^($]\{-})'
+	let patternVarOrFunc = fptn . '\|' . vptn . '\|' . sptn
+	if a:s !~ s:regEval
+		return string(xpt#util#UnescapeChar(a:s,s:nonsafe))
+	endif
+	let stringMask = s:CreateStringMask(a:s)
+	if stringMask !~ patternVarOrFunc
+		return string(xpt#util#UnescapeChar(a:s,s:nonsafe))
+	endif
+	let str = a:s
+	let evalMask = repeat('-', len(stringMask))
+	while 1
+		let matchedIndex = match(stringMask,patternVarOrFunc)
+		if matchedIndex == -1
+			break
+		endif
+		let matchedLen = len(matchstr(stringMask,patternVarOrFunc))
+		let matched = str[matchedIndex : matchedIndex + matchedLen - 1]
+		if matched =~ '^{.*}$'
+			let matched = matched[1:-2]
+		endif
+		if matched[0:0] == '(' && matched[-1:-1] == ')'
+			let contextedMatchedLen = len(matched)
+			let spaces = repeat(' ', contextedMatchedLen)
+			let stringMask = (matchedIndex == 0 ? "" : stringMask[:matchedIndex-1]) . spaces . stringMask[matchedIndex + matchedLen :]
+			continue
+		elseif matched[-1:] == ')'
+			let funcname = matchstr(matched, '^\w\+')
+			let args = matched[len(funcname) + 1 : -2]
+			let matched = "xfunc.Call('" . funcname . "',[" . args . '])'
+		elseif matched[0:0] == '$'
+			let matched = 'xfunc.GetVar(' . string( matched ) . ')'
+		endif
+		let contextedMatchedLen = len(matched)
+		let spaces = repeat(' ', contextedMatchedLen)
+		let evalMask = (matchedIndex == 0 ? "" : evalMask[:matchedIndex-1]) . '+' . spaces[1:] . evalMask[matchedIndex + matchedLen :]
+		let stringMask = (matchedIndex == 0 ? "" : stringMask[:matchedIndex-1]) . spaces . stringMask[matchedIndex + matchedLen :]
+		let str  = (matchedIndex == 0 ? "" :  str[:matchedIndex-1]) . matched . str[matchedIndex + matchedLen :]
+	endwhile
+	let idx = 0
+	let expr = ''
+	while 1
+		let matches = matchlist( evalMask, '\V\(-\*\)\(+ \*\)\?', idx )
+		if '' == matches[0]
+			break
+		endif
+		if '' != matches[1]
+			let part = str[idx : idx + len(matches[1]) - 1]
+			if matches[2] != ''
+				let part = xpt#util#UnescapeChar(part . '$', '{$( ')
+				let part = strpart(part,0,strlen(part) - 1)
+			else
+				let part = xpt#util#UnescapeChar(part, '{$( ')
+			endif
+			let expr .= ',' . string(part)
+		endif
+		if '' != matches[2]
+			let expr .= ',' . str[ idx + len(matches[1]) : idx + len(matches[0]) - 1 ]
+		endif
+		let idx += len(matches[0])
+	endwhile
+	let expr = "xfunc.Concat(" . expr[ 1: ] . ')'
+	return expr
+endfunction
+fun! s:CreateStringMask(str)
+	if a:str == ''
+		return ''
+	endif
+	if has_key(s:_evalCache.strMask,a:str)
+		return s:_evalCache.strMask[a:str]
+	endif
+	let dqe = '\V\('. s:nonEscaped . '"\)'
+	let sqe = '\V\('. s:nonEscaped . "'\\)"
+	let dptn = dqe.'\_.\{-}\1'
+	let sptn = sqe.'\%(\_[^'']\)\{-}'''
+	let mask = substitute(a:str, '[ *]', '+', 'g')
+	while 1
+		let d = match(mask,dptn)
+		let s = match(mask,sptn)
+		if d == -1 && s == -1
+			break
+		endif
+		if d > -1 && (d < s || s == -1)
+			let sub = matchstr(mask,dptn)
+			let sub = repeat(' ', len(sub))
+			let mask = substitute(mask, dptn, sub, '')
+		elseif s > -1
+			let sub = matchstr(mask,sptn)
+			let sub = repeat(' ', len(sub))
+			let mask = substitute(mask, sptn, sub, '')
+		endif
+	endwhile
+	let s:_evalCache.strMask[a:str] = mask
+	return mask
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/flt.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/flt.vim
new file mode 100644
index 0000000..2f2d526
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/flt.vim
@@ -0,0 +1,88 @@
+exec xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+let s:log = xpt#debug#Logger( 'debug' )
+let g:EmptyFilter = {}
+let s:proto = { 'force':0, }
+fun! xpt#flt#New(nIndent,text,...)
+	let flt = deepcopy(s:proto)
+	call extend(flt,{ 'nIndent':a:nIndent, 'text':a:text, 'force':a:0 == 1 && a:1, }, 'force' )
+	return flt
+endfunction
+fun! xpt#flt#NewSimple(nIndent,text,...)
+	let flt = { 'nIndent' : a:nIndent, 'text' : a:text, }
+	if a:0 == 1 && a:1
+		let flt.force = 1
+	endif
+	return flt
+endfunction
+fun! xpt#flt#Extend(flt)
+	call extend( a:flt, s:proto, 'keep' )
+endfunction
+fun! xpt#flt#Simplify(flt)
+	call filter( a:flt, 'v:val!=get(s:proto,v:key,-987654)' )
+endfunction
+fun! xpt#flt#Eval(snip,flt,closures)
+	let snipptn = a:snip.ptn
+	let r = { 'rc' : 1, 'parseIndent' : 1, 'nav' : 'stay' }
+	let rst = xpt#eval#Eval(a:flt.text,a:closures)
+	if type(rst) == type(0)
+		let r.rc = 0
+		return r
+	endif
+	if type( rst ) == type( '' )
+		if rst =~ snipptn.lft
+			let r.action = 'build'
+		else
+			let r.action = 'text'
+		endif
+		let r.text = rst
+		return r
+	endif
+	if type(rst) == type([])
+		let r.action = 'pum'
+		let r.pum = rst
+		return r
+	endif
+	call extend( r, rst, 'force' )
+	if ! has_key( r, 'action' ) && has_key( r, 'text' )
+		if r.text =~ snipptn.lft
+			let r.action = 'build'
+		else
+			let r.action = 'text'
+		endif
+	endif
+	let r.action = get( r, 'action', '' )
+	if r.action ==# 'embed'
+		let r.action = 'build'
+	endif
+	if has_key( r, 'cursor' )
+		call xpt#flt#ParseCursorSpec(r)
+	endif
+	return r
+endfunction
+fun! xpt#flt#ParseCursorSpec(flt_rst)
+	let rst = a:flt_rst
+	if type(rst.cursor) == type([]) && type( rst.cursor[ 0 ] ) == type( '' )
+		let rst.cursor = { 'rel' : 1, 'where':rst.cursor[ 0 ], 'offset':get( rst.cursor, 1, [ 0, 0 ] ) }
+	endif
+	let rst.isCursorRel = type(rst.cursor) == type({})
+endfunction
+fun! s:AddIndentToPHs(flt)
+	if a:flt.rst.nIndent == 0
+		return
+	endif
+	let nIndent = a:flt.rst.nIndent
+	let rst = []
+	for ph in a:flt.rst.phs
+		if type( ph ) == type( '' )
+			call add(rst,xpt#util#AddIndent(ph,nIndent))
+		else
+			call add(rst,ph)
+		endif
+		unlet ph
+	endfor
+	let a:flt.rst.phs = rst
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/ftscope.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/ftscope.vim
new file mode 100644
index 0000000..8e87c2e
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/ftscope.vim
@@ -0,0 +1,49 @@
+if exists( "g:__AL_XPT_FTSCP_VIM__" ) && g:__AL_XPT_FTSCP_VIM__ >= XPT#ver
+	finish
+endif
+let g:__AL_XPT_FTSCP_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+fun! xpt#ftscope#New()
+	let inst = { 'filetype':'', 'allTemplates':{}, 'ftkeyword':{ 'regexp' : '\w', 'list' : [] }, 'funcs':{ '$CURSOR_PH' : 'CURSOR' }, 'inited':0, 'varPriority':{}, 'loadedSnipFiles':{}, 'extensionTable':{}, 'snipPieces':[], }
+	return inst
+endfunction
+fun! xpt#ftscope#Init(ftscope)
+	if a:ftscope.inited
+		return
+	endif
+	let l = a:ftscope.funcs.GetVar( '$CL' )
+	let m = a:ftscope.funcs.GetVar( '$CM' )
+	if len(l) <= len(m)
+		let a:ftscope.funcs[ '$CM_OFFSET' ] = ''
+		let a:ftscope.funcs[ '$CL_STRIP' ] = l
+	else
+		let a:ftscope.funcs[ '$CM_OFFSET' ] = repeat( ' ', len( l ) - len( m ) )
+		let a:ftscope.funcs[ '$CL_STRIP' ] = l[ : -len( m ) -1 ]
+	endif
+	let a:ftscope.inited = 1
+endfunction
+fun! xpt#ftscope#IsSnippetLoaded(inst,filename)
+	return has_key(a:inst.loadedSnipFiles,a:filename)
+endfunction
+fun! xpt#ftscope#SetSnippetLoaded(inst,filename)
+	let a:inst.loadedSnipFiles[a:filename] = 1
+	let fn = substitute(a:filename, '\\', '/', 'g')
+	let shortname = matchstr(fn, '\Vftplugin\/\zs\[^/]\+\/\.\*\ze.xpt.vim')
+	if shortname != ''
+		let a:inst.loadedSnipFiles[shortname] = 1
+	endif
+endfunction
+fun! xpt#ftscope#CheckAndSetSnippetLoaded(inst,filename)
+	let loaded = has_key(a:inst.loadedSnipFiles,a:filename)
+	call xpt#ftscope#SetSnippetLoaded(a:inst,a:filename)
+	return loaded
+endfunction
+fun! xpt#ftscope#PushPHPieces(ftscope,phs)
+	call add(a:ftscope.snipPieces,a:phs)
+	return len(a:ftscope.snipPieces) - 1
+endfunction
+fun! xpt#ftscope#GetPHPieces(ftscope,phsID)
+	return a:ftscope.snipPieces[a:phsID]
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/group.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/group.vim
new file mode 100644
index 0000000..b2d6e2c
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/group.vim
@@ -0,0 +1,20 @@
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+exe XPT#importConst
+fun! xpt#group#New(name,sessid)
+	let g = { 'name'      : a:name, 'fullname':a:name, 'initValue':a:name, 'phase':'created',  'processed':0, 'placeHolders':[], 'keyPH':s:nullDict, 'behavior':{}, 'sessid':a:sessid,  }
+	return g
+endfunction
+fun! xpt#group#InsertPH(g,ph,where)
+	if has_key( a:ph, 'isKey' ) && a:g.keyPH != s:nullDict
+		unlet a:ph.isKey
+	endif
+	if has_key( a:ph, 'isKey' )
+		let a:g.keyPH = a:ph
+		let a:g.fullname = a:ph.fullname
+	else
+		call insert(a:g.placeHolders,a:ph,a:where)
+	endif
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/indent.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/indent.vim
new file mode 100644
index 0000000..497c748
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/indent.vim
@@ -0,0 +1,85 @@
+exec xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+exe XPT#importConst
+let s:indent_convert_cmd = 'substitute(v:val, ''\v(^\s*)@<=    '', ''	'', "g" )'
+fun! xpt#indent#ParseStr(text,first_line_shift)
+	let text = xpt#indent#IndentToTabStr(a:text)
+	return xpt#indent#ToActualIndentStr(text,a:first_line_shift)
+endfunction
+fun! xpt#indent#IndentToTabStr(text)
+	let lines = split( a:text, '\n', 1 )
+	call xpt#indent#IndentToTab(lines)
+	return join(lines, "\n")
+endfunction
+fun! xpt#indent#ToActualIndentStr(text,first_line_shift)
+	let lines = split( a:text, '\n', 1 )
+	call xpt#indent#ToActualIndent(lines,a:first_line_shift)
+	return join(lines, "\n")
+endfunction
+fun! xpt#indent#IndentToTab(lines)
+	call map(a:lines,s:indent_convert_cmd)
+endfunction
+fun! xpt#indent#ToActualIndent(lines,first_line_shift)
+	let indent_spaces = repeat(' ', &shiftwidth)
+	let cmd = 'substitute(v:val, ''\v(^	*)@<=	'', ''' . indent_spaces . ''', "g" )'
+	call map(a:lines,cmd)
+	if a:first_line_shift != 0
+		let shift_spaces = repeat(' ', a:first_line_shift)
+		let i = 1
+		while i < len(a:lines)
+			if a:lines[i] != '' || i == len(a:lines)-1
+				let a:lines[i] = shift_spaces . a:lines[i]
+			endif
+			let i += 1
+		endwhile
+	endif
+	if &expandtab
+		return
+	endif
+	let tabspaces = repeat( ' ',  &tabstop )
+	let cmd = 'substitute(v:val, ''\v(^\s*)@<=' . tabspaces . ''', ''	'', "g" )'
+	call map(a:lines,cmd)
+endfunction
+fun! xpt#indent#IndentBefore(pos)
+	let [ln,col] = a:pos
+	let line = matchstr( getline(ln), '\V\^\s\*' )
+	let line = ( col == 1 ) ? '' : line[ 0 : col - 1 - 1 ]
+	let tabspaces = repeat( ' ', &tabstop )
+	return len( substitute( line, '	', tabspaces, 'g' ) )
+endfunction
+fun! xpt#indent#RemoveIndentStr(text,nIndent)
+	let reg = '\V\n \{,' . a:nIndent . '\}'
+	let text = substitute(a:text, reg, '\n', 'g')
+	return text
+endfunction
+fun! xpt#indent#ToSpace(text)
+	if stridx( a:text, "	" ) < 0
+		return a:text
+	endif
+	let tabspaces = repeat( ' ', &tabstop )
+	let reg = '\v' . tabspaces . '| {0,' . (&tabstop-1) . '}	'
+	let rst = []
+	let lines = split( a:text, '\n', 1 )
+	for line in lines
+		let leading_space = matchstr( line, '\v\s*' )
+		let left = line[len(leading_space) :]
+		let l = substitute( leading_space, reg, tabspaces, 'g' )
+		call add(rst,l . left)
+	endfor
+	return join(rst, "\n")
+endfunction
+fun! xpt#indent#SpaceToTab(text)
+	let indent_spaces = repeat(' ', &shiftwidth)
+	let reg = 'substitute(v:val, ''\v(^\s*)@<='.indent_spaces.''', "	", "g" )'
+	let lines = split( a:text, '\n', 1 )
+	call map(lines,reg)
+	return join(lines, "\n")
+endfunction
+fun! xpt#indent#ActualToSnippetNr(n)
+	let n_one_indent = &shiftwidth
+	let n_indent = a:n / n_one_indent
+	return n_indent * 4 + a:n % n_one_indent
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/mark.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/mark.vim
new file mode 100644
index 0000000..a403532
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/mark.vim
@@ -0,0 +1,118 @@
+exec xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+fun! xpt#mark#InitBuf()
+	if ! exists('b:_xpt_snapshot')
+		let b:_xpt_snapshot = {'lines': getline(1, "$"), 'marks': []}
+	endif
+	return b:_xpt_snapshot
+endfunction
+fun! xpt#mark#Add(positions,opt)
+	let snp = xpt#mark#InitBuf()
+	let snp.marks += a:positions
+endfunction
+fun! xpt#mark#Update()
+	let snp = xpt#mark#InitBuf()
+	let lines_b = getline(1, "$")
+	let marks = snp.marks
+	let marks = xpt#mark#UpdateMarks(snp.lines,lines_b,marks)
+	let snp.lines = lines_b
+	let snp.marks = marks
+	return marks
+endfunction
+fun! xpt#mark#UpdateMarks(lines_a,lines_b,marks)
+	let n_lines_a = len(a:lines_a)
+	let marks = a:marks[:]
+	call filter(marks, 'v:val[0]<n_lines_a')
+	call map(marks, 'v:val[:]')
+	let changes = xpt#diff#Diff(a:lines_a,a:lines_b)
+	let [i,j,li,lj,line_offset] = [0,0,len(marks),len(changes),0]
+	while i < li && j < lj
+		let [m,c] = [marks[i],changes[j]]
+		let [ca,cb] = c
+		let [linenr,colnr] = m
+		let [cstart,cend] = ca
+		if linenr < cstart || (linenr == cstart && colnr == 0)
+			let m[0] += line_offset
+			let i += 1
+		elseif linenr >= cend
+			let line_offset += (cb[1] - cb[0]) - (cend - cstart)
+			let j += 1
+		else
+			if cb[0] == cb[1]
+				let ii = i
+				while ii < li && marks[ii][0] < cend
+					let marks[ii] = [cstart[0] + line_offset,0]
+					let ii += 1
+				endwhile
+			else
+				let ii = i
+				while ii < li && marks[ii][0] < cend
+					let ii += 1
+				endwhile
+				let changed_marks = marks[i : ii - 1]
+				call map(changed_marks, '[v:val[0]-cstart, v:val[1]]')
+				let changed_2 = xpt#mark#UpdateLineChange(a:lines_a[cstart : cend-1],a:lines_b[cb[0] : cb[1] - 1],changed_marks)
+				call map(changed_2, '[v:val[0]+cstart+line_offset, v:val[1]]')
+				let marks = marks[: i][: -2] + changed_2 + marks[ii :]
+				let i += len(changed_2)
+				let li = len(marks)
+			endif
+		endif
+	endwhile
+	while i < li
+		let marks[i][0] += line_offset
+		let i += 1
+	endwhile
+	return marks
+endfunction
+fun! xpt#mark#UpdateLineChange(lines_a,lines_b,marks)
+	let joined_offset = []
+	let offset = 0
+	for l in a:lines_a
+		let joined_offset += [offset]
+		let offset += len(l) + 1
+	endfor
+	let n_lines_a = len(a:lines_a)
+	let marks = a:marks[:]
+	call filter(marks, 'v:val[0]<n_lines_a')
+	call map(marks, 'joined_offset[v:val[0]] + v:val[1]')
+	let changes = xpt#diff#Diff(join(a:lines_a, "\n"), join(a:lines_b, "\n"))
+	let [i,j,li,lj,offset] = [0,0,len(marks),len(changes),0]
+	while i < li && j < lj
+		let [m,c] = [marks[i],changes[j]]
+		let [ca,cb] = c
+		if m <= ca[0] || m < ca[1]
+			let marks[i] = min([m,ca[0]]) + offset
+			let i += 1
+		else
+			let offset += (cb[1] - cb[0]) - (ca[1] - ca[0])
+			let j += 1
+		endif
+	endwhile
+	while i < li
+		let marks[i] += offset
+		let i += 1
+	endwhile
+	let lb_ranges = []
+	let offset = 0
+	for l in a:lines_b
+		let lb_ranges += [[offset,offset + len(l) + 1]]
+		let offset = lb_ranges[-1][1]
+	endfor
+	let [i,j] = [0,0]
+	let [li,lj] = [len(marks),len(lb_ranges)]
+	let splitted = []
+	while i < li && j < lj
+		let m = marks[i]
+		let [_start,_end] = lb_ranges[j]
+		if m < _end
+			let splitted += [[j,m - _start]]
+			let i += 1
+		else
+			let j += 1
+		endif
+	endwhile
+	return splitted
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/msvr.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/msvr.vim
new file mode 100644
index 0000000..cab9186
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/msvr.vim
@@ -0,0 +1,156 @@
+if exists( "g:__AL_XPT_MSVR_VIM__" ) && g:__AL_XPT_MSVR_VIM__ >= XPT#ver
+	finish
+endif
+let g:__AL_XPT_MSVR_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+snoremap <Plug>selectToInsert d<BS>
+let g:globalStack = []
+fun! s:_GetAlighWidth()
+	nmap <buffer> 1 2
+	let line = xpt#util#getCmdOutput("silent nmap <buffer> 1")
+	nunmap <buffer> 1
+	let line = split(line, "\n")[0]
+	return len(matchstr(line, '^n.*\ze2$'))
+endfunction
+let s:alignWidth = s:_GetAlighWidth()
+delfunction s:_GetAlighWidth
+fun! xpt#msvr#New(isLocal)
+	return { 'keys':[], 'saved':[], }
+endfunction
+fun! xpt#msvr#Add(inst,mode,key)
+	if a:inst.saved != []
+		throw "keys are already saved and can not be added"
+	endif
+	let a:inst.keys += [[a:mode,a:key]]
+endfunction
+fun! xpt#msvr#AddList(inst,...)
+	if a:0 > 0 && type(a:1) == type([])
+		let list = a:1
+	else
+		let list = a:000
+	endif
+	for item in list
+		let [ mode, key ] = split( item, '^\w\zs_' )
+		call xpt#msvr#Add(a:inst,mode,key)
+	endfor
+endfunction
+fun! xpt#msvr#UnmapAll(inst)
+	if a:inst.saved == []
+		throw "keys are not saved, can not unmap all"
+	endif
+	let localStr = '<buffer> '
+	for [mode,key] in a:inst.keys
+		exe 'silent! ' . mode . 'unmap ' . localStr . key
+	endfor
+endfunction
+fun! xpt#msvr#Save(inst)
+	if a:inst.saved != []
+		return
+	endif
+	for [mode,key] in a:inst.keys
+		call insert(a:inst.saved,xpt#msvr#MapInfo(key,mode))
+	endfor
+	let stack = s:GetStack()
+	call add(stack,a:inst)
+endfunction
+fun! xpt#msvr#Literalize(inst,...)
+	if a:inst.saved == []
+		throw "keys are not saved yet, can not literalize"
+	endif
+	let option = a:0 == 1 ? a:1 : {}
+	let insertAsSelect = get(option, 'insertAsSelect', 0)
+	let localStr = '<buffer> '
+	let nowait = v:version >= 704 ? '<nowait>' : ''
+	for [mode,key] in a:inst.keys
+		if mode == 's' && insertAsSelect
+			exe 'silent! ' . mode . 'map ' . nowait . localStr . key . ' <Plug>selectToInsert' . key
+		else
+			exe 'silent! ' . mode . 'noremap ' . nowait . localStr . key . ' ' . key
+		endif
+	endfor
+endfunction
+fun! xpt#msvr#Restore(inst)
+	if a:inst.saved == []
+		return
+	endif
+	let stack = s:GetStack()
+	if empty(stack) || stack[-1] != a:inst
+		throw "MapSaver: Incorrect Restore of MapSaver:" . s:String( stack ) . ' but ' . string( a:inst.keys )
+	endif
+	for info in a:inst.saved
+		call s:MappingPop(info)
+	endfor
+	let a:inst.saved = []
+	call remove(stack,-1)
+endfunction
+fun! s:GetStack()
+	if !exists( 'b:__map_saver_stack__' )
+		let b:__map_saver_stack__ = []
+	endif
+	return b:__map_saver_stack__
+endfunction
+if v:version >= 704
+fun! xpt#msvr#MapInfo(key,mode)
+	let arg = maparg(a:key,a:mode,0,1)
+	if arg == {} || arg.buffer == 0
+		return { 'mode'  : a:mode, 'key':a:key, 'nore':'', 'isexpr':'', 'isscript':'', 'isbuf':' <buffer> ', 'cont':''}
+	endif
+	let rhs = substitute( arg.rhs, '\V\C<SID>', '<SNR>' . arg.sid . '_', 'g' )
+	let line = s:GetMappingLine(a:key,a:mode)
+	let flag = line[0 : 1]
+	return { 'mode'  : a:mode, 'key':a:key, 'nore':arg.noremap ? 'nore' : '', 'isexpr':arg.expr ? '<expr>' : '', 'isscript':flag[0] == '&' ? ' <script> ' : '', 'isbuf':arg.buffer ? '<buffer>' : '', 'cont':rhs }
+endfunction
+else
+fun! xpt#msvr#MapInfo(key,mode)
+	let line = s:GetMappingLine(a:key,a:mode)
+	if line == ''
+		return { 'mode'  : a:mode, 'key':a:key, 'nore':'', 'isexpr':'', 'isscript':'', 'isbuf':' <buffer> ', 'cont':''}
+	endif
+	let item = line[0:1] " the first 2 characters
+	let isexpr = ''
+	if a:mode == 'i' && line[2:] =~ '\V\w(\.\*)' && line[2:] !~? '\V<c-r>' || a:mode != 'i' && line[2:] =~ '\V\w(\.\*)'  || a:mode == 'i' && line[2:] =~ '\V\.\*?\.\*:\.\*'
+		let isexpr = '<expr> '
+	endif
+	let info =  {'mode' : a:mode, 'key':a:key, 'nore':item =~ '*' ? 'nore' : '', 'isexpr':isexpr, 'isscript':item[0] == '&' ? ' <script> ' : '', 'isbuf':' <buffer> ', 'cont':line[2:]}
+	return info
+endfunction
+endif
+fun! xpt#msvr#MapCommand(info)
+	let i = a:info
+	if i.cont == ''
+		let cmd = i.mode . 'unmap <silent> ' . i.isbuf . i.key
+	else
+		let cmd = i.mode . i['nore'] . 'map <silent> ' . i.isscript . i.isexpr . i.isbuf . i.key . ' ' . i.cont
+	endif
+	return "silent! " . cmd
+endfunction
+fun! s:GetMappingLine(key,mode)
+	let mcmd = "silent ".a:mode."map <buffer> ".a:key
+	let str = xpt#util#getCmdOutput(mcmd)
+	let lines = split(str, "\n")
+	let localmark = '@'
+	let ptn = '\V\c' . a:mode . '  ' . escape(a:key, '\') . '\s\{-}' . '\zs\[*& ]' . localmark . '\%>' . s:alignWidth . 'c\S\.\{-}\$'
+	for line in lines
+		if line =~? ptn
+			return matchstr(line,ptn)
+		endif
+	endfor
+	return ""
+endfunction
+fun! s:MappingPop(info)
+	let cmd = xpt#msvr#MapCommand(a:info)
+	try
+		exe cmd
+	catch /.*/
+	endtry
+endfunction
+fun! s:String(stack)
+	let rst = ''
+	for ms in a:stack
+		let rst .= " **** " . string( ms.keys )
+	endfor
+	return rst
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/ng.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/ng.vim
new file mode 100644
index 0000000..1d89bea
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/ng.vim
@@ -0,0 +1,18 @@
+if exists( "g:__AL_XPT_NG_VIM__" ) && g:__AL_XPT_NG_VIM__ >= XPT#ver
+	finish
+endif
+let g:__AL_XPT_NG_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:priorities = XPT#priorities
+fun! xpt#ng#SetFiletypeDetector(funName)
+	if !exists("b:xptemplateData")
+		call XPTemplateInit()
+	endif
+	let x = b:xptemplateData
+	let prio = get( x.snipFileScope, 'priority', s:priorities.lang )
+	if prio <= x.ftdetector.priority
+		let x.ftdetector = { 'priority' : prio, 'func':function( a:funName ) }
+	endif
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/once.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/once.vim
new file mode 100644
index 0000000..4a6d468
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/once.vim
@@ -0,0 +1,46 @@
+let xpt#once#init = 'if xpt#once#SetAndGetLoaded(expand("<sfile>")) | finish | endif'
+fun! xpt#once#SetAndGetLoaded(fn)
+	if ! exists('g:xptemplate_loaded')
+		let g:xptemplate_loaded = {}
+	endif
+	let fn = resolve(fnamemodify( a:fn, ':p' ))
+	let fn = s:Norm(fn)
+	let _rtps = split(&runtimepath, ',')
+	let rtps = []
+	for p in _rtps
+		let p = resolve(fnamemodify( p, ':p' ))
+		let p = s:Norm(p) . '/'
+		let rtps += [p]
+	endfor
+	call sort(rtps)
+	call reverse(rtps)
+	for p in rtps
+		let pref = fn[0 : len(p) - 1]
+		if pref == p
+			let relpath = fn[len(pref) :]
+			if has_key(g:xptemplate_loaded,relpath)
+				return 1
+			else
+				let g:xptemplate_loaded[relpath] = 1
+				return 0
+			endif
+		endif
+	endfor
+	echoerr a:fn . ' not found in any one of &runtimepath'
+	return 0
+endfunction
+fun! s:Norm(path)
+	let path = a:path
+	let path = substitute(path, '\V\\', '/', 'g')
+	let path = substitute( path, '\V/\*\$', '', 'g' )
+	let path = substitute( path, '\V//\*', '/', 'g' )
+	while 1
+		let p0 = path
+		let path = substitute( path, '\V/\[^/]\+/..', '', 'g' )
+		if p0 == path
+			break
+		endif
+	endwhile
+	return path
+endfunction
+exec xpt#once#init
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/option/cwd_snippet.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/option/cwd_snippet.vim
new file mode 100644
index 0000000..73f8ccc
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/option/cwd_snippet.vim
@@ -0,0 +1,13 @@
+exec xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+call XPT#default('g:xptemplate_cwd_snippet', 0)
+augroup XPT_CWD_SNIPPET
+	au!
+	if g:xptemplate_cwd_snippet == 1
+		au BufEnter * call xpt#cwd#snpt#load()
+		au FileType * call xpt#cwd#snpt#reload()
+		au BufUnload * call xpt#cwd#snpt#clearFlag()
+	endif
+augroup END
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/option/lib_filter.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/option/lib_filter.vim
new file mode 100644
index 0000000..e2e7fa0
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/option/lib_filter.vim
@@ -0,0 +1,22 @@
+exec xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+call XPT#default('g:xptemplate_lib_filter', '\v.')
+fun! xpt#option#lib_filter#Match(fn)
+	if a:fn =~ '\V\<_\w\+\[/\\]\[^/\\]\+' || a:fn =~ '\V~~/xpt/pseudo/ftplugin/'
+		return 1
+	end
+	let regs = []
+	if type(g:xptemplate_lib_filter) == type('')
+		let regs = [g:xptemplate_lib_filter]
+	else
+		let regs = g:xptemplate_lib_filter
+	endif
+	for r in regs
+		if a:fn =~# r
+			return 1
+		endif
+	endfor
+	return 0
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/parser.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/parser.vim
new file mode 100644
index 0000000..f284f73
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/parser.vim
@@ -0,0 +1,582 @@
+exec xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'debug' )
+exe XPT#importConst
+let s:KEYTYPE_MAP = { '.':'onfocus', '.def':'onfocus', '.ontype':'live', '.onchange':'live', }
+let s:KEYTYPE_TO_DICT = { 'pre':'preValues', 'live':'liveFilters', 'onfocus':'onfocusFilters', }
+runtime plugin/xptemplate.vim
+fun s:CompileSnippetFile(fn)
+	if a:fn =~ '\V.xpt.vimc\$' || !filereadable( a:fn )
+		return
+	endif
+	let lines = readfile(a:fn)
+	let lines = xpt#parser#Compact(lines)
+	let lines = xpt#parser#CompileCompacted(lines)
+	call writefile( lines, a:fn . 'c' )
+endfunction
+fun! xpt#parser#Compile(fn)
+	let compiledFn = a:fn . 'c'
+	let ctime = getftime(a:fn)
+	if !filereadable(compiledFn) || getftime(compiledFn) < ctime || g:xptemplate_always_compile
+		call s:CompileSnippetFile(a:fn)
+	else
+	endif
+endfunction
+fun! xpt#parser#Compact(lines)
+	let compacted = []
+	let iSnipPart = match( a:lines, '\V\^XPT\s' )
+	if iSnipPart < 0
+		let iSnipPart = len(a:lines)
+	endif
+	let [i,len] = [0 - 1,iSnipPart - 1]
+	while i < len | let i += 1
+		let l = a:lines[i]
+		if l != '' && l !~ '\v^"[^"]*$'
+			call add(compacted,l)
+		endif
+	endwhile
+	let [s,e,lastNonblank] = [-1,-1,100000]
+	let [i,len] = [iSnipPart - 1,len(a:lines) - 1]
+	while i < len | let i += 1
+		let l = a:lines[i]
+		if l == '' || l =~ '\v^"[^"]*$'
+			let lastNonblank = min([lastNonblank,i - 1])
+			continue
+		endif
+		if l =~# '\V\^..XPT\>'
+			if s == -1
+				let [s,e,lastNonblank] = [-1,-1,100000]
+				continue
+			else
+				let compacted += a:lines[s : i - 1]
+				let [s,e,lastNonblank] = [-1,-1,100000]
+			endif
+		elseif l =~# '\V\^XPT\>'
+			if s == -1
+				let [s,lastNonblank] = [i,i]
+			else
+				let e = min([i - 1,lastNonblank])
+				let compacted += a:lines[s : e]
+				let [s,e,lastNonblank] = [i,-1,100000]
+			endif
+		else
+			let lastNonblank = i
+		endif
+	endwhile
+	if s != -1
+		let compacted += a:lines[s : min([lastNonblank,i])]
+	endif
+	return compacted
+endfunction
+fun! xpt#parser#CompileCompacted(lines)
+	let rst = []
+	let lines = a:lines
+	let iSnipPart = match( lines, '\V\^XPT\s' )
+	if iSnipPart < 0
+		return lines
+	endif
+	if iSnipPart > 0
+		let rst += lines[: iSnipPart - 1]
+		let lines = lines[iSnipPart :]
+	endif
+	let [i,len] = [0,len(lines)]
+	call xpt#indent#IndentToTab(lines)
+	let s = i
+	while i < len-1 | let i += 1
+		let v = lines[i]
+		if v =~# '\V\^XPT\>'
+			let ll = xpt#parser#CompileSnippet(lines[s : i - 1])
+			let rst += [ll]
+			let s = i
+		elseif v =~# '\V\^\\XPT'
+			let lines[i] = v[1 :]
+		endif
+	endwhile
+	if i >= s
+		let ll = xpt#parser#CompileSnippet(lines[s : i])
+		let rst += [ll]
+	endif
+	return rst
+endfunction
+fun! xpt#parser#CompileSnippet(lines)
+	let lines = a:lines
+	let snippetLines = []
+	let setting = xpt#st#New()
+	let l0 = lines[0]
+	let pos = match( l0, '\VXPT\s\+\S\+\.\{-}\zs\s' . s:nonEscaped . '"' )
+	if pos >= 0
+		let [setting.rawHint, lines[0]] = [ matchstr( l0[ pos + 1 + 1 : ], '\v\S.*' ), l0[ : pos ] ]
+	endif
+	let [ x, snippetName; snippetParameters ] = split(lines[0], '\V'.s:nonEscaped.'\s\+')
+	for pair in snippetParameters
+		let name = matchstr(pair, '\V\^\[^=]\*')
+		let value = pair[len(name) :]
+		let value = value[0:0] == '=' ? xpt#util#UnescapeChar(value[1:], ' ') : 1
+		let setting[name] = value
+	endfor
+	let start = 1
+	let len = len(lines)
+	while start < len
+		let command = matchstr( lines[ start ], '\V\^XSETm\?\ze\s' )
+		if command != ''
+			let [key,val,start] = s:GetXSETkeyAndValue(lines,start)
+			if key == ''
+				let start += 1
+				continue
+			endif
+			let [keyname,keytype] = xpt#parser#GetKeyType(key)
+			call s:HandleXSETcommand(setting,command,[keyname,keytype,val])
+		elseif lines[start] =~# '^\\XSET' " escaped XSET or XSETm
+			let snippetLines += [lines[start][1:]]
+		else
+			call add(snippetLines,lines[start])
+		endif
+		let start += 1
+	endwhile
+	call xpt#st#Simplify(setting)
+	if has_key( setting, 'alias' )
+		return printf( 'call XPTemplateAlias(%s,%s,%s)', string(snippetName),string(setting.alias),string(setting))
+	else
+		return printf( 'call XPTdefineSnippet(%s,%s,%s)', string(snippetName),string(setting),string(snippetLines))
+	endif
+endfunction
+fun! xpt#parser#Include(...)
+	call xpt#parser#Load(a:000,1)
+endfunction
+fun! xpt#parser#Embed(...)
+	call xpt#parser#Load(a:000,0)
+endfunction
+fun! xpt#parser#Load(fns,inherit)
+	let scope = b:xptemplateData.snipFileScope
+	let ftscope = b:xptemplateData.filetypes[scope.filetype]
+	let saved_inherit = scope.inheritFT
+	let scope.inheritFT = a:inherit
+	let fns = xpt#util#Flatten(a:fns)
+	for f in fns
+		if a:inherit && xpt#ftscope#IsSnippetLoaded(ftscope,f)
+			continue
+		endif
+		call xpt#snipfile#Push()
+		exe 'runtime! ftplugin/' . f . '.xpt.vim'
+		call xpt#snipfile#Pop()
+	endfor
+	let scope.inheritFT = saved_inherit
+endfunction
+fun! xpt#parser#SetVar(nameSpaceValue)
+	let x = b:xptemplateData
+	let ftScope = x.filetypes[x.snipFileScope.filetype]
+	let name = matchstr(a:nameSpaceValue, '^\S\+\ze')
+	if name == ''
+		return
+	endif
+	let val  = matchstr(a:nameSpaceValue, '\s\+\zs.*')
+	if val =~ '^''.*''$'
+		let val = val[1:-2]
+	else
+		let val = substitute( val, '\\ ', " ", 'g' )
+	endif
+	let val = substitute( val, '\\n', "\n", 'g' )
+	let priority = x.snipFileScope.priority
+	if !has_key(ftScope.varPriority,name) || priority <= ftScope.varPriority[name]
+		let [ftScope.funcs[name],ftScope.varPriority[name]] = [val,priority]
+	endif
+endfunction
+fun! xpt#parser#SnipSet(dictNameValue)
+	let x = b:xptemplateData
+	let snipScope = x.snipFileScope
+	let [ dict, nameValue ] = split( a:dictNameValue, '\V.', 1 )
+	let name = matchstr( nameValue, '^.\{-}\ze=' )
+	let value = nameValue[len(name) + 1 :]
+	let snipScope[dict][name] = value
+endfunction
+fun! xpt#parser#loadSpecialFiletype(ft)
+	let x = b:xptemplateData
+	let ft = a:ft
+	if has_key(x.filetypes,ft)
+		return
+	endif
+	if ft == 'unknown'
+		call xpt#parser#loadSnippetFile( 'unknown/unknown' )
+	else
+		call xpt#parser#InitSnippetFile( '~~/xpt/pseudo/ftplugin/' . ft . '/' . ft . '.xpt.vim' )
+		call XPTinclude( '_common/common' )
+		call XPTfiletypeInit()
+	endif
+	call XPTparseSnippets()
+endfunction
+fun! xpt#parser#loadSnippetFile(rel_snip)
+	exe 'runtime! ftplugin/' . a:rel_snip . '.xpt.vim'
+	call XPTfiletypeInit()
+endfunction
+fun! s:AssignSnipFT(filename)
+	let x = b:xptemplateData
+	let filename = substitute( a:filename, '\\', '/', 'g' )
+	if filename =~ 'unknown.xpt.vim$'
+		return 'unknown'
+	endif
+	let ftFolder = matchstr( filename, '\V/ftplugin/\zs\[^\\]\+\ze/' )
+	if empty(x.snipFileScopeStack)
+		if filename =~ '\V\<pseudo\>/'
+			return ftFolder
+		endif
+		if &filetype =~ '\<' . ftFolder . '\>' " sub type like 'xpt.vim'
+			let ft = &filetype
+		else
+			let ft = 'not allowed'
+		endif
+	else
+		if x.snipFileScopeStack[-1].inheritFT || ftFolder =~ '\V\^_'
+			if !has_key( x.snipFileScopeStack[ -1 ], 'filetype' )
+				throw 'parent may has no XPTemplate command called :' . a:filename
+			endif
+			let ft = x.snipFileScopeStack[-1].filetype
+		else
+			let ft = ftFolder
+		endif
+	endif
+	return ft
+endfunction
+fun! xpt#parser#InitSnippetFile(filename,...)
+	if ! xpt#option#lib_filter#Match(a:filename)
+		return 'finish'
+	endif
+	if !exists("b:xptemplateData")
+		call XPTemplateInit()
+	endif
+	let x = b:xptemplateData
+	let filetypes = x.filetypes
+	let snipScope = xpt#snipfile#New(a:filename)
+	let snipScope.filetype = s:AssignSnipFT(a:filename)
+	let x.snipFileScope = snipScope
+	let ft = snipScope.filetype
+	if ft == 'not allowed'
+		call s:log.Info( "not allowed:" . a:filename )
+		return 'finish'
+	endif
+	if ! has_key(filetypes,ft)
+		let filetypes[ft] = xpt#ftscope#New()
+	endif
+	let ftScope = filetypes[ft]
+	if xpt#ftscope#CheckAndSetSnippetLoaded(ftScope,a:filename)
+		return 'finish'
+	endif
+	for pair in a:000
+		let kv = split( pair, '=', 1 )
+		let key = kv[0]
+		let val = join( kv[ 1 : ], '=' )
+		if key =~ 'prio\%[rity]'
+			call XPTemplatePriority(val)
+		elseif key =~ 'mark'
+			call XPTemplateMark(val[0 : 0],val[1 : 1])
+		elseif key =~ 'key\%[word]'
+			call XPTemplateKeyword(val)
+		endif
+	endfor
+	return 'doit'
+endfunction
+fun! xpt#parser#SnippetFileInit_for_compiled(filename,...)
+	if !filereadable(a:filename)
+		return call( function( 'xpt#parser#InitSnippetFile' ), [ a:filename ] + a:000 )
+	endif
+	if a:filename =~ '\V.xpt.vim\$'
+		call xpt#parser#Compile(a:filename)
+		exe 'so' a:filename . 'c'
+		return 'finish'
+	else
+		return call( function( 'xpt#parser#InitSnippetFile' ), [ a:filename ] + a:000 )
+	endif
+endfunction
+fun! xpt#parser#LoadSnippets()
+	let fts = split( &filetype, '\V.', 1 )
+	call filter( fts, 'v:val!=""' )
+	for ft in fts
+		call xpt#parser#LoadFTSnippets(ft)
+	endfor
+endfunction
+fun! s:RTP()
+	let rtps = split( &runtimepath, ',' )
+	call filter( rtps, 'v:val!=""' )
+	let rtps += [ g:XPT_PATH . '/xptsnippets', g:XPT_PATH . '/personal' ]
+	let rtpath = join( rtps, ',' )
+	return rtpath
+endfunction
+fun! xpt#parser#LoadFtDetectors(ft)
+	let namePattern = a:ft =~ '/' ? a:ft : a:ft . '/*'
+	let rtpath = s:RTP()
+	let ftdetectfiles = split( globpath( rtpath, 'ftplugin/' . namePattern . '.ftdetect.vim' ), "\n" )
+	for fn in ftdetectfiles
+		exe 'so' fn
+	endfor
+endfunction
+fun! xpt#parser#LoadFTSnippets(ft)
+	let namePattern = a:ft =~ '/' ? a:ft : a:ft . '/*'
+	let rtpath = s:RTP()
+	let ftdetectfiles = split( globpath( rtpath, 'ftplugin/' . namePattern . '.ftdetect.vim' ), "\n" )
+	for fn in ftdetectfiles
+		exe 'so' fn
+	endfor
+	let snipfiles = split( globpath( rtpath, 'ftplugin/' . namePattern . '.xpt.vim' ), "\n" )
+	for fn in snipfiles
+		let compiled = fn . 'c'
+		if !filereadable(compiled) || getftime(compiled) < getftime(fn) || g:xptemplate_always_compile
+			call xpt#parser#Compile(fn)
+			exe 'so' compiled
+		endif
+	endfor
+endfunction
+fun! xpt#parser#GetKeyType(rawKey)
+	let keytype = matchstr(a:rawKey, '\V'.s:nonEscaped.'|\zs\.\{-}\$')
+	if keytype == ""
+		let keytype = matchstr(a:rawKey, '\V'.s:nonEscaped.'.\zs\.\{-}\$')
+	endif
+	let keyname = keytype == "" ? a:rawKey :  a:rawKey[ 0 : - len(keytype) - 2 ]
+	let keyname = substitute(keyname, '\V\\\(\[.|\\]\)', '\1', 'g')
+	return [keyname,keytype]
+endfunction
+let s:KEY_NAME = 0
+let s:KEY_TYPE = 1
+let s:VALUE = 2
+let s:stHandler = {}
+fun! s:stHandler.ComeFirst(setting,cmdArgs)
+	let a:setting.comeFirst = xpt#util#SplitWith( a:cmdArgs[ s:VALUE ], ' ' )
+endfunction
+fun! s:stHandler.ComeLast(setting,cmdArgs)
+	let a:setting.comeLast = xpt#util#SplitWith( a:cmdArgs[ s:VALUE ], ' ' )
+endfunction
+fun! s:stHandler.postQuoter(setting,cmdArgs)
+	let pq = split( a:cmdArgs[ s:VALUE ], ',' )
+	let a:setting.postQuoter = { 'start' : pq[0], 'end' : pq[1] }
+endfunction
+let s:stHandler.PostQuoter = s:stHandler.postQuoter
+let s:keytypeHandler = {}
+fun! s:keytypeHandler.repl(setting,cmdArgs)
+	let a:setting.replacements[a:cmdArgs[s:KEY_NAME]] = a:cmdArgs[s:VALUE]
+endfunction
+fun! s:keytypeHandler.map(setting,cmdArgs)
+	let [kn,kt,val] = a:cmdArgs
+	let mp = a:setting.mappings
+	if !has_key(mp,kn)
+		let mp[ kn ] = { 'saver' : xpt#msvr#New( 1 ), 'keys' : {} }
+	endif
+	let key = matchstr( val, '\V\^\S\+\ze\s' )
+	let mapping = matchstr( val, '\V\s\+\zs\.\*' )
+	call xpt#msvr#Add( mp[ kn ].saver, 'i', key )
+	let mp[kn].keys[key] = xpt#flt#NewSimple(0,mapping)
+endfunction
+fun! s:keytypeHandler.post(setting,cmdArgs)
+	let [kn,kt,val] = a:cmdArgs
+	let val = xpt#ph#AlterFilterByPHName(kn,val)
+	let a:setting.postFilters[kn] = xpt#flt#NewSimple(0,val)
+endfunction
+fun! s:HandleXSETcommand(setting,command,cmdArgs)
+	let [kn,kt,val] = a:cmdArgs
+	let kt = get( s:KEYTYPE_MAP, '.' . kt, kt )
+	let fcon = {}
+	if has_key(s:stHandler,kn)
+		let fcon.f = s:stHandler[kn]
+		call fcon.f(a:setting,[kn,kt,val])
+	elseif has_key(s:KEYTYPE_TO_DICT,kt)
+		let dicName = s:KEYTYPE_TO_DICT[kt]
+		let a:setting[dicName][kn] = xpt#flt#NewSimple(0,val)
+	elseif kn =~ '\V\^$'
+		let a:setting.variables[kn] = val
+	elseif has_key(s:keytypeHandler,kt)
+		let fcon.f = s:keytypeHandler[kt]
+		call fcon.f(a:setting,[kn,kt,val])
+	else
+		throw "unknown key name or type:" . kn . ' ' . kt
+	endif
+endfunction
+fun! xpt#parser#LoadSnippetToParseList(fn)
+	let lines = readfile(a:fn)
+	let i = match( lines, '\V\^XPTemplateDef' )
+	if i == -1
+		let i = match( lines, '\V\^XPT\s' ) - 1
+	endif
+	if i < 0
+		return
+	endif
+	let lines = lines[i :]
+	let x = b:xptemplateData
+	let x.snippetToParse += [ { 'snipFileScope' : x.snipFileScope, 'lines' : lines } ]
+endfunction
+fun! xpt#parser#ParseSnippet(p)
+	call xpt#snipfile#Push()
+	let x = b:xptemplateData
+	let x.snipFileScope = a:p.snipFileScope
+	let lines = a:p.lines
+	let [i,len] = [0,len(lines)]
+	let [s,e,blk] = [-1,-1,10000]
+	while i < len-1 | let i += 1
+		let v = lines[i]
+		if v =~ '^\s*$' || v =~ '^"[^"]*$'
+			let blk = min([blk,i - 1])
+			continue
+		endif
+		if v =~# '^\.\.XPT'
+			let e = i - 1
+			call s:XPTemplateParseSnippet(lines[s : e])
+			let [s,e,blk] = [-1,-1,10000]
+		elseif v =~# '^XPT\>'
+			if s != -1
+				let e = min([i - 1,blk])
+				call s:XPTemplateParseSnippet(lines[s : e])
+				let [s,e,blk] = [i,-1,10000]
+			else
+				let s = i
+				let blk = i
+			endif
+		elseif v =~# '^\\XPT'
+			let lines[i] = v[1 :]
+		else
+			let blk = i
+		endif
+	endwhile
+	if s != -1
+		call s:XPTemplateParseSnippet(lines[s : min([blk,i])])
+	endif
+	call xpt#snipfile#Pop()
+endfunction
+fun! s:XPTemplateParseSnippet(lines)
+	let lines = a:lines
+	let snipScope = XPTsnipScope()
+	let snipScope.loadedSnip = get( snipScope, 'loadedSnip', {} )
+	let snippetLines = []
+	let setting = deepcopy(g:XPTemplateSettingPrototype)
+	let [hint,lines[0]] = s:GetSnipCommentHint(lines[0])
+	if hint != ''
+		let setting.rawHint = hint
+	endif
+	let snippetParameters = split(lines[0], '\V'.s:nonEscaped.'\s\+')
+	let snippetName = snippetParameters[1]
+	let snippetParameters = snippetParameters[2:]
+	for pair in snippetParameters
+		let name = matchstr(pair, '\V\^\[^=]\*')
+		let value = pair[len(name) :]
+		let value = value[0:0] == '=' ? xpt#util#UnescapeChar(value[1:], ' ') : 1
+		let setting[name] = value
+	endfor
+	let start = 1
+	let len = len(lines)
+	while start < len
+		let command = matchstr( lines[ start ], '\V\^XSETm\?\ze\s' )
+		if command != ''
+			let [key,val,start] = s:GetXSETkeyAndValue(lines,start)
+			if key == ''
+				let start += 1
+				continue
+			endif
+			let [keyname,keytype] = xpt#parser#GetKeyType(key)
+			call s:HandleXSETcommandOld(setting,command,keyname,keytype,val)
+		elseif lines[start] =~# '^\\XSET' " escaped XSET or XSETm
+			let snippetLines += [lines[start][1:]]
+		else
+			let snippetLines += [lines[start]]
+		endif
+		let start += 1
+	endwhile
+	let setting.fromXPT = 1
+	if has_key( setting, 'alias' )
+		call XPTemplateAlias(snippetName,setting.alias,setting)
+	else
+		call XPTdefineSnippet(snippetName,setting,snippetLines)
+	endif
+	if has_key(snipScope.loadedSnip,snippetName)
+		call XPT#info( "XPT: warn : duplicate snippet:" . snippetName . ' in file:' . snipScope.filename )
+	endif
+	let snipScope.loadedSnip[snippetName] = 1
+	if has_key( setting, 'synonym' )
+		let synonyms = split( setting.synonym, '|' )
+		for synonym in synonyms
+			call XPTemplateAlias(synonym,snippetName,{})
+			if has_key(snipScope.loadedSnip,synonym)
+				call XPT#warn( "XPT: warn : duplicate synonym:" . synonym . ' in file:' . snipScope.filename )
+			endif
+			let snipScope.loadedSnip[synonym] = 1
+		endfor
+	endif
+endfunction
+fun! s:GetSnipCommentHint(str)
+	let pos = match(a:str, '\V' . s:nonEscaped . '\shint=')
+	if pos != -1
+		return [a:str[pos + 6 :],a:str[: pos - 1]]
+	endif
+	let pos = match( a:str, '\VXPT\s\+\S\+\.\{-}\zs\s' . s:nonEscaped . '"' )
+	if pos == -1
+		return [ '', a:str ]
+	else
+		return [ matchstr( a:str[ pos + 1 + 1 : ], '\S.*' ), a:str[ : pos ] ]
+	endif
+endfunction
+fun! s:GetXSETkeyAndValue(lines,start)
+	let start = a:start
+	let XSETparam = matchstr(a:lines[start], '\V\^XSET\%[m]\s\+\zs\.\*')
+	let isMultiLine = a:lines[ start ] =~# '\V\^XSETm'
+	if isMultiLine
+		let key = XSETparam
+		let [start,val] = s:ParseMultiLineValues(a:lines,start)
+	else
+		let key = matchstr(XSETparam, '\V\[^=]\*\ze=')
+		if key == ''
+			return [ '', '', start + 1 ]
+		endif
+		let val = matchstr(XSETparam, '\V=\s\*\zs\.\*')
+		let val = substitute(val, '\\n', "\n", 'g')
+	endif
+	return [key,val,start]
+endfunction
+fun! s:ParseMultiLineValues(lines,start)
+	let lines = a:lines
+	let start = a:start
+	let endPattern = '\V\^XSETm\s\+END\$'
+	let start += 1
+	let multiLineValues = []
+	while start < len(lines)
+		let line = lines[start]
+		if line =~# endPattern
+			break
+		endif
+		if line =~# '^\V\\\+XSET\%[m]'
+			let slashes = matchstr( line, '^\\\+' )
+			let nrSlashes = len(slashes + 1) / 2
+			let line = line[nrSlashes :]
+		endif
+		let multiLineValues += [line]
+		let start += 1
+	endwhile
+	let val = join(multiLineValues, "\n")
+	return [start,val]
+endfunction
+fun! s:HandleXSETcommandOld(setting,command,keyname,keytype,value)
+	if a:keyname ==# 'ComeFirst'
+		let a:setting.comeFirst = xpt#util#SplitWith( a:value, ' ' )
+	elseif a:keyname ==# 'ComeLast'
+		let a:setting.comeLast = xpt#util#SplitWith( a:value, ' ' )
+	elseif a:keyname ==# 'postQuoter'
+		let a:setting.postQuoter = a:value
+	elseif a:keyname =~ '\V\^$'
+		let a:setting.variables[a:keyname] = a:value
+	elseif a:keytype == "" || a:keytype ==# 'def'
+		let a:setting.defaultValues[a:keyname] = xpt#flt#New(0,a:value)
+	elseif a:keytype ==# 'map'
+		let a:setting.mappings[a:keyname] = get( a:setting.mappings, a:keyname, { 'saver' : xpt#msvr#New(1), 'keys' : {} } )
+		let key = matchstr( a:value, '\V\^\S\+\ze\s' )
+		let mapping = matchstr( a:value, '\V\s\+\zs\.\*' )
+		call xpt#msvr#Add( a:setting.mappings[ a:keyname ].saver, 'i', key )
+		let a:setting.mappings[a:keyname].keys[key] = xpt#flt#New(0,mapping)
+	elseif a:keytype ==# 'pre'
+		let a:setting.preValues[a:keyname] = xpt#flt#New(0,a:value)
+	elseif a:keytype ==# 'ontype'
+		let a:setting.ontypeFilters[a:keyname] = xpt#flt#New(0,a:value)
+	elseif a:keytype ==# 'post'
+		if a:keyname =~ '\V...'
+			let a:setting.postFilters[a:keyname] = xpt#flt#New( 0, 'BuildIfNoChange(' . string(a:value) . ')' )
+		else
+			let a:setting.postFilters[a:keyname] = xpt#flt#New(0,a:value)
+		endif
+	else
+		throw "unknown key name or type:" . a:keyname . ' ' . a:keytype
+	endif
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/ph.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/ph.vim
new file mode 100644
index 0000000..ad6b2c7
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/ph.vim
@@ -0,0 +1,122 @@
+exec xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+exe XPT#importConst
+fun! xpt#ph#CreateFromScreen(snipObject,nameInfo,valueInfo)
+	let xp = a:snipObject.ptn
+	let toescape = xp.l . xp.r
+	let leftEdge = xpt#util#TextBetween(a:nameInfo[0 : 1])
+	let name = xpt#util#TextBetween(a:nameInfo[1 : 2])
+	let rightEdge = xpt#util#TextBetween(a:nameInfo[2 : 3])
+	let [leftEdge,name,rightEdge] = [leftEdge[1 :],name[1 :],rightEdge[1 :]]
+	let leftEdge = xpt#util#UnescapeChar(leftEdge,toescape)
+	let name = xpt#util#UnescapeChar(name,toescape)
+	let rightEdge = xpt#util#UnescapeChar(rightEdge,toescape)
+	if a:valueInfo[1] != a:valueInfo[0]
+		let posList = [a:valueInfo[0],a:valueInfo[2]]
+		let val = xpt#util#TextBetween(posList)
+		let val = val[1:]
+		let nIndent = indent(a:valueInfo[0][0])
+		let phFilter =  { 'text' : val, 'indent' : nIndent, }
+	else
+		let phFilter = 0
+	endif
+	return xpt#ph#New(a:snipObject, { 'leftEdge'  : leftEdge, 'name':name, 'rightEdge':rightEdge, 'isKey':a:nameInfo[0] != a:nameInfo[1], }, phFilter )
+endfunction
+fun! xpt#ph#New(snipObject,pieces)
+	let phptns = a:snipObject.ptn
+	let textPieces = deepcopy(a:pieces)
+	call map( textPieces, 'v:val.text' )
+	let iFilter = match( textPieces, '\V\^' . a:snipObject.ptn.r )
+	if iFilter > 1
+		let ph ={ 'leftEdge':a:pieces[ 0 ], 'name':a:pieces[ 1 ].text, 'displayText':a:pieces[ 1 ], 'rightEdge':iFilter > 2 ? a:pieces[2] : { 'nIndent' : a:pieces[ 1 ].nIndent, 'text' : '' }, 'isKey':1 }
+		let ph.fullname = ph.leftEdge.text . ph.name . ph.rightEdge.text
+		for key in [ 'leftEdge', 'displayText', 'rightEdge' ]
+			call xpt#ph#CreateEvaluatablePHElt(a:snipObject,ph,key)
+		endfor
+	else
+		let ph ={ 'name':a:pieces[ 0 ].text, 'displayText':a:pieces[ 0 ], 'fullname':a:pieces[ 0 ].text }
+		call xpt#ph#CreateEvaluatablePHElt( a:snipObject, ph, 'displayText' )
+	endif
+	let spec = xpt#ph#CreateSpecial(a:snipObject,ph)
+	if spec isnot 0
+		return spec
+	endif
+	if len(a:pieces) - iFilter == 1
+		return ph
+	endif
+	let ftype = len( a:pieces ) - iFilter > 2 ? 'postFilter' : 'liveFilter'
+	let fltPart = copy(a:pieces[iFilter])
+	let fltPart.text = fltPart.text[1:]
+	let fltPart.text = xpt#ph#AlterFilterByPHName(ph.name,fltPart.text)
+	let flt = xpt#ph#CreatePHEltFilter(a:snipObject,fltPart)
+	if has_key( ph, 'isKey' ) && ph.name != ''
+		let a:snipObject.setting[ ftype . 's' ][ ph.name ] = flt
+	else
+		let ph[ftype] = flt
+	endif
+	return ph
+endfunction
+fun! xpt#ph#CreateEvaluatablePHElt(snipObject,ph,key)
+	let phptns = a:snipObject.ptn
+	if a:ph[ a:key ].text =~ '\V' . phptns.item_var . '\|' . phptns.item_func . '\|\n'
+		let a:ph[a:key] = xpt#ph#CreatePHEltFilter(a:snipObject,a:ph[a:key])
+	elseif a:ph[ a:key ].text =~ '\V' . s:ptnIncFull . '\|' . s:ptnIncSimp
+		let a:ph[a:key] = xpt#ph#CreatePHEltFilter(a:snipObject,a:ph[a:key])
+	else
+		let a:ph[a:key] = xpt#util#UnescapeChar(a:ph[a:key].text,a:snipObject.ptn.lr)
+	endif
+endfunction
+fun! xpt#ph#CreateSpecial(snipObject,ph)
+	let phptns = a:snipObject.ptn
+	if type(a:ph.displayText) == type({})
+		if a:ph.displayText[ 'text' ] =~ s:ptnIncFull
+			let params = matchstr( a:ph.displayText[ 'text' ], s:ptnIncFull )
+			let [name,args] = xpt#snip#ParseInclusionStatement(a:snipObject,params)
+			let a:ph.displayText[ 'text' ] = 'Inc(' . string( name ) . ', 1,  ' . string( args ) .')'
+			return a:ph
+		elseif a:ph.displayText[ 'text' ] =~ s:ptnIncSimp
+			let params = matchstr( a:ph.displayText[ 'text' ], s:ptnIncSimp )
+			let [name,args] = xpt#snip#ParseInclusionStatement(a:snipObject,params)
+			let a:ph.displayText[ 'text' ] = 'Inc(' . string( name ) . ', 0,  ' . string( args ) .')'
+			return a:ph
+		endif
+		let a:ph.value = 1
+		return a:ph
+	endif
+	return 0
+endfunction
+fun! xpt#ph#FilterEltKeys(ph)
+	let phKeys = [ 'leftEdge', 'displayText', 'rightEdge' ]
+	call filter( phKeys, 'type( get( a:ph, v:val, 0 ) ) is ' . string( type( {} ) ) )
+	return phKeys
+endfunction
+fun! xpt#ph#GetPresetFilter(ph,setting)
+	let phLive = get( a:ph, 'liveFilter', g:EmptyFilter )
+	if a:ph.name != ''
+		let pre = get(a:setting.preValues,a:ph.name,g:EmptyFilter)
+		if get( pre, 'force' )
+			return pre
+		endif
+		let live = get(a:setting.liveFilters,a:ph.name,g:EmptyFilter)
+		if get( live, 'force' )
+			return live
+		endif
+		let phLive = phLive is g:EmptyFilter || get( pre, 'force' ) ? pre : phLive
+		let phLive = phLive is g:EmptyFilter || get( live, 'force' ) ? live : phLive
+	endif
+	return phLive
+endfunction
+fun! xpt#ph#CreatePHEltFilter(snipObject,elt)
+	let val = xpt#util#UnescapeChar(a:elt.text,a:snipObject.ptn.lr)
+	return xpt#flt#New(-a:elt.nIndent,val)
+endfunction
+fun! xpt#ph#AlterFilterByPHName(phname,fltText)
+	if a:phname =~ '\V...\$'
+		let a:fltText = xpt#util#UnescapeChar( a:fltText, '$({' )
+		return 'BuildIfNoChange(' . string( a:fltText ) . ')'
+	endif
+	return a:fltText
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/phfilter.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/phfilter.vim
new file mode 100644
index 0000000..c661f80
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/phfilter.vim
@@ -0,0 +1,223 @@
+if exists( "g:__AL_XPT_PHFILTER_VIM__" ) && g:__AL_XPT_PHFILTER_VIM__ >= XPT#ver
+	finish
+endif
+let g:__AL_XPT_PHFILTER_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+let s:log = xpt#debug#Logger( 'debug' )
+exe XPT#importConst
+fun! xpt#phfilter#Filter(so,PHFilterName,extContext)
+	let fctx = { 'snipObject':a:so, 'snipSetting':a:so.setting, 'phptns':a:so.ptn,  'phEvalContext':{ 'variables':a:so.setting.variables, 'pos':[ 0, 0 ], 'nIndAdd':0 },  'srcPHs':a:so.parsedSnip, 'rstPHs':[],  'skip':'\v[^]', 'forceNotSkip':'\v.', }
+	call extend( fctx, a:extContext, 'force' )
+	call extend( fctx.phEvalContext, { 'pos' : [ 0, 0 ], 'nIndAdd' : 0 }, 'force' )
+	let fctx.srcPHs = deepcopy(fctx.srcPHs)
+	if len(fctx.srcPHs) == 0
+		return []
+	endif
+	call add(b:xptemplateData.phFilterContexts,fctx)
+	call add( fctx.rstPHs, "\n" )
+	try
+		while !empty(fctx.srcPHs)
+			let fctx.ph = remove(fctx.srcPHs,0)
+			let r = {a:PHFilterName}(fctx)
+		endwhile
+	finally
+		call remove(b:xptemplateData.phFilterContexts,-1)
+	endtry
+	let rst = fctx.rstPHs
+	if !empty(rst)
+		let rst[0] = rst[0][1 :]
+	endif
+	call filter( rst, 'len(v:val) > 0' )
+	return rst
+endfunction
+fun! xpt#phfilter#EvalInstantFilters(fctx)
+	if type(a:fctx.ph) == type({})
+		for a:fctx.key in [ 'leftEdge', 'displayText', 'rightEdge' ]
+			if s:EvalPHElt(a:fctx) isnot s:GOON
+				return
+			endif
+		endfor
+	endif
+	call xpt#phfilter#FeedPH(a:fctx)
+endfunction
+fun! xpt#phfilter#EvalPresetFilters(fctx)
+	if type(a:fctx.ph) == type({})
+		if type( a:fctx.ph[ 'displayText' ] ) == type( '' )
+			let flt = xpt#ph#GetPresetFilter(a:fctx.ph,a:fctx.snipSetting)
+			if flt isnot g:EmptyFilter
+				let a:fctx.ph[ 'displayText' ] = flt
+			endif
+		endif
+		for a:fctx.key in [ 'leftEdge', 'displayText', 'rightEdge' ]
+			if s:EvalPHElt(a:fctx) isnot s:GOON
+				return
+			endif
+		endfor
+	endif
+	call xpt#phfilter#FeedPH(a:fctx)
+endfunction
+fun! s:EvalPHElt(fctx,...)
+	let a:fctx.key = a:0 > 0 ? a:1 : a:fctx.key
+	let [ph,key] = [a:fctx.ph,a:fctx.key]
+	if has_key(ph,key) && type(ph[key]) == type({})
+		let flt = ph[key]
+		if flt.text =~# a:fctx.forceNotSkip || flt.text !~# a:fctx.skip
+			call xpt#flt#Eval(flt, a:fctx.snipObject.ftScope.funcs, a:fctx.phEvalContext)
+			return xpt#phfilter#HandleEltFilterRst(a:fctx,flt)
+		endif
+	endif
+	return s:GOON
+endfunction
+fun! xpt#phfilter#HandleEltFilterRst(fctx,flt)
+	let frst = a:flt.rst
+	if frst.rc > 0
+		if has_key( frst, 'action' )
+			let rc = s:HandleAction(a:fctx,a:flt)
+			if rc is s:DONE
+				return rc
+			endif
+		endif
+		if has_key( frst, 'text' )
+			let a:fctx.ph[a:fctx.key] = frst.text
+			return s:GOON
+		else
+			call XPT#info( 'Failed to pre-eval filter: ' . string( frst ) . ' filter=' . string( a:flt.text ) )
+			return s:UNDONE
+		endif
+	endif
+	return s:GOON
+endfunction
+fun! s:HandleAction(fctx,flt)
+	let frst = a:flt.rst
+	if frst.action == 'embed'
+		call extend(a:fctx.srcPHs,frst.phs,0)
+	else
+		return s:UNDONE
+	endif
+	return s:DONE
+endfunction
+fun! xpt#phfilter#ReplacePH(fctx)
+	let ph = a:fctx.ph
+	let phptns = a:fctx.phptns
+	let params = a:fctx.replParams
+	let rst = a:fctx.rstPHs
+	if type( ph ) == type( '' ) || !has_key(params,ph.name)
+		call xpt#phfilter#FeedPH(a:fctx)
+	else
+		let rep = params[ph.name]
+		if rep =~ phptns.lft
+			if rep !~ phptns.rt . '\$'
+				let rep = phptns.l . rep . phptns.r
+			endif
+			let slaveSnip = xpt#snip#NewSlave(a:fctx.snipObject,rep)
+			call xpt#snip#CompileAndParse(slaveSnip)
+			for a:fctx.ph in slaveSnip.parsedSnip
+				call xpt#phfilter#FeedPH(a:fctx)
+			endfor
+			let a:fctx.ph = ph
+		else
+			let ph.name = rep
+			let ph.displayText = rep
+			if ph.displayText =~ '\V' . phptns.item_var . '\|' . phptns.item_func . '\|\n'
+				let filterText = xpt#util#UnescapeChar(ph.displayText,phptns.lr)
+				let ph.displayText = xpt#flt#New(-a:fctx.phEvalContext.nIndAdd,filterText)
+			endif
+			call xpt#phfilter#FeedPH(a:fctx)
+		endif
+	endif
+endfunction
+fun! xpt#phfilter#PostQuote(fctx)
+	let ph = a:fctx.ph
+	let quoter = a:fctx.snipObject.setting.postQuoter
+	if type( ph ) == type( '' )
+		call xpt#phfilter#AppendRst(a:fctx,a:fctx.pqStack[-1],ph)
+	else
+		call extend( a:fctx.pqStack[ -1 ], [ ph, '' ] )
+		if ph.name[-len(quoter.start) :] ==# quoter.start
+			let ph.name = ph.name[0 : -1 - len(quoter.start)]
+			let ph.displayText = ph.name
+			call add(a:fctx.pqStack[-1],a:fctx.phEvalContext.nIndAdd)
+			call add( a:fctx.pqStack, [''] )
+		elseif ph.name == quoter.end
+			let stack = remove(a:fctx.pqStack,-1)
+			call remove(stack,-1)
+			call remove(stack,-1)
+			call filter( stack, 'len(v:val) > 0' )
+			let nIndent = remove(a:fctx.pqStack[-1],-1)
+			let startPH = a:fctx.pqStack[-1][-2]
+			let id = xpt#ftsc#PushPHPieces(a:fctx.snipObject.ftScope,stack)
+			if startPH.name[ -1 : -1 ] == '!'
+				let funcCall = 'Echo(IsChanged()?EmbedPHs(' . string( id ) . '):0)'
+				let startPH.name = startPH.name[0 : -len(quoter.start)]
+				let startPH.displayText = startPH.name
+			else
+				let funcCall = 'Echo(!IsChanged()?EmbedPHs(' . string( id ) . '):0)'
+			endif
+			let a:fctx.snipObject.setting.postFilters[startPH.name] = xpt#flt#New(-nIndent,funcCall)
+		endif
+	endif
+endfunction
+fun! xpt#phfilter#Repetition(fctx)
+	let ph = a:fctx.ph
+	if type( ph ) == type( '' )
+		call xpt#phfilter#AppendRst(a:fctx,a:fctx.repStack[-1],ph)
+	else
+		call extend( a:fctx.repStack[ -1 ], [ ph, '' ] )
+		if ph.name =~ s:ptnRepetition && !has_key(a:fctx.snipObject.setting.postFilters,ph.name)
+			if !has_key(a:fctx.repHeads,ph.name)
+				let a:fctx.repHeads[ph.name] = 1
+				call add(a:fctx.repStack[-1],a:fctx.phEvalContext.nIndAdd)
+				call add( a:fctx.repStack, [''] )
+			else
+				call remove(a:fctx.repHeads,ph.name)
+				let stack = remove(a:fctx.repStack,-1)
+				call filter( stack, 'len(v:val) > 0' )
+				let nIndent = remove(a:fctx.repStack[-1],-1)
+				let startPH = a:fctx.repStack[-1][-2]
+				let id = xpt#ftsc#PushPHPieces(a:fctx.snipObject.ftScope,stack)
+				let funcCall = 'Echo(!IsChanged()?EmbedPHs(' . string( id ) . '):0)'
+				let a:fctx.snipObject.setting.postFilters[startPH.name] = xpt#flt#New(-nIndent,funcCall)
+			endif
+		endif
+	endif
+endfunction
+fun! xpt#phfilter#UpdateIndent(fctx,last)
+	let evalctx = a:fctx.phEvalContext
+	if a:last =~ '\V\n'
+		let evalctx.nIndAdd = xpt#util#LastIndent(a:last)
+	endif
+endfunction
+fun! xpt#phfilter#AppendRst(fctx,lst,ph)
+	let evalctx = a:fctx.phEvalContext
+	if a:ph =~ '\V\n'
+		let lines = split( a:ph, '\V\n', 1 )
+		let evalctx.pos[0] += len(lines) - 1
+		let evalctx.pos[1] = len(lines[-1])
+	else
+		let evalctx.pos[1] += len(a:ph)
+	endif
+	let a:lst[-1] .= a:ph
+	call xpt#phfilter#UpdateIndent(a:fctx,a:lst[-1])
+endfunction
+fun! xpt#phfilter#FeedPH(fctx)
+	if type( a:fctx.ph ) == type( {} ) && has_key( a:fctx.ph, 'value' )
+		let ph = s:MergeEltsIfAllString(a:fctx.ph)
+	else
+		let ph = a:fctx.ph
+	endif
+	if type( ph ) == type( '' )
+		call xpt#phfilter#AppendRst(a:fctx,a:fctx.rstPHs,ph)
+	else
+		call extend( a:fctx.rstPHs, [ ph, '' ] )
+	endif
+endfunction
+fun! s:MergeEltsIfAllString(ph)
+	if has_key( a:ph, 'value' ) && type( a:ph[ 'displayText' ] ) == type( '' ) && type( get( a:ph, 'leftEdge', '' ) ) == type( '' ) && type( get( a:ph, 'rightEdge', '' ) ) == type( '' )
+		return get( a:ph, 'leftEdge', '' ) . get( a:ph, 'displayText', '' ) . get( a:ph, 'rightEdge', '' )
+	else
+		return a:ph
+	endif
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/priority.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/priority.vim
new file mode 100644
index 0000000..e2e719d
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/priority.vim
@@ -0,0 +1,22 @@
+if exists( "g:__AL_XPT_PRIORITY_f78d9s873942__" ) && g:__AL_XPT_PRIORITY_f78d9s873942__ >= XPT#ver
+	finish
+endif
+let g:__AL_XPT_PRIORITY_f78d9s873942__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:priorities = { 'lowest': 9999999, 'all':64, 'spec' : 48, 'like' : 32, 'lang' : 16, 'sub':8, 'personal' : 0, 'highest':-1, }
+let s:priorities.default = s:priorities.lang
+fun! xpt#priority#Get(pstr)
+	return s:priorities[a:pstr]
+endfunction
+fun! xpt#priority#Parse(pstr)
+	let pstr = a:pstr
+	if pstr =~ '\V\[+-]\$'
+		let pstr .= '1'
+	endif
+	let reg = '\V\(\w\+\|\[+-]\)\zs'
+	let prioParts = split(pstr,reg)
+	let prioParts[0] = get(s:priorities,prioParts[0],prioParts[0] - 0)
+	return eval( join( prioParts, '' ) )
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/rctx.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/rctx.vim
new file mode 100644
index 0000000..e4963f6
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/rctx.vim
@@ -0,0 +1,118 @@
+exec xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+let s:phase = { 'uninit':'uninit'   , 'popup':'popup'    , 'inited':'inited'   , 'rendering':'rendering', 'rendered':'rendered' , 'iteminit':'iteminit' , 'fillin':'fillin'   , 'post':'post'     , 'finished':'finished' , }
+let xpt#rctx#phase = s:phase
+let p = s:phase
+let s:phaseGraph = { p.uninit : [p.popup,p.inited], p.popup : [p.inited], p.inited : [p.rendering], p.rendering : [p.rendered], p.rendered : [p.iteminit], p.iteminit : [p.iteminit,p.fillin,p.post], p.fillin : [p.post,p.finished], p.post : [p.finished,p.iteminit], p.finished : [p.uninit], }
+unlet p
+fun! xpt#rctx#New(x)
+	let pre = "X" . len( a:x.stack ) . '_'
+	let inst = { 'ftScope':{}, 'level':len( a:x.stack ), 'snipObject':{}, 'snipSetting':{}, 'phase':s:phase.uninit, 'nextStep':-1, 'action':'', 'userPostAction':'', 'wrap':{}, 'userWrapped':{}, 'markNamePre':pre, 'item':{}, 'leadingPlaceHolder':{}, 'activeLeaderMarks':'innerMarks', 'history':[], 'namedStep':{}, 'processing':0, 'marks':{ 'tmpl':{ 'start':pre . '`tmpl`s', 'end':pre . '`tmpl`e' } }, 'itemDict':{}, 'itemList':[], 'groupList':[], 'lastContent':'', 'tmpmappings':{}, 'oriIndentkeys':{}, 'leadingCharToReindent':{}, }
+	let lst = split( &indentkeys, ',' )
+	let indentkeysList = []
+	for k in lst
+		if k == ""
+			let indentkeysList[ -1 ] .= ','
+		else
+			if k[ 0 ] == '0'
+				call add(indentkeysList,k)
+			endif
+		endif
+	endfor
+	for k in indentkeysList
+		if k[ 1 ] == '=' && len( k ) > 2
+			let inst.oriIndentkeys[k[2:]] = 1
+		else
+			let k = k[1:]
+			if k == ''
+				let k = ','
+			endif
+			let inst.leadingCharToReindent[k] = 1
+		endif
+	endfor
+	return inst
+endfunction
+fun! xpt#rctx#SwitchPhase(inst,nextPhase)
+	if -1 == match( s:phaseGraph[ a:inst.phase ], '\V\<' . a:nextPhase . '\>' )
+		throw 'XPT:RenderContext:switching from [' . a:inst.phase . '] to [' . a:nextPhase . '] is not allowed'
+	endif
+	let a:inst.phase = a:nextPhase
+endfunction
+fun! xpt#rctx#InitOrderedGroupList(rctx)
+	let a:rctx.firstList = copy(a:rctx.snipSetting.comeFirst)
+	let a:rctx.lastList = copy(a:rctx.snipSetting.comeLast)
+endfunction
+fun! xpt#rctx#AddDefaultPHFilters(rctx,ph)
+	if a:ph.name == ''
+		return
+	endif
+	let pfs = a:rctx.snipSetting.postFilters
+	if !has_key(pfs,a:ph.name)
+		if a:ph.name =~ '\V\w\+?\$'
+			let pfs[ a:ph.name ] = xpt#flt#New( 0, "EchoIfNoChange('')" )
+		endif
+	endif
+endfunction
+fun! xpt#rctx#DefaultMarks(rctx)
+	if a:rctx.phase == s:phase.post
+		return 'mark'
+	else
+		return 'innerMarks'
+	endif
+endfunction
+fun! xpt#rctx#UserOut(rctx,text)
+	let a:rctx.nextStep = s:R_NEXT
+	let a:rctx.userPostAction = a:text
+endfunction
+fun! xpt#rctx#UserOutAppend(rctx,text)
+	call xpt#rctx#UserOut(a:rctx,a:rctx.userPostAction . a:text)
+endfunction
+fun! xpt#rctx#AddPHToGroup(rctx,ph)
+	throw "do not use me any more"
+	let g = xpt#rctx#GetGroup(a:rctx,a:ph.name)
+	call xpt#group#InsertPH(g,a:ph,len(g.placeHolders))
+	return g
+endfunction
+fun! xpt#rctx#GetGroup(rctx,name)
+	if has_key(a:rctx.itemDict,a:name)
+		let g = a:rctx.itemDict[a:name]
+	else
+		let g = xpt#group#New(a:name,a:rctx.buildingSessionID)
+	endif
+	call xpt#rctx#AddGroup(a:rctx,g)
+	return g
+endfunction
+fun! xpt#rctx#AddGroup(rctx,g)
+	let [rctx,g] = [a:rctx,a:g]
+	let exist = has_key(rctx.itemDict,g.name)
+	if g.name != ''
+		let rctx.itemDict[g.name] = g
+	endif
+	if rctx.phase != s:phase.rendering
+		call add(rctx.firstList,g)
+		call filter( ctx.groupList, 'v:val isnot g' )
+		return
+	endif
+	if exist
+		return
+	endif
+	if g.name == ''
+		call add(rctx.groupList,g)
+	elseif s:AddToOrderList(rctx.firstList,g) || s:AddToOrderList(rctx.lastList,g)
+		return
+	else
+		call add(rctx.groupList,g)
+	endif
+endfunction
+fun! s:AddToOrderList(list,g)
+	let i = index(a:list,a:g.name)
+	if i != -1
+		let a:list[i] = a:g
+		return 1
+	else
+		return 0
+	endif
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/render.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/render.vim
new file mode 100644
index 0000000..4ac3239
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/render.vim
@@ -0,0 +1,140 @@
+if exists( "g:__AL_XPT_RENDER_VIM__" ) && g:__AL_XPT_RENDER_VIM__ >= XPT#ver
+	finish
+endif
+let g:__AL_XPT_RENDER_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+let s:log = xpt#debug#Logger( 'debug' )
+exe XPT#importConst
+fun! xpt#render#New(rctx,posStart,...)
+	let p = copy(a:posStart)
+	let nSp = a:0 == 0 ? 0 : a:1
+	let render = { 'rctx':a:rctx, 'outerIndent':xpt#util#getIndentNr( p ) + nSp, 'relIndent':0, 'nSpaceToAdd':nSp, 'start':copy( p ), 'pos':copy( p ), 'rst':[ '' ], 'marks':[], }
+	let p[1] -= 1
+	let render.offset = p[1] == 0 ? 0 : virtcol(p) - render.outerIndent
+	return render
+endfunction
+let s:buildingSeqNr = 0
+let s:anonymouseIndex = 0
+fun! xpt#render#GenScreenData(render)
+	let rctx = a:render.rctx
+	call add(a:render.marks,[rctx.marks.tmpl.start, copy( a:render.pos ), 'l', '\Ve\$' ] )
+	let rctx.groupList = []
+	call xpt#render#GenScreenDataOfPHs(a:render,rctx.snipObject.parsedSnip)
+	call add(a:render.marks,[rctx.marks.tmpl.end, copy( a:render.pos ), 'r', '\Ve\$' ] )
+	return [a:render.rst,a:render.marks]
+endfunction
+fun! xpt#render#GenScreenDataOfPHs(render,phs)
+	let rctx = a:render.rctx
+	call xpt#rctx#InitOrderedGroupList(rctx)
+	call xpt#render#BuildPHs(a:render,a:phs)
+	call filter( rctx.firstList, 'type(v:val) != ' . string( type( '' ) ) )
+	call filter( rctx.lastList,  'type(v:val) != ' . string( type( '' ) ) )
+	let rctx.groupList = rctx.firstList + rctx.groupList + rctx.lastList
+	return [a:render.rst,a:render.marks]
+endfunction
+let s:buildingSessionID = 0
+let s:renderStack = []
+fun! xpt#render#BuildPHs(render,phs)
+	if empty(s:renderStack)
+		let s:buildingSessionID += 1
+		let a:render.rctx.itemDict = {}
+	endif
+	call add(s:renderStack,a:render)
+	let a:render.rctx.buildingSessionID = s:buildingSessionID
+	if a:render.nSpaceToAdd != 0
+		let phs = [ repeat( ' ', a:render.nSpaceToAdd ) ] + a:phs
+	else
+		let phs = a:phs
+	endif
+	let phs = xpt#snip#EvalPresetFilters(a:render.rctx,phs,{ 'outerIndent':a:render.outerIndent, 'offset':a:render.offset, 'variables':{ '$_xN_OUTER_INDENT':a:render.outerIndent, '$_xOUTER_INDENT':repeat( ' ', a:render.outerIndent ),  '$_xN_OFFSET':a:render.offset, '$_xOFFSET':repeat( ' ', a:render.offset ), } })
+	for ph in phs
+		if type(ph) == type({})
+			call xpt#rctx#AddDefaultPHFilters(a:render.rctx,ph)
+		endif
+		unlet ph
+	endfor
+	let s:buildingSeqNr += 1
+	for ph in phs
+		if type( ph ) == type( '' )
+			call xpt#render#AppendText(a:render,ph)
+		else
+			call s:BuildPH(a:render,ph)
+		endif
+		unlet ph
+	endfor
+	call remove(s:renderStack,-1)
+endfunction
+fun! xpt#render#AppendFilter(render,flt)
+	call xpt#flt#Eval(a:flt,a:render.rctx.ftScope.funcs, { 'nIndAdd' : a:render.relIndent } )
+	let text = get( a:flt.rst, 'text', '' )
+	call xpt#render#AppendText(a:render,text)
+endfunction
+fun! xpt#render#AppendText(render,text)
+	if a:text =~ '\V\n'
+		call xpt#render#AppendMultiLine(a:render,a:text,a:render.outerIndent)
+	else
+		let a:render.rst[-1] .= a:text
+		let a:render.pos[1] += len(a:text)
+	endif
+endfunction
+fun! xpt#render#AppendMultiLine(render,text,nIndent)
+	if a:nIndent != 0
+		let text = xpt#util#AddIndent(a:text,a:nIndent)
+	else
+		let text = a:text
+	endif
+	let textLines = split( text, "\n", 1 )
+	let a:render.rst[-1] .= textLines[0]
+	call extend(a:render.rst,textLines[1 :])
+	call xpt#render#UpdatePosInfo(a:render)
+endfunction
+fun! xpt#render#UpdatePosInfo(render)
+	let a:render.pos = [a:render.start[0] + len(a:render.rst) - 1, len(a:render.rst[-1]) + 1]
+	let iNonspace = match( a:render.rst[ -1 ], '\v[^ ]' )
+	let a:render.relIndent = iNonspace == -1 ? XPT#Strlen(a:render.rst[-1]) : iNonspace
+endfunction
+fun! s:BuildPH(render,ph)
+	let [rctx,ph] = [a:render.rctx,a:ph]
+	let g = xpt#rctx#GetGroup(rctx,ph.name)
+	if g.sessid == rctx.buildingSessionID
+		call xpt#group#InsertPH(g,a:ph,len(g.placeHolders))
+	else
+		call xpt#group#InsertPH(g,a:ph,0)
+	endif
+	call s:CreatePHMarkNames(rctx,g,ph)
+	call add(a:render.marks,[ph.mark.start, copy( a:render.pos ), 'l' ] )
+	if has_key( ph, 'isKey' )
+		call s:Append( a:render, ph, 'leftEdge' )
+		call add(a:render.marks,[ph.editMark.start, copy( a:render.pos ), 'l' ] )
+		call xpt#render#AppendText( a:render, ph[ 'displayText' ] )
+		call add(a:render.marks,[ph.editMark.end, copy( a:render.pos ), 'r' ] )
+		call s:Append( a:render, ph, 'rightEdge' )
+	else
+		call xpt#render#AppendText( a:render, ph[ 'displayText' ] )
+	endif
+	call add(a:render.marks,[ph.mark.end, copy( a:render.pos ), 'r' ] )
+endfunction
+fun! s:CreatePHMarkNames(rctx,g,ph)
+	if a:ph.name == ''
+		let markName =  '``' . s:anonymouseIndex
+		let s:anonymouseIndex += 1
+	else
+		let markName =  a:ph.name . s:buildingSeqNr . '`' . ( has_key( a:ph, 'isKey' ) ? 'k' : ( len( a:g.placeHolders ) - 1 ) )
+	endif
+	let markPre = a:rctx.markNamePre . markName . '`'
+	call extend(a:ph, { 'mark' : { 'start' : markPre . 'os', 'end':markPre . 'oe', }, }, 'force' )
+	if has_key( a:ph, 'isKey' )
+		call extend(a:ph, { 'editMark' : { 'start' : markPre . 'is', 'end':markPre . 'ie', }, }, 'force' )
+		let a:ph.innerMarks = a:ph.editMark
+	else
+		let a:ph.innerMarks = a:ph.mark
+	endif
+endfunction
+fun! s:Append(render,ph,key)
+	if has_key(a:ph,a:key)
+			call xpt#render#AppendText(a:render,a:ph[a:key])
+	endif
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/settingswitch.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/settingswitch.vim
new file mode 100644
index 0000000..f3accf0
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/settingswitch.vim
@@ -0,0 +1,47 @@
+exec xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+fun! xpt#settingswitch#New()
+	return { 'settings':[], 'saved':[], }
+endfunction
+fun! xpt#settingswitch#Add(inst,key,value)
+	if a:inst.saved != []
+		throw "settings are already saved and can not be added again"
+	endif
+	let a:inst.settings += [[a:key,a:value]]
+endfunction
+fun! xpt#settingswitch#AddList(inst,...)
+	if a:inst.saved != []
+		throw "settings are already saved and can not be added again"
+	endif
+	for item in a:000
+		let a:inst.settings += [[item[0],item[1]]]
+	endfor
+endfunction
+fun! xpt#settingswitch#Switch(inst)
+	if a:inst.saved != []
+		return
+	endif
+	for [key,value] in a:inst.settings
+		call insert(a:inst.saved,[key,eval(key)])
+		if type( value ) == type( '' )
+			exe 'let ' key '=' string( value )
+		elseif type(value) == type({})
+			if has_key( value, 'exe' )
+				exe value.exe
+			endif
+		endif
+		unlet value
+	endfor
+endfunction
+fun! xpt#settingswitch#Restore(inst)
+	if a:inst.saved == []
+		return
+	endif
+	for setting in a:inst.saved
+		exe 'let '. setting[0] . '=' . string( setting[1] )
+	endfor
+	let a:inst.saved = []
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/snip.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/snip.vim
new file mode 100644
index 0000000..8e9d8ad
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/snip.vim
@@ -0,0 +1,236 @@
+if exists( "g:__AL_XPT_SNIP_VIM__" ) && g:__AL_XPT_SNIP_VIM__ >= XPT#ver
+	finish
+endif
+let g:__AL_XPT_SNIP_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+let s:log = xpt#debug#Logger( 'debug' )
+exe XPT#importConst
+fun! xpt#snip#DefExt(name,setting,lines)
+	call xpt#st#Extend(a:setting)
+	call XPTdefineSnippet(a:name,a:setting,a:lines)
+endfunction
+fun! xpt#snip#New(name,ftScope,snipText,prio,setting,patterns)
+	return { 'name':a:name, 'compiled':0, 'parsed':0, 'ftScope':a:ftScope, 'rawSnipText':a:snipText, 'snipText':a:snipText, 'priority':a:prio, 'setting':a:setting, 'ptn':a:patterns, }
+endfunction
+fun! xpt#snip#NewSlave(master,snipText)
+	return xpt#snip#New( '', a:master.ftScope, a:snipText, 0, a:master.setting,a:master.ptn)
+endfunction
+fun! xpt#snip#CompileAndParse(so)
+	if !a:so.parsed
+		if !a:so.compiled
+			call xpt#snip#Compile(a:so)
+		endif
+		call xpt#snip#Parse(a:so)
+	endif
+endfunction
+fun! xpt#snip#Compile(so)
+	call xpt#ftsc#Init(a:so.ftScope)
+	if a:so.snipText == ''
+		let a:so.compiledSnip = [ '' ]
+		return
+	endif
+	let rawLines = s:SplitLines(a:so)
+	let nIndent = len( matchstr( rawLines[0][0], '\V\^\s\*' ) )
+	let [l,r] = [a:so.ptn.l,a:so.ptn.r]
+	let [i,j,nlines,nitems] = [0,0,len(rawLines),len(rawLines[0])]
+	let [ st, linesCompiled ] = [ 'LeftEdge', [] ]
+	let buf = [ { 'nIndent' : 0, 'text' : '' } ]
+	while 1
+		let elt = rawLines[i][j]
+		let firstChar = matchstr( elt, '\v.' )
+		if firstChar == l
+			if st == 'LeftEdge'
+				let st = 'Name'
+				let texts = deepcopy(buf)
+				call map( texts, 'v:val.text' )
+				call extend(linesCompiled,texts)
+				let buf = [ { 'nIndent' : nIndent, 'text' : elt[ 1 : ] } ]
+			elseif st == 'Name'
+				call add( buf, { 'nIndent' : nIndent, 'text' : elt[ 1 : ] } )
+			elseif st == 'Filter'
+				let st = 'LeftEdge'
+				let followingText = buf[-1].text[1 :]
+				let buf[-1].text = buf[-1].text[0 : 0]
+				call add(linesCompiled,xpt#ph#New(a:so,buf))
+				let buf = [ { 'nIndent' : nIndent, 'text' : followingText } ]
+				continue
+			endif
+		elseif firstChar == r
+			if st == 'Name'
+				let st = 'Filter'
+				continue
+			elseif st == 'Filter'
+				call add( buf, { 'nIndent' : nIndent, 'text' : elt } )
+			endif
+		else
+			let buf[-1].text .= rawLines[i][j]
+		endif
+		let j += 1
+		if j >= nitems
+			let [i,j] = [i + 1,0]
+			if i >= nlines
+				break
+			endif
+			let buf[ -1 ].text .= "\n"
+			let [nIndent,nitems] = [ len( matchstr( rawLines[ i ][ 0 ], '\V\^\s\*' ) ), len( rawLines[ i ] ) ]
+		endif
+	endwhile
+	call filter( linesCompiled, 'len(v:val) > 0' )
+	let rst = []
+	for e in linesCompiled
+		call add(rst, type(e) == type({}) ? e : xpt#util#UnescapeChar(e,a:so.ptn.lr))
+		unlet e
+	endfor
+	let a:so.compiledSnip = rst
+	let a:so.compiled = 1
+endfunction
+fun! xpt#snip#TextToPlaceholders(text,ptn)
+	let [l,r] = [a:ptn.l,a:ptn.r]
+	let lr = l . r
+	let toks = xpt#snip#Tokenize(a:text, a:ptn) + ["", "", ""]
+	let elts = []
+	let buf = []
+	let i = -1
+	while i < len(toks) - 1
+		let i += 1
+		let tok = toks[i]
+		let chr = tok[0]
+		if chr != l && chr != r
+			if tok != ""
+				call add(elts, {'text': xpt#util#UnescapeChar(tok, lr)})
+			endif
+			continue
+		endif
+		if chr == l
+			call add(buf, {'text': xpt#util#UnescapeChar(tok[1:], lr)})
+			continue
+		endif
+		let ph = s:EltsToPh(buf)
+		call add(elts,ph)
+		let buf = []
+		if toks[i+1][0] == l
+			continue
+		endif
+		if toks[i + 1] == r
+			let [flt, iFilterEnd] = [{'text': ''}, i + 1]
+		else
+			if toks[i + 2] == r
+				let [flt, iFilterEnd] = [{'text': xpt#util#UnescapeChar(toks[i + 1], lr)}, i + 2]
+			else
+				continue
+			endif
+		end
+		if toks[iFilterEnd + 1] == r
+			let ph.postFilter = flt
+			let i = iFilterEnd + 1
+		else
+			let ph.liveFilter = flt
+			let i = iFilterEnd
+		endif
+	endwhile
+	return elts
+endfunction
+fun! s:EltsToPh(buf)
+	let buf = a:buf
+	if len(buf) == 0
+		 throw 'xpt#snip#Unexpected: ' . r
+	 elseif len(buf) == 1
+		 let ph = { 'name': buf[0] }
+	 elseif len(buf) == 2
+		 let ph = { 'leftEdge': buf[0], 'name': buf[1] }
+	 elseif len(buf) == 3
+		 let ph = { 'leftEdge': buf[0], 'name': buf[1], 'rightEdge': buf[2] }
+	 else
+		 throw 'xpt#snip#TooMany: ' . string(buf)
+	endif
+	return ph
+endfunction
+fun! xpt#snip#Parse(so)
+	let a:so.parsedSnip = a:so.compiledSnip
+	let a:so.parsedSnip = xpt#snip#ReplacePH(a:so,a:so.setting.replacements)
+	let a:so.parsedSnip = xpt#snip#EvalInstantFilters(a:so)
+	let a:so.parsedSnip = xpt#snip#PostQuote(a:so)
+	let a:so.parsedSnip = xpt#snip#Repetition(a:so)
+	let a:so.parsed = 1
+endfunction
+fun! xpt#snip#ReplacePH(so,repls)
+	let phs = xpt#phfilter#Filter(a:so, 'xpt#phfilter#ReplacePH', { 'replParams' : a:repls } )
+	return phs
+endfunction
+fun! xpt#snip#EvalInstantFilters(so)
+	let phs = xpt#phfilter#Filter(a:so, 'xpt#phfilter#EvalInstantFilters', {'skip' : a:so.ptn.item_func . '\|$_x\w', 'forceNotSkip' : s:ptnPreEvalFunc } )
+	return phs
+endfunction
+fun! xpt#snip#PostQuote(so)
+	let pqContext = { 'pqStack' : [ [] ] }
+	let pqContext.rstPHs = pqContext.pqStack[0]
+	let phs = xpt#phfilter#Filter(a:so, 'xpt#phfilter#PostQuote', pqContext )
+	return phs
+endfunction
+fun! xpt#snip#Repetition(so)
+	let repContext = { 'repStack' : [ [] ], 'repHeads' : {} }
+	let repContext.rstPHs = repContext.repStack[0]
+	let phs = xpt#phfilter#Filter(a:so, 'xpt#phfilter#Repetition', repContext )
+	return phs
+endfunction
+fun! xpt#snip#EvalPresetFilters(rctx,phs,ctx)
+	let ctx = { 'rctx':a:rctx, 'srcPHs':a:phs, 'snipSetting':a:rctx.snipSetting, 'phEvalContext':a:ctx,  }
+	let phs = xpt#phfilter#Filter(a:rctx.snipObject, 'xpt#phfilter#EvalPresetFilters', ctx )
+	return phs
+endfunction
+fun! xpt#snip#DumbCursorInPlace(so,phs)
+	for ph in a:phs
+		if type(ph) == type({}) && ph.name is 'cursor'
+			let ph.name = ''
+			let ph.displayText = ph.name
+		endif
+		unlet ph
+	endfor
+endfunction
+fun! xpt#snip#ParseInclusionStatement(so,statement)
+	let phptns = a:so.ptn
+	let ptn = '\V\^\[^(]\{-}('
+	let statement = a:statement
+	if statement =~ ptn && statement[ -1 : -1 ] == ')'
+		let name = matchstr(statement,ptn)[: -2]
+		let paramStr = statement[len(name) + 1 : -2]
+		let paramStr = xpt#util#UnescapeChar(paramStr,phptns.lr)
+		let params = {}
+		try
+			let params = eval(paramStr)
+		catch /.*/
+			XPT#info( 'XPT: Invalid parameter: ' . string( paramStr ) . ' Error=' . v:exception )
+		endtry
+		return [name,params]
+	else
+		return [statement,{}]
+	endif
+endfunction
+fun! s:SplitLines(so)
+	let delimiter = '\V\ze' . a:so.ptn.lft . '\|\ze' . a:so.ptn.rt
+	let lines = split( a:so.snipText, "\n", 1 )
+	call map( lines, 'split(v:val, delimiter, 1)' )
+	let lines[-1] += [a:so.ptn.l]
+	return lines
+endfunction
+fun! xpt#snip#Tokenize(text,ptn)
+	let delimiter = '\V\ze' . a:ptn.lft . '\|\ze' . a:ptn.rt
+	let toks = split(a:text,delimiter,0)
+	if len(toks) == 0
+		return ['']
+	end
+	let rst = []
+	for tok in toks
+		if tok == a:ptn.r
+			call add(rst,tok)
+		elseif tok[0] == a:ptn.r
+			call extend(rst,[a:ptn.r,tok[1:]])
+		else
+			call add(rst,tok)
+		end
+	endfor
+	return rst
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/snipfile.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/snipfile.vim
new file mode 100644
index 0000000..caeaa77
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/snipfile.vim
@@ -0,0 +1,26 @@
+exec xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+exec XPT#importConst
+fun! xpt#snipfile#New(filename)
+  let r = { 'filename':a:filename, 'ptn':xpt#snipfile#GenPattern( {'l':'`', 'r':'^'} ), 'priority':xpt#priority#Get('default'), 'filetype':'', 'inheritFT':0, }
+  return r
+endfunction
+fun! xpt#snipfile#Push()
+	let x = b:xptemplateData
+	let x.snipFileScopeStack += [x.snipFileScope]
+	unlet x.snipFileScope
+endfunction
+fun! xpt#snipfile#Pop()
+	let x = b:xptemplateData
+	if len(x.snipFileScopeStack) > 0
+		let x.snipFileScope = remove(x.snipFileScopeStack,-1)
+	else
+		throw "snipFileScopeStack is empty"
+	endif
+endfunction
+fun! xpt#snipfile#GenPattern(marks)
+	return { 'l':a:marks.l, 'r':a:marks.r, 'lr':a:marks.l . a:marks.r, 'lft':'\V' . s:nonEscaped . a:marks.l, 'rt':'\V' . s:nonEscaped . a:marks.r, 'item_var':'\V' . '$\w\+', 'item_qvar':'\V' . '{$\w\+}', 'item_func':'\V' . '\w\+(\.\*)', 'item_qfunc':'\V' . '{\w\+(\.\*)}', 'itemContent':'\V' . '\_.\{-}', 'item':'\V' . s:nonEscaped . a:marks.l . '\%(' . '\_.\{-}' . '\)' . s:nonEscaped . a:marks.r, }
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/snipfunc.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/snipfunc.vim
new file mode 100644
index 0000000..1d222d5
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/snipfunc.vim
@@ -0,0 +1,465 @@
+if exists( "g:__AL_XPT_SNIPFUNC_VIM__" ) && g:__AL_XPT_SNIPFUNC_VIM__ >= XPT#ver
+	finish
+endif
+let g:__AL_XPT_SNIPFUNC_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+let s:log = xpt#debug#Logger( 'debug' )
+fun! xpt#snipfunc#Extend(container)
+	call extend( a:container, s:f, 'keep' )
+endfunction
+let s:f = {}
+fun! s:f.Pre(a)
+	return a:a
+endfunction
+fun! s:f.SnipObject()
+	return self.phFilterContext isnot 0 ? self.phFilterContext.snipObject : self.renderContext.snipObject
+endfunction
+fun! s:f.PHs(snipText)
+	let so = self.SnipObject()
+	let slave = xpt#snip#NewSlave(so,a:snipText)
+	call xpt#snip#CompileAndParse(slave)
+	return slave.parsedSnip
+endfunction
+fun! s:f.Inline(snipText)
+	return { 'action' : 'embed', 'phs' : self.PHs( a:snipText ) }
+endfunction
+fun! s:f.Inc(targetName,keepCursor,params)
+	let so = self.SnipObject()
+	let snipDict = so.ftScope.allTemplates
+	if has_key(snipDict,a:targetName)
+		let tsnip = snipDict[a:targetName]
+		call xpt#snip#CompileAndParse(tsnip)
+		let phs = xpt#phfilter#Filter( tsnip, 'xpt#phfilter#ReplacePH', { 'replParams' : a:params } )
+		if !a:keepCursor
+			call xpt#snip#DumbCursorInPlace(tsnip,phs)
+		endif
+		call xpt#st#Merge(so.setting,tsnip.setting)
+		return { 'action' : 'embed', 'nIndent' : 0,  'phs' : phs }
+	else
+		return 0
+	endif
+endfunction
+fun! s:f.GetDict(...)
+	return
+endfunction
+fun! s:f.GetVar(name)
+	if a:name =~# '\V\^$_x'
+		let n = a:name[1 :]
+		if has_key(self,n)
+			return self[n]()
+		endif
+	endif
+	let varScopes = []
+	if has_key( self, 'evalContext' )
+		call add(varScopes,self.evalContext.variables)
+	endif
+	if has_key( self, 'renderContext' )
+		call add( varScopes, get( self.renderContext.snipSetting, 'variables', {} ) )
+	endif
+	call add(varScopes,self)
+	for sc in varScopes
+		let val = get(sc,a:name)
+		if val isnot 0
+			return val
+		endif
+	endfor
+	return a:name
+endfunction
+fun! s:f._xSnipName()
+	return self.renderContext.snipObject.name
+endfunction
+fun! s:f.EmbedWrappedText()
+	let wrapData = self.renderContext.userWrapped
+	if !has_key( wrapData, 'text' )
+		return 0
+	endif
+	let ph = self.phFilterContext.ph
+	if has_key( ph, 'isKey' )
+		let n = len(wrapData.lines)
+		let nIndent = self.phFilterContext.phEvalContext.pos[1] - self.phFilterContext.phEvalContext.nIndAdd
+		if self.phFilterContext.phEvalContext.pos[0] == 0
+			let nIndent += self.phFilterContext.phEvalContext.offset
+		endif
+		let sep = "\n"
+		let ph = extend(deepcopy(ph),{ 'name':'',  'value':1, }, 'force' )
+		unlet ph.isKey
+		let newPHs = []
+		let i = 0
+		while i < n
+			let newph = extend(deepcopy(ph),{ 'displayText':wrapData.lines[ i ], }, 'force' )
+			call extend(newPHs,[newph,sep])
+			let i += 1
+		endwhile
+		call remove(newPHs,-1)
+		return { 'action' : 'embed', 'nIndent' : nIndent, 'phs' : newPHs }
+	else
+		return { 'nIndent'  : wrapData.indent, 'text':wrapData.text }
+	endif
+endfunction
+fun! s:f.WrapAlignAfter(min)
+	let userWrapped = self.renderContext.userWrapped
+	let n = max([a:min,userWrapped.max]) - len(userWrapped.curline)
+	return repeat( ' ', n )
+endfunction
+fun! s:f.WrapAlignBefore(min)
+	let userWrapped = self.renderContext.userWrapped
+	let n = max([a:min,userWrapped.max]) - len(userWrapped.lines[0])
+	return repeat( ' ', n )
+endfunction
+fun! s:f.Item()
+	return get( self.renderContext, 'item', {} )
+endfunction
+fun! s:f.ItemName()
+	return get( self.Item(), 'name', '' )
+endfunction
+fun! s:f.ItemFullname()
+	return get( self.Item(), 'fullname', '')
+endfunction
+fun! s:f.ItemValue() dict
+	return get( self.evalContext, 'userInput', '' )
+endfunction
+fun! s:f.PrevItem(n)
+	let hist = get( self.renderContext, 'history', [] )
+	return get(hist,a:n,{})
+endfunction
+fun! s:f.ItemInitValue()
+	return get( self.Item(), 'initValue', '' )
+endfunction
+fun! s:f.ItemInitValueWithEdge()
+	let [l,r] = self.ItemEdges()
+	return l . self.ItemInitValue() . r
+endfunction
+fun! s:f.ItemValueStripped(...)
+	let ptn = a:0 == 0 || a:1 =~ 'lr' ? '\V\^\s\*\|\s\*\$' : ( a:1 == 'l' ? '\V\^\s\*' : '\V\s\*\$' )
+	return substitute( self.ItemValue(), ptn, '', 'g' )
+endfunction
+fun! s:f.ItemPos()
+	return XPMposStartEnd(self.renderContext.leadingPlaceHolder.mark)
+endfunction
+fun! s:f.Vmatch(...)
+	let v = self.V()
+	for reg in a:000
+		if match(v,reg) != -1
+			return 1
+		endif
+	endfor
+	return 0
+endfunction
+fun! s:f.VMS(reg)
+	return matchstr(self.V(),a:reg)
+endfunction
+fun! s:f.ItemStrippedValue()
+	let v = self.V()
+	let [edgeLeft,edgeRight] = self.ItemEdges()
+	let v = substitute( v, '\V\^' . edgeLeft,       '', '' )
+	let v = substitute( v, '\V' . edgeRight . '\$', '', '' )
+	return v
+endfunction
+fun! s:f.Phase() dict
+	return get( self.renderContext, 'phase', '' )
+endfunction
+fun! s:f.E(s)
+	return expand(a:s)
+endfunction
+fun! s:f.Context()
+	return self.renderContext
+endfunction
+fun! s:f.S(str,ptn,rep,...)
+	let flg = a:0 >= 1 ? a:1 : 'g'
+	return substitute(a:str,a:ptn,a:rep,flg)
+endfunction
+fun! s:f.SubstituteWithValue(ptn,rep,...)
+	let flg = a:0 >= 1 ? a:1 : 'g'
+	return substitute(self.V(),a:ptn,a:rep,flg)
+endfunction
+fun! s:f.HasStep(name)
+	let namedStep = get( self.renderContext, 'namedStep', {} )
+	return has_key(namedStep,a:name)
+endfunction
+fun! s:f.Reference(name)
+	let namedStep = get( self.renderContext, 'namedStep', {} )
+	return get( namedStep, a:name, '' )
+endfunction
+fun! s:f.Snippet(name)
+	return get( self.renderContext.ftScope.allTemplates, a:name, { 'tmpl' : '' } )[ 'tmpl' ]
+endfunction
+fun! s:f.Void(...)
+	return ""
+endfunction
+fun! s:f.Echo(...)
+	if a:0 > 0
+		return a:1
+	else
+		return ''
+	endif
+endfunction
+fun! s:f.EchoIf(isTrue,...)
+	if a:isTrue
+		return join( a:000, '' )
+	else
+		return self.V()
+	endif
+endfunction
+fun! s:f.EchoIfEq(expected,...)
+	if self.V() ==# a:expected
+		return join( a:000, '' )
+	else
+		return self.V()
+	endif
+endfunction
+fun! s:f.EchoIfNoChange(...)
+	if self.V0() ==# self.ItemName()
+		return join( a:000, '' )
+	else
+		return self.V()
+	endif
+endfunction
+fun! s:f.Commentize(text)
+	if has_key( self, '$CL' )
+		return self[ '$CL' ] . ' ' . a:text . ' ' . self[ '$CR' ]
+	elseif has_key( self, '$CS' )
+		return self[ '$CS' ] . ' ' . a:text
+	endif
+	return a:text
+endfunction
+fun! s:f.VoidLine()
+	return self.Commentize( 'void' )
+endfunction
+fun! s:f.Empty()
+	return self.ItemValue() == ''
+endfunction
+fun! s:f.IsChanged()
+	let initFull = self.ItemInitValueWithEdge()
+	let v = self.ItemValue()
+	return initFull !=# v
+endfunction
+fun! s:f.EmbedPHs(phsID)
+	let snipObject = self.renderContext.snipObject
+	return { 'action' : 'embed', 'phs':xpt#ftsc#GetPHPieces( snipObject.ftScope, a:phsID ) }
+endfunction
+fun! s:f.Build(...)
+	return { 'action' : 'build', 'text' : join( a:000, '' ) }
+endfunction
+fun! s:f.BuildIfChanged(...)
+	let v = substitute( self.V(), "\\V\n\\|\\s", '', 'g')
+	let fn = substitute( self.ItemInitValueWithEdge(), "\\V\n\\|\\s", '', 'g')
+	if v ==# fn || v == ''
+		return ''
+	else
+		return { 'action' : 'build', 'text' : join( a:000, '' ) }
+	endif
+endfunction
+fun! s:f.BuildIfNoChange(...)
+	let v = substitute( self.V(), "\\V\n\\|\\s", '', 'g')
+	let fn = substitute( self.ItemInitValueWithEdge(), "\\V\n\\|\\s", '', 'g')
+	if v ==# fn
+		return { 'action' : 'build', 'text' : join( a:000, '' ) }
+	else
+		return 0
+	endif
+endfunction
+fun! s:f.Trigger(name)
+	return {'action' : 'expandTmpl', 'tmplName' : a:name}
+endfunction
+fun! s:f.Finish(...)
+	return self.FinishPH( a:0 > 0 ? { 'text' : a:1 } : {} )
+endfunction
+fun! s:f.FinishOuter(...)
+	return self.FinishPH(a:0 > 0 ? { 'text' : a:1, 'marks' : 'mark' } : { 'marks' : 'mark' } )
+endfunction
+fun! s:f.FinishPH(opt)
+	let opt = a:opt
+	if empty(self.renderContext.groupList)
+		let o = { 'action' : g:XPTact.finishPH }
+		call extend( o, opt, 'keep' )
+		return o
+	else
+		return get( opt, 'text', 0 )
+	endif
+endfunction
+fun! s:f.Embed(snippetText)
+	return { 'action' : g:XPTact.embed, 'text' : a:snippetText }
+endfunction
+fun! s:f.Next(...)
+	let rst = { 'action' : 'next' }
+	if a:0 > 0
+		let phs = deepcopy(a:000)
+		call filter( phs, 'type(v:val)==' . type( '' ) )
+		if len(phs) < len(a:000)
+			let rst.phs = a:000
+		else
+			let text = join( a:000, '' )
+			let so = self.SnipObject()
+			if match(text,so.ptn.lft) >= 0
+				let rst.phs = self.PHs(text)
+			else
+				let rst.text = text
+			endif
+		endif
+	endif
+	return rst
+endfunction
+fun! s:f.Remove()
+	return { 'action' : 'remove' }
+endfunction
+fun! s:f.Choose(lst,...)
+	let val = { 'action' : 'pum', 'pum' : a:lst }
+	if a:0 == 1
+		let val.acceptEmpty = a:1 != 0
+	endif
+	return val
+endfunction
+fun! s:f.ChooseStr(...)
+	return copy(a:000)
+endfunction
+fun! s:f.Complete(key,...)
+	let val = { 'action' : 'complete', 'pum' : a:key }
+	if a:0 == 1
+		let val.acceptEmpty = a:1 != 0
+	endif
+	return val
+endfunction
+fun! s:f.xptFinishTemplateWith(postType) dict
+endfunction
+fun! s:f.xptFinishItemWith(postType) dict
+endfunction
+fun! s:f.UnescapeMarks(string) dict
+	let patterns = self.renderContext.snipObject.ptn
+	let charToEscape = '\(\[' . patterns.l . patterns.r . ']\)'
+	let r = substitute( a:string,  '\v(\\*)\1\\?\V' . charToEscape, '\1\2', 'g')
+	return r
+endfunction
+fun! s:f.headerSymbol(...)
+	let h = expand('%:t')
+	let h = substitute(h, '\.', '_', 'g') " replace . with _
+	let h = substitute(h, '.', '\U\0', 'g') " make all characters upper case
+	return '__'.h.'__'
+endfunction
+fun! s:f.date(...)
+	return strftime( self.GetVar( '$DATE_FMT' ) )
+endfunction
+fun! s:f.datetime(...)
+	return strftime( self.GetVar( '$DATETIME_FMT' ) )
+endfunction
+fun! s:f.time(...)
+	return strftime( self.GetVar( '$TIME_FMT' ) )
+endfunction
+fun! s:f.file(...)
+	return expand("%:t")
+endfunction
+fun! s:f.fileRoot(...)
+	return expand("%:t:r")
+endfunction
+fun! s:f.fileExt(...)
+	return expand("%:t:e")
+endfunction
+fun! s:f.path(...)
+	return expand("%:p")
+endfunction
+fun! s:f.UpperCase(v)
+	return substitute(a:v, '.', '\u&', 'g')
+endfunction
+fun! s:f.LowerCase(v)
+	return substitute(a:v, '.', '\l&', 'g')
+endfunction
+fun! s:f.ItemEdges()
+	let leader =  get( self.renderContext, 'leadingPlaceHolder', {} )
+	if has_key( leader, 'leftEdge' )
+		return [leader.leftEdge,leader.rightEdge]
+	else
+		return [ '', '' ]
+	endif
+endfunction
+fun! s:f.ItemCreate(name,edges,filters)
+	let [ml,mr] = XPTmark()
+	let item = ml . a:name
+	if has_key( a:edges, 'left' )
+		let item = ml . a:edges.left . item
+	endif
+	if has_key( a:edges, 'right' )
+		let item .= ml . a:edges.right
+	endif
+	let item .= mr
+	if has_key( a:filters, 'post' )
+		let item .= a:filters.post . mr . mr
+	endif
+	return item
+endfunction
+fun! s:f.ExpandIfNotEmpty(sep,item,...)
+	let v = self.V()
+	let [ml,mr] = XPTmark()
+	if a:0 != 0
+		let r = a:1
+	else
+		let r = ''
+	endif
+	let t = ( v == '' || v =~ '\V' . a:item ) ? '' : self.Build(v . ml . a:sep . ml . a:item . ml . r . mr . 'ExpandIfNotEmpty(' . string( a:sep ) . ', ' . string( a:item )  . ')' . mr . mr )
+	return t
+endfunction
+fun! s:f.ExpandInsideEdge(newLeftEdge,newRightEdge)
+	let v = self.V()
+	let fullname = self.ItemFullname()
+	let [el,er] = self.ItemEdges()
+	if v ==# fullname || v == ''
+		return ''
+	endif
+	return substitute( v, '\V' . er . '\$' , '' , '' ) . self.ItemCreate( self.ItemName(), { 'left' : a:newLeftEdge, 'right' : a:newRightEdge }, {} ) . er
+endfunction
+fun! s:f.NIndent()
+	return &shiftwidth
+endfunction
+fun! s:f.ResetIndent(nIndent,text)
+	return { 'action' : 'resetIndent', 'resetIndent':1, 'nIndent' : a:nIndent, 'text' : a:text }
+endfunction
+fun! s:f.CmplQuoter_pre() dict
+	if !g:xptemplate_brace_complete
+		return ''
+	endif
+	let v = substitute( self.ItemStrippedValue(), '\V\^\s\*', '', '' )
+	let first = matchstr( v, '\V\^\[''"]' )
+	if first == ''
+		return ''
+	endif
+	let v = substitute( v, '\V\[^' . first . ']', '', 'g' )
+	if v == first
+		return first
+	else
+		return ''
+	endif
+endfunction
+fun! s:f.AutoCmpl(keepInPost,list,...)
+	if !a:keepInPost && self.Phase() == 'post'
+		return ''
+	endif
+	if type(a:list) == type([])
+		let list = a:list
+	else
+		let list = [a:list] + a:000
+	endif
+	let v = self.V0()
+	if v == ''
+		return ''
+	endif
+	for word in list
+		if word =~ '\V\^' . v
+			return word[len(v) :]
+		endif
+	endfor
+	return ''
+endfunction
+let s:f.Edges = s:f.ItemEdges
+let s:f.UE = s:f.UnescapeMarks
+let s:f.VOID = s:f.Void
+let s:f.R = s:f.Reference
+let s:f.SV = s:f.SubstituteWithValue
+let s:f.C = s:f.Context
+let s:f.V0 = s:f.ItemStrippedValue
+let s:f.IVE = s:f.ItemInitValueWithEdge
+let s:f.VS = s:f.ItemValueStripped
+let s:f.IV = s:f.ItemInitValue
+let s:f.V = s:f.ItemValue
+let s:f.NN = s:f.ItemFullname
+let s:f.N = s:f.ItemName
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/snipfuncs/actionhelper.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/snipfuncs/actionhelper.vim
new file mode 100644
index 0000000..31c11eb
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/snipfuncs/actionhelper.vim
@@ -0,0 +1,29 @@
+exec xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:f = xpt#snipfunction#funcs
+let s:num_keys = { "nIndent" : 1, "parseIndent" : 1, }
+let s:action_names = { "build" : 1, "pum" : 1, "text" : 1, "next" : 1, "remove" : 1, "finishTemplate" : 1, }
+fun! s:f.Action(...)
+	let rst = {}
+	for kvs in a:000
+		if type(kvs) == type({})
+			call extend(rst, kvs, 'force')
+			continue
+		endif
+		for kv in split(kvs, ' ', 0)
+			if has_key(s:action_names,kv)
+				let rst.action = kv
+			else
+				let [k, v] = split(kv, '=', 1)
+				if has_key(s:num_keys,k)
+					let rst[k] = v + 0
+				else
+					let rst[k] = v
+				endif
+			endif
+		endfor
+	endfor
+	return rst
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/snipfuncs/evalhelper.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/snipfuncs/evalhelper.vim
new file mode 100644
index 0000000..ccffafc
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/snipfuncs/evalhelper.vim
@@ -0,0 +1,69 @@
+if exists( "g:__AL_XPT_EVALSUPPORT_f67523jhrk" ) && g:__AL_XPT_EVALSUPPORT_f67523jhrk >= 1
+	finish
+endif
+let g:__AL_XPT_EVALSUPPORT_f67523jhrk = 1
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:f = xpt#snipfunction#funcs
+fun! s:f.GetVar(name)
+	if a:name =~# '\V\^$_x'
+		let n = a:name[1 :]
+		return self.Call(n,[])
+	endif
+	let closures = self._ctx.closures
+	let i = len(closures)
+	while i > 0
+		let i = i - 1
+		let c = closures[i]
+		let v = get(c,a:name,0)
+		if v isnot 0
+			return v
+		endif
+	endwhile
+	return ''
+endfunction
+fun! s:f.Call(name,args)
+	let F = get(self,a:name,0)
+	if type(F) == type(function('tr'))
+		return call(F,a:args,self)
+	else
+		return call(function(a:name),a:args)
+	endif
+endfunction
+fun! s:f.Concat(...)
+	let lst = a:000
+	if len(lst) == 0
+		return ''
+	endif
+	let rst = {}
+	for e in lst
+		if type(e) == type(0)
+			if e == 0
+				return 0
+			else
+				let elt = string(e)
+			endif
+		else
+			let elt = e
+		endif
+		if type(elt) == type('')
+			let rst.text = get(rst, 'text', '') . elt
+		elseif type(elt) == type([])
+			let rst.action = get(rst, 'action', 'pum')
+			let rst.pum = get(rst, 'pum', elt)
+		else
+			if has_key(rst, 'text') && has_key(elt, 'text')
+				let rst.text .= elt.text
+			endif
+			call extend(rst, elt, 'keep')
+		endif
+		unlet e
+		unlet elt
+	endfor
+	let ks = keys(rst)
+	if len(ks) == 1 && ks[0] == 'text'
+		return rst.text
+	end
+	return rst
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/snipfunction.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/snipfunction.vim
new file mode 100644
index 0000000..4f27a9a
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/snipfunction.vim
@@ -0,0 +1,10 @@
+if exists( "g:__AL_XPT_EVAL_y732hj43k__" ) && g:__AL_XPT_EVAL_y732hj43k__ >= XPT#ver
+	finish
+endif
+let g:__AL_XPT_EVAL_y732hj43k__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:f = {}
+let xpt#snipfunction#funcs = s:f
+runtime! autoload/xpt/snipfuncs/*
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/snipline.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/snipline.vim
new file mode 100644
index 0000000..3a16fff
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/snipline.vim
@@ -0,0 +1,16 @@
+if exists( "g:__AL_XPT_SNIPLINE_VIM__" ) && g:__AL_XPT_SNIPLINE_VIM__ >= XPT#ver
+	finish
+endif
+let g:__AL_XPT_SNIPLINE_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+fun! xpt#snipline#New(elts)
+	if len(a:elts) == 0 || type(a:elts[0]) == type({})
+		let nIndent = 0
+	else
+		let nIndent = len( matchstr( a:elts[ 0 ], '\V\^ \*' ) )
+	endif
+	return { 'nIndent' : nIndent, 'elts' : a:elts }
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/st.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/st.vim
new file mode 100644
index 0000000..1ee9505
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/st.vim
@@ -0,0 +1,113 @@
+if exists( "g:__AL_XPT_ST_VIM__" ) && g:__AL_XPT_ST_VIM__ >= XPT#ver
+	finish
+endif
+let g:__AL_XPT_ST_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+exe XPT#importConst
+let s:proto = { 'hidden':0, 'variables':{}, 'preValues':{}, 'onfocusFilters':{}, 'mappings':{}, 'liveFilters':{}, 'postFilters':{}, 'replacements':{}, 'postQuoter':{}, 'comeFirst':[], 'comeLast':[], }
+let s:protoDefault = { 'preValues':{ 'cursor' : xpt#flt#New( 0, '$CURSOR_PH' ) }, 'onfocusFilters':{ 'cursor' : xpt#flt#New( 0, 'FinishPH({"text":""})' ) }, 'postQuoter':{ 'start' : '{{', 'end' : '}}' }, }
+fun! xpt#st#New()
+	return deepcopy(s:proto)
+endfunction
+fun! xpt#st#Extend(setting)
+	for k in [ 'preValues', 'onfocusFilters', 'liveFilters', 'postFilters' ]
+		if has_key(a:setting,k)
+			for val in values(a:setting[k])
+				call xpt#flt#Extend(val)
+			endfor
+		endif
+	endfor
+	if has_key( a:setting, 'mappings' )
+		for phMapping in values(a:setting.mappings)
+			for mapFilter in values(phMapping.keys)
+				call xpt#flt#Extend(mapFilter)
+			endfor
+		endfor
+	endif
+	call extend( a:setting, deepcopy( s:proto ), 'keep' )
+	for [k,v] in items(s:protoDefault)
+		call extend( a:setting[ k ], deepcopy( v ), 'keep' )
+	endfor
+endfunction
+fun! xpt#st#RenderPhaseCopy(setting)
+	let setting = copy(a:setting)
+	for k in [ 'variables', 'preValues', 'onfocusFilters' , 'liveFilters', 'postFilters', 'comeFirst', 'comeLast' ]
+		let setting[k] = copy(setting[k])
+	endfor
+	let x = b:xptemplateData
+	if x.currentExt != {}
+		let setting.variables[ '$EXT' ] = x.currentExt.ext
+		let x.currentExt = {}
+	endif
+	return setting
+endfunction
+fun! xpt#st#What()
+endfunction
+fun! xpt#st#Simplify(setting)
+	call filter( a:setting, '!has_key(s:proto,v:key) || v:val!=s:proto[v:key]' )
+endfunction
+fun! xpt#st#Merge(setting,fromSettings)
+	let a:setting.comeFirst += a:fromSettings.comeFirst
+	let a:setting.comeLast = a:fromSettings.comeLast + a:setting.comeLast
+	call xpt#st#InitItemOrderList(a:setting)
+	call extend( a:setting.preValues, a:fromSettings.preValues, 'keep' )
+	call extend( a:setting.onfocusFilters, a:fromSettings.onfocusFilters, 'keep' )
+	call extend( a:setting.postFilters, a:fromSettings.postFilters, 'keep' )
+	call extend( a:setting.variables, a:fromSettings.variables, 'keep' )
+	for key in keys(a:fromSettings.mappings)
+		if !has_key(a:setting.mappings,key)
+			let a:setting.mappings[key] = { 'saver' : xpt#msvr#New( 1 ), 'keys' : {} }
+		endif
+		for keystroke in keys(a:fromSettings.mappings[key].keys)
+			let a:setting.mappings[key].keys[keystroke] = a:fromSettings.mappings[key].keys[keystroke]
+			call xpt#msvr#Add( a:setting.mappings[ key ].saver, 'i', keystroke )
+		endfor
+	endfor
+endfunction
+fun! xpt#st#Parse(setting,snipObject)
+	let st = a:setting
+	if get( st, 'wraponly' ) isnot 0
+		call extend( st, { 'iswrap' : 1, 'iswraponly' : 1, 'wrapPH' : st.wraponly }, 'force' )
+	elseif get( st, 'wrap' ) isnot 0
+		call extend( st, { 'iswrap' : 1, 'iswraponly' : 0, 'wrapPH' : st.wrap }, 'force' )
+	else
+		call extend( st, { 'iswrap' : 0, 'iswraponly' : 0 }, 'force' )
+	endif
+	if st.iswrap && st.wrapPH is 1
+		let st.wrapPH = 'cursor'
+	endif
+	if has_key(st, 'rawHint')
+		if st.rawHint =~ s:regEval
+			let x = b:xptemplateData
+			let x.renderContext.snipObject = a:snipObject
+			let st.hint = xpt#eval#Eval(st.rawHint, x.filetypes[x.snipFileScope.filetype].funcs, { 'variables' : st.variables } )
+		else
+			let st.hint = xpt#util#UnescapeChar(st.rawHint,s:nonsafe)
+		endif
+	endif
+	call xpt#st#ParsePostQuoter(st)
+	if has_key( st, 'extension' )
+		let ext = st.extension
+		let a:snipObject.ftScope.extensionTable[ext] = get(a:snipObject.ftScope.extensionTable,ext,[])
+		let a:snipObject.ftScope.extensionTable[ext] += [a:snipObject.name]
+	endif
+endfunction
+fun! xpt#st#ParsePostQuoter(setting)
+	if !has_key( a:setting, 'postQuoter' ) || type(a:setting.postQuoter) == type({})
+		return
+	endif
+	let quoters = split( a:setting.postQuoter, ',' )
+	if len(quoters) < 2
+		throw 'postQuoter must be separated with ","! :' . a:setting.postQuoter
+	endif
+	let a:setting.postQuoter = { 'start' : quoters[0], 'end' : quoters[1] }
+endfunction
+fun! xpt#st#InitItemOrderList(setting)
+	call filter( a:setting.comeLast, 'v:val!="cursor"' )
+	call add( a:setting.comeLast, 'cursor' )
+	let a:setting.comeFirst = xpt#util#RemoveDuplicate(a:setting.comeFirst)
+	let a:setting.comeLast = xpt#util#RemoveDuplicate(a:setting.comeLast)
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/autoload/xpt/util.vim b/vim-plugins/bundle/xptemplate/autoload/xpt/util.vim
new file mode 100644
index 0000000..f501190
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/autoload/xpt/util.vim
@@ -0,0 +1,244 @@
+exe xpt#once#init
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+let s:log = xpt#debug#Logger( 'warn' )
+exe XPT#importConst
+let s:charsPatternTable = {}
+fun! xpt#util#Flatten(arr)
+	let r = []
+	for e in a:arr
+		if type(e) == 3
+			call extend(r,xpt#util#Flatten(e))
+		else
+			let r += [e]
+		endif
+		unlet e
+	endfor
+	return r
+endfunction
+fun! xpt#util#SplitWith(str,char)
+	let s = split( a:str, '\V' . s:nonEscaped . a:char, 1 )
+	return s
+endfunction
+fun! xpt#util#UnescapeChar(str,chars)
+	if a:chars == ""
+		return a:str
+	endif
+	if has_key(s:charsPatternTable,a:chars)
+		return substitute( a:str, s:charsPatternTable[ a:chars ], '\1', 'g' )
+	else
+		return substitute( a:str, s:GetUnescapeCharPattern( a:chars ), '\1', 'g' )
+	endif
+endfunction
+fun! xpt#util#DeepExtend(to,from)
+	for key in keys(a:from)
+		if type(a:from[key]) == 4
+			if has_key(a:to,key)
+				call xpt#util#DeepExtend(a:to[key],a:from[key])
+			else
+				let a:to[key] = a:from[key]
+			endif
+		elseif type(a:from[key]) == 3
+			if has_key(a:to,key)
+				call extend(a:to[key],a:from[key])
+			else
+				let a:to[key] = a:from[key]
+			endif
+		else
+			let a:to[key] = a:from[key]
+		endif
+	endfor
+endfunction
+fun! xpt#util#RemoveDuplicate(list)
+	let dict = {}
+	let newList = []
+	for e in a:list
+		if !has_key(dict,e)
+			call add(newList,e)
+		endif
+		let dict[e] = 1
+	endfor
+	return newList
+endfunction
+fun! xpt#util#ExpandTab(text,n)
+	if stridx( a:text, "	" ) < 0
+		return a:text
+	endif
+	let str = "\n" . a:text
+	let tabspaces = repeat( ' ', a:n )
+	let last = ''
+	while str != last
+		let last = str
+		let str = substitute( str, '\n	*\zs	', tabspaces, 'g' )
+	endwhile
+	return str[1 :]
+endfunction
+fun! xpt#util#convertSpaceToTab(text)
+	if ( "\n" . a:text ) !~ '\V\n ' || &expandtab
+		return a:text
+	else
+		let tabspaces = repeat( ' ',  &tabstop )
+		let lines = split( a:text, '\V\n', 1 )
+		let newlines = []
+		for line in lines
+			let newline = join( split( line, '\V\^\%(' . tabspaces . '\)', 1 ), '	' )
+			let newlines += [newline]
+		endfor
+		return join( newlines, "\n" )
+	endif
+endfunction
+fun! xpt#util#SpaceToTab(lines)
+	if ! &expandtab && match( a:lines, '\v^ ' ) > -1
+		let cmd = 'join( split( v:val, ''\v^%('' . repeat( '' '',  &tabstop ) . '')'', 1 ), ''	'' )'
+		call map(a:lines,cmd)
+	endif
+	return a:lines
+endfunction
+fun! xpt#util#SpaceToTabExceptFirstLine(lines)
+	if ! &expandtab && len( a:lines ) > 1 && match( a:lines, '\v^ ', 1 ) > -1
+		let line0 = a:lines[0]
+		let cmd = 'join( split( v:val, ''\v^%('' . repeat( '' '',  &tabstop ) . '')'', 1 ), ''	'' )'
+		call map(a:lines,cmd)
+		let a:lines[0] = line0
+	endif
+	return a:lines
+endfunction
+fun! xpt#util#AddIndent(text,nIndent)
+	let baseIndent = repeat( " ", a:nIndent )
+	return substitute(a:text, '\n', '&' . baseIndent, 'g')
+endfunction
+fun! xpt#util#AddIndent2(text,nIndent)
+	let baseIndent = repeat( " ", a:nIndent )
+	if type( a:text ) == type( '' )
+		return substitute(a:text, '\n', '&' . baseIndent, 'g')
+	else
+		call map( a:text, string( baseIndent ) . '.v:val' )
+		let a:text[0] = a:text[0][a:nIndent :]
+		return a:text
+	endif
+endfunction
+fun! xpt#util#getIndentNr(pos)
+	let [ln,col] = a:pos
+	let line = matchstr( getline( ln ), '\V\^\s\*' )
+	if 1
+		if col == 1
+			return 0
+		else
+			let line = line[0 : col - 1 - 1]
+			return virtcol([ln,len(line)])
+		endif
+	else
+		let line = ( col == 1 ) ? '' : line[ 0 : col - 1 - 1 ]
+		let tabspaces = repeat( ' ', &tabstop )
+		return len( substitute( line, '	', tabspaces, 'g' ) )
+	endif
+endfunction
+fun! xpt#util#LastIndent(text)
+	if a:text is ''
+		return 0
+	endif
+	let text = split( a:text, '\V\n', 1 )[ -1 ]
+	return len( matchstr( text, '\V\^\s\+' ) )
+endfunction
+fun! xpt#util#GetPreferedIndentNr(ln)
+	if &indentexpr == ''
+		return -1
+	else
+		let indentexpr = substitute( &indentexpr, '\Vv:lnum', a:ln, '' )
+		try
+			return eval(indentexpr)
+		catch /.*/
+			return -1
+		endtry
+	endif
+endfunction
+fun! xpt#util#TextBetween(posList)
+	return join(xpt#util#LinesBetween( a:posList ), "\n")
+endfunction
+fun! xpt#util#TextInLine(ln,s,e)
+	if a:s >= a:e
+		return ""
+	endif
+	return getline(a:ln)[a:s - 1 : a:e - 2]
+endfunction
+fun! xpt#util#LinesBetween(posList)
+	let [s,e] = a:posList
+	if s[0] > e[0] || e[0] == 0
+		return [""]
+	endif
+	let r = getline(s[0],e[0])
+	let r[-1] = strpart(r[-1],0,e[1] - 1)
+	let r[0] = strpart(r[0],s[1] - 1)
+	return r
+endfunction
+fun! xpt#util#SynNameStack(l,c)
+	if exists( '*synstack' )
+		let ids = synstack(a:l,a:c)
+		if empty(ids)
+			return []
+		endif
+		let names = []
+		for id in ids
+			let names = names + [synIDattr(id, "name")]
+		endfor
+		return names
+	else
+		return [synIDattr( synID( a:l, a:c, 0 ), "name" )]
+	endif
+endfunction
+fun! xpt#util#NearestSynName()
+	let pos = [ line( "." ), col( "." ) ]
+	let synName = synIDattr(synID(pos[0], pos[1], 1), "name")
+	if synName == ''
+		let prevPos = searchpos( '\S', 'bWn' )
+		if prevPos == [0,0]
+			return synName
+		endif
+		let synName = synIDattr(synID(prevPos[0], prevPos[1], 1), "name")
+		if synName == ''
+			return &filetype
+		endif
+	endif
+	return synName
+endfunction
+fun! xpt#util#CharsPattern(chars,...)
+	let is_magic = 0
+	if a:0 > 0 && a:1 is 1
+		let is_magic = 1
+	endif
+	let esc = '\['
+	if is_magic
+		let esc = '['
+	endif
+	let pattern = esc . escape( a:chars, '\]-^' ) . ']'
+	return pattern
+endfunction
+fun! s:GetUnescapeCharPattern(chars)
+	let chars = substitute( a:chars, '\\', '', 'g' )
+	let pattern = s:unescapeHead . '\ze\[' . escape( chars, '\]-^' ) . ']'
+	let s:charsPatternTable[a:chars] = pattern
+	return pattern
+endfunction
+fun! xpt#util#getCmdOutput(cmd)
+	let l:a = ""
+	redir => l:a
+	exe a:cmd
+	redir END
+	return l:a
+endfunction
+fun! xpt#util#Fallback(fbs)
+	let fbs = a:fbs
+	if len(fbs) > 0
+		let [key,flag] = fbs[0]
+		call remove(fbs,0)
+		if flag == 'feed'
+			call feedkeys( key, 'mt' )
+			return ''
+		else
+			return key
+		endif
+	else
+		return ''
+	endif
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/changelog.md b/vim-plugins/bundle/xptemplate/changelog.md
new file mode 100644
index 0000000..d05d373
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/changelog.md
@@ -0,0 +1,152 @@
+2016-07-07
+==========
+
+Fixed
+-----
+
+*   engine: always try to init buf data for xptemplate before XPTupdate. fixed: #79
+
+2015-06-28
+==========
+
+Fixed
+-----
+
+*   bracket: fix incorrect indent with cr
+
+*   engine: fix wrapper indent
+*   engine: normal-mode "x" breaks xpt
+
+*   filter: pass test 60-ph-func-Next 05-def-text-arg. Next move focus to next ph
+
+*   snippet-matching: snippet key should be stored in filetype instead of buffer
+*   snippet-matching: use keyword instead of word
+
+*   syntax: correct escaping nested mark
+
+2015-06-17
+==========
+
+Fixed
+-----
+
+*   engine: fix #69 mapping saver should not reinitiate when switching buffer
+
+2015-06-02
+==========
+
+Fixed
+-----
+
+*   engine: support hint of pum in dictionary type
+*   engine: post-filter uses outer-marks
+
+*   eval: concat text and Echo(). fix #68
+
+2015-04-20
+==========
+
+Fixed
+-----
+
+*   util: xpt#once#init path parsing in windows
+
+2015-04-17
+==========
+
+Added
+-----
+
+*   util: load .xpt.vim from working dir
+
+Fixed
+-----
+
+*   engine: quick-add snippet to buffer without filetype
+
+2015-04-16
+==========
+
+Added
+-----
+
+*   integration-test: of g:xptemplate_lib_filter
+
+*   option: g:xptemplate_lib_filter
+
+2015-04-14
+==========
+
+Added
+-----
+
+*   integration-test: 01-g-xptemplate_key_force_pum
+*   integration-test: 01-g-xptemplate_key
+*   integration-test: escaping in g:xptemplate_vars
+*   integration-test: 00-verboselog
+*   integration-test: snippet hint
+
+Fixed
+-----
+
+*   eval: \\$a should unescape one back slash
+*   eval: error message should not interrupt working flow
+
+*   hint: beside string, also accept number, dict and list value type
+
+*   util: xpt#once#init resolve symbolic link
+
+2015-03-05
+==========
+
+Fixed
+-----
+
+*   oop: skip verbose message when looking for class member
+
+2015-03-03
+==========
+
+Added
+-----
+
+*   integration-test: basic rendering.
+*   integration-test: indenting.
+*   integration-test: command 'XSET'.
+*   integration-test: pop up menu.
+*   integration-test: wrapper.
+*   integration-test: function:
+    `Build()` `BuildIfNoChange()` `BuildSnippet()` `Choose()` `Echo()` `Trigger()`.
+*   snippet: golang.
+*   doc: `Build()` `Echo()` `BuildIfNoChange()`.
+*   doc: gif screencast.
+*   doc: `g:xptemplate_break_undo`.
+
+Changed
+-------
+
+*   snippet: simplify markdown.
+*   engine: use closure for variable looking up.
+*   engine: filter action 'embed' is same with 'build'.
+*   engine: support to change only the visual mapping.
+*   engine: add conf `g:xptemplate_close_pum`.
+
+Deprecated
+----------
+
+*   action: 'embed'.
+
+Removed
+-------
+
+*   engine: several old fashion classes.
+
+Fixed
+-----
+
+*   engine: fix script-local mapping restore.
+*   readme: integration with latest supertab.
+*   engine: non-built default value should not move cursor to next.
+*   engine: correct several indent handling.
+*   engien: option 'preview' with completeopt.
+*   mapping: fix lost setting during applying BuildSnippet.
diff --git a/vim-plugins/bundle/xptemplate/doc/tags b/vim-plugins/bundle/xptemplate/doc/tags
new file mode 100644
index 0000000..86a3396
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/doc/tags
@@ -0,0 +1,173 @@
+<Plug>XPTrawKey	xptemplate.txt	/*<Plug>XPTrawKey*
+Build()	xpt/snippet-function.txt	/*Build()*
+BuildSnippet()	xpt/snippet-function.txt	/*BuildSnippet()*
+C()	xpt-function.txt	/*C()*
+E({expr})	xpt-function.txt	/*E({expr})*
+Echo()	xpt/snippet-function.txt	/*Echo()*
+Include:	xpt.snippet.syn.txt	/*Include:*
+N()	xpt-function.txt	/*N()*
+R({name})	xpt-function.txt	/*R({name})*
+S()	xpt-function.txt	/*S()*
+S({expr},{pat},{sub},{flags})	xpt-function.txt	/*S({expr},{pat},{sub},{flags})*
+SV()	xpt-function.txt	/*SV()*
+V()	xpt-function.txt	/*V()*
+XPTcurrentPH	xptemplate.txt	/*XPTcurrentPH*
+XPTembed	xpt.snippet.syn.txt	/*XPTembed*
+XPTemplate	xptemplate.txt	/*XPTemplate*
+XPTemplate()	xpt.api.txt	/*XPTemplate()*
+XPTemplateMark()	xpt.api.txt	/*XPTemplateMark()*
+XPTemplatePriority()	xpt.api.txt	/*XPTemplatePriority()*
+XPTemplateTrigger()	xpt.api.txt	/*XPTemplateTrigger()*
+XPTfollowingPH	xptemplate.txt	/*XPTfollowingPH*
+XPTfuncs()	xpt.api.txt	/*XPTfuncs()*
+XPTinclude	xpt.snippet.syn.txt	/*XPTinclude*
+XPTinfo()	xpt.api.txt	/*XPTinfo()*
+XPTinfoStr([fmt,[sep]])	xpt.api.txt	/*XPTinfoStr([fmt,[sep]])*
+XPTnextItem	xptemplate.txt	/*XPTnextItem*
+XPTtgr()	xpt.api.txt	/*XPTtgr()*
+XPTvar	xpt.snippet.syn.txt	/*XPTvar*
+^	xpt.snippet.syn.txt	/*^*
+`	xpt.snippet.syn.txt	/*`*
+`...^	xptemplate.txt	/*`...^*
+`::^	xpt.snippet.syn.txt	/*`::^*
+```	xpt.snippet.syn.txt	/*```*
+`cursor^	xpt.snippet.syn.txt	/*`cursor^*
+g:XPTaddBundle()	xpt.api.txt	/*g:XPTaddBundle()*
+g:xptemplate_always_show_pum	xpt/option.txt	/*g:xptemplate_always_show_pum*
+g:xptemplate_brace_complete	xpt/option.txt	/*g:xptemplate_brace_complete*
+g:xptemplate_break_undo	xpt/option.txt	/*g:xptemplate_break_undo*
+g:xptemplate_bundle	xpt/option.txt	/*g:xptemplate_bundle*
+g:xptemplate_close_pum	xpt/option.txt	/*g:xptemplate_close_pum*
+g:xptemplate_cwd_snippet	xpt/option.txt	/*g:xptemplate_cwd_snippet*
+g:xptemplate_debug_log	xpt/option.txt	/*g:xptemplate_debug_log*
+g:xptemplate_fallback	xptemplate.txt	/*g:xptemplate_fallback*
+g:xptemplate_goback	xptemplate.txt	/*g:xptemplate_goback*
+g:xptemplate_highlight	xpt/option.txt	/*g:xptemplate_highlight*
+g:xptemplate_highlight_nested	xpt/option.txt	/*g:xptemplate_highlight_nested*
+g:xptemplate_hook_before_cr	xpt/option.txt	/*g:xptemplate_hook_before_cr*
+g:xptemplate_key	xptemplate.txt	/*g:xptemplate_key*
+g:xptemplate_key_force_pum	xptemplate.txt	/*g:xptemplate_key_force_pum*
+g:xptemplate_key_pum_only	xptemplate.txt	/*g:xptemplate_key_pum_only*
+g:xptemplate_lib_filter	xpt/option.txt	/*g:xptemplate_lib_filter*
+g:xptemplate_minimal_prefix	xpt/option.txt	/*g:xptemplate_minimal_prefix*
+g:xptemplate_move_even_with_pum	xpt/option.txt	/*g:xptemplate_move_even_with_pum*
+g:xptemplate_nav_cancel	xptemplate.txt	/*g:xptemplate_nav_cancel*
+g:xptemplate_nav_next	xptemplate.txt	/*g:xptemplate_nav_next*
+g:xptemplate_nav_prev	xptemplate.txt	/*g:xptemplate_nav_prev*
+g:xptemplate_ph_pum_accept_empty	xpt/option.txt	/*g:xptemplate_ph_pum_accept_empty*
+g:xptemplate_pum_quick_back	xpt/option.txt	/*g:xptemplate_pum_quick_back*
+g:xptemplate_pum_tab_nav	xpt/option.txt	/*g:xptemplate_pum_tab_nav*
+g:xptemplate_snippet_folders	xpt/option.txt	/*g:xptemplate_snippet_folders*
+g:xptemplate_strict	xpt/option.txt	/*g:xptemplate_strict*
+g:xptemplate_strip_left	xpt/option.txt	/*g:xptemplate_strip_left*
+g:xptemplate_to_right	xptemplate.txt	/*g:xptemplate_to_right*
+g:xptemplate_vars	xpt/option.txt	/*g:xptemplate_vars*
+i_<C-\>	xptemplate.txt	/*i_<C-\\>*
+i_<C-g>	xptemplate.txt	/*i_<C-g>*
+i_<C-r><C-r><C-\>	xptemplate.txt	/*i_<C-r><C-r><C-\\>*
+i_<S-tab>	xptemplate.txt	/*i_<S-tab>*
+i_<tab>	xptemplate.txt	/*i_<tab>*
+n_<C-g>	xptemplate.txt	/*n_<C-g>*
+s_<C-\>	xptemplate.txt	/*s_<C-\\>*
+s_<C-l>	xptemplate.txt	/*s_<C-l>*
+s_<CR>	xptemplate.txt	/*s_<CR>*
+s_<S-tab>	xptemplate.txt	/*s_<S-tab>*
+s_<tab>	xptemplate.txt	/*s_<tab>*
+self.renderContext	xpt.api.txt	/*self.renderContext*
+v_<C-\>	xptemplate.txt	/*v_<C-\\>*
+xpt	xptemplate.txt	/*xpt*
+xpt-$	xpt.snippet.syn.txt	/*xpt-$*
+xpt-...	xptemplate.txt	/*xpt-...*
+xpt-```	xpt.snippet.syn.txt	/*xpt-```*
+xpt-api	xpt.api.txt	/*xpt-api*
+xpt-bundle	xptemplate.txt	/*xpt-bundle*
+xpt-context	xptemplate.txt	/*xpt-context*
+xpt-customize	xptemplate.txt	/*xpt-customize*
+xpt-customize-highlight	xptemplate.txt	/*xpt-customize-highlight*
+xpt-customize-variable	xptemplate.txt	/*xpt-customize-variable*
+xpt-customize-variable-datetime	xptemplate.txt	/*xpt-customize-variable-datetime*
+xpt-customize-variable-format	xptemplate.txt	/*xpt-customize-variable-format*
+xpt-customize-variable-space	xptemplate.txt	/*xpt-customize-variable-space*
+xpt-feature	xptemplate.txt	/*xpt-feature*
+xpt-install	xptemplate.txt	/*xpt-install*
+xpt-key-bind	xptemplate.txt	/*xpt-key-bind*
+xpt-key-clear	xptemplate.txt	/*xpt-key-clear*
+xpt-key-goback	xptemplate.txt	/*xpt-key-goback*
+xpt-key-goto-right	xptemplate.txt	/*xpt-key-goto-right*
+xpt-key-navigate	xptemplate.txt	/*xpt-key-navigate*
+xpt-key-pum	xptemplate.txt	/*xpt-key-pum*
+xpt-key-trigger	xptemplate.txt	/*xpt-key-trigger*
+xpt-key-visual	xptemplate.txt	/*xpt-key-visual*
+xpt-mixed	xpt.snippet.syn.txt	/*xpt-mixed*
+xpt-name-matching	xptemplate.txt	/*xpt-name-matching*
+xpt-nested	xptemplate.txt	/*xpt-nested*
+xpt-option	xpt/option.txt	/*xpt-option*
+xpt-personal-folder	xptemplate.txt	/*xpt-personal-folder*
+xpt-personal-var	xpt/option.txt	/*xpt-personal-var*
+xpt-placeholder-cursor	xpt.snippet.syn.txt	/*xpt-placeholder-cursor*
+xpt-placeholder-default-value	xpt.snippet.syn.txt	/*xpt-placeholder-default-value*
+xpt-placeholder-edge	xpt.snippet.syn.txt	/*xpt-placeholder-edge*
+xpt-placeholder-left-mark	xpt.snippet.syn.txt	/*xpt-placeholder-left-mark*
+xpt-placeholder-mark	xpt.snippet.syn.txt	/*xpt-placeholder-mark*
+xpt-placeholder-ontime-filter	xpt.snippet.syn.txt	/*xpt-placeholder-ontime-filter*
+xpt-placeholder-optional-ph	xpt.snippet.syn.txt	/*xpt-placeholder-optional-ph*
+xpt-placeholder-post-filter	xpt.snippet.syn.txt	/*xpt-placeholder-post-filter*
+xpt-placeholder-right-mark	xpt.snippet.syn.txt	/*xpt-placeholder-right-mark*
+xpt-placeholder-special	xpt.snippet.syn.txt	/*xpt-placeholder-special*
+xpt-popup	xptemplate.txt	/*xpt-popup*
+xpt-priority-format	xpt.snippet.syn.txt	/*xpt-priority-format*
+xpt-priority-value	xpt.snippet.syn.txt	/*xpt-priority-value*
+xpt-repetition	xptemplate.txt	/*xpt-repetition*
+xpt-snippet	xpt.snippet.syn.txt	/*xpt-snippet*
+xpt-snippet-ComeFirst	xpt.snippet.syn.txt	/*xpt-snippet-ComeFirst*
+xpt-snippet-ComeLast	xpt.snippet.syn.txt	/*xpt-snippet-ComeLast*
+xpt-snippet-XPTinclude	xpt.snippet.syn.txt	/*xpt-snippet-XPTinclude*
+xpt-snippet-XSET	xpt.snippet.syn.txt	/*xpt-snippet-XSET*
+xpt-snippet-XSETm	xpt.snippet.syn.txt	/*xpt-snippet-XSETm*
+xpt-snippet-abbr	xpt.snippet.syn.txt	/*xpt-snippet-abbr*
+xpt-snippet-alias	xpt.snippet.syn.txt	/*xpt-snippet-alias*
+xpt-snippet-body	xpt.snippet.syn.txt	/*xpt-snippet-body*
+xpt-snippet-default-post-filter	xpt.snippet.syn.txt	/*xpt-snippet-default-post-filter*
+xpt-snippet-default-value	xpt.snippet.syn.txt	/*xpt-snippet-default-value*
+xpt-snippet-embed	xpt.snippet.syn.txt	/*xpt-snippet-embed*
+xpt-snippet-expandable	xpt.snippet.syn.txt	/*xpt-snippet-expandable*
+xpt-snippet-expression	xpt.snippet.syn.txt	/*xpt-snippet-expression*
+xpt-snippet-function	xpt/snippet-function.txt	/*xpt-snippet-function*
+xpt-snippet-function-ctx	xpt.api.txt	/*xpt-snippet-function-ctx*
+xpt-snippet-header	xpt.snippet.syn.txt	/*xpt-snippet-header*
+xpt-snippet-hidden	xpt.snippet.syn.txt	/*xpt-snippet-hidden*
+xpt-snippet-hint	xpt.snippet.syn.txt	/*xpt-snippet-hint*
+xpt-snippet-include	xpt.snippet.syn.txt	/*xpt-snippet-include*
+xpt-snippet-instant-value	xpt.snippet.syn.txt	/*xpt-snippet-instant-value*
+xpt-snippet-item	xpt.snippet.syn.txt	/*xpt-snippet-item*
+xpt-snippet-keyword	xpt.snippet.syn.txt	/*xpt-snippet-keyword*
+xpt-snippet-leading-placeholder	xpt.snippet.syn.txt	/*xpt-snippet-leading-placeholder*
+xpt-snippet-mark	xpt.snippet.syn.txt	/*xpt-snippet-mark*
+xpt-snippet-name	xpt.snippet.syn.txt	/*xpt-snippet-name*
+xpt-snippet-name-matching-rule	xpt.snippet.syn.txt	/*xpt-snippet-name-matching-rule*
+xpt-snippet-placeholder	xpt.snippet.syn.txt	/*xpt-snippet-placeholder*
+xpt-snippet-post-filter	xpt.snippet.syn.txt	/*xpt-snippet-post-filter*
+xpt-snippet-postQuoter	xpt.snippet.syn.txt	/*xpt-snippet-postQuoter*
+xpt-snippet-preset-value	xpt.snippet.syn.txt	/*xpt-snippet-preset-value*
+xpt-snippet-priority	xpt.snippet.syn.txt	/*xpt-snippet-priority*
+xpt-snippet-repetition	xpt.snippet.syn.txt	/*xpt-snippet-repetition*
+xpt-snippet-sample	xpt.snippet.syn.txt	/*xpt-snippet-sample*
+xpt-snippet-setting	xpt.snippet.syn.txt	/*xpt-snippet-setting*
+xpt-snippet-synonym	xpt.snippet.syn.txt	/*xpt-snippet-synonym*
+xpt-snippet-syntax	xpt.snippet.syn.txt	/*xpt-snippet-syntax*
+xpt-snippet-tutorial	xpt.snippet.tutor.txt	/*xpt-snippet-tutorial*
+xpt-snippet-variable	xpt.snippet.syn.txt	/*xpt-snippet-variable*
+xpt-snippet-wrap	xpt.snippet.syn.txt	/*xpt-snippet-wrap*
+xpt-snippet-wraponly	xpt.snippet.syn.txt	/*xpt-snippet-wraponly*
+xpt-substitute	xpt-function.txt	/*xpt-substitute*
+xpt-tips	xptemplate.txt	/*xpt-tips*
+xpt-tutor-define-snippet	xpt.snippet.tutor.txt	/*xpt-tutor-define-snippet*
+xpt-tutor-snippet-file	xpt.snippet.tutor.txt	/*xpt-tutor-snippet-file*
+xpt-usage	xptemplate.txt	/*xpt-usage*
+xpt-with-supertab	xptemplate.txt	/*xpt-with-supertab*
+xpt-wrapper-snippet	xptemplate.txt	/*xpt-wrapper-snippet*
+xpt-write-common-snippet	xptemplate.txt	/*xpt-write-common-snippet*
+xpt-write-lang-snippet	xptemplate.txt	/*xpt-write-lang-snippet*
+xpt-write-snippet	xptemplate.txt	/*xpt-write-snippet*
+xpt-{}	xpt.snippet.syn.txt	/*xpt-{}*
+xptemplate	xptemplate.txt	/*xptemplate*
diff --git a/vim-plugins/bundle/xptemplate/doc/xpt-function.txt b/vim-plugins/bundle/xptemplate/doc/xpt-function.txt
new file mode 100644
index 0000000..80d1294
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/doc/xpt-function.txt
@@ -0,0 +1,35 @@
+
+						      *S()*   *xpt-substitute*
+S({pattern},{replace},[{flag}])
+	Substitute typed content with pattern and replace. Just like
+	|substitute()|.
+
+									 *C()*
+C()
+	Get function context, see |xpt-snippet-function-ctx|.
+
+								   *E({expr})*
+E({expr})
+	Equals to |expand()|.
+
+									 *N()*
+N()
+	Current edited item name. Valid only to |xpt-snippet-post-filter|.
+
+									 *V()*
+V()
+	Current typed text. Valid only to |xpt-snippet-post-filter|.
+
+								   *R({name})*
+R({name})
+	Reference to history item. Get value by name.
+
+					       *S({expr},{pat},{sub},{flags})*
+S({expr},{pat},{sub},{flags})
+	Equals to |substitute()|.
+
+									*SV()*
+SV()
+	Equals to S(V(),{pat},{sub},{flag}).
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/vim-plugins/bundle/xptemplate/doc/xpt.api.txt b/vim-plugins/bundle/xptemplate/doc/xpt.api.txt
new file mode 100644
index 0000000..c834934
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/doc/xpt.api.txt
@@ -0,0 +1,153 @@
+*xpt-api*
+
+	This file describes the public functions provided by XPTemplate which
+	can be used in snippets.
+
+
+							    *g:XPTaddBundle()*
+g:XPTaddBundle({filetype}, {bundle})
+	Load a bundle. {filetype} is the current buffer file type in most
+	case. And {bundle} is the file name which supplies the bundle.
+
+	For example loading jquery bundle for HTML buffer(or JAVASCRIPT buffer): >
+		call g:XPTaddBundle('javascript', 'jquery')
+<
+	
+								  *XPTfuncs()*
+g:XPTfuncs()
+	g:XPTfuncs() returns a |Dictionary| container of functions which can
+	be used in templates in the current buffer. The normal usage of
+	g:XPTfuncs() to define a template function is : >
+		let s:f = g:XPTfuncs()
+
+		fun! s:f.date() dict
+		  return strftime("%Y %b %d")
+		endfunction
+<
+	Now you can use functions and variables in the template : >
+	call XPTemplate("filehead", [
+	      \'/**--------------------/// `sum^ \\\----------------------',
+	      \' *',
+	      \' * @version : `1.0^',
+	      \' * @since : `date()^',
+	      \' * @author : `$author^ | `$email^',
+	      \' * @copyright `.com.cn^ ',
+	      \' * @TODO : ',
+	      \' * ',
+	      \' *---------------------\\\ `sum^ ///----------------------*/',
+	      \''])
+<
+
+
+								*XPTemplate()*
+XPTemplate({name} [, {context}], {template})
+	XPTemplate defines a template for the current buffer. It takes 2 or 3
+	parameters:
+	{name} is a string representing the key to trigger this template.
+	{context} can be omitted or an |Dictionary| which defines where this
+	template can be triggered. For now only "syn" is supported.
+	{template} is a string or |List|. |List| will be joined with "\n"
+	forming a template string. This saves you adding "\n" to each line.
+
+
+							    *XPTemplateMark()*
+XPTemplateMark({leftmark}, {rightmark})
+	XPTemplateMark defines which characters are used as item quoter in the
+	current buffer. See |xpt-placeholder-mark|.
+
+	NOTE this function affects only the current script and current buffer.
+
+
+							*XPTemplatePriority()*
+XPTemplatePriority({priority})
+	XPTemplatePriority sets the default priority for the current *.xpt.vim
+	script and current buffer. See |xpt-priority-value|.
+
+	NOTE this function affects only the current script and current buffer.
+
+
+			      *self.renderContext*  *xpt-snippet-function-ctx*
+	The template context can be accessed from within an
+	|xpt-snippet-function|. For example in the "item-reference" function:
+	>
+		fun! s:f.R(name)
+		  let ctx = self.renderContext
+		  if has_key(ctx.namedStep, a:name)
+		    return ctx.namedStep[a:name]
+		  endif
+
+		  return a:ctx.name
+		endfunction
+<
+
+
+								    *XPTtgr()*
+XPTtgr( {snippetName} [, {option} ] )
+	Trigger an snippet of name {snippetName} in insert mode. This function
+	returns and |i_CTRL-R_=| expression. You should always use this
+	function following "<C-R>=". 
+
+	As Example, the following two command defines auto-complete brace: >
+		call XPTemplate('brace', '{`^}')
+		inoremap { <C-r>=XPTtgr('brace')<CR>
+<	
+	After executing these 2 command, a "{" key-stroke produces a pair of
+	braces: "{}" and cursor left between them.
+
+	Table below lists all {option} keys: >
+
+	{option}.syn		Regular expression defines pattern what syntax
+				name must match for snippet to trigger.
+
+	{option}.nosyn		Regular expression defines pattern what syntax
+				name must NOT match for snippet to trigger.
+
+	{option}.literal	Snippet can only be triggered in string or
+				comment. Same as
+				{option}.syn='\V\cstring\|comment'.
+
+	{option}.noliteral	Snippet can only be triggered outside of
+				string or comment. Same as
+				{option}.nosyn='\V\cstring\|comment'.
+
+	{option}.k		What should be produced if condition is not
+				satisfied to trigger snippet.
+<
+
+							 *XPTemplateTrigger()*
+XPTemplateTrigger( {snippetName} [, {option} ] )
+	Deprecated.
+	Same as |XPTtgr()|.
+
+								   *XPTinfo()*
+XPTinfo()
+	Return 0 if no snippet in processing on screen.
+
+	Return an array representing snippets stack on screen in following
+	format:
+>
+	[ {
+		"$snipname" : "<snippet-name>",
+		"$phname" : "<placeholder-name>"
+	}, ... ]
+<
+	In outer-to-inner order
+
+						     *XPTinfoStr([fmt,[sep]])*
+XPTinfoStr([fmt,[sep]])
+	Return data of |XPTinfo()| in string.
+
+	Argument "fmt": format for rendering infomation of each nested snippet
+	in stack. Default value is "$snipname.$phname".
+
+	Argument "sep": string as a separator. Default value is " > ".
+
+	By default XPTinfoStr() returns: >
+		"<snip-a>.<ph-x> > <snip-inside-a>.<ph-y>..."
+<
+	Example: Adding this function to 'statusline' as a indicator when
+	working with deeply nested snippets: >
+		let &statusline .= '%{XPTinfoStr()}'
+<
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/vim-plugins/bundle/xptemplate/doc/xpt.snippet.syn.txt b/vim-plugins/bundle/xptemplate/doc/xpt.snippet.syn.txt
new file mode 100644
index 0000000..e2de677
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/doc/xpt.snippet.syn.txt
@@ -0,0 +1,923 @@
+*xpt-snippet-syntax*
+
+			XPT Snippet Syntax
+								    by drdr.xp
+							     drdr.xp@gmail.com
+==============================================================================
+
+	Content table:
+	|xpt-snippet-sample|
+
+	|xpt-snippet-header|
+		|xpt-snippet-priority|
+			|xpt-priority-value|
+			|xpt-priority-format|
+		|xpt-snippet-keyword|
+		|xpt-snippet-mark|
+	|xpt-snippet-variable|
+	|xpt-snippet-function|
+	|xpt-snippet-XPTinclude|
+	|xpt-snippet-embed|
+
+	|xpt-snippet|
+		|xpt-snippet-name|
+		|xpt-snippet-setting|
+		|xpt-snippet-hint|
+		|xpt-snippet-hidden|
+		|xpt-snippet-alias|
+		|xpt-snippet-synonym|
+		|xpt-snippet-wrap|
+		|xpt-snippet-wraponly|
+		|xpt-snippet-abbr|
+
+
+	|xpt-snippet-body|
+	|xpt-snippet-include|
+	|xpt-snippet-XSET|
+	|xpt-snippet-XSETm|
+	|xpt-snippet-ComeFirst|
+	|xpt-snippet-ComeLast|
+	|xpt-snippet-postQuoter|
+
+
+	|xpt-snippet-item|
+	|xpt-snippet-placeholder|
+	|xpt-placeholder-mark|
+		|xpt-placeholder-left-mark|   |`|
+		|xpt-placeholder-right-mark|  |^|
+	|xpt-placeholder-edge|
+	|xpt-snippet-leading-placeholder|
+
+	|xpt-placeholder-special|
+	|xpt-placeholder-cursor|
+
+	|xpt-snippet-expression|
+	|xpt-snippet-instant-value|
+	|xpt-snippet-preset-value|
+	|xpt-snippet-default-value|
+	|xpt-snippet-post-filter|
+		|xpt-snippet-default-post-filter|
+			|xpt-placeholder-optional-ph|
+
+	|xpt-placeholder-default-value|
+	|xpt-placeholder-post-filter|
+	|xpt-placeholder-ontime-filter|
+
+	|xpt-snippet-expandable|
+	|xpt-snippet-repetition|
+
+							  *xpt-snippet-sample*
+	A snippet file looks like this : >
+		XPTemplate priority=lang keyword=$	| |xpt-snippet-header|
+
+		let s:f = XPTfuncs()			| |xpt-snippet-function|
+		 
+		XPTvar $TRUE          true		| |xpt-snippet-variable|
+		XPTvar $FALSE         false             |
+		XPTvar $NULL          null              |
+		XPTvar $UNDEFINED     undefined         |
+                                                        |
+		XPTvar $CL  /*                          |
+		XPTvar $CM   *                          |
+		XPTvar $CR   */                         |
+                                                        |
+
+		XPTinclude				| |xpt-snippet-XPTinclude|
+		      \ _common/common                  |
+		      \ _comment/doubleSign             |
+		      \ _condition/c.like               |
+
+		fun! s:f.js_filename()			| |xpt-snippet-function|
+			return expand( "%" )            |
+		endfunction                             |
+
+
+		XPT cmt hint=/**\ @auth...\ */		| |xpt-snippet|
+		XSET author=$author                     | |xpt-snippet-XSET|
+		XSET email=$email                       | |xpt-snippet-XSET|
+		/**                                     |\ 
+		* @author : `author^ | `email^          | \
+		* @description                          |  +|xpt-snippet-body|
+		*     `cursor^                          | /
+		* @return {`Object^} `desc^             |/
+		*/
+
+
+		XPT for hint=for\ (var..;..;++)	
+		for ( i=0; i<`len^; ++i ) { `cursor^ }
+<
+
+							  *xpt-snippet-header*
+	Each snippet file starts with a XPTemplate declaration for
+	snippet-scope setting, duplication load check, etc.
+
+	Format : >
+	XPTemplate [priority=lang] [keyword=#] [mark=`^]
+<
+	There are 3 optional settings for 'XPTemplate' :
+
+							*xpt-snippet-priority*
+	Priority affects |xpt-snippet| and |xpt-snippet-variable|;
+	|xpt-snippet-function| is defined directly, so it isn't controlled by
+	|xpt-snippet-priority|. Snippets with a lower |xpt-snippet-priority|
+	override higher ones. Format : >
+		XPTemplate priority=<priority-value>
+<	See |xpt-priority-value|.
+							  *xpt-priority-value*
+	Snippets are defined with a certain priority. One buffer might load
+	snippets with the same name. Only the snippet with the lowest priority
+	is used, others are ignored.
+	Priorities can be in the range from 0 to +oo. 0 is the highest
+	priority. Some predefined symbols stand for numeric priority
+	values : >
+		all		: 64
+		spec		: 48
+		like		: 32
+		lang		: 16
+		sub		: 8
+		personal	: 0
+<	Default priority is "lang" or 16. 
+	
+	You can set priority for each snippet by using |xpt-priority-format|.
+	Or set priority for all templates in the current file with
+	|XPTemplatePriority()|.
+
+							 *xpt-priority-format*
+	Priority setting format : "priority[+/-[offset]]".
+	Following formats are all valid : >
+	3		3
+	lang		16
+	like+4		36 // like=32
+	all-		63 // all=64
+	all-1		63 // all=64
+<
+							 *xpt-snippet-keyword*
+	|xpt-snippet-keyword| defines what characters other than word chars
+	can be used as |xpt-snippet-name|.
+
+	You do not need to specify explicitly what char is
+	xpt-snippet-keyword. It is automatically added when non-word char
+	presents in snippet name. For example: >
+		XPT #include <`^.h>
+<
+	After the above snippet loaded, "#" is added.
+
+	See also |xpt-snippet-name-matching-rule|.
+
+
+							    *xpt-snippet-mark*
+	To specify which 2 characters are used as |xpt-placeholder-mark|
+	instead of the default |`| and |^|. Format : >
+		XPTemplate mark=~^
+<
+								       *xpt-$*
+								      *XPTvar*
+							*xpt-snippet-variable*
+	|xpt-snippet-variable| can be used in :
+		|xpt-snippet-instant-value|
+		|xpt-snippet-preset-value|
+		|xpt-snippet-default-value|
+		|xpt-snippet-post-filter|
+		|xpt-placeholder-ontime-filter|
+	Format : >
+		XPTvar $VAR_NAME something
+<	Or with single quoter : >
+		XPTvar $VAR_NAME 'something'
+<	The only difference is that in single quoted strings space can be
+	freely used.  Like this : >
+		XPTvar $VAR_NAME ' '
+<	Instead of using the escaped format "\ ".
+
+	It's also possible to set a variable to the empty value: >
+		XPTvar $VAR_NAME ''
+<
+	Another example from C language : >
+		XPTvar $TRUE 1
+<	and a snippet defined as : >
+		XPT while1
+		while (`$TRUE^) {
+		    `cursor^
+		}
+<	will generate : >
+		while (1) {
+		    `cursor^
+		}
+<
+	|xpt-snippet-variable| is used widely in XPTemplate, such as comment
+	definition, format customization, etc.
+
+	Personal information variables should be defined by using
+	|g:xptemplate_vars|. Variables defined with |g:xptemplate_vars|
+	override variables defined in any snippet files.
+
+	NOTE	By convention the names of |xpt-snippet-variable| supplied by
+		XPTemplate start with an upper-case letter. User defined
+		variable name should start with a lower-case letter.
+
+	NOTE	Override control of |xpt-snippet-variable| is affected by
+		|xpt-snippet-priority|.
+
+								  *XPTinclude*
+						      *xpt-snippet-XPTinclude*
+	Syntax : >
+		XPTinclude <folder_name_in_ftplugin>/<filename>
+<	The <filename> is only the file root, without ".xpt.vim". 
+	XPTinclude can include several snippets at one time.
+
+	NOTE do NOT use |:runtime| to include other snippet files. XPTinclude
+	handles snippet priority, but |:runtime| does NOT.
+
+								    *XPTembed*
+							   *xpt-snippet-embed*
+	Syntax : >
+		XPTembed <folder_name_in_ftplugin>/<filename>
+<	|XPTembed| acts like |XPTinclude|, except it includes only snippet
+	files for nested languages, like JavaScript in HTML, or HTML in PHP.
+
+	NOTE TODO differences between XPTinclude by example.
+
+
+
+
+								 *xpt-snippet*
+	The snippet part starts where the first "XPT ... " presents. Any
+	content after this command is no longer Vim script, but XPTemplate
+	snippets.
+
+	Each |xpt-snippet| defines one code snippet with the following
+	syntax : >
+		XPT <snippetName> [name=value] [name=value] ..
+		<snippet body>..
+		..XPT
+<	'XPT' is the start of a snippet. '..XPT' is the end of a snippet, it
+	is optional. If '..XPT' does not present the snippet body ends at the
+	last non-empty line( but without the last line-break ).
+
+							    *xpt-snippet-name*
+	<snippetName> is the name the user has to type to trigger this
+	snippet. It can only contain word-chars |\w| and
+	|xpt-snippet-keyword|.
+
+	Custom snippets (not provided by XPTemplate) should not start with "_"
+	by convention as these snippets are used by XPTemplate internally, see
+	also |xpt-snippet-include|.
+
+
+					      *xpt-snippet-name-matching-rule*
+	When |xpt-key-trigger| key pressed, XPT search for snippet name from
+	cursor position backwards.
+
+	XPT search for longest matching of any snippet prefixes without
+	breaking any continous words.
+
+	For example there are 4 snippets defined: >
+		XPT a
+		-a
+		XPT *
+		-*
+		XPT a*
+		-a*
+		XPT *a
+		-*a
+<       Then what typed and what got is as below: >
+		a<C-\>		-a
+		*<C-\>		-*
+		a*<C-\>		-a*
+		*a<C-\>		-*a
+		*a<C-\>		-*a
+		xa<C-\>		// Nothing matched. Because to match "a"
+				   word "xa" must be broken.
+		xa*<C-\>	xa-*
+		x*a<C-\>	x-*a
+		x*a*<C-\>	x*-a*
+<
+							 *xpt-snippet-setting*
+	The 'name=value' defines snippet settings, including
+		|xpt-snippet-hint|
+		|xpt-snippet-hidden|
+		|xpt-snippet-alias|
+
+							    *xpt-snippet-hint*
+	Set the 'menu' entry for the pop up menu; as a short description other
+	than |xpt-snippet-name|. Like the following C language popup menu : >
+		| #if           #if ...           |
+		| #ifdef        #if ...           |
+		| #ifndef       #ifndef ..        |
+<	
+	Syntax to set up hints: >
+		XPT for hint=for\ (..;..;++)
+<	Or : >
+		XPT for " for (..;..;++)
+<	The quote-hint must be at the end of |xpt-snippet| declaration.
+
+	Some characters( space, left quote and "$" ) need to be escaped in
+	hint text: >
+				<space>	(	$
+		hint=		yes	yes	yes
+		"		no	yes	yes
+<
+	With only the 'hint=' way:
+		space needs to be escaped.
+
+	With both these two ways :
+		"(" needs to be escaped if you do NOT want it to be evaluated
+		as a function call.
+		"$" needs to be escaped if you do NOT want it to be evaluated
+		as variable.
+
+
+							  *xpt-snippet-hidden*
+	Set to 1 to prevent the snippet from being triggered by the user, but
+	it CAN be triggered from internal API, or included by other snippet.
+	Syntax: >
+		XPT for hidden=1 hint=...
+<	Or: >
+		XPT for hidden hint=...
+<
+	See |xpt-snippet-include| and |xpt-api|.
+
+
+							   *xpt-snippet-alias*
+	Make the snippet an alias to another snippet. Syntax : >
+		XPT forin hint=for\ ..\ in\ ..\ ..\ endfor
+		for `value^ in `list^
+		    `cursor^
+		endfor
+
+		XPT foreach alias=forin hint=for\ ..\ in\ ..\ ..\ endfor
+<	This makes "forin" and "foreach" the same, but with possible different
+	settings.
+
+	NOTE |xpt-snippet-alias| can be used to create shortcuts.
+
+							 *xpt-snippet-synonym*
+	Like |xpt-snippet-alias|, synonym gives a snippet another name.
+	Syntax : >
+		XPT snippetName synonym=a|b|c...
+<	Where a, b and c are all the names of this snippet. For example : >
+		XPT forin synonym=fin|fi hint=for\ ..\ in\ ..\ ..\ endfor
+		for `value^ in `list^
+		    `cursor^
+		endfor
+<	This makes "forin", "fin" and "fi" the same.
+
+	NOTE |xpt-snippet-synonym| can be used to create shortcuts.
+
+
+							    *xpt-snippet-wrap*
+	Wrapper snippets can be triggered in visual mode, place holder marked
+	as "wrap" is replaced with the text selected in visual mode.
+
+	Definition of wrapper snippet has no differences from normal
+	snippet except it declaring a place holder as wrapping holder. For
+	example: >
+		       ________/---------------------| wrapper declaration
+		XPT if wrap=job
+		if (`condition^){
+		    `job^
+		}
+<	
+	Wrapping can be block-wise or line-wise. Wrapper place holder with
+	|xpt-placeholder-edge| is line-wise, or it is block-wise.
+
+	For example: >
+		XPT comment wrap=what
+		`/* `what` */^
+<	This is line-wise wrapper, it will result in: >
+		/* line1 */
+		/* line2 */
+<	But not: >
+		/* line1
+		line2 */
+<
+	See also |xpt-wrapper-snippet| and |xpt-snippet-wraponly|.
+
+
+							*xpt-snippet-wraponly*
+	Normally, wrapper snippet can also be triggered in insert-mode, unless
+	"wraponly" declared. For example: >
+				________/------------| wrap only
+		XPT if wrap=job wraponly
+		if (`condition^){
+		    `job^
+		}
+<
+							    *xpt-snippet-abbr*
+								   {default:0}
+	Set to 1 to create |abbreviations| for this snippet.
+	Example: >
+		       ____/------------------------| create abbr
+		XPT if abbr
+		if (  ) {  }
+<	Snippet defined as above will be triggered by typing "if<space>" or
+	"if<C-]>".
+
+							    *xpt-snippet-body*
+	<snippet body> is all the OTHER text except the first line : >
+		XPT for hint=for\ (..;..;++)
+		for (`i^ = `0^; `i^ < `len^; ++`i^) { |
+		    `cursor^                          | snippet body
+		}                                     |
+
+<	|xpt-snippet-body| contains snippet text and :
+		|xpt-snippet-XSET|
+		|xpt-snippet-XSETm|
+	Snippet with XSET command : >
+
+		XPT printf	hint=printf\(...)
+		XSET elts=c_printfElts( R( 'pattern' ) )
+		printf( "`pattern^"`elts^ )
+
+<	NOTE	XPTemplate use 4-spaces indent. No table-char indent is
+		allowed in snippet file.
+
+	NOTE	XSET/XSETm commands can be placed anywhere inside a snippet.
+
+
+				       *`::^* *Include:* *xpt-snippet-include*
+	`:<snipname>:^		Simple Include without "cursor".
+	`Include:<snipname>^	Include with "cursor" place holder.
+
+	`:<snipname>():^	Simple inclusion with parameter.
+	`Include:<snipname>()^	Inclusion with parameter.
+
+	Snippet can include another snippet, through inclusion place holder : >
+
+		`Include:snippetName^
+
+<	When inclusion occurs, |xpt-snippet-post-filter|,
+	|xpt-snippet-default-value| and |xpt-snippet-preset-value| is imported
+	too, if it does not override.
+
+	Short inclusion format : >
+		`:snippetName:^
+<	Only two ":" around snippet name are needed.
+
+	NOTE	The only difference between "Include:" and "::" is "Include:"
+		keeps "cursor" place holder but "::" does not.
+
+	Take "if" snippet in file "_condition/c.like.xpt.vim" for example(
+	snippets are simplified for reading ): >
+		XPT _if hidden
+		if ( `condition^ ) {
+		    `job^
+		}
+
+		XPT if hint=if\ (..)\ {..}\ else...
+		`:_if:^` `else...{{^ `Include:else^`}}^
+
+<	The real "if" includes the "_if" and "else" snippets.
+	
+	NOTE	Inclusion is literal, so that snippets with different
+		|xpt-snippet-mark| can not include each other.
+
+	NOTE	By convention snippets of name started with "_" are internal
+		snippets. Normally these snippets are set with
+		|xpt-snippet-hidden| flag on and used for inclusion only.
+
+	Parameters of Inclusion:
+
+	Inclusion can have parameters passed to included snippet. Parameters
+	are name-value pairs. Names are placeholder name. Name-Values presents
+	in form of |Dictionary|:
+		`:<snipname>( { '<phname>' : '<new_phname>', ... } ):^
+	Place holders in sub-snippet presents in parameter are replaced.
+
+
+							    *xpt-snippet-XSET*
+	In |xpt-snippet-body| XSET commands can be used anywhere to set : 
+		|xpt-snippet-preset-value|
+		|xpt-snippet-default-value|
+		|xpt-snippet-post-filter|
+	XSET syntax to set |xpt-snippet-preset-value|: >
+		XSET itemname|pre=<expression>
+<	XSET syntax to set |xpt-snippet-default-value|: >
+		XSET itemname|def=<expression>
+<	or : >
+		XSET itemname=<expression>
+<	XSET syntax to set |xpt-snippet-post-filter|: >
+		XSET itemname|post=<expression>
+<	<expression> is |xpt-snippet-expression|. For example : >
+		XPT #include_user	hint=include\ ""
+		XSET me=fileRoot()
+		#include "`me^.h"
+<	Item "me" is set to the file name without extension.
+
+							   *xpt-snippet-XSETm*
+	"XSETm" is similar to |xpt-snippet-XSET| except it uses "\n" instead
+	of "=" in |xpt-snippet-XSET| and ends with "XSETm END". For
+	example : >
+		XPT if		hint=if\ (..)\ {..}\ else...
+		if (`condition^) { 
+		    `job^
+		}` `else...^
+		XSETm else...|post
+		else { 
+		    `cursor^
+		}
+		XSETm END
+<
+
+						       *xpt-snippet-ComeFirst*
+							*xpt-snippet-ComeLast*
+	Special XSET keys "ComeFirst" and "ComeLast" specify the item render
+	order. Their value is a list of place holder names separated by space.
+	For example : >
+		XPT for hint=for\ (..;..;++)
+		XSET ComeFirst=0 len
+		for (`i^ = `0^; `i^ < `len^; ++`i^)`$BRloop^{
+		    `cursor^
+		}
+<	So that "0" is focused first, then "len" and then "i".
+
+						      *xpt-snippet-postQuoter*
+	The key "postQuoter" is designed to specify quoter do define
+	|xpt-snippet-expandable|. Default is "{{,}}".
+
+							    *xpt-snippet-item*
+	In one snippet a group of |xpt-snippet-placeholder|s with the same
+	name is an "item". For example : >
+		XPT for hint=for\ (..;..;++)
+		for (`i^ = `0^; `i^ < `len^; ++`i^) {
+		    `cursor^
+		}
+<	In this snippet there are 4 items : >
+		i, 0, len, cursor
+<	Item "i" has 3 |xpt-snippet-placeholder|s, the others have only 1.
+
+						     *xpt-snippet-placeholder*
+	A place holder is a segment of a snippet which can be changed by the
+	user. It's tracked by XPTemplate to update the user input of
+	|xpt-snippet-placeholder|s within the same |xpt-snippet-item|.
+
+	The place holders are defined by |xpt-placeholder-mark|, by default
+	|`| and |^| are used. For example : >
+		XPT for hint=for\ (..;..;++)
+		for (`i^ = `0^; `i^ < `len^; ++`i^) {
+		    `cursor^
+		}
+<	Sequentially, the place holders in this snippet are : >
+		i, 0, i, len, i, cursor
+< 
+	Note The placeholder can't contain any backslashes (\). If the default
+	value should contain any items which need to be escaped (like brackets
+	or you want to use backslashes directly), use the following syntax
+	(see |xpt-placeholder-default-value| for more information): >
+		`name^value with \() here^
+<
+					      *xpt-placeholder-left-mark*  *`*
+					     *xpt-placeholder-right-mark*  *^*
+							*xpt-placeholder-mark*
+	|xpt-placeholder-mark| are the characters used to define
+	|xpt-snippet-placeholder|s of a snippet, by default |`| and |^|.
+	Or the |xpt-placeholder-left-mark| and |xpt-placeholder-right-mark|.
+	They can be changed locally, for the current snippet file, by
+	|xpt-snippet-mark|.
+
+				      *```*   *xpt-```* *xpt-placeholder-edge*
+	Besides |`| and |^|, additional |xpt-placeholder-left-mark|s can be
+	set inside place holder to add additional information: the edge.
+
+	Edge is some text around a place holder that is not selected when the
+	cursor jumps to this place holder, but it still can be edited. For
+	example : >
+		`(`xpt`)^
+<	This place holder is named "xpt" and the edges are "(" and ")". When
+	the cursor jumps onto it : >
+		(xpt)
+		 ***------ only xpt is selected
+<	Edges help with formatting issues.
+
+	Place holder can have only a left edge, for example : >
+		`(`xpt^
+<
+	NOTE only |\_W| characters are acceptable in edges.
+
+					     *xpt-snippet-leading-placeholder*
+	In an item one place holder is the leading place holder which accepts
+	user input. Others are update by XPTemplate automatically.
+
+	By default, the first place holder in item is the leading place
+	holder, or the one with a |xpt-placeholder-edge|. This allows it to
+	specify which place holder is the edit area.
+	For example : >
+		for (`i^ = `0^; `i^ < `len^; ++`i^) {
+		    `cursor^
+		}
+<	In item "i", the first "i" before "=" is the leading one. But in this
+	snippet : >
+		for (`i^ = `0^; ``i^ < `len^; ++`i^) {
+		    `cursor^
+		}
+<	The second "i", with double |`| before "<", is the leading one.
+
+						     *xpt-placeholder-special*
+	Special place holders include : |xpt-placeholder-cursor| and
+	|xpt-snippet-wrap|.
+
+					 *`cursor^*   *xpt-placeholder-cursor*
+	Sets where cursor the stops after a snippet finished.
+
+	The item named "cursor" is a special one. It's always selected at last
+	and replaced with an empty string. When navigating to the "cursor"
+	item the snippet is complete.
+
+
+				 *xpt-{}* *xpt-mixed* *xpt-snippet-expression*
+	Expression is a mixture of plain text, |xpt-snippet-variable| and
+	|xpt-snippet-function|. 
+	Expression is used as the value of
+		|xpt-snippet-instant-value|
+		|xpt-snippet-preset-value|
+		|xpt-snippet-default-value|
+		|xpt-snippet-post-filter|
+		|xpt-placeholder-ontime-filter|.
+
+	Functions can be |xpt-snippet-function|s defined as member of
+	|XPTfuncs()| or native Vim functions.
+
+	Functions are called as member of rendering context :
+	|xpt-snippet-function-ctx|.
+
+	Functions or variables can be enclosed by "{}" to prevent function or
+	variable names messing up with the surrounding plain text.
+
+	Functions are not evaluated if "()" is escaped : >
+		S\(S("abc", '.', '\u&'))
+<	is evaluated to : >
+		S(ABC)
+<
+	Escaping the '$' stops variable evaluation : >
+		\$author
+<	is evaluated to : >
+		$author
+<	
+	Escaping the "{}" : >
+		\{S("abc", '.', '\u&')}
+<	is evaluated to : >
+		{ABC}
+<	While : >
+		{S("abc", '.', '\u&')}
+<	is evaluated to : >
+		ABC
+<	
+	Another example, supposing you are editing a file named
+	"your_file_name.ext" : >
+		__{S(E("%:t"),".","\\u&")}__
+<	is evaluated to : >
+		__YOUR_FILE_NAME.EXT__
+<	And : >
+		this is S($author,".","-&")-
+<	is evaluated to : >
+		this is -d-r-d-r-.-x-p-
+<	See also: 
+		|xpt-snippet-function|
+		|xpt-snippet-variable|
+
+						   *xpt-snippet-instant-value*
+	There is a special case for |xpt-snippet-placeholder| when the place
+	holder's content is a |xpt-snippet-expression|. In this case the place
+	holder is evaluated at once, and no more further editing can happen on
+	this place holder. For example : >
+		XPT filehead
+		...
+		 * @since : `strftime("%Y %b %d")^
+		...
+<
+						    *xpt-snippet-preset-value*
+	Preset values are like |xpt-snippet-default-value| but are applied
+	earlier. |xpt-snippet-default-value| are applied before the place
+	holders are focused; preset value are applied just after the snippet
+	is displayed on the screen.
+	To define preset values: >
+		XSET the_name|pre=<expression>
+<	
+ 						   *xpt-snippet-default-value*
+	By default place holders use their name as the default value but you
+	can choose another text as default value by using : >
+		XSET the_name|def=<expression>
+<	
+	So that before cursor jumps to leading place holder of name
+	"the_name", the <expression> evaluated and applied to the place
+	holder.
+
+	Example : the "#ind" snippet defined as : >
+		XPT #ind
+		XSET me|def=fileRoot()
+		#include "`me^.h"
+<	In C language, type "#ind<C-\>" you get : >
+		#include "current_file_name.h"
+<	
+	NOTE : if default value expression contains only plain string and
+	|xpt-snippet-variable|, it is used as |xpt-snippet-preset-value|, too;
+	for better looking without any side-effect.
+
+
+						    *xpt-snippet-post-filter*
+	Post filters are executed after the user presses <Tab> and change the
+	typed text. To define a post filter use : >
+		XSET the_name|post=<expression>
+<	Or use |xpt-snippet-postQuoter| : >
+		XPT enum hint=enum\ {\ ..\ }
+		enum `name^`$BRstc^{
+		    `elt^;`
+		    `...{{^
+		    `elt^;`
+		    `...^`}}^
+		}` `var^;
+<
+	Some usually-used post filter functions are defined in
+	ftplugin/_common/common.xpt.vim. 
+
+	For example for c language, "#ifndef" snippet is defined as follows : >
+		XPT #ifndef	hint=#ifndef\ ..
+		XSET symbol=S(fileRoot(),'\.','_','g')
+		XSET symbol|post=UpperCase(V())
+		#ifndef `symbol^
+		#     define `symbol^
+		
+		`cursor^ 
+		#endif `$CL^ `symbol^ `$CR^
+		..XPT
+<	
+	When you pressing <tab> from the first item "symbol", typed content are
+	converted to upper case. Before <tab> pressed : >
+		#ifndef __gnu__
+		#    define __gnu__
+		`cursor^
+		#endif /* __gnu__ */
+<	After <tab> pressed : >
+		#ifndef __GNU__
+		#    define __GNU__
+		`cursor^
+		#endif /* __GNU__ */
+<
+
+					     *xpt-snippet-default-post-filter*
+	Place holder with some special has default post filter set. Following
+	sections discuss them.
+
+	Place holders have default place holder defined: >
+		\V\w\+?		EchoIfNoChange('')
+<
+
+
+						 *xpt-placeholder-optional-ph*
+	If a place holder name matches pattern '\V\w\+?', "EchoIfNoChange('')"
+	is assigned as its post filter. 
+	This makes the place holder optional. 
+
+	For example a snippet defined as below: >
+		fun(`arg^`, `context?^)
+<	When you render this snippet, and cursor stays on "context?" : >
+		fun(arg, context?)
+			 --------
+				 \__ selected
+<	Pressing <Tab> clears it, and snippet becomes: >
+		fun(arg)
+<	
+
+
+						 *xpt-placeholder-post-filter*
+	For each place holder a private post filter can also be set by using
+	the |^||^| syntax : >
+		XPT lowerUpper
+		lower : `text^
+		upper : `text^UpperCase(V())^^	<---- double "^"
+<	Press <Tab>, this snippet results in : >
+		lower : text
+		upper : TEXT
+<	
+	NOTE If both |xpt-snippet-post-filter| and
+	|xpt-placeholder-post-filter| are set, the place holder filter takes
+	effect.
+
+					       *xpt-placeholder-default-value*
+					       *xpt-placeholder-ontime-filter*
+	For each place holder an ontime filter can be set to filter the text
+	each time the user types something by using the |^| syntax : >
+		XPT lowerUpper
+		lower : `text^
+		upper : `text^UpperCase(V())^	<--- only one "^"
+<	Each time the user types something at place holder "text" the second
+	place holder is updated with the content converted to upper case.
+
+	NOTE ontime filter is used as |xpt-placeholder-default-value| for the
+	leading place holder.
+
+						      *xpt-snippet-expandable*
+	Sometimes you want to create an additional piece of snippet other than
+	the original snippet. For example, add another "else" after an "if"
+	block. To do this use expandable : >
+		XPT if 
+		if `cond^
+		    `job^
+		`else...{{^else
+		    `cursor^
+		`}}^
+		endif
+<	At the place holder "else..." press <Tab> to generate another else
+	block, the text quoted by {{ and }}. Press to <Cr> to clear "else...".
+
+	Another way to define expandable is by using XSET command to define a
+	post filter: >
+		XPT if
+		if (`condition^)`$BRif^{ 
+		    `job^
+		}` `else...^
+		XSETm else...|post
+		else { 
+		    `cursor^
+		}
+		XSETm END
+<	These 2 methods are the same inside XPTemplate.
+
+						      *xpt-snippet-repetition*
+	Repetition is only a special case utilizing expandable, that another
+	same expandable trigger residing inside the expandable part.
+
+	For example the "case"s in "switch". To specify the repetition part,
+	just wrap the part you want it to repeat with `...^. n is a number and
+	can be omitted.  Take the case from "switch": >
+		XPT switch
+		switch (`^) {
+		  `...^            | repetition part
+		  case `^0^ :      |
+		    `^             |
+		    break;         |
+		  `...^            |
+		
+		  default:
+		    `^
+		}
+<
+	When you trigger a repetition template it works as below: >
+		switch () {    <------- cursor stays here
+		  `...^
+
+		  default:
+		      `^
+		}
+<	Press <Tab>, the |`...^| is selected. Press <Tab> again to expand the
+	repetition part. Or press <Cr> |xpt-key-clear| to cancel the
+	repetition part. These 4 lines are expanded: >
+		switch () {
+
+		  case `^ :         | expanded
+		    `^              |
+			break;      |
+		    `...^           |
+
+		  default:
+			`^
+		}
+<	Enter the repetition part. There is another |`...^|, that is the
+	another repeat trigger.
+
+	Press <Tab> 3 times: >
+		switch () {
+
+		  case 0 :
+
+		    break;
+
+		  case `^ :        | selected repetition part
+		    `^             |
+			break;     |
+		    `...^          |
+
+		  default:
+			`^
+		}
+<
+	Using named |`...^| allows you define multiple repetition parts in one
+	snippet. For example: >
+		XPT switch
+		switch (`^) {
+		  `case...^        | repetition part
+		  case `^0^ :      |
+		    `^             |
+		    break;         |
+		  `case...^        |
+		
+		  default:
+		    `^
+		}
+<
+	NOTE If you want to use a repetition inside a |xpt-snippet-expandable|
+	you can't use the normal |`...^| placeholder. Instead use `...{{^ as
+	in the following example: >
+		`Maybe...{{^
+		With repeatable:
+		`...{{^
+		- repeat this
+		`...^
+		`}}^
+		`}}^
+<
+	The first `}}^ ends the repetition, the second the expandable.
+
+	See |xpt-repetition| for using repetition.
+
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/vim-plugins/bundle/xptemplate/doc/xpt.snippet.tutor.txt b/vim-plugins/bundle/xptemplate/doc/xpt.snippet.tutor.txt
new file mode 100644
index 0000000..6c75a3a
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/doc/xpt.snippet.tutor.txt
@@ -0,0 +1,97 @@
+*xpt-snippet-tutorial*
+
+			XPTemplate Snippet Tutorial
+
+								    by drdr.xp
+							     drdr.xp@gmail.com
+==============================================================================
+
+	|xpt-tutor-define-snippet|
+	|xpt-tutor-snippet-file|
+
+
+						    *xpt-tutor-define-snippet*
+	This section describes how to define snippet in runtime.
+
+	In Vim, call |XPTemplate()| to define a new snippet: >
+		:call XPTemplate( 'name', 'foo`bar^' )
+
+<	And Then in insert-mode, type: >
+		name<C-\>
+<	XPT generates: >
+		foobar
+		   ```\_____________ "bar" is selected
+<	Now you can edit the "bar".
+	The editable part is called place-holder, see
+	|xpt-snippet-placeholder|. By default place-holder is quoted with "`"
+	and "^".
+
+
+						      *xpt-tutor-snippet-file*
+	Snippet defined by |XPTemplate()| can not be stored. To define
+	snippets which can be loaded every time you edit some kind of file,
+	you need to create a snippet file.
+
+	This first example snippet file is in C language.
+
+	1. Create snippet file.
+		In Linux/Mac: >
+		vim ~/.vim/ftplugin/c/hello.xpt.vim
+<		In Windows: >
+		vim ~/vimfiles/ftplugin/c/hello.xpt.vim
+<
+	2. Define your first snippet.
+		Type in insert mode: >
+		skeleton<C-\>
+<		To create a very simple snippet file skeleton. It may look
+		like: >
+		XPTemplate priority=personal+
+
+		XPT helloxpt " tips about what this snippet do
+		Say hello to `xpt^
+		`xpt^ says hello
+<
+	2.1 Short explanation.
+: >
+		XPTemplate priority=personal+
+<		These 2 lines declare an XPT snippet file. See
+		|xpt-snippet-header|.
+
+: >
+		XPT helloxpt " tips about what this snippet do
+<		"XPT" is the start symbol of a snippet. See |xpt-snippet|.
+		"helloxpt" is the trigger key. See |xpt-snippet-name|.
+		Text after the quote is hint text. See |xpt-snippet-hint|.
+
+: >
+		Say hello to `xpt^
+		`xpt^ says hello
+<		These two lines are snippet body. See |xpt-snippet-body|.
+
+
+	3. Test the first snippet "hello".
+		Start edit a new file "xpt.c": >
+		vim xpt.c
+
+<		In insert-mode type: >
+		helloxpt<C-\>
+
+<		XPT generates: >
+				 __________| "xpt" is selected
+			     ___/
+		Say hello to xpt 
+		xpt says hello
+		```\_______________________| the second "xpt" will
+					   | be updated lively
+<
+	4. To create a full featured snippet skeleton, use "xpt" instead of
+	"skeleton".
+
+	5. To learn more about snippet file syntax, read |xpt-snippet-syntax|.
+
+	6. Existent snippet files may be good samples, for example
+	ftplugin/java/java.xpt.vim .
+
+
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/vim-plugins/bundle/xptemplate/doc/xpt/credit.txt b/vim-plugins/bundle/xptemplate/doc/xpt/credit.txt
new file mode 100644
index 0000000..0a94a0e
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/doc/xpt/credit.txt
@@ -0,0 +1,17 @@
+Thanks to:
+
+Agassi
+Agassi Yu
+chen
+Florian Preinstorfer
+Gautier DI FOLCO
+grassofhust
+italiafreeware
+kikijump
+Kirill Klenov
+liu
+Lowe Thiderman
+twinside
+Vincent Berthoux
+@bstaint
+胡晋
diff --git a/vim-plugins/bundle/xptemplate/doc/xpt/indent.md b/vim-plugins/bundle/xptemplate/doc/xpt/indent.md
new file mode 100644
index 0000000..752b77b
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/doc/xpt/indent.md
@@ -0,0 +1,25 @@
+
+-   4-space indent:
+    Used in snippet file.
+    Consistent with different 'tabstop', 'shiftwidth' setting.
+
+-   tab indent:
+    Used internally in XPTemplate.
+    Produced by converting 4 leading space to one tab.
+
+    These two above are VIM setting irrelavent. Snippet file can use either of
+    them, but 4-space indent is recommended.
+
+-   space indent:
+    Produced by expanding a `tab` char to `&shiftwidth` spaces.
+    These spaces occupies the same room as actual indent.
+    This is the second last step before putting text onto screen.
+
+    space indent texts are used internally.
+    Wrapped text is passing through in this style.
+
+-   actual indent:
+    Produced by convert `&tabstop` space to one tab if 'expandtab' not set.
+    This is the actual indent
+
+    The last two are VIM setting relavent.
diff --git a/vim-plugins/bundle/xptemplate/doc/xpt/option.txt b/vim-plugins/bundle/xptemplate/doc/xpt/option.txt
new file mode 100644
index 0000000..dd72912
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/doc/xpt/option.txt
@@ -0,0 +1,354 @@
+                                                                  *xpt-option*
+==============================================================================
+
+Table of Content ~
+
+	|g:xptemplate_always_show_pum|
+	|g:xptemplate_brace_complete|
+	|g:xptemplate_break_undo|
+	|g:xptemplate_bundle|
+	|g:xptemplate_close_pum|
+	|g:xptemplate_cwd_snippet|
+	|g:xptemplate_debug_log|
+	|g:xptemplate_highlight|
+	|g:xptemplate_highlight_nested|
+	|g:xptemplate_hook_before_cr|
+	|g:xptemplate_lib_filter|
+	|g:xptemplate_minimal_prefix|
+	|g:xptemplate_move_even_with_pum|
+	|g:xptemplate_ph_pum_accept_empty|
+	|g:xptemplate_pum_quick_back|
+	|g:xptemplate_pum_tab_nav|
+	|g:xptemplate_snippet_folders|
+	|g:xptemplate_strict|
+	|g:xptemplate_strip_left|
+	|g:xptemplate_vars|
+
+						*g:xptemplate_always_show_pum*
+								   {default:0}
+	If set to 1, snippets is not triggered but popup menu shows even when
+	text user typed before cursor matches a snippet name.
+
+	For example, you have three snippets defined of names: "for", "forever"
+	and "forr". Typing "for<C-\>" results in a popup menu if
+	|g:xptemplate_always_show_pum| set to 1: >
+		for
+	       |for      |
+	       |forloop  |
+	       |forr     |
+<	Otherwise, "for<C-\>" triggers snippet "for".
+
+	See also: |g:xptemplate_key_force_pum|.
+
+
+						 *g:xptemplate_brace_complete*
+								   {default:1}
+	If set to 1, bracket characters are automatically expanded to bracket
+	pairs. For example typing "(" results in: >
+		(  )
+	          \______| cursor stops in mid of pairs of bracket
+<	"(", "[", "{", "'" and '"' are affected by this setting.
+	
+	If set to string, only bracket or quote chars included in this setting
+	will be mapped. For example: >
+		let g:xptemplate_brace_complete = '([{'
+<	With this setting, quotes are not mapped.
+
+
+						     *g:xptemplate_break_undo*
+								   {default:0}
+	If set to 1, undo sequence will be broken with |i_CTRL-G_u| before
+	snippet triggered. This would help on rolling back when mistake was
+	made.
+
+
+							 *g:xptemplate_bundle*
+
+	This option specifies what libraries will always be load to its file
+	type. For example: >
+		let g:xptemplate_bundle = 'javascript_jquery'
+<	This tells XPT to load jquery snippet to javascript language.
+	Or: >
+		let g:xptemplate_bundle = 'javascript_jquery,c_*'
+<	It tells XPT to load jquery, and all supplied library snippets for C
+	language.
+
+	Another way to load bundles is |g:XPTaddBundle()|.
+
+
+						      *g:xptemplate_close_pum*
+								   {default:0}
+	If set to 1, when trigger key(|g:xptemplate_key|) is pressed, before
+	doing anything, popup menu will be closed.
+
+
+						    *g:xptemplate_cwd_snippet*
+								   {default:0}
+	Set this to 1 to enable each vim buffer to automatically load file
+	".xpt.vim" from current working directory, as snippet file specific to
+	current directory( or project ).
+
+	Current ".xpt.vim" accepts only the most simple form of snippet, the
+	function call form: >
+		call XPTemplate( 'foo', '`foo^ says hello' )
+<
+
+
+						      *g:xptemplate_debug_log*
+								  {default:''}
+
+	This option specifies whether and where to store debug log emitted
+	during xptemplate running. Unless you are a developer of xptempalte,
+	do not touch it.
+
+	Empty string disables any logging.
+
+	Non-empty string is interpreted as log file path. "~/" at start will
+	be replaced with "$HOME/".
+
+	Example: >
+		let g:xptemplate_debug_log = '~/.xpt.log'
+<
+
+						      *g:xptemplate_highlight*
+							      {default:'next'}
+	Specifies which place holders are high lighted. The value of
+	|g:xptemplate_highlight| is a comma separated string.
+
+	Possible values are: "current", "following" and "next". Example: >
+		let g:xptemplate_highlight = 'following,next'
+<
+	"current" lets XPTemplate highlight the place holder you are currently
+	editing. See |XPTcurrentPH|.
+	For example the first "i" in "for" snippet of C language: >
+		for ( i = 0; i < len; ++i ) {
+		       \__________________________ highlighted
+<
+	"following" lets XPTemplate highlight slave place holders which are
+	updated automatically. See |XPTfollowingPH|.
+	For example the second and third "i" in "for" snippet of C language: >
+		for ( i = 0; i < len; ++i ) {
+			      \__________\________ highlighted
+<
+	"next" lets XPTemplate highlight the place holders you are going to
+	edit. See |XPTnextItem|.
+	For example the "0" and "len" if "for" snippet of C language: >
+		for ( i = 0; i < len; ++i ) {
+			   \______\\\_____________ highlighted
+<
+	Set |g:xptemplate_highlight| to '' to disable highlight.
+
+
+					       *g:xptemplate_highlight_nested*
+								   {default:0}
+	If set to 1, highlight is also applied to outer snippet, not only the
+	deepest nested one. For example, If set to 1, the following positions
+	are highlighted: >
+				  ________________________| highlighted
+			        _/ _/        ___/
+		for ( call( me ) = 0; call < len; call++ ) {
+		    /* cursor */
+		    ~~~~~~~~~~~\__________________________| highlighted
+		}
+<	The first highlight position is from nested snippet "(". Others are
+	from outer snippet "for".
+
+
+						 *g:xptemplate_hook_before_cr*
+								  {default:''}
+	Add additional action before default xptemplate action when <CR>
+	pressed.
+
+	By default, xptemplate override key mapping of <CR>(local to
+	buffer)every time starting to applying a snippet. This might change
+	user prefered <CR> behavior if user has his own key mapping of <CR>
+	defined.
+	This conf let user to fix issues like this.
+
+	The following line in .vimrc appends "abc" every time <CR> pressed
+	during applying snippet: >
+		let g:xptemplate_hook_before_cr = 'abc'
+<
+	And this appends current time every time <CR> pressed: >
+		fun! s:OutputDate()
+		    return strftime('%c')
+		endfunction
+		inoremap <expr> <Plug>do_my_work <SID>OutputDate()
+		let g:xptemplate_hook_before_cr = '<Plug>do_my_work'
+<
+	NOTE:
+		|g:xptemplate_hook_before_cr| does not accept <SID>.
+
+		And if you want to use <expr> mapping with
+		|g:xptemplate_hook_before_cr| , you need a in-the-middle
+		mapping like it does in the second example.
+
+
+						     *g:xptemplate_lib_filter*
+								   {default:.}
+Value:  unset:	do not filter, load any snippet found.
+	string:	regular expression.
+	list:	list of regular expression.
+
+	If set, XPT loads only snippets(*.xpt.vim) from 'runtimepath' that
+	matches it or one of its elements.
+
+	NOTE:	This option tries to match actual path of a snippet file.
+		Symbolic link would be resolved.
+
+	NOTE:	Included snippet like "*/_common/common.xpt.vim" is essential
+		for other snippet to work thus it won't be affected by this
+		option.
+
+	For example: >
+		let g:xptemplate_lib_filter = [
+			\ '/my_snippets\>',
+			\ '/all_user_snippets/ftplugin/xml/' ]
+<	The above setting tells XPT to ignore snippet supplied by XPT but to
+	load only "*/my_snippets/ftplugin/*/*.xpt.vim", and use only "xml"
+	snippets from "*/all_user_snippets/ftplugin/xml/*.xpt.vim".
+
+	It would works the same as with: >
+		let g:xptemplate_lib_filter = '/my_snippets\>\|/all_user_snippets/ftplugin/xml/'
+<
+
+						 *g:xptemplate_minimal_prefix*
+								   {default:0}
+	Posssible values: number or "full".
+
+	If set it to a number( N ), it means snippet is triggered( or pum
+	shows ) only when there are at least N |word| letters before cursor.
+
+	If set to "full", |g:xptemplate_key| searches for a snippet of name
+	matching exactly the word before cursor.
+
+	For example, you have only one snippet defined with name "xpt". The
+	following input will trigger "xpt" snippet, if
+	|g:xptemplate_minimal_prefix| set to 0 ( it also works with value 1 and
+	2, but not with 3 ): >
+		xp<C-\>
+<	"<C-\>" is the default trigger key.
+
+	If |g:xptemplate_minimal_prefix| set to "full", the above input can not
+	trigger "xpt" snippet.
+
+
+					     *g:xptemplate_move_even_with_pum*
+								   {default:0}
+	If set to 1, |g:xptemplate_nav_next| does not care whether pop up menu
+	shown or not. It will always move cursor to next item.
+
+	Otherwise, |g:xptemplate_nav_next| fall back to original mapping. This
+	could be helpfull for xpt working with supertab together.
+
+
+					    *g:xptemplate_ph_pum_accept_empty*
+								   {default:1}
+	When set to 1 popup menus for place holders accepts an empty input. So
+	when nothing typed pressing <Tab> closes the popup menu and sends the
+	cursor to the next place holder.
+	When not set <Tab> expands the text to the longest match and keeps the
+	popup menu open.
+
+
+						 *g:xptemplate_pum_quick_back*
+								   {default:1}
+	With popup menu, pressing "<BS>" removes minimal chars to reveil
+	more options.
+	If this is set to 0, pressing "<BS>" removes only 1 char.
+
+	For example, popup menu created with 3 options: >
+		"foo", "fooba", "foobar"
+<
+	Typing "fooba" shrinks menu to: >
+		fooba
+		foobar
+<	Now pressing "<BS>" will remove 2 chars: "ba", and leave "foo", the
+	longest prefix that has 3 options.
+
+	Pressing "<BS>" again will remove "foo".
+
+	NOTE:	Very large list might hang VIM for seconds. In this case set
+		this to 0 to get better performance.
+
+		This feature depends on a prefix dictionary of all of the
+		options.  The prefix dictionary will be created every time
+		popup menu is called.
+
+
+						    *g:xptemplate_pum_tab_nav*
+								   {default:0}
+	Set to 1 to use <tab>/<S-tab>( shift + tab ) to navigate through pop
+	up menu. <tab> behaves like <C-n> and <S-tab> behaves like <C-p>. And
+	<CR> expands snippet.
+
+
+						*g:xptemplate_snippet_folders*
+								  {default:[]}
+	NOTE:	Unless you really want XPTemplate to touch your 'runtimepath',
+		do NOT use this. This setting changes 'runtimepath' and is
+		less recommended to use than 'runtimepath'. As you may already
+		know well about 'runtimepath' and 'ftplugin', it is better for
+		you to organize snippet files yourself, with 'runtimepath'.
+
+	A list to specify which other folders are used as snippet folders.
+	For example: >
+		let g:xptemplate_snippet_folders = [
+			\ $HOME . '/my_snippets',
+			\ '/all_user_snippets' ]
+<	Thus the snippet file "$HOME/my_snippets/ftplugin/c/my.c.xpt.vim" can
+	be loaded to C files.
+	And "/all_user_snippets/ftplugins/html/all.html.xpt.vim" can be loaded
+	to HTML files.
+
+
+							 *g:xptemplate_strict*
+								   {default:2}
+	Set to 0 to let XPTemplate do the best maintaining snippet rendering,
+	even if you have changed text outside of place holders.
+
+	Set to 1 to prevent incautious changing text outside place holders.
+	Otherwise you are free to change text outside of place holders.
+
+	Set to 2 to let XPTemplate stop rendering if ANY changes taken to text
+	outside of place holders.
+
+	Example : >
+		let g:xptemplate_strict = 1
+<
+
+
+						     *g:xptemplate_strip_left*
+								   {default:1}
+	When set to 1 wrapper snippets |xpt-wrapper-snippet| remove space
+	before the first line.
+
+
+				      *xpt-personal-var*   *g:xptemplate_vars*
+	g:xptemplate_vars sets personal information variables used in
+	snippets, like "author" and "email", see |xpt-snippet-variable|.
+
+	Variables set with g:xptemplate_vars have the highest priority and
+	override any other variables set in *.xpt.vim. Syntax: >
+	let g:xptemplate_vars = 'name=value&name=value...'
+<	Example: >
+	let g:xptemplate_vars = '$author=xp\ \&\\\&123&$email=bal@bla'
+	let g:xptemplate_vars = 'author=xp\ \&\\\&123&email=bal@bla'
+
+<	Both the 2 lines above result in: >
+		'xp\ &\&123' and 'bal@bla'
+
+<	Or: >
+		let g:xptemplate_vars = exists('g:xptemplate_vars') ?
+			\ g:xptemplate_vars . '&' . '$other=bla'
+			\ : '$other=bla'
+<
+	Entries are separated with '&'.
+
+	You can also set these settings in ftplugin/_common/personal.xpt.vim
+	in your runtime path using XPTvar |xpt-snippet-variable| (see also
+	|xpt-customize-variable|).
+
+
+
+" vim: tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/vim-plugins/bundle/xptemplate/doc/xpt/snippet-function.txt b/vim-plugins/bundle/xptemplate/doc/xpt/snippet-function.txt
new file mode 100644
index 0000000..c6e5ea0
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/doc/xpt/snippet-function.txt
@@ -0,0 +1,107 @@
+                                                        *xpt-snippet-function*
+==============================================================================
+
+Table of Content ~
+
+	|Build|
+	|BuildSnippet|
+	|Echo|
+
+------------------------------------------------------------------------------
+
+	|xpt-snippet-function| can be used in :
+		|xpt-snippet-instant-value|
+		|xpt-snippet-preset-value|
+		|xpt-snippet-default-value|
+		|xpt-snippet-post-filter|
+		|xpt-placeholder-ontime-filter|
+	To define |xpt-snippet-function|, the function container must be
+	fetched by using |XPTfuncs()|. For example : >
+		let s:f = XPTfuncs()
+		fun! s:f.c_printfElts( v )
+			...
+		endfunction
+<	Then function 'c_printfElts' can be used in the snippet : >
+		XPT printf	" printf\(...)
+		XSET elts=c_printfElts( R( 'pattern' ) )
+		printf( "`pattern^"`elts^ )
+<
+	NOTE	By convention the names of |xpt-snippet-function|s supplied by
+		XPTemplate start with an upper-case letter. User defined
+		function names should starts with a lower-case letter.
+
+------------------------------------------------------------------------------
+
+							      *Build()*
+Build({snippet_text})
+	Build a piece of snippet text to replace the place holder on which
+	Build() is called.
+
+	Argument {snippet_text} is the content of snippet to build.
+
+	After calling it, place holder is removed and the first place holder
+	in this piece of snippet built is selected.
+
+	Context: >
+		XSET ph=Build('`a^ = `0^')
+		XSET ph|post=Build('`a^ = `0^')
+<
+	See also: |BuildSnippet()|
+
+
+							      *BuildSnippet()*
+BuildSnippet({snippet})
+	Build an existent snippet to replace the place holder on which
+	BuildSnippet() is called.
+
+	Argument {snippet} is the name of snippet to build.
+
+	After calling it, place holder is removed and the first place holder
+	in this piece of snippet is selected.
+
+	Example snippets: >
+		XPT parent
+		XSET x=BuildSnippet( "child" )
+		-`x^=
+
+		XPT child
+		(`a^, `b^)
+<
+	Type: >
+		parent<C-\>
+<	Got: >
+		-(a, b)=
+<	{a} and {b} is place holder
+	
+	Context: >
+		XSET ph=BuildSnippet('a')
+		XSET ph|post=BuildSnippet('a')
+<
+	See also: |Build()|
+
+
+								      *Echo()*
+Echo({string})
+	Put literal text {string} where it is called.
+
+	{string} can be any valid expression.
+
+	Place holders in {string} will not be built.
+
+	Context it works in: >
+		`Echo('a')^
+		XSET ph=Echo('a')
+		XSET ph|def=Echo('a')
+		XSET ph|pre=Echo('a')
+		XSET ph|post=Echo('a')
+<
+	Example: >
+		XPT now
+		`Echo( strftime("%c") )^
+<
+	See also: |Build()| |BuildSnippet()|
+	See also: |xpt-snippet-XSET|
+
+
+
+" vim: tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/vim-plugins/bundle/xptemplate/doc/xptemplate.txt b/vim-plugins/bundle/xptemplate/doc/xptemplate.txt
new file mode 100644
index 0000000..e9f4290
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/doc/xptemplate.txt
@@ -0,0 +1,629 @@
+*XPTemplate*	For Vim version 7.2. Last change: 2009 Nov 08
+*xptemplate*
+*xpt*
+
+
+			XP's Snippet Template engine
+								    by drdr.xp
+							     drdr.xp@gmail.com
+
+	XPTemplate is a snippet rendering engine.
+
+	|xpt-install|
+	|xpt-usage|
+		|xpt-personal-var|
+
+	|xpt-feature|
+	|xpt-option|
+	|xpt-key-bind|
+	|xpt-tips|
+		|xpt-with-supertab|
+
+	|xpt-customize|
+		|xpt-write-snippet|
+
+	|xpt-snippet-syntax|
+	|xpt-snippet-tutorial|
+	|xpt-api|
+
+								 *xpt-install*
+	Copy files and directories into one of your 'runtimepath's.
+
+								   *xpt-usage*
+	To see what snippets have been defined for the current filetype, press
+	<C-r><C-r><C-\> in insert mode. See |xpt-key-pum|.
+
+	In insert mode type the snippet name and press <C-\> to insert a
+	snippet. Use <Tab> to navigate through the snippet template.
+	For example when editing a C file: >
+		for<C-\>
+<	generates: >
+		for ( i = 0; i < len; ++i ) {
+		    /* cursor */
+		}
+<	The first "i" being selected is the current item you are editing. "0"
+	is the next item and you can navigate to it by pressing <Tab>.
+
+	To change the snippet trigger (<C-\>) see |xpt-key-trigger|, to change
+	the navigate key (<Tab>) see |xpt-key-navigate|.
+
+	NOTE with some European keyboards <C-\> does NOT work. In this case
+	you need to specify another key to trigger snippets.
+
+	Now type "abc", this results in: >
+                         ////````````````````````````| edit area
+                        ////
+                       ////     ////`````````````````| lively updated
+		      ////     ////         ////`````'
+		for ( abc = 0; abc < len; ++abc ) {
+		    /* cursor */
+		}
+<	Now press <Tab>, the cursor jumps to "0", the next item: >
+			    //```````````````````````| focus here
+		for ( abc = 0; abc < len; ++abc ) {
+		    /* cursor */
+		}
+<	After pressing <Tab> twice the snippet ends up with cursor staying at
+	line 2, column 8 (or the value of 'softtabstop'): >
+		for ( abc = 0; abc < len; ++abc ) {
+
+		}       \\___________________________| cursor stays here
+
+<	The usage is described in more detail below.
+
+	For more information regarding the syntax of snippets see
+	|xpt-snippet-syntax|. To customize settings see |xpt-option|.
+
+
+								 *xpt-feature*
+	Live typing update
+	Navigate forward and backward		|xpt-key-navigate|
+	Popup hint				|xpt-popup|
+						|xpt-snippet-hint|
+	Ordered place holders			|xpt-snippet-ComeFirst|
+	Embedded functions and variables	|xpt-snippet-function|
+	Repeatable snippet generation		|xpt-repetition|
+	Nested snippets				|xpt-nested|
+	Wrapper snippets			|xpt-wrapper-snippet|
+	Inclusion on snippet level or file level|xpt-snippet-include|
+						|xpt-snippet-XPTinclude|
+
+	Template priority			|xpt-snippet-priority|
+
+	Named item or anonymous item		|xpt-snippet-item|
+	Default value                 		|xpt-snippet-default-value|
+	Preset value                 		|xpt-snippet-preset-value|
+	Snippet Bundle/Library Support		|xpt-bundle|
+	and more...
+
+							   *xpt-name-matching*
+	See |xpt-snippet-name-matching-rule|.
+
+								   *xpt-popup*
+	If you type nothing or an incomplete snippet key and press <C-\>, a
+	popup menu shows up listing all possible snippet keys. For example: >
+		fo<C-\>
+<	Shows: >
+		for
+		forever
+		fornn
+		forr
+<
+	After selecting the item from the popup menu, press <C-\> again to
+	trigger the snippet.
+
+							      *xpt-nested*
+	Templates can be expanded inside another template. There is no
+	difference between using a nested template or a top-level template.
+	For example, when you edit a C file type switch<C-\> to generate a
+	switch block template: >
+		switch (fn) {
+		  case 0 :
+			<-------------- cursor stops here after two <Tab>s
+		    break;
+		    ...
+		  default:
+
+		}
+<	Now the cursor stops between "case 0 :" and "break;", type: >
+		if<C-\>
+<	It becomes: >
+		switch (fn) {		| upper level snippet
+		  case 0 :		|
+		    if () {             . nested snippet
+			                .
+		    }	                .
+		    break;		| upper level snippet
+		    ...                 |
+		  default:              |
+			                |
+		}                       |
+<	Type <Tab>, <Tab>.. to navigate out of the nested snippet: >
+		switch (fn) {
+		  case 0 :
+		    if () {
+
+		    }
+		    break;
+
+		  default:
+			<--------------cursor stops here
+		}
+<	Now cursor stops after "default:" and we get out back to the "switch"
+	snippet.
+
+==============================================================================
+
+
+				      *`...^*    *xpt-...*    *xpt-repetition*
+	Some segments can be defined as repeatable, for example the "case"s in
+	"switch". Specifying the repetition part is easy, just wrap the part
+	you want it to repeat with `...n^. n is a number and can be omitted if
+	only one repetition part is used.
+	Take the case from "switch": >
+		XPT switch
+		      switch (`^) {
+		        `...^            | repetition part
+		        case `^0^ :      |
+		          `^             |
+		          break;         |
+		        `...^            |
+
+		        default:
+		          `^
+		      }
+<
+	When you trigger a repetition template it works as below: >
+		switch () {    <------- cursor stays here
+		  `...^
+
+		  default:
+		      `^
+		}
+<	Press <Tab>, the |`...^| is selected. Press <Tab> again to expand the
+	repetition part. Or press <Cr> |xpt-key-clear| to cancel the
+	repetition part. These 4 lines are expanded: >
+		switch () {
+
+		  case `^ :         | expanded
+		    `^              |
+			break;      |
+		    `...^           |
+
+		  default:
+			`^
+		}
+<	Enter the repetition part. You may have noticed there is another
+	|`...^|, that is the another repeat trigger.
+
+	Press <Tab> 3 times: >
+		switch () {
+
+		  case 0 :
+
+		    break;
+
+		  case `^ :        | selected repetition part
+		    `^             |
+			break;     |
+		    `...^          |
+
+		  default:
+			`^
+		}
+<
+	See also |xpt-snippet-repetition|.
+
+
+							 *xpt-wrapper-snippet*
+	Wrapper snippets can be triggered in visual mode, place holder marked
+	as "wrap" is replaced with the text selected in visual mode.
+
+	Definition of wrapper snippet has no differences from normal
+	snippet except it declaring a place holder as wrapping holder. For
+	example: >
+		       ________/---------------------| wrapper declaration
+		XPT if wrap=job
+		if (`condition^){
+		    `job^
+		}
+<	
+	For example the following snippet: >
+		XPT call_ wrap=wrapped
+		`name^(`wrapped^`, `^)`cursor^
+<	Use command |V| to select some text and press <C-\>. The selected text
+	is yanked and popup menu shows.
+
+	For example we have one line of text as below: >
+		a, b
+<	Select this line with command |V|.
+	And then press <C-\>, choose "call_" in the popup menu.
+	And finally it results in : >
+		name(a, b)
+<
+	NOTE	Wrapper snippet declared with "wraponly" can only be triggered
+		in visual mode, not in insert mode
+
+
+
+								 *xpt-context*
+	You can define snippets that can only be triggered in certain
+	circumstances, for example in certain syntax items. Defining context
+	depended snippets is done by adding another parameter to the
+	XPTemplate call "{'syn' : 'the context name'}" : >
+		XPT para syn=comment
+		@param {`Object^} `name^ `desc^
+<	Now the snippet "para" can be only triggered in syntax items named
+	"comment".
+
+==============================================================================
+
+								*xpt-key-bind*
+	Options can be set in |.vimrc| to modify XPTemplate's behaviors.
+
+	Key mappings:
+		|<Plug>XPTrawKey|
+
+		|g:xptemplate_key|
+		|g:xptemplate_key_pum_only|
+		|g:xptemplate_key_force_pum|
+		|g:xptemplate_key_visual|
+		|g:xptemplate_nav_next|
+		|g:xptemplate_nav_prev|
+		|g:xptemplate_nav_cancel|
+		|g:xptemplate_goback|
+		|g:xptemplate_to_right|
+		|g:xptemplate_fallback|
+
+	See also: |xpt-option|.
+
+							     *<Plug>XPTrawKey*
+	Key mapping defined as: >
+		exe "inoremap <silent> <Plug>XPTrawKey " g:xptemplate_key
+<
+
+	    *i_<C-\>* *v_<C-\>* *xpt-key-trigger* *g:xptemplate_key*
+							       {default:<C-\>}
+	The key to trigger snippets in insert mode.
+	Use |g:xptemplate_key| to change this mapping. Example: >
+		let g:xptemplate_key = '<Tab>'
+<
+	NOTE: You can set this key to <Tab>, as most users do, for
+	convenience. In this case pressing <Tab> twice results in a normal
+	<Tab> if there is no snippet key matched.
+
+
+		 *i_<C-r><C-r><C-\>* *xpt-key-pum* *g:xptemplate_key_pum_only*
+					  {default:<C-r><C-r>g:xptemplate_key}
+	Show pop up menu at cursor position. Example: >
+		let g:xptemplate_key_pum_only = '<S-Tab>'
+<	By default, this key map is set to '<C-r><C-r>' concatenated with
+	|g:xptemplate_key| : '<C-r><C-r><C-\>'.
+
+
+						  *g:xptemplate_key_force_pum*
+					       {default:<C-r>g:xptemplate_key}
+	Behave like that with |g:xptemplate_always_show_pum| set.
+
+	If more than one snippet starts with( or exactly equals to ) the text
+	before cursor, pop up menu shows.
+
+	This key triggers snippet only when there is only one snippet of name
+	starts with the text before cursor.
+
+	See also: |g:xptemplate_always_show_pum|.
+
+
+			 *s_<C-\>* *xpt-key-visual* *g:xptemplate_visual
+					  {default:g:xptemplate_key}
+	The key to trigger snippets in visual mode.
+	Use |g:xptemplate_key_visual| to change this mapping. Example: >
+		let g:xptemplate_key_visual = '<Tab>'
+<
+
+
+	       *i_<tab>*  *s_<tab>* *xpt-key-navigate* *g:xptemplate_nav_next*
+							       {default:<Tab>}
+	After a snippet was triggered, this key navigates to the next item.
+	Use |g:xptemplate_nav_next| to change this mapping. Example: >
+		let g:xptemplate_nav_next = '<C-j>'
+<
+
+			      *i_<S-tab>*  *s_<S-tab>* *g:xptemplate_nav_prev*
+							     {default:<S-Tab>}
+	After a snippet was triggered, press this key to navigate back to the
+	previous item.
+	Use |g:xptemplate_nav_prev| to change this mapping. Example: >
+		let g:xptemplate_nav_prev = '<C-k>'
+<
+			   *s_<CR>*  *xpt-key-clear* *g:xptemplate_nav_cancel*
+								{default:<Cr>}
+	Press to clear current place holder and jump to next.
+	Use |g:xptemplate_nav_cancel| to change this mapping. Example: >
+		let g:xptemplate_nav_cancel = '<C-c>'
+<
+
+			*s_<C-l>* *xpt-key-goto-right* *g:xptemplate_to_right*
+							       {default:<C-l>}
+	When a place holder is initially selected jump to the end of current
+	place holder and go into insert mode.
+
+	Use |g:xptemplate_to_right| to change this mapping. Example: >
+		let g:xptemplate_to_right = '<C-;>'
+<
+						       *g:xptemplate_fallback*
+						     {default:<Plug>XPTrawKey}
+	If a try to trigger snippet( by pressing |g:xptemplate_key| ) does not
+	produce any match( full or partial ), contents of this setting is
+	output instead.
+
+	NOTE:	Contents output is similar to user typing. And they CAN be
+		remapped. This may produce a invoke loop.
+
+	The default value of this setting is the literal text of
+	|g:xptemplate_key|, which is defined by |<Plug>XPTrawKey|.
+
+	For example, if you want a completion-popup menu to show when no snippet
+	matched, you can have this line added into your |.vimrc|: >
+		let g:xptemplate_fallback = '<C-n>'
+<
+
+
+		    *n_<C-g>* *i_<C-g>* *xpt-key-goback* *g:xptemplate_goback*
+							       {default:<C-g>}
+	When you move the cursor outside of place holder you are editing,
+	pressing this key (in insert mode or normal mode) moves cursor back to
+	current place holder and selects the place holder text in select mode.
+
+	Use |g:xptemplate_goback| to change this mapping. Example: >
+		let g:xptemplate_goback = '<C-g>'
+<
+
+						     *xpt-customize-highlight*
+	You can specify which highlight Group to use for each kind of
+	highlight.
+
+
+								*XPTcurrentPH*
+							  {default:DiffChange}
+	The highlight group of place holder you are editing. Example: >
+		highlight link XPTcurrentPH Visual
+<	This statement tells XPTemplate to use the highlight group "Visual" to
+	highlight "current" items. See |g:xptemplate_highlight|.
+
+	You can also define your highlight group directly. Example: >
+		highlight XPTcurrentPH gui=none guibg=blue
+<
+							      *XPTfollowingPH*
+							  {default:CursorLine}
+	The highlight group of slave place holders you are editing. Like
+	|XPTcurrentPH|.
+
+
+								 *XPTnextItem*
+							   {default:IncSearch}
+	The highlight group of item you are going to edit. Like
+	|XPTcurrentPH|.
+
+
+								  *xpt-bundle*
+	A bundle is a collection of snippets for a certain purpose. For
+	example a library support bundle like
+	"ftplugin/javascript/jquery.xpt.vim".
+	XPTemplate supplies two ways to load bundles: |g:xptemplate_bundle|
+	and |g:XPTaddBundle()|.
+
+
+==============================================================================
+
+								    *xpt-tips*
+	Want to use XPTemplate with ... together?
+		|xpt-with-supertab|
+
+
+							   *xpt-with-supertab*
+	If you want to use supertab's <TAB> but you have also set XPT to use
+	<TAB>.
+
+==============================================================================
+
+							       *xpt-customize*
+
+	Global customization can be done with |xpt-option|.
+
+	Two options relate to personal settings:
+
+	|g:xptemplate_vars|
+	This is a easy way to set up your personal information like your name
+	and email address.
+	This option actually sets up two variables "$author" and "$email". See
+	|xpt-snippet-variable|
+
+	|g:xptemplate_bundle|
+	This option sets up which library you want to load.
+
+
+						      *xpt-customize-variable*
+	|xpt-snippet-variable| are used to configure the snippet format.
+
+	Customization variables should be defined in a snippet file( like a
+	file in |xpt-personal-folder|) with "personal" priority, to guarantee
+	it will not be overrided by other snippet with lower priority. See
+	|xpt-priority-value|.
+
+	To create a snippet file to define your variables, see
+	|xpt-write-lang-snippet|.
+
+
+	See also: |xpt-customize-variable-format|
+		  |xpt-customize-variable-space|
+		  |xpt-customize-variable-datetime|
+
+
+					       *xpt-customize-variable-format*
+	Each snippet has some variable defined to configure language format.
+	This is useful when some snippet are shared between languages, like
+	for loops in C and CPP or to accommodate different user preferences.
+
+	Brackets style variables may be defined as below: >
+		" if () ** {
+		" else ** {
+		XPTvar $BRif     ' '
+
+		" } ** else {
+		XPTvar $BRel     \n
+
+		" for () ** {
+		" while () ** {
+		" do ** {
+		XPTvar $BRloop   ' '
+
+		" struct name ** {
+		XPTvar $BRstc    ' '
+
+		" int fun() ** {
+		" class name ** {
+		XPTvar $BRfun    ' '
+
+<	The "**" in comment marks where this variable should be used.
+	For example following is "for" snippet for both C and CPP: >
+		XPT for hint=for\ (..;..;++)
+		for (`i^ = `0^; `i^ < `len^; ++`i^)`$BRloop^{
+		    `cursor^			   ******************
+		}
+<	In C language "$BRloop" is set to ' '. In CPP "$BRloop" is set to
+	"\n". You can find them in "ftplugin/c/c.xpt.vim" and
+	"ftplugin/cpp/cpp.xpt.vim".
+
+	In C this snippet results in: >
+		for ( i = 0; i < 10; ++i ) {
+
+		}
+<	In CPP this snippet results in: >
+		for ( i = 0; i < 10; ++i )
+		{
+
+		}
+<
+
+						*xpt-customize-variable-space*
+	Another set of variables is defined to customize spaces. They are: >
+		" int fun ** (
+		" class name ** (
+		XPTvar $SPfun      ''
+
+		" int fun( ** arg ** )
+		" if ( ** condition ** )
+		" for ( ** statement ** )
+		" [ ** a, b ** ]
+		" { ** 'k' : 'v' ** }
+		XPTvar $SParg      ' '
+
+		" if ** (
+		" while ** (
+		" for ** (
+		XPTvar $SPcmd      ' '
+
+		" a = a ** + ** 1
+		" (a, ** b, ** )
+		" a ** = ** b
+		XPTvar $SPop       ' '
+
+<	For example function snippet defined as below: >
+		XPT fun
+		int fun(`$SParg^`args^`$SParg^)
+<	If "$SParg" is set to ' ', snippet results in: >
+		int fun( args )
+<	If "$SParg" is set to '', snippet results in: >
+		int fun(args)
+<
+
+					     *xpt-customize-variable-datetime*
+	Variables discussed in this section defines how "date" and "time"
+	snippet displayed.
+
+	"$DATE_FMT" defines "date" snippet format. Default format is: >
+		XPTvar $DATE_FMT     '%Y %b %d'
+<
+	"$TIME_FMT" defines "time snippet format. Default format is: >
+		XPTvar $TIME_FMT     '"%H:%M:%S"'
+<
+	"$DATETIME_FMT" defines "datetime()" function format. Default format is: >
+		XPTvar $DATETIME_FMT '%c'
+<	
+	"datetime()" has no default snippet using it.
+
+
+	
+
+
+				   *xpt-personal-folder*   *xpt-write-snippet*
+	Snippet file is actually |ftplugin| and with file extension
+	".xpt.vim", like "c.xpt.vim". So you can manage snippet files just
+	like the way you manage |ftplugin|.
+
+	You have THREE place to put your own snippets:
+
+	Path_to_xpt/personal
+		Recommended.  Enough for most users. What you need to do is
+		putting snippet files into this folder.
+
+	Folders in |g:xptemplate_snippet_folders|
+		Deprecated, use 'runtimepath'.
+
+	Other 'runtimepath'
+		Need to manage 'runtimepath' yourself.
+
+	Details are discussed in following section.
+
+
+						      *xpt-write-lang-snippet*
+	You can add snippets of new language, or add snippets to currently
+	supplied languages, in the same way.
+
+	Create a new file in some |ftplugin| directory. For example, if you want
+	to add some PHP snippet, you can create file: >
+		path_to_xpt/personal/ftplugin/php/your_snippets.xpt.vim
+<	Or: >
+		&runtimepath/ftplugin/php/your_snippets.xpt.vim
+<	&runtimepath can be ~/.vim in Unix like system, or ~/vimfiles/ folder
+	in Windows. See 'runtimepath'.
+
+	NOTE	It is strongly recommended to add your own snippets in
+		"path_to_xpt/personal".
+
+	The file name "your_snippets.xpt.vim" has no limitation except it must
+	end with ".xpt.vim".
+
+	And then write your snippets in that file. Restart Vim to load them.
+	See |xpt-snippet-syntax| and |xpt-snippet-tutorial|.
+
+
+						    *xpt-write-common-snippet*
+	If you want to add some snippets which don't belong to any language,
+	or you want to set multiple variables, you can use the "personal
+	common" snippet file.
+
+	1. Rename "personal/ftplugin/_common/personal_example.xpt.vim" to
+	"personal/ftplugin/_common/personal.xpt.vim".  Or create one from
+	scratch.
+
+	2. Add your snippets into the "personal.xpt.vim".
+
+	"personal.xpt.vim" is loaded by _common/common.xpt.vim and has the
+	highest priority. Thus it's always loaded and there are no other
+	snippets overriding yours.
+
+	Example personal/ftplugin/_common/personal.xpt.vim : >
+		XPTemplate priority=personal
+
+		XPTvar $author       your_name
+		XPTvar $email        your_email
+
+		XPT yoursnippet " tips here
+		bla bla
+
+<	See |xpt-snippet-syntax| and |xpt-snippet-tutorial|.
+
+==============================================================================
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
diff --git a/vim-plugins/bundle/xptemplate/err-edit-x-dot-c-quot-wait b/vim-plugins/bundle/xptemplate/err-edit-x-dot-c-quot-wait
new file mode 100644
index 0000000..7e8ddd0
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/err-edit-x-dot-c-quot-wait
@@ -0,0 +1,19 @@
+edit x.c
+type:
+"
+wait
+<space>
+
+following config makes it break to:
+"wait""
+but it should be:
+"wait "
+
+i  wait        * wait<C-O>:echoh HintHL|echo "pid_t wait(int * status)"|echoh None<CR>
+        Last set from ~/bash.xp/vim.xp/plg-git/Hints-for-C-Library-Functions/ftplugin/c/hints_man2.vim
+i  waitpid     * waitpid<C-O>:echoh HintHL|echo "pid_t waitpid(pid_t pid, int * status, int options)"|echoh None<CR>
+        Last set from ~/bash.xp/vim.xp/plg-git/Hints-for-C-Library-Functions/ftplugin/c/hints_man2.vim
+i  wait4       * wait4<C-O>:echoh HintHL|echo "pid_t wait4(pid_t pid, int * status, int options, struct rusage * rusage)"|echoh None<CR>
+        Last set from ~/bash.xp/vim.xp/plg-git/Hints-for-C-Library-Functions/ftplugin/c/hints_man2.vim
+i  wait3       * wait3<C-O>:echoh HintHL|echo "pid_t wait3(int * status, int options, struct rusage * rusage)"|echoh None<CR>
+        Last set from ~/bash.xp/vim.xp/plg-git/Hints-for-C-Library-Functions/ftplugin/c/hints_man2.vim
diff --git a/vim-plugins/bundle/xptemplate/ftdetect/xptemplate.detect.vim b/vim-plugins/bundle/xptemplate/ftdetect/xptemplate.detect.vim
new file mode 100644
index 0000000..c1d2d91
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftdetect/xptemplate.detect.vim
@@ -0,0 +1 @@
+au BufRead,BufNewFile *.xpt.vim set filetype=xpt.vim
diff --git a/vim-plugins/bundle/xptemplate/ftdetect/xptlog.detect.vim b/vim-plugins/bundle/xptemplate/ftdetect/xptlog.detect.vim
new file mode 100644
index 0000000..89c65bf
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftdetect/xptlog.detect.vim
@@ -0,0 +1,5 @@
+augroup XPTLogFiletype
+    au!
+    au BufRead,BufNewFile xpt-debug.log set filetype=xptlog
+augroup END
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/README b/vim-plugins/bundle/xptemplate/ftplugin/README
new file mode 100644
index 0000000..8e9d601
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/README
@@ -0,0 +1,7 @@
+
+You should *NOT* be here.
+
+Please keep in mind that you should *NEVER* modify files in this folder.
+
+I supposed you are here to add new snippets or refine some of them.
+Please do it in ./personal folder. See :h xpt-personal-folder .
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_comment/c.like.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_comment/c.like.xpt.vim
new file mode 100644
index 0000000..7d6d886
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_comment/c.like.xpt.vim
@@ -0,0 +1,11 @@
+" NOTE: You can include this file into which uses C comment format.  But It is
+"       recommended to include _comment/doubleSign (or singleSign,
+"       singleDouble) directly.
+XPTemplate priority=like
+
+XPTvar $CL  /*
+XPTvar $CM   *
+XPTvar $CR   */
+
+XPTinclude
+      \ _comment/doubleSign
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_comment/cpp.like.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_comment/cpp.like.xpt.vim
new file mode 100644
index 0000000..f1e0580
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_comment/cpp.like.xpt.vim
@@ -0,0 +1,13 @@
+" NOTE: You can include this file into which uses CPP comment format.  But It
+"       is recommended to include _comment/doubleSign (or singleSign,
+"       singleDouble) directly.
+XPTemplate priority=like-
+
+XPTvar $CL  /*
+XPTvar $CM   *
+XPTvar $CR   */
+
+XPTvar $CS  //
+
+XPTinclude
+      \ _comment/singleDouble
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_comment/doubleSign.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_comment/doubleSign.xpt.vim
new file mode 100644
index 0000000..f1c6159
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_comment/doubleSign.xpt.vim
@@ -0,0 +1,65 @@
+XPTemplate priority=all-
+
+let s:f = g:XPTfuncs()
+
+" snippets for language whose comment sign is 2 signs, like c:"/* */"
+" TODO friendly cursor place holder
+
+XPTinclude
+      \ _common/common
+
+
+fun! s:f._xCommentMidIndent()
+    let l = self.GetVar( '$CL' )
+    let m = self.GetVar( '$CM' )
+    
+    if len( l ) <= len( m )
+        return ''
+    else
+        return '      '[ : len( l ) - len( m ) - 1 ]
+    endif
+endfunction
+
+
+fun! s:f._xCommentLeftWithoutMid()
+    let l = self.GetVar( '$CL' )
+    let m = self.GetVar( '$CM' )
+
+    if l == '' || m == ''
+        return l
+    endif
+
+    if l[ -len( m ) : ] == m
+        return l[ : -len( m ) -1 ]
+    else
+        return l
+    endif
+endfunction
+
+
+
+XPT _d_comment hidden wrap=what		" $CL .. $CR
+`$CL^ `what^^ `$CR^`^
+
+
+XPT _d_commentBlock hidden wrap	" $CL ..
+`$_xCommentLeftWithoutMid^`$CM `cursor^
+`$_xCommentMidIndent$CR^
+
+
+XPT _d_commentDoc hidden wrap	" $CL$CM ..
+`$CL^`$CM^
+`$_xCommentMidIndent$CM `cursor^
+`$_xCommentMidIndent$CR^
+
+
+XPT _d_commentLine hidden wrap=what	" $CL .. $CR
+XSET what=
+`$CL `what` $CR^`^
+
+
+XPT comment      alias=_d_comment
+XPT commentBlock alias=_d_commentBlock
+XPT commentDoc   alias=_d_commentDoc
+XPT commentLine  alias=_d_commentLine
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_comment/doubleSingle.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_comment/doubleSingle.xpt.vim
new file mode 100644
index 0000000..0386209
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_comment/doubleSingle.xpt.vim
@@ -0,0 +1,19 @@
+XPTemplate priority=all-2
+
+
+XPTinclude
+      \ _comment/common
+      \ _comment/singleSign
+      \ _comment/doubleSign
+
+
+
+
+XPT comment      alias=_d_comment
+XPT commentBlock alias=_d_commentBlock
+XPT commentDoc   alias=_d_commentDoc
+XPT commentLine  alias=_s_commentLine
+XPT commentLine2 alias=_d_commentLine
+
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_comment/pattern.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_comment/pattern.xpt.vim
new file mode 100644
index 0000000..490a960
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_comment/pattern.xpt.vim
@@ -0,0 +1,42 @@
+" priority is a bit lower than 'spec'
+XPTemplate priority=spec+
+
+echom "_comment/pattern is deprecated."
+
+
+" XPTvar $CL  Warn_$CL_IS_NOT_SET
+" XPTvar $CM  Warn_$CM_IS_NOT_SET
+" XPTvar $CR  Warn_$CR_IS_NOT_SET
+" XPTvar $CS  Warn_$CS_IS_NOT_SET
+
+" ================================= Snippets ===================================
+
+if has_key(s:v, '$CL') && has_key(s:v, '$CR')
+
+  call XPTdefineSnippet('cc', {'hint' : '$CL $CR'}, [ '`$CL^ `cursor^ `$CR^' ])
+  call XPTdefineSnippet('cc_', {'hint' : '$CL ... $CR'}, [ '`$CL^ `wrapped^ `$CR^' ])
+
+  " block comment
+  call XPTdefineSnippet('cb', {'hint' : '$CL ...'}, [
+        \'`$CL^',
+        \' `$CM^ `cursor^',
+        \' `$CR^' ])
+
+  " block doc comment
+  call XPTdefineSnippet('cd', {'hint' : '$CL$CM ...'}, [
+        \'`$CL^`$CM^',
+        \' `$CM^ `cursor^',
+        \' `$CR^' ])
+
+endif
+
+" line comment
+if has_key(s:v, '$CS')
+  call XPTdefineSnippet('cl', {'hint' : '$CS'}, [ '`$CS^ `cursor^' ])
+
+else
+  call XPTdefineSnippet('cl', {'hint' : '$CL .. $CR'}, [ '`$CL^ `cursor^ `$CR^' ])
+
+endif
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_comment/singleDouble.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_comment/singleDouble.xpt.vim
new file mode 100644
index 0000000..e05abb4
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_comment/singleDouble.xpt.vim
@@ -0,0 +1,19 @@
+XPTemplate priority=all-2
+
+
+XPTinclude
+      \ _comment/common
+      \ _comment/singleSign
+      \ _comment/doubleSign
+
+
+
+
+XPT comment      alias=_s_comment
+XPT commentBlock alias=_s_commentBlock
+XPT commentDoc   alias=_d_commentDoc
+XPT commentLine  alias=_s_commentLine
+XPT commentLine2 alias=_d_commentLine
+
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_comment/singleSign.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_comment/singleSign.xpt.vim
new file mode 100644
index 0000000..7fc0b98
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_comment/singleSign.xpt.vim
@@ -0,0 +1,30 @@
+XPTemplate priority=all-
+
+
+XPTinclude
+      \ _comment/common
+
+
+
+XPT _s_comment hidden wrap		" $CS ..
+`$CS `cursor^
+
+
+XPT _s_commentBlock hidden wrap	" $CS ..
+`$CS `cursor^
+
+
+XPT _s_commentDoc hidden wrap	" $CS ..
+`$CS^
+`$CS `cursor^
+`$CS^
+
+XPT _s_commentLine hidden wrap	" $CS ..
+`$CS `cursor^
+
+
+XPT comment      alias=_s_comment
+XPT commentBlock alias=_s_commentBlock
+XPT commentDoc   alias=_s_commentDoc
+XPT commentLine  alias=_s_commentLine
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_comment/xml.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_comment/xml.xpt.vim
new file mode 100644
index 0000000..34bdf25
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_comment/xml.xpt.vim
@@ -0,0 +1,11 @@
+" NOTE: You can include this file into which uses XML comment format.  But It is
+"       recommended to include _comment/doubleSign (or singleSign,
+"       singleDouble) directly.
+XPTemplate priority=spec
+
+XPTvar $CL <!--
+XPTvar $CR -->
+
+
+XPTinclude
+      \ _comment/doubleSign
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_common/cmn.counter.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_common/cmn.counter.xpt.vim
new file mode 100644
index 0000000..57b2b3a
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_common/cmn.counter.xpt.vim
@@ -0,0 +1,40 @@
+XPTemplate priority=all-
+
+let s:f = g:XPTfuncs()
+
+
+" ========================= Function and Variables =============================
+
+" draft increment implementation
+fun! s:f.CntD() "{{{
+  let ctx = self.renderContext
+  if !has_key(ctx, '__counter')
+    let ctx.__counter = {}
+  endif
+  return ctx.__counter
+endfunction "}}}
+
+fun! s:f.CntStart(name, ...) "{{{
+  let d = self.CntD()
+  let i = a:0 >= 1 ? 0 + a:1 : 0
+  let d[a:name] = 0 + i
+  return ""
+endfunction "}}}
+
+fun! s:f.Cnt(name) "{{{
+  let d = self.CntD()
+  return d[a:name]
+endfunction "}}}
+
+fun! s:f.CntIncr(name, ...)"{{{
+  let i = a:0 >= 1 ? 0 + a:1 : 1
+  let d = self.CntD()
+
+  let d[a:name] += i
+  return d[a:name]
+endfunction"}}}
+
+" ================================= Snippets ===================================
+
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_common/common.bracketcmpl.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_common/common.bracketcmpl.xpt.vim
new file mode 100644
index 0000000..072bb57
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_common/common.bracketcmpl.xpt.vim
@@ -0,0 +1,187 @@
+XPTemplate priority=all
+
+
+let s:f = g:XPTfuncs()
+
+
+XPTinclude
+      \ _common/common
+
+
+let s:pairs = { 'left' : "'" . '"([{<|*`+ ',
+      \         'right': "'" . '")]}>|*`+ ', }
+
+
+" TODO not perfect: hide right part if found right is already in input area.
+"      use searchpair() to improve
+
+let s:crIndent = 0
+
+fun! s:f.BracketRightPart( leftReg )
+
+    if has_key( self._ctx.renderContext, 'bracketComplete' )
+        return ''
+    endif
+
+    let v = self.V()
+    let v0 = v
+
+    let v = matchstr( v, a:leftReg )
+    if v == ''
+        return ''
+    endif
+
+    let v = join( reverse( split( v, '\V\s\{-}' ) ), '')
+    let v = tr( v, s:pairs.left, s:pairs.right )
+
+    if v0 =~ '\V\n\s\*\$'
+        let v = matchstr( v, '\V\S\+' )
+        return { "action" : "text", "nIndent" : -s:crIndent, "text" : "\n".v }
+    else
+        return v
+    endif
+
+endfunction
+
+fun! s:f.bkt_cmpl()
+    return self.BracketRightPart( self._ctx.renderContext.leftReg )
+endfunction
+
+fun! s:f.quote_cmpl()
+    let r = self._ctx.renderContext
+    let v = self.V()
+    let v = matchstr( v, r.leftReg )
+
+    if has_key( r, 'bracketComplete' )
+        return ''
+    elseif v == ''
+        return ''
+    else
+        return r.charRight
+    endif
+endfunction
+
+fun! s:f.quote_ontype()
+
+    let v = self.V()
+
+    if v == ''
+        return self.Finish()
+
+    elseif v =~ '\V\n'
+
+        return self.FinishOuter( v )
+
+    else
+        return 0
+    endif
+
+endfunction
+
+fun! s:f.bkt_ontype()
+
+
+    let v = self.V()
+
+    if v == ''
+        return self.Finish()
+
+    elseif v =~ '\V\n\s\*\$'
+
+        if &indentexpr != ''
+            let indentexpr = substitute( &indentexpr, '\Vv:lnum', 'line(".")', '' )
+            try
+                let nNewLineIndent = eval( indentexpr )
+                let s:crIndent = nNewLineIndent - indent( line( "." ) - 1 )
+            catch /.*/
+                let s:crIndent = self.NIndent()
+            endtry
+        else
+            let s:crIndent = self.NIndent()
+        endif
+
+        " create snippet indent. filter does not use actual indent string
+        let n_indent = xpt#indent#ActualToSnippetNr(s:crIndent)
+        let indent_str = repeat( ' ', n_indent )
+
+        let v = substitute( v, '\V\s\*\n\.\*', "\n", 'g' )
+
+        return self.FinishOuter( v . indent_str )
+
+    else
+        " nothing todo
+        return 0
+    endif
+
+endfunction
+
+fun! s:f.bkt_init( followingChar )
+    let r = self._ctx.renderContext
+
+    let r.char = self.GetVar( '$_xSnipName' )
+    let r.followingChar = a:followingChar
+    let r.leftReg = '\V\^' . r.char . r.followingChar . '\?'
+
+
+    let i = stridx( s:pairs.left, r.char )
+
+    if i != -1
+        let r.charRight = s:pairs.right[ i ]
+
+        call XPTmapKey( r.charRight, 'bkt_finish(' . string( r.charRight ) . ')' )
+    else
+        let r.charRight = ''
+    endif
+
+    return ''
+endfunction
+
+fun! s:f.bkt_finish( keyPressed )
+
+    let r = self._ctx.renderContext
+
+    if a:keyPressed != r.charRight
+        " may be outer snippet key bind
+        return a:keyPressed
+    endif
+
+    let r.bracketComplete = 1
+
+    let v = self.V()
+
+    if self.GetVar( '$SParg' ) == ' '
+
+        if v == r.char . r.followingChar
+            return self.FinishOuter( r.char . r.charRight )
+        else
+            return self.FinishOuter( v . r.charRight )
+        endif
+
+    else
+        return self.FinishOuter( v . r.charRight )
+    endif
+
+endfunction
+
+
+
+
+XPT _bracket hidden
+XSET s|pre=Echo('')
+XSET s|ontype=bkt_ontype()
+XSET s=bkt_init(' ')
+`$_xSnipName$SParg`s^`s^bkt_cmpl()^
+
+XPT _quote hidden
+XSET s|pre=Echo('')
+XSET s|ontype=quote_ontype()
+XSET s=bkt_init('')
+`$_xSnipName`s^`s^quote_cmpl()^
+
+
+XPT ( hidden alias=_bracket
+XPT [ hidden alias=_bracket
+XPT { hidden alias=_bracket
+XPT < hidden alias=_bracket
+XPT ' hidden alias=_quote
+XPT " hidden alias=_quote
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_common/common.path.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_common/common.path.xpt.vim
new file mode 100644
index 0000000..2c8560b
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_common/common.path.xpt.vim
@@ -0,0 +1,37 @@
+" disabled
+finish
+
+
+XPTemplate priority=all
+
+let s:f = g:XPTfuncs()
+
+fun! s:f.PathPumFrom( where )
+    let paths = split( globpath( a:where, '*' ), "\n" )
+    let paths = map( paths, 'v:val[len(' . string( a:where ) . '):]' )
+
+    return paths
+endfunction
+
+fun! s:f.ExpPathPumFrom( base )
+    " let prev = a:base . '/' . R( "p" )
+    let p = self.R( "p" )
+    let prev = a:base . p
+    return prev == ''
+          \ ? ''
+          \ : self.Build( p . '`p^Choose( PathPumFrom( ' . string(prev) . ' ) )^' )
+endfunction
+
+
+
+XPT FromHome " path starts from $HOME
+XSET p|post=ExpPathPumFrom($HOME)
+`p^Choose(PathPumFrom($HOME))^
+
+
+
+XPT FromPwd " path starts from $PWD
+XSET p|post=Echo(R( "p" ) == '' ? '' : Build( R( "p" ) . '`p^Choose( PathPumFrom( $PWD . R( "p" ), 0 ) )^' ) )
+`p^Choose(PathPumFrom($PWD))^
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_common/common.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_common/common.xpt.vim
new file mode 100644
index 0000000..f3873d3
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_common/common.xpt.vim
@@ -0,0 +1,665 @@
+" Default settings and functions used in every snippet file.
+XPTemplate priority=all
+
+" containers
+let s:f = g:XPTfuncs()
+
+XPTvar $author $author is not set, you need to set g:xptemplate_vars="$author=your_name" in .vimrc
+XPTvar $email  $email is not set, you need to set g:xptemplate_vars="$email=your_email@com" in .vimrc
+
+XPTvar $VOID
+
+" if () ** {
+" else ** {
+XPTvar $BRif     ' '
+
+" } ** else {
+XPTvar $BRel     \n
+
+" for () ** {
+" while () ** {
+" do ** {
+XPTvar $BRloop   ' '
+
+" struct name ** {
+XPTvar $BRstc    ' '
+
+" int fun() ** {
+" class name ** {
+XPTvar $BRfun    ' '
+
+
+" int fun ** (
+" class name ** (
+XPTvar $SPfun      ''
+
+" int fun( ** arg ** )
+" if ( ** condition ** )
+" for ( ** statement ** )
+" [ ** a, b ** ]
+" { ** 'k' : 'v' ** }
+XPTvar $SParg      ' '
+
+" if ** (
+" while ** (
+" for ** (
+XPTvar $SPcmd      ' '
+
+" a ** = ** b
+" a = a ** + ** 1
+" (a, ** b, ** )
+XPTvar $SPop       ' '
+
+
+XPTvar $DATE_FMT     '%Y %b %d'
+XPTvar $TIME_FMT     '"%H:%M:%S"'
+XPTvar $DATETIME_FMT '%c'
+
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          0
+XPTvar $UNDEFINED     0
+
+XPTvar $VOID_LINE
+XPTvar $CURSOR_PH      CURSOR
+
+
+XPTinclude
+      \ _common/personal
+      \ _common/inlineComplete
+      \ _common/common.*
+
+let s:f_prototype = xpt#snipfunction#funcs
+call extend( s:f, s:f_prototype, 'error' )
+
+
+fun! s:f._xSnipName()
+    return self._ctx.renderContext.snipObject.name
+endfunction
+
+
+fun! s:f.GetWrappedText()
+    let wrap = self._ctx.renderContext.wrap
+
+    let [ l, r ] = self.ItemEdges()
+
+    if !has_key( wrap, 'text' )
+        return 0
+    endif
+
+    if l == '' && r == ''
+        return { 'nIndent'  : wrap.indent,
+              \  'action'   : 'text',
+              \  'parseIndent' : 0,
+              \  'text'     : wrap.text }
+    else
+
+        let wrap.curline = wrap.lines[ 0 ]
+        let wrap.lines = wrap.lines[ 1 : ]
+
+        return wrap.curline
+    endif
+endfunction
+
+fun! s:f.WrapAlignAfter( min )
+    let wrap = self._ctx.renderContext.wrap
+    let n = max( [ a:min, wrap.max ] ) - len( wrap.curline )
+    return repeat( ' ', n )
+endfunction
+
+fun! s:f.WrapAlignBefore( min )
+    let wrap = self._ctx.renderContext.wrap
+    let n = max( [ a:min, wrap.max ] ) - len( wrap.lines[ 0 ] )
+    return repeat( ' ', n )
+endfunction
+
+fun! s:f.Item()
+    return get( self._ctx.renderContext, 'item', {} )
+endfunction
+
+" current name
+fun! s:f.ItemName() "{{{
+    return get( self.Item(), 'name', '' )
+endfunction "}}}
+let s:f.N = s:f.ItemName
+
+" name with edge
+fun! s:f.ItemFullname() "{{{
+    return get( self.Item(), 'fullname', '')
+endfunction "}}}
+let s:f.NN = s:f.ItemFullname
+
+" current value user typed
+fun! s:f.ItemValue() dict "{{{
+    return self.GetVar( '$UserInput' )
+endfunction "}}}
+let s:f.V = s:f.ItemValue
+
+fun! s:f.PrevItem( n )
+    let hist = get( self._ctx.renderContext, 'history', [] )
+    return get( hist, a:n, {} )
+endfunction
+
+fun! s:f.ItemInitValue()
+    return get( self.Item(), 'initValue', '' )
+endfunction
+let s:f.IV = s:f.ItemInitValue
+
+fun! s:f.ItemValueStripped( ... )
+    let ptn = a:0 == 0 || a:1 =~ 'lr'
+          \ ? '\V\^\s\*\|\s\*\$'
+          \ : ( a:1 == 'l'
+          \     ? '\V\^\s\*'
+          \     : '\V\s\*\$' )
+    return substitute( self.ItemValue(), ptn, '', 'g' )
+endfunction
+let s:f.VS = s:f.ItemValueStripped
+
+
+fun! s:f.ItemPos()
+    return XPMposStartEnd( self._ctx.renderContext.leadingPlaceHolder.mark )
+endfunction
+
+fun! s:f.ItemInitValueWithEdge()
+    let [ l, r ] = self.ItemEdges()
+    return l . self.IV() . r
+endfunction
+let s:f.IVE = s:f.ItemInitValueWithEdge
+
+" if value match one of the regexps
+fun! s:f.Vmatch( ... )
+    let v = self.V()
+    for reg in a:000
+        if match(v, reg) != -1
+            return 1
+        endif
+    endfor
+
+    return 0
+endfunction
+
+" value matchstr
+fun! s:f.VMS( reg )
+    return matchstr(self.V(), a:reg)
+endfunction
+
+" edge stripped value
+fun! s:f.ItemStrippedValue()
+  let v = self.V()
+
+  let [edgeLeft, edgeRight] = self.ItemEdges()
+
+  let v = substitute( v, '\V\^' . edgeLeft,       '', '' )
+  let v = substitute( v, '\V' . edgeRight . '\$', '', '' )
+
+  return v
+endfunction
+let s:f.V0 = s:f.ItemStrippedValue
+
+fun! s:f.Phase() dict
+    return get( self._ctx.renderContext, 'phase', '' )
+endfunction
+
+" TODO this is not needed at all except as a shortcut.
+" equals to expand()
+fun! s:f.E(s) "{{{
+  return expand(a:s)
+endfunction "}}}
+
+
+" return the context
+fun! s:f.Context() "{{{
+  return self._ctx.renderContext
+endfunction "}}}
+let s:f.C = s:f.Context
+
+
+" TODO this is not needed at all except as a shortcut.
+" post filter	substitute
+fun! s:f.S(str, ptn, rep, ...) "{{{
+  let flg = a:0 >= 1 ? a:1 : 'g'
+  return substitute(a:str, a:ptn, a:rep, flg)
+endfunction "}}}
+
+" equals to S(C().value, ...)
+fun! s:f.SubstituteWithValue(ptn, rep, ...) "{{{
+  let flg = a:0 >= 1 ? a:1 : 'g'
+  return substitute(self.V(), a:ptn, a:rep, flg)
+endfunction "}}}
+let s:f.SV = s:f.SubstituteWithValue
+
+
+fun! s:f.HasStep( name )
+    let namedStep = get( self._ctx.renderContext, 'namedStep', {} )
+    return has_key( namedStep, a:name )
+endfunction
+
+" reference to another finished item value
+fun! s:f.Reference(name) "{{{
+    let namedStep = get( self._ctx.renderContext, 'namedStep', {} )
+    return get( namedStep, a:name, '' )
+endfunction "}}}
+let s:f.R = s:f.Reference
+
+fun! s:f.Snippet( name )
+    return get( self._ctx.renderContext.ftScope.allTemplates, a:name, { 'tmpl' : '' } )[ 'tmpl' ]
+endfunction
+
+" black hole
+fun! s:f.Void(...) "{{{
+  return ""
+endfunction "}}}
+let s:f.VOID = s:f.Void
+
+" Echo several expression and concat them.
+" That's the way to use normal vim script expression instead of mixed string
+fun! s:f.Echo( ... )
+    let text = ''
+    if a:0 > 0
+        let text = a:1
+    endif
+    return { 'action': 'text', 'text': text }
+endfunction
+
+fun! s:f.EchoIf( isTrue, ... )
+    if a:isTrue
+        return join( a:000, '' )
+    else
+        return self.V()
+    endif
+endfunction
+
+fun! s:f.EchoIfEq( expected, ... )
+    if self.V() ==# a:expected
+        return join( a:000, '' )
+    else
+        return self.V()
+    endif
+endfunction
+
+fun! s:f.EchoIfNoChange( ... )
+    if self.V0() ==# self.ItemName()
+        return join( a:000, '' )
+    else
+        return self.V()
+    endif
+endfunction
+
+fun! s:f.Commentize( text )
+  if has_key( self, '$CL' )
+    return self[ '$CL' ] . ' ' . a:text . ' ' . self[ '$CR' ]
+
+  elseif has_key( self, '$CS' )
+    return self[ '$CS' ] . ' ' . a:text
+
+  endif
+
+  return a:text
+endfunction
+
+fun! s:f.VoidLine()
+  return self.Commentize( 'void' )
+endfunction
+
+" Same with Echo* except echoed text is to be build to generate dynamic place
+" holders
+fun! s:f.Build( ... )
+  return { 'action' : 'build', 'text' : join( a:000, '' ) }
+endfunction
+
+let s:f.Embed = s:f.Build
+
+fun! s:f.BuildSnippet( snipname )
+    return { 'action' : 'build', 'snippet' : a:snipname }
+endfunction
+
+fun! s:f.BuildIfChanged( ... )
+  let v = substitute( self.V(), "\\V\n\\|\\s", '', 'g')
+  " let fn = substitute( self.ItemFullname(), "\\V\n\\|\\s", '', 'g')
+  let fn = substitute( self.ItemInitValueWithEdge(), "\\V\n\\|\\s", '', 'g')
+
+  if v ==# fn || v == ''
+      return ''
+  else
+      return { 'action' : 'build', 'text' : join( a:000, '' ) }
+  endif
+endfunction
+
+fun! s:f.BuildIfNoChange( ... )
+  let v = substitute( self.V(), "\\V\n\\|\\s", '', 'g')
+  " let fn = substitute( self.ItemFullname(), "\\V\n\\|\\s", '', 'g')
+  let fn = substitute( self.ItemInitValueWithEdge(), "\\V\n\\|\\s", '', 'g')
+
+
+  if v ==# fn
+      return { 'action' : 'build', 'text' : join( a:000, '' ) }
+  else
+      return  0
+  endif
+endfunction
+
+" trigger nested template
+fun! s:f.Trigger( name ) "{{{
+  return {'action' : 'expandTmpl', 'tmplName' : a:name}
+endfunction "}}}
+
+
+fun! s:f.Finish(...)
+
+    let opt = {}
+    if a:0 > 0
+        let opt.text = a:1
+    endif
+    return self.Fin(opt)
+endfunction
+
+fun! s:f.FinishOuter( ... )
+
+    let opt = {"marks" : "mark"}
+    if a:0 > 0
+        let opt.text = a:1
+    endif
+    return self.Fin(opt)
+endfunction
+
+fun! s:f.FinishInner( ... )
+
+    let opt = {"marks" : "innerMarks"}
+    if a:0 > 0
+        let opt.text = a:1
+    endif
+    return self.Fin(opt)
+endfunction
+
+fun! s:f.Fin(opt)
+    " there is still items left
+    if ! empty( self._ctx.renderContext.itemList )
+        return get(a:opt, 'text', 0)
+    endif
+
+    let r = {'action' : 'finishTemplate'}
+    if has_key(a:opt, 'text')
+        let r.text = a:opt.text
+    endif
+    if has_key(a:opt, 'marks')
+        let r.marks = a:opt.marks
+    endif
+
+    return r
+endfunction
+
+fun! s:f.Next( ... )
+  if a:0 == 0
+    return { 'nav' : 'next' }
+  else
+    return { 'nav' : 'next', 'text' : join( a:000, '' ) }
+  endif
+endfunction
+
+fun! s:f.Remove()
+    return { 'action' : 'text', 'nav' : 'next', 'text' : '' }
+endfunction
+
+
+
+" This function is intended to be used for popup selection :
+" XSET bidule=Choose([' ','dabadi','dabada'])
+fun! s:f.Choose( lst, ... ) "{{{
+    let val = { 'action' : 'pum', 'pum' : a:lst }
+
+    if a:0 == 1
+        let val.acceptEmpty = a:1 != 0
+    endif
+
+    return val
+endfunction "}}}
+
+fun! s:f.ChooseStr(...) "{{{
+  return copy( a:000 )
+endfunction "}}}
+
+" XXX
+" Fill in postType, and finish template rendering at once.
+" This make nested template rendering go back to upper level, top-level
+" template rendering quit.
+fun! s:f.xptFinishTemplateWith(postType) dict
+endfunction
+
+" XXX
+" Fill in postType, jump to next item. For creating item being able to be
+" automatically filled in
+fun! s:f.xptFinishItemWith(postType) dict
+endfunction
+
+" TODO test me
+fun! s:f.UnescapeMarks(string) dict
+  let patterns = self._ctx.renderContext.snipObject.ptn
+  let charToEscape = '\(\[' . patterns.l . patterns.r . ']\)'
+
+  let r = substitute( a:string,  '\v(\\*)\1\\?\V' . charToEscape, '\1\2', 'g')
+
+  return r
+endfunction
+let s:f.UE = s:f.UnescapeMarks
+
+
+
+
+
+fun! s:f.headerSymbol(...) "{{{
+  let h = expand('%:t')
+  let h = substitute(h, '\.', '_', 'g') " replace . with _
+  let h = substitute(h, '.', '\U\0', 'g') " make all characters upper case
+
+  return '__'.h.'__'
+endfunction "}}}
+
+
+
+fun! s:f.date(...) "{{{
+  return strftime( self.GetVar( '$DATE_FMT' ) )
+endfunction "}}}
+fun! s:f.datetime(...) "{{{
+  return strftime( self.GetVar( '$DATETIME_FMT' ) )
+endfunction "}}}
+fun! s:f.time(...) "{{{
+  return strftime( self.GetVar( '$TIME_FMT' ) )
+endfunction "}}}
+fun! s:f.file(...) "{{{
+  return expand("%:t")
+endfunction "}}}
+fun! s:f.fileRoot(...) "{{{
+  return expand("%:t:r")
+endfunction "}}}
+fun! s:f.fileExt(...) "{{{
+  return expand("%:t:e")
+endfunction "}}}
+fun! s:f.path(...) "{{{
+  return expand("%:p")
+endfunction "}}}
+
+
+fun! s:f.UpperCase( v )
+  return substitute(a:v, '.', '\u&', 'g')
+endfunction
+
+fun! s:f.LowerCase( v )
+  return substitute(a:v, '.', '\l&', 'g')
+endfunction
+
+
+
+" Return Item Edges
+fun! s:f.ItemEdges() "{{{
+    let leader =  get( self._ctx.renderContext, 'leadingPlaceHolder', {} )
+    if has_key( leader, 'leftEdge' )
+        return [ leader.leftEdge, leader.rightEdge ]
+    else
+        return [ '', '' ]
+    endif
+endfunction "}}}
+let s:f.Edges = s:f.ItemEdges
+
+
+fun! s:f.ItemCreate( name, edges, filters )
+  let [ ml, mr ] = XPTmark()
+
+
+  let item = ml . a:name
+
+  if has_key( a:edges, 'left' )
+    let item = ml . a:edges.left . item
+  endif
+
+  if has_key( a:edges, 'right' )
+    let item .= ml . a:edges.right
+  endif
+
+  let item .= mr
+
+  if has_key( a:filters, 'post' )
+    let item .= a:filters.post . mr . mr
+  endif
+
+  return item
+
+endfunction
+
+" {{{ Quick Repetition
+" If something typed, <tab>ing to next generate another item other than the
+" typed.
+"
+" If nothing typed but only <tab> to next, clear it.
+"
+" Normal clear typed, also clear it
+" TODO escape mark character in a:sep or a:item
+" }}}
+fun! s:f.ExpandIfNotEmpty( sep, item, ... ) "{{{
+  let v = self.V()
+
+  let [ ml, mr ] = XPTmark()
+
+  if a:0 != 0
+    let r = a:1
+  else
+    let r = ''
+  endif
+
+  " let t = ( v == '' || v == a:item || v == ( a:sep . a:item . r ) )
+  let t = ( v == '' || v =~ '\V' . a:item )
+        \ ? ''
+        \ : self.Build( v
+        \       . ml . a:sep . ml . a:item . ml . r . mr
+        \       . 'ExpandIfNotEmpty(' . string( a:sep ) . ', ' . string( a:item )  . ')' . mr . mr )
+
+  return t
+endfunction "}}}
+
+fun! s:f.ExpandInsideEdge( newLeftEdge, newRightEdge )
+    let v = self.V()
+    let fullname = self.ItemFullname()
+
+    let [ el, er ] = self.ItemEdges()
+
+    if v ==# fullname || v == ''
+        return ''
+    endif
+
+    return substitute( v, '\V' . er . '\$' , '' , '' )
+                \. self.ItemCreate( self.ItemName(), { 'left' : a:newLeftEdge, 'right' : a:newRightEdge }, {} )
+                \. er
+endfunction
+
+fun! s:f.NIndent()
+    return &shiftwidth
+endfunction
+
+fun! s:f.ResetIndent( nIndent, text )
+    return { 'action' : 'resetIndent', 'resetIndent' : 1, 'nIndent' : a:nIndent, 'text' : a:text }
+endfunction
+
+
+
+fun! s:f.CmplQuoter_pre() dict
+    if !g:xptemplate_brace_complete
+        return ''
+    endif
+
+    let v = substitute( self.ItemStrippedValue(), '\V\^\s\*', '', '' )
+
+    let first = matchstr( v, '\V\^\[''"]' )
+    if first == ''
+        return ''
+    endif
+
+    let v = substitute( v, '\V\[^' . first . ']', '', 'g' )
+    if v == first
+        " only 1 quoter
+        return first
+    else
+        return ''
+    endif
+endfunction
+
+
+fun! s:f.AutoCmpl( keepInPost, list, ... )
+
+    if !a:keepInPost && self.Phase() == 'post'
+        return ''
+    endif
+
+    if type( a:list ) == type( [] )
+        let list = a:list
+    else
+        let list = [ a:list ] + a:000
+    endif
+    
+    
+    let v = self.V0()
+    if v == ''
+        return ''
+    endif
+    
+    
+    for word in list
+        if word =~ '\V\^' . v
+            return word[ len( v ) : ]
+        endif
+    endfor
+
+    return ''
+endfunction
+
+
+
+
+
+
+" Short names are normally not good. Some alias to those short name functions are
+" made, with meaningful names.
+"
+" They all start with prefix 'xpt'.
+"
+
+" ================================= Snippets ===================================
+
+" Shortcuts
+call XPTdefineSnippet('Author', {}, '`$author^')
+call XPTdefineSnippet('Email', {}, '`$email^')
+call XPTdefineSnippet("Date", {}, "`date()^")
+call XPTdefineSnippet("File", {}, "`file()^")
+call XPTdefineSnippet("Path", {}, "`path()^")
+
+
+call XPTdefineSnippet('"_', {'hint' : '" .. "', 'wraponly' : 'w' }, '"`w^"')
+call XPTdefineSnippet("'_", {'hint' : "' .. '", 'wraponly' : 'w' }, "'`w^'")
+call XPTdefineSnippet("<_", {'hint' : '< .. >', 'wraponly' : 'w' }, '<`w^>')
+call XPTdefineSnippet("(_", {'hint' : '( .. )', 'wraponly' : 'w' }, '(`w^)')
+call XPTdefineSnippet("[_", {'hint' : '[ .. ]', 'wraponly' : 'w' }, '[`w^]')
+call XPTdefineSnippet("{_", {'hint' : '{ .. }', 'wraponly' : 'w' }, '{`w^}')
+call XPTdefineSnippet("`_", {'hint' : '` .. `', 'wraponly' : 'w' }, '\``w^\`')
+
+
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_common/inlineComplete.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_common/inlineComplete.xpt.vim
new file mode 100644
index 0000000..32f1995
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_common/inlineComplete.xpt.vim
@@ -0,0 +1,53 @@
+XPTemplate priority=all
+
+let s:f = g:XPTfuncs()
+
+
+fun! s:Init()
+    let s:xptCompleteMap = [
+          \"''",
+          \'""',
+          \'()',
+          \'[]',
+          \'{}',
+          \'<>',
+          \'||',
+          \'**',
+          \'``',
+          \'++',
+          \'  ',
+          \]
+
+    let s:xptCompleteLeft = join( map( deepcopy( s:xptCompleteMap ), 'v:val[0:0]' ), '' )
+    let s:xptCompleteRight = join( map( deepcopy( s:xptCompleteMap ), 'v:val[1:1]' ), '' )
+endfunction
+
+call s:Init()
+delfunc s:Init
+
+
+
+
+fun! s:f.CompleteRightPart( leftReg ) dict
+    if !g:xptemplate_brace_complete
+        return ''
+    endif
+
+    let v = self.V()
+
+
+    let v = matchstr( v, a:leftReg )
+    if v == ''
+        return ''
+    endif
+
+    let v = join( reverse( split( v, '\V\s\{-}' ) ), '')
+    let v = tr( v, s:xptCompleteLeft, s:xptCompleteRight )
+    return v
+
+endfunction
+
+
+
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_condition/c.like.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_condition/c.like.xpt.vim
new file mode 100644
index 0000000..696bea1
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_condition/c.like.xpt.vim
@@ -0,0 +1,73 @@
+XPTemplate priority=like
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+
+
+" if () ** {
+XPTvar $BRif     ' '
+
+" } ** else {
+XPTvar $BRel     \n
+
+
+
+" int fun( ** arg ** )
+" if ( ** condition ** )
+XPTvar $SParg      ''
+
+" if ** (
+XPTvar $SPcmd       ' '
+
+" a = a ** + ** 1
+XPTvar $SPop       ' '
+
+XPTvar $VOID_LINE      /* void */;
+XPTvar $CURSOR_PH      /* cursor */
+
+XPT _if hidden
+if`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRif^{
+    `cursor^
+}
+
+XPT if wrap " if ( .. ) { .. }
+`Include:_if^
+
+XPT elif wrap " else if ( .. ) { .. }
+else `Include:_if^
+
+XPT else wrap " else { ... }
+else`$BRif^{
+    `cursor^
+}
+
+XPT ifn  alias=if	" if (.. == $NULL) {..} else...
+XSET condition=Embed('`a^`$SPop^==`$SPop^`$NULL^')
+
+XPT ifnn alias=if	" if (.. != $NULL) {..} else...
+XSET condition=Embed('`a^`$SPop^!=`$SPop^`$NULL^')
+
+XPT if0  alias=if	" if (.. == 0) {..} else...
+XSET condition=Embed('`a^`$SPop^==`$SPop^0')
+
+XPT ifn0 alias=if	" if (.. != 0) {..} else...
+XSET condition=Embed('`a^`$SPop^!=`$SPop^0')
+
+XPT ifee		" if (..) {..} else if...
+`:_if:^` `else_if...{{^`$BRel^`Include:elif^` `else_if...^`}}^
+
+XPT switch wrap	" switch (..) {case..}
+switch (`$SParg^`var^`$SParg^)`$BRif^{
+    `Include:case^
+}
+..XPT
+
+XPT case wrap	" case ..:
+case `constant^:
+    `cursor^
+    break;
+
+XPT default " default ..:
+default:
+    `cursor^
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_condition/ecma.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_condition/ecma.xpt.vim
new file mode 100644
index 0000000..8618b00
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_condition/ecma.xpt.vim
@@ -0,0 +1,28 @@
+XPTemplate priority=spec
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          true
+XPTvar $FALSE         false
+XPTvar $NULL          null
+XPTvar $UNDEFINED     undefined
+XPTvar $VOID_LINE     /* void */;
+XPTvar $BRif \n
+
+XPTinclude
+      \ _common/common
+      \ _condition/c.like
+
+
+" ========================= Function and Variables =============================
+
+
+" ================================= Snippets ===================================
+
+
+XPT ifu  alias=if	" if ($UNDEFINED == ..) {..} else...
+XSET condition=Embed('`$UNDEFINED^`$SPop^==`$SPop^`var^')
+
+
+XPT ifnu  alias=if	" if ($UNDEFINED == ..) {..} else...
+XSET condition=Embed('`$UNDEFINED^`$SPop^!=`$SPop^`var^')
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_condition/lisp.like.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_condition/lisp.like.xpt.vim
new file mode 100644
index 0000000..1480f60
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_condition/lisp.like.xpt.vim
@@ -0,0 +1,38 @@
+XPTemplate priority=like
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+XPTvar $VOID_LINE /* void */;
+XPTvar $BRif \n
+
+XPTinclude
+      \ _common/common
+
+
+" ========================= Function and Variables =============================
+
+
+" ================================= Snippets ===================================
+
+
+
+XPT if hint=(if\ (then)\ (else))
+(if [`condition^]
+    (`then^)
+    `else...{{^(`cursor^)`}}^)
+
+XPT when hint=(when\ cond\ ..)
+(when (`cond^)
+   (`todo0^)` `...^
+   (`todon^)` `...^)
+
+
+XPT unless hint=(unless\ cond\ ..)
+(unless (`cond^)
+   (`todo0^)` `...^
+   (`todon^)` `...^)
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_func/c.like.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_func/c.like.xpt.vim
new file mode 100644
index 0000000..550aaca
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_func/c.like.xpt.vim
@@ -0,0 +1,51 @@
+XPTemplate priority=like
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE           1
+XPTvar $FALSE          0
+XPTvar $NULL           NULL
+
+XPTvar $BRif           ' '
+XPTvar $BRloop         ' '
+XPTvar $BRstc          ' '
+XPTvar $BRfun          ' '
+
+XPTvar $VOID_LINE      /* void */;
+XPTvar $CURSOR_PH      /* cursor */
+
+XPTvar $CL  /*
+XPTvar $CM   *
+XPTvar $CR   */
+XPTinclude
+      \ _common/common
+
+fun! s:f.c_fun_type_indent()
+    if self[ '$BRfun' ] == "\n"
+        " let sts = &softtabstop == 0 ? &tabstop : &softtabstop
+        return '    '
+    else
+        return ""
+    endif
+endfunction
+
+fun! s:f.c_fun_body_indent()
+    if self[ '$BRfun' ] == "\n"
+        " let sts = &softtabstop == 0 ? &tabstop : &softtabstop
+        return self.ResetIndent( -&shiftwidth, "\n" )
+    else
+        return " "
+    endif
+endfunction
+
+XPT main hint=main\ (argc,\ argv)
+`c_fun_type_indent()^int`c_fun_body_indent()^main(`$SParg^int argc,`$SPop^char **argv`$SParg^)`$BRfun^{
+    `cursor^
+    return 0;
+}
+
+XPT fun wrap=curosr	hint=func..\ (\ ..\ )\ {...
+`c_fun_type_indent()^`int^`c_fun_body_indent()^`name^(`$SParg`param?`$SParg^)`$BRfun^{
+    `cursor^
+}
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_func/ecma.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_func/ecma.xpt.vim
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_loops/c.for.like.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_loops/c.for.like.xpt.vim
new file mode 100644
index 0000000..f289010
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_loops/c.for.like.xpt.vim
@@ -0,0 +1,39 @@
+XPTemplate priority=like
+
+XPTvar $BRloop        ' '
+
+" int fun( ** arg ** )
+" if ( ** condition ** )
+" for ( ** statement ** )
+" [ ** a, b ** ]
+" { ** 'k' : 'v' ** }
+XPTvar $SParg      ''
+
+" if ** (
+" while ** (
+" for ** (
+XPTvar $SPcmd      ' '
+
+" a ** = ** a ** + ** 1
+" (a, ** b, ** )
+XPTvar $SPop       ' '
+
+fun! s:f.c_strip_type()
+    let v = self.ItemValue()
+    echom v
+    echom substitute(v, '\V\^\_.*\s', 'g')
+    return substitute(v, '\V\^\_.*\s', 'g')
+endfunction
+
+XPT for wrap " for (..;..;++)
+for`$SPcmd^(`$SParg^`i^`$SPop^=`$SPop^`0^; `i^c_strip_type()^`$SPop^<`$SPop^`len^; `i^c_strip_type()^++`$SParg^)`$BRloop^{
+    `cursor^
+}
+
+XPT forr wrap " for (..;..;--)
+for`$SPcmd^(`$SParg^`i^`$SPop^=`$SPop^`n^; `i^`$SPop^>`=$SPop`0^; `i^--`$SParg^)`$BRloop^{
+    `cursor^
+}
+
+XPT forever " for (;;) ..
+for`$SPcmd^(;;) `cursor^
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_loops/c.while.like.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_loops/c.while.like.xpt.vim
new file mode 100644
index 0000000..714d40f
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_loops/c.while.like.xpt.vim
@@ -0,0 +1,37 @@
+XPTemplate priority=like
+
+
+XPTvar $TRUE       1
+XPTvar $FALSE      0
+XPTvar $NULL       NULL
+
+XPTvar $BRloop     ' '
+
+XPTvar $SParg      ' '
+XPTvar $SPcmd      ' '
+XPTvar $SPop       ' '
+
+
+
+
+XPT while wrap " while ( .. )
+while`$SPcmd^(`$SParg^`condition^`$SParg^)`$BRloop^{
+    `cursor^
+}
+
+XPT do wrap " do { .. } while ( .. )
+do`$BRloop^{
+    `cursor^
+}`$BRloop^while`$SPcmd^(`$SParg^`condition^`$SParg^);
+
+
+XPT while0 alias=do " do { .. } while ( $FALSE )
+XSET condition=Embed( $FALSE )
+
+
+XPT while1 alias=while " while ( $TRUE ) { .. }
+XSET condition=Embed( $TRUE )
+
+
+XPT whilenn alias=while " while ( $NULL != .. ) { .. }
+XSET condition=Embed( $NULL . $SPop . '!=' . $SPop . '`x^' )
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_loops/for.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_loops/for.xpt.vim
new file mode 100644
index 0000000..d1137e0
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_loops/for.xpt.vim
@@ -0,0 +1,68 @@
+"
+" standard for( i = 0; i < 10; i++ ) snippets
+"
+XPTemplate priority=all-
+
+let s:f = g:XPTfuncs()
+
+XPTvar $NULL            NULL
+XPTvar $BRloop          ' '
+
+
+XPTvar $SParg      ''
+XPTvar $SPcmd      ' '
+XPTvar $SPop       ' '
+
+XPTvar $VAR_PRE         ''
+XPTvar $FOR_SCOPE       ''
+
+XPTinclude
+      \ _common/common
+
+fun! s:f.c_strip_type()
+    let v = self.ItemValue()
+    return substitute(v, '\V\^\_.\*\s', '', 'g')
+endfunction
+
+XPT for wrap " for (..;..;++)
+for`$SPcmd^(`$SParg^`$FOR_SCOPE^`$VAR_PRE`i^`$SPop^=`$SPop^`0^; `i^c_strip_type()^`$SPop^<`$SPop^`len^; `i^c_strip_type()^++`$SParg^)`$BRloop^{
+    `cursor^
+}
+
+
+XPT forr wrap " for (..;..;--)
+for`$SPcmd^(`$SParg^`$FOR_SCOPE^`$VAR_PRE`i^`$SPop^=`$SPop^`0^; `i^c_strip_type()^`$SPop^>`=$SPop`end^; `i^c_strip_type()^--`$SParg^)`$BRloop^{
+    `cursor^
+}
+
+
+XPT fornn wrap " for (..; $NULL != var; .. )
+for`$SPcmd^(`$SParg^`$FOR_SCOPE^`$VAR_PRE`ptr^`$SPop^=`$SPop^`init^; `$NULL^`$SPop^!=`$SPop^`ptr^; `^R('ptr')^`$SParg^)`$BRloop^{
+    `cursor^
+}
+
+
+XPT forever " for (;;) ..
+for`$SPcmd^(;;) `cursor^
+..XPT
+
+" Simplify
+" XSET i|edgeLeft=$VAR_PRE
+" XSET i|edgeRight=$VAR_PRE
+" XSET $(=  ($SParg
+" XSET $)=  $SParg)
+" XSET $==  $SPop=$SPop
+" XSET $>=  $SPop>
+" XSET $e=  =$SPop
+
+" for`$SPcmd`$(`$FOR_SCOPE``i`$=`0; `i`$>`$e`end; `i++`$)`$BRloop{
+" ^
+" ..XPT
+"
+" for`SP(`SP`FOR_SCOPE`i`SP=`SP`0;`SP`i`SP>`SP`end;`SP`i++`SP)`SP{
+"
+" for$ ($ $FOR_SCOPE$i$ =$ $0;$ $i$ >$ $end;$ $i++$ )$ {
+"
+" for$ ($ $FOR_SCOPE${$VAR_PRE `i`}$ =$ $0;$ $i$ >$ $end;$ $i++$ )$ {
+"
+" for` (` `FOR_SCOPE`{$VAR_PRE `i`}` =` `0;` `{i/\v(\S+)$/\1/}` >` `{end:0::post=::focus=::live=};` `i++` )` {
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_loops/foreach.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_loops/foreach.xpt.vim
new file mode 100644
index 0000000..e69de29
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_loops/java.for.like.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_loops/java.for.like.xpt.vim
new file mode 100644
index 0000000..749d4d9
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_loops/java.for.like.xpt.vim
@@ -0,0 +1,23 @@
+XPTemplate priority=like-
+
+" containers
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          true
+XPTvar $FALSE         false
+XPTvar $NULL          null
+XPTvar $BRif
+XPTvar $VOID_LINE /* void */;
+
+" ================================= Snippets ===================================
+
+XPT for " for i++
+for`$SPcmd^(`$SParg^`int^ `i^`$SPop^=`$SPop^`0^; `i^`$SPop^<`$SPop^`len^; ++`i^`$SParg^)`$BRloop^{
+    `cursor^
+}
+
+XPT forr "for i--
+for`$SPcmd^(`$SParg^`int^ `i^`$SPop^=`$SPop^`n^; `i^`$SPop^>`=^`$SPop^`end^; --`i^`$SParg^)`$BRloop^{
+    `cursor^
+}
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_preprocessor/c.like.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_preprocessor/c.like.xpt.vim
new file mode 100644
index 0000000..de0189c
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_preprocessor/c.like.xpt.vim
@@ -0,0 +1,48 @@
+XPTemplate priority=like
+
+let s:f = g:XPTfuncs()
+
+
+XPTinclude
+      \ _common/common
+
+
+
+
+XPT #inc		" include <>
+#include <`^.h>
+
+
+XPT #include_user	" include ""
+XSET me=fileRoot()
+#include "`me^.h"
+
+
+XPT #ind alias=#include_user
+
+
+XPT #if wrap " #if ..
+#if `0^
+`cursor^
+#endif
+
+
+XPT #ifdef wrap " #ifdef ..
+#ifdef `symbol^
+`cursor^
+#endif `$CL^ `symbol^ `$CR^
+
+
+XPT #ifndef wrap	" #ifndef ..
+#ifndef `symbol^
+`cursor^
+#endif `$CL^ `symbol^ `$CR^
+
+
+XPT once wrap	" #ifndef .. #define ..
+XSET symbol=headerSymbol()
+#ifndef `symbol^
+#     define `symbol^
+
+`cursor^
+#endif `$CL^ `symbol^ `$CR^
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_printf/c.like.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_printf/c.like.xpt.vim
new file mode 100644
index 0000000..f2fff42
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_printf/c.like.xpt.vim
@@ -0,0 +1,105 @@
+XPTemplate priorit=like
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+" a ** = ** a ** + ** 1
+" (a, ** b, ** )
+XPTvar $SPop       ' '
+
+
+
+
+
+
+" if () ** {
+" else ** {
+XPTvar $BRif     ' '
+
+" } ** else {
+XPTvar $BRel     \n
+
+" for () ** {
+" while () ** {
+" do ** {
+XPTvar $BRloop   ' '
+
+" struct name ** {
+XPTvar $BRstc    ' '
+
+" int fun() ** {
+" class name ** {
+XPTvar $BRfun    ' '
+
+XPTinclude
+      \ _common/common
+
+let s:printfElts = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+"  %[flags][width][.precision][length]specifier
+let s:printfItemPattern = '\V\C' . '%' . '\[+\- 0#]\*' . '\%(*\|\d\+\)\?' . '\(.*\|.\d\+\)\?' . '\[hlL]\?' . '\(\[cdieEfgGosuxXpn]\)'
+
+let s:printfSpecifierMap = {
+      \'c' : 'char',
+      \'d' : 'int',
+      \'i' : 'int',
+      \'e' : 'scientific',
+      \'E' : 'scientific',
+      \'f' : 'float',
+      \'g' : 'float',
+      \'G' : 'float',
+      \'o' : 'octal',
+      \'s' : 'str',
+      \'u' : 'unsigned',
+      \'x' : 'decimal',
+      \'X' : 'Decimal',
+      \'p' : 'pointer',
+      \'n' : 'numWritten',
+      \}
+
+fun! s:f.c_printf_elts( v, sep )
+
+    " remove '%%' representing a single '%'
+
+    let v = substitute( a:v, '\V%%', '', 'g' )
+
+    let [ ml, mr ] = XPTmark()
+
+    if v =~ '\V%'
+
+        let start = 0
+        let post = ''
+        let i = -1
+        while 1
+            let i += 1
+
+            let start = match( v, s:printfItemPattern, start )
+            if start < 0
+                break
+            endif
+
+            let eltList = matchlist( v, s:printfItemPattern, start )
+
+            if eltList[1] == '.*'
+                " need to specifying string length before string pointer
+                let post .= a:sep . self.GetVar( '$SPop' ) . ml . s:printfElts[ i ] . '_len' . mr
+            endif
+
+            let post .= a:sep . self.GetVar( '$SPop' ) . ml . s:printfElts[ i ] . '_' . s:printfSpecifierMap[ eltList[2] ] . mr
+
+            let start += len( eltList[0] )
+
+        endwhile
+        return post
+
+    else
+        return self.Next( '' )
+
+    endif
+endfunction
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/_structures/c.like.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/_structures/c.like.xpt.vim
new file mode 100644
index 0000000..e58e1b8
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/_structures/c.like.xpt.vim
@@ -0,0 +1,22 @@
+XPTemplate priority=like
+
+
+XPTvar $BRstc         ' '
+
+
+let s:f = g:XPTfuncs()
+
+
+
+
+XPT enum hint=enum\ {\ ..\ }
+XSET postQuoter={,}
+enum `name^`$BRstc^{
+    `^
+}
+
+
+XPT struct hint=struct\ {\ ..\ }
+struct `structName^`$BRstc^{
+    `^
+}
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/actionscript/actionscript.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/actionscript/actionscript.xpt.vim
new file mode 100644
index 0000000..c5f155f
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/actionscript/actionscript.xpt.vim
@@ -0,0 +1,31 @@
+XPTemplate priority=lang
+
+" XPTvar $TRUE          1
+" XPTvar $FALSE         0
+" XPTvar $NULL          NULL
+" XPTvar $UNDEFINED     NULL
+
+
+XPTinclude
+    \ _common/common
+
+XPTvar $CL    /*
+XPTvar $CM    *
+XPTvar $CR    */
+XPTvar $CS    //
+XPTinclude
+    \ _comment/singleDouble
+
+XPTinclude
+      \ _condition/ecma
+
+" ========================= Function and Variables =============================
+
+" ================================= Snippets ===================================
+
+XPT fun wrap " function ..( .. ) {..}
+XSET arg*|post=ExpandIfNotEmpty(', ', 'arg*')
+function` `name^ (`arg*^) {
+    `cursor^
+}
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/ada/ada.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/ada/ada.xpt.vim
new file mode 100644
index 0000000..888cb45
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/ada/ada.xpt.vim
@@ -0,0 +1,134 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+XPTvar $VOID_LINE /* void */;
+XPTvar $BRif \n
+
+XPTinclude
+      \ _common/common
+
+
+" ========================= Function and Variables =============================
+
+
+" ================================= Snippets ===================================
+
+
+XPT acc " access
+access 
+..XPT
+
+XPT ali " aliased
+aliased 
+..XPT
+
+XPT beg " begin .. end;
+begin
+        `cursor^
+end;
+..XPT
+
+XPT case " case .. is .. end case;
+case `1^ is
+        `cursor^
+end case;
+..XPT
+
+XPT eli " elsif .. then ...
+elsif `1^ then
+        `cursor^
+..XPT
+
+XPT for " for .. in .. loop ... end loop;
+for `1^ in `2^ loop
+        `cursor^
+end loop;
+..XPT
+
+XPT fun " function .. return .. is ..._ end;
+function `1^name^ return `2^ is
+        `3^
+begin -- `1^
+        `cursor^
+end `1^;
+..XPT
+
+XPT if " if .. then ... end if;
+if `1^ then
+        `cursor^
+end if;
+..XPT
+
+XPT loop " loop .. end loop;
+loop
+        `cursor^
+end loop;
+..XPT
+
+XPT pbo " package body .. is .. end ;
+package body `1^name^ is
+        `cursor^
+end `1^;
+..XPT
+
+XPT pac " package .. is .. end;
+package `1^name^ is
+        `cursor^
+end `1^;
+..XPT
+
+XPT pne " package .. is ..
+package `1^ is `cursor^
+..XPT
+
+XPT pro " procedure .. begin .. end;
+procedure `1^Procedure^ is
+        `2^
+begin -- `mark^S(R('1'),'([a-zA-Z0-9_]*).*$','\1')^
+        `cursor^
+end `mark^;
+..XPT
+
+XPT rec " record .. end record;
+record
+        `cursor^
+end record;
+..XPT
+
+XPT ret " return ..;
+return `1^;
+..XPT
+
+XPT ty " type .. is ..;
+type `1^ is `cursor^
+..XPT
+
+XPT u " use ..;
+use `1^;
+..XPT
+
+XPT when " when .. => ..
+when `1^ =>
+        `cursor^
+..XPT
+
+XPT whi " while .. loop .. end loop;
+while `1^ loop
+        `cursor^
+end loop;
+..XPT
+
+XPT wu " with ..; use ..;
+with `what^; use `1^;
+`cursor^
+..XPT
+
+XPT w " with ..;
+with `1^;
+..XPT
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/c/autoimplem.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/c/autoimplem.xpt.vim
new file mode 100644
index 0000000..632ff0b
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/c/autoimplem.xpt.vim
@@ -0,0 +1,78 @@
+" finish " not finished
+if !g:XPTloadBundle( 'c', 'autoimplem' ) && !exists('g:cppautoimplemneedc') && !exists('g:objcautoimlemneedc')
+    finish
+endif
+
+XPTemplate priority=lang-2
+
+let s:f = g:XPTfuncs()
+
+" ========================== Support functions ======================
+let s:defaultImpl = { 'void'  : ''
+                   \, 'int'   : "\treturn 0;"
+                   \, 'unsigned int'   : "\treturn 0;"
+                   \, 'short' : "\treturn 0;"
+                   \, 'unsigned short' : "\treturn 0;"
+                   \, 'char'  : "\treturn '\0';"
+                   \, 'unsigned char'  : "\treturn '\0';"
+                   \, 'double': "\treturn 0.0;"
+                   \, 'float' : "\treturn 0.0f;"
+                   \, 'bool'  : "\treturn false;"
+                   \}
+
+let s:f.todoText = "\t/* TODO : implement here */"
+
+fun! s:f.GetDefaultImplementation( type )
+
+    if has_key( s:defaultImpl, a:type )
+        return s:defaultImpl[ a:type ]
+    endif
+
+    " check if type is a pointer.
+    if a:type =~ '.*\*$'
+        return "\treturn NULL;"
+    endif
+
+    return ''
+endfunction
+
+fun! s:f.GetImplementationFile() "{{{
+    let name = expand('%:p')
+    
+    if name =~ '\.h$'
+        let name = substitute( name, 'h$', '[cC]*', '' )
+    elseif name =~ '\.hpp$'
+        let name = substitute( name, 'hpp$', '[cC]*', '' )
+    endif
+
+    return glob( name )
+endfunction "}}}
+
+fun! s:f.WriteFunToCpp() " {{{
+    let imple = s:f.GetImplementationFile()
+    if imple == ''
+        return
+    endif
+
+    let retType = self.R('retType')
+    let funName = self.R('funName')
+
+    let args = self.R( 'args' )
+    let methodBody = [ retType . ' ' . funName . '(' . args . ')'
+                   \ , '{'
+                   \ , s:f.todoText
+                   \ , s:f.GetDefaultImplementation( retType )
+                   \ , '}'
+                   \ , '' ]
+
+    let txt = extend( readfile( imple ), methodBody )
+    call writefile( txt, imple )
+
+    return args
+endfunction " }}}
+
+" ================================= Snippets ===================================
+XPT hfun " create proto in h and implementation in .c/.cc/.cpp
+`retType^ `funName^( `args^WriteFunToCpp()^^);
+..XPT
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/c/c.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/c/c.xpt.vim
new file mode 100644
index 0000000..d970cb8
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/c/c.xpt.vim
@@ -0,0 +1,110 @@
+XPTemplate priority=lang
+
+
+XPTvar $TRUE           1
+XPTvar $FALSE          0
+XPTvar $NULL           NULL
+
+XPTvar $BRif           ' '
+XPTvar $BRloop         ' '
+XPTvar $BRstc          ' '
+XPTvar $BRfun          ' '
+
+XPTvar $VOID_LINE      /* void */;
+XPTvar $CURSOR_PH      /* cursor */
+
+XPTinclude
+      \ _common/common
+
+XPTvar $CL  /*
+XPTvar $CM   *
+XPTvar $CR   */
+XPTinclude
+      \ _comment/doubleSign
+
+XPTinclude
+      \ _condition/c.like
+      \ _func/c.like
+      \ _loops/c.while.like
+      \ _preprocessor/c.like
+      \ _structures/c.like
+      \ _printf/c.like
+
+XPTinclude
+      \ _loops/for
+
+
+let s:f = g:XPTfuncs()
+
+
+
+XPT _printfElts hidden 
+XSET elts|pre=Echo('')
+XSET elts=c_printf_elts( R( 'pattern' ), ',' )
+"`pattern^"`elts^
+
+
+XPT printf	" printf\(...)
+printf(`$SParg^`:_printfElts:^`$SParg^)
+
+
+XPT sprintf	" sprintf\(...)
+sprintf(`$SParg^`str^,`$SPop^`:_printfElts:^`$SParg^)
+
+
+XPT snprintf	" snprintf\(...)
+snprintf(`$SParg^`str^,`$SPop^`size^,`$SPop^`:_printfElts:^`$SParg^)
+
+
+XPT fprintf	" fprintf\(...)
+fprintf(`$SParg^`stream^,`$SPop^`:_printfElts:^`$SParg^)
+
+XPT memcpy " memcpy (..., ..., sizeof (...) ... )
+memcpy(`$SParg^`dest^,`$SPop^`source^,`$SPop^sizeof(`type^int^)`$SPop^*`$SPop^`count^`$SParg^)
+
+XPT memset " memset (..., ..., sizeof (...) ... )
+memset(`$SParg^`buffer^,`$SPop^`what^0^,`$SPop^sizeof(`$SParg^`type^int^`$SParg^)`$SPop^*`$SPop^`count^`$SParg^)
+
+XPT malloc " malloc ( ... );
+(`type^int^*)malloc(`$SParg^sizeof(`$SParg^`type^`$SParg^)`$SPop^*`$SPop^`count^`$SParg^)
+
+XPT assert	" assert (.., msg)
+assert(`$SParg^`isTrue^,`$SPop^"`text^"`$SParg^)
+
+
+XPT fcomment
+/**
+ * @author : `$author^ | `$email^
+ * @description
+ *     `cursor^
+ * @return {`int^} `desc^
+ */
+
+
+XPT para syn=comment	" comment parameter
+@param {`Object^} `name^ `desc^
+
+XPT filehead
+XSET cursor|pre=CURSOR
+/**-------------------------/// `sum^ \\\---------------------------
+ *
+ * <b>`function^</b>
+ * @version : `1.0^
+ * @since : `date()^
+ *
+ * @description :
+ *     `cursor^
+ * @usage :
+ *
+ * @author : `$author^ | `$email^
+ * @copyright `.com.cn^
+ * @TODO :
+ *
+ *--------------------------\\\ `sum^ ///---------------------------*/
+
+..XPT
+
+
+XPT call wraponly=param " ..( .. )
+`name^(`$SParg^`param^`$SParg^)
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/c/c99.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/c/c99.xpt.vim
new file mode 100644
index 0000000..8f12e1e
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/c/c99.xpt.vim
@@ -0,0 +1,12 @@
+" C99 relax some variable definition rules
+" allowing to use C++/Java style for loop
+if !g:XPTloadBundle( 'c', 'c99' )
+    finish
+endif
+
+XPTemplate priority=sub
+
+XPTinclude
+      \ _common/common
+      \ _loops/java.for.like
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/cabal/cabal.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/cabal/cabal.xpt.vim
new file mode 100644
index 0000000..0564193
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/cabal/cabal.xpt.vim
@@ -0,0 +1,58 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+XPTvar $VOID_LINE /* void */;
+XPTvar $BRif \n
+
+XPTinclude
+      \ _common/common
+
+
+" ========================= Function and Variables =============================
+
+
+" ================================= Snippets ===================================
+
+
+XPT infos hint=Name:\ Version\:\ Synopsys:\ Descr:\ Author:\ ...
+XSET Description...|post=\nDescription: `_^
+XSET Author...|post=\nAuthor: `_^
+XSET Maintainer...|post=\nMaintainer: `_^
+Name:       `name^
+Version:    `version^
+Synopsis:   `synop^
+Build-Type: `Simple^
+Cabal-Version: >= `ver^1.2^`
+`Description...^`
+`Author...^`
+`Maintainer...^
+
+XPT if hint=if\ ...\ else\ ...
+if `cond^
+    `what^
+`else...{{^else
+    `cursor^`}}^
+
+
+XPT lib hint=library\ Exposed-Modules...
+XSET another*|post=ExpandIfNotEmpty( ', ', 'another*' )
+library
+  Exposed-Modules: `job^`
+                   `more...{{^
+                   `job^`
+                   `...{{^
+                   `job^`
+                   `...^`}}^`}}^
+  Build-Depends: base >= `ver^2.0^`, `another*^
+
+XPT exe hint=Main-Is:\ ..\ Build-Depends
+XSET another*|post=ExpandIfNotEmpty( ', ', 'another*' )
+Executable `execName^
+    Main-Is: `mainFile^
+    Build-Depends: base >= `ver^2.0^`, `another*^
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/cg/cg.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/cg/cg.xpt.vim
new file mode 100644
index 0000000..e4fb101
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/cg/cg.xpt.vim
@@ -0,0 +1,105 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+" if () ** {
+" else ** {
+XPTvar $BRif     '\n'
+
+" } ** else {
+XPTvar $BRel     \n
+
+" for () ** {
+" while () ** {
+" do ** {
+XPTvar $BRloop   '\n'
+
+" struct name ** {
+XPTvar $BRstc    '\n'
+
+" int fun() ** {
+" class name ** {
+XPTvar $BRfun    '\n'
+
+XPTinclude
+    \ _common/common
+    \ _condition/c.like
+    \ _loops/c.for.like
+    \ _loops/c.while.like
+    \ _preprocessor/c.like
+
+
+" ========================= Function and Variables =============================
+
+" ================================= Snippets ===================================
+XPT fun " fun ( .. )
+`type^ `name^(
+             )
+{
+    `cursor^
+}
+
+
+XPT tech " technique ..
+technique `techName^
+{
+    `cursor^
+};
+
+
+XPT pass " pass ..
+XSET vtarget=Choose(['arbvp1', 'vs_2_x', 'vs_3_0', 'vs_4_0', 'vp20', 'vp30', 'vp40', 'gp4vp', 'hlslv', 'glslv'])
+XSET ftarget=Choose(['arbfp1', 'ps_2_x', 'ps_3_0', 'ps_4_0', 'fp20', 'fp30', 'fp40', 'gp4fp', 'hlslf', 'glslf'])
+XSET gtarget=Choos(['gp4gp', 'gs_4_0', 'glslg'])
+pass `passName^ {`common...{{^
+    VertexProgram = `compilev...{{^compile `vtarget^ `main^main^`}}^;
+    FragmentProgram = `compilef...{{^compile `ftarget^ `main^main^`}}^;`GeometryProgram...{{^
+    GeometryProgram = `compilef...{{^compile `gtarget^ `main^main^`}}^;`}}^
+    `}}^`cursor^
+};
+
+
+XPT interface " interface .. { .. }
+interface `interfaceName^
+{
+    `cursor^
+};
+
+
+XPT vertexProg " main vertex programm
+XSET vout=Choose(['COLOR0', 'COLOR1', 'TEXCOORD0', 'TEXCOORD1', 'PSIZE'])
+XSET vin=Choose(['POSITION', 'NORMAL', 'DIFFUSE', 'SPECULAR', 'TEXCOORD0', 'TEXCOORD1', 'TANGENT', 'BINORMAL', 'FOGCOORD'])
+void main( `inputs...^ float`n^ `name^ : `vin^,
+        `inputs...^float4 `position^ : POSITION`outputs...^,
+        out float4 `name^ : `vout^`outputs...^ )
+{
+    `cursor^
+}
+
+
+XPT fragProg " main vertex programm
+XSET vin=Choose(['COLOR0', 'COLOR1', 'TEXCOORD0', 'TEXCOORD1', 'WPOS'])
+void main( `inputs...^ float`n^ `name^ : `vin^,
+        `inputs...^float4 `color^ : COLOR`depth...{{^,
+        out float4 `name^ : DEPTH`}}^ )
+{
+    `cursor^
+}
+
+
+
+XPT struct " struct .. { .. }
+struct `structName^`inherit...{{^ : `interfaceName^`}}^
+{
+    `cursor^
+};
+
+
+
+" ================================= Wrapper ===================================
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/cmake/cmake.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/cmake/cmake.xpt.vim
new file mode 100644
index 0000000..e0ef8e9
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/cmake/cmake.xpt.vim
@@ -0,0 +1,38 @@
+XPTemplate priority=lang
+
+XPTinclude
+    \ _common/common
+
+XPT if " if ( cond )...
+if ( `cond^ )
+    `cursor^
+`else...{{^else( `cond^ )
+`}}^endif( `cond^ )
+..XPT
+
+XPT foreach " foreach\(...) ... endofreach\( ... )
+foreach (`varname^ `collection^)
+    `cursor^
+endforeach(`varname^)
+
+XPT set " set\(... ...)
+set(`varname^ `cursor^)
+
+XPT msg " message\("...")
+message("`cursor^")
+
+XPT function " function\(...) ... endfunction\(...)
+function(`funcName^ `params^)
+    `cursor^
+endfunction(`funcName^)
+
+XPT macro " macro\(...) ... endmacro\(...)
+macro( `macroName^ `params^ )
+    `cursor^
+endmacro( `macroName^ )
+
+XPT while " while\(...) ... endwhile\(...)
+while( `condition^ )
+    `cursor^
+enwhile( `condition^ )
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/cpp/autoimplem.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/cpp/autoimplem.xpt.vim
new file mode 100644
index 0000000..1bd3bdd
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/cpp/autoimplem.xpt.vim
@@ -0,0 +1,256 @@
+" finish " not finished
+if !g:XPTloadBundle( 'cpp', 'autoimplem' )
+    finish
+endif
+
+XPTemplate priority=lang-2
+
+let s:f = g:XPTfuncs()
+
+" To force loading the version (we need it)
+let g:cppautoimplemneedc = 1
+
+XPTinclude
+    \ _common/common
+    \ c/autoimplem
+
+" ========================== Support functions ======================
+" Count the number of blanck character before anything interesting
+" has happened
+fun! s:CalculateIndentation( ln ) "{{{
+    let i = 0
+    let spacecount = 0
+    let maxi = len( a:ln )
+
+    while i < maxi
+        let c = (a:ln)[i]
+        if c == ' '
+            let spacecount = spacecount + 1
+        elseif c == '\t'
+            let spacecount = spacecount + &tabstop
+        else
+            break
+        endif
+
+        let i = i + 1
+    endwhile
+
+    return i
+endfunction "}}}
+
+fun! s:f.GetLastStructClassDeclaration() "{{{
+    let lineNum = line('.')
+    let ourIndentation = s:CalculateIndentation( getline( lineNum ))
+
+    let lineNum = lineNum - 1
+
+    while lineNum >= 0
+        let txt = getline( lineNum )
+
+        if txt =~ '\(struct\)\|\(class\)'
+            if s:CalculateIndentation( txt ) < ourIndentation
+                return substitute( txt, '\s*\(\(struct\)\|\(class\)\)\s\+\(\S\+\).*', '\4', '' )
+            endif
+        endif
+
+        let lineNum = lineNum - 1
+    endwhile
+
+    return ""
+endfunction "}}}
+
+fun! s:f.WriteCtorToCpp() " {{{
+    let imple = s:f.GetImplementationFile()
+    if imple == ''
+        return
+    endif
+
+    let englobingClass = self.R('className')
+
+    let args = self.R( 'ctorArgs' )
+    let methodBody = [ englobingClass . '::' . englobingClass . '(' . args . ')'
+                   \ , '{'
+                   \ , s:f.todoText
+                   \ , '}'
+                   \ , '' ]
+
+    let txt = extend( readfile( imple ), methodBody )
+    call writefile( txt, imple )
+
+    return args
+endfunction " }}}
+
+fun! s:f.WriteDtorToCpp() " {{{
+    let imple = s:f.GetImplementationFile()
+    if imple == ''
+        return
+    endif
+
+    let englobingClass = self.R('className')
+
+    let methodBody = [ englobingClass . '::~' . englobingClass . '()'
+                   \ , '{'
+                   \ , s:f.todoText
+                   \ , '}'
+                   \ , '' ]
+
+    let txt = extend( readfile( imple ), methodBody )
+    call writefile( txt, imple )
+
+    return ''
+endfunction " }}}
+
+fun! s:f.WriteStaticToCpp()
+    let name = self.R('name')
+
+    let imple = s:f.GetImplementationFile()
+    if imple == ''
+        return name
+    endif
+
+    let englobingClass = self.GetLastStructClassDeclaration()
+    if englobingClass == ''
+        return name
+    endif
+
+    let methodBody = [ self.R('fieldType') . '    ' . englobingClass . '::' . name . ';' ]
+
+    let txt = extend( readfile( imple ), methodBody )
+    call writefile( txt, imple )
+
+    return name
+endfunction
+
+fun! s:f.WriteCopyCtorToCpp() " {{{
+    let cpy = self.R('cpy')
+
+    let imple = s:f.GetImplementationFile()
+    if imple == ''
+        return cpy
+    endif
+
+    let englobingClass = self.R('className')
+
+    let methodBody = [ englobingClass . '::' . englobingClass . '( const ' . englobingClass . ' &' . cpy . ' )'
+                   \ , '{'
+                   \ , s:f.todoText
+                   \ , '}'
+                   \ , '' ]
+
+    let txt = extend( readfile( imple ), methodBody )
+    call writefile( txt, imple )
+
+    return cpy
+endfunction " }}}
+
+fun! s:f.WriteMethodToCpp() "{{{
+    let imple = s:f.GetImplementationFile()
+    if imple == ''
+        return ''
+    endif
+
+    let englobingClass = self.GetLastStructClassDeclaration()
+    if englobingClass == ''
+        return ''
+    endif
+
+    let args = self.R( 'args' )
+    let constness = self.R( 'const?...' )
+    let retType = self.R( 'retType' )
+    let methodBody = [ retType . ' ' . englobingClass . '::' . self.R('funcName')
+                                \ . '(' . args . ')' . constness
+                   \ , '{'
+                   \ , s:f.todoText
+                   \ , s:f.GetDefaultImplementation( retType )
+                   \ , '}'
+                   \ , '' ]
+
+    let txt = extend( readfile( imple ), methodBody )
+    call writefile( txt, imple )
+
+    return ''
+endfunction "}}}
+
+fun! s:f.WriteOpOverloadToCpp()
+    let imple = s:f.GetImplementationFile()
+    if imple == ''
+        return ''
+    endif
+
+    let englobingClass = self.GetLastStructClassDeclaration()
+    if englobingClass == ''
+        return ''
+    endif
+
+    let inputType = self.R( 'inputType' )
+    let argName = self.R('inName' )
+    let constness = self.R( 'const?...' )
+    let retType = self.R( 'retType' )
+    let methodBody = [ retType . ' ' . englobingClass . '::operator ' . self.R('opName')
+                                \ . '( const ' . inputType . ' ' . argName . ' )' . constness
+                   \ , '{'
+                   \ , s:f.todoText
+                   \ , s:f.GetDefaultImplementation( retType )
+                   \ , '}'
+                   \ , '' ]
+
+    let txt = extend( readfile( imple ), methodBody )
+    call writefile( txt, imple )
+
+    return ''
+    
+endfunction
+
+" ================================= Snippets ===================================
+
+XPT hstatic " Static field + implementation
+XSET name|post=WriteStaticToCpp()
+static `fieldType^     `name^;
+..XPT
+
+XPT hmethod " class method + implementation
+XSET cursor=WriteMethodToCpp()
+`retType^   `funcName^( `args^ )`const?...{{^ const`}}^;`cursor^
+..XPT
+
+XPT hstruct " struct with skeletons written into .cpp
+struct `className^
+{
+    `constructor...{{^`^R('className')^( `ctorArgs^WriteCtorToCpp()^^ );
+    `}}^`destructor...{{^~`^R('className')^(`^WriteDtorToCpp()^^);
+    `}}^`copy constructor...{{^`^R('className')^( const `^R('className')^ &`cpy^WriteCopyCtorToCpp()^^ );
+    `}}^`cursor^
+};
+..XPT
+
+XPT hclass " class with skeletons written into .cpp
+XSET heritageQualifier=Choose(['public', 'private', 'protected'])
+class `className^`inherit?...{{^ : `heritageQualifier^ `fatherName^`}}^
+{
+public:
+    `constructor...{{^`^R('className')^( `ctorArgs^WriteCtorToCpp()^^ );
+    `}}^`destructor...{{^~`^R('className')^(`^WriteDtorToCpp()^^);
+    `}}^`copy constructor...{{^`^R('className')^( const `^R('className')^ &`cpy^WriteCopyCtorToCpp()^^ );
+    `}}^`cursor^
+private:
+};
+..XPT
+
+XPT hctor " Class constructor writing skeleton to cpp
+`className^GetLastStructClassDeclaration()^( `ctorArgs^WriteCtorToCpp()^^ );
+..XPT
+
+XPT hdtor " Class destructor writing skeleton to cpp
+XSET cursor=WriteDtorToCpp()
+~`className^GetLastStructClassDeclaration()^();`cursor^
+..XPT
+
+XPT hcopyctor " Class copy constructor writing skeleton to cpp
+`className^GetLastStructClassDeclaration()^( const `className^& `cpy^WriteCopyCtorToCpp()^^ );
+..XPT
+
+XPT hoperator " operator overloading writing skeleton to cpp
+XSET cursor=WriteOpOverloadToCpp()
+`retType^GetLastStructClassDeclaration()&^  operator `opName^( const `inputType^GetLastStructClassDeclaration()&^ `inName^ )`const?...{{^ const`}}^;`cursor^
+..XPT
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/cpp/cpp.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/cpp/cpp.xpt.vim
new file mode 100755
index 0000000..306af76
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/cpp/cpp.xpt.vim
@@ -0,0 +1,177 @@
+XPTemplate priority=sub
+
+" Setting priority of cpp to "sub" or "subset of language", makes it override
+" all c snippet if conflict
+
+
+
+XPTvar $TRUE          true
+XPTvar $FALSE         false
+XPTvar $NULL          NULL
+
+XPTvar $BRif     \n
+XPTvar $BRloop    \n
+XPTvar $BRloop  \n
+XPTvar $BRstc \n
+XPTvar $BRfun   \n
+
+XPTvar $VOID_LINE  /* void */;
+XPTvar $CURSOR_PH      /* cursor */
+
+XPTvar $CL  /*
+XPTvar $CM   *
+XPTvar $CR   */
+
+XPTvar $CS   //
+
+
+
+XPTinclude
+      \ _common/common
+      \ _comment/singleDouble
+      \ _condition/c.like
+      \ _func/c.like
+      \ _loops/c.while.like
+      \ _loops/java.for.like
+      \ _preprocessor/c.like
+      \ _structures/c.like
+XPTinclude
+            \ c/c
+
+" ========================= Function and Variables =============================
+let s:f = g:XPTfuncs()
+
+function! s:f.cleanTempl( ctx, ... )
+  let cleaned = substitute( a:ctx, '\s*\(class\|typename\|int\|long\)\s*', '', 'g' )
+  return cleaned
+endfunction
+
+
+" ================================= Snippets ===================================
+
+XPT all  " ..begin, ..end,
+`v^.begin(), `v^.end(), `cursor^
+
+
+XPT vector " std::vector<..> ..;
+std::vector<`type^> `var^;
+`cursor^
+
+
+XPT map " std::map<..,..> ..;
+std::map<`typeKey^,`val^>   `name^;
+`cursor^
+
+XPT class   " class ..
+class `className^`$BRfun^{
+public:
+    `className^(`$SParg`ctorParam?`$SParg^);
+    ~`className^();
+    `className^(`$SParg^const `className^ &cpy`$SParg^);
+    `cursor^
+private:
+};
+
+`className^::`className^(`ctorParam?^)`$BRfun^{
+}
+
+`className^::~`className^()`$BRfun^{
+}
+
+`className^::`className^(`$SParg^gconst `className^ &cpy`$SParg^)`$BRfun^{
+}
+..XPT
+
+XPT functor " class operator..
+struct `className^
+{
+    `closure...{{^`type^  `what^;
+    `_^R('className')^( `type^ n`what^ ) : `what^( n`what^ ) {}
+
+    `}}^`outType^   operator() ( `params^ )
+    {
+        `cursor^
+    }
+};
+..XPT
+
+XPT namespace " namespace {}
+namespace `name^
+{
+    `cursor^
+}
+..XPT
+
+XPT icastop " operator type ..
+operator `typename^ ()
+    { return `cursor^; }
+..XPT
+
+XPT castop " operator type ..
+operator `typename^ ();
+
+
+`className^::operator `typename^ ();
+    { return `cursor^; }
+..XPT
+
+XPT iop " t operator .. ()
+`type^ operator `opName^ ( `args^ )`$BRfun^{
+    `cursor^
+}
+..XPT
+
+XPT op " t operator .. ()
+`type^ operator `opName^ ( `args^ );
+
+`type^ `className^::operator `opName^ ( `args^ )`$BRfun^{
+}
+..XPT
+
+XPT templateclass   " template <> class
+template
+    <`templateParam^>
+class `className^`$BRfun^{
+public:
+    `className^(`$SParg`ctorParam?`$SParg^);
+    ~`className^();
+    `className^(`$SParg^const `className^ &cpy`$SParg^);
+    `cursor^
+private:
+};
+
+template <`templateParam^>
+`className^<`_^cleanTempl(R('templateParam'))^^>::`className^(`ctorParam?^)`$BRfun^{
+}
+
+template <`templateParam^>
+`className^<`_^cleanTempl(R('templateParam'))^^>::~`className^()`$BRfun^{
+}
+
+template <`templateParam^>
+`className^<`_^cleanTempl(R('templateParam'))^^>::`className^(`$SParg^gconst `className^ &cpy`$SParg^)`$BRfun^{
+}
+..XPT
+
+XPT try wrap=what " try .. catch..
+try
+{
+    `what^
+}`$BRel^`Include:catch^
+
+XPT catch " catch\( .. )
+catch ( `except^ )
+{
+    `cursor^
+}
+
+XPT externc wrap " #ifdef C++.... extern "c"...
+#ifdef __cplusplus
+extern "C" {
+#endif
+`cursor^
+#ifdef __cplusplus
+}
+#endif
+..XPT
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/cs/cs.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/cs/cs.xpt.vim
new file mode 100755
index 0000000..6fac91a
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/cs/cs.xpt.vim
@@ -0,0 +1,113 @@
+XPTemplate priority=lang-
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          true
+XPTvar $FALSE         false
+XPTvar $NULL          null
+
+XPTvar $BRif     \n
+XPTvar $BRloop    \n
+XPTvar $BRloop  \n
+XPTvar $BRstc \n
+XPTvar $BRfun   \n
+
+XPTvar $VOID_LINE  /* void */;
+XPTvar $CURSOR_PH      /* cursor */
+
+XPTvar $CL  /*
+XPTvar $CM   *
+XPTvar $CR   */
+
+XPTinclude
+      \ _common/common
+      \ _comment/doubleSign
+      \ _condition/c.like
+      \ _loops/c.while.like
+      \ _loops/java.for.like
+      \ _structures/c.like
+
+XPTinclude
+            \ c/c
+
+" ========================= Function and Variables =============================
+
+
+" ================================= Snippets ===================================
+
+
+XPT foreach " foreach (.. in ..) {..}
+foreach ( `var^ `e^ in `what^ )`$BRloop^{
+    `cursor^
+}
+
+
+XPT struct " struct { .. }
+`public^ struct `structName^
+{
+    `fieldAccess^public^ `type^ `name^;`...^
+    `fieldAccess^public^ `type^ `name^;`...^
+}
+
+
+XPT class " class +ctor
+class `className^
+{
+    public `className^(` `ctorParam` ^)
+    {
+        `cursor^
+    }
+}
+
+
+XPT main " static main string[]
+public static void Main( string[] args )
+{
+    `cursor^
+}
+
+
+XPT prop " .. .. {get set}
+public `type^ `Name^
+{`
+    `get...{{^
+    get { return `what^; }`}}^`
+    `set...{{^
+    set { `what^ = `value^; }`}}^
+}
+
+
+XPT namespace " namespace {}
+namespace `name^
+{
+    `cursor^
+}
+
+
+XPT try wrap=what " try .. catch .. finally
+XSET handler=$CL handler $CR
+try
+{
+    `what^
+}`
+`...^
+catch (`except^ e)
+{
+    `handler^
+}`
+`...^`
+`finally...{{^
+finally
+{
+    `cursor^
+}`}}^
+
+
+
+" ================================= Wrapper ===================================
+XPT region_ wraponly=wrapped " #region #endregion
+#region `regionText^
+`wrapped^
+`cursor^
+#endregion /* `regionText^ */
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/css/css.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/css/css.xpt.vim
new file mode 100644
index 0000000..8b9aade
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/css/css.xpt.vim
@@ -0,0 +1,521 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $VOID_LINE  /* void */;
+XPTvar $CURSOR_PH  /* cursor */
+
+XPTvar $CL  /*
+XPTvar $CM   *
+XPTvar $CR   */
+
+XPTinclude
+      \ _common/common
+      \ _comment/doubleSign
+
+
+" ========================= Function and Variables =============================
+
+fun! s:f.css_braced_post()
+  let v = self.V()
+  let v = substitute( v, '^\s*$', '', 'g' )
+
+  if v =~ '^\s*\w\+('
+    let name = matchstr( v, '^\s*\zs\w\+(' )
+    return self.Build( ' ' . name . self.ItemCreate( '', {}, {} ) . ')' )
+  else
+    return v
+  endif
+endfunction
+
+" ================================= Snippets ===================================
+
+
+XPT globalcn " global css from Sina
+body,ul,ol,li,p,h1,h2,h3,h4,h5,h6,form,fieldset,table,td,img,div{margin:0;padding:0;border:0;}
+body{background:#fff;color:#333;font-size:12px; margin-top:5px;font-family:"宋体";}
+
+ul,ol{list-style-type:none;}
+select,input,img,select{vertical-align:middle;}
+
+a{text-decoration:underline;}
+a:link{color:#009;}
+a:visited{color:#800080;}
+a:hover,a:active,a:focus{color:#c00;}
+
+.clearit{clear:both;}
+
+XPT globalen " global css from Yahoo
+html{color:#000;background:#FFF}
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0}
+table{border-collapse:collapse;border-spacing:0}
+fieldset,img{border:0}
+address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal}
+li{list-style:none}
+caption,th{text-align:left}
+h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}
+q:before,q:after{content:''}
+abbr,acronym{border:0;font-variant:normal}
+sup{vertical-align:text-top}
+sub{vertical-align:text-bottom}
+input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit}
+input,textarea,select{*font-size:100%}
+legend{color:#000}
+
+body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small}
+select,input,button,textarea{font:99% arial,helvetica,clean,sans-serif}
+table{font-size:inherit;font:100%}
+pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%}
+
+a{text-decoration:none}
+a:hover,a:focus{text-decoration:underline}
+strong{font-weight:bold}
+input[type=submit]{cursor:pointer}
+button{cursor:pointer}
+
+XPT padding " padding:
+padding: `v^`v^AutoCmpl( 1, 'auto', '0px' )^;
+
+XPT width " width :
+width: `^;
+
+
+XPT height " height :
+height: `^;
+
+
+XPT backrep " background-repeat
+XSET rep=Choose(['repeat', 'repeat-x','repeat-y','no-repeat'])
+background-repeat: `rep^;
+
+
+XPT azimuth " azimuth
+XSET azim=Choose(['left-side', 'far-left', 'left', 'center-left', 'center', 'center-right', 'right', 'far-right', 'right-side', 'behind', 'leftwards', 'rightwards'])
+azimuth: `azim^;
+
+
+XPT backpos " background-position
+XSET horiz=Choose(['left', 'center', 'right'])
+XSET horiz|post=SV('^\s*$', '', 'g')
+XSET vert=Choose(['top', 'center', 'bottom'])
+XSET vert|post=SV('^\s*$', '', 'g')
+background-position:` `vert`^` `horiz`^;
+
+
+XPT border " border
+XSET pos=ChooseStr( '-top', '-right', '-bottom', '-left' )
+XSET thick=Choose(['thin', 'thick', 'medium'])
+XSET thick|post=SV('^\s*$', '', 'g')
+XSET kind=Choose(['none', 'hidden', 'dotted', 'dashed', 'solid', 'double', 'groove', 'ridge', 'inset', 'outset'])
+XSET kind|post=SV('^\s*$', '', 'g')
+XSET color=Choose(['rgb()', '#', 'transparent'])
+XSET color|post=css_braced_post()
+border`pos^:` `thick^` `kind^` `color^;
+
+
+XPT backgroundattachment " background-attachment
+XSET selec=Choose(['scroll', 'fixed'])
+background-attachment: `selec^;
+
+
+XPT backgroundcolor " background-color
+XSET selec=Choose(['transparent', 'rgb()', '#'])
+XSET selec|post=css_braced_post()
+background-color:` `selec^;
+
+
+XPT backgroundimage " background-image
+XSET selec=Choose(['url()', 'none'])
+XSET selec|post=css_braced_post()
+background-image:` `selec^;
+
+
+XPT backgroundrepeat " background-repeat
+XSET selec=Choose(['repeat', 'repeat-x','repeat-y','no-repeat'])
+background-repeat: `selec^;
+
+
+XPT background " background
+XSET selec=Choose(['url()', 'scroll', 'fixed', 'transparent', 'rgb()', '#', 'none', 'top', 'center', 'bottom' , 'left', 'right', 'repeat', 'repeat-x', 'repeat-y', 'no-repeat'])
+XSET selec|post=css_braced_post()
+background:` `selec^;
+
+
+XPT bordercollapse " border-collapse
+XSET selec=Choose(['collapse', 'separate'])
+border-collapse: `selec^;
+
+
+XPT bordercolor " border-color
+XSET selec=Choose(['rgb()', '#', 'transparent'])
+XSET selec|post=css_braced_post()
+border-color:` `selec^;
+
+
+XPT borderspacing " border-spacing
+XSET select_disabled=Choose([''])
+border-spacing: `select^;
+
+
+XPT borderstyle " border-style
+XSET selec=Choose(['none', 'hidden', 'dotted', 'dashed', 'solid', 'double', 'groove', 'ridge', 'inset', 'outset'])
+border-style: `selec^;
+
+
+XPT borderwidth " border-width
+XSET selec=Choose(['thin', 'thick', 'medium'])
+border-width: `selec^;
+
+
+XPT bottom " bottom
+XSET selec=Choose(['auto'])
+bottom: `selec^;
+
+
+XPT captionside " caption-side
+XSET selec=Choose(['top', 'bottom'])
+caption-side: `selec^;
+
+
+XPT clear " clear
+XSET selec=Choose(['none', 'left', 'right', 'both'])
+clear: `selec^;
+
+
+XPT clip " clip
+XSET selec=Choose(['auto', 'rect('])
+clip: `selec^;
+
+
+XPT color " color
+XSET selec=Choose(['rgb()', '#'])
+XSET selec|post=css_braced_post()
+color:` `selec^;
+
+
+XPT content " content
+XSET selec=Choose(['normal', 'attr(', 'open-quote', 'close-quote', 'no-open-quote', 'no-close-quote'])
+content: `selec^;
+
+
+XPT cursor " cursor
+XSET selec=Choose(['url()', 'auto', 'crosshair', 'default', 'pointer', 'move', 'e-resize', 'ne-resize', 'nw-resize', 'n-resize', 'se-resize', 'sw-resize', 's-resize', 'w-resize', 'text', 'wait', 'help', 'progress'])
+XSET selec|post=css_braced_post()
+cursor:` `selec^;
+
+
+XPT direction " direction
+XSET selec=Choose(['ltr', 'rtl'])
+direction: `selec^;
+
+
+XPT display " display
+XSET selec=Choose(['inline', 'block', 'list-item', 'run-in', 'inline-block', 'table', 'inline-table', 'table-row-group', 'table-header-group', 'table-footer-group', 'table-row', 'table-column-group', 'table-column', 'table-cell', 'table-caption', 'none'])
+display: `selec^;
+
+
+XPT elevation " elevation
+XSET selec=Choose(['below', 'level', 'above', 'higher', 'lower'])
+elevation: `selec^;
+
+
+XPT emptycells " empty-cells
+XSET selec=Choose(['show', 'hide'])
+empty-cells: `selec^;
+
+
+XPT float " float
+XSET selec=Choose(['left', 'right', 'none'])
+float: `selec^;
+
+
+XPT fontfamily " font-family
+XSET selec=Choose(['sans-serif', 'serif', 'monospace', 'cursive', 'fantasy'])
+font-family: `selec^;
+
+
+XPT fontsize " font-size
+XSET selec=Choose(['xx-small', 'x-small', 'small', 'medium', 'large', 'x-large', 'xx-large', 'larger', 'smaller'])
+font-size: `selec^;
+
+
+XPT fontstyle " font-style
+XSET selec=Choose(['normal', 'italic', 'oblique'])
+font-style: `selec^;
+
+
+XPT fontvariant " font-variant
+XSET selec=Choose(['normal', 'small-caps'])
+font-variant: `selec^;
+
+
+XPT fontweight " font-weight
+XSET selec=Choose(['normal', 'bold', 'bolder', 'lighter'])
+font-weight: `selec^;
+
+
+XPT font " font
+XSET kind=Choose(['normal', 'italic', 'oblique', 'small-caps', 'bold', 'bolder', 'lighter'])
+XSET kind|post=SV('^\s*$', '', 'g')
+XSET size=Choose(['xx-small', 'x-small', 'small', 'medium', 'large', 'x-large', 'xx-large', 'larger', 'smaller'])
+XSET size|post=SV('^\s*$', '', 'g')
+XSET font=Choose(['sans-serif', 'serif', 'monospace', 'cursive', 'fantasy', 'caption', 'icon', 'menu', 'message-box', 'small-caption', 'status-bar'])
+XSET font|post=SV('^\s*$', '', 'g')
+font:` `kind`^` `size`^` `font`^;
+
+
+XPT letterspacing " letter-spacing
+XSET selec=Choose(['normal'])
+letter-spacing: `selec^;
+
+
+XPT lineheight " line-height
+XSET selec=Choose(['normal'])
+line-height: `selec^;
+
+
+XPT liststyleimage " list-style-image
+XSET selec=Choose(['url()', 'none'])
+XSET selec|post=css_braced_post()
+list-style-image:` `selec^;
+
+
+XPT liststyleposition " list-style-position
+XSET selec=Choose(['inside', 'outside'])
+list-style-position: `selec^;
+
+
+XPT liststyletype " list-style-type
+XSET selec=Choose(['disc', 'circle', 'square', 'decimal', 'decimal-leading-zero', 'lower-roman', 'upper-roman', 'lower-latin', 'upper-latin', 'none'])
+list-style-type: `selec^;
+
+
+XPT margin " margin
+XSET selec=Choose(['auto'])
+margin: `selec^;
+
+
+XPT maxheight " max-height
+XSET selec=Choose(['auto'])
+max-height: `selec^;
+
+
+XPT maxwidth " max-width
+XSET selec=Choose(['none'])
+max-width: `selec^;
+
+
+XPT minheight " min-height
+XSET selec=Choose(['none'])
+min-height: `selec^;
+
+
+XPT minwidth " min-width
+XSET selec=Choose(['none'])
+min-width: `selec^;
+
+XPT outline " outline
+XSET color=Choose(['rgb()', '#'])
+XSET color|post=css_braced_post()
+XSET style=Choose(['none', 'hidden', 'dotted', 'dashed', 'solid', 'double', 'groove', 'ridge', 'inset', 'outset'])
+XSET style|post=SV('^\s*$', '', 'g')
+XSET width=Choose(['thin', 'thick', 'medium'])
+XSET width|post=SV('^\s*$', '', 'g')
+outline:` `width`^` `style`^` `color`^;
+
+XPT outlinecolor " outline-color
+XSET selec=Choose(['rgb()', '#'])
+XSET selec|post=css_braced_post()
+outline-color:` `selec^;
+
+
+XPT outlinestyle " outline-style
+XSET selec=Choose(['none', 'hidden', 'dotted', 'dashed', 'solid', 'double', 'groove', 'ridge', 'inset', 'outset'])
+outline-style: `selec^;
+
+
+XPT outlinewidth " outline-width
+XSET selec=Choose(['thin', 'thick', 'medium'])
+outline-width: `selec^;
+
+
+XPT overflow " overflow
+XSET selec=Choose(['visible', 'hidden', 'scroll', 'auto'])
+overflow: `selec^;
+
+
+XPT pagebreakinside " page-break-inside
+XSET selec=Choose(['auto', 'avoid'])
+page-break-inside: `selec^;
+
+
+XPT pitch " pitch
+XSET selec=Choose(['x-low', 'low', 'medium', 'high', 'x-high'])
+pitch: `selec^;
+
+
+XPT playduring " play-during
+XSET selec=Choose(['url()', 'mix', 'repeat', 'auto', 'none'])
+XSET selec|post=css_braced_post()
+play-during:` `selec^;
+
+
+XPT position " position
+XSET selec=Choose(['static', 'relative', 'absolute', 'fixed'])
+position: `selec^;
+
+
+XPT quotes " quotes
+XSET selec=Choose(['none'])
+quotes: `selec^;
+
+
+XPT speakheader " speak-header
+XSET selec=Choose(['once', 'always'])
+speak-header: `selec^;
+
+
+XPT speaknumeral " speak-numeral
+XSET selec=Choose(['digits', 'continuous'])
+speak-numeral: `selec^;
+
+
+XPT speakpunctuation " speak-punctuation
+XSET selec=Choose(['code', 'none'])
+speak-punctuation: `selec^;
+
+
+XPT speak " speak
+XSET selec=Choose(['normal', 'none', 'spell-out'])
+speak: `selec^;
+
+
+XPT speechrate " speech-rate
+XSET selec=Choose(['x-slow', 'slow', 'medium', 'fast', 'x-fast', 'faster', 'slower'])
+speech-rate: `selec^;
+
+
+XPT tablelayout " table-layout
+XSET selec=Choose(['auto', 'fixed'])
+table-layout: `selec^;
+
+
+XPT textindent " text-indent
+text-indent: `^;
+
+XPT textalign " text-align
+XSET selec=Choose(['left', 'right', 'center', 'justify'])
+text-align: `selec^;
+
+
+XPT textdecoration " text-decoration
+XSET selec=Choose(['none', 'underline', 'overline', 'line-through', 'blink'])
+text-decoration: `selec^;
+
+
+XPT texttransform " text-transform
+XSET selec=Choose(['capitalize', 'uppercase', 'lowercase', 'none'])
+text-transform: `selec^;
+
+
+XPT top " top
+XSET selec=Choose(['auto'])
+top: `selec^;
+
+
+XPT unicodebidi " unicode-bidi
+XSET selec=Choose(['normal', 'embed', 'bidi-override'])
+unicode-bidi: `selec^;
+
+
+XPT verticalalign " vertical-align
+XSET selec=Choose(['baseline', 'sub', 'super', 'top', 'text-top', 'middle', 'bottom', 'text-bottom'])
+vertical-align: `selec^;
+
+
+XPT visibility " visibility
+XSET selec=Choose(['visible', 'hidden', 'collapse'])
+visibility: `selec^;
+
+
+XPT volume " volume
+XSET selec=Choose(['silent', 'x-soft', 'soft', 'medium', 'loud', 'x-loud'])
+volume: `selec^;
+
+
+XPT whitespace " white-space
+XSET selec=Choose(['normal', 'pre', 'nowrap', 'pre-wrap', 'pre-line'])
+white-space: `selec^;
+
+
+XPT wordspacing " word-spacing
+XSET selec=Choose(['normal'])
+word-spacing: `selec^;
+
+
+XPT zindex " z-index
+XSET selec=Choose(['auto'])
+z-index: `selec^;
+
+
+XPT bordertopcolor " border-top-color
+XSET col=Choose(['rgb()', '#', 'transparent'])
+XSET col|post=css_braced_post()
+border-top-color:` `col^;
+
+XPT borderbottomcolor " border-bottom-color
+XSET col=Choose(['rgb()', '#', 'transparent'])
+XSET col|post=css_braced_post()
+border-bottom-color:` `col^;
+
+XPT borderrightcolor " border-right-color
+XSET col=Choose(['rgb()', '#', 'transparent'])
+XSET col|post=css_braced_post()
+border-right-color:` `col^;
+
+XPT borderleftcolor " border-left-color
+XSET col=Choose(['rgb()', '#', 'transparent'])
+XSET col|post=css_braced_post()
+border-left-color:` `col^;
+
+XPT bordertopstyle " border-top-style
+XSET col=Choose(['none', 'hidden', 'dotted', 'dashed', 'solid', 'double', 'groove', 'ridge', 'inset', 'outset'])
+border-top-style: `col^;
+
+XPT borderbottomstyle " border-bottom-style
+XSET col=Choose(['none', 'hidden', 'dotted', 'dashed', 'solid', 'double', 'groove', 'ridge', 'inset', 'outset'])
+border-bottom-style: `col^;
+
+XPT borderrightstyle " border-right-style
+XSET col=Choose(['none', 'hidden', 'dotted', 'dashed', 'solid', 'double', 'groove', 'ridge', 'inset', 'outset'])
+border-right-style: `col^;
+
+XPT borderleftstyle " border-left-style
+XSET col=Choose(['none', 'hidden', 'dotted', 'dashed', 'solid', 'double', 'groove', 'ridge', 'inset', 'outset'])
+border-left-style: `col^;
+
+XPT bordertopwidth " border-top-width
+XSET col=Choose(['rgb()', '#', 'transparent'])
+XSET col|post=css_braced_post()
+border-top-width:` `col^;
+
+XPT borderbottomwidth " border-bottom-width
+XSET col=Choose(['thin', 'thick', 'medium'])
+border-bottom-width: `col^;
+
+XPT borderrightwidth " border-right-width
+XSET col=Choose(['thin', 'thick', 'medium'])
+border-right-width: `col^;
+
+XPT borderleftwidth " border-left-width
+XSET col=Choose(['thin', 'thick', 'medium'])
+border-left-width: `col^;
+
+XPT pagebreakafter " page-break-after
+XSET what=Choose(['auto', 'always', 'avoid', 'left', 'right'])
+page-break-after: `what^;
+
+XPT pagebreakbefore " page-break-before
+XSET what=Choose(['auto', 'always', 'avoid', 'left', 'right'])
+page-break-before: `what^;
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/dot/dot.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/dot/dot.xpt.vim
new file mode 100644
index 0000000..c049084
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/dot/dot.xpt.vim
@@ -0,0 +1,116 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $VOID_LINE  /* void */
+XPTvar $CURSOR_PH      /* cursor */
+
+XPTvar $CL    /*
+XPTvar $CM
+XPTvar $CR    */
+
+XPTinclude
+      \ _common/common
+      \ _comment/doubleSign
+
+
+" ========================= Function and Variables =============================
+
+
+" ================================= Snippets ===================================
+
+
+XPT digraph " digraph .. { .. }
+digraph `graphName^
+{
+    `cursor^
+}
+..XPT
+
+
+XPT graph " graph .. { .. }
+graph `graphName^
+{
+    `cursor^
+}
+..XPT
+
+XPT subgraph " subgraph .. { .. }
+subgraph `clusterName^
+{
+    `cursor^
+}
+..XPT
+
+XPT node " .. [...]
+XSET shape=Choose(['box',  'polygon',  'ellipse',  'circle',  'point',  'egg',  'triangle',  'plaintext',  'diamond',  'trapezium',  'parallelogram',  'house',  'pentagon',  'hexagon',  'septagon',  'octagon',  'doublecircle',  'doubleoctagon',  'tripleoctagon',  'invtriangle',  'invtrapezium',  'invhouse',  'Mdiamond',  'Msquare',  'Mcircle',  'rect',  'rectangle',  'none',  'note',  'tab',  'folder',  'box3d',  'component'])
+`node^` `details...{{^ [shape=`shape^, label="`^"]`}}^
+..XPT
+
+XPT lbl " [label=".."]
+[label="`cursor^"]
+
+
+XPT shapeNode " 
+`node^ [shape=`shape^` `label...{{^, label="`lbl^"`}}^]
+
+..XPT
+
+XPT circle alias=shapeNode " ..\[shape="circle"..]
+XSET shape|pre=circle
+XSET shape=Next()
+
+
+XPT diamond alias=shapeNode " ..\[shape="diamond"..]
+XSET shape|pre=diamond
+XSET shape=Next()
+
+
+XPT box alias=shapeNode " ..\[shape="box"..]
+XSET shape|pre=box
+XSET shape=Next()
+
+
+XPT ellipse alias=shapeNode " ..\[shape="ellipse"..]
+XSET shape|pre=ellipse
+XSET shape=Next()
+
+
+XPT record " ..\[shape="record", label=".."]
+`node^ [shape=record, label="`<`id`>^ `lbl^`...^| `<`id`>^ `lbl^`...^"]
+
+..XPT
+
+
+XPT triangle " ..\[shape="triangle", label=".."]
+`node^ [shape=triangle, label="`<`id`>^ `lbl^`...^| `<`id`>^ `lbl^`...^"]
+
+..XPT
+
+
+XPT row " {..|... }
+{`<`id`>^ `lbl^`...^| `<`id`>^ `lbl^`...^}
+
+..XPT
+
+
+
+XPT col " {..|... }
+{`<`id`>^ `lbl^`...^| `<`id`>^ `lbl^`...^}
+
+..XPT
+
+
+
+
+
+
+
+
+XPT subgraph_ wraponly=wrapped " subgraph .. { SEL }
+subgraph `clusterName^
+{
+    `wrapped^
+}
+..XPT
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/erlang/erlang.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/erlang/erlang.xpt.vim
new file mode 100755
index 0000000..a02a8b9
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/erlang/erlang.xpt.vim
@@ -0,0 +1,135 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+XPTvar $VOID_LINE  /* void */;
+XPTvar $CURSOR_PH      cursor
+
+XPTvar $BRif          ' '
+XPTvar $BRel          \n
+XPTvar $BRloop        ' '
+XPTvar $BRstc         ' '
+XPTvar $BRfun         ' '
+
+XPTinclude
+    \ _common/common
+
+
+" ========================= Function and Variables =============================
+
+" ================================= Snippets ===================================
+
+
+XPT inc " -include ..
+-include( "`cursor^.hrl").
+
+
+XPT def " -define ..
+-define( `what^, `def^ ).
+
+
+XPT ifdef " -ifdef ..\-endif..
+-ifdef( `what^ ).
+    `thenmacro^
+``else...`
+{{^-else.
+    `cursor^
+`}}^-endif().
+
+
+XPT ifndef " -ifndef ..\-endif
+-ifndef( `what^ ).
+    `thenmacro^
+``else...`
+{{^-else.
+    `cursor^
+`}}^-endif().
+
+
+XPT record " -record ..,{..}
+-record( `recordName^
+        ,{ `field1^`...^
+        ,  `fieldn^`...^
+        }).
+
+
+XPT if " if .. -> .. end
+if
+    `cond^ ->
+        `body^` `...^;
+    `cond2^ ->
+        `bodyn^` `...^
+end `cursor^
+
+
+XPT case " case .. of .. -> .. end
+case `matched^ of
+    `pattern^ ->
+        `body^`...^;
+    `patternn^ ->
+        `bodyn^`...^
+end `cursor^
+
+
+XPT receive " receive .. -> .. end
+receive
+    `pattern^ ->
+        `body^` `...^;
+    `patternn^ ->
+        `body^` `...^`
+   `after...{{^
+    after
+    `afterBody^`}}^
+end
+
+
+
+XPT fun " fun .. -> .. end
+fun (`params^) `_^ -> `body^`
+    `more...{{^;
+    (`params^) `_^ -> `body^`
+    `...{{^;
+    (`params^) `_^ -> `body^`
+    `...^`}}^`}}^
+end `cursor^
+
+
+XPT try wrap=what " try .. catch .. end
+try `what^
+catch
+    `except^ -> `toRet^`
+    `...^;
+    `except^ -> `toRet^`
+    `...^`
+`after...{{^
+after
+    `afterBody^`}}^
+end `cursor^
+
+
+XPT tryof " try .. of ..
+try `what^ of
+    `pattern^ ->
+        `body^` `more...^;
+    `patternn^ ->
+        `body^` `more...^
+catch
+    `excep^ -> `toRet^` `...^;
+    `except^ -> `toRet^` `...^`
+`after...{{^
+after
+    `afterBody^`}}^
+end `cursor^
+
+
+XPT function " f \( .. \) -> ..
+`funName^ ( `args0^ ) `_^ ->
+    `body0^ `...^;
+`name^R('funName')^ ( `argsn^ ) `_^ ->
+    `bodyn^`...^
+.
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/eruby/eruby.ftdetect.vim b/vim-plugins/bundle/xptemplate/ftplugin/eruby/eruby.ftdetect.vim
new file mode 100644
index 0000000..8d9ad42
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/eruby/eruby.ftdetect.vim
@@ -0,0 +1,71 @@
+if exists("b:__ERUBY_FTDETECT_VIM__")
+    finish
+endif
+let b:__ERUBY_FTDETECT_VIM__ = 1
+
+
+if &filetype !~ 'eruby'
+    finish
+endif
+
+
+
+let s:skipPattern = 'synIDattr(synID(line("."), col("."), 0), "name") =~? "\\vstring|comment"'
+let s:pattern = {
+            \   'ruby'    : {
+            \       'start' : '\V\c<%',
+            \       'mid'   : '',
+            \       'end'   : '\V\c%>',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \   'javascript'    : {
+            \       'start' : '\V\c<script\_[^>]\*>',
+            \       'mid'   : '',
+            \       'end'   : '\V\c</script>',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \   'css'           : {
+            \       'start' : '\V\c<style\_[^>]\*>',
+            \       'mid'   : '',
+            \       'end'   : '\V\c</style>',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \}
+
+let s:topFT = 'eruby'
+
+fun! XPT_erubyFiletypeDetect() "{{{
+    let pos = [ line( "." ), col( "." ) ]
+
+    let synName = xpt#util#NearestSynName()
+
+    if synName == ''
+        " top level ft is html
+        return s:topFT
+
+    else
+
+        for [ name, ftPattern ] in items( s:pattern )
+            let pos = searchpairpos( ftPattern.start, ftPattern.mid, ftPattern.end, 'nbW', ftPattern.skip )
+            if pos != [0, 0]
+                return name
+            endif
+        endfor
+
+        if synName =~ '^\cjavascript'
+            return 'javascript'
+        elseif synName =~ '^\ccss'
+            return 'css'
+        endif
+
+        return s:topFT
+
+    endif
+
+endfunction "}}}
+
+if exists( 'b:XPTfiletypeDetect' )
+    unlet b:XPTfiletypeDetect
+endif
+let b:XPTfiletypeDetect = function( 'XPT_erubyFiletypeDetect' )
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/eruby/eruby.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/eruby/eruby.xpt.vim
new file mode 100644
index 0000000..81c4581
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/eruby/eruby.xpt.vim
@@ -0,0 +1,21 @@
+XPTemplate priority=lang-
+
+XPTinclude
+    \ _common/common
+    \ html/html
+    \ html/eruby*
+
+XPTembed
+    \ ruby/ruby
+    \ javascript/javascript
+    \ css/css
+
+" ========================= Function and Variables =============================
+
+" ================================= Snippets ===================================
+
+
+
+
+" ================================= Wrapper ===================================
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/factor/factor.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/factor/factor.xpt.vim
new file mode 100644
index 0000000..bcb87e3
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/factor/factor.xpt.vim
@@ -0,0 +1,93 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+XPTinclude
+    \ _common/common
+
+
+" ========================= Function and Variables =============================
+fun! s:f.ModuleName()
+    let rootfolder = substitute(getcwd(), '^.*[\\/]\([^\\/]\+\)$', '\1', '')
+    let filename = rootfolder . '/' . expand('%:h:h') . '/' . expand('%:t:r')
+    let stripped = substitute( filename, '[\\/]', '.', 'g' )
+
+    return substitute( stripped, "-tests$", ".tests", '' )
+endfunction
+" ================================= Snippets ===================================
+
+XPT alias "ALIAS: ... ...
+ALIAS: `newword^ `oldword^
+
+XPT const "CONSTANT: ... ...
+CONSTANT: `word^ `constantValue^
+
+XPT if "... [ ... ] [ ... ] if
+`cond^ [ `then^ ] [ `else^ ] if
+
+XPT times "... [ ... ] times
+`count^ [ `what^ ] times
+
+XPT mod " USING: ... IN: ...
+XSET moduleName=ModuleName()
+USING: kernel sequences accessors ;
+IN: `moduleName^
+
+XPT quote " [ ... ]
+[ `cursor^ ]
+
+XPT arr " { ... }
+{ `cursor^ }
+
+XPT vec " V{ ... }
+V{ `cursor^ }
+
+XPT bi " [ ... ] [ ... ] bi
+[ `first^ ] [ `cursor^ ] bi
+
+XPT tri " [ ... ] [ ... ] [ ... ] tri
+[ `first^ ] [ `second^ ] [ `cursor^ ] tri
+
+XPT map " [ ... ] map
+[ `cursor^ ] map
+
+XPT filter " [ ... ] filter
+[ `cursor^ ] filter
+
+XPT dip " [ ... ] dip
+[ `cursor^ ] dip
+
+XPT cleave " { [ ... ] ... } cleave
+{ [ `code^ ]`...^
+  [ `code^ ]`...^
+} cleave
+
+XPT when " [ ... ] when
+[ `cursor^ ] when
+
+XPT unless " [ ... ] unless
+[ `cursor^ ] unless
+
+XPT keep " [ ... ] keep
+[ `cursor^ ] keep
+
+XPT cond " { { [ ... ] [ ... ] } } cond
+{ { [ `cond^ ] [ `code^ ] }`...^
+  { [ `cond^ ] [ `code^ ] }`...^`default...{{^
+  [ `cursor^ ]`}}^
+} cond
+
+XPT case " { { ... [ ... ] } } case
+{ { `case^ [ `code^ ] }`...^
+  { `case^ [ `code^ ] }`...^`default...{{^
+  [ `cursor^ ]`}}^
+} case
+
+XPT test "[ ... ] [ ... ] unit-test
+{ `ret^ } [ `test^ ] unit-test
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/gitconfig/gitconfig.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/gitconfig/gitconfig.xpt.vim
new file mode 100644
index 0000000..28920c0
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/gitconfig/gitconfig.xpt.vim
@@ -0,0 +1,24 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+
+XPTinclude
+      \ _common/common
+
+
+XPT branch " [branch "..."]
+[branch "`branchName^"]`remote...{{^
+    remote = `remote^`}}^`merge...{{^
+    merge = refs/heads/`branchName^`}}^ 
+
+XPT remote " [remote "..."]
+[remote "`remoteName^"]
+    url = `fetchUrl^
+    fetch = `fetchRef^ 
+
+XPT user " Basic user configuration
+[user]
+    name = `$Author^
+    email = `$Email^
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/gnuplot/gnuplot.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/gnuplot/gnuplot.xpt.vim
new file mode 100644
index 0000000..58faed2
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/gnuplot/gnuplot.xpt.vim
@@ -0,0 +1,34 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT skeleton " basic file skeleton
+set title "`plotTitle^"
+set xlabel "`axisLabel^"
+set ylabel "`ordinateLabel^"
+
+plot "`valueFile^" title "`valueTitle^" `using...{{^using `columns^ `}}^ with linespoint
+
+XPT label " axis labels
+set xlabel "`axisLabel^"
+set ylabel "`ordinateLabel^"
+
+XPT fun " ... ( ... ) = ...
+`funName^( `args^ )=`cursor^
+
+XPT range " set xrange ...; set yrange ...
+set xrange [`xMin^:`xMax^]
+set yrange [`yMin^:`yMay^]
+
+XPT tics " set xtics & ytics
+set xtics `xTics^
+set ytics `yTics^
+
+XPT term " Change output terminal
+XSET termMode=Choose(['svg', 'canvas','latex', 'postscript', 'x11','eps', 'xterm'])
+set terminal `termMode^ enhanced`size...{{^ size `width^ `height^`}}^
+set output "`filename^"
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/go/go.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/go/go.xpt.vim
new file mode 100644
index 0000000..454cc25
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/go/go.xpt.vim
@@ -0,0 +1,179 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+fun! s:f.MakeIntType( n )
+    let n = a:n
+    return matchstr(n, '\v^u') . "int" . matchstr(n, '\v\d+$' )
+endfunction
+
+XPTvar $TRUE          true
+XPTvar $FALSE         false
+XPTvar $NULL          nil
+XPTvar $UNDEFINED     nil
+
+XPTvar $SParg      ''
+
+XPTinclude
+      \ _common/common
+      \ _comment/c.like
+
+
+XPT _dec hidden " $_xSnipName
+`$_xSnipName^ 
+
+XPT package alias=_dec
+XPT import alias=_dec
+XPT type alias=_dec
+XPT const alias=_dec
+XPT var alias=_dec
+
+XPT _int " MakeIntType($_xSnipName)
+`MakeIntType($_xSnipName)^
+
+XPT i8  alias=_int
+XPT i16 alias=_int
+XPT i32 alias=_int
+XPT i64 alias=_int
+XPT u8  alias=_int
+XPT u16 alias=_int
+XPT u32 alias=_int
+XPT u64 alias=_int
+
+XPT struct " struct {
+struct {
+    `cursor^
+}
+
+XPT func wrap " func () int {
+func `n^(`p?^)` `int?^ {
+    `cursor^
+}
+XPT meth wrap " func (*T) () int {
+func (`^) `n^(`p?^)` `int?^ {
+    `cursor^
+}
+XPT go " go func (){}()
+go func (`p?^) {
+    `cursor^
+}()
+XPT tfunc " func Test
+func Test`^(t *testing.T) {
+    `cursor^
+}
+XPT bfunc " func Test
+func Benchmark`^(b *testing.B) {
+    `cursor^
+
+    for ii := 0; i < b.N; i++ {
+    }
+}
+XPT main " func main\()
+func main() {
+    `cursor^
+}
+
+XPT println " fmt.Println\()
+fmt.Println( `^ )
+XPT sprintf " fmt.Sprintf\()
+fmt.Sprintf( `^ )
+
+XPT forever " for ;;
+for ;; {
+    `cursor^
+}
+XPT for wrap " for i=0; i<10; i++
+for `i^ := `0^; `i^ < `10^; `i^++ {
+    `cursor^
+}
+XPT forr wrap " for i=10; i>=0; i--
+for `i^ := `10^; `i^ >= `0^; `i^-- {
+    `cursor^
+}
+XPT forrange wrap " for range
+for `_^, `^ := range `^ {
+    `cursor^
+}
+XPT forin wrap alias=forrange
+
+XPT if wrap " if {
+if `^ {
+    `cursor^
+}
+XPT iftype wrap " if _, ok := x.(type); ok { ... }
+if _, ok := `x^.( `tp^ ); ok {
+    `cursor^
+}
+XPT _ifeq wrap hidden " if x == $v {
+XSET $v=0
+if `^ == `$v^ {
+    `cursor^
+}
+XPT _ifne wrap hidden " if x != $v {
+XSET $v=0
+if `x^ != `$v^ {
+    `cursor^
+}
+XPT iferr " if err != nil {
+if err != nil {
+    `cursor^
+}
+XPT ifn alias=_ifeq
+XSET $v=nil
+XPT ifnn alias=_ifne
+XSET $v=nil
+XPT if0 alias=_ifeq
+XSET $v=0
+XPT ifn0 alias=_ifne
+XSET $v=0
+XPT else
+else {
+    `cursor^
+}
+
+XPT mps " map[string]
+map[`string^]`T^
+XPT mpi " map[string]
+map[`int^]`T^
+
+XPT mkc " make\(chan X, n, capa?)
+make(chan `bool^, `0^`, `capa?^)
+XPT mks " make\([]X, n, capa?)
+make([]`bool^, `0^`, `capa?^)
+XPT mkm " make\(map[X]Y, n, capa?)
+make(map[`string^]`bool^`, `capa?^)
+XPT mkms " make\(map[string]Y, n, capa?)
+make(map[string]`bool^`, `capa?^)
+
+XPT sel " select
+select {
+case `^:
+    `cursor^
+}
+XPT selc " select x <-ch
+select {
+case ``x?` := ^<-`ch^:
+    `cursor^
+}
+
+XPT switch " switch x {
+switch `^ {
+case `^:
+    `cursor^
+}
+XPT default " default:
+default:
+    `cursor^
+
+XPT test " if .. t.Errorf
+if `^ {} else {
+    t.Errorf( `^ )
+}
+XPT ttype " if _, ok := x.(type); ok { ... }
+if _, ok := `x^.( `tp^ ); ok {} else {
+    t.Errorf( "Expect `x^ to be `tp^ but: %v", `x^ )
+}
+XPT assert " if .. t.Errorf
+if `^ {} else {
+    t.Fatalf( `^ )
+}
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/haskell/haskell.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/haskell/haskell.xpt.vim
new file mode 100755
index 0000000..9ac532d
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/haskell/haskell.xpt.vim
@@ -0,0 +1,164 @@
+XPTemplate priority=lang mark=`~
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+XPTvar $VOID_LINE /* void */;
+XPTvar $BRif \n
+
+XPTinclude
+      \ _common/common
+      \ _preprocessor/c.like
+
+
+" ========================= Function and Variables =============================
+
+
+" ================================= Snippets ===================================
+
+
+XPT head " -----------------------------
+--------------------------------------------------
+----            `headName~
+--------------------------------------------------
+
+XPT class " class .. where..
+class `context...{{~(`ctxt~) => `}}~`className~ `types~a~ where
+    `ar~ :: `type~ `...~
+    `methodName~ :: `methodType~`...~
+`cursor~
+
+XPT classcom " -- | class..
+-- | `classDescr~
+class `context...{{~(`ctxt~) => `}}~`className~ `types~a~ where
+    -- | `methodDescr~
+    `ar~ :: `type~ `...~
+    -- | `method_Descr~
+    `methodName~ :: `methodType~`...~
+`cursor~
+
+XPT datasum " data .. = ..|..|..
+data `context...{{~(`ctxt~) => `}}~`typename~`typeParams~ ~=
+    `Constructor~ `ctorParams~VOID()~`
+  `...~
+    | `Ctor~ `params~VOID()~
+    `...~
+    `deriving...{{~deriving (`Eq,Show~)`}}~
+`cursor~
+
+
+XPT datasumcom " -- | data .. = ..|..|..
+-- | `typeDescr~VOID()~
+data `context...{{~(`ctxt~) => `}}~`typename~` `typeParams~ ~=
+    -- | `ConstructorDescr~
+    `Constructor~ `ctorParams~VOID()~`
+    `...~
+    -- | `Ctor descr~VOID()~
+    | `Ctor~ `params~VOID()~`
+    `...~
+    `deriving...{{~deriving (`Eq,Show~)`}}~
+`cursor~
+
+XPT parser " .. = .. <|> .. <|> .. <?>
+`funName~ = `rule~`
+        `another_rule...{{~
+        <|> `rule~`
+        `more...{{~
+        <|> `rule~`
+        `more...~`}}~`}}~
+        `err...{{~<?> "`descr~"`}}~
+`cursor~
+
+XPT datarecord " data .. ={}
+data `context...{{~(`ctxt~) => `}}~`typename~`typeParams~ ~=
+    `Constructor~ {
+        `field~ :: `type~`
+        `...{{~,
+        `fieldn~ :: `typen~`
+        `...~`}}~
+    }
+    `deriving...{{~deriving (`Eq, Show~)`}}~
+`cursor~
+
+XPT datarecordcom " -- | data .. ={}
+-- | `typeDescr~
+data `context...{{~(`ctxt~) => `}}~`typename~`typeParams~ ~=
+    `Constructor~ {
+        `field~ :: `type~ -- ^ `fieldDescr~`
+        `...{{~,
+        `fieldn~ :: `typen~ -- ^ `fielddescr~`
+        `...~`}}~
+    }
+    `deriving...{{~deriving (`Eq,Show~)`}}~
+`cursor~
+
+XPT instance " instance .. .. where
+instance `className~ `instanceTypes~ where
+    `methodName~ `~ = `decl~ `...~
+    `method~ `~ = `declaration~`...~
+`cursor~
+
+XPT if " if .. then .. else
+if `expr~
+    then `thenCode~
+    else `cursor~
+
+XPT fun " fun pat = ..
+`funName~ `pattern~ = `def~`
+`...{{~
+`name~R("funName")~ `pattern~ = `def~`
+`...~`}}~
+
+XPT funcom " -- | fun pat = ..
+-- | `function_description~
+`funName~ :: `type~
+`name~R("funName")~ `pattern~ = `def~`
+`...{{~
+`name~R("funName")~ `pattern~ = `def~`
+`...~`}}~
+
+XPT funtype " .. :: .. => .. -> .. ->
+`funName~ :: `context...{{~(`ctxt~)
+        =>`}}~ `type~ -- ^ `is~`
+        `...{{~
+        -> `type~ -- ^ `is~`
+        `...~`}}~
+
+XPT options " {-# OPTIONS_GHC .. #-}
+{-# OPTIONS_GHC `options~ #-}
+
+XPT lang " {-# LANGUAGE .. #-}
+{-# LANGUAGE `langName~ #-}
+
+XPT inline " {-# INLINE .. #-}
+{-# INLINE `phase...{{~[`2~] `}}~`funName~ #-}
+
+XPT noninline " {-# NOINLINE .. #-}
+{-# NOINLINE `funName~ #-}
+
+XPT type " .. -> .. ->....
+`context...{{~(`ctxt~) => `}}~`t1~ -> `t2~`...~ -> `t3~`...~
+
+XPT deriving " deriving (...)
+deriving (`classname~`...~,`classname~`...~)
+
+XPT derivingstand " deriving instance ...
+deriving instance `context...{{~`ctxt~ => `}}~`class~ `type~
+
+XPT module " module .. () where ...
+XSET moduleName=S(S(E('%:r'),'^.','\u&', ''), '[\\/]\(.\)', '.\u\1', 'g')
+module `moduleName~ `exports...{{~( `cursor~
+    ) `}}~where
+
+XPT foldr " foldr (.... -> ...)
+foldr (\ `e~ `acc~ -> `expr~) `init~ `lst~
+
+XPT foldl " foldl' (.... -> ...)
+foldl' (\ `acc~ `elem~ -> `expr~) `init~ `lst~
+
+XPT map " map (... -> ...)
+map (`elem~ -> `expr~) `list~
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/help/help.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/help/help.xpt.vim
new file mode 100644
index 0000000..c1eb42e
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/help/help.xpt.vim
@@ -0,0 +1,31 @@
+XPTemplate priority=lang
+
+
+" containers
+let s:f = g:XPTfuncs()
+
+" inclusion
+XPTinclude
+      \ _common/common
+
+" ========================= Function and Variables =============================
+
+" ================================= Snippets ===================================
+
+XPT ln "  ========...
+==============================================================================
+
+
+XPT fmt " vim: options...
+vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:
+
+
+XPT q " : > ... <
+: >
+	`cursor^
+<
+
+
+XPT r " |...|
+|`content^|
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/html/eruby.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/html/eruby.xpt.vim
new file mode 100644
index 0000000..5484831
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/html/eruby.xpt.vim
@@ -0,0 +1,24 @@
+" These snippets work only in html context of a eruby file
+if &filetype != 'eruby'
+    finish
+endif
+
+XPTemplate priority=lang-
+
+
+XPT ruby " <% ...
+<%
+    `cursor^
+%>
+
+
+XPT r " <% ... %>
+<% `cursor^ %>
+
+
+XPT re " <%= ...
+<%= `expr^ %>
+
+
+XPT rc " <%# ...
+<%# `cursor^ %>
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/html/html.ftdetect.vim b/vim-plugins/bundle/xptemplate/ftplugin/html/html.ftdetect.vim
new file mode 100644
index 0000000..958a0f6
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/html/html.ftdetect.vim
@@ -0,0 +1,63 @@
+if exists("b:__HTML_FTDETECT_VIM__")
+    finish
+endif
+let b:__HTML_FTDETECT_VIM__ = 1
+
+
+" TODO xhtml support
+
+if &filetype !~ 'html'
+    finish
+endif
+
+
+let s:skipPattern = 'synIDattr(synID(line("."), col("."), 0), "name") =~? "\\vstring|comment"'
+let s:pattern = {
+            \   'javascript'    : {
+            \       'start' : '\V\c<script\_[^>]\*>',
+            \       'mid'   : '',
+            \       'end'   : '\V\c</script>',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \   'css'           : {
+            \       'start' : '\V\c<style\_[^>]\*>',
+            \       'mid'   : '',
+            \       'end'   : '\V\c</style>',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \}
+
+fun! XPT_htmlFiletypeDetect() "{{{
+    let pos = [ line( "." ), col( "." ) ]
+    let synName = xpt#util#NearestSynName()
+
+    if synName == ''
+        " no character at current position or before curernt position
+        return &filetype
+
+    else
+
+        for [ name, ftPattern ] in items( s:pattern )
+            let pos = searchpairpos( ftPattern.start, ftPattern.mid, ftPattern.end, 'nbW', ftPattern.skip )
+            if pos != [0, 0]
+                return name
+            endif
+        endfor
+
+        if synName =~ '^\cjavascript'
+            return 'javascript'
+        elseif synName =~ '^\ccss'
+            return 'css'
+        endif
+
+        return &filetype
+
+    endif
+
+endfunction "}}}
+
+if exists( 'b:XPTfiletypeDetect' )
+    unlet b:XPTfiletypeDetect
+endif
+let b:XPTfiletypeDetect = function( 'XPT_htmlFiletypeDetect' )
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/html/html.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/html/html.xpt.vim
new file mode 100644
index 0000000..b57f551
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/html/html.xpt.vim
@@ -0,0 +1,412 @@
+" TODO entity char
+" TODO back at 'base'
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+      \ xml/xml
+
+
+
+XPTvar $CURSOR_PH 
+
+XPTvar $CL    <!--
+XPTvar $CM
+XPTvar $CR      -->
+XPTinclude
+      \ _comment/doubleSign
+
+XPTembed
+      \ javascript/javascript
+      \ css/css
+
+" ========================= Function and Variables =============================
+
+
+
+fun! s:f.createTable(...) "{{{
+    let nrow_str = inputdialog("num of row:")
+    let nrow = nrow_str + 0
+
+    let ncol_str = inputdialog("num of column:")
+    let ncol = ncol_str + 0
+
+    let l = ""
+    let i = 0 | while i < nrow | let i += 1
+        let j = 0 | while j < ncol | let j += 1
+            let l .= "<tr>\n<td id=\"`pre^_".i."_".j."\"></td>\n</tr>\n"
+        endwhile
+    endwhile
+    return "<table id='`id^'>\n".l."</table>"
+endfunction "}}}
+
+
+let s:doctypes = {
+      \ 'HTML 3.2 Final'         : 'html PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"',
+      \ 'HTML 4.0 Frameset'      : 'html PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN" "http://www.w3.org/TR/REC-html40/frameset.dtd"',
+      \ 'HTML 4.0 Transitional'  : 'html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"',
+      \ 'HTML 4.0'               : 'html PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"',
+      \ 'HTML 4.01 Frameset'     : 'html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd"',
+      \ 'HTML 4.01 Transitional' : 'html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"',
+      \ 'HTML 4.01'              : 'html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"',
+      \ 'HTML 5'                 : 'HTML',
+      \ 'XHTML 1.0 Frameset'     : 'html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"',
+      \ 'XHTML 1.0 Strict'       : 'html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"',
+      \ 'XHTML 1.0 Transitional' : 'html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"',
+      \ 'XHTML 1.1'              : 'html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"',
+      \ 'XHTML Basic 1.0'        : 'html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"',
+      \ 'XHTML Basic 1.1'        : 'html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd"',
+      \ 'XHTML Mobile 1.0'       : 'html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd"',
+      \ 'XHTML Mobile 1.1'       : 'html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.1//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile11.dtd"',
+      \ 'XHTML Mobile 1.2'       : 'html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd"',
+      \}
+
+
+fun! s:f.html_doctype_list()
+    return keys( s:doctypes )
+endfunction
+
+fun! s:f.html_doctype_post(v)
+    if has_key( s:doctypes, a:v )
+        return s:doctypes[ a:v ]
+    else
+        return ''
+    endif
+endfunction
+
+fun! s:f.html_enc()
+    return &fenc == '' ? &encoding : &fenc
+endfunction
+
+let s:nIndent = 0
+fun! s:f.html_cont_ontype()
+    let v = self.V()
+    if v =~ '\V\n'
+        let v = matchstr( v, '\V\.\*\ze\n' )
+        let s:nIndent = &indentexpr != ''
+              \ ? eval( substitute( &indentexpr, '\Vv:lnum', 'line(".")', '' ) ) - indent( line( "." ) - 1 )
+              \ : self.NIndent()
+
+        return self.Finish( v . "\n" . repeat( ' ', s:nIndent ) )
+    else
+        return v
+    endif
+endfunction
+
+fun! s:f.html_cont_helper()
+    let v = self.V()
+    if v =~ '\V\n'
+        return self.ResetIndent( -s:nIndent, "\n" )
+    else
+        return ''
+    endif
+endfunction
+
+
+fun! s:f.html_tag_cmpl()
+    if !exists( 'b:xpt_html_tags' )
+        call htmlcomplete#LoadData()
+        let tagnames = sort( keys( b:html_omni ) )
+        let b:xpt_html_tags = []
+        let dict = {
+              \        'vimxmlattrinfo' : 1,
+              \        'vimxmlentities' : 1,
+              \        'vimxmlroot'     : 1,
+              \        'vimxmltaginfo'  : 1,
+              \        }
+        for t in tagnames
+            if !has_key( dict, t )
+                call add(b:xpt_html_tags, t)
+            endif
+        endfor
+    endif
+
+    return b:xpt_html_tags
+
+endfunction
+
+fun! s:f.html_close_tag()
+    let v = self.V()
+    if v =~ '\v/\s*$|^!'
+        return ''
+    else
+        return '</' . matchstr( v, '\v^\S+' ) . '>'
+    endif
+endfunction
+
+" ================================= Snippets ===================================
+
+
+call XPTdefineSnippet("id", {'syn' : 'tag'}, 'id="`^"')
+call XPTdefineSnippet("class", {'syn' : 'tag'}, 'class="`^"')
+
+
+
+" TODO map < to tag
+
+
+XPT tag hidden " <$_xSnipName>..</$_xSnipName>
+XSET content|def=Echo( R( 't' ) =~ '\v/\s*$' ? Finish() : '' )
+XSET content|ontype=html_cont_ontype()
+<`t^$_xSnipName^>`content^`content^html_cont_helper()^`t^html_close_tag()^
+..XPT
+
+
+XPT _tag wrap=content hidden " <$_xSnipName >..</$_xSnipName>
+XSET content|ontype=html_cont_ontype()
+<`$_xSnipName^>`content^^`content^html_cont_helper()^</`$_xSnipName^>
+..XPT
+
+" XPT _t hidden " ..
+" <`$_xSnipName^>`cont^</`$_xSnipName^>
+
+
+XPT _tagAttr wrap=content hidden " <$_xSnipName >..</$_xSnipName>
+XSET content|ontype=html_cont_ontype()
+XSET att?=Echo('')
+XSET att?|post=Echo(V()=~'\V\^ \$\|att?' ? '' : V())
+<`$_xSnipName^` `att?^>`content^^`content^html_cont_helper()^</`$_xSnipName^>
+..XPT
+
+
+XPT _tagblock hidden " <$_xSnipName >\n .. \n</$_xSnipName>
+<`$_xSnipName^>
+    `cursor^^
+</`$_xSnipName^>
+
+
+XPT _tagblockAttr hidden " <$_xSnipName >\n .. \n</$_xSnipName>
+<`$_xSnipName^` `attr^>
+    `cursor^^
+</`$_xSnipName^>
+
+
+XPT _shorttag hidden " <$_xSnipName />
+<`$_xSnipName^ />
+
+
+XPT _shorttagAttr hidden " <$_xSnipName />
+XSET att?=Echo('')
+XSET att?|post=Echo(V()=~'\V\^ \$\|att?' ? '' : V())
+<`$_xSnipName^` `att?^/>
+..XPT
+
+
+XPT doctype " <!DOCTYPE ***
+XSET doctype=html_doctype_list()
+XSET doctype|post=html_doctype_post( V() )
+<!DOCTYPE `doctype^>
+
+
+XPT html " <html><head>..<head><body>...
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+    `:head:^
+    <body>
+        `cursor^
+    </body>
+</html>
+
+
+XPT head " <head>..</head>
+<head>
+    `:contenttype:^
+    `:title:^
+</head>
+
+
+
+XPT contenttype " <meta http-equiv="Content-Type" content="...
+<meta http-equiv="Content-Type" content="text/html; charset=`encoding^html_enc()^"/>
+
+
+XPT title " <title>..</title>
+<title>`title^expand('%:t:r')^</title>
+
+
+XPT style " <style>..</style>
+<style type="text/css" media="screen">
+    `cursor^
+</style>
+
+
+XPT meta " <meta ..>
+<meta name="`meta_name^" content="`meta_content^" />
+
+
+XPT link " <link rel=".." ..>
+<link rel="`stylesheet^" type="`type^text/css^" href="`url^" />
+
+
+XPT script " <script language="javascript"...
+<script language="javascript" type="text/javascript">
+    `cursor^
+</script>
+..XPT
+
+
+XPT scriptsrc " <script .. src=...
+<script language="javascript" type="text/javascript" src="`js^"></script>
+
+
+XPT body " <body>..</body>
+<body>
+    `cursor^
+</body>
+
+
+
+XPT table alias=_tag
+XPT tr    alias=_tag
+XPT td    alias=_tag
+XPT th    alias=_tag
+
+
+XPT fulltable hidden " create a full table
+`createTable()^
+
+
+XPT a wrap " <a href...
+<a href="`href^">`cursor^</a>
+..XPT
+
+
+XPT div alias=_tag
+XPT p   alias=_tag
+XPT ul  alias=_tag
+XPT ol  alias=_tag
+XPT li  alias=_tag
+XPT span  alias=_tag
+
+
+
+XPT br alias=_shorttag
+XPT img alias=_shorttagAttr
+XSET att?=Embed( 'src="`where^" alt="`alt^"' )
+
+
+
+XPT h1 alias=_tag
+XPT h2 alias=_tag
+XPT h3 alias=_tag
+XPT h4 alias=_tag
+XPT h5 alias=_tag
+XPT h6 alias=_tag
+
+XPT iframe alias=_tagAttr
+XSET att?=Embed( 'name="`name^"' )
+
+
+
+" TODO enctype list : application/x-www-form-urlencoded
+XPT form wrap " <form ..>..</form>
+XSET method=ChooseStr( 'GET', 'POST' )
+<form action="`action^" method="`method^" accept-charset="`html_enc()^" enctype="multipart/form-data">
+    `cursor^
+</form>
+
+XPT textarea alias=_tagAttr
+XSET att?=Embed( 'name="`name^"' )
+
+
+XPT input alias=_shorttagAttr
+XSET att?=Embed( 'type="`type^" name="`name^" value="`value^"' )
+XSET type=ChooseStr( 'text', 'password', 'checkbox', 'radio', 'submit', 'reset', 'file', 'hidden', 'image', 'button' )
+
+
+" TODO other optional attribute like "checked", "readonly"
+XPT _input_tmpl hidden " <input type=Echo($_xSnipName[1:]) ... />
+<input type="`Echo($_xSnipName[1:])^" name="`name^" value="`value^" />
+
+XPT itext     alias=_input_tmpl
+XPT ipassword alias=_input_tmpl
+XPT icheckbox alias=_input_tmpl
+XPT iradio    alias=_input_tmpl
+XPT isubmit   alias=_input_tmpl
+XPT ireset    alias=_input_tmpl
+XPT ifile     alias=_input_tmpl
+XPT ihidden   alias=_input_tmpl
+XPT iimage    alias=_input_tmpl
+XPT ibutton   alias=_input_tmpl
+
+
+XPT label alias=_tagAttr
+XSET att?=Embed( 'for="`which^"' )
+
+
+XPT select alias=_tagAttr
+XSET att?=Embed( 'name="`name^"' )
+
+
+XPT option alias=_tagAttr
+XSET att?=Embed( 'value="`value^"' )
+
+
+XPT fieldset " <fieldset ..
+<fieldset>
+    <legend></legend>
+    `cursor^
+</fieldset>
+..XPT
+
+" XPT sdiv alias=_t
+
+" XPT diva " tips
+" `:div( { 'content' : ':a:' } ):^
+
+
+" html 5
+" http://dev.w3.org/html5/html4-differences/Overview.html#character-encoding
+
+" XPT section alias=_tag
+" XPT article alias=_tag
+" XPT aside alias=_tag
+" XPT hgroup alias=_tag
+" XPT header alias=_tag
+" XPT footer alias=_tag
+" XPT nav alias=_tag
+
+" XPT figure alias=_tag
+" XPT figcaption alias=_tag
+
+" XPT video alias=_tag
+" XPT audio alias=_tag
+" XPT source alias=_tag
+
+" XPT embed alias=_tag
+
+" XPT mark alias=_tag
+" XPT progress alias=_tag
+" XPT meter alias=_tag
+" XPT time alias=_tag
+
+
+" XPT canvas alias=_tag
+" XPT comand alias=_tag
+" XPT details alias=_tag
+" XPT datalist alias=_tag
+
+" XPT keygen alias=_tag
+" XPT output alias=_tag
+
+" XPT ruby alias=_tag
+
+" input type=
+" tel
+" search
+" url
+" email
+" datetime
+" date
+" month
+" week
+" time
+" datetime-local
+" number
+" range
+" color 
+
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/html/php.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/html/php.xpt.vim
new file mode 100644
index 0000000..545e62c
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/html/php.xpt.vim
@@ -0,0 +1,31 @@
+" These snippets work only in html context of php file
+if &filetype != 'php'
+    finish
+endif
+
+XPTemplate priority=lang-2
+
+" this is html-scope variable independent
+if exists( 'php_noShortTags' )
+    XPTvar $PHP_TAG php
+else
+    XPTvar $PHP_TAG
+endif
+
+
+XPT shebang " #!/usr/bin/env php
+#!/usr/bin/env php
+
+..XPT
+
+XPT sb alias=shebang
+
+
+XPT php " <?$PHP_TAG ?>
+<?`$PHP_TAG^ `cursor^ ?>
+
+XPT pe " <?= ?>
+<?=`cursor^?>
+
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/htmldjango/htmldjango.ftdetect.vim b/vim-plugins/bundle/xptemplate/ftplugin/htmldjango/htmldjango.ftdetect.vim
new file mode 100644
index 0000000..52880ed
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/htmldjango/htmldjango.ftdetect.vim
@@ -0,0 +1,77 @@
+if exists( "g:__HTMLDJANGO_FTDETECT_VIM__" )
+    finish
+endif
+let g:__HTMLDJANGO_FTDETECT_VIM__ = 1
+
+
+if &filetype !~ 'htmldjango'
+    finish
+endif
+
+
+" TODO use array instead of dict because of duplicated key could be possible
+let s:skipPattern = 'synIDattr(synID(line("."), col("."), 0), "name") =~? "\\vstring|comment"'
+let s:pattern = {
+            \   'django'    : {
+            \       'start' : '\V\c{%',
+            \       'mid'   : '',
+            \       'end'   : '\V\c%}',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \   'django_expr'    : {
+            \       'start' : '\V\c{{',
+            \       'mid'   : '',
+            \       'end'   : '\V\c}}',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \   'javascript'    : {
+            \       'start' : '\V\c<script\_[^>]\*>',
+            \       'mid'   : '',
+            \       'end'   : '\V\c</script>',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \   'css'           : {
+            \       'start' : '\V\c<style\_[^>]\*>',
+            \       'mid'   : '',
+            \       'end'   : '\V\c</style>',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \}
+
+let s:topFT = 'htmldjango'
+
+fun! XPT_htmldjangoFiletypeDetect() "{{{
+    let pos = [ line( "." ), col( "." ) ]
+
+    let synName = xpt#util#NearestSynName()
+
+    if synName == ''
+
+        return s:topFT
+
+    else
+
+        for [ name, ftPattern ] in items( s:pattern )
+            let pos = searchpairpos( ftPattern.start, ftPattern.mid, ftPattern.end, 'nbW', ftPattern.skip )
+            if pos != [0, 0]
+                return name
+            endif
+        endfor
+
+        if synName =~ '\v^\cjavascript'
+            return 'javascript'
+        elseif synName =~ '\v^\ccss'
+            return 'css'
+        endif
+
+        return s:topFT
+
+    endif
+
+endfunction "}}}
+
+if exists( 'b:XPTfiletypeDetect' )
+    unlet b:XPTfiletypeDetect
+endif
+let b:XPTfiletypeDetect = function( 'XPT_htmldjangoFiletypeDetect' )
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/htmldjango/htmldjango.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/htmldjango/htmldjango.xpt.vim
new file mode 100644
index 0000000..0823d90
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/htmldjango/htmldjango.xpt.vim
@@ -0,0 +1,80 @@
+XPTemplate priority=lang-
+
+
+XPTinclude
+      \ _common/common
+      \ html/html
+
+
+XPT _simpletag hidden " {% $_xSnipName %}
+{% `$_xSnipName^ %}
+..XPT
+
+
+XPT _tag hidden " {% $_xSnipName params %}
+{% `$_xSnipName^ `params^ %}
+..XPT
+
+
+XPT _qtag hidden " {% $_xSnipName "params" %}
+{% `$_xSnipName^ "`params^" %}
+..XPT
+
+
+XPT _simpleblock hidden " {% $_xSnipName %}..{% end$_xSnipName %}
+{% `$_xSnipName^ %}`content^{% end`$_xSnipName^ %}
+..XPT
+
+
+XPT _block wrap=content hidden " {% $_xSnipName  params %}..{% end$_xSnipName %} 
+{% `$_xSnipName^ `params^ %}
+    `content^
+{% end`$_xSnipName^ %}
+..XPT
+
+
+XPT _qblock wrap=content hidden " {% $_xSnipName "params" %}..{% end$_xSnipName %} 
+{% `$_xSnipName^ "`params^" %}
+    `content^
+{% end`$_xSnipName^ %}
+..XPT
+
+
+XPT _if wrap=content " $_xSnipName .. else .. end$_xSnipName
+{% `$_xSnipName^ `param^ %}
+    `content^
+`else...{{^{% else %}
+    `content^`}}^
+{% end`$_xSnipName^ %}
+..XPT
+
+
+XPT var " {{ var }}
+{{ `var^ }}
+..XPT
+
+
+XPT autoescape  alias=_block
+XPT block       alias=_block
+XPT comment     alias=_simpleblock
+XPT csrf_token  alias=_simpletag
+XPT cycle       alias=_tag
+XPT debug       alias=_simpletag
+XPT extends     alias=_qtag
+XPT filter      alias=_block
+XPT firstof     alias=_tag
+XPT for         alias=_block
+XPT empty       alias=_simpletag
+XPT else        alias=_simpletag
+XPT if          alias=_if
+XPT ifchanged   alias=_if
+XPT ifequal     alias=_if
+XPT ifnotequal  alias=_if
+XPT include     alias=_qtag
+XPT load        alias=_tag
+XPT now         alias=_tag
+XPT regroup     alias=_tag
+XPT url         alias=_tag
+XPT spaceless   alias=_simpleblock
+XPT ssi         alias=_tag
+XPT with        alias=_block
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/java/java.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/java/java.xpt.vim
new file mode 100755
index 0000000..e68e39e
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/java/java.xpt.vim
@@ -0,0 +1,113 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          true
+XPTvar $FALSE         false
+XPTvar $NULL          null
+XPTvar $UNDEFINED     null
+
+XPTvar $VOID_LINE     /* void */;
+XPTvar $CURSOR_PH     /* cursor */
+
+XPTvar $BRif          ' '
+XPTvar $BRloop        ' '
+XPTvar $BRstc         ' '
+XPTvar $BRfun         ' '
+
+XPTinclude
+      \ _common/common
+
+XPTvar $CL    /*
+XPTvar $CM    *
+XPTvar $CR    */
+XPTinclude
+      \ _comment/doubleSign
+
+XPTinclude
+      \ _condition/c.like
+      \ _loops/java.for.like
+      \ _loops/c.while.like
+
+
+" ========================= Function and Variables =============================
+
+" ================================= Snippets ===================================
+
+
+
+
+XPT foreach " for \( .. : .. \)
+for (`$SParg^`type^ `var^ : `inWhat^`$SParg^)`$BRloop^{
+    `cursor^
+}
+
+
+XPT private " private .. ..
+private `type^ `varName^;
+
+XPT public " private .. ..
+public `type^ `varName^;
+
+XPT protected " private .. ..
+protected `type^ `varName^;
+
+XPT class " class .. ctor
+public class `className^ {
+    public `className^(`$SParg^`ctorParam^`$SParg^)`$BRfun^{
+        `cursor^
+    }
+}
+
+
+XPT main " main ( String )
+public static void main(`$SParg^String[] args`$SParg^)`$BRfun^{
+    `cursor^
+}
+
+
+XPT enum " public enum { .. }
+`public^ enum `enumName^
+{
+    `elem^` `...^,
+    `subElem^` `...^
+};
+`cursor^
+
+XPT prop " var getVar () setVar ()
+`type^ `varName^;
+
+`get...^
+XSETm get...|post
+public `R("type")^ get`S(R("varName"),'.','\u&',"")^()
+    { return `R("varName")^; }
+
+XSETm END
+`set...^
+XSETm set...|post
+public `R("type")^ set`S(R("varName"),'.','\u&',"")^( `R('type')^ val )
+    { `R("varName")^ = val; return `R( 'varName' )^; }
+
+XSETm END
+
+
+XPT try wrap=what " try .. catch (..) .. finally
+XSET handler=$CL handling $CR
+try
+{
+    `what^
+}` `catch...^
+XSETm catch...|post
+
+catch (`Exception^ `e^)
+{
+    `handler^
+}` `catch...^
+XSETm END
+`finally...{{^finally
+{
+    `cursor^
+}`}}^
+
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/javascript/javascript.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/javascript/javascript.xpt.vim
new file mode 100644
index 0000000..768fd9c
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/javascript/javascript.xpt.vim
@@ -0,0 +1,163 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+
+XPTvar $TRUE          true
+XPTvar $FALSE         false
+XPTvar $NULL          null
+XPTvar $UNDEFINED     undefined
+
+XPTvar $BRif     ' '
+XPTvar $BRel   \n
+XPTvar $BRloop    ' '
+XPTvar $BRstc ' '
+XPTvar $BRfun   ' '
+
+XPTvar $VOID_LINE  /* void */;
+XPTvar $CURSOR_PH      /* cursor */
+
+
+XPTvar $CL  /*
+XPTvar $CM   *
+XPTvar $CR   */
+
+XPTinclude
+      \ _common/common
+      \ _comment/doubleSign
+      \ _condition/ecma
+
+
+XPTvar $VAR_PRE
+XPTvar $FOR_SCOPE 'var '
+XPTinclude
+      \ _loops/for
+
+XPTinclude
+      \ javascript/jquery
+
+" ========================= Function and Variables =============================
+
+
+" ================================= Snippets ===================================
+
+
+
+XPT bench " Benchmark
+XSET log=console.log
+XSET job=$VOID_LINE
+XSET jobn=$VOID_LINE
+var t0 = new Date().getTime();
+for (var i = 0; i < `times^; ++i){
+    `job^
+}
+var t1 = new Date().getTime();
+for (var i = 0; i < `times^; ++i){
+    `jobn^
+}
+var t2 = new Date().getTime();
+`log^(t1-t0, t2-t1);
+
+..XPT
+
+XPT asoe " assertObjectEquals
+assertObjectEquals(`mess^
+                  , `arr^
+                  , `expr^)
+
+
+XPT cmt " /** @auth... */
+XSET author=$author
+XSET email=$email
+/**
+* @author : `author^ | `email^
+* @description
+*     `cursor^
+* @return {`Object^} `desc^
+*/
+
+
+XPT cpr " @param
+@param {`Object^} `name^ `desc^
+
+
+" file comment
+" 4 back slash represent 1 after rendering.
+XPT fcmt " full doxygen comment
+/**-------------------------/// `sum^ \\\---------------------------
+ *
+ * <b>`function^</b>
+ * @version : `1.0^
+ * @since : `date^
+ *
+ * @description :
+ *   `cursor^
+ * @usage :
+ *
+ * @author : `$author^ | `$email^
+ * @copyright :
+ * @TODO :
+ *
+ *--------------------------\\\ `sum^ ///---------------------------*/
+
+
+XPT fun " function ..( .. ) {..}
+XSET arg*|post=ExpandIfNotEmpty(', ', 'arg*')
+function` `name^ (`arg*^) {
+    `cursor^
+}
+
+
+XPT forin " for (var .. in ..) {..}
+for ( var `i^ in `array^ )`$BRloop^{
+    var `e^ = `array^[`i^];
+    `cursor^
+}
+
+
+XPT new " var .. = new ..\(..)
+XSET arg*|post=ExpandIfNotEmpty(', ', 'arg*')
+var `instant^ = new `Constructor^(`arg*^)
+
+
+XPT proto " ...prototype... = function\(..) { .. }
+XSET arg*|post=ExpandIfNotEmpty(', ', 'arg*')
+`Class^.prototype.`method^ = function(`arg*^)`$BRfun^{
+`cursor^
+}
+
+
+XPT setTimeout " setTimeout\(function\() { .. }, ..)
+XSET job=$VOID_LINE
+setTimeout(function() { `job^ }, `milliseconds^)
+
+
+XPT try wrap=job " try {..} catch {..} finally
+XSET dealError=/* error handling */
+XSET job=$VOID_LINE
+try`$BRif^{
+    `job^
+}
+catch (`err^)`$BRif^{
+    `dealError^
+}`...^
+catch (`err^)`$BRif^{
+    `dealError^
+}`...^`
+`finally...{{^
+finally`$BRif^{
+    `cursor^
+}`}}^
+
+
+XPT bench_ wraponly=wrapped " Benchmark
+XSET log=console.log
+var t0 = new Date().getTime();
+for (var i = 0; i < `times^; ++i){
+    `wrapped^
+}
+var t1 = new Date().getTime();
+`log^(t1-t0);
+
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/javascript/jquery.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/javascript/jquery.xpt.vim
new file mode 100644
index 0000000..ac665dd
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/javascript/jquery.xpt.vim
@@ -0,0 +1,558 @@
+" finish " not finished
+if !g:XPTloadBundle( 'javascript', 'jquery' )
+    finish
+endif
+
+XPTemplate priority=lang-2
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          true
+XPTvar $FALSE         false
+XPTvar $NULL          null
+XPTvar $UNDEFINED     undefined
+
+XPTvar $BRif     ' '
+XPTvar $BRel   \n
+XPTvar $BRloop    ' '
+XPTvar $BRloop  ' '
+XPTvar $BRstc ' '
+XPTvar $BRfun   ' '
+
+" XPTvar $JQ jQuery
+XPTvar $JQ $
+
+XPTinclude
+    \ _common/common
+
+
+" ========================= Function and Variables =============================
+let s:options = {
+            \'async'         : 1,
+            \'beforeSend'    : 1,
+            \'cache'         : 1,
+            \'complete'      : 1,
+            \'contentType'   : 1,
+            \'data'          : 1,
+            \'dataFilter'    : 1,
+            \'dataType'      : 1,
+            \'error'         : 1,
+            \'global'        : 1,
+            \'ifModified'    : 1,
+            \'jsonp'         : 1,
+            \'password'      : 1,
+            \'processData'   : 1,
+            \'scriptCharset' : 1,
+            \'success'       : 1,
+            \'timeout'       : 1,
+            \'type'          : 1,
+            \'url'           : 1,
+            \'username'      : 1,
+            \'xhr'           : 1,
+            \}
+fun! s:f.jquery_ajaxOptions()
+
+endfunction
+
+" ================================= Snippets ===================================
+
+" ===============
+" Snippet Pieces
+" ===============
+
+XPT optionalExpr hidden
+(`$SParg^`expr?^`expr?^CmplQuoter_pre()^`$SParg^)
+
+XPT expr hidden
+(`$SParg^`expr^`expr^CmplQuoter_pre()^`$SParg^)
+
+XPT maybeFunction hidden
+(`$SParg^`function...{{^function(`i^`, `e?^) { `cursor^ }`}}^`$SParg^)
+
+XPT optionalVal hidden
+(`$SParg`val?`$SParg^)
+
+XPT _funExp hidden
+`function...{{^function(`i^`, `e?^) { `cursor^ }`}}^
+..XPT
+
+" ============
+" jQuery Core
+" ============
+
+XPT $ " $\()
+$(`$SParg^`e^`e^CmplQuoter_pre()^`, `context?^`$SParg^)
+
+XPT jq " jQuery\()
+jQuery(`$SParg^`e^`e^CmplQuoter_pre()^`, `context?^`$SParg^)
+
+XPT each " each\(...
+each`:maybeFunction:^
+
+XPT sz " size\()
+size()
+
+XPT eq " eq\(...)
+eq(`$SParg^`^`$SParg^)
+
+XPT get " get\(...)
+get(`$SParg^`^`$SParg^)
+
+XPT ind " index\(...)
+index(`$SParg^`^`$SParg^)
+
+XPT da " data\(.., ..)
+data(`$SParg^`name^`, `value?^`$SParg^)
+
+XPT rmd " removeData\(..)
+removeData(`$SParg^`name^`$SParg^)
+
+XPT qu " queue\(.., ..)
+queue(`$SParg^`name^`, `toAdd?^`$SParg^)
+
+XPT dq " dequeue\(...)
+dequeue(`$SParg^`name^`$SParg^)
+..XPT
+
+
+
+
+" ==================
+" jQuery Attributes
+" ==================
+
+XPT attr " attr\(..
+attr(`$SParg^`name^`$SParg^)
+
+XPT rma " removeAttr\(..
+removeAttr(`$SParg^`name^`$SParg^)
+
+XPT ac " addClass\(..
+addClass(`$SParg^`class^`$SParg^)
+
+XPT hc " hasClass\(..
+hasClass(`$SParg^`class^`$SParg^)
+
+XPT tc " toggleClass\(..
+toggleClass(`$SParg^`class^`, `switch?^`$SParg^)
+
+XPT html " html\(..
+html`:optionalVal:^
+
+XPT text " text\(..
+text`:optionalVal:^
+
+XPT val " val\(..
+val`:optionalVal:^
+..XPT
+
+
+
+
+" ===================
+" CSS
+" ===================
+
+XPT css " css\(..
+css`:optionalVal:^
+
+XPT os " offset\()
+offset()
+
+XPT osp " offsetParent\()
+offsetParent()
+
+XPT pos " position\()
+position()
+
+XPT scrt " scrollTop\()
+scrollTop`:optionalVal:^
+
+XPT scrl " scrollLeft\()
+scrollLeft`:optionalVal:^
+
+XPT ht " height\(..)
+height`:optionalVal:^
+
+XPT wth " width\(..)
+width`:optionalVal:^
+
+XPT ih " innerHeight\()
+innerHeight()
+
+XPT iw " innerWidth\()
+innerWidth()
+
+XPT oh " outerHeight\(..)
+outerHeight(`$SParg^`margin^`$SParg^)
+
+XPT ow " outerWidth\(..)
+outerWidth(`$SParg^`margin^`$SParg^)
+..XPT
+
+
+
+
+
+" ===================
+" Traversing
+" ===================
+
+XPT flt " filter\(..
+filter`:maybeFunction:^
+
+XPT is " is\(..
+is`:expr:^
+
+XPT map " map\(..
+map`:maybeFunction:^
+
+XPT not " not\(..)
+not`:expr:^
+
+XPT slc " slice\(start, end)
+slice(`$SParg^`start^`, `end?^`$SParg^)
+
+XPT add " add\(..)
+add`:expr:^
+
+XPT chd " children\(..)
+children`:optionalExpr:^
+
+XPT cls " closest\(..)
+closest`:expr:^
+
+XPT con " content\()
+content()
+
+XPT fd " find\(..)
+find`:expr:^
+
+XPT ne " next\(..)
+next`:optionalExpr:^
+
+XPT na " nextAll\(..)
+nextAll`:optionalExpr:^
+
+XPT pr " parent\(..)
+parent`:optionalExpr:^
+
+XPT prs " parents\(..)
+parents`:optionalExpr:^
+
+XPT prv " prev\(..)
+prev`:optionalExpr:^
+
+XPT pra " prevAll\(..)
+prevAll`:optionalExpr:^
+
+XPT sib " sibling\(..)
+sibling`:optionalExpr:^
+
+XPT as " andSelf\()
+andSelf()
+
+XPT end " end\()
+end()
+..XPT
+
+
+
+" ===================
+" Manipulation
+" ===================
+XPT ap " append\(..)
+append`:expr:^
+
+XPT apt " appendTo\(..)
+appendTo`:expr:^
+
+XPT pp " prepend\(..)
+prepend`:expr:^
+
+XPT ppt " prependTo\(..)
+prependTo`:expr:^
+
+XPT af " after\(..)
+after`:expr:^
+
+XPT bf " before\(..)
+before`:expr:^
+
+XPT insa " insertAfter\(..)
+insertAfter`:expr:^
+
+XPT insb " insertBefore\(..)
+insertBefore`:expr:^
+
+XPT wr " wrap\(..)
+wrap`:expr:^
+
+XPT wra " wrapAll\(..)
+wrapAll`:expr:^
+
+XPT wri " wrapInner\(..)
+wrapInner`:expr:^
+
+XPT rep " replaceWith\(..)
+replaceWith`:expr:^
+
+XPT repa " replaceAll\(..)
+replaceAll`:expr:^
+
+XPT emp " empty\()
+empty()
+
+XPT rm " remove\(..)
+remove`:optionalExpr:^
+
+XPT cl " clone\(..)
+cloen`:optionalExpr:^
+..XPT
+
+" =========================
+" Ajax
+" =========================
+" TODO callback
+" TODO ajax option
+" TODO universial behavior for clearing optional argument
+
+XPT _ld_callback hidden
+function(`$SParg^`resText^`, `textStatus^`, `xhr^`$SParg^) { `cursor^ }
+
+XPT _aj_type hidden
+XSET type=ChooseStr( '"xml"', '"html"', '"script"', '"json"', '"jsonp"', '"text"' )
+`, `type^
+
+XPT _fun0 hidden
+function() { `cursor^ }
+
+
+
+XPT aj " $JQ.ajax\(..)
+`$JQ^.ajax(`$SParg^`opt^`$SParg^)
+
+XPT load " load\(url, ...)
+load(`$SParg^`url^`url^CmplQuoter_pre()^`, `data^`data^CmplQuoter_pre()^`, `function...{{^, `:_ld_callback:^`}}^`$SParg^)
+
+XPT ag " $JQ.get\(url, ...)
+`$JQ^.get(`$SParg^`url^`url^CmplQuoter_pre()^`, `data^`data^CmplQuoter_pre()^`, `callback^`:_aj_type:^`$SParg^)
+
+XPT agj " $JQ.getJSON\(url, ...)
+`$JQ^.getJSON(`$SParg^`url^`url^CmplQuoter_pre()^`, `data^`, `callback^`$SParg^)
+
+XPT ags " $JQ.getScript\(url, ...)
+`$JQ^.getScript(`$SParg^`url^`url^CmplQuoter_pre()^`, `callback^`$SParg^)
+
+XPT apost " $JQ.post\(url, ...)
+`$JQ^.post(`$SParg^`url^`url^CmplQuoter_pre()^`, `data^`data^CmplQuoter_pre()^`, `callback^`:_aj_type:^`$SParg^)
+
+
+
+XPT ajaxComplete " ajaxComplete\(callback)
+ajaxComplete(`$SParg^`fun...{{^function (`$SParg^`event^`, `xhr^`, `ajaxOption^`$SParg^){ `cursor^ }`}}^`$SParg^)
+
+XPT ajaxError " ajaxError\(callback)
+ajaxError(`$SParg^`fun...{{^function (`$SParg^`event^`, `xhr^`, `ajaxOption^`, `err^`$SParg^){ `cursor^ }`}}^`$SParg^)
+
+XPT ajaxSend " ajaxSend\(callback)
+ajaxSend(`$SParg^`fun...{{^function (`$SParg^`event^`, `xhr^`, `ajaxOption^`$SParg^){ `cursor^ }`}}^`$SParg^)
+
+XPT ajaxStart " ajaxStart\(callback)
+ajaxStart(`$SParg^`fun...{{^`:_fun0:^`}}^`$SParg^)
+
+XPT ajaxStop " ajaxStop\(callback)
+ajaxStop(`$SParg^`fun...{{^`:_fun0:^`}}^`$SParg^)
+
+XPT ajaxSuccess " ajaxSuccess\(callback)
+ajaxSuccess(`$SParg^`fun...{{^function (`$SParg^`event^`, `xhr^`, `ajaxOption^`$SParg^){ `cursor^ }`}}^`$SParg^)
+
+
+
+XPT asetup " $JQ.ajaxSetup\(opt)
+`$JQ^.ajaxSetup(`$SParg^`opt^`$SParg^)
+
+XPT ser " serialize\()
+serialize()
+
+XPT sera " serializeArray\()
+serializeArray()
+..XPT
+
+
+" ===================
+" Events
+" ===================
+XPT _ev_fun_a hidden
+XSET job=VoidLine()
+function (`$SParg^`ev^`$SParg^) { `job^ }
+
+XPT _ev_fun hidden
+function (`$SParg^`ev^`$SParg^) { `cursor^ }
+
+XPT _ev_arg hidden
+(`$SParg^`type^`type^CmplQuoter_pre()^`, `data^`, `fun...{{^, `:_ev_fun:^`}}^`$SParg^)
+
+XPT _ev_tr_arg hidden
+(`$SParg^`ev^`ev^CmplQuoter_pre()^`, `data^`$SParg^)
+
+XPT _ev_arg_fun hidden
+(`$SParg^`fun...{{^`:_ev_fun:^`}}^`$SParg^)
+
+
+
+XPT rd " ready\(fun)
+ready(`$SParg^`fun...{{^`:_fun0:^`}}^`$SParg^)
+
+XPT bd " bind\(type, data, fun)
+bind`:_ev_arg:^
+
+XPT one " one\(type, data, fun)
+one`:_ev_arg:^
+
+XPT tr " trigger\(ev, data)
+trigger`:_ev_tr_arg:^
+
+XPT trh " triggerHandler\(ev, data)
+triggerHandler`:_ev_tr_arg:^
+
+XPT ub " unbind\(type, fun)
+unbind(`$SParg^`type^`type^CmplQuoter_pre()^`, `fun^`$SParg^)
+
+XPT lv " live\(type, fun)
+live`:_ev_arg:^
+
+XPT die " die\(type, fun)
+die(`$SParg^`type^`type^CmplQuoter_pre()^`, `fun^`$SParg^)
+
+XPT ho " hover\(over, out)
+hover(`$SParg^`over...{{^, `:_ev_fun_a:^`}}^`, `out..{{^, `:_ev_fun:^`}}^`$SParg^)
+
+XPT tg " toggle\(fn1, fn2, ...)
+toggle(`$SParg^`fn1...{{^, `:_ev_fun_a:^`}}^`, `fn2...{{^, `:_ev_fun:^`}}^`$SParg^)
+
+
+
+XPT bl " blur\(fun)
+blur`:_ev_arg_fun:^
+
+XPT res " resize\(fun)
+resize`:_ev_arg_fun:^
+
+XPT scr " scroll\(fun)
+scroll`:_ev_arg_fun:^
+
+XPT sel " select\(fun)
+select`:_ev_arg_fun:^
+
+XPT sub " submit\(fun)
+submit`:_ev_arg_fun:^
+
+XPT unl " unload\(fun)
+unload`:_ev_arg_fun:^
+
+
+
+XPT kdown " keydown\(fun)
+keydown`:_ev_arg_fun:^
+
+XPT kup " keyup\(fun)
+keyup`:_ev_arg_fun:^
+
+XPT kpress " keypress\(fun)
+keypress`:_ev_arg_fun:^
+
+XPT clk " click\(fun)
+click`:_ev_arg_fun:^
+
+XPT dclk " dbclick\(fun)
+dbclick`:_ev_arg_fun:^
+
+
+
+XPT foc " focus\(fun)
+focus`:_ev_arg_fun:^
+
+XPT err " error\(fun)
+error`:_ev_arg_fun:^
+
+
+
+XPT mup " mouseup\(fun)
+mouseup`:_ev_arg_fun:^
+
+XPT mdown " mousedown\(fun)
+mousedown`:_ev_arg_fun:^
+
+XPT mmove " mousemove\(fun)
+mousemove`:_ev_arg_fun:^
+
+XPT menter " mouseenter\(fun)
+mouseenter`:_ev_arg_fun:^
+
+XPT mleave " mouseleave\(fun)
+mouseleave`:_ev_arg_fun:^
+
+XPT mout " mouseout\(fun)
+mouseout`:_ev_arg_fun:^
+
+
+
+
+XPT ld " load\(fun)
+load`:_ev_arg_fun:^
+
+XPT ch " change\(fun)
+change`:_ev_arg_fun:^
+..XPT
+
+
+
+" ===================
+" Effects
+" ===================
+
+XPT _ef_arg hidden
+(`$SParg^`speed^`speed^CmplQuoter_pre()^`, `fun...{{^, `:_fun0:^`}}^`$SParg^)
+
+XPT sh " show\(speed, callback)
+show`:_ef_arg:^
+
+XPT hd " hide\(speed, callback)
+hide`:_ef_arg:^
+
+XPT sld " slideDown\(speed, callback)
+slideDown`:_ef_arg:^
+
+XPT slu " slideUp\(speed, callback)
+slideUp`:_ef_arg:^
+
+XPT slt " slideToggle\(speed, callback)
+slideToggle`:_ef_arg:^
+
+
+
+XPT fi " fadeIn\(speed, callback)
+fadeIn`:_ef_arg:^
+
+XPT fo " fadeOut\(speed, callback)
+fadeOut`:_ef_arg:^
+
+XPT ft " fadeTo\(speed, callback)
+fadeTo(`$SParg^`speed^`speed^CmplQuoter_pre()^`, `opacity^`opacity^CmplQuoter_pre()^`, `fun...{{^, `:_fun0:^`}}^`$SParg^)
+
+XPT ani " animate\(params, ...)
+animate(`$SParg^`params^`, `param^`$SParg^)
+
+XPT stop " stop\()
+stop()
+..XPT
+
+" ===================
+" TODO select helper
+" ===================
+
+
+
+" ================================= Wrapper ===================================
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/json/json.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/json/json.xpt.vim
new file mode 100644
index 0000000..0e49585
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/json/json.xpt.vim
@@ -0,0 +1,23 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+" use snippet 'varConst' to generate contant variables
+" use snippet 'varFormat' to generate formatting variables
+" use snippet 'varSpaces' to generate spacing variables
+
+
+XPTinclude
+      \ _common/common
+
+XPT array " [ ..., ... ]
+[ `val^`...^, `val^`...^ ]
+
+XPT obj " { "...":... }
+{ "`key^":`val^`...^, "`key^":`val^`...^ }
+
+XPT dic " { "...":..., ... }
+{ "`key^":`val^`...^,
+  "`key^":`val^`...^
+}
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/lex/lex.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/lex/lex.xpt.vim
new file mode 100644
index 0000000..c46496f
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/lex/lex.xpt.vim
@@ -0,0 +1,45 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+XPTvar $VOID_LINE  /* void */;
+XPTvar $CURSOR_PH      cursor
+
+XPTvar $BRif          ' '
+XPTvar $BRel          \n
+XPTvar $BRloop        ' '
+XPTvar $BRstc         ' '
+XPTvar $BRfun         ' '
+
+XPTinclude
+    \ _common/common
+    \ c/c
+
+
+" ========================= Function and Variables =============================
+
+" ================================= Snippets ===================================
+
+
+XPT lex " Basic lex file
+%{
+/* includes */
+%}
+/* options */
+%%
+/* rules */
+%%
+/* C code */
+
+
+XPT ruleList " ..  {..} ...
+`reg^           { `return^ }`...^
+`reg^           { `return^ }`...^
+
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/lua/lua.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/lua/lua.xpt.vim
new file mode 100644
index 0000000..d408a7a
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/lua/lua.xpt.vim
@@ -0,0 +1,143 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+XPTvar $VOID_LINE  /* void */;
+XPTvar $CURSOR_PH      -- cursor
+
+XPTvar $BRif     \n
+XPTvar $BRloop    \n
+XPTvar $BRloop  \n
+XPTvar $BRstc \n
+XPTvar $BRfun   \n
+
+XPTvar $CS    --
+
+XPTinclude
+      \ _common/common
+      \ _comment/singleSign
+
+
+" ========================= Function and Variables =============================
+
+" Remove an item if its value hasn't change
+fun! s:f.RemoveIfUnchanged() "{{{
+  let v = self.V()
+  let [lft, rt] = self.ItemEdges()
+  if v == lft . self.N() . rt
+    return ''
+  else
+    return v
+  end
+endfunction "}}}
+
+" ================================= Snippets ===================================
+
+
+
+XPT do " do ... end
+do
+    `cursor^
+end
+
+
+XPT fn " function \(..) .. end
+XSET arg*|post=ExpandIfNotEmpty(', ', 'arg*')
+function (`arg*^) `cursor^ end
+
+
+XPT for " for ..=..,.. do ... end
+XSET step?|post=EchoIfNoChange('')
+for `var^ = `0^, `10^`, `step?^ do
+    `cursor^
+end
+
+
+XPT forin " for .. in .. do ... end
+XSET var*|post=ExpandIfNotEmpty(', ', 'var*')
+for `var*^ in `expr^ do
+    `cursor^
+end
+
+
+XPT forip " for ..,.. in ipairs\(..) do ... end
+for `key^, `value^ in ipairs(`table^) do
+    `cursor^
+end
+
+
+XPT forp " for ..,.. in pairs\(..) do ... end
+for `key^, `value^ in pairs(`table^) do
+    `cursor^
+end
+
+
+XPT fun " function ..\(..) .. end
+XSET arg*|post=ExpandIfNotEmpty(', ', 'arg*')
+function `name^(`arg*^)
+    `cursor^
+end
+
+
+XPT if " if .. then .. end
+if `cond^ then
+    `cursor^
+end
+
+
+XPT ife " if .. then .. else .. end
+XSET job=$CS job
+if `cond^ then
+    `job^
+else
+    `cursor^
+end
+
+
+XPT ifei " if .. then .. elseif .. else .. end
+XSET job=$CS job
+if `cond^ then`
+    `job^
+``elseif...`
+{{^elseif `comparison^ then
+    `job^
+``elseif...`
+^`}}^``else...`
+{{^else
+    `cursor^
+`}}^end
+
+
+XPT locf " local function ..\(..) ... end
+XSET arg*|post=ExpandIfNotEmpty(', ', 'arg*')
+local function `name^(`arg*^)
+    `cursor^
+end
+
+
+" !!! snippet ends with a space !!!
+XPT locv " local .. = ..
+local `var^ = 
+
+
+XPT p " print\(..)
+print(`cursor^)
+
+
+XPT repeat " repeat .. until ..
+repeat
+    `cursor^
+until
+
+
+XPT while " while .. do ... end
+while `cond^ do
+    `cursor^
+end
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/make/make.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/make/make.xpt.vim
new file mode 100644
index 0000000..aa88df7
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/make/make.xpt.vim
@@ -0,0 +1,76 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+XPTvar $VOID_LINE  # void
+XPTvar $CURSOR_PH      # cursor
+
+XPTvar $CS    #
+
+XPTinclude
+      \ _common/common
+      \ _comment/singleSign
+
+
+" ========================= Function and Variables =============================
+
+
+" ================================= Snippets ===================================
+
+XPT addprefix " $(addprefix ...)
+$(addprefix `prefix^, `elemList^)
+
+
+XPT addsuffix " $(addsuffix ...)
+$(addsuffix `suffix^, `elemList^)
+
+
+XPT filterout " $(filter-out ...)
+$(filter-out `toRemove^, `elemList^)
+
+
+XPT patsubst " $(patsubst ...)
+$(patsubst `sourcePattern^%.c^,  `destPattern^%.o^, `list^)
+
+
+XPT shell " $(shell ...)
+$(shell `command^)
+
+
+XPT subst " $(subst ...)
+$(subst `sourceString^, `destString^, `string^)
+
+
+XPT wildcard " $(wildcard ...)
+$(wildcard `globpattern^)
+
+
+XPT ifneq " ifneq ... else ... endif
+ifneq (`what^, `with^)
+    `job^
+``else...`
+{{^else
+    `cursor^
+`}}^endif
+
+
+XPT ifeq " ifneq ... else ... endif
+XSET job=$CS job
+ifeq (`what^, `with^)
+    `job^
+``else...`
+{{^else
+    `cursor^
+`}}^endif
+
+
+XPT basevar " CC ... CFLAG ..
+`lang^C^C := `compiler^gcc^
+`lang^C^FLAGS := `switches^-Wall -Wextra^
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/markdown/markdown.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/markdown/markdown.xpt.vim
new file mode 100644
index 0000000..9e79652
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/markdown/markdown.xpt.vim
@@ -0,0 +1,95 @@
+XPTemplate priority=lang mark=~^
+
+let s:f = g:XPTfuncs()
+
+fun! s:f.HeaderPref()
+    let snipname = self.GetVar('$_xSnipName')
+    let nr = snipname[ 1 : 1 ] * 1
+    return repeat('#', nr)
+endfunction
+
+fun! s:f.UnderLine(char)
+    let v = self.ItemValue()
+    if v == ''
+        return ''
+    else
+        " line break before "===" and after "==="
+        return "\n" . repeat(a:char, len(v)) . "\n"
+    endif
+endfunction
+
+fun! s:f.QuitContition()
+    let v = self.ItemValue()
+    if v == '' || v =~ '\V\n'
+        let q = self.Next(substitute(v, '\V\n', '', 'g'))
+        return q
+    endif
+endfunction
+
+fun! s:f.BuildRef()
+    let title = ''
+    let id = self.R( 'refId' )
+
+    let url = s:f[ '_markdown_snipp_url' ]
+    unlet s:f[ '_markdown_snipp_url' ]
+
+    if has_key( s:f, '_markdown_snipp_title' )
+        let title = '"' . s:f[ '_markdown_snipp_title' ] . '"'
+        unlet s:f[ '_markdown_snipp_title' ]
+    endif
+
+    call append( line('$'), '[' . id . ']: <' . url . '> ' . title )
+    return '\n'
+endfunction
+
+XPTinclude
+      \ _common/common
+
+XPT sharp_header hidden " HeaderPref() title
+~HeaderPref() ~t^
+
+XPT h1 alias=sharp_header
+XPT h2 alias=sharp_header
+XPT h3 alias=sharp_header
+XPT h4 alias=sharp_header
+XPT h5 alias=sharp_header
+XPT h6 alias=sharp_header
+
+XPT header_alt hidden " ... repeat($decoration,3)
+XSET $decoration==
+XSET t|ontype=QuitContition()
+~t^~t^UnderLine($decoration)^~^
+
+XPT ha1 alias=header_alt
+XSET $decoration==
+
+XPT ha2 alias=header_alt
+XSET $decoration=-
+
+XPT title alias=ha1
+XPT section alias=ha2
+XPT subsection alias=h3
+
+
+XPT link " [...](...)
+[~text^](~url^~ ~title?^)
+
+XPT img " ![...](...)
+![~alt-text^](~url^~ ~title?^)
+
+XPT ref " [...][...]
+[~text^][~refid^]
+
+XPT def " [name]: url
+[~refid^]: ~url^
+
+XPT hr " -----
+---
+
+XPT ruler alias=hr
+
+XPT table " | header | ... |
+|     |     |
+| :-- | --: |
+|     |     |
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/objc/autoimplem.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/objc/autoimplem.xpt.vim
new file mode 100644
index 0000000..6fd16be
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/objc/autoimplem.xpt.vim
@@ -0,0 +1,12 @@
+" Steal autoimplem from C snippets.
+if !g:XPTloadBundle( 'objc', 'autoimplem' )
+    finish
+endif
+XPTemplate priority=lang-2
+
+let g:objcautoimlemneedc = 1
+
+XPTinclude
+    \ _common/common
+    \ c/autoimplem
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/objc/objc.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/objc/objc.xpt.vim
new file mode 100644
index 0000000..db8ebcb
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/objc/objc.xpt.vim
@@ -0,0 +1,66 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+" Objective C can reuse all the C snippets, so include
+" them by default.
+XPTinclude
+      \ _common/common
+      \ c/c
+
+XPT msg " [to ...]
+[`to^ `msg^`args...{{^:`arg^`...{{^ `argName^:`argVal^`...^`}}^`}}^]
+
+XPT forin " for (... in ...) { ... }
+for (`type^id^ `var^ in `collection^)
+{
+    `cursor^
+}
+
+XPT import " #import "..."
+#import "`hfile^"
+
+XPT #import " #import <...>
+#import <`hfile^>
+
+XPT protocol " @protocol ... @end
+@protocol `protocolName^
+`cursor^
+@end
+
+XPT interface " @interface ... : ... ...
+@interface `interfaceName^ `inherit...{{^ : `father^ `}}^{
+    // put instances variable here
+    `cursor^
+}
+// put methods here
+@end
+
+XPT implementation " @implementation ... @end
+@implementation `className^
+`cursor^
+@end
+
+XPT categorie " @interface ... (...) ... @end
+@interface `existingClass^ (`categorieName^)
+`cursor^
+@end
+
+XPT catimplem " @implementation ... (...) ... @end
+@implementation `existingClass^ (`categorieName^)
+`cursor^
+@end
+
+XPT alloc " [[... alloc] ...]
+[[`className^ alloc] `cursor^]
+
+XPT method " - (...) ....: ...
+- (`retType^void^) `methodName^`args...{{^`...^ (`type^)name`...^`}}^;
+
+XPT implmethod " - (...) ... {  ... }
+- (`retType^) `methodName^ {
+    `cursor^
+}
+
+XPT alloc " [[...  alloc] ...]
+[[`className^  alloc] `cursor^]
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/ocaml.revised/ocaml.revised.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/ocaml.revised/ocaml.revised.xpt.vim
new file mode 100644
index 0000000..fd3efd3
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/ocaml.revised/ocaml.revised.xpt.vim
@@ -0,0 +1,172 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+XPTvar $VOID_LINE  (* void *)
+XPTvar $CURSOR_PH      (* cursor *)
+
+XPTvar $BRif          ' '
+XPTvar $BRloop        ' '
+XPTvar $BRstc         ' '
+XPTvar $BRfun         ' '
+
+XPTvar $CL    (*
+XPTvar $CM    *
+XPTvar $CR    *)
+
+XPTinclude
+      \ _common/common
+      \ _comment/doubleSign
+
+
+" ========================= Function and Variables =============================
+
+" ================================= Snippets ===================================
+
+XPT if " if .. then .. else ..
+if `cond^
+then `cursor^
+
+
+XPT match " match .. with [.. -> .. | ..]
+match `expr^ with
+  [ `what0^ -> `with0^`...^
+  | `what^ -> `with^`...^
+  ]
+
+
+XPT moduletype " module type .. = sig .. end
+module type `name^ `^ = sig
+    `cursor^
+end;
+
+
+XPT module " module .. = struct .. end
+XSET name|post=SV( '^\w', '\u&' )
+module `name^ `^ = struct
+    `cursor^
+end;
+
+XPT while " while .. do .. done
+while `cond^ do
+    `cursor^
+done
+
+XPT for " for .. to .. do .. done
+XSET side=Choose(['to', 'downto'])
+for `var^ = `val^ `side^ `expr^ do
+    `cursor^
+done
+
+XPT class " class .. = object .. end
+class `_^^ `name^ =
+object (self)
+    `cursor^
+end;
+
+
+XPT classtype " class type .. = object .. end
+class type `name^ =
+object
+   method `field^ : `type^` `...^
+   method `field^ : `type^` `...^
+end;
+
+
+XPT classtypecom " (** .. *) class type .. = object .. end
+(** `class_descr^^ *)
+class type `name^ =
+object
+   (** `method_descr^^ *)
+   method `field^ : `type^` `...^
+   (** `method_descr^^ *)
+   method `field^ : `type^` `...^
+end;
+
+
+XPT typesum " type .. = .. | ..
+XSET typeParams?|post=EchoIfNoChange( '' )
+type `typename^` `typeParams?^ =
+  [ `constructor^`...^
+  | `constructor^`...^
+  ];
+
+
+XPT typesumcom " (** .. *) type .. = .. | ..
+XSET typeParams?|post=EchoIfNoChange( '' )
+(** `typeDescr^ *)
+type `typename^` `typeParams?^ =
+  [ `constructor^ (** `ctordescr^ *)`...^
+  | `constructor^ (** `ctordescr^ *)`...^
+  ];
+
+
+XPT typerecord " type .. = { .. }
+XSET typeParams?|post=EchoIfNoChange( '' )
+type `typename^` `typeParams?^ =
+    { `recordField^ : `fType^` `...^
+    ; `recordField^ : `fType^` `...^
+    };
+
+
+XPT typerecordcom " (** .. *)type .. = { .. }
+(** `type_descr^ *)
+type `typename^ `_^^=
+    { `recordField^ : `fType^ (** `desc^ *)`...^
+    ; `otherfield^ : `othertype^ (** `desc^ *)`...^
+    };
+
+
+XPT try wrap=expr " try .. with .. -> ..
+try `expr^
+with [ `exc^ -> `rez^
+`     `...`
+{{^     | `exc2^ -> `rez2^
+`     `...`
+^`}}^     ]
+
+XPT val " value .. : ..
+value `thing^ : `cursor^
+
+XPT ty " .. -> ..
+`t^`...^ -> `t2^`...^
+
+XPT do " do { .. }
+do {
+    `cursor^
+}
+
+XPT begin " begin .. end
+begin
+    `cursor^
+end
+
+XPT fun " (fun .. -> ..)
+(fun `args^ -> `^)
+
+XPT func " value .. : .. = fun .. ->
+value `funName^ : `ty^ =
+fun `args^ ->
+    `cursor^;
+
+
+XPT letin " let .. = .. in
+let `name^ `_^^ =
+    `what^ `...^
+and `subname^ `_^^ =
+    `subwhat^`...^
+in
+
+
+XPT letrecin " let rec .. = .. in
+let rec `name^ `_^^ =
+    `what^ `...^
+and `subname^ `_^^ =
+    `subwhat^`...^
+in
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/ocaml/ocaml.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/ocaml/ocaml.xpt.vim
new file mode 100755
index 0000000..1765d58
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/ocaml/ocaml.xpt.vim
@@ -0,0 +1,181 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+XPTvar $VOID_LINE  (* void *)
+XPTvar $CURSOR_PH      (* cursor *)
+
+XPTvar $BRif          ' '
+XPTvar $BRloop        ' '
+XPTvar $BRstc         ' '
+XPTvar $BRfun         ' '
+
+XPTvar $CL    (*
+XPTvar $CM    *
+XPTvar $CR    *)
+
+XPTinclude
+      \ _common/common
+      \ _comment/doubleSign
+
+
+" ========================= Function and Variables =============================
+
+" ================================= Snippets ===================================
+
+
+
+
+
+XPT if " if .. then .. else ..
+if `cond^
+    then `cursor^`else...{{^
+    else`}}^
+
+
+" NOTE: the first repetition indent is different from the second one. Thus we
+" need two part repetition
+XPT match " match .. with .. -> .. | ..
+match `expr^ with
+    `what^ -> `with^` `...{{^
+  | `what^ -> `with^` `more...{{^
+  | `what^ -> `with^` `more...^`}}^`}}^
+
+
+XPT moduletype " module type .. = sig .. end
+module type `name^ `^ = sig
+    `cursor^
+end
+
+
+XPT module " module .. = struct .. end
+XSET name|post=SV( '^\w', '\u&' )
+module `name^ `^ = struct
+    `cursor^
+end
+
+XPT while " while .. do .. done
+while `cond^ do
+    `cursor^
+done
+
+XPT for " for .. to .. do .. done
+XSET side=Choose(['to', 'downto'])
+for `var^ = `val^ `side^ `expr^ do
+    `cursor^
+done
+
+XPT class " class .. = object .. end
+class `_^^ `name^ =
+object (self)
+    `cursor^
+end
+
+
+XPT classtype " class type .. = object .. end
+class type `name^ =
+object
+   method `field^ : `type^` `...^
+   method `field^ : `type^` `...^
+end
+
+
+XPT classtypecom " (** .. *) class type .. = object .. end
+(** `class_descr^^ *)
+class type `name^ =
+object
+   (** `method_descr^^ *)
+   method `field^ : `type^` `...^
+   (** `method_descr^^ *)
+   method `field^ : `type^` `...^
+end
+
+
+" NOTE: the first repetition indent is different from the second one. Thus we
+" need two part repetition
+XPT typesum " type .. = .. | ..
+XSET typeParams?|post=EchoIfNoChange( '' )
+type `typename^` `typeParams?^ =
+    `constructor^` `...{{^
+  | `constructor^` `more...{{^
+  | `constructor^` `more...^`}}^`}}^
+
+
+XPT typesumcom " (** .. *) type .. = .. | ..
+XSET typeParams?|post=EchoIfNoChange( '' )
+(** `typeDescr^ *)
+type `typename^` `typeParams?^ =
+    `constructor^ (** `ctordescr^ *)` `...{{^
+  | `constructor^ (** `ctordescr^ *)` `more...{{^
+  | `constructor^ (** `ctordescr^ *)` `more...^`}}^`}}^
+
+
+XPT typerecord " type .. = { .. }
+XSET typeParams?|post=EchoIfNoChange( '' )
+type `typename^` `typeParams?^ =
+    { `recordField^ : `fType^` `...^
+    ; `recordField^ : `fType^` `...^
+    }
+
+
+XPT typerecordcom " (** .. *)type .. = { .. }
+(** `type_descr^ *)
+type `typename^ `_^^=
+    { `recordField^ : `fType^ (** `desc^ *)` `...^
+    ; `otherfield^ : `othertype^ (** `desc^ *)` `...^
+    }
+
+
+XPT try wrap=expr " try .. with .. -> ..
+try `expr^
+with  `exc^ -> `rez^
+`     `...`
+{{^     | `exc2^ -> `rez2^
+`     `...`
+^`}}^
+
+XPT val " value .. : ..
+value `thing^ : `cursor^
+
+XPT ty " .. -> ..
+`t^`...^ -> `t2^`...^
+
+XPT do " do { .. }
+do {
+    `cursor^
+}
+
+XPT begin " begin .. end
+begin
+    `cursor^
+end
+
+XPT fun " (fun .. -> ..)
+(fun `args^ -> `^)
+
+XPT func " value .. : .. = fun .. ->
+let `funName^ : `ty^ =
+fun `args^ ->
+    `cursor^
+
+
+XPT letin " let .. = .. in
+let `name^ `_^^ =
+    `what^` `...^
+and `subname^ `_^^ =
+    `subwhat^` `...^
+in
+
+
+XPT letrecin " let rec .. = .. in
+let rec `name^ `_^^ =
+    `what^` `...^
+and `subname^ `_^^ =
+    `subwhat^` `...^
+in
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/perl/perl.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/perl/perl.xpt.vim
new file mode 100644
index 0000000..9e708e7
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/perl/perl.xpt.vim
@@ -0,0 +1,151 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL
+XPTvar $UNDEFINED
+
+XPTvar $VOID_LINE     # void;
+XPTvar $CURSOR_PH     # cursor
+
+XPTvar $BRif          ' '
+XPTvar $BRel   \n
+XPTvar $BRloop        ' '
+XPTvar $BRstc         ' '
+XPTvar $BRfun         ' '
+
+XPTinclude
+      \ _common/common
+
+XPTvar $CS #
+XPTinclude
+      \ _comment/singleSign
+
+XPTvar $VAR_PRE    $
+XPTvar $FOR_SCOPE  'my '
+XPTinclude
+      \ _loops/for
+
+XPTinclude
+      \ _loops/c.while.like
+
+
+" ========================= Function and Variables =============================
+
+
+" ================================= Snippets ===================================
+
+
+" perl has no NULL value
+XPT fornn hidden=1
+
+XPT whilenn hidden=1
+
+
+XPT perl " #!/usr/bin/env perl
+#!/usr/bin/env perl
+
+..XPT
+
+
+XPT xif " .. if ..;
+`expr^ if `cond^;
+
+
+XPT xwhile " .. while ..;
+`expr^ while `cond^;
+
+
+XPT xunless " .. unless ..;
+`expr^ unless `cond^;
+
+
+XPT xforeach " .. foreach ..;
+`expr^ foreach @`array^;
+
+
+XPT sub " sub .. { .. }
+sub `fun_name^`$BRfun^{
+    `cursor^
+}
+
+
+XPT unless " unless ( .. ) { .. }
+unless`$SPcmd^(`$SParg^`cond^`$SParg^)`$BRif^{
+    `cursor^
+}
+
+
+XPT eval wrap=risky " eval { .. };if...
+eval`$BRif^{
+    `risky^
+};
+if`$SPcmd^(`$SParg^$@`$SParg^)`$BRif^{
+    `handle^
+}
+
+XPT try alias=eval " eval { .. }; if ...
+
+
+XPT whileeach " while \( \( key, val ) = each\( %** ) )
+while`$SPcmd^(`$SParg^(`$SParg^$`key^,`$SPop^$`val^`$SParg^) = each(`$SParg^%`array^`$SParg^)`$SParg^)`$BRloop^{
+    `cursor^
+}
+
+XPT whileline " while \( defined\( \$line = <FILE> ) )
+while`$SPcmd^(`$SParg^defined(`$SParg^$`line^`$SPop^=`$SPop^<`STDIN^>`$SParg^)`$SParg^)`$BRloop^{
+    `cursor^
+}
+
+
+XPT foreach " foreach my .. (..){}
+foreach`$SPcmd^my $`var^ (`$SParg^@`array^`$SParg^)`$BRloop^{
+    `cursor^
+}
+
+
+XPT forkeys " foreach my var \( keys %** )
+foreach`$SPcmd^my $`var^ (`$SParg^keys @`array^`$SParg^)`$BRloop^{
+    `cursor^
+}
+
+
+XPT forvalues " foreach my var \( keys %** )
+foreach`$SPcmd^my $`var^ (`$SParg^values @`array^`$SParg^)`$BRloop^{
+    `cursor^
+}
+
+
+XPT if wrap=job " if ( .. ) { .. } ...
+XSET job=$CS job
+if`$SPcmd^(`$SParg^`cond^`$SParg^)`$BRif^{
+    `job^
+}`
+`elsif...^`$BRel^elsif`$SPcmd^(`$SParg^`cond2^`$SParg^)`$BRif^{
+    `job^
+}`
+`elsif...^`
+`else...{{^`$BRel^else`$BRif^{
+    `cursor^
+}`}}^
+
+XPT package " 
+package `className^;
+
+use base qw(`parent^);
+
+sub new`$BRfun^{
+    my $class = shift;
+    $class = ref $class if ref $class;
+    my $self = bless {}, $class;
+    $self;
+}
+
+1;
+
+..XPT
+
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/php/php.ftdetect.vim b/vim-plugins/bundle/xptemplate/ftplugin/php/php.ftdetect.vim
new file mode 100644
index 0000000..5a437cd
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/php/php.ftdetect.vim
@@ -0,0 +1,75 @@
+if exists("b:__PHP_FTDETECT_VIM__")
+    finish
+endif
+let b:__PHP_FTDETECT_VIM__ = 1
+
+
+if &filetype !~ 'php'
+    finish
+endif
+
+
+
+let s:skipPattern = 'synIDattr(synID(line("."), col("."), 0), "name") =~? "\\vstring|comment"'
+let s:pattern = {
+            \   'php'    : {
+            \       'start' : '\V\c<?\%(php\>\)\?',
+            \       'mid'   : '',
+            \       'end'   : '\V\c?>',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \   'javascript'    : {
+            \       'start' : '\V\c<script\_[^>]\*>',
+            \       'mid'   : '',
+            \       'end'   : '\V\c</script>',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \   'css'           : {
+            \       'start' : '\V\c<style\_[^>]\*>',
+            \       'mid'   : '',
+            \       'end'   : '\V\c</style>',
+            \       'skip'  : s:skipPattern,
+            \   },
+            \}
+
+if exists( 'php_noShortTags' )
+    let s:pattern.php.start = '\V\c<?php\>'
+endif
+
+let s:topFT = 'html'
+
+fun! XPT_phpFiletypeDetect() "{{{
+    let pos = [ line( "." ), col( "." ) ]
+
+    let synName = xpt#util#NearestSynName()
+
+    if synName == ''
+        " top level ft is html
+        return s:topFT
+
+    else
+
+        for [ name, ftPattern ] in items( s:pattern )
+            let pos = searchpairpos( ftPattern.start, ftPattern.mid, ftPattern.end, 'nbW', ftPattern.skip )
+            if pos != [0, 0]
+                return name
+            endif
+        endfor
+
+        if synName =~ '^\cjavascript'
+            return 'javascript'
+        elseif synName =~ '^\ccss'
+            return 'css'
+        endif
+
+        return s:topFT
+
+    endif
+
+endfunction "}}}
+
+if exists( 'b:XPTfiletypeDetect' )
+    unlet b:XPTfiletypeDetect
+endif
+let b:XPTfiletypeDetect = function( 'XPT_phpFiletypeDetect' )
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/php/php.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/php/php.xpt.vim
new file mode 100644
index 0000000..a417ad6
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/php/php.xpt.vim
@@ -0,0 +1,81 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          true
+XPTvar $FALSE         false
+XPTvar $NULL          null
+XPTvar $UNDEFINED     null
+
+XPTvar $VOID_LINE      /* void */;
+XPTvar $CURSOR_PH      /* cursor */
+
+XPTvar $BRif          ' '
+XPTvar $BRel          \n
+XPTvar $BRloop        ' '
+XPTvar $BRstc         ' '
+XPTvar $BRfun         ' '
+
+XPTinclude
+      \ _common/common
+
+XPTvar $CL    /*
+XPTvar $CM    *
+XPTvar $CR    */
+XPTinclude
+      \ _comment/doubleSign
+
+XPTvar $VAR_PRE   $
+XPTvar $FOR_SCOPE
+XPTinclude
+      \ _loops/for
+
+XPTinclude
+      \ _condition/c.like
+      \ _loops/c.while.like
+
+XPTembed
+      \ html/html
+      \ html/php*
+
+
+
+if exists( 'php_noShortTags' )
+    XPTvar $PHP_TAG php
+else
+    XPTvar $PHP_TAG
+endif
+
+XPT html " <?$PHP_TAG ... ?>
+?>`html^<?`$PHP_TAG^
+
+
+XPT foreach " foreach (.. as ..) {..}
+foreach ($`var^ as `container^)`$BRloop^{
+    `cursor^
+}
+
+
+XPT fun " function ..( .. ) {..}
+XSET params=Void()
+XSET params|post=EchoIfEq('  ', '')
+function `funName^(` `params` ^)`$BRfun^{
+    `cursor^
+}
+
+
+XPT class " class .. { .. }
+class `className^`$BRfun^{
+    function __construct( `args^ )`$BRfun^{
+        `cursor^
+    }
+}
+
+
+XPT interface " interface .. { .. }
+interface `interfaceName^`$BRfun^{
+    `cursor^
+}
+
+XPT $ " make dollar a keyword
+$
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/ps1/ps1.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/ps1/ps1.xpt.vim
new file mode 100644
index 0000000..34700a4
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/ps1/ps1.xpt.vim
@@ -0,0 +1,104 @@
+XPTemplate priority=lang
+
+
+XPTinclude
+      \ _common/common
+
+" ========================= Function and Variables =============================
+
+" ================================= Snippets ===================================
+XPT cmdlet " cmdlet ..-.. {}
+Cmdlet `verb^-`noun^
+{
+    `Param...{{^Param(
+       `^
+    )`}}^
+    `Begin...{{^Begin
+    {
+    }`}}^
+    Process
+    {
+    }
+    `End...{{^End
+    {
+    }`}}^
+}
+
+
+XPT if wrap=code " if ( .. ) { .. } ...
+if ( `cond^ )
+{
+    `code^
+}`
+`...^
+elseif ( `cond2^ )
+{
+    `body^
+}`
+`...^`
+`else...{{^
+else
+{
+    `body^
+}`}}^
+
+
+XPT fun " function ..(..) { .. }
+function `funName^( `params^ )
+{
+   `cursor^
+}
+
+
+XPT function " function { BEGIN PROCESS END }
+function `funName^( `params^ )
+{
+    `Begin...{{^Begin
+    {
+        `^
+    }`}}^
+    `Process...{{^Process
+    {
+        `^
+    }`}}^
+    `End...{{^End
+    {
+        `^
+    }`}}^
+}
+
+
+XPT foreach " foreach (.. in ..)
+foreach ($`var^ in `other^)
+    { `cursor^ }
+
+
+XPT switch " switch (){ .. {..} }
+switch `option^^ (`what^)
+{
+ `pattern^ { `action^ }`...^
+ `pattern^ { `action^ }`...^
+ `Default...{{^Default { `action^ }`}}^
+}
+
+
+XPT trap " trap [..] { .. }
+trap [`Exception^]
+{
+    `body^
+}
+
+
+XPT for " for (..;..;++)
+for ($`var^ = `init^; $`var^ -ge `val^; $`var^--)
+{
+    `cursor^
+}
+
+
+XPT forr " for (..;..;--)
+for ($`var^ = `init^; $`var^ -ge `val^; $`var^--)
+{
+    `cursor^
+}
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/python/python.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/python/python.xpt.vim
new file mode 100644
index 0000000..bf0e85d
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/python/python.xpt.vim
@@ -0,0 +1,332 @@
+XPTemplate priority=lang
+
+
+let s:f = g:XPTfuncs()
+
+" Set your python version with this variable in .vimrc or your own python
+" snippet:
+" XPTvar $PYTHON_EXC    /usr/bin/python
+" XPTvar $PYTHON_EXC    /usr/bin/env python2.6
+XPTvar $PYTHON_EXC    /usr/bin/env python
+
+" 3 single quotes quoted by single quote
+XPTvar $PYTHON_DOC_MARK '''''
+" XPTvar $PYTHON_DOC_MARK '"""'
+
+" for python 2.5 and older
+XPTvar $PYTHON_EXP_SYM ', '
+" " for python 2.6 and newer
+" XPTvar $PYTHON_EXP_SYM ' as '
+
+
+XPTvar $TRUE          True
+XPTvar $FALSE         False
+XPTvar $NULL          None
+XPTvar $UNDEFINED     None
+
+
+XPTvar $VOID_LINE     # nothing
+XPTvar $CURSOR_PH     CURSOR
+
+
+" int fun ** (
+" class name ** (
+XPTvar $SPfun      ''
+
+" int fun( ** arg ** )
+" if ( ** condition ** )
+" for ( ** statement ** )
+" [ ** a, b ** ]
+" { ** 'k' : 'v' ** }
+XPTvar $SParg      ''
+
+" if ** (
+" while ** (
+" for ** (
+XPTvar $SPcmd      ' '
+
+" a ** = ** a ** + ** 1
+" (a, ** b, ** )
+XPTvar $SPop       ' '
+
+
+
+XPTinclude
+      \ _common/common
+
+
+XPTvar $CS    #
+XPTvar $CL    '''''
+XPTvar $CM    ''
+XPTvar $CR    '''''
+
+XPTinclude
+    \ _comment/singleDouble
+
+
+" ========================= Function and Variables =============================
+
+fun! s:f.python_wrap_args_if_func( args )
+    let v = self.V()
+    if v != ''
+        return v . '(' . a:args . ')'
+    else
+        return a:args
+    endif
+endfunction
+
+fun! s:f.python_genexpr_cmpl( itemName )
+    let v = self.V()
+    if v =~ '\V(\$'
+        let args = self.R( a:itemName )
+        return self[ '$SParg' ] . args . self[ '$SParg' ] . ')'
+    else
+        return ''
+    endif
+endfunction
+
+let s:rangePattern = '\V\^r\%[ange(]\$'
+
+fun! s:f.python_seq_cmpl()
+    let v = self.V()
+
+    if v == ''
+        return ''
+    endif
+
+
+    if v =~ s:rangePattern
+        if self.Phase() == 'post'
+            return ''
+        endif
+
+        let ends = matchstr( v, s:rangePattern )
+        let rv = printf( 'range(%s0?,%send%s)'
+              \ , self[ '$SParg' ], self[ '$SPop' ], self[ '$SParg' ] )
+        return rv[ len( ends ) : ]
+    endif
+
+
+    let ends = matchstr( v, '\V.\w\+\$' )
+    if ends =~ '\V.\%[keys]\$'
+        return ".keys()"[ len( ends ) : ]
+
+    elseif ends =~ '\V.\%[values]\$'
+        return ".values()"[ len( ends ) : ]
+
+    elseif ends =~ '\V.\%[items]\$'
+        return ".items()"[ len( ends ) : ]
+
+    endif
+
+    return ''
+endfunction
+
+fun! s:f.python_sp_arg()
+    let sp = self[ '$SParg' ]
+
+    if self.Phase() == 'rendering'
+        return sp
+    elseif self.Phase() == 'post'
+        return self.V() == '' || self.V() == 'arg*' ? '' : sp
+    endif
+
+    return sp
+endfunction
+
+
+fun! s:f.python_find_class( default )
+    " TODO simplify and do more strict search
+    let indentNr = indent( line( "." ) )
+    let defIndent = searchpos( '\V\^\s\*\%<' . indentNr . 'vdef\>', 'bWcn' )
+    if defIndent == [0, 0]
+        return a:default
+    endif
+
+    let di = indent( defIndent[ 0 ] )
+
+    let clsPos = searchpos( '\V\^\s\*\%<' . di . 'vclass\s\+\zs\w\+', 'bWcn' )
+    if clsPos == [0, 0]
+        return a:default
+    endif
+
+    return matchstr( getline( clsPos[0] ), '\Vclass\s\+\zs\w\+' )
+
+endfunction
+
+fun! s:f.python_find_func( default )
+    let indentNr = indent( line( "." ) )
+    let defIndent = searchpos( '\V\^\s\*\%<' . indentNr . 'vdef\>', 'bWcn' )
+    if defIndent == [0, 0]
+        return a:default
+    endif
+
+    return matchstr( getline( defIndent[0] ), '\Vdef\s\+\zs\w\+' )
+    
+endfunction
+
+" ================================= Snippets ===================================
+
+
+XPT _if hidden
+if `cond^:
+    `pass^
+
+
+XPT _generator hidden " generator
+XSET ComeFirst=elem seq func
+`func^`func^python_genexpr_cmpl('elem')^ for `elem^ in `seq^` if `condition?^
+
+
+XPT _args hidden " expandable arguments
+XSET arg*|post=ExpandInsideEdge( ',$SPop', '' )
+`$SParg`arg*`$SParg^
+
+XPT _args2 hidden " expandable arguments
+XSET arg*|post=ExpandInsideEdge( ',$SPop', '' )
+`,$SPop`arg*^
+
+
+
+
+XPT python " #!$PYTHON_EXC
+XSET encoding=Echo(&fenc != '' ? &fenc : &enc)
+#!`$PYTHON_EXC^
+# coding: `encoding^
+
+..XPT
+
+XPT shebang alias=python
+
+XPT sb alias=python
+
+
+XPT p " pass
+pass
+
+
+XPT s " self.
+self.
+
+
+XPT filehead " file description
+`$PYTHON_DOC_MARK^
+File    : `file()^
+Author  : `$author^
+Contact : `$email^
+Date    : `date()^
+
+Description : `cursor^
+`$PYTHON_DOC_MARK^
+
+
+XPT if " if ..: .. else...
+`:_if:^
+
+
+XPT else " else:
+else:
+    `cursor^
+
+
+XPT elif " else:
+elif `cond^:
+    `cursor^
+
+
+XPT range " range\( .. )
+range(`$SParg^``0?`,$SPop^`end^`$SParg^)
+
+
+XPT forrange " for var in range\( .. )
+for `i^ in `:range:^:
+    `cursor^
+
+
+XPT for " for .. in ..: ..
+XSET seq|post=Build( V() =~ '\V\^r\%[ange(]\$' ? '`:range:^' : ItemValueStripped() )
+for `var^ in `seq^`seq^python_seq_cmpl()^:
+    `cursor^
+
+
+XPT while " while ..:
+while `condition^:
+    `cursor^
+
+
+XPT def " def ..( .. ): ...
+XSET a=arg*
+XSET a|post=Build( V() == 'arg*' ? '' : VS() . AutoCmpl( 1, 'self' ) . '`:_args2:^' )
+def `name^`$SPfun^(`a^python_sp_arg()^``a^`a^AutoCmpl(0,'self')^`a^python_sp_arg()^):
+    `cursor^
+
+
+" TODO use ontype/map instead
+XPT lambda " (lambda .. : ..)
+XSET arg*|post=ExpandInsideEdge( ',$SPop', '' )
+lambda `arg*^: `expr^
+
+
+XPT try wrap=job " try: .. except: ...
+try:
+    `job^
+`:except:^
+
+
+XPT except " except ..
+except `Exception^`$PYTHON_EXP_SYM`e^:
+    `cursor^
+
+
+XPT finally " finally:
+finally:
+    `cursor^
+
+
+XPT class " class .. : def __init__ ...
+class `ClassName^`$SPfun^(`$SParg`object`$SParg^):
+    `pass^
+
+
+XPT init " def __init__
+XSET arg*|post=ExpandInsideEdge( ',$SPop', '' )
+def __init__`$SPfun^(`$SParg^self`,$SPop`arg*^`$SParg^):
+    `cursor^
+
+
+" TODO guess method name for example __init__
+XPT super " super\( Clz, self ).
+super(`$SParg^`clz^python_find_class('Me')^,`$SPop^self`$SParg^).`method^python_find_func('what')^(`:_args:^)
+
+
+XPT ifmain " if __name__ == __main__
+if __name__`$SPop^==`$SPop^"__main__":
+    `cursor^
+
+XPT with " with .. as .. :
+with `opener^` as `name?^:
+    `cursor^
+
+
+XPT import " import ..
+import `mod^` as `name?^
+
+
+XPT from " from .. import ..
+from `module^ import `item^` as `name?^
+
+
+XPT fromfuture " from __future__ import ..
+from __future__ import `name^
+
+
+XPT str wrap=s " str\( .. )
+str(`$SParg^`s^`$SParg^)
+
+
+XPT genExp " \(func\(x) for x in seq)
+(`$SParg^`:_generator:^`$SParg^)
+
+
+XPT listComp " \[func\(x) for x in seq]
+[`$SParg^`:_generator:^`$SParg^]
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/r/r.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/r/r.xpt.vim
new file mode 100644
index 0000000..899506d
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/r/r.xpt.vim
@@ -0,0 +1,36 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+      \ _condition/c.like
+
+
+XPT for " for (... in ...) { ... }
+for (`name^ in `vec^)
+{
+    `cursor^
+}
+
+XPT while " while ( ... ) { ... }
+while ( `cond^ )
+{ 
+    `cursor^
+}
+
+XPT fun " ... <- function ( ... , ... ) { ... }
+`funName^ <- function( `args^ )
+{ 
+    `cursor^
+}
+
+XPT operator " %...% <- function ( ... , ... ) { ... }
+%`funName^% <- function( `args^ )
+{ 
+    `cursor^
+}
+
+XPT head " #! /usr/bin/env/Rscript
+#! /usr/bin/env Rscript
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/rst/rst.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/rst/rst.xpt.vim
new file mode 100644
index 0000000..4e2a710
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/rst/rst.xpt.vim
@@ -0,0 +1,70 @@
+" snippets for reStructuredText (.rst)
+XPTemplate priority=lang mark=~^
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+fun! s:f.ExpandRstTitle()
+    let txt = self.R( 'title' )
+    let bar = repeat( '=', len( txt ) )
+    return bar . "\n" . txt . "\n" . bar . "\n"
+endfunction
+
+fun! s:f.ExpandRstSection( char )
+    let txt = self.R( 'sectionName' )
+    let bar = repeat( a:char, len( txt ) )
+    return txt . "\n" . bar . "\n"
+endfunction
+
+XPT index " all stuff to create basic index
+XSET sectionName|post=ExpandRstSection('=')
+~sectionName^
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+   :numbered:
+   ~cursor^
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
+
+XPT title synonym=h1 " === ... ===
+XSET title|post=ExpandRstTitle()
+~title^
+
+
+XPT section synonym=h2 " ... ====
+XSET sectionName|post=ExpandRstSection('=')
+~sectionName^
+
+XPT subsection synonym=h3 " .... -------
+XSET sectionName|post=ExpandRstSection('-')
+~sectionName^
+
+
+XPT code " ```...```
+``~cursor^``
+
+XPT italic " *...*
+*~cursor^*
+
+XPT bold " **...**
+**~cursor^**
+
+XPT link " .. _a link: ...
+.. _a link: ~url^
+
+XPT func " .. function:: ...
+.. function:: ~funDesc^
+
+    ~cursor^
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/ruby/ruby.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/ruby/ruby.xpt.vim
new file mode 100644
index 0000000..273da97
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/ruby/ruby.xpt.vim
@@ -0,0 +1,821 @@
+XPTemplate priority=lang keyword=:%#
+
+" containers
+let s:f = g:XPTfuncs()
+
+" inclusion
+XPTinclude
+      \ _common/common
+
+" ========================= Function and Variables =============================
+
+fun! s:f.RubyCamelCase(...) "{{{
+  let str = a:0 == 0 ? self.V() : a:1
+  let r = substitute(substitute(str, "[\/ _]", ' ', 'g'), '\<.', '\u&', 'g')
+  return substitute(r, " ", '', 'g')
+endfunction "}}}
+
+fun! s:f.RubySnakeCase(...) "{{{
+  let str = a:0 == 0 ? self.V() : a:1
+  return substitute(str," ",'_','g')
+endfunction "}}}
+
+" Multiple each snippet {{{
+"{{{ s:each_list
+let s:each_list = [ 'byte', 'char', 'cons', 'index', 'key',
+      \'line', 'pair', 'slice', 'value' ]
+"}}}
+
+fun! s:f.RubyEachPopup() "{{{
+  let l = []
+  for i in s:each_list
+    let l += [{'word': i, 'menu': 'each_' . i . '{ |..| ... }'}]
+  endfor
+  return l
+endfunction "}}}
+
+fun! s:f.RubyEachBrace() "{{{
+  let v = self.SV('^_','','')
+  if v == ''
+    return ''
+  elseif v =~# 'slice\|cons'
+    return '_' . v.'(`val^3^)'
+  else
+    return '_' . v
+  endif
+endfunction "}}}
+
+fun! s:f.RubyEachPair() "{{{
+  let v = self.R('what')
+  if v =~# 'pair'
+    return '`el1^, `el2^'
+  elseif v == ''
+    return '`el^'
+  else
+    if v =~ 'slice\|cons'
+      let v = substitute(v,'val','','')
+    endif
+    return '`' . substitute(v,'[^a-z]','','g') . '^'
+  endif
+endfunction "}}}
+" End multiple each snippet }}}
+
+" Multiple assert snippet {{{
+"{{{ s:assert_map
+let s:assert_map = {
+      \'block'          : ''                                                        . ' { `cursor^ }',
+      \'equals'         : '(`expected^, `actual^`, `message^)'                      . '',
+      \'in_delta'       : '(`expected float^, `actual float^, `delta^`, `message^)' . '',
+      \'instance_of'    : '(`klass^, `object to compare^`, `message^)'              . '',
+      \'kind_of'        : '(`klass^, `object to compare^`, `message^)'              . '',
+      \'match'          : '(/`regexp^/`^, `string^`, `message^)'                    . '',
+      \'not_equal'      : '(`expected^, `actual^`, `message^)'                      . '',
+      \'nil'            : '(`object^`, `message^)'                                  . '',
+      \'no_match'       : '(/`regexp^/`^, `string^`, `message^)'                    . '',
+      \'not_nil'        : '(`object^`, `message^)'                                  . '',
+      \'nothing_raised' : '(`exception^)'                                           . ' { `cursor^ }',
+      \'not_same'       : '(`expected^, `actual^`, `message^)'                      . '',
+      \'nothing_thrown' : '`(`message`)^'                                           . ' { `cursor^ }',
+      \'operator'       : '(`obj1^, `operator^, `obj2^`, `message^)'                . '',
+      \'raise'          : '(`exception^)'                                           . ' { `cursor^ }',
+      \'respond_to'     : '(`object^, `respond to this message^`, `message^)'       . '',
+      \'same'           : '(`expected^, `actual^`, `message^)'                      . '',
+      \'send'           : '([`receiver^, `method^, `args^]`, `message^)'            . '',
+      \'throws'         : '(`expected symbol^`, `message^)'                         . ' { `cursor^ }',
+      \}
+"}}}
+
+fun! s:RubyAssertPopupSort(a, b) "{{{
+    return a:a.word == a:b.word ? 0 : a:a.word > a:b.word ? 1 : -1
+endfunction "}}}
+
+fun! s:f.RubyAssertPopup() "{{{
+  let list = []
+  for [k, v] in items(s:assert_map)
+    let list += [{ 'word' : k, 'menu' : 'assert_' . k . substitute(v, '`.\{-}^', '..', 'g') }]
+  endfor
+  return sort(list, 's:RubyAssertPopupSort')
+endfunction "}}}
+
+fun! s:f.RubyAssertMethod() "{{{
+  let v = self.SV('^_', '', '')
+  if v == ''
+    return v . '(`^`, `message^)'
+  endif
+  if has_key(s:assert_map, v)
+    return '_' . v . s:assert_map[v]
+  else
+    return ''
+  endif
+endfunction "}}}
+" End multiple assert snippet }}}
+
+" Repeat an item inside its edges.
+" Behave like ExpandIfNotEmpty() but within edges
+fun! s:f.RepeatInsideEdges(sep) "{{{
+  let [edgeLeft, edgeRight] = self.ItemEdges()
+  let v = self.V()
+  let n = self.N()
+  if v == '' || v == self.ItemFullname()
+    return ''
+  endif
+
+
+  let v = self.ItemStrippedValue()
+  let [ markLeft, markRight ] = XPTmark()
+
+  let newName = 'n' . n
+  let res  = edgeLeft . v
+  let res .= markLeft . a:sep .  markLeft . newName . markRight
+  let res .= 'ExpandIfNotEmpty("' . a:sep . '", "' . newName . '")' . markRight . markRight
+  let res .=  edgeRight
+
+
+  return res
+endfunction "}}}
+
+" Remove an item if its value hasn't change
+fun! s:f.RemoveIfUnchanged() "{{{
+  let v = self.V()
+  let [lft, rt] = self.ItemEdges()
+  if v == lft . self.N() . rt
+    return ''
+  else
+    return v
+  end
+endfunction "}}}
+
+
+
+" ================================= Snippets ===================================
+
+XPT # syn=string " #{..}
+#{`^}
+
+
+XPT : " :... => ...
+:`key^ => `value^
+
+
+XPT % " %**[..]
+XSET _=Choose(['w', 'W', 'q', 'Q'])
+%`_^[`^]
+
+
+XPT BEG " BEGIN { .. }
+BEGIN {
+    `cursor^
+}
+
+
+XPT Comp " include Comparable def <=> ...
+include Comparable
+
+def <=>(other)
+    `cursor^
+end
+
+
+XPT END " END { .. }
+END {
+    `cursor^
+}
+
+
+XPT Enum " include Enumerable def each ...
+include Enumerable
+
+def each(&block)
+    `cursor^
+end
+
+
+XPT Forw " extend Forwardable
+extend Forwardable
+
+
+XPT Md " Marshall Dump
+File.open(`filename^, "wb") { |`file^| Marshal.dump(`obj^, `file^) }
+
+
+XPT Ml " Marshall Load
+File.open(`filename^, "rb") { |`file^| Marshal.load(`file^) }
+
+
+XPT Pn " PStore.new\(..)
+PStore.new(`filename^)
+
+
+XPT Yd " YAML dump
+File.open("`filename^.yaml", "wb") { |`file^| YAML.dump(`obj^,`file^) }
+
+
+XPT Yl " YAML load
+File.open("`filename^.yaml") { |`file^| YAML.load(`file^) }
+
+
+XPT _d " __DATA__
+__DATA__
+
+
+XPT _e " __END__
+__END__
+
+
+XPT _f " __FILE__
+__FILE__
+
+
+XPT ali " alias : .. : ..
+XSET new.post=RubySnakeCase()
+XSET old=old_{R("new")}
+XSET old.post=RubySnakeCase()
+alias :`new^ :`old^
+
+
+XPT all " all? { .. }
+all? { |`element^| `cursor^ }
+
+
+XPT amm " alias_method : .. : ..
+XSET new.post=RubySnakeCase()
+XSET old=old_{R("new")}
+XSET old.post=RubySnakeCase()
+alias_method :`new^, :`old^
+
+
+XPT any " any? { |..| .. }
+any? { |`element^| `cursor^ }
+
+
+XPT app " if __FILE__ == $PROGRAM_NAME ...
+if __FILE__ == $PROGRAM_NAME
+    `cursor^
+end
+
+
+XPT array " Array.new\(..) { ... }
+Array.new(`size^) { |`i^| `cursor^ }
+
+XPT ass " assert**\(..) ...
+XSET what=RubyAssertPopup()
+XSET what|post=RubyAssertMethod()
+XSET message|post=RemoveIfUnchanged()
+assert`_`what^
+
+
+XPT attr " attr_** :...
+XSET what=Choose(["accessor", "reader", "writer"])
+XSET what|post=SV("^_$",'','')
+XSET attr*|post=ExpandIfNotEmpty(', :', 'attr*')
+attr`_`what^ :`attr*^
+
+XPT begin " begin .. rescue .. else .. end
+XSET block=# block
+XSET Exception|post=RubyCamelCase()
+begin
+    `expr^
+``rescue...`
+{{^rescue `Exception^` => `e^
+    `block^
+``rescue...`
+^`}}^``else...`
+{{^else
+    `block^
+`}}^``ensure...`
+{{^ensure
+    `cursor^
+`}}^end
+
+XPT bm " Benchmark.bmbm do ... end
+XSET times=10_000
+TESTS = `times^
+
+Benchmark.bmbm do |result|
+    `cursor^
+end
+
+
+XPT case " case .. when .. end
+XSET block=# block
+case `target^`
+when `comparison^
+    `block^
+``when...`
+{{^when `comparison^
+    `block^
+``when...`
+^`}}^``else...`
+{{^else
+    `cursor^
+`}}^end
+
+
+XPT cfy " classify { |..| .. }
+classify { |`element^| `cursor^ }
+
+
+XPT cl " class .. end
+XSET ClassName.post=RubyCamelCase()
+class `ClassName^
+    `cursor^
+end
+
+
+XPT cld " class .. < DelegateClass .. end
+XSET ClassName.post=RubyCamelCase()
+XSET ParentClass.post=RubyCamelCase()
+XSET arg*|post=RepeatInsideEdges(', ')
+class `ClassName^ < DelegateClass(`ParentClass^)
+    def initialize`(`arg*`)^
+        super(`delegate object^)
+
+        `cursor^
+    end
+end
+
+
+XPT cli " class .. def initialize\(..) ...
+XSET ClassName|post=RubyCamelCase()
+XSET name|post=RubySnakeCase()
+XSET init=Trigger('defi')
+XSET def=Trigger('def')
+class `ClassName^
+    `init^`
+    `def...^
+
+    `def^`
+    `def...^
+end
+
+
+XPT cls " class << .. end
+XSET self=self
+class << `self^
+    `cursor^
+end
+
+
+XPT clstr " .. = Struct.new ...
+XSETm do...|post
+ do
+    `cursor^
+end
+XSETm END
+XSET ClassName|post=RubyCamelCase()
+XSET attr*|post=RepeatInsideEdges(', :')
+`ClassName^ = Struct.new`(:`attr*`)^` `do...^
+
+
+XPT col " collect { .. }
+collect { |`obj^| `cursor^ }
+
+
+XPT deec " Deep copy
+Marshal.load(Marshal.dump(`obj^))
+
+
+XPT def " def .. end
+XSET method|post=RubySnakeCase()
+XSET arg*|post=RepeatInsideEdges(', ')
+def `method^`(`arg*`)^
+    `cursor^
+end
+
+
+XPT defd " def_delegator : ...
+def_delegator :`del obj^, :`del meth^, :`new name^
+
+
+XPT defds " def_delegators : ...
+def_delegators :`del obj^, :`del methods^
+
+
+XPT defi " def initialize .. end
+XSET arg*|post=RepeatInsideEdges(', ')
+def initialize`(`arg*`)^
+    `cursor^
+end
+
+
+XPT defmm " def method_missing\(..) .. end
+def method_missing(meth, *args, &block)
+    `cursor^
+end
+
+
+XPT defs " def self... end
+XSET method.post=RubySnakeCase()
+XSET arg*|post=RepeatInsideEdges(', ')
+def self.`method^`(`arg*`)^
+    `cursor^
+end
+
+
+XPT deft " def test_.. .. end
+XSET name|post=RubySnakeCase()
+XSET arg*|post=RepeatInsideEdges(', ')
+def test_`name^
+    `cursor^
+end
+
+
+XPT deli " delete_if { |..| .. }
+delete_if { |`arg^| `cursor^ }
+
+
+XPT det " detect { .. }
+detect { |`obj^| `cursor^ }
+
+
+XPT dir " Dir[..]
+XSET _='/**/*'
+Dir[`_^]
+
+
+XPT dirg " Dir.glob\(..) { |..| .. }
+Dir.glob(`dir^) { |`file^| `cursor^ }
+
+
+XPT do " do |..| .. end
+XSET arg*|post=RepeatInsideEdges(', ')
+do` |`arg*`|^
+    `cursor^
+end
+
+
+XPT dow " downto\(..) { .. }
+XSET arg=i
+XSET lbound=0
+downto(`lbound^) { |`arg^| `cursor^ }
+
+
+XPT each " each_** { .. }
+XSET what=RubyEachPopup()
+XSET what|post=RubyEachBrace()
+XSET vars=RubyEachPair()
+each`_`what^ { |`vars^| `cursor^ }
+
+
+XPT fdir " File.dirname\(..)
+File.dirname(`^)
+
+
+XPT fet " fetch\(..) { |..| .. }
+fetch(`name^) { |`key^| `cursor^ }
+
+
+XPT file " File.foreach\(..) ...
+File.foreach('`filename^') { |`line^| `cursor^ }
+
+
+XPT fin " find { |..| .. }
+find { |`element^| `cursor^ }
+
+
+XPT fina " find_all { |..| .. }
+find_all { |`element^| `cursor^ }
+
+
+XPT fjoin " File.join\(..)
+File.join(`dir^, `path^)
+
+
+XPT fla " flatten_once
+inject(Array.new) { |`arr^, `a^| `arr^.push(*`a^) }
+
+
+XPT fread " File.read\(..)
+File.read(`filename^)
+
+
+XPT grep " grep\(..) { |..| .. }
+grep(/`pattern^/) { |`match^| `cursor^ }
+
+
+XPT gsub " gsub\(..) { |..| .. }
+gsub(/`pattern^/) { |`match^| `cursor^ }
+
+
+XPT hash " Hash.new { ... }
+Hash.new { |`hash^,`key^| `hash^[`key^] = `cursor^ }
+
+XPT if " if .. end
+if `boolean exp^
+    `cursor^
+end
+
+XPT ife " if .. else .. end
+XSET block=# block
+if `boolean exp^
+    `block^
+else
+    `cursor^
+end
+
+XPT ifei " if .. elsif .. else .. end
+XSET block=# block
+if `boolean exp^`
+    `block^
+``elsif...`
+{{^elsif `comparison^
+    `block^
+``elsif...`
+^`}}^``else...`
+{{^else
+    `cursor^
+`}}^end
+
+
+XPT inj " inject\(..) { |..| .. }
+inject`(`arg`)^ { |`accumulator^, `element^| `cursor^ }
+
+
+XPT lam " lambda { .. }
+XSET arg*|post=RepeatInsideEdges(', ')
+lambda {` |`arg*`|^ `cursor^ }
+
+
+XPT loop " loop do ... end
+loop do
+    `cursor^
+end
+
+XPT map " map { |..| .. }
+map { |`arg^| `cursor^ }
+
+
+XPT max " max { |..| .. }
+max { |`element1^, `element2^| `cursor^ }
+
+
+XPT min " min { |..| .. }
+min { |`element1^, `element2^| `cursor^ }
+
+
+XPT mod " module .. .. end
+XSET module name|post=RubyCamelCase()
+module `module name^
+    `cursor^
+end
+
+
+XPT modf " module .. module_function .. end
+XSET module name|post=RubyCamelCase()
+module `module name^
+    module_function
+
+    `cursor^
+end
+
+
+XPT nam " Rake Namespace
+XSET ns=fileRoot()
+namespace :`ns^ do
+    `cursor^
+end
+
+
+XPT new " Instanciate new object
+XSET Object|post=RubyCamelCase()
+XSET arg*|post=RepeatInsideEdges(', ')
+`var^ = `Object^.new`(`arg*`)^
+
+
+XPT open " open\(..) { |..| .. }
+XSET mode...|post=, '`wb^'
+open(`filename^`, `mode...^) { |`io^| `cursor^ }
+
+
+XPT par " partition { |..| .. }
+partition { |`element^| `cursor^ }
+
+
+XPT pathf " Path from here
+XSET path=../lib
+File.join(File.dirname(__FILE__), "`path^")
+
+
+XPT rdoc syn=comment " RDoc description
+=begin rdoc
+# `cursor^
+#=end
+
+
+XPT rej " reject { |..| .. }
+reject { |`element^| `cursor^ }
+
+
+XPT rep " Benchmark report
+result.report("`name^: ") { TESTS.times { `cursor^ } }
+
+
+XPT req " require ..
+require '`lib^'
+
+
+XPT reqs " %w[..].map { |lib| require lib }
+XSET lib*|post=ExpandIfNotEmpty(' ', 'lib*')
+%w[`lib*^].map { |lib| require lib }
+
+..XPT
+
+
+XPT reve " reverse_each { .. }
+reverse_each { |`element^| `cursor^ }
+
+
+XPT ruby " #!/usr/bin/env ruby
+XSET enc=Echo(&fenc ? &fenc : &enc)
+#!/usr/bin/env ruby
+# -*- encoding: `enc^ -*-
+
+XPT shebang alias=ruby
+
+XPT sb alias=ruby
+
+
+
+XPT scan " scan\(..) { |..| .. }
+scan(/`pattern^/) { |`match^| `cursor^ }
+
+
+XPT sel " select { |..| .. }
+select { |`element^| `cursor^ }
+
+
+XPT sinc " class << self; self; end
+class << self; self; end
+
+
+XPT sor " sort { |..| .. }
+sort { |`element1^, `element2^| `element1^ <=> `element2^ }
+
+
+XPT sorb " sort_by { |..| .. }
+sort_by {` |`arg`|^ `cursor^ }
+
+
+XPT ste " step\(..) { .. }
+step(`count^`, `step^) { |`i^| `cursor^ }
+
+
+XPT sub " sub\(..) { |..| .. }
+sub(/`pattern^/) { |`match^| `cursor^ }
+
+
+XPT subcl " class .. < .. end
+XSET ClassName.post=RubyCamelCase()
+XSET Parent.post=RubyCamelCase()
+class `ClassName^ < `Parent^
+    `cursor^
+end
+
+
+XPT tas " Rake Task
+XSET task name|post=RubySnakeCase()
+XSET dep*|post=RepeatInsideEdges(', :')
+desc "`task description^"
+task :`task name^` => [:`dep*`]^ do
+    `cursor^
+end
+
+
+XPT tc " require 'test/unit' ... class Test.. < Test::Unit:TestCase ...
+XSET ClassName=RubyCamelCase(R("module"))
+XSET ClassName.post=RubyCamelCase()
+XSET deft=Trigger('deft')
+require "test/unit"
+require "`module^"
+
+class Test`ClassName^ < Test::Unit::TestCase
+    `deft^`
+
+    `deft...`{{^
+
+    `deft^`
+
+    `deft...`^`}}^
+end
+
+
+XPT tif " .. ? .. : ..
+(`boolean exp^) ? `exp if true^ : `exp if false^
+
+
+XPT tim " times { .. }
+times {` |`i`|^ `cursor^ }
+
+
+XPT tra " transaction\(..) { ... }
+transaction(`true^) { `cursor^ }
+
+
+XPT unif " Unix Filter
+ARGF.each_line do |`line^|
+    `cursor^
+end
+
+
+XPT unless " unless .. end
+unless `boolean cond^
+    `cursor^
+end
+
+
+XPT until " until .. end
+until `boolean cond^
+    `cursor^
+end
+
+
+XPT upt " upto\(..) { .. }
+upto(`ubound^) { |`i^| `cursor^ }
+
+
+XPT usai " if ARGV.. abort\("Usage...
+XSET args=[options]
+if ARGV`^
+    abort "Usage: #{$PROGRAM_NAME} `args^"
+end
+
+
+XPT usau " unless ARGV.. abort\("Usage...
+XSET args=[options]
+unless ARGV`^
+    abort "Usage: #{$PROGRAM_NAME} `args^"
+end
+
+
+XPT while " while .. end
+while `boolean cond^
+    `cursor^
+end
+
+
+XPT wid " with_index { .. }
+with_index { |`element^, `index^| `cursor^ }
+
+
+XPT xml " REXML::Document.new\(..)
+REXML::Document.new(File.read(`filename^))
+
+
+XPT y syn=comment " :yields:
+:yields:
+
+
+XPT zip " zip\(..) { |..| .. }
+zip(`enum^) { |`row^| `cursor^ }
+
+
+
+
+" ================================= Wrapper ===================================
+
+
+
+XPT invoke_ wraponly=wrapped " ..(SEL)
+XSET name|post=RubySnakeCase()
+`name^(`wrapped^)
+
+
+XPT def_ wraponly=wrapped " def ..() SEL end
+XSET method_name|post=RubySnakeCase()
+XSET arg*|post=RepeatInsideEdges(', ')
+def `method_name^`(`arg*`)^
+    `wrapped^
+end
+
+
+XPT class_ wraponly=wrapped " class .. SEL end
+XSET _|post=RubyCamelCase()
+class `_^
+    `wrapped^
+end
+
+
+XPT module_ wraponly=wrapped " module .. SEL end
+XSET _|post=RubyCamelCase()
+module `_^
+    `wrapped^
+end
+
+
+XPT begin_ wraponly=wrapped " begin SEL rescue .. else .. end
+XSET Exception|post=RubyCamelCase()
+XSET block=# block
+begin
+    `wrapped^
+``rescue...`
+{{^rescue `Exception^` => `e^
+    `block^
+``rescue...`
+^`}}^``else...`
+{{^else
+    `block^
+`}}^``ensure...`
+{{^ensure
+    `cursor^
+`}}^end
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/scheme/scheme.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/scheme/scheme.xpt.vim
new file mode 100755
index 0000000..8233984
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/scheme/scheme.xpt.vim
@@ -0,0 +1,71 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+XPTvar $VOID_LINE     /* void */;
+XPTvar $BRif \n
+
+XPTinclude
+      \ _common/common
+      \ _condition/lisp.like
+
+
+XPT begin " (begin .. )
+(begin
+   (`todo0^)` `...^
+   (`todon^)` `...^)
+
+
+XPT case " (case (of) ((match) (expr)) ..)
+(case (`of^)
+      ({`match^} `expr1^)` `...^
+      ({`matchn^} `exprn^)` `...^
+      `else...^\(else \`cursor\^)^^)
+
+
+XPT cond " (cond ([condi] (expr)) ..)
+(cond ([`condition^] `expr1^)` `...^
+`      ([`condition^] `exprn^)` `...^
+      `else...^\(else \`cursor\^)^^)
+
+
+XPT let " (let [(var (val)) ..] (body))
+(let [(`newVar^ `value^` `...^)
+`      (`newVarn^ `valuen^` `...^)]
+     (`cursor^))
+
+
+XPT letrec " (letrec [(var (val)) ..] (body))
+(letrec [(`newVar^ `value^` `...^)
+`         (`newVarn^ `valuen^` `...^)]
+     (`cursor^))
+
+
+XPT lambda " (lambda [params] (body))
+(lambda [`params^]
+        (`cursor^))
+
+
+XPT defun " (define var (lambda ..))
+(define `funName^
+    (lambda [`params^]
+        (`cursor^))
+ )
+
+
+XPT def " (define var (ex))
+(define `varName^ `cursor^)
+
+
+XPT do " (do ..)
+(do {(`var^ `init^ `step^)` `...0^
+`     (`var^ `init^ `step^)` `...0^}
+   ([`test^] `exprs^)
+   (`command^)` `...2^
+   (`command^)` `...2^)
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/sh/sh.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/sh/sh.xpt.vim
new file mode 100644
index 0000000..ad29c6b
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/sh/sh.xpt.vim
@@ -0,0 +1,179 @@
+XPTemplate priority=lang mark=~^
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+XPTvar $VOID_LINE     # void
+XPTvar $CURSOR_PH     # cursor
+
+
+XPTvar $BRif          ' '
+XPTvar $BRel          \n
+XPTvar $BRloop        ' '
+XPTvar $BRstc         ' '
+XPTvar $BRfun         ' '
+
+XPTvar $SPop          ''
+XPTvar $SParg         ''
+
+XPTinclude
+      \ _common/common
+      \ _printf/c.like
+
+XPTvar $CS    #
+XPTinclude
+      \ _comment/singleSign
+
+
+" ========================= Function and Variables =============================
+
+let s:braceMap = {
+            \   '`' : '`',
+            \   '{' : '}',
+            \   '[' : ']',
+            \   '(' : ')',
+            \  '{{' : '}}',
+            \  '[[' : ']]',
+            \  '((' : '))',
+            \  '{ ' : ' }',
+            \  '[ ' : ' ]',
+            \  '( ' : ' )',
+            \ '{{ ' : ' }}',
+            \ '[[ ' : ' ]]',
+            \ '(( ' : ' ))',
+            \}
+
+fun! s:f.sh_complete_brace()
+
+    let v = self.V()
+    let br = matchstr( v, '\V\^\[\[({`]\{1,2} \?' )
+    if br == ''
+        return ''
+    elseif br == '`'
+        return s:braceMap[ br ]
+    else
+        try
+            let cmpl = s:braceMap[ br ]
+            let cmplEsc = substitute( cmpl, ']', '\\[]]', 'g' )
+            let tail = matchstr( v, '\V\%[' . cmplEsc . ']\$' )
+            if tail == ' ' && br =~ ' '
+                let tail = ''
+            endif
+            return cmpl[ len( tail ) : ]
+        catch /.*/
+            echom v:exception
+        endtry
+    endif
+
+endfunction
+
+" ================================= Snippets ===================================
+
+
+
+
+XPT shebang " #!/bin/[ba|z|c]sh
+XSET sh=ChooseStr( 'sh', 'bash', 'zsh', 'csh' )
+#!/bin/~sh^
+
+..XPT
+
+XPT sb alias=shebang
+
+XPT _shebang hidden " #!/bin/$_xSnipName
+#!/bin/~$_xSnipName^
+
+..XPT
+
+
+XPT sh   alias=_shebang
+XPT bash alias=_shebang
+XPT zsh  alias=_shebang
+XPT csh  alias=_shebang
+
+
+XPT echodate " echo `date +%...`
+echo `date~ +~fmt^`
+
+XPT _cond hidden
+XSET condition|map=[ [
+XSET condition|map=( (
+~condition^~condition^sh_complete_brace()^
+
+
+XPT printf	" printf\(...)
+XSET elts|pre=Echo('')
+XSET elts=c_printf_elts( R( 'pattern' ), ' '[ len( $SPop ) : ] )
+printf "~pattern^"~elts^
+
+
+
+XPT forin wrap " for .. in ..; do
+for ~i^ in ~list^;~$BRloop^do
+    ~cursor^
+done
+
+XPT for wrap " for (( i=0; i<len; i++ )); do
+for ((~i^ = ~0^; ~i^ < ~len^; ~i^++));~$BRloop^do
+    ~cursor^
+done
+
+XPT forr wrap " for (( i=n; i>=start; i++ )); do
+for ((~i^ = ~n^; ~i^ >~=^ ~start^0^; ~i^--));~$BRloop^do
+    ~cursor^
+done
+
+XPT here wrap " << END ..
+<<~-~END^
+~cursor^
+~END^substitute( V(), '\v\^-', '', '' )^
+
+XPT until wrap " until ..; do
+until ~:_cond:^;~$BRloop^;do
+    ~cursor^
+done
+
+XPT while wrap " while ..; do
+while ~:_cond:^;~$BRloop^do
+    ~cursor^
+done
+
+XPT while1 alias=while " while [ 1 ]; do
+XSET condition=Next( '[ ~$TRUE^ ]' )
+
+XPT case wrap " case .. in ..
+case ~$~var^ in
+    ~pattern^)
+    ~cursor^
+    ;;
+
+esac
+
+XPT if wrap " if ..; then
+if ~:_cond:^;~$BRif^then
+    ~cursor^
+fi
+
+XPT else wrap " else ..
+else
+    ~cursor^
+
+XPT ife wrap=job " if ..; then .. else ..
+if ~:_cond:^;~$BRif^then
+    ~job^
+else
+    ~cursor^
+fi
+
+XPT elif wrap " elif .. ; then
+elif ~:_cond:^;~$BRif^then
+    ~cursor^
+
+XPT fun wrap " .. () { .. }
+~name^ ()~$BRfun^{
+    ~cursor^
+}
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/sql/sql.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/sql/sql.xpt.vim
new file mode 100644
index 0000000..8462d79
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/sql/sql.xpt.vim
@@ -0,0 +1,80 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+" if () ** {
+" else ** {
+XPTvar $BRif     ' '
+
+" } ** else {
+XPTvar $BRel     \n
+
+" for () ** {
+" while () ** {
+" do ** {
+XPTvar $BRloop   ' '
+
+" struct name ** {
+XPTvar $BRstc    ' '
+
+" int fun() ** {
+" class name ** {
+XPTvar $BRfun    ' '
+
+XPTinclude
+      \ _common/common
+
+
+
+
+" ============================================================================
+" cursor - CURSOR logic
+" ============================================================================
+XPT cursor hint=CURSOR\ logic
+DECLARE @iFetchCount                    INT
+DECLARE `<CursorName>^ CURSOR STATIC
+    FOR SELECT `<Expression1>^`
+               `Expression2...^
+    `          ,`<Expression2>^`
+               `Expression2...^
+            FROM `<Table>^ WITH (NOLOCK)
+            WHERE     (`<Expression3>^)`
+                  `Expression4...^
+            `      AND (`<Expression4>^)`
+                  `Expression4...^
+            ORDER BY `<Expression5>^`
+                  `Expression6...^
+            `        ,`<Expression6>^`
+                  `Expression6...^
+SET @iFetchCount = 0
+OPEN `<CursorName>^
+FETCH NEXT
+    FROM `<CursorName>^
+    INTO `<Variable1>^`
+         `Variable2...^
+    `    ,`<Variable2>^`
+         `Variable2...^
+WHILE (@@FETCH_STATUS = 0)
+BEGIN
+    SET @iFetchCount = @iFetchCount + 1
+    IF ((@iFetchCount % 1000) = 0)
+    BEGIN
+        SET @sMsg = '@iFetchCount = ' + ltrim(dbo.udfFormatNumber(@iFetchCount,18,0))
+        EXEC dbadb.dbo.uspLogMessage @sJob, @sMsg
+    END
+    FETCH NEXT
+        FROM `<CursorName>^
+        INTO `<Variable3>^`
+             `Variable4...^
+        `    ,`<Variable4>^`
+             `Variable4...^
+END
+CLOSE `<CursorName>^
+DEALLOCATE `<CursorName>^
+..XPT
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/svg/svg.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/svg/svg.xpt.vim
new file mode 100644
index 0000000..8644443
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/svg/svg.xpt.vim
@@ -0,0 +1,65 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+XPTinclude
+    \ _common/common
+    \ xml/xml
+
+
+" ========================= Function and Variables =============================
+
+" ================================= Snippets ===================================
+
+XPT svg " Start an svg document
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="`width^100%^" height="`height^100%^" version="1.1" xmlns="http://www.w3.org/2000/svg">
+    `cursor^
+</svg>
+..XPT
+
+XPT line " Create an svg line
+<line x1="`xStart^" y1="`yStart^" x2="`xEnd^" y2="`yEnd^" `style...^ />
+XSET style...|post= style="`cursor^"
+..XPT
+
+XPT circle " Create an svg circle
+<circle cx="`xCenter^" cy="`yCenter^" r="`radius^" `style...^ />
+XSET style...|post= style="`cursor^"
+..XPT
+
+XPT ellipse " Create an svg ellipse
+<ellipse cx="`xCenter^" cy="`yCenter^" rx="`horizontalRadius^" ry="`verticalRadius^" `style...^ />
+XSET style...|post= style="`cursor^"
+..XPT
+
+XPT rect " Create an svg rectangle
+<rect x="`xStart^" y="`yStart^" width="`width^" height="`height^" `style...^ />
+XSET style...|post= style="`cursor^"
+..XPT
+
+XPT polygon " Create an svg polygon
+<polygon points="`x^,`y^`...^ `x^,`y^`...^" `style...^ />
+XSET style...|post= style="`cursor^"
+..XPT
+
+XPT polyline " Create an svg polyline
+<polyline points="`x^,`y^`...^ `x^,`y^`...^" `style...^ />
+XSET style...|post= style="`cursor^"
+..XPT
+
+XPT line " Create an svg line
+<text x="`xStart^" y="`yStart^" x2="`xEnd^" y2="`yEnd^" `style...^>
+    `cursor^
+</text>
+XSET style...|post= style="`style^"
+..XPT
+
+" ================================= Wrapper ===================================
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/tcl/tcl.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/tcl/tcl.xpt.vim
new file mode 100644
index 0000000..9aa73d0
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/tcl/tcl.xpt.vim
@@ -0,0 +1,93 @@
+XPTemplate priority=lang mark=~^
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+XPTvar $VOID_LINE     /* void */;
+XPTvar $CURSOR_PH
+
+XPTvar $BRif \n
+
+XPTinclude
+      \ _common/common
+
+
+" ========================= Function and Variables =============================
+
+
+" ================================= Snippets ===================================
+
+
+
+XPT shebang " #!/bin/sh .. exec tclsh..
+#!/bin/sh
+#\
+exec tclsh "$0" "$@""
+
+..XPT
+
+XPT sb alias=shebang
+
+
+XPT for " for {...}
+for {set ~i^ ~x^} {$~i^ <= ~len^} {incr ~i^} {
+    ~cursor^
+}
+
+
+XPT foreach " foreach i var {...
+foreach ~i^ ~var^ {
+    ~cursor^
+}
+
+
+XPT while " while {i <= ?} {...
+while {~i^ <= ~len^} {
+    ~cursor^
+}
+
+
+XPT if " if { ... } { ...
+if {~a^} {
+     ~cursor^
+}
+
+
+XPT elseif " elseif {...
+elseif {~a^} {
+     ~cursor^
+}
+
+
+XPT else " else {...
+else {
+     ~cursor^
+}
+
+
+XPT switch " switch ... {...
+switch ~var^ {
+    ~1^     { ~body1^ }
+    ~2^     { ~body2^ }
+    ~3^     { ~body3^ }
+    default { ~body4^ }
+}
+
+
+XPT proc " proc *** {...
+proc ~name^ {~args^} {
+     ~cursor^
+}
+
+
+XPT regexp " regexp ... match
+regexp ~r^ ~str^ match ~vars^
+
+
+XPT regsub " regsub ...
+regsub ~in^ ~str^ ~out^
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/tex/tex.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/tex/tex.xpt.vim
new file mode 100644
index 0000000..45d89e5
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/tex/tex.xpt.vim
@@ -0,0 +1,137 @@
+XPTemplate priority=lang mark=`~
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+
+XPT _arg1 hidden " \\$_xSnipName\{..}
+\\`$_xSnipName~{`cursor~}
+
+XPT _arg2 hidden " \\$_xSnipName\{..}\{..}
+\\`$_xSnipName~{`a~}{`b~}
+
+XPT _sub hidden " \\{$_xSnipName}_..
+\\`$_xSnipName~_`sub~
+
+XPT _sub_super hidden " \\{$_xSnipName}_..^..
+\\`$_xSnipName~_`sub~^`super~
+
+XPT _begin wrap hidden " \begin{..} .. end{..}
+\begin{`sth~}`{`what?`}~
+    `cursor~
+\end{`sth~}
+
+XPT _block wrap hidden " \begin\{$_xSnipName} .. \end\{$_xSnipName}
+\begin{`$_xSnipName~}
+    `cursor~
+\end{`$_xSnipName~}
+
+XPT _block_t wrap hidden " \begin\{$_xSnipName} .. \end\{$_xSnipName}
+\begin{`$_xSnipName~}{`title~}
+    `cursor~
+\end{`$_xSnipName~}
+
+XPT section alias=_arg1
+XPT label alias=_arg1
+XPT ref alias=_arg1
+
+XPT frac alias=_arg2
+
+XPT abstract alias=_block
+XPT document alias=_block
+XPT equation alias=_block
+XPT slide alias=_block
+
+XPT frame alias=_block_t
+XPT block alias=_block_t
+
+XPT lim alias=_sub
+
+XPT int alias=_sub_super
+
+XPT info " title author date
+\title{`title~}
+\author{`$author~}
+\date{`date()~}
+
+XPT array " begin{array}{..}... end{array}
+\begin{array}{`kind~rcl~}
+`what~` `...0~ & `what~` `...0~ \\\\` `...1~
+`what~` `...2~ & `what~` `...2~ \\\\` `...1~
+\end{array}
+
+XPT table " begin{tabular}{..}... end{tabular}
+XSET hline..|post=\hline
+XSET what*|post=ExpandIfNotEmpty( ' & ', 'what*' )
+\begin{tabular}{`kind~|r|c|l|~}
+`hline..~
+`what*~ \\\\` `...1~
+`hline..~
+`what*~ \\\\` `...1~
+\end{tabular}
+
+
+" backward compatible
+XPT lbl " label{..}
+\label{`cursor~}
+
+" backward compatible
+XPT integral " int_..^..
+\int_`begin~^`end~{`cursor~}
+
+XPT itemize " begin{itemize} ... end{itemize}
+\begin{itemize}
+    \item `what~~`...~
+    \item `what~~`...~
+\end{itemize}
+
+XPT enumerate " begin{enumerate} ... end{enumerate}
+\begin{enumerate}
+    \item `what~~`...~
+    \item `what~~`...~
+\end{enumerate}
+
+XPT description " begin{description} ... end{description}
+\begin{description}
+    \item[`what~] `content~~`...~
+    \item[`what~] `content~~`...~
+\end{description}
+
+XPT sqrt " sqrt[..]{..}
+\sqrt`[`nth?`]~{`cursor~}
+
+XPT sum " sum{..}~..{}
+\sum_{`init~}^`end~{`cursor~}
+
+XPT documentclass " documentclass[..]{..}
+XSET kind=Choose(['article','book','report', 'letter','slides'])
+\documentclass[`11~pt]{`kind~}
+
+XPT toc " \tableofcontents
+\tableofcontents
+
+" backward compatible
+XPT beg alias=_begin
+
+XPT columns " \begin{columns}...
+\begin{columns}
+    \begin{column}[l]{`size~5cm~}
+    \end{column}`...~
+
+    \begin{column}[l]{`size~5cm~}
+    \end{column}`...~
+    `cursor~
+\end{columns}
+
+XPT enclose_ wraponly=wrapped " \begin{..} SEL \end{..}
+\begin{`something~}
+    `wrapped~
+\end{`something~}
+
+XPT as_ wraponly=wrapped " SEL{..}
+\\`wrapped~{`cursor~}
+
+XPT with_ wraponly=wrapped " \\.. {SEL}
+\\`cursor~{`wrapped~}
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/unknown/unknown.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/unknown/unknown.xpt.vim
new file mode 100644
index 0000000..2bd0722
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/unknown/unknown.xpt.vim
@@ -0,0 +1,8 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+
+XPTinclude
+    \ _common/common
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/vim/autoload.vim.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/vim/autoload.vim.xpt.vim
new file mode 100644
index 0000000..da00a43
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/vim/autoload.vim.xpt.vim
@@ -0,0 +1,30 @@
+if expand( "%:p:h" ) . '/' !~# '\V\[\\/]autoload\[\\/]'
+    finish
+endif
+
+XPTemplate priority=lang-
+
+let s:f = g:XPTfuncs()
+
+fun! s:f.vim_autoload_pre()
+    let path = expand( "%:p" )
+    let path = substitute( path, '\V\\', '/', 'g' )
+    let path = matchstr( path, '\V/autoload/\zs\.\+\ze.vim\$' )
+    let path = substitute( path, '\V/', '#', 'g' )
+    return path
+endfunction
+
+
+
+XPTinclude
+      \ _common/common
+      \ vim/vim
+
+" TODO fix it
+" XSET name|repl=vim_autoload_pre()#`name
+XPT fun alias=_fun " fun! vim_autoload_pre()#**
+XSET name=Build( '`' . vim_autoload_pre() . '#`n^' )
+
+
+XPT ## " vim_autoload_pre\()#
+`vim_autoload_pre()^#
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/vim/vim.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/vim/vim.xpt.vim
new file mode 100644
index 0000000..a1cb5a7
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/vim/vim.xpt.vim
@@ -0,0 +1,182 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+
+" int fun ** (
+" class name ** (
+XPTvar $SPfun      ''
+
+" int fun( ** arg ** )
+" if ( ** condition ** )
+" for ( ** statement ** )
+" [ ** a, b ** ]
+" { ** 'k' : 'v' ** }
+XPTvar $SParg      ' '
+
+" if ** (
+" while ** (
+" for ** (
+XPTvar $SPcmd      ' '
+
+" a ** = ** a ** + ** 1
+" (a, ** b, ** )
+XPTvar $SPop       ' '
+
+XPTinclude
+      \ _common/common
+      \ _printf/c.like
+
+XPTvar $CS    "
+XPTinclude
+      \ _comment/singleSign
+
+fun! s:f.vim_call()
+    " Note: do not use [ * - 2 ] which may be -1
+    return getline( '.' )[ : self.ItemPos()[0][1] - 1 ] =~ '\v^\s*\w$' ? 'call ' : ''
+endfunction
+
+call XPTdefineSnippet('vimformat', {}, [ '" vim:tw=78:ts=8:sw=4:sts=4:et:norl:fdm=marker:fmr={{{,}}}' ])
+
+
+
+XPT lncol " [ line\( "." ), col\( "." ) ]
+[ line( '.' ), col( '.' ) ]
+
+XPT printf	" printf\(..)
+XSET elts|pre=Echo('')
+XSET elts=c_printf_elts( R( 'pattern' ), "," )
+printf(`$SParg^"`pattern^"`elts^`$SParg^)
+
+XPT _args hidden " expandable arguments
+XSET arg*|post=ExpandInsideEdge( ',$SPop', '' )
+`$SParg`arg*`$SParg^
+
+XPT self " self.
+self.
+
+XPT once " if exists.. finish
+XSET i|pre=headerSymbol()
+if exists(`$SParg^"`g^:`i^"`$SParg^)
+    finish
+endif
+let `g^:`i^`$SPop^=`$SPop^1
+`cursor^
+
+XPT version " if exists && larger than
+XSET i|pre=headerSymbol()
+XSET ver=1
+if exists(`$SParg^"`g^:`i^"`$SParg^) && `g^:`i^`$SPop^>=`$SPop^`ver^
+    finish
+endif
+let ``g^:``i^`$SPop^=`$SPop^``ver^
+`cursor^
+
+XPT varconf " if !exists ".." let .. = .. endif
+if !exists(`$SParg^"`g^:`varname^"`$SParg^)
+    let `g^:`varname^`$SPop^=`$SPop^`val^
+endif
+
+XPT _fun hidden wrap " fun! ..(..) .. endfunction
+fun! `name^`$SPfun^(`:_args:^) "{{{
+    `cursor^
+endfunction "}}}
+
+XPT fun alias=_fun
+
+XPT member wrap " tips
+fun! `name^`$SPfun^(`:_args:^) dict "{{{
+    `cursor^
+endfunction "}}}
+
+XPT while wrap " while .. .. endwhile
+while `cond^
+    `cursor^
+endwhile
+
+XPT while1 alias=while
+XSET cond=Embed( $TRUE )
+
+XPT whilei wrap " while i | let i += 1
+let [`$SParg^`i^,`$SPop^`len^`$SParg^] = [`$SParg^`0^`$SPop^-`$SPop^1,`$SPop^`len_expr^`$SPop^-`$SPop^1`$SParg^]
+while `i^`$SPop^<`$SPop^`len^ | let `i^`$SPop^+=`$SPop^1
+    `cursor^
+endwhile
+
+XPT forin wrap " for .. in ..
+for `value^ in `list^
+    `cursor^
+endfor
+
+XPT try wrap=job " try .. catch ..
+try
+    `job^
+`:catch:^
+endtry
+
+XPT catch " catch / .. /
+XSET exception=.*
+catch /`exception^/
+    `cursor^
+
+XPT finally " finally ..
+finally
+    `cursor^
+
+XPT if wrap " if .. else ..
+if `cond^
+    `cursor^
+endif
+
+XPT else " else ..
+else
+    `cursor^
+
+XPT filehead " description of file
+" File Description {{{
+" =============================================================================
+" `cursor^
+"                                                  by `$author^
+"                                                     `$email^
+" Usage :
+"
+" =============================================================================
+" }}}
+..XPT
+
+XPT savecpo " save &cpo
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+`cursor^
+let &cpo = s:oldcpo
+
+" The first placeholder wrapping 'com' keyword that causes ctags halt
+XPT sid "  generate s:sid variable
+exe 'map <Plug>xsid <SID>|let s:sid=matchstr(maparg("<Plug>xsid"), "\\d\\+_")|unmap <Plug>xsid'
+
+..XPT
+
+XPT bench " while 1000.. doit..
+let n = `100000^
+let i = 0
+let `t^_0 = reltime()
+
+while i < n
+    let i += 1
+    `cursor^
+endwhile
+
+let `t^ = reltime( `t^_0 )
+let us = `t^[0] * 1000*1000 + `t^[1]
+echo 'spent:' reltimestr( `t^ )
+echo 'per-call(us):' us/n
+
+XPT call wraponly=param " ..\( .. )
+`vim_call()`name^(`$SParg^`param^`$SParg^)
+
+XPT _call hidden wrap=param? " $_xSnipName( .. )
+`$_xSnipName^(`$SParg`param?`$SParg^)
+
+XPT string alias=_call
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/xhtml/xhtml.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/xhtml/xhtml.xpt.vim
new file mode 100644
index 0000000..cfb7695
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/xhtml/xhtml.xpt.vim
@@ -0,0 +1,6 @@
+XPTemplate priority=lang-
+
+XPTinclude
+    \ html/html
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/xml/xml.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/xml/xml.xpt.vim
new file mode 100644
index 0000000..297c897
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/xml/xml.xpt.vim
@@ -0,0 +1,155 @@
+XPTemplate priority=spec
+
+let s:f = g:XPTfuncs()
+
+XPTvar $CURSOR_PH     <!-- cursor -->
+
+XPTinclude
+      \ _common/common
+
+XPTvar $CL    <!--
+XPTvar $CM
+XPTvar $CR    -->
+XPTinclude
+      \ _comment/doubleSign
+
+
+" ========================= Function and Variables =============================
+
+fun! s:f.xml_att_val()
+    if self.Phase()=='post'
+        return ''
+    endif
+
+    let name = self.ItemName()
+    return self.Vmatch('\V' . name, '\V\^\s\*\$')
+          \ ? ''
+          \ : '="val" ' . name
+endfunction
+
+fun! s:f.xml_tag_ontype()
+    let v = self.V()
+    if v =~ '\V\s\$'
+        let v = substitute( v, '\V\s\*\$', '', 'g' )
+        return self.Next( v )
+    endif
+    return v
+endfunction
+
+fun! s:f.xml_attr_ontype()
+    let v = self.V()
+    if v =~ '\V=\$'
+        return self.Next()
+    elseif len( v ) > 2 && v =~ '\V""\$'
+        return self.Next( v[ 0 : -2 ] )
+    else
+        return v
+    endif
+
+endfunction
+
+fun! s:f.xml_create_attr_ph()
+    " let prev = self.PrevItem( -1 )
+    if !self.HasStep( 'x' )
+        return self.Embed('` `x^' . '`att*^')
+    endif
+
+    let prev = self.Reference( 'x' )
+
+    if prev =~ '=$' 
+        return self.Embed('`"`x`"^' . '`att*^')
+    elseif prev =~ '"$'
+        return self.Embed('` `x^' . '`att*^')
+    else
+        return self.Next( '' )
+    endif
+endfunction
+
+fun! s:f.xml_close_tag()
+    let v = self.V()
+    if v[ 0 : 0 ] != '<' || v[ -1:-1 ] != '>'
+        return ''
+    endif
+
+    let v = v[ 1: -2 ]
+
+    if v =~ '\v/\s*$|^!'
+        return ''
+    else
+        return '</' . matchstr( v, '\v^\S+' ) . '>'
+    endif
+endfunction
+
+fun! s:f.xml_cont_helper()
+    let v = self.V()
+    if v =~ '\V\n'
+        return self.ResetIndent( -s:nIndent, "\n" )
+    else
+        return ''
+    endif
+endfunction
+
+let s:nIndent = 0
+fun! s:f.xml_cont_ontype()
+    let v = self.V()
+    if v =~ '\V\n'
+        let v = matchstr( v, '\V\.\*\ze\n' )
+        let s:nIndent = &indentexpr != ''
+              \ ? eval( substitute( &indentexpr, '\Vv:lnum', 'line(".")', '' ) ) - indent( line( "." ) - 1 )
+              \ : self.NIndent()
+
+        return self.Finish( v . "\n" . repeat( ' ', s:nIndent ) )
+    else
+        return v
+    endif
+endfunction
+
+
+" inoremap <silent> < <space><BS><C-r>=XPTtgr('__tag',{'syn':'','k':'<'})<cr>
+
+" ================================= Snippets ===================================
+
+XPT _tag hidden " <$_xSnipName>..</$_xSnipName>
+XSET content|def=Echo( R( 't' ) =~ '\v/\s*$' ? Finish() : '' )
+XSET content|ontype=xml_cont_ontype()
+<`t^$_xSnipName^>`content^`content^xml_cont_helper()^`t^xml_close_tag()^
+..XPT
+
+XPT __tag hidden " <Tag>..</Tag>
+XSET content|def=Echo( R( 't' ) =~ '\v/\s*$' ? Finish() : '' )
+XSET content|ontype=xml_cont_ontype()
+`<`t`>^^`content^^`content^xml_cont_helper()^`t^xml_close_tag()^
+..XPT
+
+" NOTE: use Embed in default value phase to prevent post filter ruin place
+" holder
+" XPT < " <Tag>..</Tag>
+" XSET tag|ontype=xml_tag_ontype()
+" XSET att*|pre=Echo('')
+" XSET att*|def=Embed( '` `^' )
+" <`tag^`att*^>`content^</`tag^>
+" ..XPT
+
+
+" " auto attributes completion
+" XPT < " <Tag>..</Tag>
+" XSET tag|ontype=xml_tag_ontype()
+" XSET att*|pre=Echo('')
+" XSET att*|def=xml_create_attr_ph()
+" XSET x|def=Echo( '' )
+" XSET x|ontype=xml_attr_ontype()
+" XSET x|post=SV( '\v^\s*$', '' )
+" <`tag^`att*^>`content^</`tag^>
+" ..XPT
+
+
+XPT ver " <?xml version=...
+<?xml version="`ver^1.0^" encoding="`enc^utf-8^" ?>
+
+
+XPT style " <?xml-stylesheet...
+<?xml-stylesheet type="`style^text/css^" href="`from^">
+
+
+XPT cdata wrap " <![CDATA[...
+<![CDATA[`cursor^]]>
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/xpt/xpt.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/xpt/xpt.xpt.vim
new file mode 100644
index 0000000..0d19ded
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/xpt/xpt.xpt.vim
@@ -0,0 +1,223 @@
+XPTemplate priority=sub
+
+let s:f = g:XPTfuncs()
+
+XPTinclude
+      \ _common/common
+      \ vim/vim
+
+
+fun! s:f.xpt_vim_hint_escape()
+  let v = substitute( self.V(), '\(\\*\)\([(]\)', '\1\1\\\2', 'g' )
+  return v
+endfunction
+
+
+" TODO lazy load
+let s:xpt_snip = split( globpath( &rtp, "ftplugin/**/*.xpt.vim" ), "\n" )
+call map( s:xpt_snip, 'substitute(v:val, ''\V\'', ''/'', ''g'')' )
+call map( s:xpt_snip, 'matchstr(v:val, ''\Vftplugin/\zs\.\*\ze.xpt.vim'')' )
+
+fun! s:f.xpt_ftp_pum()
+    return self.Choose( s:xpt_snip )
+endfunction
+
+let s:xpts = {}
+for v in s:xpt_snip
+    if v == ''
+        continue
+    endif
+
+    let [ ft, snip ] = split( v, '/' )
+    if !has_key( s:xpts, ft )
+        let s:xpts[ ft ] = []
+    endif
+
+    let s:xpts[ ft ] += [ snip ]
+endfor
+
+
+fun! s:f.xpt_vim_path()
+  return keys( s:xpts )
+endfunction
+
+fun! s:f.xpt_vim_name(path)
+  let path = matchstr( a:path, '\w\+' )
+  if has_key( s:xpts, path )
+    return s:xpts[ path ]
+  else
+    return ''
+  endif
+endfunction
+
+
+
+
+XPT ftpfile " xpt ftplugin snippet file
+XSET path=xpt_vim_path()
+XSET name=xpt_vim_name( R( 'path' ) )
+`path^/`name^
+
+XPT incfile " XPTinclude ...
+XPTinclude
+      \ _common/common
+      \ `:ftpfile:^
+
+
+XPT container " let s:f = ..
+let s:f = g:XPTfuncs()
+
+
+XPT tmpl " XPT name ...
+XSET tips|post=xpt_vim_hint_escape()
+\XPT `name^` " `tips^
+`cursor^
+
+
+XPT snip alias=tmpl
+
+
+XPT var " XPTvar $*** ***
+XPTvar $`name^ `cursor^
+
+
+XPT varLang " variables to define language properties
+" variable prefix
+XPTvar $VAR_PRE            
+
+
+XPT varFormat " variables to define format
+" if () ** {
+" else ** {
+XPTvar $BRif     ' '
+
+" } ** else {
+XPTvar $BRel     \n
+
+" for () ** {
+" while () ** {
+" do ** {
+XPTvar $BRloop   ' '
+
+" struct name ** {
+XPTvar $BRstc    ' '
+
+" int fun() ** {
+" class name ** {
+XPTvar $BRfun    ' '
+
+
+XPT varSpaces " variable to define spacing
+" int fun ** (
+" class name ** (
+XPTvar $SPfun      ''
+
+" int fun( ** arg ** )
+" if ( ** condition ** )
+" for ( ** statement ** )
+" [ ** a, b ** ]
+" { ** 'k' : 'v' ** }
+XPTvar $SParg      ' '
+
+" if ** (
+" while ** (
+" for ** (
+XPTvar $SPcmd      ' '
+
+" a ** = ** a ** + ** 1
+" (a, ** b, ** )
+XPTvar $SPop       ' '
+
+
+XPT varConst " variables to define constants
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+
+XPT varHelper " variables to define helper place holders
+XPTvar $VOID_LINE      
+XPTvar $CURSOR_PH      
+
+
+XPT varComment1 " variables to define single sign comments
+XPTvar $CS    `cursor^
+
+
+XPT varComment2 " variables to define double sign comments
+XPTvar $CL    `left sign^
+XPTvar $CM    `cursor^
+XPTvar $CR    `right sign^
+
+XPT spfun " `\$SPfun^
+\`$SPfun\^
+
+XPT sparg " `\$SParg^
+\`$SParg\^
+
+XPT spcmd " `\$SPcmd^
+\`$SPcmd\^
+
+XPT spop " `\$SPop^
+\`$SPop\^
+
+
+XPT buildifeq " {{}}
+\``name^{{\^`cursor^\`}}\^
+
+XPT inc " `::^
+\`:`name^:\^
+
+XPT include " `Include:^
+\`Include:`name^\^
+
+
+XPT fun wrap " fun! s:f.**
+fun! `s:f.`name^(`$SParg`param?`$SParg^)
+    `cursor^
+endfunction
+
+
+XPT skeleton " very simple snippet file skeleton
+" Save this file as ~/.vim/ftplugin/c/hello.xpt.vim(or
+" ~/vimfiles/ftplugin/c/hello.xpt.vim).
+" Then you can use it in C language file:
+"     vim xpt.c
+" And type:
+"     helloxpt<C-\>
+"
+XPTemplate priority=personal+
+
+\XPT helloxpt " tips about what this snippet do
+Say hello to \`xpt^.
+\`xpt^ says hello.
+
+
+
+
+
+XPT xpt " start template to write template
+XPTemplate priority=`prio^
+XSET prio=ChooseStr( 'all', 'spec', 'like', 'lang', 'sub', 'personal' )
+
+let s:f = g:XPTfuncs()
+
+" use snippet 'varConst' to generate contant variables
+" use snippet 'varFormat' to generate formatting variables
+" use snippet 'varSpaces' to generate spacing variables
+
+
+XPTinclude
+      \ _common/common
+
+
+\XPT helloxpt " tips about what this snippet does
+Say hello to \`xpt\^.
+\`xpt\^ says hello.
+
+`cursor^
+
+..XPT
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/xptest/xptest.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/xptest/xptest.xpt.vim
new file mode 100644
index 0000000..975361b
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/xptest/xptest.xpt.vim
@@ -0,0 +1,64 @@
+XPTemplate priority=lang
+
+let s:f = g:XPTfuncs()
+
+
+XPTinclude
+      \ _common/common
+
+
+fun! s:f.fff()
+  let v = self.V()
+  if v == 'aa'
+    return ''
+  else
+    return ', another'
+  endif
+endfunction
+
+
+
+
+
+XPT aa syn=43w
+fjdkls
+\XPT
+fdskl
+..XPT
+
+XPT table alias=_tag
+XPT tr    alias=_tag
+
+XPT e " tips
+#{ `^ }
+
+XPT bb " tips
+XSET cursor=123
+what `a^ `cursor^
+\XPT
+..XPT
+
+" XPT jkldsjfksl
+
+XPT q " tips
+XSET $a=3
+`p`{$a}`p^-`p^
+
+XPT x " tips
+XSET $a=3
+`p`p`p^-`$a^
+
+XPT t " tips
+`:x:^fjkdls
+fjksl
+
+
+fd
+..XPT
+" XPT aa " paste at end test
+" `f^`aa...{{^pp`}}^`l^Echo( Context().history[-1].item.name )^
+
+XPT pp " tips
+`...^
+- Let's repeat `this^
+`...^
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/xslt/xslt.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/xslt/xslt.xpt.vim
new file mode 100644
index 0000000..b4acb3c
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/xslt/xslt.xpt.vim
@@ -0,0 +1,110 @@
+XPTemplate priority=lang- keyword=<
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+XPTvar $VOID_LINE  /* void */;
+XPTvar $CURSOR_PH      cursor
+
+XPTvar $BRif          ' '
+XPTvar $BRel          \n
+XPTvar $BRloop        ' '
+XPTvar $BRstc         ' '
+XPTvar $BRfun         ' '
+
+XPTinclude
+      \ _common/common
+      \ html/html
+      \ xml/xml
+
+XPTvar $CL    <!--
+XPTvar $CM
+XPTvar $CR    -->
+XPTinclude
+      \ _comment/doubleSign
+
+" ========================= Function and Variables =============================
+
+" ================================= Snippets ===================================
+
+
+
+
+XPT sort " <xsl:sort ...
+<xsl:sort select="`what^" />
+
+
+XPT valueof " <xsl:value-of ...
+<xsl:value-of select="`what^" />
+
+
+XPT apply " <xsl:apply-templates ...
+<xsl:apply-templates select="`what^" />
+
+
+XPT param " <xsl:param ...
+<xsl:param name="`name^" `select...{{^select="`expr^"`}}^ />
+
+
+XPT import " <xsl:import ...
+<xsl:import href="`URI^" />
+
+
+XPT include " <xsl:include ...
+<xsl:include href="`URI^" />
+
+
+XPT stylesheet " <xsl:stylesheet ...
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >
+
+    <xsl:output method="xml" indent="yes"/>
+
+    <xsl:template match="/`cursor^">
+    </xsl:template>
+</xsl:stylesheet>
+
+
+XPT template " <xsl:template match= ...
+<xsl:template match="`match^">
+    `cursor^
+</xsl:template>
+
+
+XPT foreach " <xsl:for-each select= ...
+<xsl:for-each select="`match^">
+    `cursor^
+</xsl:for-each>
+
+
+XPT if " <xsl:if test= ...
+<xsl:if test="`test^">
+    `cursor^
+</xsl:if>
+
+
+XPT choose " <xsl:choose ...
+XSET job=$CL void $CR
+<xsl:choose>
+    <xsl:when test="`expr^">
+        `job^
+    </xsl:when>`...^
+    <xsl:when test="`ex^">
+        `job^
+    </xsl:when>`...^
+    `otherwise...{{^<xsl:otherwise>
+        `cursor^
+    </xsl:otherwise>`}}^
+</xsl:choose>
+
+
+XPT when " <xsl:when test= ...
+<xsl:when test="`ex^">
+    `what^
+</xsl:when>
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/yacc/yacc.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/yacc/yacc.xpt.vim
new file mode 100644
index 0000000..ca774ab
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/yacc/yacc.xpt.vim
@@ -0,0 +1,55 @@
+XPTemplate priority=lang-
+
+let s:f = g:XPTfuncs()
+
+XPTvar $TRUE          1
+XPTvar $FALSE         0
+XPTvar $NULL          NULL
+XPTvar $UNDEFINED     NULL
+
+XPTvar $VOID_LINE      /* void */;
+XPTvar $CURSOR_PH      /* cursor */
+
+XPTvar $BRif          ' '
+XPTvar $BRel          \n
+XPTvar $BRloop        ' '
+XPTvar $BRstc         ' '
+XPTvar $BRfun         ' '
+
+
+XPTinclude
+    \ _common/common
+    \ c/c
+
+
+" ========================= Function and Variables =============================
+
+" ================================= Snippets ===================================
+
+
+XPT yacc " Basic yacc file
+%{
+/* includes */
+%}
+/* options */
+%%
+/* grammar rules */
+%%
+/* C code */
+
+XPT rule " ..: .. | .. | ...
+`ruleName^: `pattern^   { `action^ }
+`        `...`
+{{^        | `pattern^   { `action^ }
+`        `...`
+^`}}^        ;
+
+XPT tok " %token ...
+%token 
+
+XPT prio " %left ... %right ...
+XSET op*|post=ExpandIfNotEmpty( "' '", 'op*', "" )
+%left   '`op*^'` `...^
+%left   '`op*^'` `...^
+
+
diff --git a/vim-plugins/bundle/xptemplate/ftplugin/zsh/zsh.xpt.vim b/vim-plugins/bundle/xptemplate/ftplugin/zsh/zsh.xpt.vim
new file mode 100644
index 0000000..2efc27c
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/ftplugin/zsh/zsh.xpt.vim
@@ -0,0 +1,8 @@
+" got basic sh snippets for zsh files
+" (like ~/.zshrc)
+XPTemplate priority=lang
+
+XPTinclude
+      \ _common/common
+      \ sh/sh
+
diff --git a/vim-plugins/bundle/xptemplate/personal/Readme.txt b/vim-plugins/bundle/xptemplate/personal/Readme.txt
new file mode 100644
index 0000000..5ede980
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/personal/Readme.txt
@@ -0,0 +1,25 @@
+
+This is the folder where you add your personal snippets.
+
+This fold is one of 'runtimepath'. You can imagine this is another ~/.vim
+folder( in Unix ) or ~/vimfiles( in windows ).
+
+==============================================================================
+
+To add your own snippets, just create a snippet file like what XPT does. For
+example to create a C language snippet you need to create: >
+	personal/ftplugin/c/some_name.xpt.vim
+< And then add snippets in this file. 
+See |xpt-snippet-syntax| |xpt-write-snippet| and |xpt-snippet-tutorial|.
+
+NOTE: personal snippets in this file should have high priority which is set
+with |xpt-snippet-priority|, for example the "personal" priority: >
+	XPTemplate priority=personal
+< This is the highest priority thus no other snippets overrides yours. See
+|xpt-snippet-priority|
+
+
+You can also create snippets in some other folders and specify them as snippet
+folder with |g:xptemplate_snippet_folders|
+
+" vim:tw=78:ts=8:sw=8:sts=8:noet:ft=help:norl:spell:
diff --git a/vim-plugins/bundle/xptemplate/personal/ftplugin/_common/personal_example.xpt.vim b/vim-plugins/bundle/xptemplate/personal/ftplugin/_common/personal_example.xpt.vim
new file mode 100644
index 0000000..adbab62
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/personal/ftplugin/_common/personal_example.xpt.vim
@@ -0,0 +1,15 @@
+" Move me to your own fptlugin/_common and config your personal information.
+"
+" Here is the place to set personal preferences; "priority=personal" is the
+" highest which overrides any other XPTvar setting.
+"
+" You can also set personal variables with 'g:xptemplate_vars' in your .vimrc.
+XPTemplate priority=personal
+
+
+" XPTvar $author       you have not yet set $author variable
+" XPTvar $email        you have not yet set $email variable
+
+XPT yoursnippet " tips here
+bla bla
+
diff --git a/vim-plugins/bundle/xptemplate/plugin/debug.vim b/vim-plugins/bundle/xptemplate/plugin/debug.vim
new file mode 100644
index 0000000..706635f
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/plugin/debug.vim
@@ -0,0 +1,133 @@
+if exists( "g:__DEBUG_VIM__" ) && g:__DEBUG_VIM__ >= XPT#ver
+    finish
+endif
+let g:__DEBUG_VIM__ = XPT#ver
+
+let s:oldcpo = &cpo
+set cpo-=<
+set cpo+=B
+
+let s:globalLogLevel = 'warn'
+" let s:globalLogLevel = 'debug'
+
+com! DebugGetSID let s:sid =  matchstr("<SID>", '\zs\d\+_\ze')
+DebugGetSID
+delc DebugGetSID
+
+fun! CreateLogger( level ) "{{{
+
+  let level = s:logLevels[ a:level ]
+  let level = min( [ level, s:logLevels[ s:globalLogLevel ] ] )
+
+  let logger = copy( s:loggerPrototype )
+
+  if level < s:logLevels.fatal | let logger.Fatal = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.error | let logger.Error = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.warn  | let logger.Warn  = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.info  | let logger.Info  = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.log   | let logger.Log   = s:loggerPrototype.LogNothing | endif
+  if level < s:logLevels.debug | let logger.Debug = s:loggerPrototype.LogNothing | endif
+
+  return logger
+endfunction "}}}
+
+fun! Assert( shouldBeTrue, msg ) "{{{
+    if !a:shouldBeTrue
+        throw a:msg
+    end 
+endfunction "}}}
+
+com! -nargs=+ Assert call Assert( <args>, <q-args> )
+
+
+let s:logLevels = {
+      \ 'fatal' : 1,
+      \ 'error' : 2,
+      \ 'warn'  : 3,
+      \ 'info'  : 4,
+      \ 'log'   : 5,
+      \ 'debug' : 6,
+      \ }
+
+let s:loggerPrototype = {}
+fun! s:Fatal(...) dict "{{{
+    return call('Log_core', ['Fatal'] + a:000)
+endfunction "}}}
+
+fun! s:Error(...) dict "{{{
+    return call('Log_core', ['Error'] + a:000)
+endfunction "}}}
+
+fun! s:Warn(...) dict "{{{
+    return call('Log_core', ['Warn'] + a:000)
+endfunction "}}}
+
+fun! s:Info(...) dict "{{{
+    return call('Log_core', ['Info'] + a:000)
+endfunction "}}}
+
+fun! s:Log(...) dict "{{{
+    return call('Log_core', ['Log'] + a:000)
+endfunction "}}}
+
+fun! s:Debug(...) dict "{{{
+    return call('Log_core', ['Debug'] + a:000)
+endfunction "}}}
+
+fun! s:LogNothing(...) "{{{
+endfunction "}}}
+
+
+
+let s:loggerPrototype.Fatal       = function( "<SNR>" . s:sid . "Fatal"      )
+let s:loggerPrototype.Error       = function( "<SNR>" . s:sid . "Error"      )
+let s:loggerPrototype.Warn        = function( "<SNR>" . s:sid . "Warn"       )
+let s:loggerPrototype.Info        = function( "<SNR>" . s:sid . "Info"       )
+let s:loggerPrototype.Log         = function( "<SNR>" . s:sid . "Log"        )
+let s:loggerPrototype.Debug       = function( "<SNR>" . s:sid . "Debug"      )
+let s:loggerPrototype.LogNothing  = function( "<SNR>" . s:sid . "LogNothing" )
+
+
+if len( finddir( $HOME . '/tmp' ) ) > 0
+    let s:logLocation = finddir( $HOME . '/tmp' )
+else
+    let s:logLocation = $HOME 
+endif
+
+let s:logLocation .= '/vim.log'
+
+
+call delete(s:logLocation)
+
+fun! Log_core(level, ...) "{{{
+    " call stack printing 
+    try
+        throw ''
+    catch /.*/
+        let stack = matchstr( v:throwpoint, 'function\s\+\zs.\{-}\ze\.\.\%(Fatal\|Error\|Warn\|Info\|Log\|Debug\).*' )
+        let stack = substitute( stack, '<SNR>\d\+_', '', 'g' )
+    endtry
+
+
+    exe 'redir! >> '.s:logLocation
+
+
+    silent echom a:level . ':::' . stack . ' cursor at=' . string( [ line("."), col(".") ] )
+
+    for msg in a:000
+        let l = split(';' . msg . ';', "\n")
+        let l[0] = l[0][1:]
+        let l[ -1 ] = l[ -1 ][ :-2 ]
+        for v in l
+            silent! echom v
+        endfor
+    endfor
+    redir END
+
+    if a:level =~ 'Fatal\|Error\|Warn'
+        echoerr string( a:000 )
+    endif
+endfunction "}}}
+
+
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/plugin/xpmark.vim b/vim-plugins/bundle/xptemplate/plugin/xpmark.vim
new file mode 100644
index 0000000..a8b3c62
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/plugin/xpmark.vim
@@ -0,0 +1,695 @@
+if exists( "g:__XPMARK_VIM__" ) && g:__XPMARK_VIM__ >= XPT#ver
+	finish
+endif
+let g:__XPMARK_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+com! XPMgetSID let s:sid =  matchstr("<SID>", '\zs\d\+_\ze')
+XPMgetSID
+delc XPMgetSID
+runtime plugin/xptemplate.conf.vim
+runtime plugin/debug.vim
+let s:log = xpt#debug#Logger( 'warn' )
+let g:xpm_mark = 'p'
+let g:xpm_mark_nextline = 'l'
+let g:xpm_changenr_level = 1000
+let s:insertPattern = '[i]'
+let g:XPM_RET = { 'likely_matched':{'likely_matched'  : 1}, 'no_updated_made':{'no_updated_made' : 1}, 'undo_redo':{'undo_redo'       : 1}, 'updated':{'updated'         : 1}, }
+let s:emptyHistoryElt = {'list':[], 'dict' :{}, 'likely' : { 'start' : '', 'end' : '' }}
+let g:XPMpreferLeft = 'l'
+let g:XPMpreferRight = 'r'
+augroup XPM
+	au!
+	au BufEnter * call <SID>InitBuf()
+augroup END
+fun! XPMcheckStatusline()
+	if stridx( &l:statusline, 'XPMautoUpdate' ) >= 0
+		return
+	else
+		call s:SetupStatusline()
+	endif
+endfunction
+fun! s:SetupStatusline()
+	if &statusline == ""
+		if &l:statusline == ''
+			setlocal statusline=%<%f\ %h%m%r%=%-14.(%l,%c%V%)\ %P
+		else
+		endif
+	else
+		if &l:statusline == ''
+			setlocal statusline<
+		else
+		endif
+	endif
+	if stridx( &l:statusline, 'XPMautoUpdate' ) < 0
+		if &l:statusline =~ '\V\^%!'
+			let &l:statusline  .= '.XPMautoUpdate("statusline")' 
+		else
+			let &l:statusline  .= '%{XPMautoUpdate("statusline")}' 
+		endif
+	endif
+endfunction
+fun! XPMadd(name,pos,prefer,...)
+	call XPMcheckStatusline()
+	let d = s:BufData()
+	let prefer = a:prefer == 'l' ? 0 : 1
+	if has_key(d.marks,a:name)
+		call d.removeMark(a:name)
+	endif
+	let d.marks[a:name] = a:pos + [len(getline(a:pos[0])),prefer]
+	call d.addMarkOrder(a:name,get(a:000,0,0))
+endfunction
+fun! XPMhere(name,prefer)
+	call XPMadd( a:name, [ line( "." ), col( "." ) ], a:prefer )
+endfunction
+fun! XPMremove(name)
+	let d = s:BufData()
+	call d.removeMark(a:name)
+endfunction
+fun! XPMremoveStartEnd(dict)
+	let d = s:BufData()
+	call d.removeMark(a:dict.start)
+	call d.removeMark(a:dict.end)
+endfunction
+fun! XPMremoveMarkStartWith(prefix)
+	let d = s:BufData()
+	for key in keys(d.marks)
+		if key =~# '^\V' . a:prefix
+			call d.removeMark(key)
+		endif
+	endfor
+endfunction
+fun! XPMflush()
+	let d = s:BufData()
+	let d.marks = {}
+	let d.orderedMarks = []
+	let d.changeLikelyBetween  = { 'start' : '', 'end' : '' }
+	let d.markHistory[ changenr() ] = { 'dict' : d.marks, 'list': d.orderedMarks, 'likely' : d.changeLikelyBetween }
+endfunction
+fun! XPMflushWithHistory()
+	call XPMflush()
+	let d = s:BufData()
+	let d.markHistory = {}
+endfunction
+fun! XPMgoto(name)
+	let d = s:BufData()
+	if has_key(d.marks,a:name)
+		let pos = d.marks[a:name][: 1]
+		call cursor(pos)
+	endif
+endfunction
+fun! XPMpos(name)
+	let d = s:BufData()
+	if has_key(d.marks,a:name)
+		return d.marks[a:name][: 1]
+	endif
+	return [0,0]
+endfunction
+fun! XPMhas(...)
+	let d = s:BufData()
+	for name in a:000
+		if !has_key(d.marks,name)
+			return 0
+		endif
+	endfor
+	return 1
+endfunction
+fun! XPMposStartEnd(dict)
+	let d = s:BufData()
+	return [has_key(d.marks,a:dict.start) ? d.marks[a:dict.start][0:1] : [0,0], has_key(d.marks,a:dict.end) ? d.marks[a:dict.end][0:1] : [0,0],]
+endfunction
+fun! XPMposList(...)
+	let d = b:_xpmark
+	let list = []
+	for name in a:000
+		call add(list,get(d.marks,name,[0,0])[0:1])
+	endfor
+	return list
+endfunction
+fun! XPMmarkAfter(pos)
+	let d = b:_xpmark
+	for name in d.orderedMarks
+		if d.marks[name][0] >= a:pos[0] && d.marks[name][1] >= a:pos[1]
+			return { 'name' : name, 'pos' : copy( d.marks[ name ] ) }
+		endif
+	endfor
+	return 0
+endfunction
+fun! XPMsetLikelyBetween(start,end)
+	let d = s:BufData()
+	let d.changeLikelyBetween = { 'start' : a:start, 'end' : a:end }
+endfunction
+fun! XPMsetUpdateStrategy(mode)
+	let d = s:BufData()
+	if a:mode == 'manual'
+		let d.updateStrategy = a:mode
+	elseif a:mode == 'normalMode'
+		let d.updateStrategy = a:mode
+	elseif a:mode == 'insertMode'
+		let d.updateStrategy = a:mode
+	else
+		let d.updateStrategy = 'auto'
+	endif
+endfunction
+fun! XPMupdateSpecificChangedRange(start,end)
+	let d = s:BufData()
+	let nr = changenr()
+	if nr != d.lastChangenr
+		call d.snapshot()
+	endif
+	call d.initCurrentStat()
+	let rc = d.updateWithNewChangeRange(a:start,a:end)
+	call d.saveCurrentStat()
+	return rc
+endfunction
+fun! XPMautoUpdate(msg)
+	if !exists( 'b:_xpmark' )
+		return ''
+	endif
+	let d = s:BufData()
+	let isInsertMode = (d.lastMode == 'i' && mode() == 'i')
+	if d.updateStrategy == 'manual'  || d.updateStrategy == 'normalMode' && isInsertMode || d.updateStrategy == 'insertMode' && !isInsertMode
+		return ''
+	endif
+	call XPMupdate('auto')
+	return ''
+endfunction
+fun! XPMupdate(...)
+	if !exists( 'b:_xpmark' )
+		return ''
+	endif
+	let d = s:BufData()
+	let mode = a:0 > 0 ? a:000[0] : 'auto'
+	if mode == 'force'
+		let needUpdate = 1
+	else
+		let needUpdate = d.isUpdateNeeded()
+	endif
+	if !needUpdate
+		call d.snapshot()
+		call d.saveCurrentStat()
+		return g:XPM_RET.no_updated_made
+	endif
+	call d.initCurrentStat()
+	if d.lastMode =~ s:insertPattern && d.stat.mode =~ s:insertPattern
+		let rc = d.insertModeUpdate()
+	else
+		let rc = d.normalModeUpdate()
+	endif
+	call d.saveCurrentStat()
+	return rc
+endfunction
+fun! XPMupdateStat()
+	let d = s:BufData()
+	call d.saveCurrentStat()
+endfunction
+fun! XPMupdateCursorStat(...)
+	let d = s:BufData()
+	call d.saveCurrentCursorStat()
+endfunction
+fun! XPMsetBufSortFunction(funcRef)
+	if !exists('b:_xpm_compare')
+		let b:_xpm_compare = a:funcRef
+	endif
+endfunction
+fun! XPMallMark()
+	let d = s:BufData()
+	let msg = ''
+	let i = 0
+	for name in d.orderedMarks
+		let msg .= printf( '%3d', i )  . ' ' . name . repeat( '-', 30-len( name ) )  . substitute( string( d.marks[ name ] ), '\<\d\>', ' &', 'g' ) . "\n"
+		let i += 1
+	endfor
+	return msg
+endfunction
+fun! s:isUpdateNeeded() dict
+	if empty(self.marks) && changenr() == self.lastChangenr
+		return 0
+	endif
+	return 1
+endfunction
+fun! s:initCurrentStat() dict
+	let self.stat = { 'currentPosition':[ line( '.' ), col( '.' ) ], 'totalLine':line( "$" ), 'currentLineLength':len( getline( "." ) ), 'mode':mode(), 'positionOfMarkP':[ line( "'" . g:xpm_mark ), col( "'" . g:xpm_mark ) ]  }
+endfunction
+fun! s:snapshot() dict
+	let nr = changenr()
+	if nr == self.lastChangenr
+		return
+	endif
+	let n = self.lastChangenr + 1
+	if !has_key(self.markHistory,n-1)
+		if has_key(self.markHistory,n-2)
+			let self.markHistory[n-1] = self.markHistory[n-2]
+		else
+			let self.markHistory[n-1] = deepcopy(s:emptyHistoryElt)
+		endif
+	endif
+	while n < nr
+		let self.markHistory[n] = self.markHistory[n - 1]
+		if has_key(self.markHistory,n - g:xpm_changenr_level)
+			unlet self.markHistory[n - g:xpm_changenr_level]
+		endif
+		let n += 1
+	endwhile
+	let self.marks = copy(self.marks)
+	let self.orderedMarks = copy(self.orderedMarks)
+	let self.changeLikelyBetween = deepcopy(self.changeLikelyBetween)
+	let self.markHistory[ nr ] = { 'dict' : self.marks, 'list': self.orderedMarks, 'likely' : self.changeLikelyBetween }
+endfunction
+fun! s:handleUndoRedo() dict
+	let nr = changenr()
+	if nr < self.lastChangenr
+		call self.ToChangeNr(nr)
+		return 1
+	elseif nr > self.lastChangenr && nr <= self.changenrRange[1]
+		call self.ToChangeNr(nr)
+		return 1
+	else
+		return 0
+	endif
+endfunction
+fun! s:ToChangeNr(nr) dict
+	if has_key(self.markHistory,a:nr)
+		let self.marks = self.markHistory[a:nr].dict
+		let self.orderedMarks = self.markHistory[a:nr].list
+		let self.changeLikelyBetween = self.markHistory[a:nr].likely
+	else
+		call s:log.Info( "No " . a:nr . ' in markHistory, create new mark set' )
+		let self.marks = {}
+		let self.orderedMarks = []
+		let self.changeLikelyBetween = { 'start' : '', 'end' : '' }
+	endif
+endfunction
+fun! s:insertModeUpdate() dict
+	if self.handleUndoRedo()
+		return g:XPM_RET.undo_redo
+	endif
+	let stat = self.stat
+	if changenr() != self.lastChangenr
+		call self.snapshot()
+	endif
+	if stat.totalLine == self.lastTotalLine
+		if stat.currentPosition[0] == self.lastPositionAndLength[0] && stat.currentLineLength == self.lastPositionAndLength[2]
+			return g:XPM_RET.no_updated_made
+		endif
+		if self.lastPositionAndLength[2] == len(getline(self.lastPositionAndLength[0]))
+			return g:XPM_RET.no_updated_made
+		endif
+	endif
+	let lastPos = self.lastPositionAndLength[: 1]
+	let bLastPos = [self.lastPositionAndLength[0] + stat.totalLine - self.lastTotalLine,0]
+	let bLastPos[1] = self.lastPositionAndLength[1] - self.lastPositionAndLength[2] + len(getline(bLastPos[0]))
+	if bLastPos[0] * 10000 + bLastPos[1] >= lastPos[0] * 10000 + lastPos[1]
+		return self.updateWithNewChangeRange(self.lastPositionAndLength[:1],stat.currentPosition)
+	else
+		return self.updateWithNewChangeRange(stat.currentPosition,stat.currentPosition)
+	endif
+endfunction
+fun! s:normalModeUpdate() dict
+	let stat = self.stat
+	let nr = changenr()
+	if nr == self.lastChangenr
+		return g:XPM_RET.no_updated_made
+	endif
+	if self.handleUndoRedo()
+		return g:XPM_RET.undo_redo
+	endif
+	let cs = [ line( "'[" ), col( "'[" ) ]
+	let ce = [ line( "']" ), col( "']" ) ]
+	call self.snapshot()
+	let diffOfLine = stat.totalLine - self.lastTotalLine
+	if stat.mode =~ s:insertPattern
+		if diffOfLine > 0
+			if self.lastPositionAndLength[0] < stat.positionOfMarkP[0]
+				call self.updateMarksAfterLine(self.lastPositionAndLength[0] - 1)
+			else
+				call self.updateMarksAfterLine(stat.currentPosition[0] - 1)
+			endif
+		elseif self.lastMode =~ 's' || self.lastMode == "\<C-s>"
+			return self.updateWithNewChangeRange([ line( "'<" ), col( "'<" ) ], stat.currentPosition)
+		else
+			return self.updateWithNewChangeRange(stat.currentPosition,stat.currentPosition)
+		endif
+	elseif self.lastMode =~ s:insertPattern
+		return g:XPM_RET.no_updated_made
+	else
+		let linewiseDeletion = stat.positionOfMarkP[0] == 0
+		let lineNrOfChangeEndInLastStat = ce[0] - diffOfLine
+		if linewiseDeletion
+			if cs == ce
+				call self.updateForLinewiseDeletion(cs[0],lineNrOfChangeEndInLastStat)
+				return g:XPM_RET.updated
+			else
+			endif
+		elseif stat.positionOfMarkP[0] == line( "'" . g:xpm_mark_nextline )  && stat.totalLine < self.lastTotalLine
+			let endPos = [self.lastPositionAndLength[0],self.lastPositionAndLength[2]]
+			return self.updateWithNewChangeRange(endPos,endPos)
+		elseif self.lastMode =~ '[vVsS]'
+		elseif diffOfLine == -1
+			let cs = [self.lastPositionAndLength[0],self.lastPositionAndLength[2] + 1]
+			let ce = [self.lastPositionAndLength[0],self.lastPositionAndLength[2] + 2]
+			return self.updateWithNewChangeRange(cs,ce)
+		elseif cs == [1,1] && ce == [stat.totalLine,1] || diffOfLine < -1
+			call XPMflush()
+			return g:XPM_RET.updated
+		endif
+		return self.updateWithNewChangeRange(cs,ce)
+	endif
+	return g:XPM_RET.updated
+endfunction
+fun! s:updateMarksAfterLine(line) dict
+	let diffOfLine = self.stat.totalLine - self.lastTotalLine
+	for [n,v] in items(self.marks)
+		if v[0] > a:line
+			let self.marks[n] = [v[0] + diffOfLine,v[1],v[2],v[3]]
+		endif
+	endfor
+endfunction
+fun! s:updateForLinewiseDeletion(fromLine,toLine) dict
+	for [n,mark] in items(self.marks)
+		if mark[0] >= a:toLine
+			let self.marks[n] = [mark[0] + self.stat.totalLine - self.lastTotalLine,mark[1],mark[2],mark[3]]
+		elseif mark[0] >= a:fromLine && mark[0] < a:toLine
+			call self.removeMark(n)
+		endif
+	endfor
+endfunction
+fun! s:updateWithNewChangeRange(changeStart,changeEnd) dict
+	let bChangeEnd = [a:changeEnd[0] - self.stat.totalLine, a:changeEnd[1] - len(getline(a:changeEnd[0]))]
+	let likelyIndexes = self.findLikelyRange(a:changeStart,bChangeEnd)
+	if likelyIndexes == [-1,-1]
+		let indexes = [0,len(self.orderedMarks)]
+		call self.updateMarks(indexes,a:changeStart,a:changeEnd)
+		return g:XPM_RET.updated
+	else
+		let len = len(self.orderedMarks)
+		let i = likelyIndexes[0]
+		let j = likelyIndexes[1]
+		call self.updateMarksBefore([0,i + 1],a:changeStart,a:changeEnd)
+		call self.updateMarks([i+1,j],a:changeStart,a:changeEnd)
+		let len2 = len(self.orderedMarks)
+		let j += len2 - len
+		call self.updateMarksAfter([j,len2],a:changeStart,a:changeEnd)
+		return [self.orderedMarks[i],self.orderedMarks[j]]
+	endif
+endfunction
+fun! s:updateMarksBefore(indexRange,changeStart,changeEnd) dict
+	let lineLengthCS = len(getline(a:changeStart[0]))
+	let [iStart,iEnd] = [a:indexRange[0] - 1,a:indexRange[1] - 1]
+	while iStart < iEnd
+		let iStart += 1
+		let name = self.orderedMarks[iStart]
+		let mark = self.marks[name]
+		let bMark = [mark[0] - self.lastTotalLine,mark[1] - mark[2]]
+		if mark[0] < a:changeStart[0]
+			continue
+		elseif mark[0] == a:changeStart[0] && mark[1] - 1 < a:changeStart[1]
+			let self.marks[name] = [mark[0],mark[1],lineLengthCS,mark[3]]
+		else
+			call s:log.Error( 'mark should be before, but it is after start of change:' . string( [ mark, a:changeStart ] ) )
+		endif
+	endwhile
+endfunction
+fun! s:updateMarksAfter(indexRange,changeStart,changeEnd) dict
+	let bChangeEnd = [a:changeEnd[0] - self.stat.totalLine, a:changeEnd[1] - len(getline(a:changeEnd[0]))]
+	let diffOfLine = self.stat.totalLine - self.lastTotalLine
+	let lineLengthCS = len(getline(a:changeStart[0]))
+	let lineLengthCE = len(getline(a:changeEnd[0]))
+	let lineNrOfChangeEndInLastStat = a:changeEnd[0] - diffOfLine
+	let [iStart,iEnd] = [a:indexRange[0] - 1,a:indexRange[1] - 1]
+	while iStart < iEnd
+		let iStart += 1
+		let name = self.orderedMarks[iStart]
+		let mark = self.marks[name]
+		let bMark = [mark[0] - self.lastTotalLine,mark[1] - mark[2]]
+		if mark[0] > lineNrOfChangeEndInLastStat
+			if diffOfLine == 0
+				break
+			endif
+			let self.marks[name] = [mark[0] + diffOfLine,mark[1],mark[2],mark[3]]
+		elseif bMark[0] == bChangeEnd[0] && bMark[1] >= bChangeEnd[1]
+			let self.marks[name] = [a:changeEnd[0],bMark[1] + lineLengthCE,lineLengthCE,mark[3]]
+		else
+			call s:log.Error( 'mark should be after changes, but it is before them:' . string( [ bMark, bChangeEnd ] ))
+		endif
+	endwhile
+endfunction
+fun! s:updateMarks(indexRange,changeStart,changeEnd) dict
+	let bChangeEnd = [a:changeEnd[0] - self.stat.totalLine, a:changeEnd[1] - len(getline(a:changeEnd[0]))]
+	let diffOfLine = self.stat.totalLine - self.lastTotalLine
+	let lineLengthCS = len(getline(a:changeStart[0]))
+	let lineLengthCE = len(getline(a:changeEnd[0]))
+	let lineNrOfChangeEndInLastStat = a:changeEnd[0] - diffOfLine
+	let [iStart,iEnd] = [a:indexRange[0] - 1,a:indexRange[1] - 1]
+	while iStart < iEnd
+		let iStart += 1
+		let name = self.orderedMarks[iStart]
+		let mark = self.marks[name]
+		let bMark = [mark[0] - self.lastTotalLine,mark[1] - mark[2]]
+		if mark[0] < a:changeStart[0]
+			continue
+		elseif mark[0] > lineNrOfChangeEndInLastStat
+			let self.marks[name] = [mark[0] + diffOfLine,mark[1],mark[2],mark[3]]
+		elseif mark[0 : 1] == a:changeStart && bMark == bChangeEnd
+			if mark[3] == 0
+				let self.marks[name] = [mark[0],mark[1],lineLengthCS,0]
+			else
+				let self.marks[name] = [a:changeEnd[0],bMark[1] + lineLengthCE,lineLengthCE,1]
+			endif
+		elseif mark[0] == a:changeStart[0] && mark[1] - 1 < a:changeStart[1]
+			let self.marks[name] = [mark[0],mark[1],lineLengthCS,mark[3]]
+		elseif bMark[0] == bChangeEnd[0] && bMark[1] >= bChangeEnd[1]
+			let self.marks[name] = [a:changeEnd[0],bMark[1] + lineLengthCE,lineLengthCE,mark[3]]
+		else
+			call self.removeMark(name)
+			let iStart -= 1
+			let iEnd -= 1
+		endif
+	endwhile
+endfunction
+fun! XPMupdateWithMarkRangeChanging(startMark,endMark,changeStart,changeEnd)
+	let d = s:BufData()
+	call d.initCurrentStat()
+	if changenr() != d.lastChangenr
+		call d.snapshot()
+	endif
+	let startIndex = index(d.orderedMarks,a:startMark)
+	let endIndex = index(d.orderedMarks,a:endMark,startIndex + 1)
+	call d.updateMarksAfter([endIndex,len(d.orderedMarks)],a:changeStart,a:changeEnd)
+	let [i,len] = [startIndex + 1 ,endIndex]
+	while i < len
+		let len -= 1
+		let mark = d.orderedMarks[i]
+	endwhile
+	let lineLength = len(getline(a:changeStart[0]))
+	let [i] = [startIndex + 1]
+	while i > 0
+		let i -= 1
+		let mark = d.orderedMarks[i]
+		if d.marks[mark][0] < a:changeStart[0]
+			break
+		else
+			let d.marks[mark][2] = len(getline(d.marks[mark][0]))
+		endif
+	endwhile
+	call d.saveCurrentStat()
+endfunction
+fun! s:findLikelyRange2(changeStart,bChangeEnd) dict
+	if self.changeLikelyBetween.start == '' || self.changeLikelyBetween.end == ''
+		return [-1,-1]
+	elseif !has_key(self.marks,self.changeLikelyBetween.start) || !has_key(self.marks,self.changeLikelyBetween.end)
+		return [-1,-1]
+	endif
+	let [likelyStart,likelyEnd] = [self.marks[self.changeLikelyBetween.start], self.marks[self.changeLikelyBetween.end]]
+	let bLikelyEnd = [likelyEnd[0] - self.lastTotalLine, likelyEnd[1] - likelyEnd[2]]
+	let nChangeStart = a:changeStart[0] * 10000 + a:changeStart[1]
+	let nLikelyStart = likelyStart[0] * 10000 + likelyStart[1]
+	let nbChangeEnd = a:bChangeEnd[0] * 10000 + a:bChangeEnd[1]
+	let nbLikelyEnd = bLikelyEnd[0] * 10000 + bLikelyEnd[1]
+	if nChangeStart >= nLikelyStart && nbChangeEnd <= nbLikelyEnd
+		let re = []
+		let [i,len] = [0,len(self.orderedMarks)]
+		while i < len
+			if self.orderedMarks[i] == self.changeLikelyBetween.start
+				call add(re,i)
+			elseif self.orderedMarks[i] == self.changeLikelyBetween.end
+				call add(re,i)
+				return re
+			endif
+			let i += 1
+		endwhile
+		call s:log.Error( string( self.changeLikelyBetween ) . ' : end mark is not found!' )
+	else
+		return [-1,-1]
+	endif
+endfunction
+fun! s:findLikelyRange(changeStart,bChangeEnd) dict
+	if self.changeLikelyBetween.start == '' || self.changeLikelyBetween.end == ''
+		return [-1,-1]
+	elseif !has_key(self.marks,self.changeLikelyBetween.start) || !has_key(self.marks,self.changeLikelyBetween.end)
+		return [-1,-1]
+	endif
+	let nChangeStart = a:changeStart[0] * 10000 + a:changeStart[1]
+	let nbChangeEnd = a:bChangeEnd[0] * 10000 + a:bChangeEnd[1]
+	let iLikelyStart = -1
+	let iLikelyEnd = -1
+	let [i,len] = [0,len(self.orderedMarks)]
+	while i < len
+		if self.orderedMarks[i] == self.changeLikelyBetween.start
+			let iLikelyStart = i
+		elseif self.orderedMarks[i] == self.changeLikelyBetween.end
+			let iLikelyEnd = i
+			break
+		endif
+		let i += 1
+	endwhile
+	if iLikelyStart == -1 || iLikelyEnd == -1
+		return [-1,-1]
+	endif
+	while iLikelyStart >= 0
+		let likelyStart = self.marks[self.orderedMarks[iLikelyStart]]
+		let nLikelyStart = likelyStart[0] * 10000 + likelyStart[1]
+		if nChangeStart >= nLikelyStart
+			break
+		endif
+		let iLikelyStart -= 1
+	endwhile
+	if iLikelyStart == -1
+		return [-1,-1]
+	endif
+	while iLikelyEnd < len(self.orderedMarks)
+		let likelyEnd = self.marks[self.orderedMarks[iLikelyEnd]]
+		let bLikelyEnd = [likelyEnd[0] - self.lastTotalLine, likelyEnd[1] - likelyEnd[2]]
+		let nbLikelyEnd = bLikelyEnd[0] * 10000 + bLikelyEnd[1]
+		if nbChangeEnd <= nbLikelyEnd
+			break
+		endif
+		let iLikelyEnd += 1
+	endwhile
+	if iLikelyEnd == len(self.orderedMarks)
+		return [-1,-1]
+	endif
+	return [iLikelyStart,iLikelyEnd]
+endfunction
+fun! s:saveCurrentCursorStat() dict
+	if self.marks == {}
+		return
+	endif
+	let p = [ line( '.' ), col( '.' ) ]
+		exe 'k'.g:xpm_mark
+		if p[0] < line( '$' )
+			exe '+1k' . g:xpm_mark_nextline
+		else
+			exe 'delmarks ' . g:xpm_mark_nextline
+		endif
+	let self.lastPositionAndLength = p + [ len( getline( "." ) ) ]
+	let self.lastMode = mode()
+endfunction
+fun! s:saveCurrentStat() dict
+	call self.saveCurrentCursorStat()
+	let self.lastChangenr = changenr()
+	let self.changenrRange[0] = min([self.lastChangenr,self.changenrRange[0]])
+	let self.changenrRange[1] = max([self.lastChangenr,self.changenrRange[1]])
+	let self.lastTotalLine = line( "$" )
+endfunction
+fun! s:removeMark(name) dict
+	if !has_key(self.marks,a:name)
+		return
+	endif
+	if self.changeLikelyBetween.start == a:name || self.changeLikelyBetween.end == a:name
+		let self.changeLikelyBetween = { 'start' : '', 'end' : '' }
+	endif
+	call filter( self.orderedMarks, 'v:val != ' . string( a:name ) )
+	call remove(self.marks,a:name)
+endfunction
+fun! s:addMarkOrder(name,beforeWhich) dict
+	let markToAdd = self.marks[a:name]
+	let nPos = markToAdd[0] * 10000 + markToAdd[1]
+	let i = -1
+	for n in self.orderedMarks
+		let i += 1
+		let mark = self.marks[n]
+		let nMark = mark[0] * 10000 + mark[1]
+		if nMark == nPos
+			if a:beforeWhich isnot 0 && n =~ a:beforeWhich
+				call insert(self.orderedMarks,a:name,i)
+				return
+			else
+				let cmp = self.compare(a:name,n)
+				if cmp == 0
+					throw 'XPM : overlapped mark:' . a:name . '=' . string(markToAdd) . ' and ' . n . '=' . string( mark ) 
+				elseif cmp > 0
+					continue
+				else
+					call insert(self.orderedMarks,a:name,i)
+					return
+				endif
+			endif
+		elseif nPos < nMark
+			call insert(self.orderedMarks,a:name,i)
+			return
+		endif
+	endfor
+	call add (self.orderedMarks,a:name)
+endfunction
+fun! s:compare(a,b) dict
+	if exists( 'b:_xpm_compare' )
+		return b:_xpm_compare(self,a:a,a:b)
+	else
+		return s:defaultCompare(self,a:a,a:b)
+	endif
+endfunction
+fun! s:ClassPrototype(...)
+	let p = {}
+	for name in a:000
+		let p[ name ] = function( '<SNR>' . s:sid . name )
+	endfor
+	return p
+endfunction
+let s:prototype = s:ClassPrototype( 'ToChangeNr',  'addMarkOrder', 'compare', 'findLikelyRange',  'handleUndoRedo', 'initCurrentStat', 'insertModeUpdate', 'isUpdateNeeded', 'normalModeUpdate', 'removeMark', 'saveCurrentCursorStat', 'saveCurrentStat', 'snapshot', 'updateForLinewiseDeletion', 'updateMarks',  'updateMarksAfter',  'updateMarksAfterLine', 'updateMarksBefore',  'updateWithNewChangeRange', )
+fun! s:initBufData()
+	let nr = changenr()
+	let b:_xpmark = { 'updateStrategy':'auto', 'stat':{}, 'orderedMarks':[], 'marks':{}, 'markHistory':{}, 'changeLikelyBetween':{ 'start' : '', 'end' : '' },  'lastMode':'n', 'lastPositionAndLength':[ line( '.' ), col( '.' ), len( getline( '.' ) ) ], 'lastTotalLine':line( '$' ), 'lastChangenr':nr, 'changenrRange':[nr, nr], }
+	let b:_xpmark.markHistory[ nr ] = { 'dict' : b:_xpmark.marks, 'list' : b:_xpmark.orderedMarks, 'likely' : b:_xpmark.changeLikelyBetween }
+	call extend( b:_xpmark, s:prototype, 'force' )
+	exe 'k' . g:xpm_mark
+	if line( '.' ) < line( '$' )
+		exe '+1k' . g:xpm_mark_nextline
+	else
+		exe 'delmarks ' . g:xpm_mark_nextline
+	endif
+endfunction
+fun! s:BufData()
+	if !exists('b:_xpmark')
+		call s:initBufData()
+	endif
+	return b:_xpmark
+endfunction
+fun! s:InitBuf()
+	if !exists('b:_xpmark')
+		call s:initBufData()
+	endif
+endfunction
+fun! s:defaultCompare(d,markA,markB)
+	let [ma,mb] = [a:d.marks[a:markA],a:d.marks[a:markB]]
+	let nMarkA = ma[0] * 10000 + ma[1]
+	let nMarkB = mb[0] * 10000 + mb[1]
+	return (nMarkA - nMarkB) != 0 ? (nMarkA - nMarkB) : (a:d.marks[a:markA][3] - a:d.marks[a:markB][3])
+endfunction
+if &ruler && &rulerformat == ""
+	set rulerformat=%-14.(%l,%c%V%)%=%P
+elseif !&ruler
+	set rulerformat=
+endif
+set ruler
+let &rulerformat .= '%{XPMautoUpdate("ruler")}'
+fun! PrintDebug()
+	let d = s:BufData()
+	let debugString = changenr()
+	let debugString .= ' p:' . string( getpos( "'" . g:xpm_mark )[ 1 : 2 ] )
+	let debugString .= ' ' . string( [[ line( "'[" ), col( "'[" ) ], [ line( "']" ), col( "']" ) ]] ) . " "
+	let debugString .= " " . mode() . string( [line( "." ), col( "." )] ) . ' last:' .string( d.lastPositionAndLength )
+	let debugString .= " ll:" . d.lastTotalLine
+	return substitute( debugString, '\s', '' , 'g' )
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/plugin/xpopup.vim b/vim-plugins/bundle/xptemplate/plugin/xpopup.vim
new file mode 100644
index 0000000..72ff30e
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/plugin/xpopup.vim
@@ -0,0 +1,637 @@
+if exists( "g:__XPOPUP_VIM__" ) && g:__XPOPUP_VIM__ >= XPT#ver
+	finish
+endif
+let g:__XPOPUP_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+runtime plugin/debug.vim
+exe XPT#let_sid
+let s:log = CreateLogger( 'warn' )
+let s:log = CreateLogger( 'debug' )
+fun! s:SetIfNotExist(k,v)
+	if !exists(a:k)
+		exe "let ".a:k."=".string(a:v)
+	endif
+endfunction
+let s:opt = { 'doCallback':'doCallback',  'enlarge':'enlarge',  'acceptEmpty':'acceptEmpty',  'tabNav':'tabNav', }
+let s:CHECK_PUM = 1
+let s:errorTolerance = 3
+let s:sessionPrototype = { 'callback':{}, 'list':[], 'key':'', 'prefixIndex':{}, 'popupCount':0, 'sessCount':0, 'errorInputCount':0,  'line':0, 'col':0, 'prefix':'',  'ignoreCase':0, 'acceptEmpty':0, 'matchWholeName':0, 'matchPrefix':0, 'strictInput':0, 'tabNav':0,  'last':'', 'currentText':'', 'longest':'', 'matched':'', 'matchedCallback':'', 'currentList':[], }
+fun! XPPopupNew(callback,data,...)
+	let sess = deepcopy(s:sessionPrototype)
+	let sess.callback = a:callback
+	let sess.data = a:data
+	call sess.createPrefixIndex([])
+	if a:0 > 0
+		let items = a:1
+		if type( items ) == type( '' )
+			call sess.SetTriggerKey(items)
+		elseif type(items) == type([])
+			call sess.addList(items)
+		else
+			call s:log.Error( 'unsupported items type as pum items:' . str( items ) )
+		endif
+	endif
+	return sess
+endfunction
+fun! s:popup(start_col,opt) dict
+	let doCallback = get(a:opt,s:opt.doCallback,1)
+	let ifEnlarge = get(a:opt,s:opt.enlarge,1)
+	let self.popupCount += 1
+	let cursorIndex = col(".") - 1 - 1
+	let self.line        = line(".")
+	let self.col = a:start_col
+	let self.prefix = s:GetTextBeforeCursor(self)
+	let self.ignoreCase  = self.prefix !~# '\u'
+	if self.key != ''
+		let self.longest = self.prefix
+		let actions = self.KeyPopup(doCallback,ifEnlarge)
+	else
+		let self.currentList = s:filterCompleteList(self)
+		if ifEnlarge
+			let self.longest = s:LongestPrefix(self)
+		else
+			let self.longest = self.prefix
+		endif
+		let actions = self.ListPopup(doCallback,ifEnlarge)
+	endif
+	let actions = s:CreateSession(self) . actions
+	call s:ApplyMapAndSetting()
+	return actions
+endfunction
+fun PUMclear()
+	return "\<C-v>\<C-v>\<BS>"
+endfunction
+fun! s:CreateSession(sess)
+	if !exists( 'b:__xpp_sess_count' )
+		let b:__xpp_sess_count = 0
+	endif
+	let action = ''
+	let b:__xpp_sess_count += 1
+	let a:sess.sessCount = b:__xpp_sess_count
+	if exists( 'b:__xpp_current_session' )
+		call s:End()
+		if pumvisible()
+			let action .= PUMclear()
+		endif
+	endif
+	let b:__xpp_current_session = a:sess
+	return action
+endfunction
+fun! s:SetAcceptEmpty(acc) dict
+	let self.acceptEmpty = !!a:acc
+	return self
+endfunction
+fun! s:SetMatchWholeName(mwn) dict
+	let self.matchWholeName = !!a:mwn
+	return self
+endfunction
+fun! s:SetOption(opt) dict
+	if type(a:opt) == type([])
+		for optname in a:opt
+			let self[optname] = 1
+		endfor
+	elseif type(a:opt) == type({})
+		for [key,value] in items(a:opt)
+			let self[key] = value
+		endfor
+	endif
+endfunction
+fun! s:KeyPopup(doCallback,ifEnlarge) dict
+	let actionList = []
+	if a:ifEnlarge
+		let actionList = [ 'clearPum', 'clearPrefix', 'typeLongest', 'triggerKey', 'setLongest' ]
+		if a:doCallback
+			let actionList += [ 'checkAndCallback' ]
+		endif
+	else
+		let actionList = [ 'clearPum', 'clearPrefix', 'typeLongest', 'triggerKey', 'removeTrailing', 'forcePumShow' ]
+	endif
+	return "\<C-r>=XPPprocess(" . string( actionList ) . ")\<CR>"
+endfunction
+fun! s:ListPopup(doCallback,ifEnlarge) dict
+	let actionClosePum = ''
+	let actionList = []
+	if self.longest !=# self.prefix
+		let actionList += ['clearPum',  'clearPrefix', 'clearPum', 'typeLongest' ]
+	endif
+	if 0
+	else
+		if self.popupCount > 1 && a:ifEnlarge && self.acceptEmpty && self.prefix == ''
+			let self.matched = ''
+			let self.matchedCallback = 'onOneMatch'
+			let actionList = []
+			let actionList += [ 'clearPum',  'clearPrefix', 'clearPum', 'callback' ]
+		elseif len(self.currentList) == 0
+			let self.matched = ''
+			let self.matchedCallback = 'onEmpty'
+			let actionList += ['callback']
+		elseif len(self.currentList) == 1 && a:doCallback
+			if self.matchPrefix
+				let self.matched = type(self.currentList[0]) == type({}) ? self.currentList[0].word : self.currentList[0]
+				let self.matchedCallback = 'onOneMatch'
+				let actionList += ['clearPum', 'clearPrefix', 'clearPum', 'typeMatched', 'callback']
+			else
+				let actionClosePum = PUMclear()
+				let actionList += [ 'popup', 'fixPopup' ]
+			endif
+		elseif self.prefix != ""  && self.longest ==? self.prefix
+			if self.matchPrefix && a:doCallback
+				let self.matched = ''
+				for item in self.currentList
+					let key = type(item) == type({}) ? item.word : item
+					if key ==? self.prefix
+					    let self.matched = key
+					    let self.matchedCallback = 'onOneMatch'
+					    let actionList += ['clearPum', 'clearPrefix', 'clearPum', 'typeLongest', 'callback']
+					    break
+					endif
+				endfor
+				if self.matched == ''
+					let actionClosePum = PUMclear()
+					let actionList += [ 'popup', 'fixPopup' ]
+				endif
+			else
+				let actionClosePum = PUMclear()
+				let actionList += [ 'popup', 'fixPopup' ]
+			endif
+		else
+			let actionClosePum = PUMclear()
+			let actionList += [ 'popup', 'fixPopup' ]
+		endif
+	endif
+	let self.matchPrefix = 1
+	return actionClosePum . "\<C-r>=XPPprocess(" . string( actionList ) . ")\<CR>"
+endfunction
+fun! s:SetTriggerKey(key) dict
+	let self.key = a:key
+endfunction
+fun! s:sessionPrototype.addList(list)
+	let list = a:list
+	if list == []
+		return
+	endif
+	if type( list[0] ) == type( '' )
+		call map( list, '{"word" : v:val, "icase" : 1 }' )
+	else
+		call map( list, '{"word" : v:val["word"],' . '"info": get(v:val, "info", ""),' . '"menu": get(v:val, "menu", ""),' . '"icase": 1 }' )
+	endif
+	let self.list += list
+	call self.updatePrefixIndex(list)
+endfunction
+fun! s:sessionPrototype.createPrefixIndex(list)
+	let self.prefixIndex = { 'keys' : {}, 'lowerkeys' : {}, 'ori' : {}, 'lower' : {} }
+	call self.updatePrefixIndex(a:list)
+endfunction
+fun! s:sessionPrototype.updatePrefixIndex(list)
+	if g:xptemplate_pum_quick_back == 0
+		return
+	endif
+	for item in a:list
+		let key = (type(item) == type({})) ?item.word : item
+		if !has_key(self.prefixIndex.keys,key)
+			let self.prefixIndex.keys[key] = 1
+			call s:UpdateIndex(self.prefixIndex.ori,key)
+		endif
+		let lowerKey = substitute(key, '.', '\l&', 'g')
+		if !has_key(self.prefixIndex.lowerkeys,lowerKey)
+			let self.prefixIndex.lowerkeys[lowerKey] = 1
+			call s:UpdateIndex(self.prefixIndex.lower,lowerKey)
+		endif
+	endfor
+endfunction
+fun! s:_InitBuffer()
+	if exists( 'b:__xpp_buffer_init' )
+		return
+	endif
+	let b:_xpp_map_saver = xpt#msvr#New(1)
+	call xpt#msvr#AddList(b:_xpp_map_saver, 'i_<UP>',  'i_<DOWN>',   'i_<BS>',  'i_<TAB>',  'i_<S-TAB>',  'i_<CR>',   'i_<C-e>',  'i_<C-y>',  )
+	let b:_xpp_setting_switch = xpt#settingswitch#New()
+	let co = {"menu":1, "menuone":1, "longest":1}
+	for k in split(&completeopt, ',')
+		let co[k] = 1
+	endfor
+	let new_completeopt = join( keys(co), ',' )
+	call xpt#settingswitch#AddList(b:_xpp_setting_switch, [ '&l:cinkeys', '' ],  [ '&l:indentkeys', '' ],  [ '&completeopt', new_completeopt ], )
+	let b:__xpp_buffer_init = 1
+endfunction
+fun! XPPprocess(list)
+	if !exists("b:__xpp_current_session")
+		call s:log.Error("session does not exist!")
+		return ""
+	endif
+	let sess = b:__xpp_current_session
+	if len(a:list) == 0
+		return "\<C-n>\<C-p>"
+	endif
+	let actionName = a:list[0]
+	let nextList = a:list[1 :]
+	let postAction = ""
+	if actionName == 'clearPrefix'
+		let n = col(".") - sess.col
+		let postAction = repeat( "\<bs>", n )
+	elseif actionName == 'clearPum'
+		if pumvisible()
+			let postAction = "\<C-e>"
+		endif
+	elseif actionName == 'triggerKey'
+		let postAction = sess.key
+	elseif actionName == 'setLongest'
+		let current = s:GetTextBeforeCursor(sess)
+		if len(current) > len(sess.longest)
+			let postAction = repeat( "\<BS>", len( current ) - len( sess.longest ) )  . current[len(sess.longest) :]
+			let sess.longest = s:GetTextBeforeCursor(sess)
+			if pumvisible()
+				let nextList = [ 'clearPum', 'clearPrefix', 'typeLongest', 'triggerKey' ] + nextList
+			else
+				let nextList = [ 'clearPrefix', 'clearPum', 'typeLongest' ] + nextList
+			endif
+		endif
+	elseif actionName == 'removeTrailing'
+		let current = s:GetTextBeforeCursor(sess)
+		if len(current) > len(sess.longest)
+			let postAction = repeat( "\<BS>", len( current ) - len( sess.longest ) )
+		endif
+	elseif actionName == 'forcePumShow'
+		let postAction = "\<C-n>\<C-p>"
+	elseif actionName == 'checkAndCallback'
+		if pumvisible()
+			return "\<C-n>\<C-p>"
+		else
+			let current = s:GetTextBeforeCursor(sess)
+			let sess.matched = current
+			let sess.matchedCallback = 'onOneMatch'
+			call s:End()
+			let postAction = ""
+			if has_key(sess.callback,sess.matchedCallback)
+				let postAction = sess.callback[sess.matchedCallback](sess)
+				return postAction
+			else
+				return ''
+			endif
+		endif
+	elseif actionName == 'keymodeEnlarge'
+		let current = s:GetTextBeforeCursor(sess)
+		if sess.acceptEmpty && current == ''
+			let sess.longest = ''
+			let sess.matched = ''
+			let sess.matchedCallback = 'onOneMatch'
+			let nextList = [ 'callback' ]
+		elseif current !=# sess.currentText
+			let sess.longest = sess.currentText
+			let sess.matched = sess.currentText
+			let sess.matchedCallback = 'onOneMatch'
+			let nextList = [ 'clearPrefix', 'typeLongest', 'callback' ]
+		else
+			return sess.popup(sess.col, { 'doCallback' : 1, 'enlarge':1 } )
+		endif
+	elseif actionName == 'enlarge'
+		let current = s:GetTextBeforeCursor(sess)
+		if current !=# sess.currentText
+			let sess.longest = sess.currentText
+			let sess.matched = sess.currentText
+			let sess.matchedCallback = 'onOneMatch'
+			let nextList = [ 'clearPrefix', 'typeLongest', 'callback' ]
+		else
+			return sess.popup(sess.col, { 'doCallback' : 1, 'enlarge':1 } )
+		endif
+	elseif actionName == 'typeMatched'
+		let postAction = sess.matched
+	elseif actionName == 'typeLongest'
+		let postAction = sess.longest
+	elseif actionName == 'type'
+		let postAction = remove(nextList,0)
+	elseif actionName == 'popup'
+		call complete(sess.col,sess.currentList)
+	elseif actionName == 'fixPopup'
+		let current = s:GetTextBeforeCursor(sess)
+		let i = 0
+		let j = -1
+		for v in sess.currentList
+			let key = type(v) == type({}) ? v.word : v
+			if key ==# current
+				let j = i
+				break
+			endif
+			let i += 1
+		endfor
+		if j != -1
+			let postAction .= repeat( "\<C-p>", j + 1 )
+		endif
+	elseif actionName == 'callback'
+		call s:End()
+		let postAction = ""
+		if has_key(sess.callback,sess.matchedCallback)
+			let postAction = sess.callback[sess.matchedCallback](sess)
+			return postAction
+		endif
+	elseif actionName == 'end'
+		call s:End()
+		let postAction = ''
+	else
+	endif
+	if !empty(nextList)
+		let  postAction .= "\<C-r>=XPPprocess(" . string( nextList ) . ")\<CR>"
+	else
+		let postAction .= g:xpt_post_action
+	endif
+	return postAction
+endfunction
+fun! s:GetTextBeforeCursor(sess)
+	let c = col( "." )
+	if c == 1
+		return ''
+	endif
+	return getline(".")[ a:sess.col - 1 : c - 2 ]
+endfunction
+fun! XPPcomplete(col,list)
+	let oldcfu = &completefunc
+	set completefunc=XPPcompleteFunc
+	return "\<C-x>\<C-u>"
+endfunction
+fun! XPPcr()
+	if !s:PopupCheck(s:CHECK_PUM)
+		call feedkeys("\<CR>", 'mt')
+		return ""
+	endif
+	return "\<C-r>=XPPaccept()\<CR>"
+endfunction
+fun! XPPup(key)
+	if !s:PopupCheck(s:CHECK_PUM)
+		call feedkeys( a:key, 'mt' )
+		return ""
+	endif
+	return "\<C-p>"
+endfunction
+fun! XPPdown(key)
+	if !s:PopupCheck(s:CHECK_PUM)
+		call feedkeys( a:key, 'mt' )
+		return ""
+	endif
+	return "\<C-n>"
+endfunction
+fun! XPPcallback()
+	if !exists("b:__xpp_current_session")
+		return ""
+	endif
+	let sess = b:__xpp_current_session
+	call s:End()
+	if has_key(sess.callback,sess.matchedCallback)
+		let post = sess.callback[sess.matchedCallback](sess)
+	else
+		let post = ""
+	endif
+	return post
+endfunction
+fun! XPPshorten()
+	if !s:PopupCheck(! s:CHECK_PUM)
+		let s:pos = getpos(".")[ 1 : 2 ]
+		return "\<C-e>\<C-r>=XPPcorrectPos()\<cr>\<bs>"
+	endif
+	if !pumvisible()
+		return "\<BS>"
+	endif
+	let sess = b:__xpp_current_session
+	let current = s:GetTextBeforeCursor(sess)
+	if sess.key != ''
+		return "\<BS>"
+	endif
+	if current == ''
+		call s:End()
+		return "\<bs>"
+	endif
+	let actions = "\<C-y>"
+	let actions = ""
+	if g:xptemplate_pum_quick_back == 1
+		let prefixMap = (sess.ignoreCase) ? sess.prefixIndex.lower : sess.prefixIndex.ori
+		let shorterKey = s:FindShorter(prefixMap, ( sess.ignoreCase ? substitute(current, '.', '\l&', 'g') : current ))
+	else
+		 let shorterKey = current[0 : -2]
+	endif
+	let action = actions . repeat( "\<bs>", len(current) - len(shorterKey) ) . "\<C-r>=XPPrepopup(0, 'noenlarge')\<cr>"
+	return action
+endfunction
+fun! XPPenlarge(key)
+	if !s:PopupCheck(s:CHECK_PUM)
+		call feedkeys( a:key, 'm' )
+		return ""
+	endif
+	return "\<C-r>=XPPrepopup(1, 'enlarge')\<cr>"
+endfunction
+fun! XPPcancel(key)
+	if !s:PopupCheck()
+		call feedkeys( a:key, 'mt' )
+		return ""
+	endif
+	return "\<C-r>=XPPprocess(" . string( [ 'clearPum', 'clearPrefix', 'typeLongest', 'end' ] ) . ")\<cr>"
+endfunction
+fun! XPPaccept()
+	if !s:PopupCheck()
+		call feedkeys("\<C-y>", 'mt')
+		return ""
+	endif
+	let sess = b:__xpp_current_session
+	let beforeCursor = col( "." ) - 2
+	let beforeCursor = beforeCursor == -1 ? 0 : beforeCursor
+	let toType = getline(sess.line)[sess.col - 1 : beforeCursor]
+	return "\<C-r>=XPPprocess(" . string( [ 'clearPum', 'clearPrefix', 'type', toType, 'end' ] ) . ")\<cr>"
+endfunction
+fun! XPPrepopup(doCallback,ifEnlarge)
+	if !exists("b:__xpp_current_session")
+		return ""
+	endif
+	let sess = b:__xpp_current_session
+	if sess.key != ''
+		let sess.currentText = s:GetTextBeforeCursor(sess)
+		let action = "\<C-e>" . "\<C-r>=XPPprocess(" . string( [ 'keymodeEnlarge' ] ) . ")\<CR>"
+		return action
+	else
+		let action = sess.popup(sess.col, { 'doCallback' : a:doCallback, 'enlarge':a:ifEnlarge == 'enlarge' } )
+		return action
+	endif
+endfunction
+fun! XPPcorrectPos()
+	let p = getpos(".")[1:2]
+	if p != s:pos
+		unlet s:pos
+		return "\<bs>"
+	else
+		unlet s:pos
+		return ""
+	endif
+endfunction
+fun! s:ApplyMapAndSetting()
+	call s:_InitBuffer()
+	if exists( 'b:__xpp_pushed' )
+		return
+	endif
+	let b:__xpp_pushed = 1
+	call xpt#msvr#Save(b:_xpp_map_saver)
+	let sess = b:__xpp_current_session
+	exe 'inoremap <silent> <buffer> <UP>'   '<C-r>=XPPup("\<lt>UP>")<CR>'
+	exe 'inoremap <silent> <buffer> <DOWN>' '<C-r>=XPPdown("\<lt>DOWN>")<CR>'
+	exe 'inoremap <silent> <buffer> <bs>'  '<C-r>=XPPshorten()<cr>'
+	exe 'inoremap <silent> <buffer> <C-e>' '<C-r>=XPPcancel("\<lt>C-e>")<cr>'
+	if sess.tabNav
+		exe 'inoremap <silent> <buffer> <S-tab>' '<C-r>=XPPup("\<lt>S-Tab>")<cr>'
+		exe 'inoremap <silent> <buffer> <tab>' '<C-r>=XPPdown("\<lt>TAB>")<cr>'
+		exe 'inoremap <silent> <buffer> <cr>'  '<C-r>=XPPenlarge("\<lt>CR>")<cr>'
+		exe 'inoremap <silent> <buffer> <C-y>' '<C-r>=XPPenlarge("\<lt>C-y>")<cr>'
+	else
+		exe 'inoremap <silent> <buffer> <tab>' '<C-r>=XPPenlarge("\<lt>TAB>")<cr>'
+		exe 'inoremap <silent> <buffer> <cr>'  '<C-r>=XPPenlarge("\<lt>CR>")<cr>'
+		exe 'inoremap <silent> <buffer> <C-y>' '<C-r>=XPPenlarge("\<lt>C-y>")<cr>'
+	endif
+	augroup XPpopup
+		au!
+		au CursorMovedI * call s:CheckAndFinish()
+		au InsertEnter * call XPPend()
+	augroup END
+	call xpt#settingswitch#Switch(b:_xpp_setting_switch)
+	if exists( ':AcpLock' )
+		AcpLock
+	endif
+endfunction
+fun! s:ClearMapAndSetting()
+	call s:_InitBuffer()
+	if !exists( 'b:__xpp_pushed' )
+		return
+	endif
+	unlet b:__xpp_pushed
+	augroup XPpopup
+		au!
+	augroup END
+	call xpt#msvr#Restore(b:_xpp_map_saver)
+	call xpt#settingswitch#Restore(b:_xpp_setting_switch)
+	if exists( ':AcpUnlock' )
+		try
+			AcpUnlock
+		catch /.*/
+		endtry
+	endif
+endfunction
+fun! s:CheckAndFinish()
+	if !exists( 'b:__xpp_current_session' )
+		call s:End()
+		return ''
+	endif
+	let sess = b:__xpp_current_session
+	if !pumvisible()
+		if line( "." ) == sess.line
+			if sess.strictInput
+				if col(".") > sess.col
+					call feedkeys( "\<BS>", 'n' )
+				endif
+			else
+				return s:MistakeTypeEnd()
+			endif
+		else
+			return s:MistakeTypeEnd()
+		endif
+	endif
+	return ''
+endfunction
+fun! s:MistakeTypeEnd()
+	call s:End()
+	return PUMclear()
+endfunction
+fun! XPPhasSession()
+	return exists("b:__xpp_current_session")
+endfunction
+fun! XPPend()
+	call s:End()
+	if pumvisible()
+		return PUMclear()
+	endif
+	return ''
+endfunction
+fun! s:End()
+	call s:ClearMapAndSetting()
+	if exists("b:__xpp_current_session")
+		unlet b:__xpp_current_session
+	endif
+endfunction
+fun! s:PopupCheck(...)
+	let checkPum = (a:0 == 0 || a:1)
+	if !exists("b:__xpp_current_session")
+		call s:End()
+		return 0
+	endif
+	let sess = b:__xpp_current_session
+	if sess.line != line(".") || col(".") < sess.col || (checkPum && !pumvisible())
+		call s:End()
+		return 0
+	endif
+	return 1
+endfunction
+fun! s:UpdateIndex(map,key)
+	let [i,len] = [0,len(a:key)]
+	while i < len
+		let prefix = a:key[0 : i - 1]
+		if !has_key(a:map,prefix)
+			let a:map[prefix] = 1
+		else
+			let a:map[prefix] += 1
+		endif
+		let i += 1
+	endwhile
+endfunction
+fun! s:LongestPrefix(sess)
+	let longest = ".*"
+	for e in a:sess.currentList
+		let key = (type(e) == type({})) ? e.word : e
+		if longest == ".*"
+			let longest  = a:sess.ignoreCase ? substitute(key, '.', '\l&', 'g') : key
+		else
+			while key !~ '^\V' . ( a:sess.ignoreCase ? '\c' : '\C' ) . escape(longest, '\') && len(longest) > 0
+				let longest = longest[ : -2 ] " remove one char
+			endwhile
+		endif
+	endfor
+	let longest = ( longest == '.*' ) ? '' : longest
+	if a:sess.prefix !=# longest[: len(a:sess.prefix) - 1]
+		let longest = a:sess.prefix . longest[len(a:sess.prefix) :]
+	endif
+	return longest
+endfunction
+fun! s:filterCompleteList(sess)
+	let list = []
+	let caseOption = a:sess.ignoreCase ? '\c' : '\C'
+	if a:sess.matchWholeName
+		let pattern = '\V\^' . caseOption . a:sess.prefix . '\$'
+	else
+		let pattern = '\V\^' . caseOption . a:sess.prefix
+	endif
+	for item in a:sess.list
+		let key = (type(item) == type({})) ? item.word : item
+		if key =~ pattern
+			let list += [item]
+		endif
+	endfor
+	return list
+endfunction
+fun! s:FindShorter(map,key)
+	let key = a:key
+	if len(key) == 1
+	  return ''
+	endif
+	let nmatch = has_key(a:map,key) ? a:map[key] : 1
+	if !has_key(a:map,key[: -2])
+		return key[: -2]
+	endif
+	let key = key[: -2]
+	while key != '' && a:map[key] == nmatch
+		let key = key[: -2]
+	endwhile
+	return key
+endfunction
+fun! s:ClassPrototype(...)
+	let p = {}
+	for name in a:000
+		let p[ name ] = function( '<SNR>' . s:sid . name )
+	endfor
+	return p
+endfunction
+let s:sessionPrototype2 = s:ClassPrototype( 'popup', 'SetAcceptEmpty', 'SetMatchWholeName', 'SetTriggerKey', 'SetOption', 'KeyPopup', 'ListPopup', )
+call extend( s:sessionPrototype, s:sessionPrototype2, 'force' )
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/plugin/xpreplace.vim b/vim-plugins/bundle/xptemplate/plugin/xpreplace.vim
new file mode 100644
index 0000000..b1bb03b
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/plugin/xpreplace.vim
@@ -0,0 +1,197 @@
+if exists( "g:__XPREPLACE_VIM__" ) && g:__XPREPLACE_VIM__ >= XPT#ver
+	finish
+endif
+let g:__XPREPLACE_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+runtime plugin/debug.vim
+runtime plugin/xpmark.vim
+let s:log = CreateLogger( 'warn' )
+let s:log = CreateLogger( 'debug' )
+fun! s:InitBuffer()
+	if exists( 'b:__xpr_init' )
+		return
+	endif
+	let b:__xpr_init = { 'settingSwitch' : xpt#settingswitch#New() }
+	call xpt#settingswitch#AddList(b:__xpr_init.settingSwitch, [ '&l:textwidth', '0' ], [ '&l:virtualedit', 'onemore' ], [ '&l:whichwrap'  , 'b,s,h,l,<,>,~,[,]' ], [ '&l:selection'  , 'exclusive' ], [ '&l:selectmode' , '' ], )
+endfunction
+fun! XPRstartSession()
+	call s:InitBuffer()
+	if exists( 'b:_xpr_session' )
+		throw "xpreplace session already pushed"
+		return
+	endif
+	let b:_xpr_session = {}
+	call xpt#settingswitch#Switch(b:__xpr_init.settingSwitch)
+	let b:_xpr_session.savedReg = @"
+	let @" = 'XPreplaceInited'
+endfunction
+fun! XPRendSession()
+	if !exists( 'b:_xpr_session' )
+		throw "no setting pushed"
+		return
+	endif
+	let @" = b:_xpr_session.savedReg
+	call xpt#settingswitch#Restore(b:__xpr_init.settingSwitch)
+	unlet b:_xpr_session
+endfunction
+fun! XPreplaceByMarkInternal(startMark,endMark,replacement)
+	let [start,end] = [XPMpos(a:startMark),XPMpos(a:endMark)]
+	if start == [0,0] || end == [0,0]
+		throw 'XPM:' . ' ' . a:startMark . ' or ' . a:endMark . 'is invalid'
+	endif
+	let pos = XPreplaceInternal( start, end, a:replacement, { 'doJobs' : 0 } )
+	call XPMupdateWithMarkRangeChanging(a:startMark,a:endMark,start,pos)
+	return pos
+endfunction
+fun! XPreplaceInternal(start,end,replacement,...)
+	let option = { 'doJobs' : 1, 'saveHoriScroll' : 0 }
+	if a:0 == 1
+		call extend( option, a:1, 'force' )
+	endif
+	let replacement = a:replacement
+	let repLines = split( a:replacement, '\n', 1 )
+	if option.doJobs
+		call s:doPreJob(a:start,a:end,replacement)
+	endif
+	if 0
+		let [curNrLines,finalNrLines] = [a:end[0] - a:start[0] + 1,len(repLines)]
+		let [ s, e ] = [ 1, col( [ a:end[ 0 ], '$' ] ) ]
+		let repLines[0] = XPT#TextInLine(a:start[0],s,a:start[1]) . repLines[0]
+		let repLines[-1] .= XPT#TextInLine(a:end[0],a:end[1],e)
+		let positionAfterReplacement = [a:end[0] + (finalNrLines - curNrLines),a:end[1] - len(getline(a:end[0]))]
+		if curNrLines > finalNrLines
+			call cursor(a:start)
+			if curNrLines > finalNrLines + 1
+				exe 'silent!' 'normal!' 'zOd' ( finalNrLines - curNrLines - 1 ) 'j'
+			else
+				silent! normal! zOdd
+			endif
+		elseif curNrLines < finalNrLines
+			call append( a:start[ 0 ], repeat( [ '' ], finalNrLines - curNrLines ) )
+		endif
+		call setline(a:start[0],repLines)
+		let positionAfterReplacement[1] += len(getline(positionAfterReplacement[0]))
+		call cursor(positionAfterReplacement)
+		silent! normal! zO
+	else
+		call cursor(a:start)
+		silent! normal! zO
+		call cursor(a:start)
+		if a:start != a:end
+			silent! normal! v
+			call cursor(a:end)
+			silent! normal! dzO
+			call cursor(a:start)
+		endif
+		if replacement != ''
+			let positionAfterReplacement = s:Replace_standard(a:start,a:end,replacement)
+		else
+			let positionAfterReplacement = [ line("."), col(".") ]
+		endif
+	endif
+	if option.doJobs
+		call s:doPostJob(a:start,positionAfterReplacement,replacement)
+	endif
+	return positionAfterReplacement
+endfunction
+fun! s:Replace_standard(start,end,replacement)
+	let replacement = a:replacement
+	let bStart = [a:start[0] - line( '$' ), a:start[1] - len(getline(a:start[0]))]
+	call cursor(a:start)
+	let ifPasteAtEnd = ( col( [ a:start[0], '$' ] ) == a:start[1] && a:start[1] > 1 ) 
+	let @" = replacement . ';'
+	if ifPasteAtEnd
+		call cursor(a:start[0],a:start[1] - 1)
+		let char = matchstr( getline( '.' ), '\v.$' )
+		let @" = char . replacement . ';'
+		silent! normal! ""P
+	else
+		if col( "." ) == len( getline( line( "." ) ) ) + 1
+			silent! normal! ""p
+		else
+			silent! normal! ""P
+		endif
+	endif
+	let positionAfterReplacement = [ bStart[0] + line( '$' ), 0 ]
+	let positionAfterReplacement[1] = bStart[1] + len(getline(positionAfterReplacement[0]))
+	call cursor(a:start)
+	k'
+	call cursor(positionAfterReplacement)
+	silent! '',.foldopen!
+	if ifPasteAtEnd
+		call cursor(positionAfterReplacement[0],positionAfterReplacement[1] - 1 - len(char))
+		silent! normal! DzO
+	else
+		call cursor(positionAfterReplacement)
+		if positionAfterReplacement[1] == len(getline(positionAfterReplacement[0])) + 1 && positionAfterReplacement[1] > 1
+			call cursor(positionAfterReplacement[0],positionAfterReplacement[1] - 1)
+			silent! normal! xzO
+		else
+			silent! normal! XzO
+		endif
+	endif
+	let positionAfterReplacement = [ bStart[0] + line( '$' ), 0 ]
+	let positionAfterReplacement[1] = bStart[1] + len(getline(positionAfterReplacement[0]))
+	return positionAfterReplacement
+endfunction
+fun! s:Replace_gp(start,end,replacement)
+	let replacement = a:replacement
+	let bStart = [a:start[0] - line( '$' ), a:start[1] - len(getline(a:start[0]))]
+	call cursor(a:start)
+	let ifPasteAtEnd = ( col( [ a:start[0], '$' ] ) == a:start[1] && a:start[1] > 1 ) 
+	let @" = replacement . ';'
+	call cursor(a:start)
+	silent! normal! ""gPzOXzO
+	let positionAfterReplacement = [ line( "." ), col( "." ) ]
+	return positionAfterReplacement
+endfunction
+fun! XPreplace(start,end,replacement,...)
+	let option = { 'doJobs' : 1 }
+	if a:0 == 1
+		call extend(option, a:1, 'force')
+	endif
+	call XPRstartSession()
+	let positionAfterReplacement = a:end
+	try
+		let positionAfterReplacement = XPreplaceInternal(a:start,a:end,a:replacement,option)
+	catch /.*/
+		call XPT#warn(v:exception)
+		call XPT#warn(v:throwpoint)
+	finally
+		call XPRendSession()
+	endtry
+	return positionAfterReplacement
+endfunction
+let s:_xpreplace = { 'post' : {}, 'pre' : {} }
+fun! XPRaddPreJob(functionName)
+	let s:_xpreplace.pre[a:functionName] = function(a:functionName)
+endfunction
+fun! XPRaddPostJob(functionName)
+	let s:_xpreplace.post[a:functionName] = function(a:functionName)
+endfunction
+fun! XPRremovePreJob(functionName)
+	let d = s:_xpreplace.pre
+	if has_key(d,a:functionName)
+		unlet d[a:functionName]
+	endif
+endfunction
+fun! XPRremovePostJob(functionName)
+	let d = s:_xpreplace.post
+	if has_key(d,a:functionName)
+		unlet d[a:functionName]
+	endif
+endfunction
+fun! s:doPreJob(start,end,replacement)
+	let d = { 'f' : '' }
+	for d.f in values(s:_xpreplace.pre)
+		call d.f(a:start,a:end)
+	endfor
+endfunction
+fun! s:doPostJob(start,end,replacement)
+	let d = { 'f' : '' }
+	for d.f in values(s:_xpreplace.post)
+		call d.f(a:start,a:end)
+	endfor
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/plugin/xpt.plugin.highlight.vim b/vim-plugins/bundle/xptemplate/plugin/xpt.plugin.highlight.vim
new file mode 100644
index 0000000..164b673
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/plugin/xpt.plugin.highlight.vim
@@ -0,0 +1,136 @@
+if exists( "g:__XPT_PLUGIN_HIGHLIGHT_VIM__" ) && g:__XPT_PLUGIN_HIGHLIGHT_VIM__ >= XPT#ver
+	finish
+endif
+let g:__XPT_PLUGIN_HIGHLIGHT_VIM__ = XPT#ver
+runtime plugin/xptemplate.vim
+if '' == g:xptemplate_highlight 
+	finish
+endif
+if !hlID( 'XPTcurrentPH' )
+	hi def link XPTcurrentPH DiffChange
+endif
+if !hlID( 'XPTfollowingPH' )
+	hi def link XPTfollowingPH CursorLine
+endif
+if !hlID( 'XPTnextItem' )
+	hi def link XPTnextItem IncSearch
+endif
+fun! s:UpdateHL(x,ctx)
+	if !a:ctx.processing
+		return 1
+	endif
+	call s:ClearHL(a:x,a:ctx)
+	if pumvisible()
+		return 1
+	endif
+	if g:xptemplate_highlight =~ 'current' && a:ctx.phase == 'fillin'
+		let r = s:MarkRange(a:ctx.leadingPlaceHolder.mark)
+		call s:HL( 'XPTcurrentPH', r[2:] )
+	endif
+	if g:xptemplate_highlight =~ 'following' && a:ctx.phase == 'fillin'
+		let r = ''
+		for ph in a:ctx.item.placeHolders
+			let r .= '\|' . s:MarkRange( ph.mark )
+		endfor
+		call s:HL( 'XPTfollowingPH', r[2:] )
+	endif
+	if g:xptemplate_highlight =~ 'next'
+		let r = s:PatternOfNext(a:ctx)
+		if g:xptemplate_highlight_nested
+			for octx in a:x.stack
+				let r .= s:PatternOfNext(octx)
+			endfor
+		endif
+		call s:HL( 'XPTnextItem', r[2:] )
+	endif
+	return 1
+endfunction
+fun! s:PatternOfNext(ctx)
+	let r = ''
+	for item in a:ctx.itemList
+		if item.keyPH != {}
+			let r .= '\|' . s:MarkRange( item.keyPH.innerMarks )
+		else
+			let r .= '\|' . s:MarkRange( item.placeHolders[0].mark )
+		endif
+	endfor
+	if a:ctx.itemList == [] || 'cursor' != item.name
+		let pos = XPMposList(a:ctx.marks.tmpl.end,a:ctx.marks.tmpl.end)
+		let r .= '\|' . XPTgetStaticRange( pos[0], [ pos[1][0], pos[1][1] + 1 ] )
+	endif
+	return r
+endfunction
+fun! s:MarkRange(marks)
+	let pos = XPMposList(a:marks.start,a:marks.end)
+	if pos[0] == pos[1]
+		let pos[1][1] += 1
+	endif
+	return XPTgetStaticRange(pos[0],pos[1])
+endfunction
+fun! XPTgetStaticRange(p,q)
+	let posStart = a:p
+	let posEnd = a:q
+	if posStart[0] == posEnd[0] && posStart[1] + 1 == posEnd[1]
+		return '\%' . posStart[0] . 'l' . '\%' . posStart[1] . 'c'
+	endif
+	let r = ''
+	if posStart[0] == posEnd[0]
+		let r = r . '\%' . posStart[0] . 'l'
+		if posStart[1] > 1
+			let r = r . '\%>' . (posStart[1]-1) .'c'
+		endif
+		let r = r . '\%<' . posEnd[1] . 'c'
+	else
+		if posStart[0] < posEnd[0] - 1
+			let r = r . '\%>' . posStart[0] .'l' . '\%<' . posEnd[0] . 'l'
+		else
+			let r = r . '\%' . ( posStart[0] + 1 ) .'l'
+		endif
+		let r = r . '\|' . '\%(' . '\%' . posStart[0] . 'l\%>' . (posStart[1]-1) . 'c\)' . '\|' . '\%(' . '\%' . posEnd[0]   . 'l\%<' . (posEnd[1]+0)   . 'c\)'
+	endif
+	let r = '\%(' . r . '\)'
+	return '\V'.r
+endfunction
+if exists( '*matchadd' )
+	fun! s:HLinit()
+		if !exists( 'b:__xptHLids' )
+			let b:__xptHLids = []
+		endif
+	endfunction
+	fun! s:ClearHL(x,ctx)
+		call s:HLinit()
+		for id in b:__xptHLids
+			try
+				call matchdelete(id)
+			catch /.*/
+			endtry
+		endfor
+		let b:__xptHLids = []
+	endfunction
+	fun! s:HL(grp,ptn)
+		call s:HLinit()
+		call add(b:__xptHLids,matchadd(a:grp,a:ptn,30))
+	endfunction
+else
+	let s:matchingCmd = { 'XPTcurrentPH':'3match',  'XPTfollowingPH':'match',  'XPTnextItem':'2match',  }
+	fun! s:ClearHL(x,ctx)
+		for cmd in values(s:matchingCmd)
+			exe cmd 'none'
+		endfor
+	endfunction
+	fun! s:HL(grp,ptn)
+		let cmd = get( s:matchingCmd, a:grp, '' )
+		if '' != cmd
+			exe cmd a:grp '/' . a:ptn . '/'
+		endif
+	endfunction
+endif
+exe XPT#let_sid
+let s:FuncUpdate = function( '<SNR>' . s:sid . "UpdateHL" )
+let s:FuncClear  = function( '<SNR>' . s:sid . "ClearHL" )
+call g:XPTaddPlugin("insertenter"  , 'after' , s:FuncUpdate )
+call g:XPTaddPlugin("start"        , 'after' , s:FuncUpdate )
+call g:XPTaddPlugin("update"       , 'after' , s:FuncUpdate )
+call g:XPTaddPlugin("finishSnippet", 'after' , s:FuncUpdate )
+call g:XPTaddPlugin("ph_pum"       , 'before', s:FuncClear )
+call g:XPTaddPlugin("finishAll"    , 'after' , s:FuncClear )
diff --git a/vim-plugins/bundle/xptemplate/plugin/xptemplate.conf.vim b/vim-plugins/bundle/xptemplate/plugin/xptemplate.conf.vim
new file mode 100644
index 0000000..7c163a8
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/plugin/xptemplate.conf.vim
@@ -0,0 +1,234 @@
+if exists( "g:__XPTEMPLATE_CONF_VIM__" ) && g:__XPTEMPLATE_CONF_VIM__ >= XPT#ver
+	finish
+endif
+let g:__XPTEMPLATE_CONF_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+exe XPT#importConst
+let s:def = function( "XPT#default" )
+call s:def('g:xptemplate_key'	, '<C-\>' )
+call s:def('g:xptemplate_key_force_pum'	, '<C-r>' . g:xptemplate_key )
+call s:def('g:xptemplate_key_pum_only'	, '<C-r><C-r>' . g:xptemplate_key )
+call s:def('g:xptemplate_key_visual'	, g:xptemplate_key )
+call s:def('g:xptemplate_nav_next'	, '<Tab>' )
+call s:def('g:xptemplate_nav_prev'	, '<S-Tab>' )
+call s:def('g:xptemplate_nav_cancel'	, '<cr>' )
+call s:def('g:xptemplate_goback'	, '<C-g>' )
+call s:def('g:xptemplate_to_right'	, '<C-l>' )
+call s:def('g:xptemplate_key_2'	, g:xptemplate_key )
+call s:def('g:xptemplate_nav_next_2'	, g:xptemplate_nav_next )
+call s:def('g:xptemplate_fallback'	, '<Plug>XPTrawKey' )
+call s:def('g:xptemplate_key_visual_2'	, g:xptemplate_key_visual )
+call s:def('g:xptemplate_fallback_condition'	, '\V\c<Tab>' )
+call s:def('g:xptemplate_move_even_with_pum'	, g:xptemplate_nav_next !=? '<Tab>' )
+call s:def('g:xptemplate_close_pum'	, 0 )
+call s:def('g:xptemplate_break_undo'	, 0 )
+call s:def('g:xptemplate_always_show_pum'	, 0 )
+call s:def('g:xptemplate_minimal_prefix'	, 1 )
+call s:def('g:xptemplate_pum_tab_nav'	, 0 )
+call s:def('g:xptemplate_pum_quick_back'	, 1 )
+call s:def('g:xptemplate_strict'	, 2 )
+call s:def('g:xptemplate_highlight'	, 'next' )
+call s:def('g:xptemplate_highlight_nested'	, 0 )
+call s:def('g:xptemplate_brace_complete'	, 0 )
+call s:def('g:xptemplate_strip_left'	, 1 )
+call s:def('g:xptemplate_ph_pum_accept_empty'	, 1 )
+call s:def('g:xptemplate_hook_before_cr'	, '' )
+call s:def('g:xptemplate_debug_log'	, '' )
+call s:def('g:xptemplate_vars'	, '' )
+call s:def('g:xptemplate_bundle'	, '' )
+call s:def('g:xptemplate_snippet_folders'	, [] )
+runtime! autoload/xpt/option/*
+call s:def('g:xpt_post_action', '')
+fun! s:ParseXPTVars()
+	let var_strings = split(g:xptemplate_vars . '&', '\V'.s:nonEscaped.'&\zs')
+	let vars = {}
+	for v in var_strings
+		let key = matchstr(v, '\V\^\[^=]\*\ze=')
+		if key == ''
+			continue
+		endif
+		if key !~ '^\$'
+			let key = '$'.key
+		endif
+		let val = matchstr(v, '\V\^\[^=]\*=\zs\.\*')
+		let escaped_val = xpt#util#UnescapeChar(val, '&')
+		let vars[key] = strpart(escaped_val,0,len(escaped_val)-1)
+	endfor
+	return vars
+endfunction
+if type( g:xptemplate_minimal_prefix ) == type( '' )
+	if g:xptemplate_minimal_prefix =~ ','
+		let [ outer, inner ] = split( g:xptemplate_minimal_prefix, ',' )
+		if outer =~ '\d'
+			let g:xptemplate_minimal_prefix = outer + 0
+		else
+			let g:xptemplate_minimal_prefix = outer
+		endif
+		if inner =~ '\d'
+			let g:xptemplate_minimal_prefix_nested = inner + 0
+		else
+			let g:xptemplate_minimal_prefix_nested = inner
+		endif
+	endif
+endif
+call s:def( 'g:xptemplate_minimal_prefix_nested', g:xptemplate_minimal_prefix )
+if g:xptemplate_fallback == ''
+	let g:xptemplate_fallback = '<NOP>'
+endif
+if g:xptemplate_fallback == g:xptemplate_key || g:xptemplate_fallback == g:xptemplate_key_force_pum
+	let g:xptemplate_fallback = 'nore:' . g:xptemplate_fallback
+endif
+if g:xptemplate_brace_complete is 1
+	let g:xptemplate_brace_complete = '([{"'''
+endif
+let s:path = expand( "<sfile>" )
+let s:filename = 'xptemplate.conf.vim'
+let s:path = substitute( s:path, '\', '/', 'g' )
+let s:path = matchstr( s:path, '\V\.\*\ze/plugin/' . s:filename )
+let &runtimepath .= ',' . s:path . '/personal'
+for s:path in g:xptemplate_snippet_folders
+	let &runtimepath .= ',' . s:path
+endfor
+unlet s:path
+unlet s:filename
+let g:XPTmappings = { 'popup_old':"<C-v><C-v><BS><C-r>=XPTemplateStart(0,{'popupOnly':1})<cr>", 'trigger_old':"<C-v><C-v><BS><C-r>=XPTemplateStart(0)<cr>", 'popup':"<C-r>=XPTemplateStart(0,{'k':'%s','popupOnly':1})<cr>", 'force_pum':"<C-r>=XPTemplateStart(0,{'k':'%s','forcePum':1})<cr>", 'trigger':"<C-r>=XPTemplateStart(0,{'k':'%s'})<cr>", 'wrapTrigger':"\"0s<C-r>=XPTemplatePreWrap(@0)<cr>", 'incSelTrigger':"<C-c>`>a<C-r>=XPTemplateStart(0)<cr>", 'excSelTrigger':"<C-c>`>i<C-r>=XPTemplateStart(0)<cr>", 'selTrigger':(&selection == 'inclusive') ? "<C-c>`>a<C-r>=XPTemplateStart(0,{'k':'%s'})<cr>" : "<C-c>`>i<C-r>=XPTemplateStart(0,{'k':'%s'})<cr>", }
+if g:xptemplate_break_undo
+	let g:XPTmappings.trigger = "<C-g>u" . g:XPTmappings.trigger
+endif
+if g:xptemplate_close_pum
+	for k in split('popup,force_pum,trigger', ',')
+		let g:XPTmappings[k] = "<C-v><C-v><BS>" . g:XPTmappings[k]
+	endfor
+end
+if g:xptemplate_fallback =~ '\V\^nore:'
+	let g:xptemplate_fallback = g:xptemplate_fallback[5:]
+	exe "inoremap <silent> <Plug>XPTfallback"          g:xptemplate_fallback
+else
+	exe "imap     <silent> <Plug>XPTfallback"          g:xptemplate_fallback
+endif
+exe "inoremap <silent> <Plug>XPTrawKey"            g:xptemplate_key
+fun! s:EscapeMap(s)
+	return substitute( a:s, '\V>', '++', 'g' )
+endfunction
+exe "inoremap <silent>" g:xptemplate_key           printf( g:XPTmappings.trigger      , s:EscapeMap( g:xptemplate_key )          )
+exe "xnoremap <silent>" g:xptemplate_key_visual    g:XPTmappings.wrapTrigger
+exe "snoremap <silent>" g:xptemplate_key           printf( g:XPTmappings.selTrigger   , s:EscapeMap( g:xptemplate_key )          )
+exe "inoremap <silent>" g:xptemplate_key_pum_only  printf( g:XPTmappings.popup        , s:EscapeMap( g:xptemplate_key_pum_only ) )
+exe "inoremap <silent>" g:xptemplate_key_force_pum printf( g:XPTmappings.force_pum    , s:EscapeMap( g:xptemplate_key_force_pum ))
+if g:xptemplate_key_2 != g:xptemplate_key
+	exe "inoremap <silent>" g:xptemplate_key_2           g:XPTmappings.trigger
+	exe "snoremap <silent>" g:xptemplate_key_2           g:XPTmappings.selTrigger
+endif
+if g:xptemplate_key_visual_2 != g:xptemplate_key_visual
+	exe "xnoremap <silent>" g:xptemplate_key_visual_2           g:XPTmappings.wrapTrigger
+endif
+let g:XPTpvs = s:ParseXPTVars()
+if type( g:xptemplate_bundle ) == type( '' )
+	let s:bundle = split( g:xptemplate_bundle, ',' )
+else
+	let s:bundle = g:xptemplate_bundle
+endif
+let g:xptBundle = {}
+for ftAndBundle in s:bundle
+	let [ ft; bundle_list ] = split( ftAndBundle, '_' )
+	let bundle = join( bundle_list, '_' )
+	if !has_key(g:xptBundle,ft)
+		let g:xptBundle[ft] = {}
+	endif
+	let g:xptBundle[ft][bundle] = 1
+endfor
+fun! g:XPTaddBundle(ft,bundle)
+	call XPTemplateInit()
+	let g:xptBundle[a:ft] = get(g:xptBundle,a:ft,{})
+	let g:xptBundle[a:ft][a:bundle] = 1
+	call XPTembed( a:ft . '/' . a:bundle )
+endfunction
+fun! g:XPTloadBundle(ft,bundle)
+	if !has_key(g:xptBundle,a:ft)
+		return 0
+	elseif !has_key( g:xptBundle[ a:ft ], a:bundle ) && !has_key( g:xptBundle[ a:ft ], '*' )
+		return 0
+	else
+		return 1
+	endif
+endfunction
+fun! XPTfiletypeInit()
+	if !exists( 'b:xptemplateData' )
+		call XPTemplateInit()
+	endif
+	let x = b:xptemplateData
+	let fts = x.filetypes
+	for [ft,ftScope] in items(fts)
+		let f = ftScope.funcs
+		for [k,v] in items(g:XPTpvs)
+			let f[k] = v
+		endfor
+		if &l:commentstring != ''
+			let cms = split( &l:commentstring, '\V%s', 1 )
+			if cms[1] == ''
+				let f[ '$CS' ] = get( f, '$CS', cms[0] )
+			else
+				if !has_key( f, '$CL' ) && !has_key( f, '$CR' )
+					let [ f[ '$CL' ], f[ '$CR' ] ] = cms
+				endif
+			endif
+		endif
+	endfor
+endfunction
+augroup XPTftInit
+  au!
+  au FileType * call XPTfiletypeInit()
+augroup END
+if stridx( g:xptemplate_brace_complete, '(' ) >= 0
+	inoremap <silent> ( <C-v><C-v><BS><C-r>=XPTtgr('(',{'noliteral':1,'k':'('})<cr>
+endif
+if stridx( g:xptemplate_brace_complete, '[' ) >= 0
+	inoremap <silent> [ <C-v><C-v><BS><C-r>=XPTtgr('[',{'noliteral':1,'k':'['})<cr>
+endif
+if stridx( g:xptemplate_brace_complete, '{' ) >= 0
+	inoremap <silent> { <C-v><C-v><BS><C-r>=XPTtgr('{',{'noliteral':1,'k':'{'})<cr>
+endif
+if stridx( g:xptemplate_brace_complete, '''' ) >= 0
+	inoremap <silent> ' <C-v><C-v><BS><C-r>=XPTtgr('''',{'noliteral':1,'k':''''})<cr>
+endif
+if stridx( g:xptemplate_brace_complete, '"' ) >= 0
+	inoremap <silent> " <C-v><C-v><BS><C-r>=XPTtgr('"',{'noliteral':1,'k':'"'})<cr>
+endif
+fun! XPTinfo()
+	if !exists( 'b:xptemplateData' )
+		return 0
+	endif
+	let x = b:xptemplateData
+	if !x.renderContext.processing
+		return 0
+	endif
+	let st = x.stack
+	let st = st + [x.renderContext]
+	call map( st, '{"$snipname":v:val.snipObject.name, "$phname":v:val.item.name}' )
+	return st
+endfunction
+fun! XPTinfoStr(...)
+	let data = XPTinfo()
+	if data is 0
+		return ''
+	endif
+	let fmt = a:000
+	if len(fmt) == 0
+		let fmt = [ "$snipname.$phname", " > " ]
+	elseif len(fmt) == 1
+		call add( fmt, " > " )
+	else
+		let fmt = fmt[0 : 1]
+	endif
+	let rst = []
+	for e in data
+		let elt = fmt[0]
+		for k in [ "$snipname", "$phname" ]
+			let elt = substitute( elt, '\V' . k, e[ k ], 'g' )
+		endfor
+		call add(rst,elt)
+	endfor
+	return join(rst,fmt[1])
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/plugin/xptemplate.parser.vim b/vim-plugins/bundle/xptemplate/plugin/xptemplate.parser.vim
new file mode 100644
index 0000000..bc426ea
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/plugin/xptemplate.parser.vim
@@ -0,0 +1,22 @@
+if exists( "g:__XPTEMPLATE_PARSER_VIM__" ) && g:__XPTEMPLATE_PARSER_VIM__ >= XPT#ver
+	finish
+endif
+let g:__XPTEMPLATE_PARSER_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+runtime plugin/xptemplate.conf.vim
+exec XPT#importConst
+com! -nargs=* XPTemplate if xpt#parser#InitSnippetFile( expand( "<sfile>" ), <f-args> ) == 'finish' | finish | endif
+com! -nargs=* XPTemplateDef call xpt#parser#LoadSnippetToParseList(expand("<sfile>")) | finish
+com! -nargs=* XPT           call xpt#parser#LoadSnippetToParseList(expand("<sfile>")) | finish
+com! -nargs=* XPTvar call xpt#parser#SetVar(<q-args>)
+com! -nargs=* XPTsnipSet call xpt#parser#SnipSet(<q-args>)
+com! -nargs=+ XPTinclude call xpt#parser#Include(<f-args>)
+com! -nargs=+ XPTembed call xpt#parser#Embed(<f-args>)
+fun! XPTinclude(...)
+	call xpt#parser#Load(a:000,1)
+endfunction
+fun! XPTembed(...)
+	call xpt#parser#Load(a:000,0)
+endfunction
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/plugin/xptemplate.vim b/vim-plugins/bundle/xptemplate/plugin/xptemplate.vim
new file mode 100644
index 0000000..6b32940
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/plugin/xptemplate.vim
@@ -0,0 +1,2286 @@
+" GetLatestVimScripts: 2611 1 :AutoInstall: xpt.tgz
+" VERSION: 0.4.9.161024-8f2c6c5
+if exists( "g:__XPTEMPLATE_VIM__" ) && g:__XPTEMPLATE_VIM__ >= XPT#ver
+	finish
+endif
+let g:__XPTEMPLATE_VIM__ = XPT#ver
+let s:oldcpo = &cpo
+set cpo-=< cpo+=B
+exe XPT#let_sid
+runtime plugin/xptemplate.conf.vim
+runtime plugin/xpreplace.vim
+runtime plugin/xpmark.vim
+runtime plugin/xpopup.vim
+exec XPT#importConst
+let s:log = xpt#debug#Logger( 'warn' )
+let s:log = xpt#debug#Logger( 'debug' )
+let s:close_pum = "\<C-v>\<C-v>\<BS>"
+let s:renderPhase = xpt#rctx#phase
+call XPRaddPreJob( 'XPMupdateCursorStat' )
+call XPRaddPostJob( 'XPMupdateSpecificChangedRange' )
+call XPMsetUpdateStrategy( 'normalMode' )
+fun! XPTmarkCompare(o,markToAdd,existedMark)
+	let renderContext = b:xptemplateData.renderContext
+	if renderContext.phase == 'rendering'
+		let [lm,rm] = [a:o.changeLikelyBetween.start,a:o.changeLikelyBetween.end]
+		if a:existedMark ==# rm
+			return -1
+		endif
+	elseif renderContext.action == 'build' && has_key( renderContext, 'buildingMarkRange' ) && renderContext.buildingMarkRange.end == a:existedMark
+		return -1
+	endif
+	return 1
+endfunction
+let s:repetitionPattern     = '\w\*...\w\*'
+let s:expandablePattern     = '\V\S\+...\$'
+let s:nullDict = {}
+let s:nullList = []
+let s:nonEscaped = '\%(' .     '\%(\[^\\]\|\^\)' .     '\%(\\\\\)\*' . '\)' . '\@<='
+let g:XPTemplateSettingPrototype = { 'hidden':0, 'variables':{}, 'preValues':{ 'cursor' : xpt#flt#New( 0, '$CURSOR_PH' ) }, 'defaultValues':{}, 'mappings':{}, 'ontypeFilters':{}, 'postFilters':{}, 'comeFirst':[], 'comeLast':[], }
+fun! g:XPTapplyTemplateSettingDefaultValue(setting)
+	let s = a:setting
+	let s.postQuoter        = get( s,           'postQuoter',   { 'start' : '{{', 'end' : '}}' } )
+	let s.preValues.cursor  = get( s.preValues, 'cursor',       '$CURSOR_PH' )
+endfunction
+let g:XPT_RC = { 'ok':{}, 'canceled':{}, }
+let s:buildingSeqNr = 0
+let s:anonymouseIndex = 0
+let s:pumCB = {}
+fun! s:pumCB.onEmpty(sess)
+	if g:xptemplate_fallback ==? '<NOP>'
+		call XPT#warn( "XPT: No snippet matches" )
+		return ''
+	else
+		let x = b:xptemplateData
+		let x.fallbacks = [ [ "\<Plug>XPTfallback", 'feed' ] ] + x.fallbacks
+		return XPT#fallback(x.fallbacks)
+	endif
+endfunction
+fun! s:pumCB.onOneMatch(sess)
+	if a:sess.matched == ''
+		call feedkeys( eval('"\' . g:xptemplate_key . '"' ), 'nt')
+		return ''
+	else
+		return s:DoStart(a:sess)
+	endif
+endfunction
+let s:ItemPumCB = {}
+fun! s:ItemPumCB.onOneMatch(sess)
+	if 0 == s:XPTupdate()
+		return s:ShiftForward( '' )
+	else
+		return ""
+	endif
+endfunction
+fun! s:FallbackKey()
+	call feedkeys( "\<Plug>XPTfallback", 'mt' )
+	return ''
+endfunction
+fun! XPTemplateKeyword(val)
+	let x = b:xptemplateData
+	let ftScope = x.filetypes[x.snipFileScope.filetype]
+	let ftkeyword = ftScope.ftkeyword
+	let val = substitute(a:val, '\w', '', 'g')
+	let val = string(val)[1 : -2]
+	let needEscape = '^\]-'
+	let ftkeyword.list += split( val, '\v\s*' )
+	call sort(ftkeyword.list)
+	let ftkeyword.list = split( substitute( join( ftkeyword.list, '' ), '\v(.)\1+', '\1', 'g' ), '\v\s*' )
+	let ftkeyword.regexp = '\[0-9A-Za-z_' . escape( join( ftkeyword.list, '' ), needEscape ) . ']'
+endfunction
+fun! XPTemplatePriority(...)
+	let x = b:xptemplateData
+	let p = get( a:000, 0, '' )
+	if p == ''
+		let p = 'lang'
+	endif
+	let x.snipFileScope.priority = xpt#priority#Parse(p)
+endfunction
+fun! XPTemplateMark(sl,sr)
+	let b:xptemplateData.snipFileScope.ptn = xpt#snipfile#GenPattern({'l':a:sl, 'r':a:sr})
+endfunction
+fun! XPTmark()
+	let renderContext = b:xptemplateData.renderContext
+	let xp = renderContext.snipObject.ptn
+	return [xp.l,xp.r]
+endfunction
+fun! g:XPTfuncs()
+	return g:GetSnipFileFtScope().funcs
+endfunction
+fun! XPTemplateAlias(name,toWhich,setting)
+	let name = a:name
+	let xptObj = b:xptemplateData
+	let xt = xptObj.filetypes[g:GetSnipFileFT()].allTemplates
+	let toSnip = get(xt,a:toWhich)
+	if toSnip is 0
+		return
+	endif
+	let setting = deepcopy(toSnip.setting)
+	call xpt#util#DeepExtend(setting,a:setting)
+	let prio = xptObj.snipFileScope.priority
+	let existed = get( xt, a:name, { 'priority': xpt#priority#Get( 'lowest' ) } )
+	if existed.priority < prio
+		return
+	endif
+	if has_key(xt,a:toWhich)
+		let xt[a:name] = { 'name':a:name, 'parsed':0, 'ftScope':toSnip.ftScope, 'snipText':toSnip.snipText, 'priority':prio, 'setting':setting, 'ptn':deepcopy(toSnip.ptn), }
+		call s:UpdateNamePrefixDict(toSnip.ftScope,a:name)
+		call s:ParseTemplateSetting(xt[a:name])
+		if get( xt[ name ].setting, 'abbr', 0 )
+			call s:Abbr(name)
+		endif
+	endif
+endfunction
+fun! g:GetSnipFileFT()
+	let x = b:xptemplateData
+	return x.snipFileScope.filetype
+endfunction
+fun! g:GetSnipFileFtScope()
+	let x = b:xptemplateData
+	return x.filetypes[x.snipFileScope.filetype]
+endfunction
+fun! s:GetTempSnipScope(x,ft)
+	if !has_key( a:x, '__tmp_snip_scope' )
+		let sc = xpt#snipfile#New('')
+		let b:xptemplateData.snipFileScope = sc
+		let sc.priority = 0
+		let a:x.__tmp_snip_scope = sc
+	endif
+	let a:x.__tmp_snip_scope.filetype = '' == a:ft ? 'unknown' : a:ft
+	return a:x.__tmp_snip_scope
+endfunction
+fun! XPTemplate(name,str_or_ctx,...)
+	let x = b:xptemplateData
+	if a:0 == 0
+		let snip = a:str_or_ctx
+		let setting = {}
+	else
+		let snip = a:1
+		let setting = a:str_or_ctx
+	endif
+	let ft = get( setting, 'filetype', &filetype )
+	let ft = '' == ft ? 'unknown' : ft
+	call xpt#parser#loadSpecialFiletype(ft)
+	call xpt#snipfile#Push()
+	let x.snipFileScope = s:GetTempSnipScope(x,ft)
+	call XPTdefineSnippet(a:name,setting,snip)
+	call xpt#snipfile#Pop()
+endfunction
+fun! XPTdefineSnippet(name,setting,snip)
+	let name = a:name
+	let x = b:xptemplateData
+	let ftScope = x.filetypes[x.snipFileScope.filetype]
+	let templates = ftScope.allTemplates
+	let xp = x.snipFileScope.ptn
+	let templateSetting = deepcopy(g:XPTemplateSettingPrototype)
+	call extend( templateSetting, a:setting, 'force' )
+	call g:XPTapplyTemplateSettingDefaultValue(templateSetting)
+	let prio = x.snipFileScope.priority
+	if has_key(templates,a:name) && templates[a:name].priority < prio
+		return
+	endif
+	call s:UpdateNamePrefixDict(ftScope,a:name)
+	if type(a:snip) == type([])
+		let snip = join(a:snip, "\n")
+	else
+		let snip = a:snip
+	endif
+	let templates[a:name] = { 'name':a:name, 'parsed':0, 'ftScope':ftScope, 'snipText':snip, 'priority':prio, 'setting':templateSetting, 'ptn':deepcopy(b:xptemplateData.snipFileScope.ptn), }
+	call s:InitTemplateObject(x,templates[a:name])
+	if get( templates[ name ].setting, 'abbr', 0 )
+		call s:Abbr(name)
+	endif
+endfunction
+fun! s:UpdateNamePrefixDict(ftScope,name)
+	if !has_key( a:ftScope, 'namePrefix' )
+		let a:ftScope.namePrefix = {}
+	endif
+	let [n,pre] = [a:name,a:ftScope.namePrefix]
+	while n != '' && !has_key( pre, n )
+		let pre[n] = 1
+		let n = n[: -2]
+	endwhile
+endfunction
+fun! s:Abbr(name)
+	let name = a:name
+	try
+		exe 'inoreabbr <silent> <buffer> ' name '<C-v><C-v>' . "<BS>\<C-r>=XPTtgr(" . string( name ) . ",{'k':''})\<CR>"
+	catch /.*/
+		let n = matchstr( name, '\v\w+$' )
+		let pre = name[: -len(n) - 1]
+		let x.abbrPrefix[n] = get(x.abbrPrefix,n,{})
+		let x.abbrPrefix[n][pre] = 1
+		exe 'inoreabbr <silent> <buffer> ' n printf( "\<C-r>=XPTabbr(%s)\<CR>", string( n ) )
+	endtry
+endfunction
+fun! s:InitTemplateObject(xptObj,tmplObj)
+	call s:ParseTemplateSetting(a:tmplObj)
+	call s:AddCursorToComeLast(a:tmplObj.setting)
+	call s:InitItemOrderList(a:tmplObj.setting)
+	if !has_key( a:tmplObj.setting.defaultValues, 'cursor' )
+		let a:tmplObj.setting.defaultValues.cursor = xpt#flt#New( 0, 'Finish("")' )
+	endif
+	if len(a:tmplObj.name) == 1 && 0 " diabled
+	else
+		let nonWordChar = substitute( a:tmplObj.name, '\w', '', 'g' )
+		if nonWordChar != ''
+			if !(a:tmplObj.setting.wraponly || a:tmplObj.setting.hidden)
+				call XPTemplateKeyword(nonWordChar)
+			endif
+		endif
+	endif
+endfunction
+fun! s:ParseInclusion(tmplDict,tmplObject)
+	if type( a:tmplObject.snipText ) == type( function( 'tr' ) )
+		return
+	endif
+	let xp = a:tmplObject.ptn
+	let phPattern = '\V' . xp.lft . 'Include:\(\.\{-}\)' . xp.rt
+	let linePattern = '\V' . '\n\(\s\*\)\.\{-}' . phPattern
+	call s:DoInclude( a:tmplDict, a:tmplObject, { 'ph' : phPattern, 'line' : linePattern }, 1 )
+	let phPattern = '\V' . xp.lft . ':\(\.\{-}\):' . xp.rt
+	let linePattern = '\V' . '\n\(\s\*\)\.\{-}' . phPattern
+	call s:DoInclude( a:tmplDict, a:tmplObject, { 'ph' : phPattern, 'line' : linePattern }, 0 )
+endfunction
+fun! s:DoInclude(tmplDict,tmplObject,pattern,keepCursor)
+	let snip = "\n" . a:tmplObject.snipText
+	let xp = a:tmplObject.ptn
+	let included = {a:tmplObject.name : 1}
+	let pos = 0
+	while 1
+		let pos = match(snip,a:pattern.line,pos)
+		if -1 == pos
+			break
+		endif
+		let [matching,indent,incName] = matchlist(snip,a:pattern.line,pos)[: 2]
+		let indent = matchstr( split( matching, '\n' )[ -1 ], '^\s*' )
+		let [incName,params] = s:ParseInclusionStatement(a:tmplObject,incName)
+		if has_key(a:tmplDict,incName)
+			if has_key(included,incName) && included[incName] > 20
+				throw "XPT : include too many snippet:" . incName . ' in ' . a:tmplObject.name
+			endif
+			let included[incName] = get(included,incName,0) + 1
+			let ph = matchstr(matching,a:pattern.ph)
+			let incTmplObject = a:tmplDict[incName]
+			call s:ParseSnippet(incTmplObject,incTmplObject.ftScope)
+			call s:MergeSetting(a:tmplObject.setting,incTmplObject.setting)
+			let incSnip = s:ReplacePHInSubSnip(a:tmplObject,incTmplObject,params)
+			let incSnip = substitute( incSnip, '\n', '&' . indent, 'g' )
+			if !a:keepCursor
+				let incSnip = substitute( incSnip, xp.lft . 'cursor' . xp.rt, xp.l . xp.r, 'g' )
+			endif
+			let leftEnd = pos + len(matching) - len(ph)
+			let rightStart = pos + len(matching)
+			let left = snip[: leftEnd - 1]
+			let right = snip[rightStart :]
+			let snip = left . incSnip . right
+		else
+			throw "XPT : include inexistent snippet:" . incName . ' in ' . a:tmplObject.name
+		endif
+	endwhile
+	let a:tmplObject.snipText = snip[1:]
+endfunction
+fun! s:ReplacePHInSubSnip(snipObject,subSnipObject,params)
+	let xp = a:snipObject.ptn
+	let incSnip = a:subSnipObject.snipText
+	let incSnipPieces = split( incSnip, '\V' . xp.rt, 1 )
+	for [k,v] in items(a:params)
+		let [i,len] = [0 - 1,len(incSnipPieces) - 1]
+		while i < len | let i += 1
+			let piece = incSnipPieces[i]
+			if piece =~# '\V' . k
+				let parts = split( piece, '\V' . xp.lft, 1 )
+				let iName = len(parts) == 4 ? 2 : len(parts) - 1
+				if parts[iName] ==# k
+					let parts[iName] = v
+				endif
+				let incSnipPieces[i] = join(parts,xp.l)
+			endif
+		endwhile
+	endfor
+	let incSnip = join(incSnipPieces,xp.r)
+	return incSnip
+endfunction
+fun! s:ParseInclusionStatement(snipObject,st)
+	let xp = a:snipObject.ptn
+	let ptn = '\V\^\[^(]\{-}('
+	let st = a:st
+	if st =~ ptn && st[ -1 : -1 ] == ')'
+		let name = matchstr(st,ptn)[: -2]
+		let paramStr = st[len(name) + 1 : -2]
+		let paramStr = xpt#util#UnescapeChar(paramStr,xp.l . xp.r)
+		let params = {}
+		try
+			let params = eval(paramStr)
+		catch /.*/
+			XPT#warn( 'XPT: Invalid parameter: ' . string( paramStr ) . ' Error=' . v:exception )
+		endtry
+		return [name,params]
+	else
+		return [st,{}]
+	endif
+endfunction
+fun! s:MergeSetting(toSettings,fromSettings)
+	let a:toSettings.comeFirst += a:fromSettings.comeFirst
+	let a:toSettings.comeLast = a:fromSettings.comeLast + a:toSettings.comeLast
+	call s:InitItemOrderList(a:toSettings)
+	call extend( a:toSettings.preValues, a:fromSettings.preValues, 'keep' )
+	call extend( a:toSettings.defaultValues, a:fromSettings.defaultValues, 'keep' )
+	call extend( a:toSettings.postFilters, a:fromSettings.postFilters, 'keep' )
+	call extend( a:toSettings.variables, a:fromSettings.variables, 'keep' )
+	for key in keys(a:fromSettings.mappings)
+		if !has_key(a:toSettings.mappings,key)
+			let a:toSettings.mappings[key] = { 'saver' : xpt#msvr#New(1), 'keys' : {} }
+		endif
+		for keystroke in keys(a:fromSettings.mappings[key].keys)
+			let a:toSettings.mappings[key].keys[keystroke] = a:fromSettings.mappings[key].keys[keystroke]
+			call xpt#msvr#Add( a:toSettings.mappings[ key ].saver, 'i', keystroke )
+		endfor
+	endfor
+endfunction
+fun! s:ParseTemplateSetting(tmpl)
+	let x = b:xptemplateData
+	let setting = a:tmpl.setting
+	if type( get( setting, 'wraponly', 0 ) ) == type( '' )
+		let setting.wrap = setting.wraponly
+		let setting.wraponly = 1
+	endif
+	let setting.iswrap = has_key( setting, 'wrap' )
+	let setting.wraponly = get( setting, 'wraponly', 0 )
+	if has_key( setting, 'wrap' ) && setting.wrap is 1
+		let setting.wrap = 'cursor'
+	endif
+	let x.renderContext.snipObject = a:tmpl
+	if has_key(setting, 'rawHint')
+		let hint = xpt#eval#Eval(setting.rawHint, [x.filetypes[x.snipFileScope.filetype].funcs, setting.variables, ])
+		if type(hint) == type({})
+			if get(hint, 'action', '') == 'pum'
+				let pum = get(hint, 'pum', [])
+				let setting.hint =  join( pum[ : 3 ], ' ' ) . ' ..'
+			else
+				let setting.hint = get(hint, 'text', '')
+			endif
+		elseif type(hint) == type([])
+			let setting.hint =  join( hint[ : 3 ], ' ' ) . ' ..'
+		elseif type(hint) == type(1)
+			let setting.hint = string(hint)
+		elseif type(hint) == 2
+			let setting.hint = string(hint)
+		else
+			let setting.hint = hint
+		endif
+	endif
+	call s:ParsePostQuoter(setting)
+endfunction
+fun! s:ParsePostQuoter(setting)
+	if !has_key( a:setting, 'postQuoter' ) || type(a:setting.postQuoter) == type({})
+		return
+	endif
+	let quoters = split( a:setting.postQuoter, ',' )
+	if len(quoters) < 2
+		throw 'postQuoter must be separated with ","! :' . a:setting.postQuoter
+	endif
+	let a:setting.postQuoter = { 'start' : quoters[0], 'end' : quoters[1] }
+endfunction
+fun! s:AddCursorToComeLast(setting)
+	if match( a:setting.comeLast, 'cursor' ) < 0
+		call add( a:setting.comeLast, 'cursor' )
+	endif
+endfunction
+fun! s:InitItemOrderList(setting)
+	let a:setting.comeFirst = xpt#util#RemoveDuplicate(a:setting.comeFirst)
+	let a:setting.comeLast = xpt#util#RemoveDuplicate(a:setting.comeLast)
+endfunction
+fun! XPTreload()
+	try
+		call s:Crash()
+	catch /.*/
+	endtry
+  try
+	unlet b:xptemplateData
+  catch /.*/
+  endtry
+  e
+endfunction
+fun! XPTgetAllTemplates()
+	call s:GetContextFTObj() " force initializing
+	return copy(b:xptemplateData.filetypes[&filetype].allTemplates)
+endfunction
+fun! XPTemplatePreWrap(wrap)
+	let x = b:xptemplateData
+	let x.wrap = a:wrap
+	let x.wrap = substitute( x.wrap, '\V\n\$', '', '' )
+	let x.wrap = xpt#indent#ToSpace(x.wrap)
+	if ( g:xptemplate_strip_left || x.wrap =~ '\n' ) && visualmode() ==# 'V'
+		let x.wrapStartPos = virtcol(".")
+		let indent = matchstr( x.wrap, '^\s*' )
+		let indentNr = len(indent)
+		let x.wrap = x.wrap[indentNr :]
+	else
+		let x.wrapStartPos = col(".")
+		let indentNr = min( [ indent( line( "." ) ), virtcol('.') - 1 ] )
+	endif
+	let maxIndent = indentNr
+	let x.wrap = substitute( x.wrap, '\V\n \{0,' . maxIndent . '\}', "\n", 'g' )
+	let lines = split( x.wrap, '\V\\r\n\|\r\|\n', 1 )
+	let maxlen = 0
+	for l in lines
+		let maxlen = maxlen < len(l) ? len(l) : maxlen
+	endfor
+	let indentNr -= maxIndent
+	let x.wrap =  { 'indent' : -indentNr, 'text':x.wrap, 'lines':lines, 'max':maxlen, 'curline':lines[ 0 ], }
+	let leftSpaces = s:ConcreteSpace()
+	if leftSpaces != ''
+		let x.wrapStartPos = len(leftSpaces) + 1
+	endif
+	let leftSpaces = substitute( leftSpaces, '	', '	', 'g' )
+	return leftSpaces . "\<C-r>=XPTemplateDoWrap()\<CR>"
+endfunction
+fun! s:ConcreteSpace()
+	if getline( line( '.' ) ) =~ '^\s*$'
+		let pos = virtcol( '.' )
+		normal! d0
+		let leftSpaces = XPT#convertSpaceToTab( repeat( ' ', pos - 1 ) )
+	else
+		let leftSpaces = ''
+	endif
+	return leftSpaces
+endfunction
+fun! XPTemplateDoWrap()
+	call XPTparseSnippets()
+	let x = b:xptemplateData
+	let ppr = s:Popup("", x.wrapStartPos, {})
+	return ppr
+endfunction
+fun! XPTabbr(name)
+	let x = b:xptemplateData
+	let line = getline( "." )
+	let pre = matchstr( line, '\v\S+$' )
+	if pre == ''
+		return printf( "\<C-r>=XPTtgr(%s, {'k':''})\<CR>", string( a:name ) )
+	else
+		if has_key(x.abbrPrefix,a:name)
+			if has_key(x.abbrPrefix[a:name],pre)
+				return repeat( "\<BS>", len( pre ) ) . printf( "\<C-r>=XPTtgr(%s, {'k':''})\<CR>", string( pre . a:name ) )
+			else
+				return printf( "\<C-r>=XPTtgr(%s, {'k':''})\<CR>", string( a:name ) )
+			endif
+		else
+			return printf( "\<C-r>=XPTtgr(%s, {'k':''})\<CR>", string( a:name ) )
+		endif
+	endif
+endfunction
+fun! XPTtgr(snippetName,...)
+	let opt = a:0 == 1 ? a:1 : {}
+	if pumvisible() || XPPhasSession()
+		return XPPend() . "\<C-r>=XPTtgr(" . string( a:snippetName ) . ', ' . string(opt) . ")\<CR>"
+	endif
+	if opt != {}
+		if get( opt, 'noliteral', 0 )
+			let opt.nosyn = '\V\cstring\|comment'
+		elseif get( opt, 'literal', 0 )
+			let opt.syn = '\V\cstring\|comment'
+		endif
+		if has_key( opt, 'nopum' )
+			let opt.pum = !opt.nopum
+		endif
+		let syn = synIDattr( synID( line("."), col("."), 0 ), "name" )
+		if has_key( opt, 'nosyn' ) && syn =~ opt.nosyn || has_key( opt, 'syn' ) && syn !~ opt.syn
+			return opt.k
+		endif
+		if has_key( opt, 'pum' )
+			if opt.pum && !pumvisible() || !opt.pum && pumvisible()
+				return opt.k
+			endif
+		endif
+	endif
+	let action = XPTemplateStart( 0, { 'startPos' : [ line( "." ), col( "." ) ], 'tmplName' : a:snippetName } )
+	return action
+endfunction
+fun! XPTemplateTrigger(snippetName,...)
+	let opt = a:0 == 1 ? a:1 : {}
+	return XPTtgr(a:snippetName,opt)
+endfunction
+fun! XPTparseSnippets()
+	let x = b:xptemplateData
+	for p in x.snippetToParse
+		call xpt#parser#ParseSnippet(p)
+	endfor
+	let x.snippetToParse = []
+endfunction
+fun! XPTemplateStart(pos_unused_any_more,...)
+	let action = ''
+	call XPTparseSnippets()
+	let x = b:xptemplateData
+	let opt = a:0 == 1 ? a:1 : {}
+	if has_key( opt, 'tmplName' )
+		let startColumn = opt.startPos[1]
+		let templateName = opt.tmplName
+		call cursor(opt.startPos)
+		return action . s:DoStart({ 'line':opt.startPos[0], 'col':startColumn, 'matched':templateName, 'data':{ 'ftScope' : s:GetContextFTObj() } } )
+	endif
+	if get( opt, 'concrete', 0 ) == 0
+		let opt.concrete = 1
+		let leftSpaces = s:ConcreteSpace()
+		if leftSpaces != ''
+			let leftSpaces = substitute( leftSpaces, '	', '	', 'g' )
+			return leftSpaces . "\<C-r>=XPTemplateStart(0," . string( opt ) . ")\<CR>"
+		endif
+	endif
+	let keypressed = get( opt, 'k', g:xptemplate_key )
+	let keypressed = substitute( keypressed, '\V++', '>', 'g' )
+	if pumvisible()
+		if XPPhasSession()
+			return XPPend() . "\<C-r>=XPTemplateStart(0," . string( opt ) . ")\<CR>"
+		else
+			if x.fallbacks == []
+				if keypressed =~ g:xptemplate_fallback_condition
+					let x.fallbacks = [ [ "\<Plug>XPTfallback", 'feed' ] ] + x.fallbacks
+					return XPT#fallback(x.fallbacks)
+				else
+				endif
+			else
+				if g:xptemplate_fallback =~? '\V<Plug>XPTrawKey\|<NOP>' || g:xptemplate_fallback ==? keypressed
+					return XPT#fallback(x.fallbacks)
+				else
+					let x.fallbacks = [ [ "\<Plug>XPTfallback", 'feed' ] ] + x.fallbacks
+					return XPT#fallback(x.fallbacks)
+				endif
+			endif
+		endif
+	else
+		if XPPhasSession()
+			call XPPend()
+		endif
+	endif
+	let forcePum = get( opt, 'forcePum', g:xptemplate_always_show_pum )
+	if x.renderContext.processing
+		let miniPrefix = g:xptemplate_minimal_prefix_nested
+	else
+		let miniPrefix = g:xptemplate_minimal_prefix
+	endif
+	let isFullMaatching = miniPrefix is 'full'
+	let cursorColumn = col(".")
+	let startLineNr = line(".")
+	let accEmp = 0
+	if g:xptemplate_key ==? '<Tab>'
+		let accEmp = 1
+	endif
+	if has_key( opt, 'popupOnly' )
+		let startColumn = cursorColumn
+	elseif x.wrapStartPos
+		let startColumn = x.wrapStartPos
+	else
+		let ftScope = s:GetContextFTObj()
+		let ftkeyword = ftScope.ftkeyword
+		let columnBeforeCursor = col( "." ) - 2
+		if columnBeforeCursor >= 0
+			let lineToCursor = getline(startLineNr)[0 : columnBeforeCursor]
+		else
+			let lineToCursor = ''
+		endif
+		let pre = ftScope.namePrefix
+		let n = split( lineToCursor, '\s', 1 )[ -1 ]
+		let snpt_name_ptn = '\V\^\(' . ftkeyword.regexp . '\|\k\)\k\*'
+		while n != '' && !has_key( pre, n )
+			let shorter = substitute( n, snpt_name_ptn, '', '' )
+			if shorter == n
+				let n = n[1 :]
+			else
+				let n = shorter
+			endif
+		endwhile
+		let matched = n
+		if !has_key( opt, 'popupOnly' )
+			if !isFullMaatching && len(matched) < miniPrefix
+				  let x.fallbacks = [ [ "\<Plug>XPTfallback", 'feed' ] ] + x.fallbacks
+				  return XPT#fallback(x.fallbacks)
+			endif
+		endif
+		let startColumn = col( "." ) - len( matched )
+		if matched == ''
+			let [startLineNr, startColumn] = [line("."), col(".")]
+		endif
+	endif
+	let templateName = strpart(getline(startLineNr),startColumn - 1,cursorColumn - startColumn)
+	let action = action . s:Popup(templateName,startColumn, { 'acceptEmpty'    : accEmp, 'forcePum':forcePum, 'matchWholeName':get( opt, 'popupOnly', 0 ) ? 0 : isFullMaatching } )
+	return action
+endfunction
+fun! s:NewRenderContext(ftScope,tmplName)
+	let x = b:xptemplateData
+	if x.renderContext.processing
+		call xpt#buf#Pushrctx()
+	endif
+	let renderContext = xpt#rctx#New(x)
+	let x.renderContext = renderContext
+	let renderContext.phase = 'inited'
+	let renderContext.snipObject = s:GetContextFTObj().allTemplates[a:tmplName]
+	let renderContext.ftScope = a:ftScope
+	call s:ParseSnippet(renderContext.snipObject,renderContext.ftScope)
+	let renderContext.snipSetting = copy(renderContext.snipObject.setting)
+	let setting = renderContext.snipSetting
+	for k in [ 'variables', 'preValues', 'defaultValues' , 'ontypeFilters', 'postFilters', 'comeFirst', 'comeLast' ]
+		let setting[k] = copy(setting[k])
+	endfor
+	return renderContext
+endfunction
+fun! s:ParseSnippet(snippet,ftScope)
+	if !a:snippet.parsed
+		let a:snippet.snipText = xpt#indent#IndentToTabStr(a:snippet.snipText)
+		call s:ParseInclusion(a:ftScope.allTemplates,a:snippet)
+		let a:snippet.snipText = s:ParseQuotedPostFilter(a:snippet)
+		let a:snippet.snipText = s:ParseRepetition(a:snippet)
+		let a:snippet.parsed = 1
+	endif
+endfunction
+fun! s:DoStart(sess)
+	let x = b:xptemplateData
+	if !has_key(s:GetContextFTObj().allTemplates,a:sess.matched)
+		return ''
+	endif
+	let b:__xpt_snip_sess__ = a:sess
+	return "\<BS>" . s:RenderSnippet()
+endfunction
+fun! s:RenderSnippet()
+	let x = b:xptemplateData
+	let sess = b:__xpt_snip_sess__
+	let x.savedReg = @"
+	let [lineNr,column] = [sess.line,sess.col]
+	let cursorColumn = col(".")
+	let tmplname = sess.matched
+	let ctx = s:NewRenderContext(sess.data.ftScope,tmplname)
+	call s:BuildSnippet([lineNr,column],[lineNr,cursorColumn])
+	let ctx.phase = 'rendered'
+	let ctx.processing = 1
+	call s:CallPlugin( 'render', 'after' )
+	if empty(x.stack)
+		call s:SaveNavKey()
+		call s:ApplyMap()
+	endif
+	let x.wrap = ''
+	let x.wrapStartPos = 0
+	let action = s:GotoNextItem()
+	call s:CallPlugin( 'start', 'after' )
+	return action
+endfunction
+fun! s:SaveNavKey()
+	let x = b:xptemplateData
+	let navKey = g:xptemplate_nav_next
+	let mapInfo = xpt#msvr#MapInfo( navKey, 'i' )
+	if mapInfo.cont == ''
+		let x.canNavFallback = 0
+		exe 'inoremap <buffer> <Plug>XPTnavFallback ' navKey
+	else
+		let x.canNavFallback = 1
+		let mapInfo.key = '<Plug>XPTnavFallback'
+		exe xpt#msvr#MapCommand(mapInfo)
+	endif
+endfunction
+fun! s:FinishRendering(...)
+	let x = b:xptemplateData
+	let renderContext = x.renderContext
+	let xp = renderContext.snipObject.ptn
+	let isCursor = get( renderContext.item, 'name', 0 ) is 'cursor'
+	call XPMremoveMarkStartWith(renderContext.markNamePre)
+	if empty(x.stack)
+		let x.fallbacks = []
+		let renderContext.processing = 0
+		let renderContext.phase = 'finished'
+		call s:ClearMap()
+		call XPMflushWithHistory()
+		let @" = x.savedReg
+		call s:CallPlugin( 'finishAll', 'after' )
+	else
+		call xpt#buf#Poprctx()
+		call s:CallPlugin( 'finishSnippet', 'after' )
+		let renderContext = x.renderContext
+	endif
+	return ''
+endfunction
+fun! s:Popup(pref,coln,opt)
+	let x = b:xptemplateData
+	let renderContext = x.renderContext
+	if renderContext.phase == 'finished'
+		let renderContext.phase = 'popup'
+	endif
+	let cmpl=[]
+	let cmpl2 = []
+	let ftScope = s:GetContextFTObj()
+	if ftScope == {}
+		return ''
+	endif
+	let forcePum = get( a:opt, 'forcePum', g:xptemplate_always_show_pum )
+	let snipDict = ftScope.allTemplates
+	let synNames = s:SynNameStack(line("."), a:coln)
+	if has_key(snipDict,a:pref) && !forcePum
+		let snipObj = snipDict[a:pref]
+		if s:IfSnippetShow(snipObj,synNames)
+			return s:DoStart({ 'line':line( "." ), 'col':a:coln, 'matched':a:pref, 'data':{ 'ftScope' : s:GetContextFTObj() } } )
+		endif
+	endif
+	for [key,snipObj] in items(snipDict)
+		if !s:IfSnippetShow(snipObj,synNames)
+			continue
+		endif
+		let hint = get( snipObj.setting, 'hint', '' )
+		if key =~# '\V\^\[A-Z]'
+			call add( cmpl2, {'word' : key, 'menu' : hint } )
+		else
+			call add( cmpl, {'word' : key, 'menu' : hint } )
+		endif
+	endfor
+	call sort(cmpl)
+	call sort(cmpl2)
+	let cmpl = cmpl + cmpl2
+	let pumsess = XPPopupNew(s:pumCB, { 'ftScope' : ftScope }, cmpl)
+	call pumsess.SetAcceptEmpty( get( a:opt, 'acceptEmpty', 0 ) )
+	call pumsess.SetMatchWholeName( get( a:opt, 'matchWholeName', 0 ) )
+	call pumsess.SetOption({ 'matchPrefix':! forcePum, 'tabNav':g:xptemplate_pum_tab_nav } )
+	return pumsess.popup(a:coln,{})
+endfunction
+fun! s:IfSnippetShow(snipObj,synNames)
+	let x = b:xptemplateData
+	let snipObj = a:snipObj
+	let synNames = a:synNames
+	if snipObj.setting.wraponly && x.wrap is '' || !snipObj.setting.iswrap && x.wrap isnot ''
+		return 0
+	endif
+	if has_key(snipObj.setting, "syn") && snipObj.setting.syn != '' && match(synNames, '\c' . snipObj.setting.syn) == -1
+		return 0
+	endif
+	if get( snipObj.setting, 'hidden', 0 )  == 1
+		return 0
+	endif
+	return 1
+endfunction
+fun! s:AddIndent(text,nIndent)
+	let baseIndent = repeat( " ", a:nIndent )
+	return substitute(a:text, '\n', '&' . baseIndent, 'g')
+endfunction
+fun! s:ParseRepetition(snipObject)
+	let tmplObj = a:snipObject
+	let xp = a:snipObject.ptn
+	let tmpl = a:snipObject.snipText
+	let bef = ""
+	let rest = ""
+	let rp = xp.lft . s:repetitionPattern . xp.rt
+	let repPtn = '\V\(' . rp . '\)\_.\{-}' . '\1'
+	let repContPtn = '\V\(' . rp . '\)\zs\_.\{-}' . '\1'
+	let stack = []
+	let from = 0
+	while 1
+		let startOfMatch = match(tmpl,repPtn,from)
+		if startOfMatch == -1
+			break
+		endif
+		let stack += [startOfMatch]
+		let from = startOfMatch + 1
+	endwhile
+	while stack != []
+		let matchpos = stack[-1]
+		unlet stack[-1]
+		if matchpos == 0
+			let bef = ''
+		else
+			let bef = tmpl[: matchpos-1]
+		endif
+		let rest = tmpl[matchpos :]
+		let indentNr = s:GetIndentBeforeEdge(tmplObj,bef)
+		let repeatPart = matchstr(rest,repContPtn)
+		let repeatPart = 'BuildIfNoChange(' . string( repeatPart ) . ')'
+		let symbol = matchstr(rest,rp)
+		let name = substitute( symbol, '\V' . xp.lft . '\|' . xp.rt, '', 'g' )
+		let tmplObj.setting.postFilters[name] = xpt#flt#New(-indentNr,repeatPart)
+		let bef .= symbol
+		let rest = substitute(rest, repPtn, '', '')
+		let tmpl = bef . rest
+	endwhile
+	return tmpl
+endfunction
+fun! s:GetIndentBeforeEdge(tmplObj,textBeforeLeftMark)
+	let xp = a:tmplObj.ptn
+	if a:textBeforeLeftMark =~ '\V' . xp.lft . '\_[^' . xp.r . ']\*\%$'
+		let tmpBef = substitute( a:textBeforeLeftMark, '\V' . xp.lft . '\_[^' . xp.r . ']\*\%$', '', '' )
+		let indentOfFirstLine = matchstr( tmpBef, '.*\n\zs\s*' )
+	else
+		let indentOfFirstLine = matchstr( a:textBeforeLeftMark, '.*\n\zs\s*' )
+	endif
+	return len(indentOfFirstLine)
+endfunction
+fun! s:ParseQuotedPostFilter(tmplObj)
+	let xp = a:tmplObj.ptn
+	let postFilters = a:tmplObj.setting.postFilters
+	let quoter = a:tmplObj.setting.postQuoter
+	let flagPattern = '\V\[!]\$'
+	let startPattern = '\V\_.\{-}\zs' . xp.lft . '\_[^' . xp.r . ']\*' . quoter.start . xp.rt
+	let endPattern = '\V' . xp.lft . quoter.end . xp.rt
+	let snip = a:tmplObj.snipText
+	let stack = []
+	let startPos = 0
+	while startPos != -1
+	  let startPos = match(snip,startPattern,startPos)
+	  if startPos != -1
+		  call add(stack,startPos)
+		  let startPos += len(matchstr(snip,startPattern,startPos))
+	  endif
+	endwhile
+	while 1
+		if empty(stack)
+		  break
+		endif
+		let startPos = remove(stack,-1)
+		let endPos = match(snip,endPattern,startPos + 1)
+		if endPos == -1
+			break
+		endif
+		let startText = matchstr(snip,startPattern,startPos)
+		let endText = matchstr(snip,endPattern,endPos)
+		let name = startText[1 : -1 - len(quoter.start) - 1]
+		let flag = matchstr(name,flagPattern)
+		if flag != ''
+			let name = name[: -1 - len(flag)]
+		endif
+		if name =~ xp.lft
+			let name = matchstr( name, '\V' . xp.lft . '\zs\_.\*' )
+			if name =~ xp.lft
+				let name = matchstr( name, '\V\_.\*\ze' . xp.lft )
+			endif
+		endif
+		let plainPostFilter = snip[startPos + len(startText) : endPos - 1]
+		let firstLineIndentNr = s:GetIndentBeforeEdge(a:tmplObj,snip[: startPos - 1])
+		if flag == '!'
+			let plainPostFilter = 'BuildIfChanged(' . string( plainPostFilter ) . ')'
+		else
+			let plainPostFilter = 'BuildIfNoChange(' . string( plainPostFilter ) . ')'
+		endif
+		let postFilters[name] = xpt#flt#New(-firstLineIndentNr,plainPostFilter)
+		let snip = snip[: startPos + len(startText) - 1 - 1 - len(quoter.start) - len(flag)] . snip[endPos + len(endText) - 1 :]
+	endwhile
+	return snip
+endfunction
+fun! s:BuildSnippet(nameStartPosition,nameEndPosition)
+	call getchar(0)
+	let x = b:xptemplateData
+	let ctx = b:xptemplateData.renderContext
+	let xp = ctx.snipObject.ptn
+	let curline = getline(a:nameStartPosition[0])
+	let nIndent = -1
+	if len( matchstr( curline, '\V\^\s\*' ) ) == a:nameStartPosition[ 1 ] - 1
+		if has_key(ctx.oriIndentkeys,ctx.snipObject.name) || has_key(ctx.leadingCharToReindent,ctx.snipObject.name)
+			if a:nameStartPosition == a:nameEndPosition
+				call XPreplace(a:nameStartPosition,a:nameEndPosition, ctx.snipObject.name, { 'doJobs' : 0 } )
+			endif
+			let nIndent = XPT#getPreferedIndentNr(a:nameStartPosition[0])
+			if a:nameStartPosition == a:nameEndPosition
+				call XPreplace(a:nameStartPosition,[a:nameEndPosition[0], a:nameEndPosition[1] + len(ctx.snipObject.name)], '', { 'doJobs' : 0 } )
+			endif
+		endif
+	endif
+	let ctx.phase = 'rendering'
+	if ctx.snipSetting.iswrap && x.wrap isnot ''
+		let setting = ctx.snipSetting
+		let setting.preValues[ setting.wrap ] = xpt#flt#New( 0, 'GetWrappedText()' )
+		let setting.defaultValues[ setting.wrap ] = xpt#flt#New( 0, "Next()", 1 )
+		call insert(setting.comeFirst,setting.wrap,0)
+	endif
+	if x.wrap isnot ''
+		let ctx.wrap = copy(x.wrap)
+	endif
+	let snippetText = ctx.snipObject.snipText
+	let currentNIndent = XPT#getIndentNr(a:nameStartPosition[0],a:nameStartPosition[1])
+	let nIndentToAdd = currentNIndent
+	if nIndent >= 0
+		if nIndent > currentNIndent
+			let snippetText = repeat( ' ', nIndent - currentNIndent ) . snippetText
+			let nIndentToAdd = nIndent
+		elseif nIndent < currentNIndent
+			let snippetText = repeat( ' ', nIndent ) . snippetText
+			let nIndentToAdd = nIndent
+			let a:nameStartPosition[1] = 1
+		endif
+	endif
+	let snippetText = xpt#indent#ToActualIndentStr(snippetText,nIndentToAdd)
+	call XPMupdate()
+	call XPMadd( ctx.marks.tmpl.start, a:nameStartPosition, g:XPMpreferLeft, '\Ve\$' )
+	call XPMadd( ctx.marks.tmpl.end, a:nameEndPosition, g:XPMpreferRight, '\Ve\$' )
+	call xpt#settingswitch#Switch(b:xptemplateData.settingWrap)
+	call XPMsetLikelyBetween(ctx.marks.tmpl.start,ctx.marks.tmpl.end)
+	call XPreplace(a:nameStartPosition,a:nameEndPosition,snippetText)
+	let ctx.firstList = []
+	let ctx.itemList = []
+	let ctx.lastList = []
+	if 0 > s:BuildPlaceHolders(ctx.marks.tmpl)
+		return s:Crash()
+	endif
+	let ctx = empty(x.stack) ? x.renderContext : x.stack[0]
+	let rg = XPMposList(ctx.marks.tmpl.start,ctx.marks.tmpl.end)
+	exe 'silent! ' . rg[0][0] . ',' . rg[1][0] . 'foldopen!'
+endfunction
+fun! s:GetNameInfo(end)
+	let x = b:xptemplateData
+	let xp = x.renderContext.snipObject.ptn
+	if getline(".")[col(".") - 1] != xp.l
+		throw "cursor is not at item start position:".string(getpos(".")[1:2])
+	endif
+	let endn = a:end[0] * 10000 + a:end[1]
+	let l0 = getpos(".")[1:2]
+	let r0 = searchpos(xp.rt, 'nW')
+	let r0n = r0[0] * 10000 + r0[1]
+	if r0 == [0,0] || r0n >= endn
+		return [[0,0],[0,0],[0,0],[0,0]]
+	endif
+	let l1 = searchpos(xp.lft, 'W')
+	let l2 = searchpos(xp.lft, 'W')
+	let l1n = l1[0] * 10000 + l1[1]
+	let l2n = l2[0] * 10000 + l2[1]
+	if l1n > r0n || l1n >= endn
+		let l1 = [0,0]
+	endif
+	if l2n > r0n || l1n >= endn
+		let l2 = [0,0]
+	endif
+	if l1 != [0,0] && l2 != [0,0]
+		return [l0,l1,l2,r0]
+	elseif l1 == [0,0] && l2 == [0,0]
+		return [l0,l0,r0,r0]
+	else
+		return [l0,l1,r0,r0]
+	endif
+endfunction
+fun! s:GetValueInfo(end)
+	let x = b:xptemplateData
+	let xp = x.renderContext.snipObject.ptn
+	if getline(".")[col(".") - 1] != xp.r
+		throw "cursor is not at item end position:".string(getpos(".")[1:2])
+	endif
+	let nEnd = a:end[0] * 10000 + a:end[1]
+	let r0 = [ line( "." ), col( "." ) ]
+	let l0 = searchpos(xp.lft, 'nW', a:end[0])
+	if l0 == [0,0]
+		let l0n = nEnd
+	else
+		let l0n = min([l0[0] * 10000 + l0[1],nEnd])
+	endif
+	let r1 = searchpos(xp.rt, 'W', a:end[0])
+	if r1 == [0,0] || r1[0] * 10000 + r1[1] >= l0n
+		return [r0,copy(r0),copy(r0)]
+	endif
+	let r2 = searchpos(xp.rt, 'W', a:end[0])
+	if r2 == [0,0] || r2[0] * 10000 + r2[1] >= l0n
+		return [r0,r1,copy(r1)]
+	endif
+	return [r0,r1,r2]
+endfunction
+fun! s:TextWithoutIndent(posRange)
+	let [s,e] = a:posRange
+	let text = xpt#util#TextBetween([s,e])
+	let text = xpt#indent#ToSpace(text)
+	let nIndent = xpt#indent#IndentBefore(s)
+	let text = xpt#indent#RemoveIndentStr(text,nIndent)
+	return text
+endfunction
+fun! s:CreatePlaceHolder(ctx,nameInfo,valueInfo)
+	let xp = a:ctx.snipObject.ptn
+	let toescape = xp.l . xp.r
+	let leftEdge = s:TextWithoutIndent(a:nameInfo[0 : 1])
+	let name = s:TextWithoutIndent(a:nameInfo[1 : 2])
+	let rightEdge = s:TextWithoutIndent(a:nameInfo[2 : 3])
+	let [leftEdge,name,rightEdge] = [leftEdge[1 :],name[1 :],rightEdge[1 :]]
+	let leftEdge = xpt#util#UnescapeChar(leftEdge,toescape)
+	let name = xpt#util#UnescapeChar(name,toescape)
+	let rightEdge = xpt#util#UnescapeChar(rightEdge,toescape)
+	let fullname = leftEdge . name . rightEdge
+	let incPattern = '\V\^:\zs\.\*\ze:\$\|\^Include:\zs\.\*\$'
+	if name =~ incPattern
+		return { 'include' : matchstr( name, incPattern ) }
+	endif
+	if name =~ '\V' . xp.item_var . '\|' . xp.item_func
+		return { 'value' : fullname, 'leftEdge':leftEdge, 'name':name, 'rightEdge':rightEdge, }
+	endif
+	let placeHolder = { 'name':name, 'isKey':(a:nameInfo[0] != a:nameInfo[1]), }
+	if placeHolder.isKey
+		call extend(placeHolder,{ 'leftEdge':leftEdge, 'rightEdge':rightEdge, 'fullname':fullname, }, 'force' )
+	endif
+	if a:valueInfo[1] != a:valueInfo[0]
+		let isPostFilter = a:valueInfo[1][0] == a:valueInfo[2][0] && a:valueInfo[1][1] + 1 == a:valueInfo[2][1]
+		let val = xpt#util#TextBetween(a:valueInfo[0 : 1])
+		let val = val[1:]
+		let val = xpt#util#UnescapeChar(val,xp.l . xp.r)
+		let nIndent = indent(a:valueInfo[0][0])
+		if isPostFilter
+			if name =~ s:expandablePattern
+				let val = xpt#util#UnescapeChar( val, '{$( ' )
+				let val = 'BuildIfNoChange(' . string( val ) . ')'
+			endif
+			let placeHolder.postFilter = xpt#flt#New(-nIndent,val)
+		else
+			let placeHolder.ontimeFilter = xpt#flt#New(-nIndent,val)
+		endif
+	endif
+	return placeHolder
+endfunction
+fun! s:BuildMarksOfPlaceHolder(item,placeHolder,nameInfo,valueInfo)
+	let renderContext = b:xptemplateData.renderContext
+	let [item,placeHolder,nameInfo,valueInfo] = [a:item,a:placeHolder,a:nameInfo,a:valueInfo]
+	if item.name == ''
+		let markName =  '``' . s:anonymouseIndex
+		let s:anonymouseIndex += 1
+	else
+		let markName =  item.name . s:buildingSeqNr . '`' . ( placeHolder.isKey ? 'k' : (len(item.placeHolders)-1) )
+	endif
+	let markPre = renderContext.markNamePre . markName . '`'
+	call extend(placeHolder,{ 'mark':{ 'start':markPre . 'os', 'end':markPre . 'oe', }, }, 'force' )
+	if placeHolder.isKey
+		call extend(placeHolder,{ 'editMark':{ 'start':markPre . 'is', 'end':markPre . 'ie', }, }, 'force' )
+		let placeHolder.innerMarks = placeHolder.editMark
+	else
+		let placeHolder.innerMarks = placeHolder.mark
+	endif
+	let valueInfo[2][1] += 1
+	if placeHolder.isKey
+		let shift = (nameInfo[0] != nameInfo[1] && nameInfo[0][0] == nameInfo[1][0])
+		let nameInfo[1][1] -= shift
+		let shift = (nameInfo[1][0] == nameInfo[2][0]) * (shift + 1)
+		let nameInfo[2][1] -= shift
+		if nameInfo[2] != nameInfo[3]
+			let shift = (nameInfo[2][0] == nameInfo[3][0]) * (shift + 1)
+			let nameInfo[3][1] -= shift
+		endif
+		call XPreplaceInternal(nameInfo[0],valueInfo[2],placeHolder.fullname)
+	else
+		if nameInfo[0][0] == nameInfo[3][0]
+			let nameInfo[3][1] -= 1
+		endif
+		call XPreplaceInternal(nameInfo[0],valueInfo[2],placeHolder.name)
+	endif
+	call XPMadd( placeHolder.mark.start, nameInfo[0], 'l' )
+	if placeHolder.isKey
+		call XPMadd( placeHolder.editMark.start, nameInfo[1], 'l' )
+		call XPMadd( placeHolder.editMark.end,   nameInfo[2], 'r' )
+	endif
+	call XPMadd( placeHolder.mark.end,   nameInfo[3], 'r' )
+endfunction
+fun! s:AddItemToRenderContext(ctx,item)
+	let [ctx,item] = [a:ctx,a:item]
+	let exist = has_key(ctx.itemDict,item.name)
+	if item.name != ''
+		let ctx.itemDict[item.name] = item
+	endif
+	if exist
+		return
+	endif
+	if ctx.phase != 'rendering'
+		if ! s:AddToOrderList(ctx.firstList,item)
+			call add(ctx.firstList,item)
+		endif
+		call filter( ctx.itemList, 'v:val isnot item' )
+		return
+	endif
+	if item.name == ''
+		call add(ctx.itemList,item)
+	elseif s:AddToOrderList(ctx.firstList,item) || s:AddToOrderList(ctx.lastList,item)
+		return
+	else
+		call add(ctx.itemList,item)
+	endif
+endfunction
+fun! s:AddToOrderList(list,item)
+	let i = index(a:list,a:item.name)
+	if i != -1
+		let a:list[i] = a:item
+		return 1
+	else
+		return 0
+	endif
+endfunction
+fun! s:BuildPlaceHolders(markRange)
+	let s:buildingSeqNr += 1
+	let rc = 0
+	let x = b:xptemplateData
+	let renderContext = b:xptemplateData.renderContext
+	let snipObj = renderContext.snipObject
+	let setting = snipObj.setting
+	let xp = renderContext.snipObject.ptn
+	let renderContext.itemDict = {}
+	let current = [renderContext.item,renderContext.leadingPlaceHolder]
+	let renderContext.action = 'build'
+	if renderContext.firstList == []
+		let renderContext.firstList = copy(renderContext.snipSetting.comeFirst)
+	endif
+	if renderContext.lastList == []
+		let renderContext.lastList = copy(renderContext.snipSetting.comeLast)
+	endif
+	let renderContext.buildingMarkRange = copy(a:markRange)
+	call XPRstartSession()
+	call XPMgoto(a:markRange.start)
+	let i = 0
+	while i < 10000
+		let i += 1
+		let markPos = s:NextLeftMark(a:markRange)
+		let end = XPMpos(a:markRange.end)
+		let nEnd = end[0] * 10000 + end[1]
+		if markPos == [0,0] || markPos[0] * 10000 + markPos[1] >= nEnd
+			break
+		endif
+		let nameInfo = s:GetNameInfo(end)
+		if nameInfo[0] == [0,0]
+			break
+		endif
+		call cursor(nameInfo[3])
+		let valueInfo = s:GetValueInfo(end)
+		if valueInfo[0] == [0,0]
+			break
+		endif
+		let placeHolder = s:CreatePlaceHolder(renderContext,nameInfo,valueInfo)
+		let rc = 1
+		if renderContext.wrap != {} && setting.iswrap && get( placeHolder, 'name', 0 ) is setting.wrap && get( placeHolder, 'isKey', 0 )
+			let n = len(renderContext.wrap.lines) - 1
+			let indent = repeat( ' ', virtcol( nameInfo[ 0 ] ) - 1 )
+			let line = "\n" . indent . xp.l . placeHolder.leftEdge . xp.l . 'GetWrappedText()' . xp.l . placeHolder.rightEdge . xp.r
+			let lines = repeat(line,n)
+			let pos = copy(valueInfo[-1])
+			let pos[1] += 1
+			call XPreplaceInternal(pos,pos,lines)
+		endif
+		if has_key( placeHolder, 'include' )
+			call s:ApplyBuildTimeInclusion(placeHolder,nameInfo,valueInfo)
+			call cursor(nameInfo[0])
+		elseif has_key( placeHolder, 'value' )
+			let to_build = s:ApplyInstantValue(placeHolder,nameInfo,valueInfo)
+			if to_build
+				call cursor(nameInfo[0])
+			endif
+		else
+			let item = s:BuildItemForPlaceHolder(placeHolder)
+			call s:BuildMarksOfPlaceHolder(item,placeHolder,nameInfo,valueInfo)
+			let renderContext.item = item
+			let renderContext.leadingPlaceHolder = item.keyPH == s:nullDict ? placeHolder : item.keyPH
+			call s:EvaluateEdge(xp,item,placeHolder)
+			call s:ApplyPreValues(placeHolder)
+			call xpt#rctx#AddDefaultPHFilters(renderContext,placeHolder)
+			call cursor(XPMpos(placeHolder.mark.end))
+		endif
+	endwhile
+	let renderContext.itemList = renderContext.firstList + renderContext.itemList + renderContext.lastList
+	call filter( renderContext.itemList, 'type(v:val) != 1' )
+	let renderContext.firstList = []
+	let renderContext.lastList = []
+	let end = XPMpos(a:markRange.end)
+	call cursor(end)
+	let [renderContext.item,renderContext.leadingPlaceHolder] = current
+	let renderContext.action = ''
+	call XPRendSession()
+	return rc
+endfunction
+fun! s:NextLeftMark(markRange)
+	let x = b:xptemplateData
+	let renderContext = x.renderContext
+	let xp = renderContext.snipObject.ptn
+	let curline = getline( line(".") )
+	let c = col(".")
+	if len(curline) > 1 && curline[c - 1] == xp.l
+		return [ line("."), c ]
+	endif
+	while 1
+		let end = XPMpos(a:markRange.end)
+		let nEnd = end[0] * 10000 + end[1]
+		let ptn = xpt#util#CharsPattern(xp.l . xp.r)
+		let markPos = searchpos( '\V\\\*' . ptn, 'cW' )
+		if markPos == [0,0] || markPos[0] * 10000 + markPos[1] >= nEnd
+			break
+		endif
+		let content = getline(markPos[0])[markPos[1] - 1 :]
+		let char = matchstr( content, '\V' . ptn )
+		let content = matchstr( content, '^\\*' )
+		let newEsc = repeat( '\', len( content ) / 2 )
+		call XPreplaceInternal( markPos, [ markPos[0], markPos[1] + len( content ) ], newEsc, { 'doPostJob' : 1 } )
+		if len(content) % 2 == 0 && char == xp.l
+			call cursor([markPos[0],markPos[1] + len(newEsc)])
+			break
+		endif
+		call cursor([markPos[0],markPos[1] + len(newEsc) + 1])
+	endwhile
+	return markPos
+endfunction
+fun! s:EvaluateEdge(xp,item,ph)
+	if !a:ph.isKey
+		return
+	endif
+	let eval_ptn = '\V' . a:xp.item_var . '\|' . a:xp.item_func
+	if a:ph.leftEdge =~ eval_ptn
+		let a:ph.leftEdge = s:EvalAsFilter(a:ph.leftEdge, XPMpos(a:ph.mark.start))
+		call XPreplaceByMarkInternal(a:ph.mark.start,a:ph.editMark.start, a:ph.leftEdge)
+	endif
+	if a:ph.rightEdge =~ eval_ptn
+		let a:ph.rightEdge = s:EvalAsFilter(a:ph.rightEdge, XPMpos(a:ph.editMark.end))
+		call XPreplaceByMarkInternal(a:ph.editMark.end,a:ph.mark.end, a:ph.rightEdge)
+	endif
+	let a:ph.fullname = a:ph.leftEdge . a:item.name . a:ph.rightEdge
+	let a:item.fullname = a:ph.fullname
+endfunction
+fun! s:EvalAsFilter(raw,start_pos)
+	let x = b:xptemplateData
+	let rctx = x.renderContext
+	let flt = xpt#flt#New(0,a:raw)
+	let flt_rst = s:EvalFilter(flt,[ rctx.ftScope.funcs, rctx.snipSetting.variables, ])
+	return s:IndentFilterText(flt_rst,a:start_pos)
+endfunction
+fun! s:IndentFilterText(flt_rst,start)
+	let lines = split( a:flt_rst.text, '\n', 1 )
+	if get(a:flt_rst, 'parseIndent', 1)
+		call xpt#indent#IndentToTab(lines)
+	endif
+	let indent = s:IndentAt(a:start,a:flt_rst)
+	call xpt#indent#ToActualIndent(lines,indent)
+	return join(lines, "\n")
+endfunction
+fun! s:ApplyBuildTimeInclusion(placeHolder,nameInfo,valueInfo)
+	let renderContext = b:xptemplateData.renderContext
+	let tmplDict = renderContext.ftScope.allTemplates
+	let placeHolder = a:placeHolder
+	let nameInfo = a:nameInfo
+	let valueInfo = a:valueInfo
+	let [incName,params] = s:ParseInclusionStatement(renderContext.snipObject,placeHolder.include)
+	if !has_key(tmplDict,incName)
+		call XPT#warn( "unknown inclusion :" . incName )
+		return
+	endif
+	let incTmplObject = tmplDict[incName]
+	call s:ParseSnippet(incTmplObject,renderContext.ftScope)
+	call s:MergeSetting(renderContext.snipSetting,incTmplObject.setting)
+	let incSnip = s:ReplacePHInSubSnip(renderContext.snipObject,incTmplObject,params)
+	let incSnip = s:AddIndent(incSnip,nameInfo[0][1]-1)
+	let valueInfo[-1][1] += 1
+	call XPreplaceInternal(nameInfo[0],valueInfo[-1],incSnip)
+endfunction
+fun! s:ApplyInstantValue(placeHolder,nameInfo,valueInfo)
+	let rctx = b:xptemplateData.renderContext
+	let ph = a:placeHolder
+	let nameInfo = a:nameInfo
+	let valueInfo = a:valueInfo
+	let start = a:nameInfo[0]
+	let combined_flt_rst = {}
+	let text = ''
+	let to_build = 0
+	for k in [ 'leftEdge', 'name', 'rightEdge' ]
+		if ph[k] != ''
+			let flt = xpt#flt#New(0,ph[k])
+			let flt_rst = s:EvalFilter(flt,[ rctx.ftScope.funcs, rctx.snipSetting.variables, ])
+			if flt_rst.rc == 0
+				continue
+			endif
+			let text .= get( flt_rst, 'text', '' )
+			if get(flt_rst, 'nIndent', 0) != 0
+				let combined_flt_rst.nIndent = flt_rst.nIndent
+			endif
+			if flt_rst.action == 'build'
+				let to_build = 1
+			endif
+		endif
+	endfor
+	let valueInfo[-1][1] += 1
+	let combined_flt_rst.text = text
+	let text = s:IndentFilterText(combined_flt_rst,start)
+	call XPreplaceInternal( nameInfo[0], valueInfo[-1], text, { 'doJobs' : 1 } )
+	return to_build
+endfunction
+fun! s:IndentAt(start,flt_rst)
+	let filter_indent_offset = get(a:flt_rst, 'nIndent', 0)
+	let indent = xpt#indent#IndentBefore(a:start)
+	let indent += filter_indent_offset
+	let indent = max([0,indent])
+	return indent
+endfunction
+fun! s:ApplyPreValues(placeHolder)
+	let rctx = b:xptemplateData.renderContext
+	let setting = rctx.snipSetting
+	let name = a:placeHolder.name
+	let preValue = name == '' ? g:EmptyFilter : get(setting.preValues,name,g:EmptyFilter)
+	if preValue is g:EmptyFilter
+		let preValue = get( a:placeHolder, 'ontimeFilter', get(setting.defaultValues,name,g:EmptyFilter))
+	endif
+	if preValue is g:EmptyFilter
+		return
+	endif
+	let flt_rst = s:EvalFilter(preValue,[ rctx.ftScope.funcs, rctx.snipSetting.variables, ])
+	if flt_rst.rc is 0 || ! has_key(flt_rst, 'text')
+		return
+	endif
+	let mark_name = s:GetPHReplacingMarkName(flt_rst)
+	let marks = a:placeHolder[mark_name]
+	let s = XPMpos(marks.start)
+	let text = s:IndentFilterText(flt_rst,s)
+	try
+		call XPreplaceByMarkInternal(marks.start,marks.end,text)
+	catch /.*/
+		call s:Crash( v:exception . " while update preset text" )
+	endtry
+endfunction
+fun! s:BuildItemForPlaceHolder(placeHolder)
+	let renderContext = b:xptemplateData.renderContext
+	if has_key(renderContext.itemDict,a:placeHolder.name)
+		let item = renderContext.itemDict[a:placeHolder.name]
+	else
+		let item = { 'name'         : a:placeHolder.name, 'fullname':a:placeHolder.name, 'initValue':a:placeHolder.name, 'processed':0, 'placeHolders':[], 'keyPH':s:nullDict, 'behavior':{}, }
+	endif
+	let inPrevBuild = (index(renderContext.itemList,item) >= 0)
+	call s:AddItemToRenderContext(renderContext,item)
+	if a:placeHolder.isKey
+		let item.keyPH = a:placeHolder
+		let item.fullname = a:placeHolder.fullname
+	else
+		if renderContext.phase != 'rendering' && inPrevBuild
+			call insert(item.placeHolders,a:placeHolder)
+		else
+			call add(item.placeHolders,a:placeHolder)
+		endif
+	endif
+	return item
+endfunction
+fun! s:XPTvisual()
+	if &selectmode =~ 'cmd'
+		normal! v\<C-g>
+	else
+		normal! v
+	endif
+endfunction
+fun! s:CleanupCurrentItem()
+	let renderContext = b:xptemplateData.renderContext
+	call s:ClearItemMapping(renderContext)
+endfunction
+fun! s:ShiftBackward()
+	let renderContext = b:xptemplateData.renderContext
+	if empty(renderContext.history)
+		return ''
+	endif
+	call s:CleanupCurrentItem()
+	let his = remove(renderContext.history,-1)
+	call s:PushBackItem()
+	let renderContext.item = his.item
+	let renderContext.leadingPlaceHolder = his.leadingPlaceHolder
+	let leader = renderContext.leadingPlaceHolder
+	call XPMsetLikelyBetween(leader.mark.start,leader.mark.end)
+	return s:SelectCurrent()
+endfunction
+fun! s:PushBackItem()
+	let renderContext = b:xptemplateData.renderContext
+	let item = renderContext.item
+	if !renderContext.leadingPlaceHolder.isKey
+		call insert(item.placeHolders,renderContext.leadingPlaceHolder,0)
+	endif
+	call insert(renderContext.itemList,item,0)
+	let item.processed = 1
+endfunction
+fun! s:ShiftForward(action)
+	let x = b:xptemplateData
+	let renderContext = x.renderContext
+	if pumvisible()
+		if XPPhasSession()
+			return XPPend() . "\<C-r>=<SNR>" . s:sid . 'ShiftForward(' . string( a:action ) . ")\<CR>"
+		else
+			if g:xptemplate_move_even_with_pum
+				return s:close_pum . "\<C-r>" . '=XPTforceForward(' . string( a:action ) . ")\<CR>"
+			else
+				if x.canNavFallback
+					let x.fallbacks = [ [ "\<Plug>XPTnavFallback", 'feed' ], [ "\<C-r>=XPTforceForward(" . string( a:action ) . ")\<CR>", 'expr' ], ]
+					return XPT#fallback(x.fallbacks)
+				else
+					return XPPend() . "\<C-r>=<SNR>" . s:sid . 'ShiftForward(' . string( a:action ) . ")\<CR>"
+				endif
+			endif
+		endif
+	else
+		if XPPhasSession()
+			call XPPend()
+		endif
+		return s:close_pum . "\<C-r>" . '=XPTforceForward(' . string( a:action ) . ")\<CR>"
+	endif
+endfunction
+fun! XPTforceForward(action)
+	call XPMupdate('force')
+	if s:XPTupdate() < 0
+		return ''
+	endif
+	if s:FinishCurrent(a:action) < 0
+		return ''
+	endif
+	let postaction = s:GotoNextItem()
+	return postaction
+endfunction
+fun! s:FinishCurrent(action)
+	let renderContext = b:xptemplateData.renderContext
+	let marks = renderContext.leadingPlaceHolder.mark
+	call s:CleanupCurrentItem()
+	let rc = s:XPTupdate()
+	if rc == -1
+		return -1
+	endif
+	let name = renderContext.item.name
+	if a:action ==# 'clear'
+		call XPreplace(XPMpos( marks.start ),XPMpos( marks.end ), '')
+	endif
+	let [post,built] = s:ApplyPostFilter()
+	if name != ''
+		let renderContext.namedStep[name] = post
+	endif
+	if built || a:action ==# 'clear'
+		call s:RemoveCurrentMarks()
+	else
+		let renderContext.history += [{ 'item':renderContext.item, 'leadingPlaceHolder':renderContext.leadingPlaceHolder } ]
+	endif
+	return 0
+endfunction
+fun! s:RemoveCurrentMarks()
+	let renderContext = b:xptemplateData.renderContext
+	let item = renderContext.item
+	let leader = renderContext.leadingPlaceHolder
+	call XPMremoveStartEnd(leader.mark)
+	if has_key( leader, 'editMark' )
+		call XPMremoveStartEnd(leader.editMark)
+	endif
+	for ph in item.placeHolders
+		call XPMremoveStartEnd(ph.mark)
+	endfor
+endfunction
+fun! s:ApplyPostFilter()
+	let rctx = b:xptemplateData.renderContext
+	let rctx.activeLeaderMarks = 'mark'
+	let posts = rctx.snipSetting.postFilters
+	let name = rctx.item.name
+	let leader = rctx.leadingPlaceHolder
+	let marks = rctx.leadingPlaceHolder[rctx.activeLeaderMarks]
+	let rctx.phase = 'post'
+	let typed = xpt#util#TextBetween(XPMposStartEnd(marks))
+	if rctx.item.name != ''
+		let rctx.namedStep[rctx.item.name] = typed
+	endif
+	let groupPostFilter = get(posts,name,g:EmptyFilter)
+	let leaderPostFilter = get( leader, 'postFilter', g:EmptyFilter )
+	let filter = groupPostFilter is g:EmptyFilter ? leaderPostFilter : groupPostFilter
+	let hadBuilt = 0
+	if filter isnot g:EmptyFilter
+		let flt_rst = s:EvalPostFilter(filter,typed,leader)
+		let mark_name = s:GetPHReplacingMarkName(flt_rst)
+		let marks = rctx.leadingPlaceHolder[mark_name]
+		let ori_flt_rst = copy(flt_rst)
+		call XPMsetLikelyBetween(marks.start,marks.end)
+		if flt_rst.rc != 0
+			if has_key( flt_rst, 'text' )
+				if flt_rst.text !=# typed
+					let [start,end] = XPMposStartEnd(marks)
+					if mark_name == 'mark'
+					    call s:RemoveEditMark(leader)
+					endif
+					call xpt#settingswitch#Switch(b:xptemplateData.settingWrap)
+					let text = s:IndentFilterText(flt_rst,start)
+					call XPreplace(start,end,text)
+				endif
+			endif
+			if flt_rst.action == 'build'
+				let rctx.firstList = []
+				let buildrc = s:BuildPlaceHolders(marks)
+				if 0 > buildrc
+					return [s:Crash(),1]
+				endif
+				let hadBuilt = 0 < buildrc
+				let rctx.phase = 'post'
+			endif
+		endif
+	endif
+	if groupPostFilter is g:EmptyFilter
+		call s:UpdateFollowingPlaceHoldersWith(typed,{})
+		return [typed,hadBuilt]
+	else
+		call s:UpdateFollowingPlaceHoldersWith( typed, { 'post' : ori_flt_rst } )
+		if hadBuilt
+			return [typed,hadBuilt]
+		else
+			return [ get(flt_rst, 'text', typed), hadBuilt ]
+		endif
+	endif
+endfunction
+fun! s:RemoveEditMark(ph)
+	if has_key( a:ph, 'editMark' )
+		call XPMremoveStartEnd(a:ph.editMark)
+		let a:ph.innerMarks = a:ph.mark
+		unlet a:ph.editMark
+	endif
+endfunction
+fun! s:EvalPostFilter(filter,typed,leader)
+	let renderContext = b:xptemplateData.renderContext
+	let pos = XPMpos(a:leader.mark.start)
+	let pos[1] = 1
+	let startMark = XPMmarkAfter(pos)
+	let flt_rst = s:EvalFilter(a:filter,[ renderContext.ftScope.funcs, renderContext.snipSetting.variables, { '$UserInput' : a:typed } ] )
+	return flt_rst
+endfunction
+fun! s:GotoNextItem()
+	let action = s:DoGotoNextItem()
+	call xpt#settingswitch#Restore(b:xptemplateData.settingWrap)
+	return action
+endfunction
+fun! s:DoGotoNextItem()
+	let renderContext = b:xptemplateData.renderContext
+	let placeHolder = s:ExtractOneItem()
+	if placeHolder == s:nullDict
+		call cursor(XPMpos(renderContext.marks.tmpl.end))
+		return s:FinishRendering(1)
+	endif
+	let phPos = XPMpos(placeHolder.mark.start)
+	if phPos == [0,0]
+		return s:Crash('failed to find position of mark:' . placeHolder.mark.start)
+	endif
+	let leader = renderContext.leadingPlaceHolder
+	let leaderMark = leader.innerMarks
+	call XPMsetLikelyBetween(leaderMark.start,leaderMark.end)
+	if renderContext.item.processed
+		let renderContext.phase = 'fillin'
+		return s:SelectCurrent()
+	endif
+	let oldRenderContext = renderContext
+	let postaction = s:InitItem()
+	let renderContext = b:xptemplateData.renderContext
+	let leader = renderContext.leadingPlaceHolder
+	if renderContext.processing && empty(renderContext.itemList) && !has_key(renderContext.snipSetting.postFilters,renderContext.item.name) && !has_key( leader, 'postFilter' ) && empty(renderContext.item.placeHolders) && XPMpos(leader.mark.end) == XPMpos(renderContext.marks.tmpl.end) && postaction !~ ''
+		let pp = s:FinishRendering()
+		return postaction
+	endif
+	if !renderContext.processing
+		return postaction
+	endif
+	try
+		call XPMsetLikelyBetween(leader.mark.start,leader.mark.end)
+	catch /.*/
+		return s:Crash()
+	endtry
+	if postaction == ''
+		if oldRenderContext == renderContext || oldRenderContext.level < renderContext.level
+			call cursor(XPMpos(renderContext.leadingPlaceHolder.innerMarks.end))
+		endif
+		return ''
+	else
+		return postaction
+	endif
+endfunction
+fun! s:ExtractOneItem()
+	let renderContext = b:xptemplateData.renderContext
+	let itemList = renderContext.itemList
+	let [renderContext.item,renderContext.leadingPlaceHolder] = [{},{}]
+	if empty(itemList)
+		return s:nullDict
+	endif
+	let item = itemList[0]
+	let renderContext.itemList = renderContext.itemList[1 :]
+	let renderContext.item = item
+	if empty(item.placeHolders) && item.keyPH == s:nullDict
+		call XPT#warn( "item without placeholders!" )
+		return s:nullDict
+	endif
+	if item.keyPH == s:nullDict
+		let renderContext.leadingPlaceHolder = item.placeHolders[0]
+		let item.placeHolders = item.placeHolders[1:]
+	else
+		let renderContext.leadingPlaceHolder = item.keyPH
+	endif
+	return renderContext.leadingPlaceHolder
+endfunction
+fun! s:HandleDefaultValueAction(flt_rst)
+	let x = b:xptemplateData
+	let rctx = x.renderContext
+	let leader = rctx.leadingPlaceHolder
+	if a:flt_rst.action ==# 'expandTmpl'
+		let marks = leader.mark
+		call XPreplace(XPMpos( marks.start ), XPMpos( marks.end ), '')
+		call XPMsetLikelyBetween(marks.start,marks.end)
+		return XPTemplateStart(0, {'startPos' : getpos(".")[1:2], 'tmplName' : a:flt_rst.tmplName})
+	elseif a:flt_rst.action ==# 'pum'
+		return s:DefaultValuePumHandler(rctx,a:flt_rst)
+	elseif a:flt_rst.action ==# 'finishTemplate'
+		return s:ActionFinish(rctx,a:flt_rst)
+	elseif a:flt_rst.action ==# 'build'
+		if s:FillinLeader(a:flt_rst) is s:BROKEN || s:BuildLeaderText(a:flt_rst) is s:BROKEN
+			return s:BROKEN
+		endif
+		return s:GotoNextItem()
+	elseif a:flt_rst.action ==# 'text'
+		if s:FillinLeader(a:flt_rst) is s:BROKEN
+			return s:BROKEN
+		endif
+	else
+		if s:FillinLeader(a:flt_rst) is s:BROKEN
+			return s:BROKEN
+		endif
+	endif
+	if a:flt_rst.nav == 'next'
+		if x.renderContext.processing
+			let postaction =  s:ShiftForward( '' )
+			return postaction
+		else
+			return ''
+		endif
+	endif
+	return s:SelectCurrent()
+endfunction
+fun! s:GetLeaderOpPos(flt_rst)
+	let marks = s:GetLeaderOpMarks(a:flt_rst)
+	let [s,e] = XPMposStartEnd(marks)
+	return [s,e]
+endfunction
+fun! s:GetLeaderOpMarks(flt_rst)
+	let rctx = b:xptemplateData.renderContext
+	let mark_name = s:GetPHReplacingMarkName(a:flt_rst)
+	return rctx.leadingPlaceHolder[mark_name]
+endfunction
+fun! s:GetPHReplacingMarkName(flt_rst)
+	let rctx = b:xptemplateData.renderContext
+	let mark_name = get(a:flt_rst, 'marks')
+	if mark_name is 0
+		let mark_name = xpt#rctx#DefaultMarks(rctx)
+	endif
+	return mark_name
+endfunction
+fun! s:ActionFinish(renderContext,flt_rst)
+	let rctx = b:xptemplateData.renderContext
+	let [start,end] = s:GetLeaderOpPos(a:flt_rst)
+	if start[0] != 0 && end[0] != 0
+		if a:flt_rst.rc isnot 0
+			if has_key( a:flt_rst, 'text' )
+				let text = s:IndentFilterText(a:flt_rst,start)
+				call XPreplace(start,end,text)
+			endif
+		endif
+	endif
+	if s:FinishCurrent( '' ) < 0
+		return ''
+	endif
+	call cursor(XPMpos(rctx.leadingPlaceHolder.mark.end))
+	let xptObj = b:xptemplateData
+	if empty(xptObj.stack) || 1
+		return s:FinishRendering()
+	else
+		return ''
+	endif
+endfunction
+fun! s:FillinLeader(flt_rst)
+	let x = b:xptemplateData
+	let rctx = x.renderContext
+	let mark_name = s:GetPHReplacingMarkName(a:flt_rst)
+	let marks = rctx.leadingPlaceHolder[mark_name]
+	let [s,e] = XPMposStartEnd(marks)
+	if s[0] == 0 || e[0] == 0
+		call s:Crash('leader marks not found:' . string(mark_name))
+		return s:BROKEN
+	endif
+	if a:flt_rst.rc is 0
+		return s:NONE
+	endif
+	if has_key( a:flt_rst, 'text' )
+		call xpt#settingswitch#Switch(b:xptemplateData.settingWrap)
+		let text = s:IndentFilterText(a:flt_rst,s)
+		call XPreplace(s,e,text)
+	endif
+	call s:XPTupdate()
+	return s:DONE
+endfunction
+fun! s:BuildLeaderText(flt_rst)
+	let rctx = b:xptemplateData.renderContext
+	let mark_name = s:GetPHReplacingMarkName(a:flt_rst)
+	let marks = rctx.leadingPlaceHolder[mark_name]
+	if a:flt_rst.action == 'build'
+		let build_rc = s:BuildPlaceHolders(marks)
+		if build_rc is s:BROKEN
+			call s:Crash('building place holder failed')
+		elseif build_rc is s:BUILT
+			call s:RemoveCurrentMarks()
+		end
+		return build_rc
+	end
+	return s:NONE
+endfunction
+fun! s:DefaultValuePumHandler(renderContext,flt_rst)
+	let pumlen = len(a:flt_rst.pum)
+	if pumlen > 1
+		return s:DefaultValueShowPum(a:renderContext,a:flt_rst)
+	endif
+	if pumlen == 0
+		let a:flt_rst.text = ''
+	elseif pumlen == 1
+		let a:flt_rst.text = a:flt_rst.pum[0]
+	endif
+	if s:FillinLeader(a:flt_rst) is s:BROKEN
+		return s:BROKEN
+	endif
+	return s:SelectCurrent()
+endfunction
+fun! s:DefaultValueShowPum(renderContext,flt_rst)
+	let leader = a:renderContext.leadingPlaceHolder
+	let [start,end] = XPMposStartEnd(leader.innerMarks)
+	call XPreplace( start, end, '')
+	call cursor(start)
+	call s:CallPlugin( 'ph_pum', 'before' )
+	let pumsess = XPPopupNew(s:ItemPumCB,{},a:flt_rst.pum)
+	call pumsess.SetAcceptEmpty( get( a:flt_rst, 'acceptEmpty',  g:xptemplate_ph_pum_accept_empty ) )
+	call pumsess.SetOption({ 'tabNav':g:xptemplate_pum_tab_nav } )
+	return pumsess.popup( col("."), { 'doCallback' : 1, 'enlarge' : 0 } )
+endfunction
+fun! s:InitItem()
+	let renderContext = b:xptemplateData.renderContext
+	let currentItem = renderContext.item
+	let leaderMark = renderContext.leadingPlaceHolder.innerMarks
+	let currentItem.initValue = xpt#util#TextBetween(XPMposStartEnd(leaderMark))
+	call xpt#rctx#SwitchPhase(renderContext,s:renderPhase.iteminit)
+	let postaction = s:ApplyDefaultValue()
+	let renderContext = b:xptemplateData.renderContext
+	if renderContext.processing && currentItem == renderContext.item
+		let renderContext.item.initValue = xpt#util#TextBetween(XPMposStartEnd(leaderMark))
+	endif
+	if renderContext.phase == s:renderPhase.iteminit
+		call s:InitItemMapping()
+		call s:InitItemTempMapping()
+		call xpt#rctx#SwitchPhase(renderContext,s:renderPhase.fillin)
+	endif
+	return postaction
+endfunction
+fun! s:ApplyDefaultValue()
+	let rctx = b:xptemplateData.renderContext
+	let leader = rctx.leadingPlaceHolder
+	let defs = rctx.snipSetting.defaultValues
+	if has_key(defs,leader.name) && defs[leader.name].force
+		let filter = defs[leader.name]
+	else
+		let filter = get( leader, 'ontimeFilter', get(defs,leader.name, g:EmptyFilter))
+	endif
+	if filter is g:EmptyFilter
+		call s:XPTupdate()
+		return s:SelectCurrent()
+	endif
+	let rctx.activeLeaderMarks = 'innerMarks'
+	let typed = xpt#util#TextBetween(XPMposStartEnd(leader.innerMarks))
+	let flt_rst = s:EvalFilter(filter,[ rctx.ftScope.funcs, rctx.snipSetting.variables, { '$UserInput': typed } ] )
+	if flt_rst.rc is 0
+		return s:SelectCurrent()
+	endif
+	return s:HandleDefaultValueAction(flt_rst)
+endfunction
+fun! XPTmappingEval(str)
+	if pumvisible()
+		if XPPhasSession()
+			return XPPend() . "\<C-r>=XPTmappingEval(" . string(a:str) . ")\<CR>"
+		else
+			return "\<C-v>\<C-v>\<BS>\<C-r>=XPTmappingEval(" . string(a:str) . ")\<CR>"
+		endif
+	endif
+	let rc = s:XPTupdate()
+	if rc != 0
+		return ''
+	endif
+	let x = b:xptemplateData
+	let typed = xpt#util#TextBetween( XPMposStartEnd( x.renderContext.leadingPlaceHolder.mark))
+	let filter = xpt#flt#New(0,a:str)
+	let flt_rst = s:EvalFilter(filter,[ x.renderContext.ftScope.funcs, x.renderContext.snipSetting.variables, { '$UserInput' : typed } ] )
+	if flt_rst.rc is 0
+		return ''
+	endif
+	let postAction = s:HandleMapAction(flt_rst)
+	return postAction
+endfunction
+fun! s:InitItemMapping()
+	let renderContext = b:xptemplateData.renderContext
+	let mappings = renderContext.snipObject.setting.mappings
+	let item = renderContext.item
+	if has_key(mappings,item.name)
+		call xpt#msvr#Save(mappings[item.name].saver)
+		for [key,mapping] in items(mappings[item.name].keys)
+			exe 'inoremap <silent> <buffer>' key '<C-r>=XPTmappingEval(' string( mapping.text ) ')<CR>'
+		endfor
+	endif
+endfunction
+fun! s:InitItemTempMapping()
+	let renderContext = b:xptemplateData.renderContext
+	let mappings = renderContext.tmpmappings
+	if !has_key( mappings, 'saver' )
+		return
+	endif
+	for keys in mappings.keys
+		call xpt#msvr#Add( mappings.saver, 'i', keys[0] )
+	endfor
+	call xpt#msvr#Save(mappings.saver)
+	for keys in mappings.keys
+		exe 'inoremap <silent> <buffer>' keys[0] '<C-r>=XPTmappingEval(' string( keys[1] ) ')<CR>'
+	endfor
+endfunction
+fun! XPTmapKey(left,right)
+	let renderContext = b:xptemplateData.renderContext
+	let mappings = renderContext.tmpmappings
+	if renderContext.phase != s:renderPhase.iteminit
+		call s:log.Warn( "Not in [iteminit] phase, mapping ingored" )
+		return
+	endif
+	if !has_key( mappings, 'saver' )
+		let mappings.saver = xpt#msvr#New(1)
+		let mappings.keys = []
+	endif
+	call add(mappings.keys,[a:left,a:right])
+endfunction
+fun! s:ClearItemMapping(rctx)
+	let renderContext = a:rctx
+	let mappings = renderContext.tmpmappings
+	if has_key( mappings, 'saver' )
+		call xpt#msvr#Restore(mappings.saver)
+	endif
+	let mappings = renderContext.snipObject.setting.mappings
+	let item = renderContext.item
+	if has_key(mappings,item.name)
+		call xpt#msvr#Restore(mappings[item.name].saver)
+	endif
+endfunction
+fun! s:SelectCurrent()
+	let ph = b:xptemplateData.renderContext.leadingPlaceHolder
+	let marks = ph.innerMarks
+	let [ctl,cbr] = XPMposStartEnd(marks)
+	if ctl == cbr
+		call cursor(ctl)
+		call XPMupdateStat()
+		return ''
+	else
+		call cursor(ctl)
+		call s:XPTvisual()
+		if &l:selection == 'exclusive'
+			call cursor(cbr)
+		else
+			if cbr[1] == 1
+				call cursor( cbr[0] - 1, col( [ cbr[0] - 1, '$' ] ) )
+			else
+				call cursor(cbr[0],cbr[1] - 1)
+			endif
+		endif
+		normal! v
+		if &selectmode =~ 'cmd'
+			call feedkeys( "\<esc>gv", 'nt' )
+		else
+			call feedkeys( "\<esc>gv\<C-g>", 'nt' )
+		endif
+		call XPMupdateStat()
+		return ''
+	endif
+endfunction
+fun! s:EvalFilter(filter,closures)
+	let rctx = b:xptemplateData.renderContext
+	let snip = rctx.snipObject
+	let r = xpt#flt#Eval(snip,a:filter,a:closures)
+	call s:LoadFilterActionSnippet(r)
+	return r
+endfunction
+fun! s:LoadFilterActionSnippet(flt_rst)
+	let renderContext = b:xptemplateData.renderContext
+	if has_key( a:flt_rst, 'snippet' )
+		let allsnip = renderContext.ftScope.allTemplates
+		let snipname = a:flt_rst.snippet
+		if has_key(allsnip,snipname)
+			let snip = allsnip[snipname]
+			call s:ParseSnippet(snip,renderContext.ftScope)
+			call s:MergeSetting(renderContext.snipSetting, snip.setting)
+			let a:flt_rst.text = snip.snipText
+		else
+			call XPT#warn( 'snippet "' . snipname . '" not found' )
+		end
+	end
+endfunction
+fun! s:Goback()
+	let renderContext = b:xptemplateData.renderContext
+	return s:SelectCurrent()
+endfunction
+fun! s:XPTinitMapping()
+	let literal_chars = '' . 'abcdefghijklmnopqrstuvwxyz' . 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' . '1234567890' . '!@#$%^&*()' . '`~-_=+[{]}\;:"'',<.>/?'
+	let literalKeys = split( literal_chars, '\V\s\*' )
+	let literalKeys = map( literalKeys, '"s_".v:val' ) + [ 's_<SPACE>', 's_\|', ]
+	let b:mapSaver = xpt#msvr#New(1)
+	call xpt#msvr#AddList(b:mapSaver, 'i_' . g:xptemplate_nav_next, 's_' . g:xptemplate_nav_next,  'i_' . g:xptemplate_nav_prev, 's_' . g:xptemplate_nav_prev,  's_' . g:xptemplate_nav_cancel, 's_' . g:xptemplate_to_right,  'n_' . g:xptemplate_goback, 'i_' . g:xptemplate_goback,  'i_<CR>',  's_<DEL>', 's_<BS>', )
+	if g:xptemplate_nav_next_2 != g:xptemplate_nav_next
+		call xpt#msvr#AddList(b:mapSaver, 'i_' . g:xptemplate_nav_next_2, 's_' . g:xptemplate_nav_next_2, )
+	endif
+	let b:mapLiteral = xpt#msvr#New(1)
+	call xpt#msvr#AddList(b:mapLiteral,literalKeys)
+	let b:xptemplateData.settingSwitch = xpt#settingswitch#New()
+	call xpt#settingswitch#AddList(b:xptemplateData.settingSwitch, [ '&l:textwidth', '0' ], [ '&l:lazyredraw', '1' ], [ '&l:indentkeys', { 'exe' : 'setl indentkeys-=*<Return>' } ], [ '&l:cinkeys', { 'exe' : 'setl cinkeys-=*<Return>' } ], )
+	let b:xptemplateData.settingWrap = xpt#settingswitch#New()
+	call xpt#settingswitch#Add(b:xptemplateData.settingWrap, '&l:wrap', '1')
+endfunction
+fun! s:XPTCR()
+	let [ l, c ] = [ line( "." ), col( "." ) ]
+	let textFollowing = getline(l)[c - 1 :]
+	if textFollowing !~ '\V\^\s' || !&autoindent
+		return "\<CR>"
+	else
+		let spaces = matchstr( textFollowing, '\V\^\s\+' )
+		return "\<CR>" . spaces . repeat( "\<Left>", len( spaces ) )
+	endif
+endfunction
+fun! s:ApplyMap()
+	let x = b:xptemplateData
+	let renderContext = x.renderContext
+	call xpt#settingswitch#Switch(b:xptemplateData.settingSwitch)
+	call xpt#msvr#Save(b:mapSaver)
+	call xpt#msvr#Save(b:mapLiteral)
+	call xpt#msvr#UnmapAll(b:mapSaver)
+	call xpt#msvr#Literalize( b:mapLiteral, { 'insertAsSelect' : 1 } )
+	exe 'inoremap <silent> <buffer>' g:xptemplate_nav_prev   '<C-v><C-v><BS><C-r>=<SID>ShiftBackward()<CR>'
+	exe 'inoremap <silent> <buffer>' g:xptemplate_nav_next   '<C-r>=<SID>ShiftForward("")<CR>'
+	exe 'snoremap <silent> <buffer>' g:xptemplate_nav_cancel '<Esc>i<C-r>=<SID>ShiftForward("clear")<CR>'
+	exe 'nnoremap <silent> <buffer>' g:xptemplate_goback     'i<C-r>=<SID>Goback()<CR>'
+	exe 'inoremap <silent> <buffer>' g:xptemplate_goback     ' <C-v><C-v><BS><C-r>=<SID>Goback()<CR>'
+	exe 'imap <silent> <buffer> <CR>' g:xptemplate_hook_before_cr . '<Plug>XPT_map_CR'
+	snoremap <silent> <buffer> <Del> <Del>i
+	snoremap <silent> <buffer> <BS> d<BS>
+	if g:xptemplate_nav_next_2 != g:xptemplate_nav_next
+		exe 'inoremap <silent> <buffer>' g:xptemplate_nav_next_2   '<C-v><C-v><BS><C-r>=<SID>ShiftForward("")<CR>'
+		exe 'snoremap <silent> <buffer>' g:xptemplate_nav_next_2   '<Esc>`>a<C-r>=<SID>ShiftForward("")<CR>'
+	endif
+	if &selection == 'inclusive'
+		exe 'snoremap <silent> <buffer>' g:xptemplate_nav_prev   '<Esc>`>a<C-r>=<SID>ShiftBackward()<CR>'
+	exe 'snoremap <silent> <buffer>' g:xptemplate_nav_next   '<Esc>`>a<C-r>=<SID>ShiftForward("")<CR>'
+		exe "snoremap <silent> <buffer> ".g:xptemplate_to_right." <esc>`>a"
+	else
+		exe 'snoremap <silent> <buffer>' g:xptemplate_nav_prev   '<Esc>`>i<C-r>=<SID>ShiftBackward()<CR>'
+	exe 'snoremap <silent> <buffer>' g:xptemplate_nav_next   '<Esc>`>i<C-r>=<SID>ShiftForward("")<CR>'
+		exe "snoremap <silent> <buffer> ".g:xptemplate_to_right." <esc>`>i"
+	endif
+endfunction
+fun! s:ClearMap()
+	call xpt#settingswitch#Restore(b:xptemplateData.settingSwitch)
+	call xpt#msvr#Restore(b:mapLiteral)
+	call xpt#msvr#Restore(b:mapSaver)
+endfunction
+fun! XPTbufData()
+	if !exists( 'b:xptemplateData' )
+		call XPTemplateInit()
+	endif
+	return b:xptemplateData
+endfunction
+fun! XPTnewSnipScope(filename)
+	let sf = xpt#snipfile#New(a:filename)
+	let b:xptemplateData.snipFileScope = sf
+	return sf
+endfunction
+fun! XPTsnipScope()
+  return b:xptemplateData.snipFileScope
+endfunction
+fun! XPTemplateInit()
+	if exists( 'b:xptemplateData' )
+		return
+	endif
+	call xpt#buf#New()
+	call XPMsetBufSortFunction( function( 'XPTmarkCompare' ) )
+	call s:XPTinitMapping()
+endfunction
+fun! s:SynNameStack(l,c)
+	if exists( '*synstack' )
+		let ids = synstack(a:l,a:c)
+		if empty(ids)
+			return []
+		endif
+		let names = []
+		for id in ids
+			let names = names + [synIDattr(id, "name")]
+		endfor
+		return names
+	else
+		return [synIDattr( synID( a:l, a:c, 0 ), "name" )]
+	endif
+endfunction
+fun! s:UpdateFollowingPlaceHoldersWith(contentTyped,option)
+	let renderContext = b:xptemplateData.renderContext
+	let useGroupPost = renderContext.phase == 'post' && has_key( a:option, 'post' )
+	if useGroupPost
+		let group_flt_rst = a:option.post
+	endif
+	call XPRstartSession()
+	let phList = renderContext.item.placeHolders
+	try
+		for ph in phList
+			let flt = renderContext.phase == 'post' ? get( ph, 'postFilter', get( ph, 'ontimeFilter',  g:EmptyFilter ) ) : get( ph, 'ontimeFilter', g:EmptyFilter )
+			let phStartPos = XPMpos(ph.mark.start)
+			let [phln,phcol] = phStartPos
+			if flt isnot g:EmptyFilter
+				let flt_rst = s:EvalFilter(flt,[ renderContext.ftScope.funcs, renderContext.snipSetting.variables, { '$UserInput' : a:contentTyped } ] )
+			elseif useGroupPost
+				let flt_rst = copy(group_flt_rst)
+			else
+				let flt_rst = { 'nIndent': -XPT#getIndentNr( phln, phcol ), 'text':a:contentTyped }
+			endif
+			let flttext = s:IndentFilterText(flt_rst,phStartPos)
+			let text = xpt#util#TextBetween(XPMposStartEnd(ph.mark))
+			if text !=# flttext
+				call XPreplaceByMarkInternal(ph.mark.start,ph.mark.end,flttext)
+			endif
+		endfor
+	catch /.*/
+		call XPT#error(v:exception)
+	finally
+		call XPRendSession()
+	endtry
+endfunction
+fun! s:Crash(...)
+	let msg = "XPTemplate session ends: " . join( a:000, "\n" )
+	call XPPend()
+	let x = b:xptemplateData
+	call s:ClearItemMapping(x.renderContext)
+	while !empty(x.stack)
+		let rctx = remove(x.stack,-1)
+		call s:ClearItemMapping(rctx)
+	endwhile
+	call s:ClearMap()
+	let x.stack = []
+	let x.renderContext = xpt#rctx#New(x)
+	call XPMflushWithHistory()
+	call XPT#warn(msg)
+	call s:CallPlugin( 'finishAll', 'after' )
+	return ''
+endfunction
+fun! s:XPTupdateTyping()
+	let rc = s:XPTupdate()
+	if rc != 0
+		return rc
+	endif
+	let renderContext = b:xptemplateData.renderContext
+	if 'fillin' != renderContext.phase
+		return rc
+	endif
+	let leader = renderContext.leadingPlaceHolder
+	let ontypeFilters = renderContext.snipSetting.ontypeFilters
+	let flt = get(ontypeFilters,leader.name,g:EmptyFilter)
+	if flt isnot g:EmptyFilter
+		call s:HandleOntypeFilter(flt)
+	endif
+	return rc
+endfunction
+fun! s:HandleOntypeFilter(filter)
+	let renderContext = b:xptemplateData.renderContext
+	let leader = renderContext.leadingPlaceHolder
+	let [start,end] = XPMposStartEnd(leader.mark)
+	let contentTyped = xpt#util#TextBetween([start,end])
+	let flt_rst = s:EvalFilter(a:filter,[ renderContext.ftScope.funcs, renderContext.snipSetting.variables, { '$UserInput' : contentTyped } ] )
+	if 0 is flt_rst.rc
+		return
+	endif
+	if has_key( flt_rst, 'action' )
+		call s:HandleOntypeAction(renderContext,flt_rst)
+	endif
+endfunction
+fun! s:HandleOntypeAction(renderContext,flt_rst)
+	let postaction = s:HandleAction(a:flt_rst)
+	if '' != postaction
+		call feedkeys( postaction, 'n' )
+	endif
+endfunction
+fun! s:HandleMapAction(flt_rst)
+	let rctx = b:xptemplateData.renderContext
+	if a:flt_rst.action == 'finishTemplate'
+		let postaction = s:ActionFinish(rctx,a:flt_rst)
+		return postaction
+	elseif a:flt_rst.action == ''
+	endif
+	let postaction = get(a:flt_rst, 'text', '')
+	if a:flt_rst.nav == 'next'
+		if rctx.processing
+			let postaction .=  s:ShiftForward( '' )
+			return postaction
+		else
+			return ''
+		endif
+	endif
+	return postaction
+endfunction
+fun! s:HandleAction(flt_rst)
+	let rctx = b:xptemplateData.renderContext
+	let [s,e] = s:GetLeaderOpPos(a:flt_rst)
+	let postaction = ''
+	if a:flt_rst.action == 'text'
+		if has_key( a:flt_rst, 'text' )
+			call XPreplace(s,e,a:flt_rst.text)
+		endif
+	elseif a:flt_rst.action == 'finishTemplate'
+		let postaction = s:ActionFinish(rctx,a:flt_rst)
+		return postaction
+	elseif a:flt_rst.action == ''
+	endif
+	if a:flt_rst.nav == 'next'
+		if rctx.processing
+			let postaction =  s:ShiftForward( '' )
+			return postaction
+		else
+			return ''
+		endif
+	endif
+	return postaction
+endfunction
+fun! s:IsUpdateCondition(renderContext)
+	if a:renderContext.phase == 'uninit'
+		call XPMflushWithHistory()
+		return 0
+	endif
+	if !a:renderContext.processing
+		call XPMupdate()
+		return 0
+	endif
+	return 1
+endfunction
+fun! s:UpdateMarksAccordingToLeaderChanges(renderContext)
+	let leaderMark = a:renderContext.leadingPlaceHolder.mark
+	let innerMarks = a:renderContext.leadingPlaceHolder.innerMarks
+	let [start,end] = XPMposList(leaderMark.start,leaderMark.end)
+	if start[0] == 0 || end[0] == 0
+		throw 'XPM:mark_lost:' . string( start[0] == 0 ? leaderMark.start : leaderMark.end )
+	endif
+	if XPMhas(innerMarks.start,innerMarks.end)
+		call XPMsetLikelyBetween(innerMarks.start,innerMarks.end)
+	else
+		call XPMsetLikelyBetween(leaderMark.start,leaderMark.end)
+	endif
+	let rc = XPMupdate()
+	if a:renderContext.phase == 'fillin'
+		if rc is g:XPM_RET.updated || (type(rc) == type([]) && (rc[0] != leaderMark.start && rc[0] != innerMarks.start || rc[1] != leaderMark.end && rc[1] != innerMarks.end))
+			if g:xptemplate_strict == 2
+				throw 'XPT:changes outside of place holder'
+			elseif g:xptemplate_strict == 1
+				undo
+				call XPMupdate()
+				call XPT#warn( "editing OUTSIDE place holder is not allowed whne g:xptemplate_strict=1, use " . g:xptemplate_goback . " to go back" )
+				return g:XPT_RC.canceled
+			else
+			endif
+		endif
+	endif
+	return rc
+endfunction
+fun! s:XPTupdate()
+	call XPTemplateInit()
+	let renderContext = b:xptemplateData.renderContext
+	if !s:IsUpdateCondition(renderContext)
+		return 0
+	endif
+	try
+		let rc = s:UpdateMarksAccordingToLeaderChanges(renderContext)
+		if g:XPT_RC.canceled is rc
+			return 0
+		endif
+		call s:DoUpdate(renderContext,rc)
+		return 0
+	catch /^XP.*/
+		call s:Crash(v:exception)
+		return -1
+	finally
+		call XPMupdateStat()
+	endtry
+endfunction
+fun! s:DoUpdate(renderContext,changeType)
+	let renderContext = a:renderContext
+	let contentTyped = xpt#util#TextBetween(XPMposStartEnd(renderContext.leadingPlaceHolder.mark))
+	call s:CallPlugin("update", 'before')
+	if type(a:changeType) == type([]) || a:changeType is g:XPM_RET.likely_matched || a:changeType is g:XPM_RET.no_updated_made
+		let relPos = s:RecordRelativePosToMark( [ line( '.' ), col( '.' ) ], renderContext.leadingPlaceHolder.mark.start )
+		call s:UpdateFollowingPlaceHoldersWith(contentTyped,{})
+		call s:GotoRelativePosToMark(relPos,renderContext.leadingPlaceHolder.mark.start)
+	else
+	endif
+	call s:CallPlugin('update', 'after')
+	let renderContext.lastContent = contentTyped
+endfunction
+fun! s:DoBreakUndo()
+	if pumvisible()
+		return "\<UP>\<DOWN>"
+	endif
+	return "\<C-g>u"
+endfunction
+inoremap <silent> <Plug>XPTdoBreakUndo <C-r>=<SID>DoBreakUndo()<CR>
+inoremap <silent> <Plug>XPT_map_CR <C-r>=<SID>XPTCR()<CR>
+fun! s:BreakUndo()
+	if mode() != 'i' || pumvisible()
+		return
+	endif
+	let x = b:xptemplateData
+	if x.renderContext.processing
+		call feedkeys( "\<Plug>XPTdoBreakUndo", 'm' )
+	endif
+endfunction
+fun! s:RecordRelativePosToMark(pos,mark)
+	let p = XPMpos(a:mark)
+	if a:pos[0] == p[0]
+		return [0,a:pos[1] - p[1]]
+	else
+		return [a:pos[0] - p[0],a:pos[1]]
+	endif
+endfunction
+fun! s:GotoRelativePosToMark(rPos,mark)
+	let p = XPMpos(a:mark)
+	if a:rPos[0] == 0
+		call cursor(p[0],a:rPos[1] + p[1])
+	else
+		call cursor(p[0] + a:rPos[0],a:rPos[1])
+	endif
+endfunction
+fun! s:XPTcheck()
+	if !exists( 'b:xptemplateData' )
+		call XPTemplateInit()
+	endif
+	let x = b:xptemplateData
+	if x.wrap isnot ''
+		let x.wrapStartPos = 0
+		let x.wrap = ''
+	endif
+	call s:CallPlugin( 'insertenter', 'after' )
+endfunction
+fun! s:GetContextFT()
+	if exists( 'b:XPTfiletypeDetect' )
+		return b:XPTfiletypeDetect()
+	elseif &filetype == ''
+		return 'unknown'
+	else
+		return &filetype
+	endif
+endfunction
+fun! s:GetContextFTObj()
+	let x = b:xptemplateData
+	let ft = s:GetContextFT()
+	call xpt#parser#loadSpecialFiletype(ft)
+	let ftScope = get(x.filetypes,ft,{})
+	return ftScope
+endfunction
+augroup XPT
+	au!
+	au BufEnter * call XPTemplateInit()
+	au InsertEnter * call <SID>XPTcheck()
+	au CursorMoved,CursorMovedI * call <SID>XPTupdateTyping()
+	if g:xptemplate_strict == 1
+		au CursorMovedI * call <SID>BreakUndo()
+	endif
+augroup END
+fun! g:XPTaddPlugin(event,when,func)
+	if has_key(s:plugins,a:event)
+		call add(s:plugins[a:event][a:when],a:func)
+	else
+		throw "XPT does NOT support event:".a:event
+	endif
+endfunction
+let s:plugins = {}
+fun! s:CreatePluginContainer(...)
+	for evt in a:000
+		let s:plugins[evt] = { 'before' : [], 'after' : []}
+	endfor
+endfunction
+call s:CreatePluginContainer( 'start', 'render', 'build', 'finishSnippet', 'finishAll', 'preValue', 'defaultValue', 'ph_pum', 'postFilter', 'initItem', 'nextItem', 'prevItem', 'update', 'insertenter', )
+delfunc s:CreatePluginContainer
+fun! s:CallPlugin(ev,when)
+	let cnt = get(s:plugins,a:ev,{})
+	let evs = get(cnt,a:when,[])
+	if evs == []
+		return
+	endif
+	let x = b:xptemplateData
+	for XPTplug in evs
+		call XPTplug(x,x.renderContext)
+	endfor
+endfunction
+com! XPTreload call XPTreload()
+com! XPTcrash call <SID>Crash()
+let &cpo = s:oldcpo
diff --git a/vim-plugins/bundle/xptemplate/readme-img/400x/browse-and-basic.gif b/vim-plugins/bundle/xptemplate/readme-img/400x/browse-and-basic.gif
new file mode 100644
index 0000000..c57e530
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/400x/browse-and-basic.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/400x/c-ifee.gif b/vim-plugins/bundle/xptemplate/readme-img/400x/c-ifee.gif
new file mode 100644
index 0000000..175ed16
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/400x/c-ifee.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/400x/c-loop-and-wrapper.gif b/vim-plugins/bundle/xptemplate/readme-img/400x/c-loop-and-wrapper.gif
new file mode 100644
index 0000000..ed0214a
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/400x/c-loop-and-wrapper.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/400x/c-macro.gif b/vim-plugins/bundle/xptemplate/readme-img/400x/c-macro.gif
new file mode 100644
index 0000000..3364b97
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/400x/c-macro.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/400x/c-outline.gif b/vim-plugins/bundle/xptemplate/readme-img/400x/c-outline.gif
new file mode 100644
index 0000000..3f611c9
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/400x/c-outline.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/400x/py-class-def.gif b/vim-plugins/bundle/xptemplate/readme-img/400x/py-class-def.gif
new file mode 100644
index 0000000..a52d821
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/400x/py-class-def.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/400x/py-for-inline-cmpl.gif b/vim-plugins/bundle/xptemplate/readme-img/400x/py-for-inline-cmpl.gif
new file mode 100644
index 0000000..6576c03
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/400x/py-for-inline-cmpl.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/400x/py-optional-ph.gif b/vim-plugins/bundle/xptemplate/readme-img/400x/py-optional-ph.gif
new file mode 100644
index 0000000..b26e11d
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/400x/py-optional-ph.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/400x/py-quick-add.gif b/vim-plugins/bundle/xptemplate/readme-img/400x/py-quick-add.gif
new file mode 100644
index 0000000..2aacad7
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/400x/py-quick-add.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/400x/py-try.gif b/vim-plugins/bundle/xptemplate/readme-img/400x/py-try.gif
new file mode 100644
index 0000000..6069747
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/400x/py-try.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/600x/browse-and-basic.gif b/vim-plugins/bundle/xptemplate/readme-img/600x/browse-and-basic.gif
new file mode 100644
index 0000000..3c6acff
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/600x/browse-and-basic.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/600x/c-ifee.gif b/vim-plugins/bundle/xptemplate/readme-img/600x/c-ifee.gif
new file mode 100644
index 0000000..1319685
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/600x/c-ifee.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/600x/c-loop-and-wrapper.gif b/vim-plugins/bundle/xptemplate/readme-img/600x/c-loop-and-wrapper.gif
new file mode 100644
index 0000000..585ba53
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/600x/c-loop-and-wrapper.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/600x/c-macro.gif b/vim-plugins/bundle/xptemplate/readme-img/600x/c-macro.gif
new file mode 100644
index 0000000..8f45948
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/600x/c-macro.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/600x/c-outline.gif b/vim-plugins/bundle/xptemplate/readme-img/600x/c-outline.gif
new file mode 100644
index 0000000..3665938
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/600x/c-outline.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/600x/py-class-def.gif b/vim-plugins/bundle/xptemplate/readme-img/600x/py-class-def.gif
new file mode 100644
index 0000000..9df3fde
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/600x/py-class-def.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/600x/py-for-inline-cmpl.gif b/vim-plugins/bundle/xptemplate/readme-img/600x/py-for-inline-cmpl.gif
new file mode 100644
index 0000000..eb18fbb
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/600x/py-for-inline-cmpl.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/600x/py-optional-ph.gif b/vim-plugins/bundle/xptemplate/readme-img/600x/py-optional-ph.gif
new file mode 100644
index 0000000..f0418b0
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/600x/py-optional-ph.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/600x/py-quick-add.gif b/vim-plugins/bundle/xptemplate/readme-img/600x/py-quick-add.gif
new file mode 100644
index 0000000..65c2d2b
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/600x/py-quick-add.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/600x/py-try.gif b/vim-plugins/bundle/xptemplate/readme-img/600x/py-try.gif
new file mode 100644
index 0000000..d1f5794
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/600x/py-try.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/c-pum-starts-with-f.png b/vim-plugins/bundle/xptemplate/readme-img/c-pum-starts-with-f.png
new file mode 100644
index 0000000..082ecaf
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/c-pum-starts-with-f.png differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/samples/b-box.gif b/vim-plugins/bundle/xptemplate/readme-img/samples/b-box.gif
new file mode 100644
index 0000000..49a5461
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/samples/b-box.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/samples/b-catrom.gif b/vim-plugins/bundle/xptemplate/readme-img/samples/b-catrom.gif
new file mode 100644
index 0000000..5c32fe7
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/samples/b-catrom.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/samples/b-lanczos2.gif b/vim-plugins/bundle/xptemplate/readme-img/samples/b-lanczos2.gif
new file mode 100644
index 0000000..8c14a99
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/samples/b-lanczos2.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/samples/b-lanczos3.gif b/vim-plugins/bundle/xptemplate/readme-img/samples/b-lanczos3.gif
new file mode 100644
index 0000000..3c6acff
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/samples/b-lanczos3.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/samples/b-mitchell.gif b/vim-plugins/bundle/xptemplate/readme-img/samples/b-mitchell.gif
new file mode 100644
index 0000000..4c3f1e9
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/samples/b-mitchell.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/samples/b-mix.gif b/vim-plugins/bundle/xptemplate/readme-img/samples/b-mix.gif
new file mode 100644
index 0000000..b73c0b7
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/samples/b-mix.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/samples/b-sample.gif b/vim-plugins/bundle/xptemplate/readme-img/samples/b-sample.gif
new file mode 100644
index 0000000..49a5461
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/readme-img/samples/b-sample.gif differ
diff --git a/vim-plugins/bundle/xptemplate/readme-img/samples/x.md b/vim-plugins/bundle/xptemplate/readme-img/samples/x.md
new file mode 100644
index 0000000..133c55b
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/readme-img/samples/x.md
@@ -0,0 +1,14 @@
+## b-box.gif
+![](b-box.gif)
+## b-catrom.gif
+![](b-catrom.gif)
+## b-lanczos2.gif
+![](b-lanczos2.gif)
+## b-lanczos3.gif
+![](b-lanczos3.gif)
+## b-mitchell.gif
+![](b-mitchell.gif)
+## b-mix.gif
+![](b-mix.gif)
+## b-sample.gif
+![](b-sample.gif)
diff --git a/vim-plugins/bundle/xptemplate/resource/xptLogo.gif b/vim-plugins/bundle/xptemplate/resource/xptLogo.gif
new file mode 100644
index 0000000..3d1e548
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/resource/xptLogo.gif differ
diff --git a/vim-plugins/bundle/xptemplate/resource/xptLogo.png b/vim-plugins/bundle/xptemplate/resource/xptLogo.png
new file mode 100644
index 0000000..4fafc08
Binary files /dev/null and b/vim-plugins/bundle/xptemplate/resource/xptLogo.png differ
diff --git a/vim-plugins/bundle/xptemplate/resource/xptLogo.svg b/vim-plugins/bundle/xptemplate/resource/xptLogo.svg
new file mode 100644
index 0000000..c9ce167
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/resource/xptLogo.svg
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="xptLogo.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/drdrxp/xptLogo.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3228">
+      <stop
+         id="stop3236"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0.5"
+         id="stop3242" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3238" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-69.40138 : 526.18109 : 1"
+       inkscape:vp_y="8.4469599e-14 : 1000 : 0"
+       inkscape:vp_z="911.39153 : 177.60966 : 1"
+       inkscape:persp3d-origin="443.85222 : 350.78739 : 1"
+       id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3228"
+       id="linearGradient3882"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.5380714,0,0,1.4731251e-2,2448.7314,99.525479)"
+       x1="-734.28571"
+       y1="-636.64789"
+       x2="-688.57141"
+       y2="-636.64789" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3228"
+       id="linearGradient3884"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.5380714,0,0,1.4731249e-2,2982.3045,-611.53389)"
+       x1="-734.28571"
+       y1="-636.64789"
+       x2="-688.57141"
+       y2="-636.64789" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.41783652"
+     inkscape:cx="337.65112"
+     inkscape:cy="293.38515"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1279"
+     inkscape:window-height="999"
+     inkscape:window-x="0"
+     inkscape:window-y="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.4238441px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect2413"
+       width="217.97697"
+       height="217.97697"
+       x="261.5264"
+       y="441.83347"
+       ry="0" />
+    <rect
+       style="fill:#ffffff"
+       id="rect2415"
+       width="123.52029"
+       height="123.52029"
+       x="-57.313179"
+       y="-590.19452"
+       transform="matrix(-0.7071068,0.7071068,-0.7071068,-0.7071068,0,0)"
+       ry="0" />
+    <rect
+       ry="0"
+       transform="matrix(-0.7071068,0.7071068,-0.7071068,-0.7071068,0,0)"
+       y="-837.66309"
+       x="190.1557"
+       height="123.52028"
+       width="123.52028"
+       id="rect2421"
+       style="fill:#ffffff" />
+    <rect
+       style="fill:url(#linearGradient3882);fill-opacity:1"
+       id="rect2448"
+       width="213.06972"
+       height="4.8924856"
+       x="-889.12524"
+       y="91.209953"
+       transform="matrix(-0.7071068,-0.7071068,-0.7071068,0.7071068,0,0)" />
+    <rect
+       transform="matrix(0.7071068,-0.7071068,-0.7071068,-0.7071068,0,0)"
+       y="-619.84998"
+       x="-355.55194"
+       height="4.8924856"
+       width="213.06972"
+       id="rect3244"
+       style="fill:url(#linearGradient3884);fill-opacity:1" />
+    <rect
+       style="fill:#ffffff"
+       id="rect2419"
+       width="123.52028"
+       height="123.52028"
+       x="-39.958038"
+       y="-818.88287"
+       transform="matrix(-0.7071068,0.7071068,-0.7071068,-0.7071068,0,0)"
+       ry="0" />
+    <rect
+       ry="0"
+       transform="matrix(-0.7071068,0.7071068,-0.7071068,-0.7071068,0,0)"
+       y="-832.95605"
+       x="-55.822365"
+       height="114.3708"
+       width="114.3708"
+       id="rect3258"
+       style="fill:#000000" />
+    <rect
+       style="fill:#ffffff"
+       id="rect3256"
+       width="243.20906"
+       height="243.20906"
+       x="-723.79572"
+       y="-679.71436"
+       transform="scale(-1,-1)"
+       ry="0" />
+    <rect
+       ry="0"
+       transform="matrix(-0.7071068,0.7071068,-0.7071068,-0.7071068,0,0)"
+       y="-608.00818"
+       x="170.91666"
+       height="123.52028"
+       width="123.52028"
+       id="rect2417"
+       style="fill:#ffffff" />
+    <rect
+       style="fill:#000000"
+       id="rect3266"
+       width="114.3708"
+       height="114.3708"
+       x="194.06642"
+       y="-585.35474"
+       transform="matrix(-0.7071068,0.7071068,-0.7071068,-0.7071068,0,0)"
+       ry="0" />
+    <rect
+       ry="0"
+       transform="scale(-1,-1)"
+       y="-686.18402"
+       x="-259.51929"
+       height="243.20906"
+       width="243.20906"
+       id="rect3268"
+       style="fill:#ffffff" />
+    <text
+       xml:space="preserve"
+       style="font-size:28.65269279px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+       x="260.45657"
+       y="691.9726"
+       id="text3252"><tspan
+         sodipodi:role="line"
+         id="tspan3254"
+         x="260.45657"
+         y="691.9726">XPTemplate</tspan></text>
+    <g
+       id="g2443"
+       transform="matrix(0.1076722,0,0,0.1076722,503.2351,370.09702)">
+      <path
+         transform="matrix(1,0,0,-1,120,1624.7244)"
+         d="M -482.85712,599.50507 A 230,230 0 1 1 -942.85712,599.50507 A 230,230 0 1 1 -482.85712,599.50507 z"
+         sodipodi:ry="230"
+         sodipodi:rx="230"
+         sodipodi:cy="599.50507"
+         sodipodi:cx="-712.85712"
+         id="path2429"
+         style="fill:#ffffff"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#000000"
+         id="path2431"
+         sodipodi:cx="-712.85712"
+         sodipodi:cy="599.50507"
+         sodipodi:rx="230"
+         sodipodi:ry="230"
+         d="M -482.85712,599.50507 A 230,230 0 1 1 -942.85712,599.50507 A 230,230 0 1 1 -482.85712,599.50507 z"
+         transform="matrix(0.3913043,0,0,-0.3913043,-313.91302,1259.8083)" />
+      <rect
+         ry="68.571426"
+         y="975.21936"
+         x="-822.85718"
+         height="474.28561"
+         width="142.85719"
+         id="rect2433"
+         style="fill:#ffffff" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:61.06483459px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+       x="486.85205"
+       y="485.47595"
+       id="text3294"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3296"
+         x="486.85205"
+         y="485.47595">T</tspan></text>
+  </g>
+</svg>
diff --git a/vim-plugins/bundle/xptemplate/syntax/xpt.vim b/vim-plugins/bundle/xptemplate/syntax/xpt.vim
new file mode 100644
index 0000000..9575df8
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/syntax/xpt.vim
@@ -0,0 +1,231 @@
+fun! s:GetMark()
+
+    let cur = [ line( '.' ), col( '.' ) ]
+
+
+    call cursor( 0, 0 )
+    let lnr = search( '^XPTemplate .*mark=..', 'c' )
+
+    if lnr == 0
+        call cursor ( cur )
+        return ['`', '^', '`^']
+    endif
+
+    let line = getline( lnr )
+
+    let marks = matchstr( line, '\Vmark=\zs\.\.' )
+
+    call cursor ( cur )
+    return [ marks[0:0], marks[1:1], marks ]
+
+endfunction
+
+let s:m = s:GetMark()
+
+let s:escaped = '\%(\\\\\)\*\\'
+let s:nonEscaped =
+      \   '\%('
+      \ .     '\%(\[^\\]\|\^\)'
+      \ .     '\%(\\\\\)\*'
+      \ . '\)'
+      \ . '\@<='
+
+let s:lr_chars = escape(s:m[2], '\]-^')
+
+let s:l = s:nonEscaped . s:m[0]
+let s:r = s:nonEscaped . s:m[1]
+let s:lr = s:nonEscaped . '\[' . s:lr_chars . ']'
+let s:lq = '\%(' . s:l . '\)'
+let s:rq = '\%(' . s:r . '\)'
+
+let s:non_lr_chars = '\[^' . s:lr_chars . ']'
+
+let s:l_escaped = s:escaped . s:m[0]
+let s:r_escaped = s:escaped . s:m[1]
+let s:lr_escaped = s:escaped . '\[' . s:lr_chars . ']'
+
+let s:non_mark_any = '\%(' . s:lr_escaped . '\|' . s:non_lr_chars . '\)\*'
+
+
+setlocal foldmethod=syntax
+
+
+syntax keyword  XPTemplateSnippetKey XPTemplate nextgroup=XPTfileMeta skipwhite
+
+syntax region   XPTfileMeta               start=/./ end=/$/ contained
+syntax match    XPTfileMetaPair           /\w\+=\S*/ containedin=XPTfileMeta
+
+" meta data values
+syntax match    XPTfileMetaValue_mark     /=\S\{2}/ containedin=XPTfileMetaPair
+syntax match    XPTfileMetaValue_priority /=\%(all\|spec\|like\|lang\|sub\|personal\)\?\%([+-]\d*\)\?/ containedin=XPTfileMetaPair
+
+" meta data keys 
+syntax keyword  XPTfileMetaKey_priority   prio[rity] containedin=XPTfileMetaPair nextgroup=XPTfileMetaValue_priority
+syntax keyword  XPTfileMetaKey_mark       mark containedin=XPTfileMetaPair nextgroup=XPTfileMetaValue_mark
+
+
+" ==================================
+" XPTvar command to define variables
+" ==================================
+syntax match    XptVarValue  /.*$/ containedin=XptVarBody
+syntax region   XptVarBody matchgroup=XptVarName start=/\$\w\+/ end=/$/ keepend skipwhite nextgroup=XptVarValue
+syntax keyword  XPTSnippetVar XPTvar nextgroup=XptVarBody skipwhite
+
+
+" ==================
+" XPTinclude command
+" ==================
+syntax match    XptSnippetIncludeItemDir /\%(\w\+\/\)\+/ containedin=XptSnippetIncludeItem
+syntax match    XptSnippetIncludeItemFile /[a-zA-Z0-9_.*]\+\s*$/ containedin=XptSnippetIncludeItem
+syntax match    XptSnippetIncludeItem /[a-zA-Z0-9_.]\+\/.*/ containedin=XptSnippetIncludeBody
+syntax region   XptSnippetIncludeBody start=/^\s*\\/ end=/^\ze\s*[^\\	 ]/ keepend skipwhite
+syntax keyword  XptSnippetInclude     XPTinclude nextgroup=XptSnippetIncludeBody skipnl skipwhite
+syntax keyword  XptSnippetInclude     XPTembed   nextgroup=XptSnippetIncludeBody skipnl skipwhite
+
+
+
+" TODO escaping
+syntax match XPTvariable /\$\w\+/ containedin=XPTmeta_value,XPTmeta_simpleHint,XPTxset_value
+syntax match XPTvariable_quote /{\$\w\+}/ containedin=XPTmeta_value,XPTmeta_simpleHint,XPTxset_value
+
+" TODO escaping, quoted
+syntax region XPTfunction start=/\w\+(/ end=/)/ containedin=XPTmeta_value,XPTmeta_simpleHint,XPTxset_value
+
+
+exe 'syntax match XPTitemPost /\V' . s:non_mark_any . s:rq . '\{1,2}/ contains=XPTmark contained containedin=XPTsnippetBody'
+" XPTitemB for distinguish coherent item
+exe 'syntax match XPTitemB /\V' . s:l . '\_.\{-}' . s:r . '/ contains=XPTmark containedin=XPTsnippetBody nextgroup=XPTitemPost,XPTitem'
+exe 'syntax match XPTitem  /\V' . s:l . '\_.\{-}' . s:r . '/ contains=XPTmark containedin=XPTsnippetBody nextgroup=XPTitemPost,XPTitemB'
+exe 'syntax match XPTinclusion /\VInclude:\zs\.\{-}\ze' . s:r . '/	contained containedin=XPTitem,XPTitemB'
+exe 'syntax match XPTinclusion /\V:\zs\.\{-}\ze:' . s:r . '/		contained containedin=XPTitem,XPTitemB'
+exe 'syntax match XPTcursor /\V' . s:l . 'cursor' . s:r . '/		contained containedin=XPTitem,XPTitemB'
+exe 'syntax match XPTvariable /\V' . '$\w\+' . '/		contained containedin=XPTitem,XPTitemB'
+exe 'syntax match XPTvariable_quote /\V{' . '$\w\+' . '}/		contained containedin=XPTitem,XPTitemB'
+exe 'syntax match XPTmark /\V' . s:r .  '/ contains=XPTmark containedin=XPTitem,XPTitemB'
+
+" the end pattern is weird.
+" \%(^$)^XPT\s does not work.
+syntax match XPTxset /^XSET\s\+\%(\w\|[.?*]\)\+\([|.]\%(pre\|def\|post\|ontype\)\)\?=.*/ containedin=XPTsnippetBody
+syntax region XPTxsetm start=/^XSETm\s\+/ end=/XSETm END$/ containedin=XPTsnippetBody fold
+syntax keyword XPTkeyword_XSET XSET containedin=XPTxset nextgroup=XPTxset_name1,XPTxset_name2,XPTxset_name3 skipwhite transparent
+" priorities are low to high
+syntax match XPTxset_value /.*/ containedin=XPTxset transparent
+syntax match XPTxset_eq /=/ containedin=XPTxset nextgroup=XPTxset_value transparent
+syntax match XPTxset_type /[|.]\%(pre\|def\|post\|ontype\)\|\ze=/ containedin=XPTxset nextgroup=XPTxset_eq transparent
+syntax match XPTxset_name3 /\%(\w\|\.\)*/ containedin=XPTxset nextgroup=XPTxset_type transparent
+syntax match XPTxset_name2 /\%(\w\|\.\)*\ze\./ containedin=XPTxset nextgroup=XPTxset_type transparent
+syntax match XPTxset_name1 /\%(\w\|\.\)*\ze|/ containedin=XPTxset nextgroup=XPTxset_type transparent
+
+syntax keyword  XPTkeyword_XPT XPT nextgroup=XPTsnippetName skipwhite
+syntax match    XPTsnippetTitle /.*$/ contained nextgroup=XPTsnippetBody,XPTkeyword_XPT skipwhite skipnl skipempty
+syntax match    XPTsnippetName /\S\+/ contained nextgroup=XPTmeta,XPTmetaAlias,XPTsnippetTitle,XPTsnippetBody skipwhite skipempty
+syntax match    XPTend /\.\.XPT/ contained containedin=XPTsnippetBody
+syntax match    XPTnotKey /\\XPT/ contained containedin=XPTsnippetBody
+
+
+" escaped white space or non-space
+syntax match XPTmeta /\w\(\\\s\|\S\)\+/ containedin=XPTsnippetTitle nextgroup=XPTmeta,XPTmetaAlias,XPTmeta_simpleHint skipwhite skipnl skipempty
+
+syntax match XPTmeta_simpleHint /\V\(\\\*\)\1"\.\*/ contained containedin=XPTsnippetTitle
+
+syntax match XPTmetaAlias /alias=\S\+/ nextgroup=XPTmeta,XPTsnippetBody,XPTkeyword_XPT skipwhite skipnl skipempty
+syntax match XPTmetaAlias_name /\S\+\ze=/ contained containedin=XPTmetaAlias
+syntax match XPTmetaAlias_value /=\zs\S\+/ contained containedin=XPTmetaAlias
+
+syntax match XPTmeta_name /\w\+\ze=\?/ containedin=XPTmeta nextgroup=XPTmeta_value
+syntax keyword XPTmeta_name_key hint alias synonym hidden wrap wraponly abbr syn contained containedin=XPTmeta_name
+syntax match XPTmeta_value /=\zs\(\\\s\|\S\)*/ containedin=XPTmeta
+
+syntax region XPTsnippetBody  start=/^/ end=/\ze\%(^$\n\)*\%$\|\ze\%(^$\n\)*XPT\s\|^\.\.XPT\|\ze\(^".*\n\|^\s*\n\)*\(^XPT\s\|\%$\|^".*\%$\|^\s*\%$\)/ contained containedin=XPTsnippetTitle contains=XPTxset excludenl fold
+
+syntax match XPThintMark /\V \zs**\ze / contained containedin=vimLineComment
+syntax match vimLineComment /^".*$/ containedin=XPTregion contains=@vimCommentGroup,vimCommentString,vimCommentTitle
+
+
+syntax match XPTbadIndent /^\(    \)*\zs \{1,3}\ze\%(\S\|$\)/ contained containedin=XPTsnippetBody
+syntax match XPTbadIndent /^\s*\zs\t/ contained containedin=XPTsnippetBody
+
+
+
+
+
+" syntax keyword TemplateKey XSETm indent hint syn priority containedin=XPTsnippetTitle
+
+
+
+
+" =======================
+" Xpt snippets definition
+" =======================
+syntax region   XPTregion start=/^/ end=/\%$/ contained contains=XPTsnippetTitle
+
+
+hi def link XPTfileMetaPair           Normal
+hi def link XPTfileMetaKey_priority   Identifier
+hi def link XPTfileMetaValue_priority Constant
+hi def link XPTfileMetaKey_mark       Identifier
+hi def link XPTfileMetaValue_mark     Constant
+
+hi def link XptVarBody            Error
+hi def link XptVarName            Constant
+hi def link XptVarValue           Normal
+
+hi def link XptSnippetIncludeItemFile String
+hi def link XptSnippetIncludeItemDir Directory
+hi def link XptSnippetIncludeItem Directory
+hi def link XptSnippetIncludeBody Normal
+hi def link XptSnippetInclude     Statement
+
+
+hi def link XPTsnippetTitle       Statement
+hi def link XPTsnippetName        Label
+hi def link XPTmeta               Normal
+hi def link XPTmeta_name          Error
+hi def link XPTmeta_name_key      Identifier
+hi def link XPTmeta_value         String
+hi def link XPTmetaAlias_name     XPTmeta_name_key
+hi def link XPTmetaAlias_value    XPTsnippetName
+hi def link XPTmeta_simpleHint    Comment
+hi def link XPTsnippetBody        Normal
+hi def link XPTcomment            Comment
+hi def link XPT_END               Folded
+hi def link XPTxset               Comment
+hi def link XPTxsetm              Comment
+" hi def link XPTxset_name1         Function
+" hi def link XPTxset_name2         Function
+" hi def link XPTxset_name3         Function
+hi def link XPTxset_type          Constant
+hi def link XPTxset_eq            Operator
+hi def link XPTxset_value         Normal
+hi def link XPTregion             SpecialKey
+hi def link XPTitem               CursorLine
+if has('gui_running')
+    hi def link XPTitemB              CursorColumn
+else
+    hi def link XPTitemB              XPTitem
+endif
+hi def link XPTinclusion          XPTsnippetName
+" hi def link XPTcursor             TabLineSel
+hi def link XPTcursor             StatusLine
+hi def link XPTitemPost           WildMenu
+hi def link XPTvariable           Constant
+hi def link XPTvariable_quote     Constant
+hi def link XPTfunction           Function
+
+hi def link XPTbadIndent          Error
+
+" not implemented
+hi def link XPTmark               NonText
+hi def link TemplateKey           Title
+
+hi def link XPThintMark           Label
+
+hi def link XPTemplateSnippetKey  Statement
+hi def link XPTSnippetVar         Statement
+hi def link XPTkeyword_XPT        Statement
+" hi def link XPTkeyword_XSET       Comment
+" hi def link XPTkeyword_XSET       Preproc
+hi def link XPTkeyword_hint       Statement
+
+
+" vim: set ts=8 sw=4 sts=4:
diff --git a/vim-plugins/bundle/xptemplate/syntax/xptlog.vim b/vim-plugins/bundle/xptemplate/syntax/xptlog.vim
new file mode 100644
index 0000000..c1b16d6
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/syntax/xptlog.vim
@@ -0,0 +1,9 @@
+syn match xptlogStack /^\w\+:::.*/ contains=xptlogFunctionName,xptlogLevel
+syn match xptlogLevel /^\w\+\ze:::/ contained
+syn match xptlogFunctionName /[^:.]\+\ze\%(\.\.\|$\)/ contained contains=xptlogFunctionSID
+syn match xptlogFunctionSID /<SNR>\d\+_/
+
+hi def link xptlogStack             Statement
+hi def link xptlogLevel             Label
+hi def link xptlogFunctionName      Function
+hi def link xptlogFunctionSID       Title
diff --git a/vim-plugins/bundle/xptemplate/xpt-err b/vim-plugins/bundle/xptemplate/xpt-err
new file mode 100644
index 0000000..27bb21e
--- /dev/null
+++ b/vim-plugins/bundle/xptemplate/xpt-err
@@ -0,0 +1,14 @@
+vim nginx.conf
+press '
+Messages maintainer: Bram Moolenaar <Bram@vim.org>                                                                                                                               
+Error detected while processing function XPTtgr..XPTemplateStart..<SNR>156_DoStart..<SNR>156_RenderSnippet..<SNR>156_BuildSnippet..<SNR>156_BuildPlaceHolders..<SNR>156_NextLeftM
+ark:                                                                                                                                                                             
+line   40:                                                                                                                                                                       
+E121: Undefined variable: content                                                                                                                                                
+Error detected while processing function XPTtgr..XPTemplateStart..<SNR>156_DoStart..<SNR>156_RenderSnippet..<SNR>156_BuildSnippet..<SNR>156_BuildPlaceHolders..<SNR>156_NextLeftM
+ark:                                                                                                                                                                             
+line   40:                                                                                                                                                                       
+E116: Invalid arguments for function len( content ) / 2 )                                                                                                                        
+Error detected while processing function XPTtgr..XPTemplateStart..<SNR>156_DoStart..<SNR>156_RenderSnippet..<SNR>156_BuildSnippet..<SNR>156_BuildPlaceHolders..<SNR>156_NextLeftM
+ark:                                                                                                                                                                             
+line   40:        
diff --git a/vim-plugins/colors/mayansmoke.vim b/vim-plugins/colors/mayansmoke.vim
new file mode 100644
index 0000000..6d146f8
--- /dev/null
+++ b/vim-plugins/colors/mayansmoke.vim
@@ -0,0 +1,343 @@
+" =============================================================================
+"
+" File:        mayansmoke.vim
+" Description: Vim color scheme file
+" Maintainer:  Jeet Sukumaran (GUI colors); Clayton Parker (cterm colors)
+"
+" =============================================================================
+
+"  Initialization and Setup {{{1
+" =============================================================================
+set background=light
+highlight clear
+if exists("syntax_on")
+  syntax reset
+endif
+let colors_name = "mayansmoke"
+" }}}
+
+"  Normal Color {{{1
+" =============================================================================
+hi Normal gui=NONE guifg=Black guibg=#F4F4E8
+" }}}
+
+"  Highlight Groups {{{1
+" =============================================================================
+" Groups (see ':help highlight-groups'):
+"    ColorColumn     highlight to use with ':set colorcolumn'
+"    Cursor          the character under the cursor
+"    CursorIM        like Cursor, but used when in IME mode |CursorIM|
+"    CursorColumn    the screen column that the cursor is in when 'cursorcolumn' is set
+"    CursorLine      the screen line that the cursor is in when 'cursorline' is set
+"    Directory       directory names (and other special names in listings)
+"    DiffAdd         diff mode: Added line |diff.txt|
+"    DiffChange      diff mode: Changed line |diff.txt|
+"    DiffDelete      diff mode: Deleted line |diff.txt|
+"    DiffText        diff mode: Changed text within a changed line |diff.txt|
+"    ErrorMsg        error messages on the command line
+"    VertSplit       the column separating vertically split windows
+"    Folded          line used for closed folds
+"    FoldColumn      'foldcolumn'
+"    SignColumn      column where |signs| are displayed
+"    IncSearch       'incsearch' highlighting; also used for the text replaced with ":s///c"
+"    LineNr          Line number for ":number" and ":#" commands, and when 'number' option is set.
+"    MatchParen      The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt|
+"    ModeMsg         'showmode' message (e.g., "-- INSERT --")
+"    MoreMsg         |more-prompt|
+"    NonText         '~' and '@' at the end of the window, etc.
+"    Normal          normal text
+"    Pmenu           Popup menu: normal item.
+"    PmenuSel        Popup menu: selected item.
+"    PmenuSbar       Popup menu: scrollbar.
+"    PmenuThumb      Popup menu: Thumb of the scrollbar.
+"    Question        |hit-enter| prompt and yes/no questions
+"    Search          Last search pattern highlighting (see 'hlsearch').
+"    SpecialKey      Meta and special keys listed with ":map", text that is displayed differently from what it really is (such as tabs, spaces in listchars etc.).
+"    SpellBad        Word that is not recognized by the spellchecker. |spell|
+"    SpellCap        Word that should start with a capital. |spell|
+"    SpellLocal      Word that is recognized by the spellchecker as one that is
+"    SpellRare       Word that is recognized by the spellchecker as one that is hardly ever used. |spell|
+"    StatusLine      status line of current window
+"    StatusLineNC    status lines of not-current windows
+"    TabLine         tab pages line, not active tab page label
+"    TabLineFill     tab pages line, where there are no labels
+"    TabLineSel      tab pages line, active tab page label
+"    Title           titles for output from ":set all", ":autocmd" etc.
+"    Visual          Visual mode selection
+"    VisualNOS       Visual mode selection when vim is "Not Owning the Selection".
+"    WarningMsg      warning messages
+"    WildMenu        current match in 'wildmenu' completion
+hi ColorColumn  guifg=NONE              guibg=#EEEEDD
+hi Cursor       guifg=bg                guibg=fg                gui=NONE
+if hlexists('MayanSmokeCursorLine')
+    hi link CursorColumn MayanSmokeCursorLine
+    hi link CursorLine MayanSmokeCursorLine
+elseif exists('g:mayansmoke_cursor_line_visibility') && g:mayansmoke_cursor_line_visibility >= 2
+    hi CursorColumn guifg=NONE              guibg=NavajoWhite   gui=NONE
+    hi CursorLine   guifg=NONE              guibg=NavajoWhite   gui=NONE
+elseif exists('g:mayansmoke_cursor_line_visibility') && g:mayansmoke_cursor_line_visibility >= 1
+    hi CursorColumn guifg=NONE              guibg=white         gui=NONE
+    hi CursorLine   guifg=NONE              guibg=white         gui=NONE
+else
+    hi CursorColumn guifg=NONE              guibg=#FFFDD0       gui=NONE
+    hi CursorLine   guifg=NONE              guibg=#FFFDD0       gui=NONE
+endif
+hi CursorIM     guifg=bg                guibg=fg                gui=NONE
+hi lCursor      guifg=bg                guibg=fg                gui=NONE
+hi DiffAdd      guifg=NONE              guibg=SeaGreen1         gui=NONE
+hi DiffChange   guifg=NONE              guibg=LightSkyBlue1     gui=NONE
+hi DiffDelete   guifg=NONE              guibg=LightCoral        gui=NONE
+hi DiffText     guifg=black             guibg=LightCyan1        gui=NONE
+hi Directory    guifg=#1600FF           guibg=bg                gui=NONE
+hi ErrorMsg     guifg=Red2              guibg=NONE              gui=NONE
+hi FoldColumn   guifg=SteelBlue4        guibg=LightYellow2      gui=bold
+hi Folded       guifg=SteelBlue4        guibg=Gainsboro      gui=italic
+if hlexists('MayanSmokeSearch')
+    hi link IncSearch MayanSmokeSearch
+    hi link Search MayanSmokeSearch
+elseif exists('g:mayansmoke_search_visibility') && g:mayansmoke_search_visibility >= 4
+    hi IncSearch    guifg=white             guibg=red           gui=NONE
+    hi Search       guifg=white             guibg=red           gui=NONE
+elseif exists('g:mayansmoke_search_visibility') && g:mayansmoke_search_visibility == 3
+    hi IncSearch    guifg=black             guibg=gold       gui=NONE
+    hi Search       guifg=black             guibg=gold        gui=NONE
+elseif exists('g:mayansmoke_search_visibility') && g:mayansmoke_search_visibility == 2
+    hi IncSearch    guifg=white             guibg=darkorange       gui=NONE
+    hi Search       guifg=white             guibg=darkorange        gui=NONE
+elseif exists('g:mayansmoke_search_visibility') && g:mayansmoke_search_visibility == 0
+    hi IncSearch    guifg=black             guibg=tan         gui=NONE
+    hi Search       guifg=black             guibg=tan         gui=NONE
+else
+    hi IncSearch    guifg=black             guibg=khaki          gui=NONE
+    hi Search       guifg=black             guibg=khaki          gui=NONE
+endif
+hi LineNr       guifg=#666677           guibg=#cccfbf    gui=NONE
+hi MatchParen   guifg=black             guibg=LemonChiffon3     gui=bold
+hi ModeMsg      guifg=White             guibg=tomato1           gui=bold
+hi MoreMsg      guifg=SeaGreen4         guibg=bg                gui=bold
+hi NonText      guifg=LightCyan3        guibg=bg                gui=bold
+
+hi Pmenu        guifg=Orange4           guibg=LightYellow3      gui=NONE
+hi PmenuSel     guifg=ivory2            guibg=NavajoWhite4      gui=bold
+hi PmenuSbar    guifg=White             guibg=#999666        gui=NONE
+hi PmenuThumb   guifg=White             guibg=#7B7939        gui=NONE
+
+hi Question     guifg=Chartreuse4       guibg=bg                gui=bold
+hi SignColumn   guifg=white             guibg=LightYellow3      gui=NONE
+if hlexists('MayanSmokeSpecialKey')
+    hi link SpecialKey MayanSmokeSpecialKey
+elseif exists('g:mayansmoke_special_key_visibility') && g:mayansmoke_special_key_visibility >= 2
+    hi SpecialKey   guifg=black         guibg=NavajoWhite       gui=NONE
+elseif exists('g:mayansmoke_special_key_visibility') && g:mayansmoke_special_key_visibility == 0
+    hi SpecialKey   guifg=bisque3       guibg=NONE              gui=NONE
+else
+    hi SpecialKey   guifg=white         guibg=ivory3            gui=NONE
+endif
+hi SpellBad     guisp=Firebrick2                                gui=undercurl
+hi SpellCap     guisp=Blue                                      gui=undercurl
+hi SpellLocal   guisp=DarkCyan                                  gui=undercurl
+hi SpellRare    guisp=Magenta                                   gui=undercurl
+hi StatusLine   guifg=#FFFEEE           guibg=#557788     gui=NONE
+" hi StatusLineNC guifg=#EAE6E2           guibg=LightSteelBlue3    gui=italic
+hi StatusLineNC guifg=#F4F4EE           guibg=#99aabb    gui=italic
+hi TabLine      guifg=fg                guibg=LightGrey         gui=underline
+hi TabLineFill  guifg=fg                guibg=bg                gui=reverse
+hi TabLineSel   guifg=fg                guibg=bg                gui=bold
+hi Title        guifg=DeepSkyBlue3      guibg=bg                gui=bold
+hi VertSplit    guifg=#99aabb     guibg=#99aabb
+hi Visual       guifg=white             guibg=DeepSkyBlue1      gui=NONE
+hi WarningMsg   guifg=Firebrick2        guibg=bg                gui=NONE
+hi WildMenu     guifg=Black             guibg=SkyBlue           gui=NONE
+" }}}
+
+" 256-Color Terminal Colors, by Clayton Parker {{{1
+" =============================================================================
+hi Normal cterm=NONE ctermfg=16  ctermbg=255
+hi Comment      ctermfg=110
+hi Constant     ctermfg=214
+    hi String   ctermfg=30
+    hi Boolean  ctermfg=88
+hi Identifier   ctermfg=160
+hi Function     ctermfg=132
+hi Statement    ctermfg=21
+hi Keyword      ctermfg=45
+hi PreProc      ctermfg=27
+hi Type         ctermfg=147
+hi Special      ctermfg=64
+hi Ignore       ctermfg=255
+hi Error        ctermfg=196             ctermbg=255     term=none
+hi Todo         ctermfg=136             ctermbg=255     cterm=NONE
+hi VimError         ctermfg=160          ctermbg=16
+hi VimCommentTitle  ctermfg=110
+hi qfLineNr         ctermfg=16           ctermbg=46        cterm=NONE
+hi pythonDecorator ctermfg=208   ctermbg=255 cterm=NONE
+hi Cursor       ctermfg=255             ctermbg=16              cterm=NONE
+hi CursorColumn ctermfg=NONE            ctermbg=255             cterm=NONE
+hi CursorIM     ctermfg=255             ctermbg=16              cterm=NONE
+hi CursorLine   ctermfg=NONE            ctermbg=254             cterm=NONE
+hi lCursor      ctermfg=255             ctermbg=16              cterm=NONE
+hi DiffAdd      ctermfg=16              ctermbg=48              cterm=NONE
+hi DiffChange   ctermfg=16              ctermbg=153             cterm=NONE
+hi DiffDelete   ctermfg=16              ctermbg=203             cterm=NONE
+hi DiffText     ctermfg=16              ctermbg=226             cterm=NONE
+hi Directory    ctermfg=21              ctermbg=255             cterm=NONE
+hi ErrorMsg     ctermfg=160             ctermbg=NONE            cterm=NONE
+hi FoldColumn   ctermfg=24              ctermbg=252             cterm=NONE
+hi Folded       ctermfg=24              ctermbg=252             cterm=NONE
+hi IncSearch    ctermfg=255             ctermbg=160             cterm=NONE
+hi LineNr       ctermfg=253             ctermbg=110             cterm=NONE
+hi NonText      ctermfg=110             ctermbg=255             cterm=NONE
+hi Pmenu        ctermfg=fg              ctermbg=195             cterm=NONE
+hi PmenuSbar    ctermfg=255             ctermbg=153             cterm=NONE
+hi PmenuSel     ctermfg=255             ctermbg=21              cterm=NONE
+hi PmenuThumb   ctermfg=111             ctermbg=255             cterm=NONE
+hi SignColumn   ctermfg=110             ctermbg=254             cterm=NONE
+hi Search       ctermfg=255             ctermbg=160             cterm=NONE
+hi SpecialKey   ctermfg=255             ctermbg=144             cterm=NONE
+hi SpellBad     ctermfg=16              ctermbg=229             cterm=NONE
+hi SpellCap     ctermfg=16              ctermbg=231             cterm=NONE
+hi SpellLocal   ctermfg=16              ctermbg=231             cterm=NONE
+hi SpellRare    ctermfg=16              ctermbg=226             cterm=NONE
+hi StatusLine   ctermfg=255             ctermbg=24              cterm=NONE
+hi StatusLineNC ctermfg=253             ctermbg=110             cterm=NONE
+hi Title        ctermfg=75              ctermbg=255             cterm=NONE
+hi VertSplit    ctermfg=255             ctermbg=24              cterm=NONE
+hi Visual       ctermfg=255             ctermbg=153             cterm=NONE
+hi WildMenu     ctermfg=16              ctermbg=117             cterm=NONE
+
+" 1}}}
+
+"  Syntax {{{1
+" =============================================================================
+
+"  General {{{2
+" -----------------------------------------------------------------------------
+" Groups ('*' = major; see 'help group-name'):
+"   *Comment        any comment
+"   *Constant       any constant
+"       String         a string constant: "this is a string"
+"       Character      a character constant: 'c', '\n'
+"       Number         a number constant: 234, 0xff
+"       Boolean        a boolean constant: TRUE, false
+"       Float          a floating point constant: 2.3e10
+"   *Identifier     any variable name
+"       Function       function name (also: methods for classes)
+"   *Statement      any statement
+"       Conditional    if, then, else, endif, switch, etc.
+"       Repeat         for, do, while, etc.
+"       Label          case, default, etc.
+"       Operator       "sizeof", "+", "*", etc.
+"       Keyword        any other keyword
+"       Exception      try, catch, throw
+"   *PreProc        generic Preprocessor
+"       Include        preprocessor #include
+"       Define         preprocessor #define
+"       Macro          same as Define
+"       PreCondit      preprocessor #if, #else, #endif, etc.
+"   *Type           int, long, char, etc.
+"       StorageClass   static, register, volatile, etc.
+"       Structure      struct, union, enum, etc.
+"       Typedef        A typedef
+"   *Special        any special symbol
+"       SpecialChar    special character in a constant
+"       Tag            you can use CTRL-] on this
+"       Delimiter      character that needs attention
+"       SpecialComment special things inside a comment
+"       Debug          debugging statements
+"   *Error          any erroneous construct
+"   *Todo           anything that needs extra attention
+" hi Comment      guifg=#A2B5CD         guibg=NONE      gui=italic
+hi Comment      guifg=#96AAC2         guibg=NONE      gui=italic
+hi Constant     guifg=DarkOrange        guibg=NONE      gui=NONE
+    hi String   guifg=Aquamarine4       guibg=NONE      gui=NONE
+    hi Boolean  guifg=IndianRed4        guibg=NONE      gui=NONE
+hi Identifier   guifg=brown3            guibg=NONE      gui=NONE
+hi Function     guifg=VioletRed4        guibg=NONE      gui=NONE
+hi Statement    guifg=blue1             guibg=NONE      gui=NONE
+hi Keyword      guifg=DodgerBlue        guibg=NONE      gui=NONE
+hi PreProc      guifg=blue1             guibg=NONE      gui=NONE
+hi Type         guifg=LightSlateBlue    guibg=NONE      gui=NONE
+hi Special      guifg=DarkOliveGreen4   guibg=NONE      gui=NONE
+hi Ignore       guifg=bg                guibg=NONE      gui=NONE
+hi Error        guifg=Red               guibg=NONE      gui=underline
+hi Todo         guifg=tan4              guibg=NONE      gui=underline
+" 2}}}
+
+"  Vim {{{2
+" -----------------------------------------------------------------------------
+hi VimError         guifg=red            guibg=Black   gui=bold
+hi VimCommentTitle  guifg=DarkSlateGray4 guibg=bg      gui=bold,italic
+" 2}}}
+
+" QuickFix {{{2
+" -----------------------------------------------------------------------------
+
+" syn match qfFileName  "^[^|]*" nextgroup=qfSeparator
+" syn match qfSeparator "|" nextgroup=qfLineNr contained
+" syn match qfLineNr    "[^|]*" contained contains=qfError
+" syn match qfError     "error" contained
+hi qfFileName  guifg=LightSkyBlue4     guibg=NONE      gui=italic
+hi qfLineNr    guifg=coral             guibg=NONE      gui=bold
+hi qfError     guifg=red               guibg=NONE      gui=bold
+" 2}}}
+
+" Python {{{2
+" -----------------------------------------------------------------------------
+hi pythonDecorator  guifg=orange3 guibg=NONE gui=bold
+hi link pythonDecoratorFunction pythonDecorator
+" 2}}}
+
+" Diff {{{2
+" -----------------------------------------------------------------------------
+hi diffOldFile          guifg=#006666           guibg=NONE      gui=NONE
+hi diffNewFile          guifg=#0088FF           guibg=NONE      gui=bold
+hi diffFile             guifg=#0000FF           guibg=NONE      gui=NONE
+hi link diffOnly        Constant
+hi link diffIdentical   Constant
+hi link diffDiffer      Constant
+hi link diffBDiffer     Constant
+hi link diffIsA         Constant
+hi link diffNoEOL       Constant
+hi link diffCommon      Constant
+hi diffRemoved          guifg=#BB0000           guibg=NONE      gui=NONE
+hi diffChanged          guifg=DarkSeaGreen      guibg=NONE      gui=NONE
+hi diffAdded            guifg=#00AA00           guibg=NONE      gui=NONE
+hi diffLine             guifg=thistle4          guibg=NONE      gui=italic
+hi link diffSubname     diffLine
+hi link diffComment     Comment
+" 2}}}
+
+" PHP (contributed by Ryan Kulla) {{{2
+" -----------------------------------------------------------------------------
+" Ryan Kulla's addition for PHP syntax highlighting (for regular/terminal vim)
+hi phpConditional ctermfg=21 cterm=NONE guifg=black
+hi phpIdentifier ctermfg=0 cterm=NONE guifg=black
+hi phpOperator ctermfg=black cterm=NONE guifg=black
+hi phpRegion ctermfg=132 cterm=NONE guifg=VioletRed4
+hi phpComparison ctermfg=black cterm=NONE guifg=black
+hi phpType ctermfg=darkgreen cterm=NONE guifg=darkgreen
+hi phpParent ctermfg=black cterm=NONE guifg=black
+hi phpMethodsVar ctermfg=132 cterm=NONE guifg=VioletRed4
+hi phpStatement ctermfg=21 cterm=NONE guifg=blue
+hi phpStorageClass ctermfg=21 cterm=NONE guifg=blue
+hi phpStringSingle ctermfg=30 cterm=NONE guifg=Aquamarine4
+hi phpStringDouble ctermfg=30 cterm=NONE guifg=Aquamarine4
+hi phpFunctions ctermfg=21 cterm=NONE guifg=blue
+hi phpSpecialFunction ctermfg=21 cterm=NONE guifg=blue
+hi phpRepeat ctermfg=21 cterm=NONE guifg=blue
+hi phpNumber ctermfg=214 cterm=bold guifg=brown
+hi phpTodo ctermfg=red cterm=bold guifg=red gui=bold
+hi phpDefine ctermfg=21 cterm=NONE guifg=blue
+hi phpConstant ctermfg=21 cterm=NONE guifg=black
+hi phpCoreConstant ctermfg=21 cterm=NONE guifg=black
+hi phpMemberSelector ctermfg=black cterm=NONE guifg=black
+hi phpLabel ctermfg=21 cterm=NONE guifg=blue
+hi phpStructure ctermfg=black cterm=NONE guifg=black
+hi phpRelation ctermfg=black cterm=NONE guifg=black
+hi phpEnvVar ctermfg=black cterm=NONE guifg=black
+hi phpIntVar ctermfg=0 cterm=bold guifg=black gui=bold
+hi phpBoolean ctermfg=58 cterm=NONE guifg=brown
+" 2}}}
+
+" 1}}}
+
diff --git a/vim-plugins/colors/wombat256mod.vim b/vim-plugins/colors/wombat256mod.vim
new file mode 100644
index 0000000..1137eb8
--- /dev/null
+++ b/vim-plugins/colors/wombat256mod.vim
@@ -0,0 +1,96 @@
+" Vim color file
+" Original Maintainer:  Lars H. Nielsen (dengmao@gmail.com)
+" Last Change:  2010-07-23
+"
+" Modified version of wombat for 256-color terminals by
+"   David Liang (bmdavll@gmail.com)
+" based on version by
+"   Danila Bespalov (danila.bespalov@gmail.com)
+
+set background=dark
+
+if version > 580
+	hi clear
+	if exists("syntax_on")
+		syntax reset
+	endif
+endif
+
+let colors_name = "wombat256mod"
+
+
+" General colors
+hi Normal		ctermfg=252		ctermbg=234		cterm=none		guifg=#e3e0d7	guibg=#242424	gui=none
+hi Cursor		ctermfg=234		ctermbg=228		cterm=none		guifg=#242424	guibg=#eae788	gui=none
+hi Visual		ctermfg=251		ctermbg=239		cterm=none		guifg=#c3c6ca	guibg=#554d4b	gui=none
+hi VisualNOS	ctermfg=251		ctermbg=236		cterm=none		guifg=#c3c6ca	guibg=#303030	gui=none
+hi Search		ctermfg=177		ctermbg=241		cterm=none		guifg=#d787ff	guibg=#636066	gui=none
+hi Folded		ctermfg=103		ctermbg=237		cterm=none		guifg=#a0a8b0	guibg=#3a4046	gui=none
+hi Title		ctermfg=230						cterm=bold		guifg=#ffffd7					gui=bold
+hi StatusLine	ctermfg=230		ctermbg=238		cterm=none		guifg=#ffffd7	guibg=#444444	gui=italic
+hi VertSplit	ctermfg=238		ctermbg=238		cterm=none		guifg=#444444	guibg=#444444	gui=none
+hi StatusLineNC	ctermfg=241		ctermbg=238		cterm=none		guifg=#857b6f	guibg=#444444	gui=none
+hi LineNr		ctermfg=241		ctermbg=232		cterm=none		guifg=#857b6f	guibg=#080808	gui=none
+hi SpecialKey	ctermfg=241		ctermbg=235		cterm=none		guifg=#626262	guibg=#2b2b2b	gui=none
+hi WarningMsg	ctermfg=203										guifg=#ff5f55
+hi ErrorMsg		ctermfg=196		ctermbg=236		cterm=bold		guifg=#ff2026	guibg=#3a3a3a	gui=bold
+
+" Vim >= 7.0 specific colors
+if version >= 700
+hi CursorLine					ctermbg=236		cterm=none						guibg=#32322f
+hi MatchParen	ctermfg=228		ctermbg=101		cterm=bold		guifg=#eae788	guibg=#857b6f	gui=bold
+hi Pmenu		ctermfg=230		ctermbg=238						guifg=#ffffd7	guibg=#444444
+hi PmenuSel		ctermfg=232		ctermbg=192						guifg=#080808	guibg=#cae982
+endif
+
+" Diff highlighting
+hi DiffAdd						ctermbg=17										guibg=#2a0d6a
+hi DiffDelete	ctermfg=234		ctermbg=60		cterm=none		guifg=#242424	guibg=#3e3969	gui=none
+hi DiffText						ctermbg=53		cterm=none						guibg=#73186e	gui=none
+hi DiffChange					ctermbg=237										guibg=#382a37
+
+"hi CursorIM
+"hi Directory
+"hi IncSearch
+"hi Menu
+"hi ModeMsg
+"hi MoreMsg
+"hi PmenuSbar
+"hi PmenuThumb
+"hi Question
+"hi Scrollbar
+"hi SignColumn
+"hi SpellBad
+"hi SpellCap
+"hi SpellLocal
+"hi SpellRare
+"hi TabLine
+"hi TabLineFill
+"hi TabLineSel
+"hi Tooltip
+"hi User1
+"hi User9
+"hi WildMenu
+
+
+" Syntax highlighting
+hi Keyword		ctermfg=111		cterm=none		guifg=#88b8f6	gui=none
+hi Statement	ctermfg=111		cterm=none		guifg=#88b8f6	gui=none
+hi Constant		ctermfg=173		cterm=none		guifg=#e5786d	gui=none
+hi Number		ctermfg=173		cterm=none		guifg=#e5786d	gui=none
+hi PreProc		ctermfg=173		cterm=none		guifg=#e5786d	gui=none
+hi Function		ctermfg=192		cterm=none		guifg=#cae982	gui=none
+hi Identifier	ctermfg=192		cterm=none		guifg=#cae982	gui=none
+hi Type			ctermfg=186		cterm=none		guifg=#d4d987	gui=none
+hi Special		ctermfg=229		cterm=none		guifg=#eadead	gui=none
+hi String		ctermfg=113		cterm=none		guifg=#95e454	gui=italic
+hi Comment		ctermfg=246		cterm=none		guifg=#9c998e	gui=italic
+hi Todo			ctermfg=101		cterm=none		guifg=#857b6f	gui=italic
+
+
+" Links
+hi! link FoldColumn		Folded
+hi! link CursorColumn	CursorLine
+hi! link NonText		LineNr
+
+" vim:set ts=4 sw=4 noet:
diff --git a/vim-plugins/filetype.vim b/vim-plugins/filetype.vim
new file mode 100644
index 0000000..1e90db3
--- /dev/null
+++ b/vim-plugins/filetype.vim
@@ -0,0 +1,7 @@
+au BufRead,BufNewFile *.inc,*.ihtml,*.tpl,*.class set filetype=php
+        \ | let Comment="<!-- " | let EndComment=" -->"
+au BufRead,BufNewFile *.py,*.sh,*.pl,*.tcl let Comment="#" | let EndComment=""
+au BufRead,BufNewFile *.js set filetype=html | let Comment="//" | let EndComment=""
+au BufRead,BufNewFile *.cc,*.php,*.cxx let Comment="//" | let EndComment=""
+au BufRead,BufNewFile *.c,*.h let Comment="/*" | let EndComment="*/"
+au BufRead,BufNewFile *.html let Comment="{#" | let EndComment="%}" | set filetype=htmldjango
diff --git a/vim-plugins/ftplugin/.python_editing.vim.un~ b/vim-plugins/ftplugin/.python_editing.vim.un~
new file mode 100644
index 0000000..b8d4494
Binary files /dev/null and b/vim-plugins/ftplugin/.python_editing.vim.un~ differ
diff --git a/vim-plugins/ftplugin/instant-markdown.vim b/vim-plugins/ftplugin/instant-markdown.vim
new file mode 100644
index 0000000..c34c1a6
--- /dev/null
+++ b/vim-plugins/ftplugin/instant-markdown.vim
@@ -0,0 +1,188 @@
+" # Configuration
+if !exists('g:instant_markdown_slow')
+    let g:instant_markdown_slow = 0
+endif
+
+if !exists('g:instant_markdown_autostart')
+    let g:instant_markdown_autostart = 1
+endif
+
+if !exists('g:instant_markdown_open_to_the_world')
+    let g:instant_markdown_open_to_the_world = 0
+endif
+
+if !exists('g:instant_markdown_allow_unsafe_content')
+    let g:instant_markdown_allow_unsafe_content = 0
+endif
+
+if !exists('g:instant_markdown_allow_external_content')
+    let g:instant_markdown_allow_external_content = 1
+endif
+
+" # Utility Functions
+" Simple system wrapper that ignores empty second args
+function! s:system(cmd, stdin)
+    if strlen(a:stdin) == 0
+        call system(a:cmd)
+    else
+        call system(a:cmd, a:stdin)
+    endif
+endfu
+
+" Wrapper function to automatically execute the command asynchronously and
+" redirect output in a cross-platform way. Note that stdin must be passed as a
+" List of lines.
+function! s:systemasync(cmd, stdinLines)
+    if has('win32') || has('win64')
+        call s:winasync(a:cmd, a:stdinLines)
+    else
+        let cmd = a:cmd . '&>/dev/null &'
+        call s:system(cmd, join(a:stdinLines, "\n"))
+    endif
+endfu
+
+" Executes a system command asynchronously on Windows. The List stdinLines will
+" be concatenated and passed as stdin to the command. If the List is empty,
+" stdin will also be empty.
+function! s:winasync(cmd, stdinLines)
+    " To execute a command asynchronously on windows, the script must use the
+    " "!start" command. However, stdin can't be passed to this command like
+    " system(). Instead, the lines are saved to a file and then piped into the
+    " command.
+    if len(a:stdinLines)
+        let tmpfile = tempname()
+        call writefile(a:stdinLines, tmpfile)
+        let command = 'type ' . tmpfile . ' | ' . a:cmd
+    else
+        let command = a:cmd
+    endif
+    exec 'silent !start /b cmd /c ' . command . ' > NUL'
+endfu
+
+function! s:refreshView()
+    let bufnr = expand('<bufnr>')
+    call s:systemasync("curl -X PUT -T - http://localhost:8090",
+                \ s:bufGetLines(bufnr))
+endfu
+
+function! s:startDaemon(initialMDLines)
+    let env = ''
+    if g:instant_markdown_open_to_the_world
+        let env .= 'INSTANT_MARKDOWN_OPEN_TO_THE_WORLD=1 '
+    endif
+    if g:instant_markdown_allow_unsafe_content
+        let env .= 'INSTANT_MARKDOWN_ALLOW_UNSAFE_CONTENT=1 '
+    endif
+    if !g:instant_markdown_allow_external_content
+        let env .= 'INSTANT_MARKDOWN_BLOCK_EXTERNAL=1 '
+    endif
+
+    call s:systemasync('instant-markdown-d', a:initialMDLines)
+endfu
+
+function! s:initDict()
+    if !exists('s:buffers')
+        let s:buffers = {}
+    endif
+endfu
+
+function! s:pushBuffer(bufnr)
+    call s:initDict()
+    let s:buffers[a:bufnr] = 1
+endfu
+
+function! s:popBuffer(bufnr)
+    call s:initDict()
+    call remove(s:buffers, a:bufnr)
+endfu
+
+function! s:killDaemon()
+    call s:systemasync("curl -s -X DELETE http://localhost:8090", [])
+endfu
+
+function! s:bufGetLines(bufnr)
+  return getbufline(a:bufnr, 1, "$")
+endfu
+
+" I really, really hope there's a better way to do this.
+fu! s:myBufNr()
+    return str2nr(expand('<abuf>'))
+endfu
+
+" # Functions called by autocmds
+"
+" ## push a new Markdown buffer into the system.
+"
+" 1. Track it so we know when to garbage collect the daemon
+" 2. Start daemon if we're on the first MD buffer.
+" 3. Initialize changedtickLast, possibly needlessly(?)
+fu! s:pushMarkdown()
+    let bufnr = s:myBufNr()
+    call s:initDict()
+    if len(s:buffers) == 0
+        call s:startDaemon(s:bufGetLines(bufnr))
+    endif
+    call s:pushBuffer(bufnr)
+    let b:changedtickLast = b:changedtick
+endfu
+
+" ## pop a Markdown buffer
+"
+" 1. Pop the buffer reference
+" 2. Garbage collection
+"     * daemon
+"     * autocmds
+fu! s:popMarkdown()
+    let bufnr = s:myBufNr()
+    silent au! instant-markdown * <buffer=abuf>
+    call s:popBuffer(bufnr)
+    if len(s:buffers) == 0
+        call s:killDaemon()
+    endif
+endfu
+
+" ## Refresh if there's something new worth showing
+"
+" 'All things in moderation'
+fu! s:temperedRefresh()
+    if !exists('b:changedtickLast')
+        let b:changedtickLast = b:changedtick
+    elseif b:changedtickLast != b:changedtick
+        let b:changedtickLast = b:changedtick
+        call s:refreshView()
+    endif
+endfu
+
+fu! s:previewMarkdown()
+  call s:startDaemon(getline(1, '$'))
+  aug instant-markdown
+    if g:instant_markdown_slow
+      au CursorHold,BufWrite,InsertLeave <buffer> call s:temperedRefresh()
+    else
+      au CursorHold,CursorHoldI,CursorMoved,CursorMovedI <buffer> call s:temperedRefresh()
+    endif
+    au BufWinLeave <buffer> call s:cleanUp()
+  aug END
+endfu
+
+fu! s:cleanUp()
+  call s:killDaemon()
+  au! instant-markdown * <buffer>
+endfu
+
+if g:instant_markdown_autostart
+    " # Define the autocmds "
+    aug instant-markdown
+        au! * <buffer>
+        au BufEnter <buffer> call s:refreshView()
+        if g:instant_markdown_slow
+          au CursorHold,BufWrite,InsertLeave <buffer> call s:temperedRefresh()
+        else
+          au CursorHold,CursorHoldI,CursorMoved,CursorMovedI <buffer> call s:temperedRefresh()
+        endif
+        au BufWinLeave <buffer> call s:popMarkdown()
+        au BufwinEnter <buffer> call s:pushMarkdown()
+    aug END
+else
+    command! -buffer InstantMarkdownPreview call s:previewMarkdown()
+endif
diff --git a/vim-plugins/ftplugin/python_editing.vim b/vim-plugins/ftplugin/python_editing.vim
new file mode 100644
index 0000000..eabcc98
--- /dev/null
+++ b/vim-plugins/ftplugin/python_editing.vim
@@ -0,0 +1,91 @@
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+finish
+endif
+let b:did_ftplugin = 1
+
+map <buffer> <S-e> :w<CR>:!/usr/bin/env python % <CR>
+map <buffer> gd /def <C-R><C-W><CR>
+
+set foldmethod=indent
+set foldexpr=PythonFoldExpr(v:lnum)
+set foldtext=PythonFoldText()
+
+map <buffer> f za
+map <buffer> F :call ToggleFold()<CR>
+let b:folded = 1
+
+function! ToggleFold()
+    if( b:folded == 0 )
+        exec "normal! zM"
+        let b:folded = 1
+    else
+        exec "normal! zR"
+        let b:folded = 0
+    endif
+endfunction
+
+function! PythonFoldText()
+
+    let size = 1 + v:foldend - v:foldstart
+    if size < 10
+        let size = " " . size
+    endif
+    if size < 100
+        let size = " " . size
+    endif
+    if size < 1000
+        let size = " " . size
+    endif
+
+    if match(getline(v:foldstart), '"""') >= 0
+        let text = substitute(getline(v:foldstart), '"""', '', 'g' ) . ' '
+    elseif match(getline(v:foldstart), "'''") >= 0
+        let text = substitute(getline(v:foldstart), "'''", '', 'g' ) . ' '
+    else
+        let text = getline(v:foldstart)
+    endif
+
+    return size . ' lines:'. text . ' '
+
+endfunction
+
+function! PythonFoldExpr(lnum)
+
+    if indent( nextnonblank(a:lnum) ) == 0
+        return 0
+    endif
+
+    if getline(a:lnum-1) =~ '^\(class\|def\)\s'
+        return 1
+    endif
+
+    if getline(a:lnum) =~ '^\s*$'
+        return "="
+    endif
+
+    if indent(a:lnum) == 0
+        return 0
+    endif
+
+    return '='
+
+endfunction
+
+" In case folding breaks down
+function! ReFold()
+    set foldmethod=expr
+    set foldexpr=0
+    set foldnestmax=1
+    set foldmethod=expr
+    set foldexpr=PythonFoldExpr(v:lnum)
+    set foldtext=PythonFoldText()
+    echo
+endfunction
+
+"inoremap ; :
+"inoremap : ;
+
+" Django template completion
+let g:htmldjangocomplete_html_flavour = 'html401s'
+au FileType htmldjango set omnifunc=htmldjangocomplete#CompleteDjango
diff --git a/vim-plugins/templates/.skeleton.py.un~ b/vim-plugins/templates/.skeleton.py.un~
new file mode 100644
index 0000000..52d281e
Binary files /dev/null and b/vim-plugins/templates/.skeleton.py.un~ differ
diff --git a/vim-plugins/templates/.skeleton.sh.un~ b/vim-plugins/templates/.skeleton.sh.un~
new file mode 100644
index 0000000..f55788a
Binary files /dev/null and b/vim-plugins/templates/.skeleton.sh.un~ differ
diff --git a/vim-plugins/templates/skeleton.py b/vim-plugins/templates/skeleton.py
new file mode 100644
index 0000000..cd9ac48
--- /dev/null
+++ b/vim-plugins/templates/skeleton.py
@@ -0,0 +1,6 @@
+def main():
+    pass
+
+
+if __name__ == "__main__":
+    main()
diff --git a/vim-plugins/templates/skeleton.sh b/vim-plugins/templates/skeleton.sh
new file mode 100644
index 0000000..7a693aa
--- /dev/null
+++ b/vim-plugins/templates/skeleton.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+
diff --git a/vim-plugins/tmp/%home%viktor%code%python%odin-proj%dev%webapp%Odin%README.md.swp b/vim-plugins/tmp/%home%viktor%code%python%odin-proj%dev%webapp%Odin%README.md.swp
new file mode 100644
index 0000000..c5c6582
Binary files /dev/null and b/vim-plugins/tmp/%home%viktor%code%python%odin-proj%dev%webapp%Odin%README.md.swp differ
diff --git a/vim-plugins/tmp/undo/%etc%apt%sources.list b/vim-plugins/tmp/undo/%etc%apt%sources.list
new file mode 100644
index 0000000..306afdf
Binary files /dev/null and b/vim-plugins/tmp/undo/%etc%apt%sources.list differ
diff --git a/vim-plugins/tmp/undo/%etc%default%locale b/vim-plugins/tmp/undo/%etc%default%locale
new file mode 100644
index 0000000..6fa30e0
Binary files /dev/null and b/vim-plugins/tmp/undo/%etc%default%locale differ
diff --git a/vim-plugins/tmp/undo/%etc%fstab b/vim-plugins/tmp/undo/%etc%fstab
new file mode 100644
index 0000000..475c658
Binary files /dev/null and b/vim-plugins/tmp/undo/%etc%fstab differ
diff --git a/vim-plugins/tmp/undo/%etc%hosts b/vim-plugins/tmp/undo/%etc%hosts
new file mode 100644
index 0000000..ebea187
Binary files /dev/null and b/vim-plugins/tmp/undo/%etc%hosts differ
diff --git a/vim-plugins/tmp/undo/%etc%init%docker.conf b/vim-plugins/tmp/undo/%etc%init%docker.conf
new file mode 100644
index 0000000..08bdb8b
Binary files /dev/null and b/vim-plugins/tmp/undo/%etc%init%docker.conf differ
diff --git a/vim-plugins/tmp/undo/%etc%inputrc b/vim-plugins/tmp/undo/%etc%inputrc
new file mode 100644
index 0000000..197a570
Binary files /dev/null and b/vim-plugins/tmp/undo/%etc%inputrc differ
diff --git a/vim-plugins/tmp/undo/%etc%ssh%ssh_config b/vim-plugins/tmp/undo/%etc%ssh%ssh_config
new file mode 100644
index 0000000..40c17da
Binary files /dev/null and b/vim-plugins/tmp/undo/%etc%ssh%ssh_config differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.bash_aliases b/vim-plugins/tmp/undo/%home%viktor%.bash_aliases
new file mode 100644
index 0000000..99d1103
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.bash_aliases differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.bash_completion b/vim-plugins/tmp/undo/%home%viktor%.bash_completion
new file mode 100644
index 0000000..1428e6d
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.bash_completion differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.bashrc b/vim-plugins/tmp/undo/%home%viktor%.bashrc
new file mode 100644
index 0000000..3d6c5d9
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.bashrc differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.config%plasma-locale-settings.sh b/vim-plugins/tmp/undo/%home%viktor%.config%plasma-locale-settings.sh
new file mode 100644
index 0000000..a9291ef
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.config%plasma-locale-settings.sh differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.inputrc b/vim-plugins/tmp/undo/%home%viktor%.inputrc
new file mode 100644
index 0000000..bbac3d0
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.inputrc differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.oh-my-zsh%oh-my-zsh.sh b/vim-plugins/tmp/undo/%home%viktor%.oh-my-zsh%oh-my-zsh.sh
new file mode 100644
index 0000000..33a3188
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.oh-my-zsh%oh-my-zsh.sh differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.oh-my-zsh%themes%bira.zsh-theme b/vim-plugins/tmp/undo/%home%viktor%.oh-my-zsh%themes%bira.zsh-theme
new file mode 100644
index 0000000..71f7722
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.oh-my-zsh%themes%bira.zsh-theme differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.profile b/vim-plugins/tmp/undo/%home%viktor%.profile
new file mode 100644
index 0000000..6d449c0
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.profile differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.ssh%config b/vim-plugins/tmp/undo/%home%viktor%.ssh%config
new file mode 100755
index 0000000..585ed58
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.ssh%config differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.tmux%.tmux.conf b/vim-plugins/tmp/undo/%home%viktor%.tmux%.tmux.conf
new file mode 100644
index 0000000..f652dda
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.tmux%.tmux.conf differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.tmux.conf b/vim-plugins/tmp/undo/%home%viktor%.tmux.conf
new file mode 100644
index 0000000..f490bf5
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.tmux.conf differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.tmux.conf.local b/vim-plugins/tmp/undo/%home%viktor%.tmux.conf.local
new file mode 100644
index 0000000..0cafaad
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.tmux.conf.local differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.vimrc b/vim-plugins/tmp/undo/%home%viktor%.vimrc
new file mode 100644
index 0000000..56ddc16
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.vimrc differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.virtualenvs%django%bin%activate b/vim-plugins/tmp/undo/%home%viktor%.virtualenvs%django%bin%activate
new file mode 100644
index 0000000..ac84e77
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.virtualenvs%django%bin%activate differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.virtualenvs%reqs.txt b/vim-plugins/tmp/undo/%home%viktor%.virtualenvs%reqs.txt
new file mode 100644
index 0000000..0f75110
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.virtualenvs%reqs.txt differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.virtualenvs%venv.sh b/vim-plugins/tmp/undo/%home%viktor%.virtualenvs%venv.sh
new file mode 100755
index 0000000..7f71923
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.virtualenvs%venv.sh differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%.zshrc b/vim-plugins/tmp/undo/%home%viktor%.zshrc
new file mode 100644
index 0000000..27a8545
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%.zshrc differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%CLIENTNAME.ovpn b/vim-plugins/tmp/undo/%home%viktor%CLIENTNAME.ovpn
new file mode 100644
index 0000000..455c915
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%CLIENTNAME.ovpn differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%Software_Development%python%techfest%TechFest%techfest%config%settings%base.py b/vim-plugins/tmp/undo/%home%viktor%Software_Development%python%techfest%TechFest%techfest%config%settings%base.py
new file mode 100644
index 0000000..4fab25b
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%Software_Development%python%techfest%TechFest%techfest%config%settings%base.py differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%auto%update_vim_and_zsh.sh b/vim-plugins/tmp/undo/%home%viktor%auto%update_vim_and_zsh.sh
new file mode 100755
index 0000000..b48f81f
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%auto%update_vim_and_zsh.sh differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%bobi-rd-links b/vim-plugins/tmp/undo/%home%viktor%bobi-rd-links
new file mode 100644
index 0000000..b2fd3b4
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%bobi-rd-links differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%dot_files%setup-vim.sh b/vim-plugins/tmp/undo/%home%viktor%code%dot_files%setup-vim.sh
new file mode 100755
index 0000000..8981ded
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%dot_files%setup-vim.sh differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%Odin%config%settings%base.py b/vim-plugins/tmp/undo/%home%viktor%code%python%Odin%config%settings%base.py
new file mode 100644
index 0000000..b8d0f5e
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%Odin%config%settings%base.py differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%Odin%env.example b/vim-plugins/tmp/undo/%home%viktor%code%python%Odin%env.example
new file mode 100644
index 0000000..93978ba
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%Odin%env.example differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%Odin%odin%dashboard%views.py b/vim-plugins/tmp/undo/%home%viktor%code%python%Odin%odin%dashboard%views.py
new file mode 100644
index 0000000..7ea0fb8
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%Odin%odin%dashboard%views.py differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%minimal-django-file-upload-example%src%for_django_1-9%myproject%myproject%myapp%models.py b/vim-plugins/tmp/undo/%home%viktor%code%python%minimal-django-file-upload-example%src%for_django_1-9%myproject%myproject%myapp%models.py
new file mode 100644
index 0000000..c219bc7
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%minimal-django-file-upload-example%src%for_django_1-9%myproject%myproject%myapp%models.py differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%minimal-django-file-upload-example%src%for_django_1-9%myproject%myproject%myapp%urls.py b/vim-plugins/tmp/undo/%home%viktor%code%python%minimal-django-file-upload-example%src%for_django_1-9%myproject%myproject%myapp%urls.py
new file mode 100644
index 0000000..b9d7dee
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%minimal-django-file-upload-example%src%for_django_1-9%myproject%myproject%myapp%urls.py differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%minimal-django-file-upload-example%src%for_django_1-9%myproject%myproject%myapp%views.py b/vim-plugins/tmp/undo/%home%viktor%code%python%minimal-django-file-upload-example%src%for_django_1-9%myproject%myproject%myapp%views.py
new file mode 100644
index 0000000..4c17e5a
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%minimal-django-file-upload-example%src%for_django_1-9%myproject%myproject%myapp%views.py differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%minimal-django-file-upload-example%src%for_django_1-9%myproject%myproject%settings.py b/vim-plugins/tmp/undo/%home%viktor%code%python%minimal-django-file-upload-example%src%for_django_1-9%myproject%myproject%settings.py
new file mode 100644
index 0000000..f07322f
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%minimal-django-file-upload-example%src%for_django_1-9%myproject%myproject%settings.py differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%Dockerfile b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%Dockerfile
new file mode 100644
index 0000000..4111f05
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%Dockerfile differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%docker-compose.yml b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%docker-compose.yml
new file mode 100644
index 0000000..5a90a9f
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%docker-compose.yml differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%postgres%Dockerfile b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%postgres%Dockerfile
new file mode 100644
index 0000000..fb7effe
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%postgres%Dockerfile differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%Dockerfile b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%Dockerfile
new file mode 100644
index 0000000..d8ef3c6
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%Dockerfile differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%Odin%config%settings%base.py b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%Odin%config%settings%base.py
new file mode 100644
index 0000000..d2f69bf
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%Odin%config%settings%base.py differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%Odin%config%urls.py b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%Odin%config%urls.py
new file mode 100644
index 0000000..a8c53cd
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%Odin%config%urls.py differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%Odin%odin%dashboard%views.py b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%Odin%odin%dashboard%views.py
new file mode 100644
index 0000000..0e600b3
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%Odin%odin%dashboard%views.py differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%entrypoint.sh b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%entrypoint.sh
new file mode 100644
index 0000000..4ca6701
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%deploy%webapp%entrypoint.sh differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%docker-compose.yml b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%docker-compose.yml
new file mode 100644
index 0000000..e5c05e7
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%docker-compose.yml differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Dockerfile b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Dockerfile
new file mode 100644
index 0000000..8360e30
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Dockerfile differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%Dockerfile b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%Dockerfile
new file mode 100644
index 0000000..b74755e
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%Dockerfile differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%README.md b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%README.md
new file mode 100644
index 0000000..d482120
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%README.md differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%config%settings%base.py b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%config%settings%base.py
new file mode 100644
index 0000000..a7843ca
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%config%settings%base.py differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%config%urls.py b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%config%urls.py
new file mode 100644
index 0000000..382475a
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%config%urls.py differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%deploy%dev%docker-compose.yml b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%deploy%dev%docker-compose.yml
new file mode 100644
index 0000000..6a1ce1f
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%deploy%dev%docker-compose.yml differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%deploy%dev%entrypoint.sh b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%deploy%dev%entrypoint.sh
new file mode 100644
index 0000000..224260b
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%deploy%dev%entrypoint.sh differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%docker-compose.yml b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%docker-compose.yml
new file mode 100644
index 0000000..35a0e40
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%docker-compose.yml differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%odin%templates%authentication%login.html b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%odin%templates%authentication%login.html
new file mode 100644
index 0000000..e9ab1c7
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%Odin%odin%templates%authentication%login.html differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%entrypoint.sh b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%entrypoint.sh
new file mode 100644
index 0000000..8cca8f0
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%odin-proj%dev%webapp%entrypoint.sh differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%projects%fbchat%timeCost.txt b/vim-plugins/tmp/undo/%home%viktor%code%python%projects%fbchat%timeCost.txt
new file mode 100644
index 0000000..4e8d180
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%projects%fbchat%timeCost.txt differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%projects%techfest%TechFest%techfest%asd b/vim-plugins/tmp/undo/%home%viktor%code%python%projects%techfest%TechFest%techfest%asd
new file mode 100644
index 0000000..12ec51d
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%projects%techfest%TechFest%techfest%asd differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%projects%techfest%TechFest%techfest%manage.py b/vim-plugins/tmp/undo/%home%viktor%code%python%projects%techfest%TechFest%techfest%manage.py
new file mode 100755
index 0000000..b37c87b
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%projects%techfest%TechFest%techfest%manage.py differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%code%python%refactorer%readme b/vim-plugins/tmp/undo/%home%viktor%code%python%refactorer%readme
new file mode 100644
index 0000000..d8d61d2
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%code%python%refactorer%readme differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%docker%dockercoins%docker-compose.logging.yml b/vim-plugins/tmp/undo/%home%viktor%docker%dockercoins%docker-compose.logging.yml
new file mode 100644
index 0000000..51d020e
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%docker%dockercoins%docker-compose.logging.yml differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%Dockerfile b/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%Dockerfile
new file mode 100644
index 0000000..068d6eb
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%Dockerfile differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%docker-compose.yml b/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%docker-compose.yml
new file mode 100644
index 0000000..27c181a
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%docker-compose.yml differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%esx-vpn%Dockerfile b/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%esx-vpn%Dockerfile
new file mode 100644
index 0000000..6942242
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%esx-vpn%Dockerfile differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%postgres%Dockerfile b/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%postgres%Dockerfile
new file mode 100644
index 0000000..fac1462
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%postgres%Dockerfile differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%postgres%docker-compose.yml b/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%postgres%docker-compose.yml
new file mode 100644
index 0000000..66b948a
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%postgres%docker-compose.yml differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%redis%Dockerfile b/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%redis%Dockerfile
new file mode 100644
index 0000000..273ffa4
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%redis%Dockerfile differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%techfest%config%settings%base.py b/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%techfest%config%settings%base.py
new file mode 100644
index 0000000..9601fd2
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%docker%dockerfile-tut%techfest%config%settings%base.py differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%q b/vim-plugins/tmp/undo/%home%viktor%q
new file mode 100644
index 0000000..332baf9
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%q differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%test.css b/vim-plugins/tmp/undo/%home%viktor%test.css
new file mode 100644
index 0000000..3e442c3
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%test.css differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%todo.txt b/vim-plugins/tmp/undo/%home%viktor%todo.txt
new file mode 100644
index 0000000..14494ef
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%todo.txt differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%venv.sh b/vim-plugins/tmp/undo/%home%viktor%venv.sh
new file mode 100755
index 0000000..974c82b
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%venv.sh differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%venvs%install-reqs.sh b/vim-plugins/tmp/undo/%home%viktor%venvs%install-reqs.sh
new file mode 100755
index 0000000..a9be5db
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%venvs%install-reqs.sh differ
diff --git a/vim-plugins/tmp/undo/%home%viktor%viktor b/vim-plugins/tmp/undo/%home%viktor%viktor
new file mode 100644
index 0000000..d628ea4
Binary files /dev/null and b/vim-plugins/tmp/undo/%home%viktor%viktor differ
diff --git a/vim-plugins/tmp/undo/%mnt%home%viktor%auto-commit.sh b/vim-plugins/tmp/undo/%mnt%home%viktor%auto-commit.sh
new file mode 100755
index 0000000..f6661ea
Binary files /dev/null and b/vim-plugins/tmp/undo/%mnt%home%viktor%auto-commit.sh differ
diff --git a/vim-plugins/tmp/undo/%tmp%crontab.LH6Lsq%crontab b/vim-plugins/tmp/undo/%tmp%crontab.LH6Lsq%crontab
new file mode 100644
index 0000000..f9d6baf
Binary files /dev/null and b/vim-plugins/tmp/undo/%tmp%crontab.LH6Lsq%crontab differ
diff --git a/vim-plugins/tmp/undo/%tmp%crontab.Wlpq8x%crontab b/vim-plugins/tmp/undo/%tmp%crontab.Wlpq8x%crontab
new file mode 100644
index 0000000..5c2cffe
Binary files /dev/null and b/vim-plugins/tmp/undo/%tmp%crontab.Wlpq8x%crontab differ
diff --git a/vim-plugins/tmp/undo/%tmp%crontab.ZwLCPA%crontab b/vim-plugins/tmp/undo/%tmp%crontab.ZwLCPA%crontab
new file mode 100644
index 0000000..4bbe959
Binary files /dev/null and b/vim-plugins/tmp/undo/%tmp%crontab.ZwLCPA%crontab differ
diff --git a/vim-plugins/tmp/undo/%tmp%zsh5bn4yf b/vim-plugins/tmp/undo/%tmp%zsh5bn4yf
new file mode 100644
index 0000000..a35e743
Binary files /dev/null and b/vim-plugins/tmp/undo/%tmp%zsh5bn4yf differ
diff --git a/vim-plugins/tmp/undo/%usr%bin%pip3 b/vim-plugins/tmp/undo/%usr%bin%pip3
new file mode 100755
index 0000000..88b42c0
Binary files /dev/null and b/vim-plugins/tmp/undo/%usr%bin%pip3 differ